updated pot file

1 files changed, 268 insertions, 217 deletions

diff --git a/po/ja.po b/po/ja.po
index 0c77c4bf..3679a996 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2001-11-27 19:52+0100\n"
+"POT-Creation-Date: 2001-12-03 17:32+0100\n"
 "PO-Revision-Date: 1999-12-19 14:43+0100\n"
 "Last-Translator: Taisuke Yamada <tai@imasy.or.jp>\n"
 "Language-Team: Japanese\n"
@@ -24,28 +24,28 @@ msgid ""
 "You requested installation of package $rpm\n"
 msgstr "指定されたパッケージ（%s）をインストールしています…\n"
 
-#: _irpm:31 po/placeholder.h:163 urpmi:248
+#: _irpm:31 po/placeholder.h:169 urpmi:248
 msgid "Is it OK?"
 msgstr "よろしいでしょうか？"
 
-#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:279
+#: _irpm:33 po/placeholder.h:159 urpmi:251 urpmi:279
 msgid "Ok"
 msgstr "はい（続行する）"
 
-#: _irpm:34 po/placeholder.h:119 urpmi:252 urpmi:280
+#: _irpm:34 po/placeholder.h:125 urpmi:252 urpmi:280
 msgid "Cancel"
 msgstr "いいえ（中止する）"
 
-#: _irpm:40 po/placeholder.h:130 urpmi:256 urpmi:318 urpmi:342
+#: _irpm:40 po/placeholder.h:136 urpmi:256 urpmi:318 urpmi:342
 msgid "Nn"
 msgstr "NnＮｎいイ"
 
-#: _irpm:41 po/placeholder.h:133 urpmi:257 urpmi:319 urpmi:343
+#: _irpm:41 po/placeholder.h:139 urpmi:257 urpmi:319 urpmi:343
 msgid "Yy"
 msgstr "YyＹｙはハ"
 
 # ｙ
-#: _irpm:42 po/placeholder.h:157 urpmi:258
+#: _irpm:42 po/placeholder.h:163 urpmi:258
 msgid " (Y/n) "
 msgstr " (はい(Y)/いいえ(n)) [はい] "
 
@@ -154,506 +154,533 @@ msgstr "urpmi はインストールされていません"
 msgid "reading synthesis file [%s]"
 msgstr "「%s」を作成することができませんでした\n"
 
-#: po/placeholder.h:30 urpm.pm:298
+#: po/placeholder.h:30
+msgid "retrieving source hdlist (or synthesis)..."
+msgstr ""
+
+#: po/placeholder.h:31
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:31 urpm.pm:277
+#: po/placeholder.h:32 urpm.pm:1719
+msgid "retrieving rpms files..."
+msgstr ""
+
+#: po/placeholder.h:33 urpm.pm:283
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:32
+#: po/placeholder.h:34
 #, c-format
 msgid "nothing to write in list file for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:33 urpm.pm:233
+#: po/placeholder.h:35 urpm.pm:239
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:34
+#: po/placeholder.h:36
 #, fuzzy, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "アップデートを「%s」について行なうことができませんでした\n"
 
-#: po/placeholder.h:35
+#: po/placeholder.h:37
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:36 urpm.pm:845
+#: po/placeholder.h:38 urpm.pm:869
 #, c-format
 msgid "read provides file [%s]"
 msgstr ""
 
-#: po/placeholder.h:37 urpm.pm:1549
+#: po/placeholder.h:39 urpm.pm:1595
 #, c-format
 msgid "package %s is not found."
 msgstr ""
 
-#: po/placeholder.h:38 urpm.pm:876
+#: po/placeholder.h:40 urpm.pm:900
 #, fuzzy, c-format
 msgid "unable to write compss file [%s]"
 msgstr "「%s」を作成することができませんでした\n"
 
-#: po/placeholder.h:39 urpm.pm:819
+#: po/placeholder.h:41 urpm.pm:843
 #, c-format
 msgid "unmounting %s"
 msgstr ""
 
-#: po/placeholder.h:40
+#: po/placeholder.h:42
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr ""
 
-#: po/placeholder.h:41 urpm.pm:925 urpm.pm:1491
+#: po/placeholder.h:43 urpm.pm:949 urpm.pm:1537
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:42 urpm.pm:160
+#: po/placeholder.h:44 urpm.pm:166
 #, c-format
 msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:43 urpm.pm:184
