fixed some English typos; updated Hungarian file

1 files changed, 528 insertions, 342 deletions

diff --git a/po/vi.po b/po/vi.po
index b012acef..7ec0d6b2 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2001-11-24 14:46+0100\n"
+"POT-Creation-Date: 2001-11-27 19:52+0100\n"
 "PO-Revision-Date: 2001-03-21 15:04+0100\n"
 "Last-Translator: TRINH MINH THANH <tmthanh@yahoo.com>\n"
 "Language-Team: Vietnamese\n"
@@ -25,27 +25,27 @@ msgstr ""
 "Tù ®éng cµi ®Æt c¸c gãi...\n"
 "B¹n yªu cÇu cµi ®Æt gãi $rpm\n"
 
-#: _irpm:31 po/placeholder.h:152 urpmi:248
-msgid "Is it ok?"
+#: _irpm:31 po/placeholder.h:163 urpmi:248
+msgid "Is it OK?"
 msgstr "§­îc ch­a?"
 
-#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:281
+#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:279
 msgid "Ok"
 msgstr "OK"
 
-#: _irpm:34 po/placeholder.h:116 urpmi:252 urpmi:282
+#: _irpm:34 po/placeholder.h:119 urpmi:252 urpmi:280
 msgid "Cancel"
 msgstr "Bá qua"
 
-#: _irpm:40 po/placeholder.h:154 urpmi:256 urpmi:319 urpmi:343
+#: _irpm:40 po/placeholder.h:130 urpmi:256 urpmi:318 urpmi:342
 msgid "Nn"
 msgstr "Kh«ng"
 
-#: _irpm:41 po/placeholder.h:119 urpmi:257 urpmi:320 urpmi:344
+#: _irpm:41 po/placeholder.h:133 urpmi:257 urpmi:319 urpmi:343
 msgid "Yy"
 msgstr "Cã"
 
-#: _irpm:42 po/placeholder.h:118 urpmi:258
+#: _irpm:42 po/placeholder.h:157 urpmi:258
 msgid " (Y/n) "
 msgstr "Cã/Kh«ng"
 
@@ -153,177 +153,178 @@ msgstr "thö urpmf --help ®Ó cã thªm tïy chän"
 msgid "urpmi is not installed"
 msgstr "urpmi ch­a ®­îc cµi ®Æt"
 
-#: po/placeholder.h:29 urpm.pm:283
+#: po/placeholder.h:29
+#, fuzzy, c-format
+msgid "reading synthesis file [%s]"
+msgstr "®äc tËp danh s¸ch c¸c phô thuéc [%s]"
+
+#: po/placeholder.h:30 urpm.pm:298
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "Kh«ng thÓ ghi tËp tin cÊu h×nh [%s]"
 
-#: po/placeholder.h:30 urpm.pm:169
+#: po/placeholder.h:31 urpm.pm:277
 #, c-format
-msgid "unable to use name \"%s\" for unamed medium because it is already used"
+msgid "using different removable device [%s] for \"%s\""
 msgstr ""
-"kh«ng thÓ dïng tªn \"%s\" cho ph­¬ng tiÖn kh«ng tªn v× nã ®· ®­îc dïng råi"
 
-#: po/placeholder.h:31
+#: po/placeholder.h:32
 #, c-format
 msgid "nothing to write in list file for \"%s\""
 msgstr "kh«ng cã g× ®Ó ghi vµo tËp danh s¸ch cho \"%s\""
 
-#: po/placeholder.h:32 urpm.pm:218
+#: po/placeholder.h:33 urpm.pm:233
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "kh«ng thÓ t×m thÊy tËp danh s¸ch cho \"%s\", ph­¬ng tiÖn bÞ lê ®i"
 
-#: po/placeholder.h:33
+#: po/placeholder.h:34
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "kh«ng thÓ ph©n t¸ch tËp hdlist cña \"%s\""
 
-#: po/placeholder.h:34
+#: po/placeholder.h:35
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "kh«ng cã g× ®­îc ghi trong tËp danh s¸ch cho \"%s\""
 
-#: po/placeholder.h:35 urpm.pm:1951
-#, c-format
-msgid ""
-"removing %s to upgrade ...\n"
-" to %s since it will not upgrade correctly!"
-msgstr ""
-"®ang gì bá %s ®Ó cËp nhËt ...\n"
-" tíi %s do nã sÏ kh«ng ®­îc n©ng cÊp chÝnh x¸c!"
-
-#: po/placeholder.h:39 urpm.pm:839
+#: po/placeholder.h:36 urpm.pm:845
 #, c-format
 msgid "read provides file [%s]"
 msgstr "®äc tËp tin cung cÊp [%s]"
 
-#: po/placeholder.h:40
-#, c-format
-msgid "trying to remove inexistant medium \"%s\""
-msgstr "cè g¾ng gì bá ph­¬ng tiÖn kh«ng tån t¹i \"%s\""
-
-#: po/placeholder.h:41 urpm.pm:1692
+#: po/placeholder.h:37 urpm.pm:1549
 #, c-format
 msgid "package %s is not found."
 msgstr "Kh«ng t×m thÊy gãi tin %s."
 
-#: po/placeholder.h:42
-#, c-format
-msgid "unable to copy source of [%s] from [%s]"
-msgstr "kh«ng thÓ copy nguån cña [%s] tõ [%s]"
-
-#: po/placeholder.h:43 urpm.pm:870
+#: po/placeholder.h:38 urpm.pm:876
 #, c-format
 msgid "unable to write compss file [%s]"
 msgstr "kh«ng thÓ ghi tËp tin nÐn [%s]"
 
-#: po/placeholder.h:44 urpm.pm:813
+#: po/placeholder.h:39 urpm.pm:819
 #, c-format
 msgid "unmounting %s"
 msgstr "®ang bá g¾n kÕt %s"
 
-#: po/placeholder.h:45
+#: po/placeholder.h:40
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "®ang gì bá c¸c header cò %d trong cache"
 
-#: po/placeholder.h:46 urpm.pm:919 urpm.pm:1634
+#: po/placeholder.h:41 urpm.pm:925 urpm.pm:1491
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "kh«ng t×m thÊy tËp hdlist cho ph­¬ng tiÖn \"%s\""
 
-#: po/placeholder.h:47 urpm.pm:176
+#: po/placeholder.h:42 urpm.pm:160
+#, c-format
+msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
+msgstr ""
+"ph­¬ng tiÖn \"%s\" cè sö dông hdlist ®ang ®­îc dïng, ph­¬ng tiÖn bÞ bá qua"
+
+#: po/placeholder.h:43 urpm.pm:184
+#, c-format
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"kh«ng thÓ dïng tªn \"%s\" cho ph­¬ng tiÖn kh«ng tªn v× nã ®· ®­îc dïng råi"
+
+#: po/placeholder.h:44 urpm.pm:191
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 "kh«ng nhËn ®­îc ph­¬ng tiÖn \"%s\" vµo kho¶n môc do kh«ng tån t¹i tËp danh "
 "s¸ch [%s]"
 
-#: po/placeholder.h:48
+#: po/placeholder.h:45
 msgid "keeping only files referenced in provides"
 msgstr "chØ gi÷ c¸c tËp tin ®­îc tham chiÕu trong c¸c cung cÊp"
 
-#: po/placeholder.h:49
+#: po/placeholder.h:46
 #, c-format
 msgid "unable to build synthesis file for medium \"%s\""
 msgstr "kh«ng thÓ t¹o tËp tin tæng hîp cho ph­¬ng tiÖn \"%s\""
 
-#: po/placeholder.h:50
+#: po/placeholder.h:47
 #, c-format
 msgid "found %d headers in cache"
 msgstr "t×m thÊy c¸c header %d trong cache"
 
-#: po/placeholder.h:51 urpm.pm:836
+#: po/placeholder.h:48 urpm.pm:842
 #, c-format
 msgid "unable to read provides file [%s]"
 msgstr "kh«ng thÓ ®äc tËp tin cung cÊp [%s]"
 
-#: po/placeholder.h:52 urpm.pm:2034
+#: po/placeholder.h:49 urpm.pm:1891
 #, c-format
 msgid "avoid selecting %s as its locales language is not already selected"
 msgstr "tr¸nh chän %s v× locales language cña nã ch­a ®­îc chän lùa"
 
-#: po/placeholder.h:53 urpm.pm:311
+#: po/placeholder.h:50
+#, fuzzy, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not be updated otherwise"
+msgstr ""
+"®ang gì bá %s ®Ó n©ng cÊp ...\n"
+" tíi %s v× nã sÏ kh«ng ®­îc cËp nhËt kiÓu kh¸c"
+
+#: po/placeholder.h:54 urpm.pm:326
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "ph­¬ng tiÖn \"%s\" ®· tån t¹i råi"
 
-#: po/placeholder.h:54 urpm.pm:295
-#, c-format
-msgid "write config file [%s]"
-msgstr "ghi tËp cÊu h×nh [%s]"
-
 #: po/placeholder.h:55
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "kh«ng thÓ ghi tËp danh s¸ch cña \"%s\""
 
-#: po/placeholder.h:56 urpm.pm:1817
+#: po/placeholder.h:56 urpm.pm:310
 #, c-format
-msgid "retrieving [%s]"
-msgstr "®ang gäi [%s]"
-
-#: po/placeholder.h:57 urpm.pm:1819
-#, c-format
-msgid "wget of [%s] failed"
-msgstr "wget cña [%s] háng"
+msgid "write config file [%s]"
+msgstr "ghi tËp cÊu h×nh [%s]"
 
-#: po/placeholder.h:58 urpm.pm:1101
+#: po/placeholder.h:57 urpm.pm:1107
 #, c-format
 msgid "no package named %s"
 msgstr "kh«ng cã gãi tin mang danh %s"
 
-#: po/placeholder.h:59 urpm.pm:848
+#: po/placeholder.h:58 urpm.pm:854
 #, c-format
 msgid "unable to read compss file [%s]"
 msgstr "kh«ng thÓ ®äc tËp tin nÐn [%s]"
 
-#: po/placeholder.h:60 urpm.pm:213
+#: po/placeholder.h:59 urpm.pm:228
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "kh«ng thÓ t×m ®­îc tËp tin hdlist cho \"%s\", ph­¬ng tiÖn bÞ bá qua"
 
-#: po/placeholder.h:61
+#: po/placeholder.h:60
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "x©y dùng tËp tin tæng hîp hdlist cho ph­¬ng tiÖn \"%s\""
 
-#: po/placeholder.h:62
+#: po/placeholder.h:61
 msgid "computing dependencies"
 msgstr "®ang tÝnh to¸n c¸c phô thuéc"
 
-#: po/placeholder.h:63 urpm.pm:868
+#: po/placeholder.h:62
+#, fuzzy, c-format
+msgid "retrieve of [%s] failed"
+msgstr "wget cña [%s] háng"
+
+#: po/placeholder.h:63 urpm.pm:874
 #, c-format
 msgid "write provides file [%s]"
 msgstr "ghi tËp tin cung cÊp [%s]"
 
-#: po/placeholder.h:64 urpm.pm:803
+#: po/placeholder.h:64 urpm.pm:809
 #, c-format
 msgid "mounting %s"
 msgstr "®ang g¾n kÕt %s"
 
-#: po/placeholder.h:65 urpm.pm:163
+#: po/placeholder.h:65 urpm.pm:178
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
@@ -332,125 +333,136 @@ msgstr ""
 "kh«ng thÓ qu¶n lý ph­¬ng tiÖn \"%s\" v× tËp danh s¸ch ®· ®­îc c¸i kh¸c dïng "
 "råi"
 
-#: po/placeholder.h:66 urpm.pm:148
-#, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
-msgstr ""
-"ph­¬ng tiÖn \"%s\" cè sö dông mét danh s¸ch ®ang ®­îc dïng, ph­¬ng tiÖn bÞ "
-"bá qua"
-
-#: po/placeholder.h:67
+#: po/placeholder.h:66
 #, c-format
 msgid "reading hdlist file [%s]"
 msgstr "®ang ®äc tËp tin hdlist [%s]"
 
-#: po/placeholder.h:68 urpm.pm:873
+#: po/placeholder.h:67 urpm.pm:879
 #, c-format
 msgid "write compss file [%s]"
 msgstr "ghi tËp tin nÐn [%s]"
 
-#: po/placeholder.h:69 urpm.pm:827
+#: po/placeholder.h:68 urpm.pm:833
 #, c-format
 msgid "read depslist file [%s]"
 msgstr "®äc tËp danh s¸ch c¸c phô thuéc [%s]"
 
-#: po/placeholder.h:70
-#, c-format
-msgid "trying to select inexistant medium \"%s\""
-msgstr "cè g¾ng chän ph­¬ng tiÖn kh«ng tån t¹i \"%s\""
+#: po/placeholder.h:69 urpm.pm:103
+msgid "curl failed\n"
+msgstr ""
+
+#: po/placeholder.h:70 urpm.pm:281 urpm.pm:284
+#, fuzzy, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "kh«ng thÓ t¹o ph­¬ng tiÖn \"%s\"\n"
 
-#: po/placeholder.h:71 urpm.pm:1812
+#: po/placeholder.h:71 urpm.pm:1668
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "®Çu vµo bÊt th­êng: [%s]"
 
-#: po/placeholder.h:72 urpm.pm:145
+#: po/placeholder.h:72 urpm.pm:1502 urpm.pm:1528
 #, c-format
-msgid "medium \"%s\" try to use an already used hdlist, medium ignored"
-msgstr ""
-"ph­¬ng tiÖn \"%s\" cè sö dông hdlist ®ang ®­îc dïng, ph­¬ng tiÖn bÞ bá qua"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "cã nhiÒu gãi víi cïng tªn tËp tin rpm \"%s\""
 
-#: po/placeholder.h:73 urpm.pm:1943
+#: po/placeholder.h:73 urpm.pm:163
 #, c-format