+#: po/placeholder.h:45 urpm.pm:190
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 
-#: po/placeholder.h:44 urpm.pm:191
+#: po/placeholder.h:46 urpm.pm:197
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 
-#: po/placeholder.h:45
+#: po/placeholder.h:47
 msgid "keeping only files referenced in provides"
 msgstr ""
 
-#: po/placeholder.h:46
+#: po/placeholder.h:48
 #, fuzzy, c-format
 msgid "unable to build synthesis file for medium \"%s\""
 msgstr "アップデートを「%s」について行なうことができませんでした\n"
 
-#: po/placeholder.h:47
+#: po/placeholder.h:49
 #, c-format
 msgid "found %d headers in cache"
 msgstr ""
 
-#: po/placeholder.h:48 urpm.pm:842
+#: po/placeholder.h:50 urpm.pm:866
 #, fuzzy, c-format
 msgid "unable to read provides file [%s]"
 msgstr "「%s」を作成することができませんでした\n"
 
-#: po/placeholder.h:49 urpm.pm:1891
+#: po/placeholder.h:51 urpm.pm:1945
 #, c-format
 msgid "avoid selecting %s as its locales language is not already selected"
 msgstr ""
 
-#: po/placeholder.h:50
+#: po/placeholder.h:52
 #, c-format
 msgid ""
 "removing %s to upgrade to %s ...\n"
 "  since it will not be updated otherwise"
 msgstr ""
 
-#: po/placeholder.h:54 urpm.pm:326
+#: po/placeholder.h:56
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: po/placeholder.h:55
+#: po/placeholder.h:57
 #, fuzzy, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "「%s」を作成することができませんでした\n"
 
-#: po/placeholder.h:56 urpm.pm:310
+#: po/placeholder.h:58
 #, c-format
 msgid "write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:57 urpm.pm:1107
+#: po/placeholder.h:59 urpm.pm:1133
 #, fuzzy, c-format
 msgid "no package named %s"
 msgstr "%s というパッケージはありません\n"
 
-#: po/placeholder.h:58 urpm.pm:854
+#: po/placeholder.h:60 urpm.pm:878
 #, fuzzy, c-format
 msgid "unable to read compss file [%s]"
 msgstr "「%s」を作成することができませんでした\n"
 
-#: po/placeholder.h:59 urpm.pm:228
+#: po/placeholder.h:61 urpm.pm:234
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:60
+#: po/placeholder.h:62
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:61
+#: po/placeholder.h:63
 msgid "computing dependencies"
 msgstr ""
 
-#: po/placeholder.h:62
+#: po/placeholder.h:64
 #, c-format
 msgid "retrieve of [%s] failed"
 msgstr ""
 
-#: po/placeholder.h:63 urpm.pm:874
+#: po/placeholder.h:65 urpm.pm:898
 #, c-format
 msgid "write provides file [%s]"
 msgstr ""
 
-#: po/placeholder.h:64 urpm.pm:809
+#: po/placeholder.h:66 urpm.pm:833
 #, fuzzy, c-format
 msgid "mounting %s"
 msgstr "%s をインストール中…\n"
 
-#: po/placeholder.h:65 urpm.pm:178
+#: po/placeholder.h:67 urpm.pm:184
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
 "medium"
 msgstr ""
 
-#: po/placeholder.h:66
+#: po/placeholder.h:68
 #, c-format
 msgid "reading hdlist file [%s]"
 msgstr ""
 
-#: po/placeholder.h:67 urpm.pm:879
+#: po/placeholder.h:69 urpm.pm:103
 #, c-format
-msgid "write compss file [%s]"
+msgid "wget failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:68 urpm.pm:833
+#: po/placeholder.h:70 urpm.pm:903
 #, c-format
-msgid "read depslist file [%s]"
+msgid "write compss file [%s]"
 msgstr ""
 
-#: po/placeholder.h:69 urpm.pm:103
-msgid "curl failed\n"
+#: po/placeholder.h:71 urpm.pm:857
+#, c-format
+msgid "read depslist file [%s]"
 msgstr ""
 
-#: po/placeholder.h:70 urpm.pm:281 urpm.pm:284
+#: po/placeholder.h:72 urpm.pm:287 urpm.pm:290
 #, fuzzy, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "「%s」を作成することができませんでした\n"
 
-#: po/placeholder.h:71 urpm.pm:1668
+#: po/placeholder.h:73 urpm.pm:1714
 #, c-format
 msgid "malformed input: [%s]"
 msgstr ""
 