-msgid ""
-"removing %s to upgrade ...\n"
-" to %s since it will not be updated otherwise"
+msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr ""
-"®ang gì bá %s ®Ó n©ng cÊp ...\n"
-" tíi %s v× nã sÏ kh«ng ®­îc cËp nhËt kiÓu kh¸c"
+"ph­¬ng tiÖn \"%s\" cè sö dông mét danh s¸ch ®ang ®­îc dïng, ph­¬ng tiÖn bÞ "
+"bá qua"
 
-#: po/placeholder.h:77 urpm.pm:865
+#: po/placeholder.h:74 urpm.pm:871
 #, c-format
 msgid "unable to write provides file [%s]"
 msgstr "kh«ng thÓ ghi tËp tin cung cÊp [%s]"
 
-#: po/placeholder.h:78 urpm.pm:191
+#: po/placeholder.h:75 urpm.pm:206
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "kh«ng thÓ truy cËp tËp hdlist cña \"%s\", ph­¬ng tiÖn bÞ bá qua"
 
-#: po/placeholder.h:79 urpm.pm:1005
-msgid "unable to register rpm file"
-msgstr "kh«ng thÓ ®¨ng ký tËp tin rpm"
-
-#: po/placeholder.h:80 urpm.pm:1362
+#: po/placeholder.h:76 urpm.pm:1215
+#, fuzzy
 msgid "unable to find all synthesis file, using parsehdlist server"
 msgstr "kh«ng thÓ t×m tËp tin tæng hîp, dïng parsehdlist server"
 
-#: po/placeholder.h:81 urpm.pm:241
+#: po/placeholder.h:77 urpm.pm:1011
+msgid "unable to register rpm file"
+msgstr "kh«ng thÓ ®¨ng ký tËp tin rpm"
+
+#: po/placeholder.h:78 urpm.pm:256
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "kh«ng thÓ xem xÐt tËp danh s¸ch cho \"%s\", ph­¬ng tiÖn bÞ bá qua"
 
-#: po/placeholder.h:82 urpm.pm:233
+#: po/placeholder.h:79 urpm.pm:272
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
+msgstr ""
+
+#: po/placeholder.h:80 urpm.pm:248
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "tËp danh s¸ch kh«ng râ rµng cho \"%s\", ph­¬ng tiÖn bÞ bá qua"
 
-#: po/placeholder.h:83
+#: po/placeholder.h:81
 #, c-format
 msgid "copy of [%s] failed"
 msgstr "copy cña [%s] háng"
 
-#: po/placeholder.h:84 urpm.pm:907 urpm.pm:1338 urpm.pm:1616 urpm.pm:1623
+#: po/placeholder.h:82
+#, c-format
+msgid "trying to remove inexistent medium \"%s\""
+msgstr "cè g¾ng gì bá ph­¬ng tiÖn kh«ng tån t¹i \"%s\""
+
+#: po/placeholder.h:83 urpm.pm:913 urpm.pm:1191 urpm.pm:1473 urpm.pm:1480
 #, c-format
 msgid "unable to parse correctly [%s]"
 msgstr "kh«ng thÓ ph©n t¸ch chÝnh x¸c [%s]"
 
-#: po/placeholder.h:85 urpm.pm:824
+#: po/placeholder.h:84 urpm.pm:1192
+#, fuzzy, c-format
+msgid "read synthesis file [%s]"
+msgstr "®äc tËp danh s¸ch c¸c phô thuéc [%s]"
+
+#: po/placeholder.h:85 urpm.pm:830
 #, c-format
 msgid "unable to read depslist file [%s]"
 msgstr "kh«ng thÓ ®äc tËp danh s¸ch c¸c phô thuéc [%s]"
 
-#: po/placeholder.h:86
-msgid "removable medium not selected"
-msgstr "ph­¬ng tiÖn th¸o l¾p kh«ng ®­îc chän"
-
-#: po/placeholder.h:87 urpm.pm:851
+#: po/placeholder.h:86 urpm.pm:857
 #, c-format
 msgid "read compss file [%s]"
 msgstr "®äc tËp tin nÐn [%s]"
 
-#: po/placeholder.h:88 urpm.pm:124 urpm.pm:136
+#: po/placeholder.h:87 urpm.pm:139 urpm.pm:151
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "lçi có ph¸p trong tËp cÊu h×nh t¹i dßng %s"
 
-#: po/placeholder.h:89
+#: po/placeholder.h:88
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "®ang t¹o hdlist [%s]"
 
-#: po/placeholder.h:90 urpm.pm:1746
+#: po/placeholder.h:89 urpm.pm:1603
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "kh«ng thÓ ®äc tËp tin rpm [%s] tõ ph­¬ng tiÖn \"%s\""
 
-#: po/placeholder.h:91 urpm.pm:1009
+#: po/placeholder.h:90 urpm.pm:1015
 msgid "error registering local packages"
 msgstr "lçi ®¨ng ký c¸c gãi tin côc bé"
 
-#: po/placeholder.h:92 urpm.pm:1762
+#: po/placeholder.h:91 urpm.pm:273
+#, c-format
+msgid "taking removable device as \"%s\""
+msgstr ""
+
+#: po/placeholder.h:92 urpm.pm:1619
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
@@ -462,215 +474,274 @@ msgstr ""
 msgid "unable to build hdlist: %s"
 msgstr "kh«ng thÓ t¹o hdlist: %s"
 
-#: po/placeholder.h:94 urpm.pm:1000
+#: po/placeholder.h:94 urpm.pm:1593 urpm.pm:1596 urpm.pm:1615
+#, c-format
+msgid "medium \"%s\" is not selected"
+msgstr "ph­¬ng tiÖn \"%s\" kh«ng ®­îc chän"
+
+#: po/placeholder.h:95 urpm.pm:1006
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "tªn tËp tin rpm [%s] kh«ng hîp lÖ"
 
-#: po/placeholder.h:95 urpm.pm:1736 urpm.pm:1739 urpm.pm:1758
+#: po/placeholder.h:96 urpm.pm:1175
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "ph­¬ng tiÖn \"%s\" kh«ng ®­îc chän"
+msgid "unknown data associated with %s"
+msgstr "d÷ liÖu kh«ng x¸c ®Þnh liªn quan víi %s"
 
-#: po/placeholder.h:96 urpm.pm:207
+#: po/placeholder.h:97 urpm.pm:222
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "®ang cè bá qua ph­¬ng tiÖn ®ang tån t¹i \"%s\", tr¸nh"
 
-#: po/placeholder.h:97 urpm.pm:863
+#: po/placeholder.h:98 urpm.pm:869
 #, c-format
 msgid "write depslist file [%s]"
 msgstr "ghi tËp danh s¸ch c¸c phô thuéc [%s]"
 