-#: po/placeholder.h:72 urpm.pm:1502 urpm.pm:1528
+#: po/placeholder.h:74 urpm.pm:1548 urpm.pm:1574
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: po/placeholder.h:73 urpm.pm:163
+#: po/placeholder.h:75 urpm.pm:169
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:74 urpm.pm:871
+#: po/placeholder.h:76 urpm.pm:895
 #, fuzzy, c-format
 msgid "unable to write provides file [%s]"
 msgstr "「%s」を作成することができませんでした\n"
 
-#: po/placeholder.h:75 urpm.pm:206
+#: po/placeholder.h:77 urpm.pm:212
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:76 urpm.pm:1215
+#: po/placeholder.h:78 urpm.pm:1245
 #, fuzzy
 msgid "unable to find all synthesis file, using parsehdlist server"
 msgstr "アップデートを「%s」について行なうことができませんでした\n"
 
-#: po/placeholder.h:77 urpm.pm:1011
+#: po/placeholder.h:79 urpm.pm:1035
 #, fuzzy
 msgid "unable to register rpm file"
 msgstr "「%s」を作成することができませんでした\n"
 
-#: po/placeholder.h:78 urpm.pm:256
+#: po/placeholder.h:80 urpm.pm:262
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:79 urpm.pm:272
+#: po/placeholder.h:81 urpm.pm:278
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:80 urpm.pm:248
+#: po/placeholder.h:82 urpm.pm:254
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:81
+#: po/placeholder.h:83
 #, c-format
 msgid "copy of [%s] failed"
 msgstr ""
 
-#: po/placeholder.h:82
+#: po/placeholder.h:84
 #, fuzzy, c-format
 msgid "trying to remove inexistent medium \"%s\""
 msgstr "「%s」を作成することができませんでした\n"
 
-#: po/placeholder.h:83 urpm.pm:913 urpm.pm:1191 urpm.pm:1473 urpm.pm:1480
+#: po/placeholder.h:85
+msgid "retrieving description file..."
+msgstr ""
+
+#: po/placeholder.h:86 urpm.pm:937 urpm.pm:1221 urpm.pm:1519 urpm.pm:1526
 #, fuzzy, c-format
 msgid "unable to parse correctly [%s]"
 msgstr "アップデートを「%s」について行なうことができませんでした\n"
 
-#: po/placeholder.h:84 urpm.pm:1192
+#: po/placeholder.h:87 urpm.pm:1222
 #, fuzzy, c-format
 msgid "read synthesis file [%s]"
 msgstr "「%s」を作成することができませんでした\n"
 
-#: po/placeholder.h:85 urpm.pm:830
+#: po/placeholder.h:88 urpm.pm:854
 #, fuzzy, c-format
 msgid "unable to read depslist file [%s]"
 msgstr "「%s」を作成することができませんでした\n"
 
-#: po/placeholder.h:86 urpm.pm:857
+#: po/placeholder.h:89 urpm.pm:881
 #, c-format
 msgid "read compss file [%s]"
 msgstr ""
 
-#: po/placeholder.h:87 urpm.pm:139 urpm.pm:151
+#: po/placeholder.h:90 urpm.pm:98
+msgid "no webfetch (curl or wget for example) found\n"
+msgstr ""
+
+#: po/placeholder.h:91 urpm.pm:145 urpm.pm:157
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr ""
 
-#: po/placeholder.h:88
+#: po/placeholder.h:92
 #, c-format
 msgid "building hdlist [%s]"
 msgstr ""
 
-#: po/placeholder.h:89 urpm.pm:1603
+#: po/placeholder.h:93 urpm.pm:1649
 #, fuzzy, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "「%s」を作成することができませんでした\n"
 
-#: po/placeholder.h:90 urpm.pm:1015
+#: po/placeholder.h:94 urpm.pm:1039
 msgid "error registering local packages"
 msgstr ""
 
-#: po/placeholder.h:91 urpm.pm:273
+#: po/placeholder.h:95 urpm.pm:279
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: po/placeholder.h:92 urpm.pm:1619
+#: po/placeholder.h:96 urpm.pm:1726
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr ""
+
+#: po/placeholder.h:97 urpm.pm:1665
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: po/placeholder.h:93
+#: po/placeholder.h:98
 #, fuzzy, c-format
 msgid "unable to build hdlist: %s"
 msgstr "アップデートを「%s」について行なうことができませんでした\n"
 
-#: po/placeholder.h:94 urpm.pm:1593 urpm.pm:1596 urpm.pm:1615
+#: po/placeholder.h:99 urpm.pm:1639 urpm.pm:1642 urpm.pm:1661
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr ""
 
-#: po/placeholder.h:95 urpm.pm:1006
+#: po/placeholder.h:100 urpm.pm:1030
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr ""
 
-#: po/placeholder.h:96 urpm.pm:1175
+#: po/placeholder.h:101 urpm.pm:1205
 #, c-format
 msgid "unknown data associated with %s"
 msgstr ""
 
-#: po/placeholder.h:97 urpm.pm:222
+#: po/placeholder.h:102 urpm.pm:228
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: po/placeholder.h:98 urpm.pm:869
+#: po/placeholder.h:103 urpm.pm:893
 #, c-format
 msgid "write depslist file [%s]"
 msgstr ""
 
-#: po/placeholder.h:99 urpm.pm:208
+#: po/placeholder.h:104 urpm.pm:214
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:100 urpm.pm:1879
+#: po/placeholder.h:105 urpm.pm:1933
 #, c-format
 msgid "avoid selecting %s as not enough files will be updated"
 msgstr ""
 
-#: po/placeholder.h:101 urpm.pm:1007
+#: po/placeholder.h:106 urpm.pm:1031
 #, fuzzy, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "「%s」を作成することができませんでした\n"
 
-#: po/placeholder.h:102 urpm.pm:866
+#: po/placeholder.h:107 urpm.pm:890
 #, fuzzy, c-format
 msgid "unable to write depslist file [%s]"
 msgstr "「%s」を作成することができませんでした\n"
 
-#: po/placeholder.h:103
+#: po/placeholder.h:108
 #, c-format
 msgid ""
 "removing %s to upgrade to %s ...\n"
 "  since it will not upgrade correctly!"
 msgstr ""
 
-#: po/placeholder.h:107 urpm.pm:342 urpm.pm:1630
+#: po/placeholder.h:112 urpm.pm:1018
+#, c-format
+msgid "relocated %s entries in depslist"
+msgstr ""
+
+#: po/placeholder.h:113 urpm.pm:1676
 #, fuzzy, c-format
 msgid "unable to access medium \"%s\""
 msgstr "アップデートを「%s」について行なうことができませんでした\n"
 
-#: po/placeholder.h:108 urpm.pm:994
+#: po/placeholder.h:114 urpm.pm:944 urpm.pm:1532 urpm.pm:1583
 #, c-format
-msgid "relocated %s entries in depslist"
+msgid "unable to parse correctly [%s] on value \"%s\""
 msgstr ""
 
-#: po/placeholder.h:109
+#: po/placeholder.h:115
 #, fuzzy, c-format
 msgid "trying to select inexistent medium \"%s\""
 msgstr "「%s」を作成することができませんでした\n"
 
-#: po/placeholder.h:110 urpm.pm:97
-msgid "wget failed\n"
-msgstr ""
-
-#: po/placeholder.h:111 urpm.pm:920 urpm.pm:1486 urpm.pm:1537
-#, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
-msgstr ""
-
-#: po/placeholder.h:112 urpm.pm:1110
+#: po/placeholder.h:116 urpm.pm:1136
 #, fuzzy, c-format
 msgid "The following packages contain %s: %s"
 msgstr "%s は次のパッケージの中にあります: %s\n"
 
-#: po/placeholder.h:113
+#: po/placeholder.h:117
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr ""
 
-#: po/placeholder.h:114 urpm.pm:1772
+#: po/placeholder.h:118 urpm.pm:1724
+msgid "...retrieving done"
+msgstr ""
+
+#: po/placeholder.h:119 urpm.pm:1826
 #, c-format
 msgid "selecting %s using obsoletes"
 msgstr ""
 
-#: po/placeholder.h:115 urpm.pm:1888
+#: po/placeholder.h:120 urpm.pm:109
+#, c-format
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr ""
+
+#: po/placeholder.h:121 urpm.pm:1942
 #, c-format
 msgid "selecting %s by selection on files"
 msgstr ""
 
-#: po/placeholder.h:116 urpm.pm:100
+#: po/placeholder.h:122 urpm.pm:106
 msgid "curl is missing\n"
 msgstr ""
 
-#: po/placeholder.h:117 urpm.pm:95
+#: po/placeholder.h:123 urpm.pm:101
 msgid "wget is missing\n"
 msgstr ""
 
-#: po/placeholder.h:118 urpm.pm:195
+#: po/placeholder.h:124 urpm.pm:201
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr ""
 