-#: po/placeholder.h:98 urpm.pm:1322
-#, c-format
-msgid "unknown data associated with %s"
-msgstr "d÷ liÖu kh«ng x¸c ®Þnh liªn quan víi %s"
-
-#: po/placeholder.h:99
-#, c-format
-msgid "source of [%s] not found as [%s]"
-msgstr "nguån cña [%s] kh«ng t×m thÊy v× [%s]"
-
-#: po/placeholder.h:100 urpm.pm:193
+#: po/placeholder.h:99 urpm.pm:208
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "kh«ng thÓ truy cËp tËp danh s¸ch cña \"%s\", ph­¬ng tiÖn bÞ bá qua"
 
-#: po/placeholder.h:101 urpm.pm:2024
+#: po/placeholder.h:100 urpm.pm:1879
 #, c-format
 msgid "avoid selecting %s as not enough files will be updated"
 msgstr "tr¸nh chän %s v× sÏ kh«ng ®ñ c¸c tËp tin ®­îc cËp nhËt"
 
-#: po/placeholder.h:102
-#, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
-msgstr "wget cña [%s] háng (cã lÏ do thiÕu wget ?)"
-
-#: po/placeholder.h:103 urpm.pm:1001
+#: po/placeholder.h:101 urpm.pm:1007
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "kh«ng thÓ truy cËp tËp tin rpm [%s]"
 
-#: po/placeholder.h:104 urpm.pm:860
+#: po/placeholder.h:102 urpm.pm:866
 #, c-format
 msgid "unable to write depslist file [%s]"
 msgstr "kh«ng thÓ ghi tËp danh s¸ch c¸c phô thuéc [%s]"
 
-#: po/placeholder.h:105 urpm.pm:327 urpm.pm:1773
+#: po/placeholder.h:103
+#, fuzzy, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not upgrade correctly!"
+msgstr ""
+"®ang gì bá %s ®Ó cËp nhËt ...\n"
+" tíi %s do nã sÏ kh«ng ®­îc n©ng cÊp chÝnh x¸c!"
+
+#: po/placeholder.h:107 urpm.pm:342 urpm.pm:1630
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "kh«ng thÓ truy cËp ph­¬ng tiÖn \"%s\""
 
-#: po/placeholder.h:106 urpm.pm:988
+#: po/placeholder.h:108 urpm.pm:994
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "c¸c môc nhËp %s ®­îc ®Æt l¹i trong danh s¸ch c¸c phô thuéc"
 
-#: po/placeholder.h:107 urpm.pm:914 urpm.pm:1629 urpm.pm:1680
+#: po/placeholder.h:109
 #, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
-msgstr "kh«ng thÓ ph©n t¸ch ®óng [%s] trªn gi¸ trÞ \"%s\""
+msgid "trying to select inexistent medium \"%s\""
+msgstr "cè g¾ng chän ph­¬ng tiÖn kh«ng tån t¹i \"%s\""
+
+#: po/placeholder.h:110 urpm.pm:97
+#, fuzzy
+msgid "wget failed\n"
+msgstr "wget cña [%s] háng"
 
-#: po/placeholder.h:108
+#: po/placeholder.h:111 urpm.pm:920 urpm.pm:1486 urpm.pm:1537
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "kh«ng t×m thÊy c¸c tËp tin rpm tõ [%s]"
+msgid "unable to parse correctly [%s] on value \"%s\""
+msgstr "kh«ng thÓ ph©n t¸ch ®óng [%s] trªn gi¸ trÞ \"%s\""
 
-#: po/placeholder.h:109 urpm.pm:1104
+#: po/placeholder.h:112 urpm.pm:1110
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "C¸c gãi tin sau ®©y chøa %s: %s"
 
-#: po/placeholder.h:110 urpm.pm:1645 urpm.pm:1671
+#: po/placeholder.h:113
 #, c-format
-msgid "there are multiples packages with the same rpm filename \"%s\""
-msgstr "cã nhiÒu gãi víi cïng tªn tËp tin rpm \"%s\""
+msgid "no rpm files found from [%s]"
+msgstr "kh«ng t×m thÊy c¸c tËp tin rpm tõ [%s]"
 
-#: po/placeholder.h:111 urpm.pm:1920
+#: po/placeholder.h:114 urpm.pm:1772
 #, c-format
 msgid "selecting %s using obsoletes"
 msgstr "chän %s sö dông c¸c c¸i ®· lçi thêi"
 
-#: po/placeholder.h:112 urpm.pm:2031
+#: po/placeholder.h:115 urpm.pm:1888
 #, c-format
 msgid "selecting %s by selection on files"
 msgstr "chän %s b»ng viÖc lùa chän trªn c¸c tËp tin"
 
-#: po/placeholder.h:113 urpm.pm:180
+#: po/placeholder.h:116 urpm.pm:100
+msgid "curl is missing\n"
+msgstr ""
+
+#: po/placeholder.h:117 urpm.pm:95
+msgid "wget is missing\n"
+msgstr ""
+
+#: po/placeholder.h:118 urpm.pm:195
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "kh«ng thÓ x¸c ®Þnh ph­¬ng tiÖn cña tËp hdlist [%s]"
 
-#: po/placeholder.h:114 urpmi:308 urpmi:315 urpmi:328 urpmi:339 urpmi:352
+#: po/placeholder.h:120
+#, fuzzy
+msgid "  --help         - print this help message.\n"
+msgstr "  --all           - in toµn bé tag."
+
+#: po/placeholder.h:121 urpmi:361
+msgid "everything already installed"
+msgstr "Mäi thø ®· ®­îc cµi ®Æt"
+
+#: po/placeholder.h:122 urpmi:98
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: tïy chän kh«ng x¸c ®Þnh \"-%s\", xem c¸ch dïng b»ng --help\n"
+
+#: po/placeholder.h:123 urpmi:194
+msgid "One of the following packages is needed:"
+msgstr "CÇn mét gãi trong c¸c gãi sau ®©y:"
+
+#: po/placeholder.h:124 po/placeholder.h:222
+msgid "  --update       - use only update media.\n"
+msgstr ""
+
+#: po/placeholder.h:125 urpmi:299
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
+msgstr ""
+
+#: po/placeholder.h:129
+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
 msgid "Installation failed"
 msgstr "Cµi ®Æt kh«ng ®­îc"
 
-#: po/placeholder.h:115 urpmi:279
-msgid "Press enter when it's done..."
-msgstr "NhÊn phÝm Enter khi hoµn thµnh..."
+#: po/placeholder.h:132 po/placeholder.h:234
+msgid ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
+msgstr ""
 
-#: po/placeholder.h:117 urpmi:201
-msgid "Sorry, bad choice, try again\n"
-msgstr "Xin lçi, lùa chän tåi, h·y thö l¹i\n"
+#: po/placeholder.h:134
+#, fuzzy
+msgid "  --X            - use X interface.\n"
+msgstr "  --all           - in toµn bé tag."
 