-#: po/placeholder.h:120
+#: po/placeholder.h:126
 msgid "  --help         - print this help message.\n"
 msgstr ""
 
-#: po/placeholder.h:121 urpmi:361
+#: po/placeholder.h:127 urpmi:361
 msgid "everything already installed"
 msgstr "すべて既にインストールされています"
 
-#: po/placeholder.h:122 urpmi:98
+#: po/placeholder.h:128 urpmi:98
 #, fuzzy, c-format
 msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 "未知のオプション（\"-$1\"）です。\n"
 "使用方法を --help オプションで確認してください。\n"
 
-#: po/placeholder.h:123 urpmi:194
+#: po/placeholder.h:129 urpmi:194
 msgid "One of the following packages is needed:"
 msgstr "次のパッケージのいずれかが必要です:"
 
-#: po/placeholder.h:124 po/placeholder.h:222
+#: po/placeholder.h:130 po/placeholder.h:237
 msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: po/placeholder.h:125 urpmi:299
+#: po/placeholder.h:131 urpmi:299
 msgid ""
 "Installation failed, some files are missing.\n"
 "You may want to update your urpmi database"
 msgstr ""
 
-#: po/placeholder.h:129
+#: po/placeholder.h:135
 msgid "  --auto         - automatically select a good package in choices.\n"
 msgstr ""
 
-#: po/placeholder.h:131 urpmi:307 urpmi:314 urpmi:327 urpmi:338 urpmi:351
+#: po/placeholder.h:137 urpmi:307 urpmi:314 urpmi:327 urpmi:338 urpmi:351
 msgid "Installation failed"
 msgstr "インストールに失敗しました"
 
-#: po/placeholder.h:132 po/placeholder.h:234
+#: po/placeholder.h:138 po/placeholder.h:249
 msgid ""
 "  --auto-select  - automatically select packages for upgrading the system.\n"
 msgstr ""
 
-#: po/placeholder.h:134
+#: po/placeholder.h:140
 msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: po/placeholder.h:135 urpmi:247
+#: po/placeholder.h:141 urpmi:247
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
 "d MB)"
 msgstr "依存関係のため、次のパッケージもインストールします (%d MB)"
 
-#: po/placeholder.h:136 urpmi:320 urpmi:344
+#: po/placeholder.h:142 urpmi:320 urpmi:344
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr ""
 "依存関係を確認せずにインストールを試みますか？ (はい(y)/いいえ(N)) [いいえ] "
 
-#: po/placeholder.h:137
+#: po/placeholder.h:143
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
 "                   X or text mode.\n"
 msgstr ""
 
-#: po/placeholder.h:141 po/placeholder.h:240
+#: po/placeholder.h:147 po/placeholder.h:256
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: po/placeholder.h:142 po/placeholder.h:241
+#: po/placeholder.h:148 po/placeholder.h:257
 msgid "  -v             - verbose mode.\n"
 msgstr ""
 
-#: po/placeholder.h:143
+#: po/placeholder.h:149
 msgid "  -q             - quiet mode.\n"
 msgstr ""
 
-#: po/placeholder.h:144 urpmi:202
+#: po/placeholder.h:150 urpmi:202
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "どれを選びますか？(1-%d) "
 
-#: po/placeholder.h:145
+#: po/placeholder.h:151 po/placeholder.h:197 po/placeholder.h:217
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: po/placeholder.h:146
+#: po/placeholder.h:152
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -663,87 +690,80 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: po/placeholder.h:152 urpmi:328 urpmi:352
+#: po/placeholder.h:158 urpmi:328 urpmi:352
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr ""
 "再度インストールを試みますか？（--force 相当です） (はい(y)/いいえ(N)) [いい"
 "え] "
 
-#: po/placeholder.h:154
+#: po/placeholder.h:160 po/placeholder.h:250
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: po/placeholder.h:155 urpmi:205
+#: po/placeholder.h:161 urpmi:205
 msgid "Sorry, bad choice, try again\n"
 msgstr "有効な選択ではありません。もう一度お願いします\n"
 
-#: po/placeholder.h:156
+#: po/placeholder.h:162
 msgid ""
 "  names or rpm files (only for root) given on command line are installed.\n"
 msgstr ""
 
-#: po/placeholder.h:158
+#: po/placeholder.h:164
 msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: po/placeholder.h:159
+#: po/placeholder.h:165 po/placeholder.h:190 po/placeholder.h:210
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: po/placeholder.h:160 urpmi:294
+#: po/placeholder.h:166 urpmi:294
 #, c-format
 msgid "installing %s\n"
 msgstr "%s をインストール中…\n"
 
-#: po/placeholder.h:161 urpmi:152
+#: po/placeholder.h:167 urpmi:152
 msgid "Only superuser is allowed to install local packages"
 msgstr ""
 "ローカルパッケージのインストールはスーパーユーザーでなくてはできません。"
 
-#: po/placeholder.h:162 urpmi:276
+#: po/placeholder.h:168 urpmi:276
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "メディア（%s）を %s に挿入して下さい。"
 
-#: po/placeholder.h:164 po/placeholder.h:242 urpmi:266 urpmq:148
+#: po/placeholder.h:170 po/placeholder.h:258 urpmi:266 urpmq:149
 msgid "unable to get source packages, aborting"
 msgstr "ソースパッケージを取得できませんでした。このまま終了します"
 
-#: po/placeholder.h:165 urpmi:102
+#: po/placeholder.h:171 urpmi:102
 #, fuzzy
 msgid "Only superuser is allowed to install packages"
 msgstr ""
 "ローカルパッケージのインストールはスーパーユーザーでなくてはできません。"
 
-#: po/placeholder.h:166 urpmi:193
+#: po/placeholder.h:172 urpmi:193
 #, fuzzy, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "次のパッケージのいずれかが必要です:"
 
-#: po/placeholder.h:167 urpmi:277
+#: po/placeholder.h:173 urpmi:277
 msgid "Press Enter when it's done..."
 msgstr "終わった後はリターンキーを押して下さい。"
 
-#: po/placeholder.h:168 urpmi.addmedia:46
-#, c-format
-msgid ""
-"%s\n"
-"`with' missing for ftp media\n"
-msgstr ""
-"%s\n"
-"「with ...」以降の指定が ftp については必要です\n"
-
-#: po/placeholder.h:172
+#: po/placeholder.h:174
+#, fuzzy
 msgid ""
-"usage: urpmi.addmedia [--update] <name> <url>\n"
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
 "where <url> is one of\n"
 "       file://<path>\n"
 "       ftp://<login>:<password>@<host>/<path> with <relative filename of "
 "hdlist>\n"
 "       ftp://<host>/<path> with <relative filename of hdlist>\n"
 "       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable_<device>://<path>\n"
+"       removable://<path>\n"
+"and [options] are from\n"
 msgstr ""
 "使用方法: urpmi.addmedia [--update] <name> <url>\n"
 "ここで、<url> は以下のうちのいずれかの形式です：\n"
@@ -753,60 +773,62 @@ msgstr ""
 "  http://<host>/<path> with <relative filename of hdlist>\n"
 "  removable_<device>://<path>\n"
 
-#: po/placeholder.h:181 urpmi.addmedia:57
+#: po/placeholder.h:184 urpmi.addmedia:76
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "「%s」を作成することができませんでした\n"
 
-#: po/placeholder.h:182 urpmi.addmedia:58
+#: po/placeholder.h:185 urpmi.addmedia:77
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "アップデートを「%s」について行なうことができませんでした\n"
 
-#: po/placeholder.h:183 urpmi.addmedia:42
+#: po/placeholder.h:186 po/placeholder.h:206 urpmi.addmedia:54
+#, fuzzy, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr "未知のオプション（%s）が指定されています\n"
+
+#: po/placeholder.h:191 po/placeholder.h:215
+msgid "  -c             - clean headers cache directory.\n"
+msgstr ""
+
+#: po/placeholder.h:192 urpmi.addmedia:62
 #, c-format
 msgid ""
 "%s\n"
-"device `%s' do not exist\n"
+"<relative path of hdlist> missing\n"
 msgstr ""
 "%s\n"
-"指定のデバイス（%s）が見つかりません\n"
+"「<relative path of hdlist>」部分の指定がありません\n"
+
+#: po/placeholder.h:196 po/placeholder.h:216
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr ""
 
-#: po/placeholder.h:187 urpmi.addmedia:44
+#: po/placeholder.h:198 urpmi.addmedia:64
 #, c-format
 msgid ""
 "%s\n"
-"<relative path of hdlist> missing\n"
+"`with' missing for ftp media\n"
 msgstr ""
 "%s\n"
-"「<relative path of hdlist>」部分の指定がありません\n"
+"「with ...」以降の指定が ftp については必要です\n"
 
-#: po/placeholder.h:191
-#, fuzzy, c-format
+#: po/placeholder.h:202
+#, fuzzy
 msgid ""