-#: po/placeholder.h:120
+#: po/placeholder.h:135 urpmi:247
+#, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
+msgstr "§Ó tho¶ m·n c¸c phô thuéc, c¸c gãi sau ®©y sÏ ®­îc cµi ®Æt (%d MB)"
+
+#: po/placeholder.h:136 urpmi:320 urpmi:344
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Thö cµi ®Æt mµ kh«ng cÇn kiÓm tra c¸c phô thuéc? (Cã/Kh«ng)"
+
+#: po/placeholder.h:137
+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
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr ""
+
+#: po/placeholder.h:142 po/placeholder.h:241
+msgid "  -v             - verbose mode.\n"
+msgstr ""
+
+#: po/placeholder.h:143
+#, fuzzy
+msgid "  -q             - quiet mode.\n"
+msgstr "  --all           - in toµn bé tag."
+
+#: po/placeholder.h:144 urpmi:202
 #, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "B¹n lùa chän g×? (1-%d) "
+
+#: po/placeholder.h:145
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:146
+#, fuzzy, c-format
 msgid ""
 "urpmi version %s\n"
 "Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "usage:\n"
-"  --help           - print this help message.\n"
-"  --update         - use only update media.\n"
-"  --auto           - automatically select a good package in choices.\n"
-"  --auto-select    - automatically select packages for upgrading the "
-"system.\n"
-"  --force          - force invocation even if some package do not exist.\n"
-"  --X              - use X interface.\n"
-"  --best-output    - choose best interface according to the environment:\n"
-"                     X or text mode.\n"
-"  -a               - select all matches on command line.\n"
-"  -m               - choose minimum closure of requires (default).\n"
-"  -M               - choose maximun closure of requires.\n"
-"  -c               - choose complete method for resolving requires closure.\n"
-"  -p               - allow search in provides to find package.\n"
-"  -q               - quiet mode.\n"
-"  -v               - verbose mode.\n"
-"  names or rpm files (only for root) given on command line are installed.\n"
 msgstr ""
-"Phiªn b¶n urpmi %s\n"
-"B¶n quyÒn (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"§©y lµ phÇn mÒm miÔm phÝ cã thÓ ph©n phèi l¹i theo ®iÒu kho¶n cña GNU GPL.\n"
-"C¸ch dïng:\n"
-"  --help           - in néi dung trî gióp nµy.\n"
-"  --update         - chØ dïng ph­¬ng tiÖn cËp nhËt nµy.\n"
-"  --auto           - tù ®éng chän mét gãi tin tèt trong c¸c lùa chän.\n"
-"  --auto-select    - tù ®éng chän c¸c gãi ®Ó n©ng cÊp hÖ thèng.\n"
-"  --force          - b¾t buéc cÇu viÖn ngay c¶ khi cã gãi nµo ®ã kh«ng tån "
-"t¹i.\n"
-"  --X              - sö dông giao diÖn X .\n"
-"  --best-output    - chän giao diÖn tèt nhÊt theo m«i tr­êng:\n"
-"                     X hoÆc chÕ ®é v¨n b¶n.\n"
-"  -a               - chän tÊt c¶ c¸c tháa m·n trong dßng lÖnh.\n"
-"  -m               - chän sù kÕt thóc tèi thiÓu cña c¸c yªu cÇu (mÆc ®Þnh).\n"
-"  -M               - chän sù kÕt thóc tèi ®a cña c¸c yªu cÇu.\n"
-"  -c               - chän ph­¬ng ph¸p toµn diÖn gi¶i quyÕt c¸c yªu cÇu kÕt "
-"thóc.\n"
-"  -p               - cho phÐp t×m kiÕm trong c¸c cung cÊp ®Ó t×m gãi tin.\n"
-"  -q               - chÕ ®é yªn lÆng.\n"
-"  -v               - chÕ ®é dµi dßng.\n"
-"  c¸c tªn hoÆc c¸c tËp tin rpm (chØ dµnh cho root) cã trong dßng lÖnh ®­îc "
-"cµi ®Æt.\n"
-
-#: po/placeholder.h:142 urpmi:362
-msgid "everything already installed"
-msgstr "Mäi thø ®· ®­îc cµi ®Æt"
+"§©y lµ phÇn mÒm miÔn phÝ vµ cã thÓ ph©n phèi l¹i theo c¸c ®iÒu kho¶n cña GNU "
+"GPL."
 
-#: po/placeholder.h:143 urpmi:247
-#, c-format
+#: po/placeholder.h:152 urpmi:328 urpmi:352
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Thö cè g¾ng cµi ®Æt (--Ðp buéc)? (Cã/Kh«ng)"
+
+#: po/placeholder.h:154
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
-msgstr "§Ó tho¶ m·n c¸c phô thuéc, c¸c gãi sau ®©y sÏ ®­îc cµi ®Æt (%d MB)"
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
 
-#: po/placeholder.h:144 urpmi:296
-#, c-format
-msgid "installing %s\n"
-msgstr "®ang cµi ®Æt %s\n"
+#: po/placeholder.h:155 urpmi:205
+msgid "Sorry, bad choice, try again\n"
+msgstr "Xin lçi, lùa chän tåi, h·y thö l¹i\n"
 
-#: po/placeholder.h:145 urpmi:198
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "B¹n lùa chän g×? (1-%d) "
+#: po/placeholder.h:156
+msgid ""
+"  names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
 
-#: po/placeholder.h:146 urpmi:321 urpmi:345
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Thö cµi ®Æt mµ kh«ng cÇn kiÓm tra c¸c phô thuéc? (Cã/Kh«ng)"
+#: po/placeholder.h:158
+msgid "  -a             - select all matches on command line.\n"
+msgstr ""
 
-#: po/placeholder.h:147 urpmi:190
-msgid "One of the following packages is needed:"
-msgstr "CÇn mét gãi trong c¸c gãi sau ®©y:"
+#: po/placeholder.h:159
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:160 urpmi:294
+#, c-format
+msgid "installing %s\n"
+msgstr "®ang cµi ®Æt %s\n"
 
-#: po/placeholder.h:148 urpmi:149
+#: po/placeholder.h:161 urpmi:152
 msgid "Only superuser is allowed to install local packages"
 msgstr "ChØ cho phÐp ng­êi dïng cao cÊp ®­îc cµi ®Æt c¸c gãi côc bé"
 
-#: po/placeholder.h:149 urpmi:278
+#: po/placeholder.h:162 urpmi:276
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "H·y n¹p ph­¬ng tiÖn cã tªn \"%s\" trªn thiÕt bÞ [%s]"
 
-#: po/placeholder.h:150 po/placeholder.h:205 urpmi:268 urpmq:153
+#: po/placeholder.h:164 po/placeholder.h:242 urpmi:266 urpmq:148
 msgid "unable to get source packages, aborting"
 msgstr "kh«ng thÓ lÊy c¸c gãi nguån, hñy bá"
 
-#: po/placeholder.h:151 urpmi:329 urpmi:353
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Thö cè g¾ng cµi ®Æt (--Ðp buéc)? (Cã/Kh«ng)"
+#: po/placeholder.h:165 urpmi:102
+#, fuzzy
+msgid "Only superuser is allowed to install packages"
+msgstr "ChØ cho phÐp ng­êi dïng cao cÊp ®­îc cµi ®Æt c¸c gãi côc bé"
+
+#: po/placeholder.h:166 urpmi:193
+#, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "CÇn mét gãi trong c¸c gãi %s sau ®©y ®Ó cµi ®Æt:"
 
-#: po/placeholder.h:155 urpmi.addmedia:46
+#: po/placeholder.h:167 urpmi:277
+msgid "Press Enter when it's done..."
+msgstr "NhÊn phÝm Enter khi hoµn thµnh..."
+
+#: po/placeholder.h:168 urpmi.addmedia:46
 #, c-format
 msgid ""
 "%s\n"
@@ -679,7 +750,7 @@ msgstr ""
 "%s\n"
 "`with' thiÕu cho ph­¬ng tiÖn ftp\n"
 
-#: po/placeholder.h:159
+#: po/placeholder.h:172
 msgid ""
 "usage: urpmi.addmedia [--update] <name> <url>\n"
 "where <url> is one of\n"
@@ -699,17 +770,17 @@ msgstr ""
 "       http://<m¸y chñ/<®­êng dÉn> with <tªn tÖp liªn quan cña hdlist>\n"
 "       removable_<thiÕt bÞ>://<®­êng dÉn>\n"
 
-#: po/placeholder.h:168 urpmi.addmedia:57
+#: po/placeholder.h:181 urpmi.addmedia:57
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "kh«ng thÓ t¹o ph­¬ng tiÖn \"%s\"\n"
 
-#: po/placeholder.h:169 urpmi.addmedia:58
+#: po/placeholder.h:182 urpmi.addmedia:58
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "kh«ng thÓ cËp nhËt ph­¬ng tiÖn \"%s\"\n"
 
-#: po/placeholder.h:170 urpmi.addmedia:42
+#: po/placeholder.h:183 urpmi.addmedia:42
 #, c-format
 msgid ""
 "%s\n"
@@ -718,7 +789,7 @@ msgstr ""
 "%s\n"
 "thiÕt bÞ `%s' kh«ng tån t¹i\n"
 
-#: po/placeholder.h:174 urpmi.addmedia:44
+#: po/placeholder.h:187 urpmi.addmedia:44
 #, c-format
 msgid ""
 "%s\n"
@@ -727,7 +798,7 @@ msgstr ""
 "%s\n"
 "thiÕu <®­êng dÉn liªn quan cña hdlist> \n"
 
-#: po/placeholder.h:178
+#: po/placeholder.h:191
 #, c-format
 msgid ""
 "usage: urpmi.update [-a] <name> ...\n"
@@ -746,11 +817,11 @@ msgstr ""
 "\n"
 "c¸c tïy chän kh«ng x¸c ®Þnh '%s'\n"
 
-#: po/placeholder.h:187 urpmi.update:51
+#: po/placeholder.h:200 urpmi.update:51
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "Kh«ng cã g× ®Ó cËp nhËt (dïng urpmi.addmedia ®Ó thªm ph­¬ng tiÖn)\n"
 
-#: po/placeholder.h:188 urpmi.update:53
+#: po/placeholder.h:201 urpmi.update:53
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -759,11 +830,11 @@ msgstr ""
 "môc nhËp ®Ó cËp nhËt ®ang thiÕu\n"
 "(mét môc cña %s)\n"
 
-#: po/placeholder.h:192 urpmi.removemedia:44
+#: po/placeholder.h:205 urpmi.removemedia:44
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr "Kh«ng cã g× ®Ó gì bá (dïng urpmi.addmedia ®Ó thªm ph­¬ng tiÖn)\n"
 
-#: po/placeholder.h:193 urpmi.removemedia:46
+#: po/placeholder.h:206 urpmi.removemedia:46
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -772,7 +843,7 @@ msgstr ""
 "môc nhËp ®Ó gì bá ®ang thiÕu\n"
 "(mét môc cho %s)\n"
 
-#: po/placeholder.h:197
+#: po/placeholder.h:210
 #, c-format
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
@@ -787,130 +858,115 @@ msgstr ""
 "\n"
 "c¸c tïy chän kh«ng x¸c ®Þnh '%s'\n"
 
-#: po/placeholder.h:204 urpmq:85
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: kh«ng thÓ ®äc tÖp rpm \"%s\"\n"
-
-#: po/placeholder.h:206 urpmq:82
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: tïy chän kh«ng x¸c ®Þnh \"-%s\", xem c¸ch dïng b»ng --help\n"
+#: po/placeholder.h:217
+#, fuzzy
+msgid "  -h             - print this help message.\n"
+msgstr "  --all           - in toµn bé tag."
 
-#: po/placeholder.h:207 urpmq:131
+#: po/placeholder.h:218 urpmq:130
 msgid ""
 "some package have to be removed for being upgraded, this is not supported "
 "yet\n"
 msgstr ""
 "gãi nµo ®ã ph¶i d­îc gì bá ®Ó tiÕn hµnh n©ng cÊp, nã vÉn ch­a ®­îc hç trî\n"
 
-#: po/placeholder.h:208
+#: po/placeholder.h:219
+#, fuzzy
+msgid "  -g             - print groups too with name.\n"
+msgstr "  --group         - in nhãm tag: nhãm."
+
+#: po/placeholder.h:220 urpmq:84
 #, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: kh«ng thÓ ®äc tÖp rpm \"%s\"\n"
+
+#: po/placeholder.h:221
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr ""
+
+#: po/placeholder.h:223
+#, fuzzy
+msgid "  -r             - print version and release too with name.\n"
+msgstr "                    dßng lÖnh nh­ng kh«ng cã tªn gãi tin)."
+
+#: po/placeholder.h:224
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+
+#: po/placeholder.h:225
+#, fuzzy, c-format
 msgid ""
 "urpmq version %s\n"
 "Copyright (C) 2000, 2001 MandrakeSoft.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "usage:\n"