-"usage: urpmi.update [-a] <name> ...\n"
+"usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
-"   -a    select all non-removable media.\n"
-"   -c    clean headers cache directory.\n"
-"   -f    force generation of base files, use another -f for hdlist files.\n"
-"\n"
-"unknown options '%s'\n"
 msgstr ""
-"使用方法: urpmi.update [-a] <name> ...\n"
-"ここで <name> はアップデート対象のメディアの名前です。\n"
+"使用方法: urpmi.removemedia [-a] <name> ...\n"
+"ここで <name> は削除対象のメディアの名前です。\n"
 "  -a    すべてのメディアを選択します\n"
-"  -c    ヘッダキャッシュをクリアします\n"
-"  -f    hdlist またはベースファイルを無条件に生成します\n"
 "\n"
 "サポートされていないオプションです: %s\n"
 
-#: po/placeholder.h:200 urpmi.update:51
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr ""
-"アップデートが必要なものはありません。\n"
-"メディアを追加する場合は urpmi.addmedia を使用して下さい。\n"
-
-#: po/placeholder.h:201 urpmi.update:53
+#: po/placeholder.h:211 urpmi.update:58
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -815,13 +837,23 @@ msgstr ""
 "アップデート対象が見つかりません\n"
 "(%s の中のいずれか)\n"
 
-#: po/placeholder.h:205 urpmi.removemedia:44
+#: po/placeholder.h:218 urpmi.update:56
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"アップデートが必要なものはありません。\n"
+"メディアを追加する場合は urpmi.addmedia を使用して下さい。\n"
+
+#: po/placeholder.h:219
+msgid "  -a             - select all non-removable media.\n"
+msgstr ""
+
+#: po/placeholder.h:220 urpmi.removemedia:44
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "\"削除が必要なものはありません。\\n\"\n"
 "\"メディアを追加する場合は urpmi.addmedia を使用して下さい。\\n\"\n"
 
-#: po/placeholder.h:206 urpmi.removemedia:46
+#: po/placeholder.h:221 urpmi.removemedia:46
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -830,7 +862,7 @@ msgstr ""
 "削除対象が見つかりません\n"
 "(%s の中のいずれか)\n"
 
-#: po/placeholder.h:210
+#: po/placeholder.h:225
 #, c-format
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
@@ -845,11 +877,11 @@ msgstr ""
 "\n"
 "サポートされていないオプションです: %s\n"
 
-#: po/placeholder.h:217
+#: po/placeholder.h:232
 msgid "  -h             - print this help message.\n"
 msgstr ""
 
-#: po/placeholder.h:218 urpmq:130
+#: po/placeholder.h:233 urpmq:131
 msgid ""
 "some package have to be removed for being upgraded, this is not supported "
 "yet\n"
@@ -857,28 +889,28 @@ msgstr ""
 "アップグレードのためにはいくつかのパッケージを削除する\n"
 "必要があります（これは未実装です）\n"
 
-#: po/placeholder.h:219
+#: po/placeholder.h:234
 msgid "  -g             - print groups too with name.\n"
 msgstr ""
 
-#: po/placeholder.h:220 urpmq:84
+#: po/placeholder.h:235 urpmq:83
 #, fuzzy, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: RPMファイル（$_）を読むことが出来ませんでした\n"
 
-#: po/placeholder.h:221
+#: po/placeholder.h:236
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: po/placeholder.h:223
+#: po/placeholder.h:238
 msgid "  -r             - print version and release too with name.\n"
 msgstr ""
 
-#: po/placeholder.h:224
+#: po/placeholder.h:239
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: po/placeholder.h:225
+#: po/placeholder.h:240
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -888,62 +920,56 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: po/placeholder.h:231
+#: po/placeholder.h:246
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: po/placeholder.h:232
+#: po/placeholder.h:247
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:233
+#: po/placeholder.h:248
 msgid ""
 "  -c             - choose complete method for resolving requires closure.\n"
 msgstr ""
 
-#: po/placeholder.h:235 urpmq:81
+#: po/placeholder.h:251 urpmq:80
 #, fuzzy, c-format
 msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 "未知のオプション（\"-$1\"）です。\n"
 "使用方法を --help オプションで確認してください。\n"
 
-#: po/placeholder.h:236
+#: po/placeholder.h:252
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:243
+#: po/placeholder.h:259
 msgid ""
 "  -u             - remove package if a better version is already installed.\n"
 msgstr ""
 