-"  -h             - print this help message.\n"
-"  -v             - verbose mode.\n"
-"  -d             - extend query to package dependencies.\n"
-"  -u             - remove package if a better version is already installed.\n"
-"  -m             - extend query to package dependencies, remove already\n"
-"                   installed package that provide what is necessary, add\n"
-"                   packages that may be block the upgrade.\n"
-"  -M             - extend query to package dependencies and remove already\n"
-"                   installed package only if they are newer or the same.\n"
-"  -c             - choose complete method for resolving requires closure.\n"
-"  -p             - allow search in provides to find package.\n"
-"  -g             - print groups too with name.\n"
-"  -r             - print version and release too with name.\n"
-"  --update       - use only update media.\n"
-"  --auto-select  - automatically select packages for upgrading the system.\n"
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+msgstr ""
+"§©y lµ phÇn mÒm miÔn phÝ vµ cã thÓ ph©n phèi l¹i theo c¸c ®iÒu kho¶n cña GNU "
+"GPL."
+
+#: po/placeholder.h:231
+#, fuzzy
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "                    dßng lÖnh nh­ng kh«ng cã tªn gãi tin)."
+
+#: po/placeholder.h:232
+msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
-"  --force        - force invocation even if some package do not exist.\n"
-"  names or rpm files given on command line are queried.\n"
-msgstr ""
-"phiªn b¶n version %s\n"
-"B¶n quyÒn (C) 2000, 2001 MandrakeSoft.\n"
-"§©y lµ phÇn mÒm tù do vµ cã thÓ ph©n phèi l¹i theo ®iÒu kho¶n cña GNU GPL.\n"
-"c¸ch dïng:\n"
-"  -h             - in th«ng ®iÖp trî gióp nµy.\n"
-"  -v             - chÕ ®é dµi dßng.\n"
-"  -d             - më réng truy vÊn cho c¸c phô thuéc gãi tin.\n"
-"  -u             - gì bá gãi tin nÕu ®· cµi ®Æt mét phiªn b¶n tèt h¬n.\n"
-"  -m             - më réng truy vÊn cho c¸c phô thuéc gãi tin, ®· gì bá\n"
-"                   gãi ®­îc cµi ®Æt mµ nã cho biÕt c¸i nµo lµ cÇn thiÕt, \n"
-"                   thªm c¸c gãi sÏ cã thÓ ng¨n c¶n viÖc n©ng cÊp.\n"
-"  -M             - më réng truy vÊn cho c¸c phô thuéc gãi tin vµ chØ gì bá\n"
-"                   gãi ®· cµi ®Æt chØ khi chóng míi h¬n hay nh­ nhau.\n"
-"  -c             - chän ph­¬ng ph¸p hoµn chØnh ®Ó gi¶i quyÕt c¸c ®ßi hái kÕt "
-"thóc.\n"
-"  -p             - cho phÐp t×m kiÕm trong c¸c cung cÊp ®Ó t×m gãi tin.\n"
-"  -g             - còng in nhãm víi tªn.\n"
-"  -r             - in phiªn b¶n vµ c¶ ph¸t hµnh víi tªn.\n"
-"  --update       - chØ dïng ph­¬ng tiÖn cËp nhËt.\n"
-"  --auto-select  - tù ®éng chän c¸c gãi ®Ó n©ng cÊp hÖ thèng.\n"
-"  --headers      - trÝch headers ra cho gãi tin ®­îc liÖt kª tõ urpmi db "
-"tíi\n"
-"                   stdout (chØ víi root).\n"
-"  --sources      - ®­a toµn bé c¸c gãi nguån tr­íc khi t¶i xuèng (chØ víi "
-"root).\n"
-"  --force        - Ðp buéc cÇu viÖn thËm chÝ nÕu gãi nµo ®ã kh«ng tån t¹i.\n"
-"  ®ßi hái c¸c tªn hay tËp tin rpm ®­îc ®­a vµo dßng lÖnh.\n"
-
-#: urpm.pm:257
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
 msgstr ""
 
-#: urpm.pm:258
-#, c-format
-msgid "taking removable device as \"%s\""
+#: po/placeholder.h:233
+msgid ""
+"  -c             - choose complete method for resolving requires closure.\n"
 msgstr ""
 
-#: urpm.pm:262
+#: po/placeholder.h:235 urpmq:81
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: tïy chän kh«ng x¸c ®Þnh \"-%s\", xem c¸ch dïng b»ng --help\n"
+
+#: po/placeholder.h:236
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
 
-#: urpm.pm:266 urpm.pm:269
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "kh«ng thÓ t¹o ph­¬ng tiÖn \"%s\"\n"
+#: po/placeholder.h:243
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
+msgstr ""
 
-#: urpm.pm:1339
-#, fuzzy, c-format
-msgid "read synthesis file [%s]"
-msgstr "®äc tËp danh s¸ch c¸c phô thuéc [%s]"
+#: po/placeholder.h:244
+msgid ""
+"  --force        - force invocation even if some packages do not\n"
+"exist.\n"
+msgstr ""
 
-#: urpmi:49
+#: urpm.pm:1796 urpm.pm:1805
 #, c-format
-msgid "urpmi version %s"
-msgstr "phiªn b¶n urpmi %s"
+msgid "removing %s to upgrade to %s ..."
+msgstr ""
 
-#: urpmi:98
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: tïy chän kh«ng x¸c ®Þnh \"-%s\", xem c¸ch dïng b»ng --help\n"
+#: urpm.pm:1797 urpm.pm:1806
+msgid ", $otherPackage, "
+msgstr ", $otherPackage, "
 
-#: urpmi:102
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr "ChØ cho phÐp ng­êi dïng cao cÊp ®­îc cµi ®Æt c¸c gãi côc bé"
+#: urpm.pm:1797 urpm.pm:1806
+msgid "));"
+msgstr "));"
 
-#: urpmi:189
-#, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "CÇn mét gãi trong c¸c gãi %s sau ®©y ®Ó cµi ®Æt:"
+#: urpm.pm:1802
+msgid "$p->{name}-$p->{version}-$p->{release}"
+msgstr "$p->{name}-$p->{version}-$p->{release}"
 
-#: urpmi:301
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
-msgstr ""
+#: urpm.pm:1812
+msgid "$prefix/$_"
+msgstr "$prefix/$_"
+
+#: urpmi:48
+#, c-format
+msgid "urpmi version %s"
+msgstr "phiªn b¶n urpmi %s"
 
 #: urpmi.addmedia:30
 msgid "usage: urpmi.addmedia [--update] <name> <url>"
@@ -942,8 +998,138 @@ msgstr ", $_);"
 msgid "urpmq version %s"
 msgstr "Phiªn b¶n urpmq %s"
 