-#: po/placeholder.h:244
-msgid ""
-"  --force        - force invocation even if some packages do not\n"
-"exist.\n"
-msgstr ""
-
-#: urpm.pm:1796 urpm.pm:1805
+#: urpm.pm:1850 urpm.pm:1859
 #, c-format
 msgid "removing %s to upgrade to %s ..."
 msgstr ""
 
-#: urpm.pm:1797 urpm.pm:1806
+#: urpm.pm:1851 urpm.pm:1860
 msgid ", $otherPackage, "
 msgstr ", $otherPackage, "
 
-#: urpm.pm:1797 urpm.pm:1806
+#: urpm.pm:1851 urpm.pm:1860
 msgid "));"
 msgstr "));"
 
-#: urpm.pm:1802
+#: urpm.pm:1856
 msgid "$p->{name}-$p->{version}-$p->{release}"
 msgstr "$p->{name}-$p->{version}-$p->{release}"
 
-#: urpm.pm:1812
+#: urpm.pm:1866
 msgid "$prefix/$_"
 msgstr "$prefix/$_"
 
@@ -952,37 +978,65 @@ msgstr "$prefix/$_"
 msgid "urpmi version %s"
 msgstr "urpmi バージョン %s"
 
-#: urpmi.addmedia:30
+#: urpmi.addmedia:29
 #, fuzzy
-msgid "usage: urpmi.addmedia [--update] <name> <url>"
+msgid "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]"
 msgstr "使用方法: urpmi.addmedia <name> <url>"
 
-#. <path>
-#. <login>:<password>@<host>/<path> with <relative filename of hdlist>
-#. <host>/<path> with <relative filename of hdlist>
-#. <host>/<path> with <relative filename of hdlist>
-#. <path>
-#: urpmi.addmedia:37
+#: urpmi.addmedia:38 urpmi.addmedia:39 urpmi.addmedia:40 urpmi.addmedia:41
+#: urpmi.update:43 urpmi.update:44 urpmi.update:45 urpmi.update:46
+#: urpmi.update:47 urpmi.update:48
+msgid ") . _("
+msgstr ""
+
+#: urpmi.addmedia:42
 msgid ");"
 msgstr ");"
 
-#: urpmi.update:38
-msgid "usage: urpmi.update [-a] <name> ..."
+#: urpmi.update:41
+#, fuzzy
+msgid "usage: urpmi.update [options] <name> ..."
 msgstr "使用方法: urpmi.update [-a] <name> <url>"
 
+#: urpmi.removemedia:35 urpmi.update:48
+msgid ", $_);"
+msgstr ", $_);"
+
 #: urpmi.removemedia:32
 msgid "usage: urpmi.removemedia [-a] <name> ..."
 msgstr "使用方法: urpmi.removemedia [-a] <name>"
 
-#: urpmi.removemedia:35
-msgid ", $_);"
-msgstr ", $_);"
-
 #: urpmq:34
 #, c-format
 msgid "urpmq version %s"
 msgstr "urpmq version %s"
 
+#~ msgid ""
+#~ "%s\n"
+#~ "device `%s' do not exist\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "指定のデバイス（%s）が見つかりません\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "usage: urpmi.update [-a] <name> ...\n"
+#~ "where <name> is a medium name to update.\n"
+#~ "   -a    select all non-removable media.\n"
+#~ "   -c    clean headers cache directory.\n"
+#~ "   -f    force generation of base files, use another -f for hdlist "
+#~ "files.\n"
+#~ "\n"
+#~ "unknown options '%s'\n"
+#~ msgstr ""
+#~ "使用方法: urpmi.update [-a] <name> ...\n"
+#~ "ここで <name> はアップデート対象のメディアの名前です。\n"
+#~ "  -a    すべてのメディアを選択します\n"
+#~ "  -c    ヘッダキャッシュをクリアします\n"
+#~ "  -f    hdlist またはベースファイルを無条件に生成します\n"
+#~ "\n"
+#~ "サポートされていないオプションです: %s\n"
+
 #, fuzzy
 #~ msgid ""
 #~ "urpmi version %s\n"
@@ -1038,9 +1092,6 @@ msgstr "urpmq version %s"
 #~ msgid "), $_);"
 #~ msgstr "), $_);"
 
-#~ msgid "unknown options \"%s\"\n"
-#~ msgstr "未知のオプション（%s）が指定されています\n"
-
 #~ msgid ""
 #~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name "
 #~ "[package_names...]\n"