-#~ msgid "));"
-#~ msgstr "));"
+#~ msgid "retrieving [%s]"
+#~ msgstr "®ang gäi [%s]"
+
+#~ msgid "wget of [%s] failed (maybe wget is missing?)"
+#~ msgstr "wget cña [%s] háng (cã lÏ do thiÕu wget ?)"
+
+#~ msgid "unable to copy source of [%s] from [%s]"
+#~ msgstr "kh«ng thÓ copy nguån cña [%s] tõ [%s]"
+
+#~ msgid "removable medium not selected"
+#~ msgstr "ph­¬ng tiÖn th¸o l¾p kh«ng ®­îc chän"
+
+#~ msgid "source of [%s] not found as [%s]"
+#~ msgstr "nguån cña [%s] kh«ng t×m thÊy v× [%s]"
+
+#~ msgid ""
+#~ "urpmi version %s\n"
+#~ "Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "usage:\n"
+#~ "  --help           - print this help message.\n"
+#~ "  --update         - use only update media.\n"
+#~ "  --auto           - automatically select a good package in choices.\n"
+#~ "  --auto-select    - automatically select packages for upgrading the "
+#~ "system.\n"
+#~ "  --force          - force invocation even if some packages do not "
+#~ "exist.\n"
+#~ "  --X              - use X interface.\n"
+#~ "  --best-output    - choose best interface according to the environment:\n"
+#~ "                     X or text mode.\n"
+#~ "  -a               - select all matches on command line.\n"
+#~ "  -m               - choose minimum closure of requires (default).\n"
+#~ "  -M               - choose maximum closure of requires.\n"
+#~ "  -c               - choose complete method for resolving requires "
+#~ "closure.\n"
+#~ "  -p               - allow search in provides to find package.\n"
+#~ "  -q               - quiet mode.\n"
+#~ "  -v               - verbose mode.\n"
+#~ "  names or rpm files (only for root) given on command line are "
+#~ "installed.\n"
+#~ msgstr ""
+#~ "Phiªn b¶n urpmi %s\n"
+#~ "B¶n quyÒn (C) 1999, 2000, 2001 MandrakeSoft.\n"
+#~ "§©y lµ phÇn mÒm miÔm phÝ cã thÓ ph©n phèi l¹i theo ®iÒu kho¶n cña GNU "
+#~ "GPL.\n"
+#~ "C¸ch dïng:\n"
+#~ "  --help           - in néi dung trî gióp nµy.\n"
+#~ "  --update         - chØ dïng ph­¬ng tiÖn cËp nhËt nµy.\n"
+#~ "  --auto           - tù ®éng chän mét gãi tin tèt trong c¸c lùa chän.\n"
+#~ "  --auto-select    - tù ®éng chän c¸c gãi ®Ó n©ng cÊp hÖ thèng.\n"
+#~ "  --force          - b¾t buéc cÇu viÖn ngay c¶ khi cã gãi nµo ®ã kh«ng "
+#~ "tån t¹i.\n"
+#~ "  --X              - sö dông giao diÖn X .\n"
+#~ "  --best-output    - chän giao diÖn tèt nhÊt theo m«i tr­êng:\n"
+#~ "                     X hoÆc chÕ ®é v¨n b¶n.\n"
+#~ "  -a               - chän tÊt c¶ c¸c tháa m·n trong dßng lÖnh.\n"
+#~ "  -m               - chän sù kÕt thóc tèi thiÓu cña c¸c yªu cÇu (mÆc "
+#~ "®Þnh).\n"
+#~ "  -M               - chän sù kÕt thóc tèi ®a cña c¸c yªu cÇu.\n"
+#~ "  -c               - chän ph­¬ng ph¸p toµn diÖn gi¶i quyÕt c¸c yªu cÇu "
+#~ "kÕt thóc.\n"
+#~ "  -p               - cho phÐp t×m kiÕm trong c¸c cung cÊp ®Ó t×m gãi "
+#~ "tin.\n"
+#~ "  -q               - chÕ ®é yªn lÆng.\n"
+#~ "  -v               - chÕ ®é dµi dßng.\n"
+#~ "  c¸c tªn hoÆc c¸c tËp tin rpm (chØ dµnh cho root) cã trong dßng lÖnh "
+#~ "®­îc cµi ®Æt.\n"
+
+#~ msgid ""
+#~ "urpmq version %s\n"
+#~ "Copyright (C) 2000, 2001 MandrakeSoft.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "usage:\n"
+#~ "  -h             - print this help message.\n"
+#~ "  -v             - verbose mode.\n"
+#~ "  -d             - extend query to package dependencies.\n"
+#~ "  -u             - remove package if a better version is already "
+#~ "installed.\n"
+#~ "  -m             - extend query to package dependencies, remove already\n"
+#~ "                   installed package that provide what is necessary, add\n"
+#~ "                   packages that may be block the upgrade.\n"
+#~ "  -M             - extend query to package dependencies and remove "
+#~ "already\n"
+#~ "                   installed package only if they are newer or the same.\n"
+#~ "  -c             - choose complete method for resolving requires "
+#~ "closure.\n"
+#~ "  -p             - allow search in provides to find package.\n"
+#~ "  -g             - print groups too with name.\n"
+#~ "  -r             - print version and release too with name.\n"
+#~ "  --update       - use only update media.\n"
+#~ "  --auto-select  - automatically select packages for upgrading the "
+#~ "system.\n"
+#~ "  --headers      - extract headers for package listed from urpmi db to\n"
+#~ "                   stdout (root only).\n"
+#~ "  --sources      - give all source packages before downloading (root "
+#~ "only).\n"
+#~ "  --force        - force invocation even if some packages do not exist.\n"
+#~ "  names or rpm files given on command line are queried.\n"
+#~ msgstr ""
+#~ "phiªn b¶n version %s\n"
+#~ "B¶n quyÒn (C) 2000, 2001 MandrakeSoft.\n"
+#~ "§©y lµ phÇn mÒm tù do vµ cã thÓ ph©n phèi l¹i theo ®iÒu kho¶n cña GNU "
+#~ "GPL.\n"
+#~ "c¸ch dïng:\n"
+#~ "  -h             - in th«ng ®iÖp trî gióp nµy.\n"
+#~ "  -v             - chÕ ®é dµi dßng.\n"
+#~ "  -d             - më réng truy vÊn cho c¸c phô thuéc gãi tin.\n"
+#~ "  -u             - gì bá gãi tin nÕu ®· cµi ®Æt mét phiªn b¶n tèt h¬n.\n"
+#~ "  -m             - më réng truy vÊn cho c¸c phô thuéc gãi tin, ®· gì bá\n"
+#~ "                   gãi ®­îc cµi ®Æt mµ nã cho biÕt c¸i nµo lµ cÇn "
+#~ "thiÕt, \n"
+#~ "                   thªm c¸c gãi sÏ cã thÓ ng¨n c¶n viÖc n©ng cÊp.\n"
+#~ "  -M             - më réng truy vÊn cho c¸c phô thuéc gãi tin vµ chØ gì "
+#~ "bá\n"
+#~ "                   gãi ®· cµi ®Æt chØ khi chóng míi h¬n hay nh­ nhau.\n"
+#~ "  -c             - chän ph­¬ng ph¸p hoµn chØnh ®Ó gi¶i quyÕt c¸c ®ßi hái "
+#~ "kÕt thóc.\n"
+#~ "  -p             - cho phÐp t×m kiÕm trong c¸c cung cÊp ®Ó t×m gãi tin.\n"
+#~ "  -g             - còng in nhãm víi tªn.\n"
+#~ "  -r             - in phiªn b¶n vµ c¶ ph¸t hµnh víi tªn.\n"
+#~ "  --update       - chØ dïng ph­¬ng tiÖn cËp nhËt.\n"
+#~ "  --auto-select  - tù ®éng chän c¸c gãi ®Ó n©ng cÊp hÖ thèng.\n"
+#~ "  --headers      - trÝch headers ra cho gãi tin ®­îc liÖt kª tõ urpmi db "
+#~ "tíi\n"
+#~ "                   stdout (chØ víi root).\n"
+#~ "  --sources      - ®­a toµn bé c¸c gãi nguån tr­íc khi t¶i xuèng (chØ víi "
+#~ "root).\n"
+#~ "  --force        - Ðp buéc cÇu viÖn thËm chÝ nÕu gãi nµo ®ã kh«ng tån "
+#~ "t¹i.\n"
+#~ "  ®ßi hái c¸c tªn hay tËp tin rpm ®­îc ®­a vµo dßng lÖnh.\n"
 
 #~ msgid "), $_);"
 #~ msgstr "), $_);"