summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPablo Saratxaga <pablo@mandriva.com>2001-11-27 18:59:33 +0000
committerPablo Saratxaga <pablo@mandriva.com>2001-11-27 18:59:33 +0000
commit8923ae296271934e0e9f486877efde3f6e090d24 (patch)
treebda65c104c7a99dcea81192f97c4ce46c957c753
parent41e32b3391326cf338195e5863121ff36fcd6a81 (diff)
downloadurpmi-8923ae296271934e0e9f486877efde3f6e090d24.tar
urpmi-8923ae296271934e0e9f486877efde3f6e090d24.tar.gz
urpmi-8923ae296271934e0e9f486877efde3f6e090d24.tar.bz2
urpmi-8923ae296271934e0e9f486877efde3f6e090d24.tar.xz
urpmi-8923ae296271934e0e9f486877efde3f6e090d24.zip
fixed some English typos; updated Hungarian file
-rwxr-xr-x_irpm2
-rw-r--r--po/af.po614
-rw-r--r--po/ar.po622
-rw-r--r--po/az.po862
-rw-r--r--po/bg.po682
-rw-r--r--po/bs.po720
-rw-r--r--po/ca.po719
-rwxr-xr-xpo/create_placeholder16
-rw-r--r--po/cs.po867
-rw-r--r--po/da.po865
-rw-r--r--po/de.po801
-rw-r--r--po/el.po887
-rw-r--r--po/eo.po868
-rw-r--r--po/es.po892
-rw-r--r--po/et.po702
-rw-r--r--po/eu.po747
-rw-r--r--po/fi.po715
-rw-r--r--po/fr.po703
-rw-r--r--po/ga.po619
-rw-r--r--po/gl.po614
-rw-r--r--po/hr.po865
-rw-r--r--po/hu.po894
-rw-r--r--po/id.po841
-rw-r--r--po/is.po612
-rw-r--r--po/it.po875
-rw-r--r--po/ja.po715
-rw-r--r--po/ka.po616
-rw-r--r--po/ko.po747
-rw-r--r--po/lt.po692
-rw-r--r--po/lv.po725
-rw-r--r--po/nl.po614
-rw-r--r--po/no.po856
-rw-r--r--po/pl.po614
-rw-r--r--po/placeholder.h164
-rw-r--r--po/pt.po698
-rw-r--r--po/pt_BR.po708
-rw-r--r--po/ro.po612
-rw-r--r--po/ru.po721
-rw-r--r--po/sk.po745
-rw-r--r--po/sp.po858
-rw-r--r--po/sr.po861
-rw-r--r--po/sv.po858
-rw-r--r--po/tg.po728
-rw-r--r--po/th.po841
-rw-r--r--po/tr.po863
-rw-r--r--po/uk.po614
-rw-r--r--po/urpmi.pot583
-rw-r--r--po/uz.po612
-rw-r--r--po/vi.po870
-rw-r--r--po/wa.po779
-rw-r--r--po/zh_CN.GB2312.po725
-rw-r--r--po/zh_TW.Big5.po842
-rw-r--r--urpm.pm14
-rw-r--r--urpme2
-rwxr-xr-xurpmi34
-rwxr-xr-xurpmq3
56 files changed, 21890 insertions, 15028 deletions
diff --git a/_irpm b/_irpm
index 974f5c2f..ac4c2b35 100755
--- a/_irpm
+++ b/_irpm
@@ -28,7 +28,7 @@ $SIG{ALRM} = sub { $pid and kill 9, $pid; not_found(); };
alarm $timeout;
if (!$automatic) {
- $interactive_mesg = i18n("Automatic installation of packages...\nYou requested installation of package $rpm\n") . i18n("Is it ok?");
+ $interactive_mesg = i18n("Automatic installation of packages...\nYou requested installation of package $rpm\n") . i18n("Is it OK?");
if ($X) {
my $ok = i18n("Ok");
my $cancel = i18n("Cancel");
diff --git a/po/af.po b/po/af.po
index 24da0285..52971f21 100644
--- a/po/af.po
+++ b/po/af.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: Fri May 19 2000 13:02:12+0200\n"
"Last-Translator: Schalk W. Cronj� <schalkc@ntaba.co.za>\n"
"Language-Team: Afrikaans <mandrake@af.org.za>\n"
@@ -24,27 +24,27 @@ msgid ""
"You requested installation of package $rpm\n"
msgstr ""
-#: _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 "Is dit aanvaarbaar?"
-#: _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 "Kanselleer"
-#: _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 "Nn"
-#: _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 "JjYy"
-#: _irpm:42 po/placeholder.h:118 urpmi:258
+#: _irpm:42 po/placeholder.h:157 urpmi:258
msgid " (Y/n) "
msgstr " (J/n) "
@@ -147,120 +147,120 @@ msgstr ""
msgid "urpmi is not installed"
msgstr ""
-#: po/placeholder.h:29 urpm.pm:283
+#: po/placeholder.h:29
+#, c-format
+msgid "reading synthesis file [%s]"
+msgstr ""
+
+#: po/placeholder.h:30 urpm.pm:298
#, c-format
msgid "unable to write config file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:31
+#: po/placeholder.h:32
#, c-format
msgid "nothing to write in list file for \"%s\""
msgstr ""
-#: 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 ""
-#: po/placeholder.h:33
+#: po/placeholder.h:34
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr ""
-#: po/placeholder.h:34
+#: po/placeholder.h:35
#, c-format
msgid "nothing written in list file for \"%s\""
msgstr ""
-#: po/placeholder.h:35 urpm.pm:1951
-#, c-format
-msgid ""
-"removing %s to upgrade ...\n"
-" to %s since it will not upgrade correctly!"
-msgstr ""
-
-#: po/placeholder.h:39 urpm.pm:839
+#: po/placeholder.h:36 urpm.pm:845
#, c-format
msgid "read provides file [%s]"
msgstr ""
-#: po/placeholder.h:40
+#: po/placeholder.h:37 urpm.pm:1549
#, c-format
-msgid "trying to remove inexistant medium \"%s\""
+msgid "package %s is not found."
msgstr ""
-#: po/placeholder.h:41 urpm.pm:1692
+#: po/placeholder.h:38 urpm.pm:876
#, c-format
-msgid "package %s is not found."
+msgid "unable to write compss file [%s]"
msgstr ""
-#: po/placeholder.h:42
+#: po/placeholder.h:39 urpm.pm:819
#, c-format
-msgid "unable to copy source of [%s] from [%s]"
+msgid "unmounting %s"
msgstr ""
-#: po/placeholder.h:43 urpm.pm:870
+#: po/placeholder.h:40
#, c-format
-msgid "unable to write compss file [%s]"
+msgid "removing %d obsolete headers in cache"
msgstr ""
-#: po/placeholder.h:44 urpm.pm:813
+#: po/placeholder.h:41 urpm.pm:925 urpm.pm:1491
#, c-format
-msgid "unmounting %s"
+msgid "no hdlist file found for medium \"%s\""
msgstr ""
-#: po/placeholder.h:45
+#: po/placeholder.h:42 urpm.pm:160
#, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
msgstr ""
-#: po/placeholder.h:46 urpm.pm:919 urpm.pm:1634
+#: po/placeholder.h:43 urpm.pm:184
#, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
msgstr ""
-#: po/placeholder.h:47 urpm.pm:176
+#: po/placeholder.h:44 urpm.pm:191
#, c-format
msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
msgstr ""
-#: po/placeholder.h:48
+#: po/placeholder.h:45
msgid "keeping only files referenced in provides"
msgstr ""
-#: po/placeholder.h:49
+#: po/placeholder.h:46
#, c-format
msgid "unable to build synthesis file for medium \"%s\""
msgstr ""
-#: po/placeholder.h:50
+#: po/placeholder.h:47
#, c-format
msgid "found %d headers in cache"
msgstr ""
-#: po/placeholder.h:51 urpm.pm:836
+#: po/placeholder.h:48 urpm.pm:842
#, c-format
msgid "unable to read provides file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:53 urpm.pm:311
+#: po/placeholder.h:50
#, c-format
-msgid "medium \"%s\" already exists"
+msgid ""
+"removing %s to upgrade to %s ...\n"
+" since it will not be updated otherwise"
msgstr ""
-#: po/placeholder.h:54 urpm.pm:295
+#: po/placeholder.h:54 urpm.pm:326
#, c-format
-msgid "write config file [%s]"
+msgid "medium \"%s\" already exists"
msgstr ""
#: po/placeholder.h:55
@@ -268,324 +268,347 @@ msgstr ""
msgid "unable to write list file of \"%s\""
msgstr ""
-#: po/placeholder.h:56 urpm.pm:1817
-#, c-format
-msgid "retrieving [%s]"
-msgstr ""
-
-#: po/placeholder.h:57 urpm.pm:1819
+#: po/placeholder.h:56 urpm.pm:310
#, c-format
-msgid "wget of [%s] failed"
+msgid "write config file [%s]"
msgstr ""
-#: po/placeholder.h:58 urpm.pm:1101
+#: po/placeholder.h:57 urpm.pm:1107
#, fuzzy, c-format
msgid "no package named %s"
msgstr "geen pakket het die naam %s nie\n"
-#: po/placeholder.h:59 urpm.pm:848
+#: po/placeholder.h:58 urpm.pm:854
#, c-format
msgid "unable to read compss file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:61
+#: po/placeholder.h:60
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr ""
-#: po/placeholder.h:62
+#: po/placeholder.h:61
msgid "computing dependencies"
msgstr ""
-#: po/placeholder.h:63 urpm.pm:868
+#: po/placeholder.h:62
+#, c-format
+msgid "retrieve of [%s] failed"
+msgstr ""
+
+#: po/placeholder.h:63 urpm.pm:874
#, c-format
msgid "write provides file [%s]"
msgstr ""
-#: po/placeholder.h:64 urpm.pm:803
+#: po/placeholder.h:64 urpm.pm:809
#, fuzzy, c-format
msgid "mounting %s"
msgstr "%s word installeer\n"
-#: 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 "
"medium"
msgstr ""
-#: po/placeholder.h:66 urpm.pm:148
-#, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
-msgstr ""
-
-#: po/placeholder.h:67
+#: po/placeholder.h:66
#, c-format
msgid "reading hdlist file [%s]"
msgstr ""
-#: po/placeholder.h:68 urpm.pm:873
+#: po/placeholder.h:67 urpm.pm:879
#, c-format
msgid "write compss file [%s]"
msgstr ""
-#: po/placeholder.h:69 urpm.pm:827
+#: po/placeholder.h:68 urpm.pm:833
#, c-format
msgid "read depslist file [%s]"
msgstr ""
-#: po/placeholder.h:70
+#: po/placeholder.h:69 urpm.pm:103
+msgid "curl failed\n"
+msgstr ""
+
+#: po/placeholder.h:70 urpm.pm:281 urpm.pm:284
#, c-format
-msgid "trying to select inexistant medium \"%s\""
+msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr ""
-#: po/placeholder.h:71 urpm.pm:1812
+#: po/placeholder.h:71 urpm.pm:1668
#, c-format
msgid "malformed input: [%s]"
msgstr ""
-#: 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"
+msgid "there are multiple packages with the same rpm filename \"%s\""
msgstr ""
-#: 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 ""
-#: po/placeholder.h:77 urpm.pm:865
+#: po/placeholder.h:74 urpm.pm:871
#, c-format
msgid "unable to write provides file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:79 urpm.pm:1005
-msgid "unable to register rpm file"
+#: po/placeholder.h:76 urpm.pm:1215
+msgid "unable to find all synthesis file, using parsehdlist server"
msgstr ""
-#: po/placeholder.h:80 urpm.pm:1362
-msgid "unable to find all synthesis file, using parsehdlist server"
+#: po/placeholder.h:77 urpm.pm:1011
+msgid "unable to register rpm file"
msgstr ""
-#: po/placeholder.h:81 urpm.pm:241
+#: po/placeholder.h:78 urpm.pm:256
#, c-format
msgid "unable to inspect list file for \"%s\", medium ignored"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:83
+#: po/placeholder.h:81
#, c-format
msgid "copy of [%s] failed"
msgstr ""
-#: 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 ""
+
+#: 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 ""
-#: po/placeholder.h:85 urpm.pm:824
+#: po/placeholder.h:84 urpm.pm:1192
#, c-format
-msgid "unable to read depslist file [%s]"
+msgid "read synthesis file [%s]"
msgstr ""
-#: po/placeholder.h:86
-msgid "removable medium not selected"
+#: po/placeholder.h:85 urpm.pm:830
+#, c-format
+msgid "unable to read depslist file [%s]"
msgstr ""
-#: po/placeholder.h:87 urpm.pm:851
+#: po/placeholder.h:86 urpm.pm:857
#, c-format
msgid "read compss file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:89
+#: po/placeholder.h:88
#, c-format
msgid "building hdlist [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:91 urpm.pm:1009
+#: po/placeholder.h:90 urpm.pm:1015
msgid "error registering local packages"
msgstr ""
-#: po/placeholder.h:92 urpm.pm:1762
+#: po/placeholder.h:91 urpm.pm:273
#, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "taking removable device as \"%s\""
msgstr ""
-#: po/placeholder.h:93
+#: po/placeholder.h:92 urpm.pm:1619
#, c-format
-msgid "unable to build hdlist: %s"
+msgid "incoherent medium \"%s\" marked removable but not really"
msgstr ""
-#: po/placeholder.h:94 urpm.pm:1000
+#: po/placeholder.h:93
#, c-format
-msgid "invalid rpm file name [%s]"
+msgid "unable to build hdlist: %s"
msgstr ""
-#: po/placeholder.h:95 urpm.pm:1736 urpm.pm:1739 urpm.pm:1758
+#: po/placeholder.h:94 urpm.pm:1593 urpm.pm:1596 urpm.pm:1615
#, c-format
msgid "medium \"%s\" is not selected"
msgstr ""
-#: po/placeholder.h:96 urpm.pm:207
+#: po/placeholder.h:95 urpm.pm:1006
#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "invalid rpm file name [%s]"
msgstr ""
-#: po/placeholder.h:97 urpm.pm:863
+#: po/placeholder.h:96 urpm.pm:1175
#, c-format
-msgid "write depslist file [%s]"
+msgid "unknown data associated with %s"
msgstr ""
-#: po/placeholder.h:98 urpm.pm:1322
+#: po/placeholder.h:97 urpm.pm:222
#, c-format
-msgid "unknown data associated with %s"
+msgid "trying to bypass existing medium \"%s\", avoiding"
msgstr ""
-#: po/placeholder.h:99
+#: po/placeholder.h:98 urpm.pm:869
#, c-format
-msgid "source of [%s] not found as [%s]"
+msgid "write depslist file [%s]"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: po/placeholder.h:102
+#: po/placeholder.h:101 urpm.pm:1007
#, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
+msgid "unable to access rpm file [%s]"
msgstr ""
-#: po/placeholder.h:103 urpm.pm:1001
+#: po/placeholder.h:102 urpm.pm:866
#, c-format
-msgid "unable to access rpm file [%s]"
+msgid "unable to write depslist file [%s]"
msgstr ""
-#: po/placeholder.h:104 urpm.pm:860
+#: po/placeholder.h:103
#, c-format
-msgid "unable to write depslist file [%s]"
+msgid ""
+"removing %s to upgrade to %s ...\n"
+" since it will not upgrade correctly!"
msgstr ""
-#: po/placeholder.h:105 urpm.pm:327 urpm.pm:1773
+#: po/placeholder.h:107 urpm.pm:342 urpm.pm:1630
#, c-format
msgid "unable to access medium \"%s\""
msgstr ""
-#: po/placeholder.h:106 urpm.pm:988
+#: po/placeholder.h:108 urpm.pm:994
#, c-format
msgid "relocated %s entries in depslist"
msgstr ""
-#: 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\""
+msgid "trying to select inexistent medium \"%s\""
msgstr ""
-#: po/placeholder.h:108
+#: 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 "no rpm files found from [%s]"
+msgid "unable to parse correctly [%s] on value \"%s\""
msgstr ""
-#: po/placeholder.h:109 urpm.pm:1104
+#: po/placeholder.h:112 urpm.pm:1110
#, fuzzy, c-format
msgid "The following packages contain %s: %s"
msgstr "Die volgende pakket bevat %s: %s\n"
-#: 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\""
+msgid "no rpm files found from [%s]"
msgstr ""
-#: po/placeholder.h:111 urpm.pm:1920
+#: po/placeholder.h:114 urpm.pm:1772
#, c-format
msgid "selecting %s using obsoletes"
msgstr ""
-#: po/placeholder.h:112 urpm.pm:2031
+#: po/placeholder.h:115 urpm.pm:1888
#, c-format
msgid "selecting %s by selection on files"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:114 urpmi:308 urpmi:315 urpmi:328 urpmi:339 urpmi:352
-msgid "Installation failed"
-msgstr "Installasie het misluk"
-
-#: po/placeholder.h:115 urpmi:279
-msgid "Press enter when it's done..."
-msgstr "Druk ENTER wanneer u reg is..."
+#: po/placeholder.h:120
+msgid " --help - print this help message.\n"
+msgstr ""
-#: po/placeholder.h:117 urpmi:201
-msgid "Sorry, bad choice, try again\n"
-msgstr "Jammer, swak keuse, probeer weer\n"
+#: po/placeholder.h:121 urpmi:361
+msgid "everything already installed"
+msgstr "Alles is alreeds installeer"
-#: po/placeholder.h:120
+#: po/placeholder.h:122 urpmi:98
#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr ""
+
+#: po/placeholder.h:123 urpmi:194
+msgid "One of the following packages is needed:"
+msgstr "Slegs een van die volgende pakkette word benodig:"
+
+#: po/placeholder.h:124 po/placeholder.h:222
+msgid " --update - use only update media.\n"
+msgstr ""
+
+#: po/placeholder.h:125 urpmi:299
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"
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
msgstr ""
-#: po/placeholder.h:142 urpmi:362
-msgid "everything already installed"
-msgstr "Alles is alreeds installeer"
+#: 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 "Installasie het misluk"
+
+#: po/placeholder.h:132 po/placeholder.h:234
+msgid ""
+" --auto-select - automatically select packages for upgrading the system.\n"
+msgstr ""
+
+#: po/placeholder.h:134
+msgid " --X - use X interface.\n"
+msgstr ""
-#: po/placeholder.h:143 urpmi:247
+#: po/placeholder.h:135 urpmi:247
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -594,49 +617,113 @@ msgstr ""
"How afhanklikhede te bevredig, moet die volgende pakkette installeer word (%"
"d MB)"
-#: po/placeholder.h:144 urpmi:296
-#, c-format
-msgid "installing %s\n"
-msgstr "%s word installeer\n"
+#: po/placeholder.h:136 urpmi:320 urpmi:344
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Moet ons 'n installasie sonder afhanklikheidstoetsing probeer? (j/N) "
+
+#: 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:145 urpmi:198
+#: po/placeholder.h:143
+msgid " -q - quiet mode.\n"
+msgstr ""
+
+#: po/placeholder.h:144 urpmi:202
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Wat is u keuse (1-%d)"
-#: po/placeholder.h:146 urpmi:321 urpmi:345
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Moet ons 'n installasie sonder afhanklikheidstoetsing probeer? (j/N) "
+#: po/placeholder.h:145
+msgid " --wget - use wget to retrieve distant files.\n"
+msgstr ""
-#: po/placeholder.h:147 urpmi:190
-msgid "One of the following packages is needed:"
-msgstr "Slegs een van die volgende pakkette word benodig:"
+#: po/placeholder.h:146
+#, 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"
+msgstr ""
+
+#: po/placeholder.h:152 urpmi:328 urpmi:352
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Moet ons die installasie afdwing (--force) ? (j/N) "
+
+#: po/placeholder.h:154
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+
+#: po/placeholder.h:155 urpmi:205
+msgid "Sorry, bad choice, try again\n"
+msgstr "Jammer, swak keuse, probeer weer\n"
+
+#: po/placeholder.h:156
+msgid ""
+" names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: po/placeholder.h:158
+msgid " -a - select all matches on command line.\n"
+msgstr ""
+
+#: 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 "%s word installeer\n"
-#: po/placeholder.h:148 urpmi:149
+#: po/placeholder.h:161 urpmi:152
msgid "Only superuser is allowed to install local packages"
msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
-#: po/placeholder.h:149 urpmi:278
+#: po/placeholder.h:162 urpmi:276
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Sit asb. die %s getiteld %s in"
-#: 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 ""
-#: po/placeholder.h:151 urpmi:329 urpmi:353
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Moet ons die installasie afdwing (--force) ? (j/N) "
+#: po/placeholder.h:165 urpmi:102
+#, fuzzy
+msgid "Only superuser is allowed to install packages"
+msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
+
+#: po/placeholder.h:166 urpmi:193
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Slegs een van die volgende pakkette word benodig:"
+
+#: po/placeholder.h:167 urpmi:277
+msgid "Press Enter when it's done..."
+msgstr "Druk ENTER wanneer u reg is..."
-#: po/placeholder.h:155 urpmi.addmedia:46
+#: po/placeholder.h:168 urpmi.addmedia:46
#, c-format
msgid ""
"%s\n"
"`with' missing for ftp media\n"
msgstr ""
-#: po/placeholder.h:159
+#: po/placeholder.h:172
msgid ""
"usage: urpmi.addmedia [--update] <name> <url>\n"
"where <url> is one of\n"
@@ -648,31 +735,31 @@ msgid ""
" removable_<device>://<path>\n"
msgstr ""
-#: po/placeholder.h:168 urpmi.addmedia:57
+#: po/placeholder.h:181 urpmi.addmedia:57
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr ""
-#: po/placeholder.h:169 urpmi.addmedia:58
+#: po/placeholder.h:182 urpmi.addmedia:58
#, c-format
msgid "unable to update medium \"%s\"\n"
msgstr ""
-#: po/placeholder.h:170 urpmi.addmedia:42
+#: po/placeholder.h:183 urpmi.addmedia:42
#, c-format
msgid ""
"%s\n"
"device `%s' do not exist\n"
msgstr ""
-#: po/placeholder.h:174 urpmi.addmedia:44
+#: po/placeholder.h:187 urpmi.addmedia:44
#, c-format
msgid ""
"%s\n"
"<relative path of hdlist> missing\n"
msgstr ""
-#: po/placeholder.h:178
+#: po/placeholder.h:191
#, c-format
msgid ""
"usage: urpmi.update [-a] <name> ...\n"
@@ -684,29 +771,29 @@ msgid ""
"unknown options '%s'\n"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:188 urpmi.update:53
+#: po/placeholder.h:201 urpmi.update:53
#, c-format
msgid ""
"the entry to update is missing\n"
"(one of %s)\n"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:193 urpmi.removemedia:46
+#: po/placeholder.h:206 urpmi.removemedia:46
#, c-format
msgid ""
"the entry to remove is missing\n"
"(one of %s)\n"
msgstr ""
-#: po/placeholder.h:197
+#: po/placeholder.h:210
#, c-format
msgid ""
"usage: urpmi.removemedia [-a] <name> ...\n"
@@ -716,23 +803,38 @@ msgid ""
"unknown options '%s'\n"
msgstr ""
-#: po/placeholder.h:204 urpmq:85
+#: po/placeholder.h:217
+msgid " -h - print this help message.\n"
+msgstr ""
+
+#: po/placeholder.h:218 urpmq:130
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+
+#: po/placeholder.h:219
+msgid " -g - print groups too with name.\n"
+msgstr ""
+
+#: po/placeholder.h:220 urpmq:84
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr ""
-#: po/placeholder.h:206 urpmq:82
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#: po/placeholder.h:221
+msgid " names or rpm files given on command line are queried.\n"
msgstr ""
-#: po/placeholder.h:207 urpmq:131
-msgid ""
-"some package have to be removed for being upgraded, this is not supported "
-"yet\n"
+#: po/placeholder.h:223
+msgid " -r - print version and release too with name.\n"
+msgstr ""
+
+#: po/placeholder.h:224
+msgid " -f - print version, release and arch with name.\n"
msgstr ""
-#: po/placeholder.h:208
+#: po/placeholder.h:225
#, c-format
msgid ""
"urpmq version %s\n"
@@ -740,77 +842,68 @@ msgid ""
"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 package do not exist.\n"
-" names or rpm files given on command line are queried.\n"
msgstr ""
-#: urpm.pm:257
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:231
+msgid " -d - extend query to package dependencies.\n"
msgstr ""
-#: urpm.pm:258
-#, c-format
-msgid "taking removable device as \"%s\""
+#: po/placeholder.h:232
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
msgstr ""
-#: urpm.pm:262
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
+#: po/placeholder.h:233
+msgid ""
+" -c - choose complete method for resolving requires closure.\n"
msgstr ""
-#: urpm.pm:266 urpm.pm:269
+#: po/placeholder.h:235 urpmq:81
#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
msgstr ""
-#: urpm.pm:1339
-#, c-format
-msgid "read synthesis file [%s]"
+#: po/placeholder.h:236
+msgid ""
+" --headers - extract headers for package listed from urpmi db to\n"
+" stdout (root only).\n"
msgstr ""
-#: urpmi:49
-#, c-format
-msgid "urpmi version %s"
+#: po/placeholder.h:243
+msgid ""
+" -u - remove package if a better version is already installed.\n"
msgstr ""
-#: urpmi:98
+#: po/placeholder.h:244
+msgid ""
+" --force - force invocation even if some packages do not\n"
+"exist.\n"
+msgstr ""
+
+#: urpm.pm:1796 urpm.pm:1805
#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgid "removing %s to upgrade to %s ..."
msgstr ""
-#: urpmi:102
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
+#: urpm.pm:1797 urpm.pm:1806
+msgid ", $otherPackage, "
+msgstr ", $otherPackage, "
-#: urpmi:189
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Slegs een van die volgende pakkette word benodig:"
+#: urpm.pm:1797 urpm.pm:1806
+msgid "));"
+msgstr "));"
-#: urpmi:301
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+#: urpm.pm:1802
+msgid "$p->{name}-$p->{version}-$p->{release}"
+msgstr ""
+
+#: urpm.pm:1812
+msgid "$prefix/$_"
+msgstr ""
+
+#: urpmi:48
+#, c-format
+msgid "urpmi version %s"
msgstr ""
#: urpmi.addmedia:30
@@ -843,9 +936,6 @@ msgstr ", $_);"
msgid "urpmq version %s"
msgstr ""
-#~ msgid "));"
-#~ msgstr "));"
-
#~ msgid "), $_);"
#~ msgstr "), $_);"
diff --git a/po/ar.po b/po/ar.po
index b36f9371..9e41a969 100644
--- a/po/ar.po
+++ b/po/ar.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-09-13 10:55+0200\n"
"Last-Translator: Mohammed Gamal <f2c2001@yahoo.com>\n"
"Language-Team: Arabic \n"
@@ -25,27 +25,27 @@ msgstr ""
"التثبيت الآلي للحزم...\n"
"لقد طلبت تثبيت الحزمة $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 "هل أنت موافق؟"
-#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:281
+#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:279
msgid "Ok"
msgstr "موافق"
-#: _irpm:34 po/placeholder.h:116 urpmi:252 urpmi:282
+#: _irpm:34 po/placeholder.h:119 urpmi:252 urpmi:280
msgid "Cancel"
msgstr "الغاء"
-#: _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 "لا"
-#: _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 "نعم"
-#: _irpm:42 po/placeholder.h:118 urpmi:258
+#: _irpm:42 po/placeholder.h:157 urpmi:258
msgid " (Y/n) "
msgstr " (ل/ن)"
@@ -152,494 +152,583 @@ msgstr "جرب urpmf --help لخيارات أكثر"
msgid "urpmi is not installed"
msgstr "urpmi غير مثبت"
-#: po/placeholder.h:29 urpm.pm:283
+#: po/placeholder.h:29
+#, c-format
+msgid "reading synthesis file [%s]"
+msgstr ""
+
+#: po/placeholder.h:30 urpm.pm:298
#, c-format
msgid "unable to write config file [%s]"
msgstr "غير قادر على كتابة ملف الإعدادات [%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"
-msgstr "لم يمكن استخدام الإسم \"%s\" لوسيط غير مسمى لأنه مستخدم بالفعل"
+msgid "using different removable device [%s] for \"%s\""
+msgstr ""
-#: po/placeholder.h:31
+#: po/placeholder.h:32
#, c-format
msgid "nothing to write in list file for \"%s\""
msgstr "لا شئ للكتابة في ملف القوائم لـ \"%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 ""
-#: po/placeholder.h:33
-#, c-format
+#: po/placeholder.h:34
+#, fuzzy, c-format
msgid "unable to parse hdlist file of \"%s\""
-msgstr ""
+msgstr "لا شئ للكتابة في ملف القوائم لـ \"%s\""
-#: po/placeholder.h:34
-#, c-format
+#: po/placeholder.h:35
+#, fuzzy, c-format
msgid "nothing written in list file for \"%s\""
-msgstr ""
-
-#: po/placeholder.h:35 urpm.pm:1951
-#, c-format
-msgid ""
-"removing %s to upgrade ...\n"
-" to %s since it will not upgrade correctly!"
-msgstr ""
+msgstr "لا شئ للكتابة في ملف القوائم لـ \"%s\""
-#: po/placeholder.h:39 urpm.pm:839
+#: po/placeholder.h:36 urpm.pm:845
#, c-format
msgid "read provides file [%s]"
msgstr ""
-#: po/placeholder.h:40
-#, c-format
-msgid "trying to remove inexistant medium \"%s\""
-msgstr ""
-
-#: po/placeholder.h:41 urpm.pm:1692
+#: po/placeholder.h:37 urpm.pm:1549
#, c-format
msgid "package %s is not found."
msgstr ""
-#: po/placeholder.h:42
-#, c-format
-msgid "unable to copy source of [%s] from [%s]"
-msgstr ""
-
-#: po/placeholder.h:43 urpm.pm:870
+#: po/placeholder.h:38 urpm.pm:876
#, c-format
msgid "unable to write compss file [%s]"
msgstr ""
-#: po/placeholder.h:44 urpm.pm:813
+#: po/placeholder.h:39 urpm.pm:819
#, c-format
msgid "unmounting %s"
msgstr ""
-#: po/placeholder.h:45
+#: po/placeholder.h:40
#, c-format
msgid "removing %d obsolete headers in cache"
msgstr ""
-#: 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 ""
-#: 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 ""
+
+#: po/placeholder.h:43 urpm.pm:184
+#, c-format
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr "لم يمكن استخدام الإسم \"%s\" لوسيط غير مسمى لأنه مستخدم بالفعل"
+
+#: po/placeholder.h:44 urpm.pm:191
#, c-format
msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
msgstr ""
-#: po/placeholder.h:48
+#: po/placeholder.h:45
msgid "keeping only files referenced in provides"
msgstr ""
-#: po/placeholder.h:49
+#: po/placeholder.h:46
#, c-format
msgid "unable to build synthesis file for medium \"%s\""
msgstr ""
-#: po/placeholder.h:50
+#: po/placeholder.h:47
#, c-format
msgid "found %d headers in cache"
msgstr ""
-#: po/placeholder.h:51 urpm.pm:836
+#: po/placeholder.h:48 urpm.pm:842
#, c-format
msgid "unable to read provides file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:53 urpm.pm:311
+#: po/placeholder.h:50
#, c-format
-msgid "medium \"%s\" already exists"
+msgid ""
+"removing %s to upgrade to %s ...\n"
+" since it will not be updated otherwise"
msgstr ""
-#: po/placeholder.h:54 urpm.pm:295
+#: po/placeholder.h:54 urpm.pm:326
#, c-format
-msgid "write config file [%s]"
+msgid "medium \"%s\" already exists"
msgstr ""
#: po/placeholder.h:55
-#, c-format
+#, fuzzy, c-format
msgid "unable to write list file of \"%s\""
-msgstr ""
-
-#: po/placeholder.h:56 urpm.pm:1817
-#, c-format
-msgid "retrieving [%s]"
-msgstr ""
+msgstr "غير قادر على كتابة ملف الإعدادات [%s]"
-#: po/placeholder.h:57 urpm.pm:1819
+#: po/placeholder.h:56 urpm.pm:310
#, c-format
-msgid "wget of [%s] failed"
+msgid "write config file [%s]"
msgstr ""
-#: po/placeholder.h:58 urpm.pm:1101
+#: po/placeholder.h:57 urpm.pm:1107
#, c-format
msgid "no package named %s"
msgstr ""
-#: po/placeholder.h:59 urpm.pm:848
+#: po/placeholder.h:58 urpm.pm:854
#, c-format
msgid "unable to read compss file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:61
+#: po/placeholder.h:60
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr ""
-#: po/placeholder.h:62
+#: po/placeholder.h:61
msgid "computing dependencies"
msgstr ""
-#: po/placeholder.h:63 urpm.pm:868
+#: po/placeholder.h:62
+#, c-format
+msgid "retrieve of [%s] failed"
+msgstr ""
+
+#: po/placeholder.h:63 urpm.pm:874
#, c-format
msgid "write provides file [%s]"
msgstr ""
-#: po/placeholder.h:64 urpm.pm:803
+#: po/placeholder.h:64 urpm.pm:809
#, c-format
msgid "mounting %s"
msgstr ""
-#: 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 "
"medium"
msgstr ""
-#: po/placeholder.h:66 urpm.pm:148
-#, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
-msgstr ""
-
-#: po/placeholder.h:67
+#: po/placeholder.h:66
#, c-format
msgid "reading hdlist file [%s]"
msgstr ""
-#: po/placeholder.h:68 urpm.pm:873
+#: po/placeholder.h:67 urpm.pm:879
#, c-format
msgid "write compss file [%s]"
msgstr ""
-#: po/placeholder.h:69 urpm.pm:827
+#: po/placeholder.h:68 urpm.pm:833
#, c-format
msgid "read depslist file [%s]"
msgstr ""
-#: po/placeholder.h:70
+#: po/placeholder.h:69 urpm.pm:103
+msgid "curl failed\n"
+msgstr ""
+
+#: po/placeholder.h:70 urpm.pm:281 urpm.pm:284
#, c-format
-msgid "trying to select inexistant medium \"%s\""
+msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr ""
-#: po/placeholder.h:71 urpm.pm:1812
+#: po/placeholder.h:71 urpm.pm:1668
#, c-format
msgid "malformed input: [%s]"
msgstr ""
-#: 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"
+msgid "there are multiple packages with the same rpm filename \"%s\""
msgstr ""
-#: 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 ""
-#: po/placeholder.h:77 urpm.pm:865
+#: po/placeholder.h:74 urpm.pm:871
#, c-format
msgid "unable to write provides file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:79 urpm.pm:1005
-msgid "unable to register rpm file"
+#: po/placeholder.h:76 urpm.pm:1215
+msgid "unable to find all synthesis file, using parsehdlist server"
msgstr ""
-#: po/placeholder.h:80 urpm.pm:1362
-msgid "unable to find all synthesis file, using parsehdlist server"
+#: po/placeholder.h:77 urpm.pm:1011
+msgid "unable to register rpm file"
msgstr ""
-#: po/placeholder.h:81 urpm.pm:241
+#: po/placeholder.h:78 urpm.pm:256
#, c-format
msgid "unable to inspect list file for \"%s\", medium ignored"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:83
+#: po/placeholder.h:81
#, c-format
msgid "copy of [%s] failed"
msgstr ""
-#: 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 ""
+
+#: 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 ""
-#: po/placeholder.h:85 urpm.pm:824
+#: po/placeholder.h:84 urpm.pm:1192
#, c-format
-msgid "unable to read depslist file [%s]"
+msgid "read synthesis file [%s]"
msgstr ""
-#: po/placeholder.h:86
-msgid "removable medium not selected"
+#: po/placeholder.h:85 urpm.pm:830
+#, c-format
+msgid "unable to read depslist file [%s]"
msgstr ""
-#: po/placeholder.h:87 urpm.pm:851
+#: po/placeholder.h:86 urpm.pm:857
#, c-format
msgid "read compss file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:89
+#: po/placeholder.h:88
#, c-format
msgid "building hdlist [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:91 urpm.pm:1009
+#: po/placeholder.h:90 urpm.pm:1015
msgid "error registering local packages"
msgstr ""
-#: po/placeholder.h:92 urpm.pm:1762
+#: po/placeholder.h:91 urpm.pm:273
#, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "taking removable device as \"%s\""
msgstr ""
-#: po/placeholder.h:93
+#: po/placeholder.h:92 urpm.pm:1619
#, c-format
-msgid "unable to build hdlist: %s"
+msgid "incoherent medium \"%s\" marked removable but not really"
msgstr ""
-#: po/placeholder.h:94 urpm.pm:1000
+#: po/placeholder.h:93
#, c-format
-msgid "invalid rpm file name [%s]"
+msgid "unable to build hdlist: %s"
msgstr ""
-#: po/placeholder.h:95 urpm.pm:1736 urpm.pm:1739 urpm.pm:1758
+#: po/placeholder.h:94 urpm.pm:1593 urpm.pm:1596 urpm.pm:1615
#, c-format
msgid "medium \"%s\" is not selected"
msgstr ""
-#: po/placeholder.h:96 urpm.pm:207
+#: po/placeholder.h:95 urpm.pm:1006
#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "invalid rpm file name [%s]"
msgstr ""
-#: po/placeholder.h:97 urpm.pm:863
+#: po/placeholder.h:96 urpm.pm:1175
#, c-format
-msgid "write depslist file [%s]"
+msgid "unknown data associated with %s"
msgstr ""
-#: po/placeholder.h:98 urpm.pm:1322
+#: po/placeholder.h:97 urpm.pm:222
#, c-format
-msgid "unknown data associated with %s"
+msgid "trying to bypass existing medium \"%s\", avoiding"
msgstr ""
-#: po/placeholder.h:99
+#: po/placeholder.h:98 urpm.pm:869
#, c-format
-msgid "source of [%s] not found as [%s]"
+msgid "write depslist file [%s]"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: po/placeholder.h:102
+#: po/placeholder.h:101 urpm.pm:1007
#, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
+msgid "unable to access rpm file [%s]"
msgstr ""
-#: po/placeholder.h:103 urpm.pm:1001
+#: po/placeholder.h:102 urpm.pm:866
#, c-format
-msgid "unable to access rpm file [%s]"
+msgid "unable to write depslist file [%s]"
msgstr ""
-#: po/placeholder.h:104 urpm.pm:860
+#: po/placeholder.h:103
#, c-format
-msgid "unable to write depslist file [%s]"
+msgid ""
+"removing %s to upgrade to %s ...\n"
+" since it will not upgrade correctly!"
msgstr ""
-#: po/placeholder.h:105 urpm.pm:327 urpm.pm:1773
+#: po/placeholder.h:107 urpm.pm:342 urpm.pm:1630
#, c-format
msgid "unable to access medium \"%s\""
msgstr ""
-#: po/placeholder.h:106 urpm.pm:988
+#: po/placeholder.h:108 urpm.pm:994
#, c-format
msgid "relocated %s entries in depslist"
msgstr ""
-#: 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\""
+msgid "trying to select inexistent medium \"%s\""
+msgstr ""
+
+#: po/placeholder.h:110 urpm.pm:97
+msgid "wget failed\n"
msgstr ""
-#: 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]"
+msgid "unable to parse correctly [%s] on value \"%s\""
msgstr ""
-#: po/placeholder.h:109 urpm.pm:1104
+#: po/placeholder.h:112 urpm.pm:1110
#, c-format
msgid "The following packages contain %s: %s"
msgstr ""
-#: 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\""
+msgid "no rpm files found from [%s]"
msgstr ""
-#: po/placeholder.h:111 urpm.pm:1920
+#: po/placeholder.h:114 urpm.pm:1772
#, c-format
msgid "selecting %s using obsoletes"
msgstr ""
-#: po/placeholder.h:112 urpm.pm:2031
+#: po/placeholder.h:115 urpm.pm:1888
#, c-format
msgid "selecting %s by selection on files"
msgstr ""
-#: 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 ""
-#: 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 - print all tags."
+
+#: po/placeholder.h:121 urpmi:361
+msgid "everything already installed"
+msgstr ""
+
+#: po/placeholder.h:122 urpmi:98
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: خيار غير معلوم \"-%s\", تحقَّق من طريقة الإستخدام بـ --help\n"
+
+#: po/placeholder.h:123 urpmi:194
+msgid "One of the following packages is needed:"
+msgstr ""
+
+#: 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 ""
-#: po/placeholder.h:115 urpmi:279
-msgid "Press enter when it's done..."
+#: 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"
+#: po/placeholder.h:134
+#, fuzzy
+msgid " --X - use X interface.\n"
+msgstr " --all - print all tags."
+
+#: po/placeholder.h:135 urpmi:247
+#, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
msgstr ""
-#: po/placeholder.h:120
+#: po/placeholder.h:136 urpmi:320 urpmi:344
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr ""
+
+#: 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 - print all tags."
+
+#: po/placeholder.h:144 urpmi:202
#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr ""
+
+#: 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 ""
+msgstr "هذا برنامج حر و يمكن اعادة توزيعه تحت بنود ترخيص GNU GPL"
-#: po/placeholder.h:142 urpmi:362
-msgid "everything already installed"
+#: po/placeholder.h:152 urpmi:328 urpmi:352
+msgid "Try installation even more strongly (--force)? (y/N) "
msgstr ""
-#: po/placeholder.h:143 urpmi:247
-#, c-format
+#: po/placeholder.h:154
msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"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"
+#: po/placeholder.h:155 urpmi:205
+msgid "Sorry, bad choice, try again\n"
msgstr ""
-#: po/placeholder.h:145 urpmi:198
-#, c-format
-msgid "What is your choice? (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) "
+#: 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:"
+#: po/placeholder.h:159
+msgid " --curl - use curl to retrieve distant files.\n"
msgstr ""
-#: po/placeholder.h:148 urpmi:149
+#: po/placeholder.h:160 urpmi:294
+#, c-format
+msgid "installing %s\n"
+msgstr ""
+
+#: po/placeholder.h:161 urpmi:152
msgid "Only superuser is allowed to install local packages"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: po/placeholder.h:151 urpmi:329 urpmi:353
-msgid "Try installation even more strongly (--force)? (y/N) "
+#: po/placeholder.h:165 urpmi:102
+msgid "Only superuser is allowed to install packages"
msgstr ""
-#: po/placeholder.h:155 urpmi.addmedia:46
+#: po/placeholder.h:166 urpmi:193
+#, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "واحد من هذه الحدم يُحتاج اليه لتثبيت %s:"
+
+#: po/placeholder.h:167 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 ""
-#: po/placeholder.h:159
+#: po/placeholder.h:172
msgid ""
"usage: urpmi.addmedia [--update] <name> <url>\n"
"where <url> is one of\n"
@@ -651,31 +740,31 @@ msgid ""
" removable_<device>://<path>\n"
msgstr ""
-#: po/placeholder.h:168 urpmi.addmedia:57
+#: po/placeholder.h:181 urpmi.addmedia:57
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr ""
-#: po/placeholder.h:169 urpmi.addmedia:58
+#: po/placeholder.h:182 urpmi.addmedia:58
#, c-format
msgid "unable to update medium \"%s\"\n"
msgstr ""
-#: po/placeholder.h:170 urpmi.addmedia:42
+#: po/placeholder.h:183 urpmi.addmedia:42
#, c-format
msgid ""
"%s\n"
"device `%s' do not exist\n"
msgstr ""
-#: po/placeholder.h:174 urpmi.addmedia:44
+#: po/placeholder.h:187 urpmi.addmedia:44
#, c-format
msgid ""
"%s\n"
"<relative path of hdlist> missing\n"
msgstr ""
-#: po/placeholder.h:178
+#: po/placeholder.h:191
#, c-format
msgid ""
"usage: urpmi.update [-a] <name> ...\n"
@@ -687,29 +776,29 @@ msgid ""
"unknown options '%s'\n"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:188 urpmi.update:53
+#: po/placeholder.h:201 urpmi.update:53
#, c-format
msgid ""
"the entry to update is missing\n"
"(one of %s)\n"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:193 urpmi.removemedia:46
+#: po/placeholder.h:206 urpmi.removemedia:46
#, c-format
msgid ""
"the entry to remove is missing\n"
"(one of %s)\n"
msgstr ""
-#: po/placeholder.h:197
+#: po/placeholder.h:210
#, c-format
msgid ""
"usage: urpmi.removemedia [-a] <name> ...\n"
@@ -719,102 +808,113 @@ msgid ""
"unknown options '%s'\n"
msgstr ""
-#: po/placeholder.h:204 urpmq:85
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr ""
-
-#: po/placeholder.h:206 urpmq:82
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
+#: po/placeholder.h:217
+#, fuzzy
+msgid " -h - print this help message.\n"
+msgstr " --all - print all tags."
-#: 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 ""
"بعض الحزم تحتاج الى أن تُزال لكي يتم ترقيتها, هذا لا يزال غير مدعوم حتى الآن\n"
-#: po/placeholder.h:208
+#: po/placeholder.h:219
+#, fuzzy
+msgid " -g - print groups too with name.\n"
+msgstr " --group - print tag group: group."
+
+#: po/placeholder.h:220 urpmq:84
#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr ""
+
+#: 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 " command line but without package name)."
+
+#: 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 "هذا برنامج حر و يمكن اعادة توزيعه تحت بنود ترخيص GNU GPL"
+
+#: po/placeholder.h:231
+#, fuzzy
+msgid " -d - extend query to package dependencies.\n"
+msgstr " command line but without package name)."
+
+#: 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 ""
-#: urpm.pm:257
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:233
+msgid ""
+" -c - choose complete method for resolving requires closure.\n"
msgstr ""
-#: urpm.pm:258
+#: po/placeholder.h:235 urpmq:81
#, c-format
-msgid "taking removable device as \"%s\""
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
msgstr ""
-#: urpm.pm:262
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
+#: 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
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
+#: po/placeholder.h:243
+msgid ""
+" -u - remove package if a better version is already installed.\n"
msgstr ""
-#: urpm.pm:1339
-#, c-format
-msgid "read synthesis file [%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 "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: خيار غير معلوم \"-%s\", تحقَّق من طريقة الإستخدام بـ --help\n"
+#: urpm.pm:1797 urpm.pm:1806
+msgid ", $otherPackage, "
+msgstr ", $otherPackage, "
-#: urpmi:102
-msgid "Only superuser is allowed to install packages"
-msgstr ""
+#: urpm.pm:1797 urpm.pm:1806
+msgid "));"
+msgstr "));"
-#: urpmi:189
-#, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "واحد من هذه الحدم يُحتاج اليه لتثبيت %s:"
+#: 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 "urpmi الإصدار %s"
#: urpmi.addmedia:30
msgid "usage: urpmi.addmedia [--update] <name> <url>"
diff --git a/po/az.po b/po/az.po
index 25adc453..3a6b7d3c 100644
--- a/po/az.po
+++ b/po/az.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-11-14 17:06GMT+0200\n"
"Last-Translator: Vasif İsmayıloğlu MD <azerb_linux@hotmail.com>\n"
"Language-Team: Azerbaijani Turkic <linuxaz@azerimail.net>\n"
@@ -26,27 +26,27 @@ msgstr ""
"Paketlərin öz özünə qurulması...\n"
"$rpm paketlərininin qurulmasını istədiniz\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 "Oldu mu?"
-#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:281
+#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:279
msgid "Ok"
msgstr "Oldu"
-#: _irpm:34 po/placeholder.h:116 urpmi:252 urpmi:282
+#: _irpm:34 po/placeholder.h:119 urpmi:252 urpmi:280
msgid "Cancel"
msgstr "Ləğv et"
-#: _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 "XxJjNn"
-#: _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 "Bb"
-#: _irpm:42 po/placeholder.h:118 urpmi:258
+#: _irpm:42 po/placeholder.h:157 urpmi:258
msgid " (Y/n) "
msgstr " (B/x) "
@@ -159,175 +159,177 @@ msgstr "daha təfsilatlı seçənəklər üçün urpmf --help sınayın"
msgid "urpmi is not installed"
msgstr "urpmi qurulmayıb"
-#: po/placeholder.h:29 urpm.pm:283
+#: po/placeholder.h:29
+#, fuzzy, c-format
+msgid "reading synthesis file [%s]"
+msgstr "[%s] asılılıqlar siyahısı faylı oxundu"
+
+#: po/placeholder.h:30 urpm.pm:298
#, c-format
msgid "unable to write config file [%s]"
msgstr "[%s] quraşdırma faylı yazıla bilmir"
-#: 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 ""
-"adsız medya üçün \"%s\" adı işlədilə bilmir, çünkü onsuz da istifadədədir"
-#: po/placeholder.h:31
+#: po/placeholder.h:32
#, c-format
msgid "nothing to write in list file for \"%s\""
msgstr "\"%s\" üçün siyahı faylında bir şey yazmağa lüzum yoxdur"
-#: 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 "\"%s\" üçün siyahı faylı tapıla bilmir, medya rədd edilir"
-#: po/placeholder.h:33
+#: po/placeholder.h:34
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "\"%s\" hdlist faylı alına bilmir"
-#: po/placeholder.h:34
+#: po/placeholder.h:35
#, c-format
msgid "nothing written in list file for \"%s\""
msgstr "\"%s\" üçün siyahı faylında bir şey yazılmır"
-#: po/placeholder.h:35 urpm.pm:1951
-#, c-format
-msgid ""
-"removing %s to upgrade ...\n"
-" to %s since it will not upgrade correctly!"
-msgstr ""
-"düzgün aparıla bilməyəcəyindən %s\n"
-" %s olaraq güncəllənmək üçün çıxardılır!"
-
-#: po/placeholder.h:39 urpm.pm:839
+#: po/placeholder.h:36 urpm.pm:845
#, c-format
msgid "read provides file [%s]"
msgstr "[%s] gətirənlər faylını oxu"
-#: po/placeholder.h:40
-#, c-format
-msgid "trying to remove inexistant medium \"%s\""
-msgstr "mövcud olmayan \"%s\" medyası çıxardılmağa çalışılır"
-
-#: po/placeholder.h:41 urpm.pm:1692
+#: po/placeholder.h:37 urpm.pm:1549
#, c-format
msgid "package %s is not found."
msgstr "%s paketi tapılmadı."
-#: po/placeholder.h:42
-#, c-format
-msgid "unable to copy source of [%s] from [%s]"
-msgstr "[%s] mənbə faylı [%s] üstündən köçürülə bilmədi"
-
-#: po/placeholder.h:43 urpm.pm:870
+#: po/placeholder.h:38 urpm.pm:876
#, c-format
msgid "unable to write compss file [%s]"
msgstr "kompas faylı \"%s\" yazıla bilmir"
-#: po/placeholder.h:44 urpm.pm:813
+#: po/placeholder.h:39 urpm.pm:819
#, c-format
msgid "unmounting %s"
msgstr "%s ayrılır"
-#: po/placeholder.h:45
+#: po/placeholder.h:40
#, c-format
msgid "removing %d obsolete headers in cache"
msgstr "ön yaddaşdakı %d mütləq başlıqlar çıxardılır"
-#: 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 "\"%s\" medyası hdlist faylı tapılmadı"
-#: 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 ""
+"\"%s\" medyası onsuz da istifadədə olan hdlist işlətməyə cəhd etdi, medya "
+"rədd edildi"
+
+#: po/placeholder.h:43 urpm.pm:184
+#, c-format
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"adsız medya üçün \"%s\" adı işlədilə bilmir, çünkü onsuz da istifadədədir"
+
+#: po/placeholder.h:44 urpm.pm:191
#, c-format
msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
msgstr "\"%s\" medyası [%s] siyahı faylına malik olmadığı üçün alına bilmir"
-#: po/placeholder.h:48
+#: po/placeholder.h:45
msgid "keeping only files referenced in provides"
msgstr "təkcə gətirənlərdə yad edilən fayllar saxlanılır"
-#: po/placeholder.h:49
+#: po/placeholder.h:46
#, c-format
msgid "unable to build synthesis file for medium \"%s\""
msgstr "\"%s\" medyası sintezi inşa edilə bilmi"
-#: po/placeholder.h:50
+#: po/placeholder.h:47
#, c-format
msgid "found %d headers in cache"
msgstr "ön yaddaşda %d başlıq tapıldı"
-#: po/placeholder.h:51 urpm.pm:836
+#: po/placeholder.h:48 urpm.pm:842
#, c-format
msgid "unable to read provides file [%s]"
msgstr "gətirən faylı \"%s\" oxuna bilmi"
-#: 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 "%s yerləşdirmə dili seçili olmadığı üçün seçilə bilmir"
-#: 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 ""
+"düzgün aparıla bilməyəcəyindən %s\n"
+" %s olaraq güncəllənmək üçün çıxardılır!"
+
+#: po/placeholder.h:54 urpm.pm:326
#, c-format
msgid "medium \"%s\" already exists"
msgstr "\"%s\" medyası onsuz da vardır"
-#: po/placeholder.h:54 urpm.pm:295
-#, c-format
-msgid "write config file [%s]"
-msgstr "[%s] quraşdırma faylı yazılır"
-
#: po/placeholder.h:55
#, c-format
msgid "unable to write list file of \"%s\""
msgstr "\"%s\" fayl siyahısı yazıla bilmi"
-#: po/placeholder.h:56 urpm.pm:1817
+#: po/placeholder.h:56 urpm.pm:310
#, c-format
-msgid "retrieving [%s]"
-msgstr "[%s] cəhd edilir"
-
-#: po/placeholder.h:57 urpm.pm:1819
-#, c-format
-msgid "wget of [%s] failed"
-msgstr "[%s] faylı wget əməliyyatı bacarılmadı"
+msgid "write config file [%s]"
+msgstr "[%s] quraşdırma faylı yazılır"
-#: po/placeholder.h:58 urpm.pm:1101
+#: po/placeholder.h:57 urpm.pm:1107
#, c-format
msgid "no package named %s"
msgstr "%s adlı paket yoxdur"
-#: po/placeholder.h:59 urpm.pm:848
+#: po/placeholder.h:58 urpm.pm:854
#, c-format
msgid "unable to read compss file [%s]"
msgstr "kompas faylı \"%s\" oxuna bilmi"
-#: 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 "\"%s\" üçün hdlist faylı tapıla bilmir, medya rədd edildi"
-#: po/placeholder.h:61
+#: po/placeholder.h:60
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "\"%s\" medyası hdlist sintezi inşa edilid"
-#: po/placeholder.h:62
+#: po/placeholder.h:61
msgid "computing dependencies"
msgstr "asılılıqlar hesablanır"
-#: po/placeholder.h:63 urpm.pm:868
+#: po/placeholder.h:62
+#, fuzzy, c-format
+msgid "retrieve of [%s] failed"
+msgstr "[%s] faylı wget əməliyyatı bacarılmadı"
+
+#: po/placeholder.h:63 urpm.pm:874
#, c-format
msgid "write provides file [%s]"
msgstr "gətirənlər faylı [%s] yazıldı"
-#: po/placeholder.h:64 urpm.pm:803
+#: po/placeholder.h:64 urpm.pm:809
#, c-format
msgid "mounting %s"
msgstr "%s bağlanır"
-#: 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 "
@@ -336,126 +338,136 @@ msgstr ""
"\"%s\" medyası siyahı faylı başqa medya tərəfindən istifadədə olduğu üçün "
"diqqətə alına bilir"
-#: po/placeholder.h:66 urpm.pm:148
-#, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
-msgstr ""
-"\"%s\" medyumu onsuz da istifadədə olan bir siyahını işlətməyə cəhd etdi, "
-"medya rədd edildi"
-
-#: po/placeholder.h:67
+#: po/placeholder.h:66
#, c-format
msgid "reading hdlist file [%s]"
msgstr "[%s] hdlist faylı oxunur"
-#: po/placeholder.h:68 urpm.pm:873
+#: po/placeholder.h:67 urpm.pm:879
#, c-format
msgid "write compss file [%s]"
msgstr "[%s] kompas faylı yazıldı"
-#: po/placeholder.h:69 urpm.pm:827
+#: po/placeholder.h:68 urpm.pm:833
#, c-format
msgid "read depslist file [%s]"
msgstr "[%s] asılılıqlar siyahısı faylı oxundu"
-#: po/placeholder.h:70
-#, c-format
-msgid "trying to select inexistant medium \"%s\""
-msgstr "mövcud olmayan \"%s\" medyası seçilə bilmi"
+#: 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 " \"%s\" medyası yaradıla bilmir\n"
-#: po/placeholder.h:71 urpm.pm:1812
+#: po/placeholder.h:71 urpm.pm:1668
#, c-format
msgid "malformed input: [%s]"
msgstr "xətalı giriş: [%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 ""
-"\"%s\" medyası onsuz da istifadədə olan hdlist işlətməyə cəhd etdi, medya "
-"rədd edildi"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "\"%s\" rpm fayl adlı çoxlu fayl tapıldı"
-#: 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 ""
-"düzgün aparıla bilməyəcəyindən %s\n"
-" %s olaraq güncəllənmək üçün çıxardılır!"
+"\"%s\" medyumu onsuz da istifadədə olan bir siyahını işlətməyə cəhd etdi, "
+"medya rədd edildi"
-#: po/placeholder.h:77 urpm.pm:865
+#: po/placeholder.h:74 urpm.pm:871
#, c-format
msgid "unable to write provides file [%s]"
msgstr "gətirən faylı \"%s\" faylı yazıla bilmi"
-#: 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 "\"%s\" medyası hdlist faylına çatıla bilmir, medya rədd edildi"
-#: po/placeholder.h:79 urpm.pm:1005
-msgid "unable to register rpm file"
-msgstr "rpm faylı qeyd edilə bilmir"
-
-#: 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 "bütün sintez faylları tapıla bilmir, daranmış hdlist işlədilir"
-#: po/placeholder.h:81 urpm.pm:241
+#: po/placeholder.h:77 urpm.pm:1011
+msgid "unable to register rpm file"
+msgstr "rpm faylı qeyd edilə bilmir"
+
+#: po/placeholder.h:78 urpm.pm:256
#, c-format
msgid "unable to inspect list file for \"%s\", medium ignored"
msgstr "\"%s\" faylları siyahısı incələnə bilmir, medya rədd edildi"
-#: 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 "\"%s\" üçün inkoherent siyahı faylı, medya rədd edildi"
-#: po/placeholder.h:83
+#: po/placeholder.h:81
#, c-format
msgid "copy of [%s] failed"
msgstr "[%s] köçürülmə əməliyyatı bacarılmadı"
-#: 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 "mövcud olmayan \"%s\" medyası çıxardılmağa çalışılır"
+
+#: 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 "[%s] düzgün olaraq darana bilmir"
-#: po/placeholder.h:85 urpm.pm:824
+#: po/placeholder.h:84 urpm.pm:1192
+#, fuzzy, c-format
+msgid "read synthesis file [%s]"
+msgstr "[%s] asılılıqlar siyahısı faylı oxundu"
+
+#: po/placeholder.h:85 urpm.pm:830
#, c-format
msgid "unable to read depslist file [%s]"
msgstr "[%s] asılılqlar siyahısı faylı oxuna bilmir"
-#: po/placeholder.h:86
-msgid "removable medium not selected"
-msgstr "söküləbilən medya seçili deyil"
-
-#: po/placeholder.h:87 urpm.pm:851
+#: po/placeholder.h:86 urpm.pm:857
#, c-format
msgid "read compss file [%s]"
msgstr "[%s] compss faylı oxundu"
-#: 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 "quraşdırma faylında %s sətirində sintaksis xətası"
-#: po/placeholder.h:89
+#: po/placeholder.h:88
#, c-format
msgid "building hdlist [%s]"
msgstr "[%s] hdlist faylı inşa edilir"
-#: 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 "\"%s\" medyasından [%s] rpm faylı oxuna bilmir"
-#: po/placeholder.h:91 urpm.pm:1009
+#: po/placeholder.h:90 urpm.pm:1015
msgid "error registering local packages"
msgstr "yerli paket qeydiyyat xətası"
-#: 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 "\"%s\" inkeherent medyası söküləbilən deyə bildirilib, amma deyil"
@@ -465,215 +477,276 @@ msgstr "\"%s\" inkeherent medyası söküləbilən deyə bildirilib, amma deyil"
msgid "unable to build hdlist: %s"
msgstr "hdlist inşa edilə bilmir: %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 "\"%s\" medyası seçili deyil"
+
+#: po/placeholder.h:95 urpm.pm:1006
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "hökmsüz rpm fayı adı [%s]"
-#: 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 "\"%s\" medyası seçili deyil"
+msgid "unknown data associated with %s"
+msgstr "%s ilə naməlum verilən qarşılaşdırılıb"
-#: 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 "mövcud medya \"%s\" yan keçilməyə çalışıldı, imtina edirəm"
-#: po/placeholder.h:97 urpm.pm:863
+#: po/placeholder.h:98 urpm.pm:869
#, c-format
msgid "write depslist file [%s]"
msgstr "[%s] asılılıqlar faylı yazıldı"
-#: po/placeholder.h:98 urpm.pm:1322
-#, c-format
-msgid "unknown data associated with %s"
-msgstr "%s ilə naməlum verilən qarşılaşdırılıb"
-
-#: po/placeholder.h:99
-#, c-format
-msgid "source of [%s] not found as [%s]"
-msgstr "[%s] mənbəyi [%s] olaraq tapılmadı"
-
-#: 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 "\"%s\" siyahı faylına çatıla bilmədi, medya rədd edildi"
-#: 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 "kifayət qədər fayl güncəllənməyəcəyi üçün %s seçilməsi imtina edildi"
-#: po/placeholder.h:102
-#, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
-msgstr "[%s] wget əməliyyatı bacarılmadı (bəlkə wget yoxdur?)"
-
-#: po/placeholder.h:103 urpm.pm:1001
+#: po/placeholder.h:101 urpm.pm:1007
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "rpm faylı [%s] çatıla bilmir"
-#: po/placeholder.h:104 urpm.pm:860
+#: po/placeholder.h:102 urpm.pm:866
#, c-format
msgid "unable to write depslist file [%s]"
msgstr "asılılıqlar siyahısı faylı [%s] yazıla bilmir"
-#: 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 ""
+"düzgün aparıla bilməyəcəyindən %s\n"
+" %s olaraq güncəllənmək üçün çıxardılır!"
+
+#: po/placeholder.h:107 urpm.pm:342 urpm.pm:1630
#, c-format
msgid "unable to access medium \"%s\""
msgstr "\"%s\" medyasına çatıla bilmir"
-#: po/placeholder.h:106 urpm.pm:988
+#: po/placeholder.h:108 urpm.pm:994
#, c-format
msgid "relocated %s entries in depslist"
msgstr "asılılıqlar siyahısında %s sahə yenidən yerləşdirildi"
-#: 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 "[%s] \"%s\" qiymətində düzgün darana bilmədi"
+msgid "trying to select inexistent medium \"%s\""
+msgstr "mövcud olmayan \"%s\" medyası seçilə bilmi"
+
+#: po/placeholder.h:110 urpm.pm:97
+#, fuzzy
+msgid "wget failed\n"
+msgstr "[%s] faylı wget əməliyyatı bacarılmadı"
-#: 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 "[%s] üstündə rpm fayı tapıla bilmədi"
+msgid "unable to parse correctly [%s] on value \"%s\""
+msgstr "[%s] \"%s\" qiymətində düzgün darana bilmədi"
-#: po/placeholder.h:109 urpm.pm:1104
+#: po/placeholder.h:112 urpm.pm:1110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Aşağıdakı paketlər %s daxıl edir: %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 "\"%s\" rpm fayl adlı çoxlu fayl tapıldı"
+msgid "no rpm files found from [%s]"
+msgstr "[%s] üstündə rpm fayı tapıla bilmədi"
-#: po/placeholder.h:111 urpm.pm:1920
+#: po/placeholder.h:114 urpm.pm:1772
#, c-format
msgid "selecting %s using obsoletes"
msgstr "%s mütləqlər işlədilərək seçilir"
-#: po/placeholder.h:112 urpm.pm:2031
+#: po/placeholder.h:115 urpm.pm:1888
#, c-format
msgid "selecting %s by selection on files"
msgstr "%s fayllar üstündə seçilərək seçilir"
-#: 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 "bu [%s] hdlist faylı medyası tapıla bilmədi"
-#: 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 - bütün təqləri göstər."
+
+#: po/placeholder.h:121 urpmi:361
+msgid "everything already installed"
+msgstr "hər şey artıq qurulmuşdur"
+
+#: po/placeholder.h:122 urpmi:98
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr ""
+"urpmq: namə'lum seçənək \"-%s\", istifadə qaydasını --help ilə yoxlayın\n"
+
+#: po/placeholder.h:123 urpmi:194
+msgid "One of the following packages is needed:"
+msgstr "Aşağıdakı paketlərin bir dənəsinə ehtiyac var:"
+
+#: 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 "Qurulum iflas etdi"
-#: po/placeholder.h:115 urpmi:279
-msgid "Press enter when it's done..."
-msgstr "Qurtardığında enter düyməsinə basın..."
+#: 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 "Xətalı seçənək, təkrar sınayın\n"
+#: po/placeholder.h:134
+#, fuzzy
+msgid " --X - use X interface.\n"
+msgstr " --all - bütün təqləri göstər."
-#: 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 ""
+"Asılıqları ortadan qaldırmaq üçün, aşağıdakı paketlər də qurulmalıdır (%d Mb)"
+
+#: po/placeholder.h:136 urpmi:320 urpmi:344
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Paket asılılıqlarına fikir vermədən qurmağı sınayım? (b/X) "
+
+#: 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 - bütün təqləri göstər."
+
+#: po/placeholder.h:144 urpmi:202
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "Seçkiniz? (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 "Bu, pulsuz proqramdır və GNU GPL lisenziyası altında dağıdıla bilər."
+
+#: po/placeholder.h:152 urpmi:328 urpmi:352
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Quruluşu zorlayaraq sınayım (--force)? (b/X)"
+
+#: po/placeholder.h:154
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
msgstr ""
-"urpmi buraxılışı %s\n"
-"Təlif Haqqı (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"Bu, pulsuz proqramdır və GPL lisenziyası altında yayıla bilər GPL.\n"
-"istifadə qaydası:\n"
-" --help - bu kömək ismarışını çap edər.\n"
-" --update - təkcə güncəl medyanı işlət.\n"
-" --auto - seçililər arasında ən yaxşısını seç.\n"
-" --auto-select - sistemi güncəlləşdirmək üçün lazım olan paketləri "
-"seçin.\n"
-" --force - bir neçə paket çatmasa belə paketi qur.\n"
-" --X - X ara üzünü işlət.\n"
-" --best-output - proqrama uyğun gələn ən yaxşı ara üzü seç:\n"
-" X və ya mətn modu.\n"
-" -a - əmr sətirindəki bütün uyğun gələnləri seç.\n"
-" -m - sorğulananlara ən yaxınları seç (əsas).\n"
-" -M - sorğulananlara ən geniş yaxınları seç.\n"
-" -c - istəklərə ən uyğun gələnlərini seç.\n"
-" -q - sadə mod.\n"
-" -v - ətrtaflı mod.\n"
-" əmr sətirindəki adlar və ya rpm faylları (saəcə olaraq ali istifadəçi "
-"isəniz).\n"
-
-#: po/placeholder.h:142 urpmi:362
-msgid "everything already installed"
-msgstr "hər şey artıq qurulmuşdur"
-#: po/placeholder.h:143 urpmi:247
-#, c-format
+#: po/placeholder.h:155 urpmi:205
+msgid "Sorry, bad choice, try again\n"
+msgstr "Xətalı seçənək, təkrar sınayın\n"
+
+#: po/placeholder.h:156
msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+" names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: po/placeholder.h:158
+msgid " -a - select all matches on command line.\n"
+msgstr ""
+
+#: po/placeholder.h:159
+msgid " --curl - use curl to retrieve distant files.\n"
msgstr ""
-"Asılıqları ortadan qaldırmaq üçün, aşağıdakı paketlər də qurulmalıdır (%d Mb)"
-#: po/placeholder.h:144 urpmi:296
+#: po/placeholder.h:160 urpmi:294
#, c-format
msgid "installing %s\n"
msgstr "%s qurulur\n"
-#: po/placeholder.h:145 urpmi:198
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Seçkiniz? (1-%d)"
-
-#: po/placeholder.h:146 urpmi:321 urpmi:345
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Paket asılılıqlarına fikir vermədən qurmağı sınayım? (b/X) "
-
-#: po/placeholder.h:147 urpmi:190
-msgid "One of the following packages is needed:"
-msgstr "Aşağıdakı paketlərin bir dənəsinə ehtiyac var:"
-
-#: po/placeholder.h:148 urpmi:149
+#: po/placeholder.h:161 urpmi:152
msgid "Only superuser is allowed to install local packages"
msgstr ""
"Yerli paketləri qurmaq üçün sadəcə olaraq sistem operatoru məs'uliyyətlidir"
-#: 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 "Lütfən \"%s\" medyasını [%s] avadanlığına yerləşdirin"
-#: 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 "qaynaq paketi alına bilmir, çıxılır"
-#: po/placeholder.h:151 urpmi:329 urpmi:353
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Quruluşu zorlayaraq sınayım (--force)? (b/X)"
+#: po/placeholder.h:165 urpmi:102
+#, fuzzy
+msgid "Only superuser is allowed to install packages"
+msgstr ""
+"Yerli paketləri qurmaq üçün sadəcə olaraq sistem operatoru məs'uliyyətlidir"
+
+#: po/placeholder.h:166 urpmi:193
+#, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Aşağıdakı paketlərin bir dənəsinə %s ehtiyac hiss edir:"
+
+#: po/placeholder.h:167 urpmi:277
+msgid "Press Enter when it's done..."
+msgstr "Qurtardığında enter düyməsinə basın..."
-#: po/placeholder.h:155 urpmi.addmedia:46
+#: po/placeholder.h:168 urpmi.addmedia:46
#, c-format
msgid ""
"%s\n"
@@ -682,7 +755,7 @@ msgstr ""
"%s\n"
"əksik ftp medyası ilə 'with'\n"
-#: po/placeholder.h:159
+#: po/placeholder.h:172
msgid ""
"usage: urpmi.addmedia [--update] <name> <url>\n"
"where <url> is one of\n"
@@ -701,17 +774,17 @@ msgstr ""
" http://<verici>/<cığır> with <nisbi fayl adı və ya hdlist>\n"
" removable_<avadanlıq>://<cığır>\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 " \"%s\" medyası yaradıla bilmir\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 " \"%s\" medyası güncəllənə bilmir\n"
-#: po/placeholder.h:170 urpmi.addmedia:42
+#: po/placeholder.h:183 urpmi.addmedia:42
#, c-format
msgid ""
"%s\n"
@@ -720,7 +793,7 @@ msgstr ""
"%s\n"
"avadanlıq '%s' mövcud deyildir\n"
-#: po/placeholder.h:174 urpmi.addmedia:44
+#: po/placeholder.h:187 urpmi.addmedia:44
#, c-format
msgid ""
"%s\n"
@@ -729,7 +802,7 @@ msgstr ""
"%s\n"
"<hdlistin nisbi yolu> mövcud deyildir\n"
-#: po/placeholder.h:178
+#: po/placeholder.h:191
#, c-format
msgid ""
"usage: urpmi.update [-a] <name> ...\n"
@@ -748,13 +821,13 @@ msgstr ""
"\n"
"namə'lum seçənəklər '%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 ""
"güncəllənəcək bir şey yoxdur (medya əlavə etmək üçün urpmi.addmedia "
"işlədin)\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"
@@ -763,12 +836,12 @@ msgstr ""
"güncəllənəcək giriş mövcud deyildir\n"
"(%s dan (dən) biri)\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 ""
"çıxardılacaq bir şey yoxdur (medya əlavə etmək üçün urpmi.addmedia işlədin)\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"
@@ -777,7 +850,7 @@ msgstr ""
"çıxardılacaq giriş mövcud deyildir\n"
"(%s dan (dən) biri)\n"
-#: po/placeholder.h:197
+#: po/placeholder.h:210
#, c-format
msgid ""
"usage: urpmi.removemedia [-a] <name> ...\n"
@@ -792,18 +865,12 @@ msgstr ""
"\n"
"namə'lum seçənəklər '%s' \n"
-#: po/placeholder.h:204 urpmq:85
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: \"%s\" rpm faylı oxuna bilmir\n"
-
-#: po/placeholder.h:206 urpmq:82
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-"urpmq: namə'lum seçənək \"-%s\", istifadə qaydasını --help ilə yoxlayın\n"
+#: po/placeholder.h:217
+#, fuzzy
+msgid " -h - print this help message.\n"
+msgstr " --all - bütün təqləri göstər."
-#: 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"
@@ -811,115 +878,102 @@ msgstr ""
"bə'zi paketlər güncəllənmək üçün çıxardılmalıdırlar, bu da hələlik "
"dəstəklənmir\n"
-#: po/placeholder.h:208
+#: po/placeholder.h:219
+#, fuzzy
+msgid " -g - print groups too with name.\n"
+msgstr " --group - təq qrupunu göstər: qrup."
+
+#: po/placeholder.h:220 urpmq:84
#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: \"%s\" rpm faylı oxuna bilmir\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 " paket adsız əmr sətiri)."
+
+#: 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 "Bu, pulsuz proqramdır və GNU GPL lisenziyası altında dağıdıla bilər."
+
+#: po/placeholder.h:231
+#, fuzzy
+msgid " -d - extend query to package dependencies.\n"
+msgstr " paket adsız əmr sətiri)."
+
+#: 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 ""
-"urpmq buraxılış %s\n"
-"Təlif Haqqı (C) 2000, 2001 MandrakeSoft.\n"
-"Bu, pulsuz proqramdır və GNU GPL lisenziyası ilə dağıdıla bilər.\n"
-"istifadə qaydası:\n"
-" -h - yardım ismarışı çap edilir.\n"
-" -v - təfsilatlı mod.\n"
-" -d - paket asılılqlarına tərəf sorğulamanı genişlət.\n"
-" -u - daha yaxşı buraxılışı onsuz da qurulu isə paketi çıxart.\n"
-" -m - sorğunu paket asılılıqlarına genişlət, lazım olanları\n"
-" daxil edən onsuz da qurulu paketi çıxart, gencəlləməyə\n"
-" mane olan paketi əlavə et.\n"
-" -M - sorğunu paket asılılıqlarına genişlət və paketlər eyni və "
-"ya\n"
-" daha yeni isə çıxart.\n"
-" -c - sorğulamanı bitirmə üçün bütöv yoluu işlət.\n"
-" -p - paketi tapmaq üçün gətirdikləri siyahısında axtarışa "
-"icazə ver.\n"
-" -g - adlarla birlikdə qrupları da çap et.\n"
-" -r - adla birlikdə buraxılış və yayını da çap et.\n"
-" --update - təkcə güncə medyadan istifadə et.\n"
-" --auto-select - sistemi güncəlləmək üçün paketləri öz-özünə seç.\n"
-" --headers - paket başlıqlarını urpmi db-dən\n"
-" stdout-a çap et (təkcə ali istifadəçi).\n"
-" --sources - endirmədən əvvəl bütün mənbə paketini ver (təkcə ali "
-"istifadəçi).\n"
-" --force - bir paket yoxdursa, invokasiyanı zorla.\n"
-" əmr sətirində ad ya da rpm fayllarına ehtiyac vardır.\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: namə'lum seçənək \"-%s\", istifadə qaydasını --help ilə yoxlayın\n"
-#: urpm.pm:266 urpm.pm:269
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr " \"%s\" medyası yaradıla bilmir\n"
+#: po/placeholder.h:236
+msgid ""
+" --headers - extract headers for package listed from urpmi db to\n"
+" stdout (root only).\n"
+msgstr ""
-#: urpm.pm:1339
-#, fuzzy, c-format
-msgid "read synthesis file [%s]"
-msgstr "[%s] asılılıqlar siyahısı faylı oxundu"
+#: po/placeholder.h:243
+msgid ""
+" -u - remove package if a better version is already installed.\n"
+msgstr ""
-#: urpmi:49
-#, c-format
-msgid "urpmi version %s"
-msgstr "urpmi buraxılışı %s"
+#: po/placeholder.h:244
+msgid ""
+" --force - force invocation even if some packages do not\n"
+"exist.\n"
+msgstr ""
-#: urpmi:98
+#: urpm.pm:1796 urpm.pm:1805
#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgid "removing %s to upgrade to %s ..."
msgstr ""
-"urpmq: namə'lum seçənək \"-%s\", istifadə qaydasını --help ilə yoxlayın\n"
-#: urpmi:102
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr ""
-"Yerli paketləri qurmaq üçün sadəcə olaraq sistem operatoru məs'uliyyətlidir"
+#: urpm.pm:1797 urpm.pm:1806
+msgid ", $otherPackage, "
+msgstr ", $otherPackage, "
-#: urpmi:189
-#, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Aşağıdakı paketlərin bir dənəsinə %s ehtiyac hiss edir:"
+#: urpm.pm:1797 urpm.pm:1806
+msgid "));"
+msgstr "));"
-#: urpmi:301
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
-msgstr ""
+#: urpm.pm:1802
+msgid "$p->{name}-$p->{version}-$p->{release}"
+msgstr "$p->{name}-$p->{version}-$p->{release}"
+
+#: urpm.pm:1812
+msgid "$prefix/$_"
+msgstr "$prefix/$_"
+
+#: urpmi:48
+#, c-format
+msgid "urpmi version %s"
+msgstr "urpmi buraxılışı %s"
#: urpmi.addmedia:30
msgid "usage: urpmi.addmedia [--update] <name> <url>"
@@ -950,3 +1004,129 @@ msgstr ", $_);"
#, c-format
msgid "urpmq version %s"
msgstr "urpmq buraxılışı %s"
+
+#~ msgid "retrieving [%s]"
+#~ msgstr "[%s] cəhd edilir"
+
+#~ msgid "wget of [%s] failed (maybe wget is missing?)"
+#~ msgstr "[%s] wget əməliyyatı bacarılmadı (bəlkə wget yoxdur?)"
+
+#~ msgid "unable to copy source of [%s] from [%s]"
+#~ msgstr "[%s] mənbə faylı [%s] üstündən köçürülə bilmədi"
+
+#~ msgid "removable medium not selected"
+#~ msgstr "söküləbilən medya seçili deyil"
+
+#~ msgid "source of [%s] not found as [%s]"
+#~ msgstr "[%s] mənbəyi [%s] olaraq tapılmadı"
+
+#~ 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 ""
+#~ "urpmi buraxılışı %s\n"
+#~ "Təlif Haqqı (C) 1999, 2000, 2001 MandrakeSoft.\n"
+#~ "Bu, pulsuz proqramdır və GPL lisenziyası altında yayıla bilər GPL.\n"
+#~ "istifadə qaydası:\n"
+#~ " --help - bu kömək ismarışını çap edər.\n"
+#~ " --update - təkcə güncəl medyanı işlət.\n"
+#~ " --auto - seçililər arasında ən yaxşısını seç.\n"
+#~ " --auto-select - sistemi güncəlləşdirmək üçün lazım olan paketləri "
+#~ "seçin.\n"
+#~ " --force - bir neçə paket çatmasa belə paketi qur.\n"
+#~ " --X - X ara üzünü işlət.\n"
+#~ " --best-output - proqrama uyğun gələn ən yaxşı ara üzü seç:\n"
+#~ " X və ya mətn modu.\n"
+#~ " -a - əmr sətirindəki bütün uyğun gələnləri seç.\n"
+#~ " -m - sorğulananlara ən yaxınları seç (əsas).\n"
+#~ " -M - sorğulananlara ən geniş yaxınları seç.\n"
+#~ " -c - istəklərə ən uyğun gələnlərini seç.\n"
+#~ " -q - sadə mod.\n"
+#~ " -v - ətrtaflı mod.\n"
+#~ " əmr sətirindəki adlar və ya rpm faylları (saəcə olaraq ali istifadəçi "
+#~ "isəniz).\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 ""
+#~ "urpmq buraxılış %s\n"
+#~ "Təlif Haqqı (C) 2000, 2001 MandrakeSoft.\n"
+#~ "Bu, pulsuz proqramdır və GNU GPL lisenziyası ilə dağıdıla bilər.\n"
+#~ "istifadə qaydası:\n"
+#~ " -h - yardım ismarışı çap edilir.\n"
+#~ " -v - təfsilatlı mod.\n"
+#~ " -d - paket asılılqlarına tərəf sorğulamanı genişlət.\n"
+#~ " -u - daha yaxşı buraxılışı onsuz da qurulu isə paketi "
+#~ "çıxart.\n"
+#~ " -m - sorğunu paket asılılıqlarına genişlət, lazım olanları\n"
+#~ " daxil edən onsuz da qurulu paketi çıxart, "
+#~ "gencəlləməyə\n"
+#~ " mane olan paketi əlavə et.\n"
+#~ " -M - sorğunu paket asılılıqlarına genişlət və paketlər eyni "
+#~ "və ya\n"
+#~ " daha yeni isə çıxart.\n"
+#~ " -c - sorğulamanı bitirmə üçün bütöv yoluu işlət.\n"
+#~ " -p - paketi tapmaq üçün gətirdikləri siyahısında axtarışa "
+#~ "icazə ver.\n"
+#~ " -g - adlarla birlikdə qrupları da çap et.\n"
+#~ " -r - adla birlikdə buraxılış və yayını da çap et.\n"
+#~ " --update - təkcə güncə medyadan istifadə et.\n"
+#~ " --auto-select - sistemi güncəlləmək üçün paketləri öz-özünə seç.\n"
+#~ " --headers - paket başlıqlarını urpmi db-dən\n"
+#~ " stdout-a çap et (təkcə ali istifadəçi).\n"
+#~ " --sources - endirmədən əvvəl bütün mənbə paketini ver (təkcə ali "
+#~ "istifadəçi).\n"
+#~ " --force - bir paket yoxdursa, invokasiyanı zorla.\n"
+#~ " əmr sətirində ad ya da rpm fayllarına ehtiyac vardır.\n"
diff --git a/po/bg.po b/po/bg.po
index 72e8f2f0..566ab78e 100644
--- a/po/bg.po
+++ b/po/bg.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: 2000-01-30 17:59+0100\n"
"Last-Translator: Boyan Ivanov <boyan17@bulgaria.com>\n"
"Language-Team: Bulgarian\n"
@@ -25,27 +25,27 @@ msgstr ""
"����������� ���������� �� ������ ...\n"
"��� ��������� ���������� �� ����� $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 "���� ����� �� �"
-#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:281
+#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:279
msgid "Ok"
msgstr "�����"
-#: _irpm:34 po/placeholder.h:116 urpmi:252 urpmi:282
+#: _irpm:34 po/placeholder.h:119 urpmi:252 urpmi:280
msgid "Cancel"
msgstr "�����"
-#: _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 "��Nn"
-#: _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 "��Yy"
-#: _irpm:42 po/placeholder.h:118 urpmi:258
+#: _irpm:42 po/placeholder.h:157 urpmi:258
msgid " (Y/n) "
msgstr " (�/�) "
@@ -149,120 +149,120 @@ msgstr ""
msgid "urpmi is not installed"
msgstr "urpmi �� � ����������"
-#: po/placeholder.h:29 urpm.pm:283
+#: po/placeholder.h:29
+#, c-format
+msgid "reading synthesis file [%s]"
+msgstr ""
+
+#: po/placeholder.h:30 urpm.pm:298
#, c-format
msgid "unable to write config file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:31
+#: po/placeholder.h:32
#, c-format
msgid "nothing to write in list file for \"%s\""
msgstr ""
-#: 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 ""
-#: po/placeholder.h:33
+#: po/placeholder.h:34
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr ""
-#: po/placeholder.h:34
+#: po/placeholder.h:35
#, c-format
msgid "nothing written in list file for \"%s\""
msgstr ""
-#: po/placeholder.h:35 urpm.pm:1951
-#, c-format
-msgid ""
-"removing %s to upgrade ...\n"
-" to %s since it will not upgrade correctly!"
-msgstr ""
-
-#: po/placeholder.h:39 urpm.pm:839
+#: po/placeholder.h:36 urpm.pm:845
#, c-format
msgid "read provides file [%s]"
msgstr ""
-#: po/placeholder.h:40
+#: po/placeholder.h:37 urpm.pm:1549
#, c-format
-msgid "trying to remove inexistant medium \"%s\""
+msgid "package %s is not found."
msgstr ""
-#: po/placeholder.h:41 urpm.pm:1692
+#: po/placeholder.h:38 urpm.pm:876
#, c-format
-msgid "package %s is not found."
+msgid "unable to write compss file [%s]"
msgstr ""
-#: po/placeholder.h:42
+#: po/placeholder.h:39 urpm.pm:819
#, c-format
-msgid "unable to copy source of [%s] from [%s]"
+msgid "unmounting %s"
msgstr ""
-#: po/placeholder.h:43 urpm.pm:870
+#: po/placeholder.h:40
#, c-format
-msgid "unable to write compss file [%s]"
+msgid "removing %d obsolete headers in cache"
msgstr ""
-#: po/placeholder.h:44 urpm.pm:813
+#: po/placeholder.h:41 urpm.pm:925 urpm.pm:1491
#, c-format
-msgid "unmounting %s"
+msgid "no hdlist file found for medium \"%s\""
msgstr ""
-#: po/placeholder.h:45
+#: po/placeholder.h:42 urpm.pm:160
#, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
msgstr ""
-#: po/placeholder.h:46 urpm.pm:919 urpm.pm:1634
+#: po/placeholder.h:43 urpm.pm:184
#, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
msgstr ""
-#: po/placeholder.h:47 urpm.pm:176
+#: po/placeholder.h:44 urpm.pm:191
#, c-format
msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
msgstr ""
-#: po/placeholder.h:48
+#: po/placeholder.h:45
msgid "keeping only files referenced in provides"
msgstr ""
-#: po/placeholder.h:49
+#: po/placeholder.h:46
#, c-format
msgid "unable to build synthesis file for medium \"%s\""
msgstr ""
-#: po/placeholder.h:50
+#: po/placeholder.h:47
#, c-format
msgid "found %d headers in cache"
msgstr ""
-#: po/placeholder.h:51 urpm.pm:836
+#: po/placeholder.h:48 urpm.pm:842
#, c-format
msgid "unable to read provides file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:53 urpm.pm:311
+#: po/placeholder.h:50
#, c-format
-msgid "medium \"%s\" already exists"
+msgid ""
+"removing %s to upgrade to %s ...\n"
+" since it will not be updated otherwise"
msgstr ""
-#: po/placeholder.h:54 urpm.pm:295
+#: po/placeholder.h:54 urpm.pm:326
#, c-format
-msgid "write config file [%s]"
+msgid "medium \"%s\" already exists"
msgstr ""
#: po/placeholder.h:55
@@ -270,341 +270,347 @@ msgstr ""
msgid "unable to write list file of \"%s\""
msgstr ""
-#: po/placeholder.h:56 urpm.pm:1817
-#, c-format
-msgid "retrieving [%s]"
-msgstr ""
-
-#: po/placeholder.h:57 urpm.pm:1819
+#: po/placeholder.h:56 urpm.pm:310
#, c-format
-msgid "wget of [%s] failed"
+msgid "write config file [%s]"
msgstr ""
-#: po/placeholder.h:58 urpm.pm:1101
+#: po/placeholder.h:57 urpm.pm:1107
#, fuzzy, c-format
msgid "no package named %s"
msgstr "���� ����� ������� %s\n"
-#: po/placeholder.h:59 urpm.pm:848
+#: po/placeholder.h:58 urpm.pm:854
#, c-format
msgid "unable to read compss file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:61
+#: po/placeholder.h:60
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr ""
-#: po/placeholder.h:62
+#: po/placeholder.h:61
msgid "computing dependencies"
msgstr ""
-#: po/placeholder.h:63 urpm.pm:868
+#: po/placeholder.h:62
+#, c-format
+msgid "retrieve of [%s] failed"
+msgstr ""
+
+#: po/placeholder.h:63 urpm.pm:874
#, c-format
msgid "write provides file [%s]"
msgstr ""
-#: po/placeholder.h:64 urpm.pm:803
+#: po/placeholder.h:64 urpm.pm:809
#, fuzzy, c-format
msgid "mounting %s"
msgstr "����������� %s\n"
-#: 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 "
"medium"
msgstr ""
-#: po/placeholder.h:66 urpm.pm:148
-#, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
-msgstr ""
-
-#: po/placeholder.h:67
+#: po/placeholder.h:66
#, c-format
msgid "reading hdlist file [%s]"
msgstr ""
-#: po/placeholder.h:68 urpm.pm:873
+#: po/placeholder.h:67 urpm.pm:879
#, c-format
msgid "write compss file [%s]"
msgstr ""
-#: po/placeholder.h:69 urpm.pm:827
+#: po/placeholder.h:68 urpm.pm:833
#, c-format
msgid "read depslist file [%s]"
msgstr ""
-#: po/placeholder.h:70
+#: po/placeholder.h:69 urpm.pm:103
+msgid "curl failed\n"
+msgstr ""
+
+#: po/placeholder.h:70 urpm.pm:281 urpm.pm:284
#, c-format
-msgid "trying to select inexistant medium \"%s\""
+msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr ""
-#: po/placeholder.h:71 urpm.pm:1812
+#: po/placeholder.h:71 urpm.pm:1668
#, c-format
msgid "malformed input: [%s]"
msgstr ""
-#: 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"
+msgid "there are multiple packages with the same rpm filename \"%s\""
msgstr ""
-#: 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 ""
-#: po/placeholder.h:77 urpm.pm:865
+#: po/placeholder.h:74 urpm.pm:871
#, c-format
msgid "unable to write provides file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:79 urpm.pm:1005
-msgid "unable to register rpm file"
+#: po/placeholder.h:76 urpm.pm:1215
+msgid "unable to find all synthesis file, using parsehdlist server"
msgstr ""
-#: po/placeholder.h:80 urpm.pm:1362
-msgid "unable to find all synthesis file, using parsehdlist server"
+#: po/placeholder.h:77 urpm.pm:1011
+msgid "unable to register rpm file"
msgstr ""
-#: po/placeholder.h:81 urpm.pm:241
+#: po/placeholder.h:78 urpm.pm:256
#, c-format
msgid "unable to inspect list file for \"%s\", medium ignored"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:83
+#: po/placeholder.h:81
#, c-format
msgid "copy of [%s] failed"
msgstr ""
-#: 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 ""
+
+#: 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 ""
-#: po/placeholder.h:85 urpm.pm:824
+#: po/placeholder.h:84 urpm.pm:1192
#, c-format
-msgid "unable to read depslist file [%s]"
+msgid "read synthesis file [%s]"
msgstr ""
-#: po/placeholder.h:86
-msgid "removable medium not selected"
+#: po/placeholder.h:85 urpm.pm:830
+#, c-format
+msgid "unable to read depslist file [%s]"
msgstr ""
-#: po/placeholder.h:87 urpm.pm:851
+#: po/placeholder.h:86 urpm.pm:857
#, c-format
msgid "read compss file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:89
+#: po/placeholder.h:88
#, c-format
msgid "building hdlist [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:91 urpm.pm:1009
+#: po/placeholder.h:90 urpm.pm:1015
msgid "error registering local packages"
msgstr ""
-#: po/placeholder.h:92 urpm.pm:1762
+#: po/placeholder.h:91 urpm.pm:273
#, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "taking removable device as \"%s\""
msgstr ""
-#: po/placeholder.h:93
+#: po/placeholder.h:92 urpm.pm:1619
#, c-format
-msgid "unable to build hdlist: %s"
+msgid "incoherent medium \"%s\" marked removable but not really"
msgstr ""
-#: po/placeholder.h:94 urpm.pm:1000
+#: po/placeholder.h:93
#, c-format
-msgid "invalid rpm file name [%s]"
+msgid "unable to build hdlist: %s"
msgstr ""
-#: po/placeholder.h:95 urpm.pm:1736 urpm.pm:1739 urpm.pm:1758
+#: po/placeholder.h:94 urpm.pm:1593 urpm.pm:1596 urpm.pm:1615
#, c-format
msgid "medium \"%s\" is not selected"
msgstr ""
-#: po/placeholder.h:96 urpm.pm:207
+#: po/placeholder.h:95 urpm.pm:1006
#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "invalid rpm file name [%s]"
msgstr ""
-#: po/placeholder.h:97 urpm.pm:863
+#: po/placeholder.h:96 urpm.pm:1175
#, c-format
-msgid "write depslist file [%s]"
+msgid "unknown data associated with %s"
msgstr ""
-#: po/placeholder.h:98 urpm.pm:1322
+#: po/placeholder.h:97 urpm.pm:222
#, c-format
-msgid "unknown data associated with %s"
+msgid "trying to bypass existing medium \"%s\", avoiding"
msgstr ""
-#: po/placeholder.h:99
+#: po/placeholder.h:98 urpm.pm:869
#, c-format
-msgid "source of [%s] not found as [%s]"
+msgid "write depslist file [%s]"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: po/placeholder.h:102
+#: po/placeholder.h:101 urpm.pm:1007
#, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
+msgid "unable to access rpm file [%s]"
msgstr ""
-#: po/placeholder.h:103 urpm.pm:1001
+#: po/placeholder.h:102 urpm.pm:866
#, c-format
-msgid "unable to access rpm file [%s]"
+msgid "unable to write depslist file [%s]"
msgstr ""
-#: po/placeholder.h:104 urpm.pm:860
+#: po/placeholder.h:103
#, c-format
-msgid "unable to write depslist file [%s]"
+msgid ""
+"removing %s to upgrade to %s ...\n"
+" since it will not upgrade correctly!"
msgstr ""
-#: po/placeholder.h:105 urpm.pm:327 urpm.pm:1773
+#: po/placeholder.h:107 urpm.pm:342 urpm.pm:1630
#, c-format
msgid "unable to access medium \"%s\""
msgstr ""
-#: po/placeholder.h:106 urpm.pm:988
+#: po/placeholder.h:108 urpm.pm:994
#, c-format
msgid "relocated %s entries in depslist"
msgstr ""
-#: 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\""
+msgid "trying to select inexistent medium \"%s\""
+msgstr ""
+
+#: po/placeholder.h:110 urpm.pm:97
+msgid "wget failed\n"
msgstr ""
-#: 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]"
+msgid "unable to parse correctly [%s] on value \"%s\""
msgstr ""
-#: po/placeholder.h:109 urpm.pm:1104
+#: po/placeholder.h:112 urpm.pm:1110
#, fuzzy, c-format
msgid "The following packages contain %s: %s"
msgstr "���� ������ �������� %s: %s\n"
-#: 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\""
+msgid "no rpm files found from [%s]"
msgstr ""
-#: po/placeholder.h:111 urpm.pm:1920
+#: po/placeholder.h:114 urpm.pm:1772
#, c-format
msgid "selecting %s using obsoletes"
msgstr ""
-#: po/placeholder.h:112 urpm.pm:2031
+#: po/placeholder.h:115 urpm.pm:1888
#, c-format
msgid "selecting %s by selection on files"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:114 urpmi:308 urpmi:315 urpmi:328 urpmi:339 urpmi:352
-msgid "Installation failed"
-msgstr "������������ ���������"
+#: po/placeholder.h:120
+msgid " --help - print this help message.\n"
+msgstr ""
-#: po/placeholder.h:115 urpmi:279
-msgid "Press enter when it's done..."
-msgstr "��������� enter,������ ��� ������"
+#: po/placeholder.h:121 urpmi:361
+msgid "everything already installed"
+msgstr "������ � ����������� ����"
-#: po/placeholder.h:117 urpmi:201
-msgid "Sorry, bad choice, try again\n"
-msgstr "���������,��� �����, �������� ������\n"
+#: po/placeholder.h:122 urpmi:98
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr ""
-#: po/placeholder.h:120
-#, fuzzy, c-format
+#: po/placeholder.h:123 urpmi:194
+msgid "One of the following packages is needed:"
+msgstr "���� �� ���� ������ � ���������:"
+
+#: po/placeholder.h:124 po/placeholder.h:222
+msgid " --update - use only update media.\n"
+msgstr ""
+
+#: po/placeholder.h:125 urpmi:299
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"
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
msgstr ""
-"urpmi ������ %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"���� � �������� ������� � ���� �� ���� ��������������� �������� GNU GPL "
-"�������.\n"
-"����� �� ����������:\n"
-" --help - ��������� ���� ���������.\n"
-" --auto - ����������� ������ ����� ����� � ������� ������.\n"
-" --auto-select - ����������� ������ ������ �� ������������ �� "
-"���������.\n"
-" --force - ����������,���� � ��� ����� ����� ������.\n"
-" --X - �������� � ���������.\n"
-" --best-output - ������ ���-������ ���������,������ ������� - � ��� "
-"�������.\n"
-" -a - ������ ������ ������,����� �� ���������,� ���������.\n"
-" -c - ������ �������� ����� �� ��������� �� �������������.\n"
-" -q - ��� �����.\n"
-" -v - ����� �����.\n"
-
-#: po/placeholder.h:142 urpmi:362
-msgid "everything already installed"
-msgstr "������ � ����������� ����"
-#: po/placeholder.h:143 urpmi:247
+#: 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 "������������ ���������"
+
+#: po/placeholder.h:132 po/placeholder.h:234
+msgid ""
+" --auto-select - automatically select packages for upgrading the system.\n"
+msgstr ""
+
+#: po/placeholder.h:134
+msgid " --X - use X interface.\n"
+msgstr ""
+
+#: po/placeholder.h:135 urpmi:247
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -612,49 +618,113 @@ msgid ""
msgstr ""
"�� �� �� ������� �������������,���� ������ �� ����� ����������� (%d MB)"
-#: po/placeholder.h:144 urpmi:296
-#, c-format
-msgid "installing %s\n"
-msgstr "����������� %s\n"
+#: po/placeholder.h:136 urpmi:320 urpmi:344
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "���� �� ����������� ��� �������� �� �����������? (�/�) "
-#: po/placeholder.h:145 urpmi:198
+#: 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
+msgid " -q - quiet mode.\n"
+msgstr ""
+
+#: po/placeholder.h:144 urpmi:202
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "����� � ������ �����? (1-%d) "
-#: po/placeholder.h:146 urpmi:321 urpmi:345
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "���� �� ����������� ��� �������� �� �����������? (�/�) "
+#: po/placeholder.h:145
+msgid " --wget - use wget to retrieve distant files.\n"
+msgstr ""
-#: po/placeholder.h:147 urpmi:190
-msgid "One of the following packages is needed:"
-msgstr "���� �� ���� ������ � ���������:"
+#: po/placeholder.h:146
+#, 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"
+msgstr ""
-#: po/placeholder.h:148 urpmi:149
+#: po/placeholder.h:152 urpmi:328 urpmi:352
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "���� �� ����������� ���� ��-����� (--force)? (�/�) "
+
+#: po/placeholder.h:154
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+
+#: po/placeholder.h:155 urpmi:205
+msgid "Sorry, bad choice, try again\n"
+msgstr "���������,��� �����, �������� ������\n"
+
+#: po/placeholder.h:156
+msgid ""
+" names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: po/placeholder.h:158
+msgid " -a - select all matches on command line.\n"
+msgstr ""
+
+#: 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 "����������� %s\n"
+
+#: po/placeholder.h:161 urpmi:152
msgid "Only superuser is allowed to install local packages"
msgstr "���� superuser-� ��� ������� �� ��������� ������� ������"
-#: po/placeholder.h:149 urpmi:278
+#: po/placeholder.h:162 urpmi:276
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "���� ������� %s ������� %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 ""
-#: po/placeholder.h:151 urpmi:329 urpmi:353
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "���� �� ����������� ���� ��-����� (--force)? (�/�) "
+#: po/placeholder.h:165 urpmi:102
+#, fuzzy
+msgid "Only superuser is allowed to install packages"
+msgstr "���� superuser-� ��� ������� �� ��������� ������� ������"
+
+#: po/placeholder.h:166 urpmi:193
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "���� �� ���� ������ � ���������:"
+
+#: po/placeholder.h:167 urpmi:277
+msgid "Press Enter when it's done..."
+msgstr "��������� enter,������ ��� ������"
-#: po/placeholder.h:155 urpmi.addmedia:46
+#: po/placeholder.h:168 urpmi.addmedia:46
#, c-format
msgid ""
"%s\n"
"`with' missing for ftp media\n"
msgstr ""
-#: po/placeholder.h:159
+#: po/placeholder.h:172
msgid ""
"usage: urpmi.addmedia [--update] <name> <url>\n"
"where <url> is one of\n"
@@ -666,31 +736,31 @@ msgid ""
" removable_<device>://<path>\n"
msgstr ""
-#: po/placeholder.h:168 urpmi.addmedia:57
+#: po/placeholder.h:181 urpmi.addmedia:57
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr ""
-#: po/placeholder.h:169 urpmi.addmedia:58
+#: po/placeholder.h:182 urpmi.addmedia:58
#, c-format
msgid "unable to update medium \"%s\"\n"
msgstr ""
-#: po/placeholder.h:170 urpmi.addmedia:42
+#: po/placeholder.h:183 urpmi.addmedia:42
#, c-format
msgid ""
"%s\n"
"device `%s' do not exist\n"
msgstr ""
-#: po/placeholder.h:174 urpmi.addmedia:44
+#: po/placeholder.h:187 urpmi.addmedia:44
#, c-format
msgid ""
"%s\n"
"<relative path of hdlist> missing\n"
msgstr ""
-#: po/placeholder.h:178
+#: po/placeholder.h:191
#, c-format
msgid ""
"usage: urpmi.update [-a] <name> ...\n"
@@ -702,29 +772,29 @@ msgid ""
"unknown options '%s'\n"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:188 urpmi.update:53
+#: po/placeholder.h:201 urpmi.update:53
#, c-format
msgid ""
"the entry to update is missing\n"
"(one of %s)\n"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:193 urpmi.removemedia:46
+#: po/placeholder.h:206 urpmi.removemedia:46
#, c-format
msgid ""
"the entry to remove is missing\n"
"(one of %s)\n"
msgstr ""
-#: po/placeholder.h:197
+#: po/placeholder.h:210
#, c-format
msgid ""
"usage: urpmi.removemedia [-a] <name> ...\n"
@@ -734,23 +804,38 @@ msgid ""
"unknown options '%s'\n"
msgstr ""
-#: po/placeholder.h:204 urpmq:85
+#: po/placeholder.h:217
+msgid " -h - print this help message.\n"
+msgstr ""
+
+#: po/placeholder.h:218 urpmq:130
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+
+#: po/placeholder.h:219
+msgid " -g - print groups too with name.\n"
+msgstr ""
+
+#: po/placeholder.h:220 urpmq:84
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr ""
-#: po/placeholder.h:206 urpmq:82
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#: po/placeholder.h:221
+msgid " names or rpm files given on command line are queried.\n"
msgstr ""
-#: po/placeholder.h:207 urpmq:131
-msgid ""
-"some package have to be removed for being upgraded, this is not supported "
-"yet\n"
+#: po/placeholder.h:223
+msgid " -r - print version and release too with name.\n"
+msgstr ""
+
+#: po/placeholder.h:224
+msgid " -f - print version, release and arch with name.\n"
msgstr ""
-#: po/placeholder.h:208
+#: po/placeholder.h:225
#, c-format
msgid ""
"urpmq version %s\n"
@@ -758,77 +843,68 @@ msgid ""
"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 package do not exist.\n"
-" names or rpm files given on command line are queried.\n"
msgstr ""
-#: urpm.pm:257
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:231
+msgid " -d - extend query to package dependencies.\n"
msgstr ""
-#: urpm.pm:258
-#, c-format
-msgid "taking removable device as \"%s\""
+#: po/placeholder.h:232
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
msgstr ""
-#: urpm.pm:262
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
+#: po/placeholder.h:233
+msgid ""
+" -c - choose complete method for resolving requires closure.\n"
msgstr ""
-#: urpm.pm:266 urpm.pm:269
+#: po/placeholder.h:235 urpmq:81
#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
msgstr ""
-#: urpm.pm:1339
-#, c-format
-msgid "read synthesis file [%s]"
+#: po/placeholder.h:236
+msgid ""
+" --headers - extract headers for package listed from urpmi db to\n"
+" stdout (root only).\n"
msgstr ""
-#: urpmi:49
-#, c-format
-msgid "urpmi version %s"
+#: po/placeholder.h:243
+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 ""
-#: urpmi:98
+#: urpm.pm:1796 urpm.pm:1805
#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgid "removing %s to upgrade to %s ..."
msgstr ""
-#: urpmi:102
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr "���� superuser-� ��� ������� �� ��������� ������� ������"
+#: urpm.pm:1797 urpm.pm:1806
+msgid ", $otherPackage, "
+msgstr ", $otherPackage, "
-#: urpmi:189
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "���� �� ���� ������ � ���������:"
+#: urpm.pm:1797 urpm.pm:1806
+msgid "));"
+msgstr "));"
-#: urpmi:301
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+#: urpm.pm:1802
+msgid "$p->{name}-$p->{version}-$p->{release}"
+msgstr "$p->{name}-$p->{version}-$p->{release}"
+
+#: urpm.pm:1812
+msgid "$prefix/$_"
+msgstr "$prefix/$_"
+
+#: urpmi:48
+#, c-format
+msgid "urpmi version %s"
msgstr ""
#: urpmi.addmedia:30
@@ -862,11 +938,53 @@ msgstr ", $_);"
msgid "urpmq version %s"
msgstr ""
-#~ msgid "));"
-#~ msgstr "));"
-
-#~ msgid "), $_);"
-#~ msgstr "), $_);"
+#, fuzzy
+#~ 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 ""
+#~ "urpmi ������ %s\n"
+#~ "Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+#~ "���� � �������� ������� � ���� �� ���� ��������������� �������� GNU GPL "
+#~ "�������.\n"
+#~ "����� �� ����������:\n"
+#~ " --help - ��������� ���� ���������.\n"
+#~ " --auto - ����������� ������ ����� ����� � ������� ������.\n"
+#~ " --auto-select - ����������� ������ ������ �� ������������ �� "
+#~ "���������.\n"
+#~ " --force - ����������,���� � ��� ����� ����� ������.\n"
+#~ " --X - �������� � ���������.\n"
+#~ " --best-output - ������ ���-������ ���������,������ ������� - � ��� "
+#~ "�������.\n"
+#~ " -a - ������ ������ ������,����� �� ���������,� "
+#~ "���������.\n"
+#~ " -c - ������ �������� ����� �� ��������� �� "
+#~ "�������������.\n"
+#~ " -q - ��� �����.\n"
+#~ " -v - ����� �����.\n"
#~ msgid ""
#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name "
diff --git a/po/bs.po b/po/bs.po
index 90890d1e..fca1993a 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -4,7 +4,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-09-19 13:34GMT\n"
"Last-Translator: Amila Akagi� <bono@lugbih.org>\n"
"Language-Team: Bosnian <lokal-subscribe@lugbih.org>\n"
@@ -25,27 +25,27 @@ msgstr ""
"Automatska instalacija paketa..\n"
"Zahtjevali ste instalaciju paketa $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 "Je li u redu?"
-#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:281
+#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:279
msgid "Ok"
msgstr "U redu"
-#: _irpm:34 po/placeholder.h:116 urpmi:252 urpmi:282
+#: _irpm:34 po/placeholder.h:119 urpmi:252 urpmi:280
msgid "Cancel"
msgstr "Odustani"
-#: _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 "Nn"
-#: _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 "DdYy"
-#: _irpm:42 po/placeholder.h:118 urpmi:258
+#: _irpm:42 po/placeholder.h:157 urpmi:258
msgid " (Y/n) "
msgstr " (D/n) "
@@ -149,120 +149,120 @@ msgstr "poku�ajte urpmf --help za vi�e opcija"
msgid "urpmi is not installed"
msgstr "urpmi nije instaliran"
-#: po/placeholder.h:29 urpm.pm:283
+#: po/placeholder.h:29
+#, fuzzy, c-format
+msgid "reading synthesis file [%s]"
+msgstr "ne mogu kreirati medij \"%s\"\n"
+
+#: po/placeholder.h:30 urpm.pm:298
#, c-format
msgid "unable to write config file [%s]"
msgstr "nisam u mogu�nosti da zapi�em konf. datoteku [%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 ""
-#: po/placeholder.h:31
-#, c-format
+#: po/placeholder.h:32
+#, fuzzy, c-format
msgid "nothing to write in list file for \"%s\""
-msgstr ""
+msgstr "ne mogu kreirati medij \"%s\"\n"
-#: 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 ""
-#: po/placeholder.h:33
+#: po/placeholder.h:34
#, fuzzy, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "ne mogu update-irati medij \"%s\"\n"
-#: po/placeholder.h:34
-#, c-format
+#: po/placeholder.h:35
+#, fuzzy, c-format
msgid "nothing written in list file for \"%s\""
-msgstr ""
-
-#: po/placeholder.h:35 urpm.pm:1951
-#, c-format
-msgid ""
-"removing %s to upgrade ...\n"
-" to %s since it will not upgrade correctly!"
-msgstr ""
+msgstr "ne mogu kreirati medij \"%s\"\n"
-#: po/placeholder.h:39 urpm.pm:839
+#: po/placeholder.h:36 urpm.pm:845
#, c-format
msgid "read provides file [%s]"
msgstr ""
-#: po/placeholder.h:40
-#, fuzzy, c-format
-msgid "trying to remove inexistant medium \"%s\""
-msgstr "ne mogu kreirati medij \"%s\"\n"
-
-#: po/placeholder.h:41 urpm.pm:1692
+#: po/placeholder.h:37 urpm.pm:1549
#, c-format
msgid "package %s is not found."
msgstr ""
-#: po/placeholder.h:42
-#, c-format
-msgid "unable to copy source of [%s] from [%s]"
-msgstr ""
-
-#: po/placeholder.h:43 urpm.pm:870
+#: po/placeholder.h:38 urpm.pm:876
#, fuzzy, c-format
msgid "unable to write compss file [%s]"
msgstr "ne mogu kreirati medij \"%s\"\n"
-#: po/placeholder.h:44 urpm.pm:813
+#: po/placeholder.h:39 urpm.pm:819
#, c-format
msgid "unmounting %s"
msgstr ""
-#: po/placeholder.h:45
+#: po/placeholder.h:40
#, c-format
msgid "removing %d obsolete headers in cache"
msgstr ""
-#: 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 ""
-#: 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 ""
+
+#: po/placeholder.h:43 urpm.pm:184
+#, c-format
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+
+#: po/placeholder.h:44 urpm.pm:191
#, c-format
msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
msgstr ""
-#: po/placeholder.h:48
+#: po/placeholder.h:45
msgid "keeping only files referenced in provides"
msgstr ""
-#: po/placeholder.h:49
+#: po/placeholder.h:46
#, fuzzy, c-format
msgid "unable to build synthesis file for medium \"%s\""
msgstr "ne mogu update-irati medij \"%s\"\n"
-#: po/placeholder.h:50
+#: po/placeholder.h:47
#, c-format
msgid "found %d headers in cache"
msgstr ""
-#: po/placeholder.h:51 urpm.pm:836
+#: po/placeholder.h:48 urpm.pm:842
#, fuzzy, c-format
msgid "unable to read provides file [%s]"
msgstr "ne mogu kreirati medij \"%s\"\n"
-#: 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 ""
-#: po/placeholder.h:53 urpm.pm:311
+#: po/placeholder.h:50
#, c-format
-msgid "medium \"%s\" already exists"
+msgid ""
+"removing %s to upgrade to %s ...\n"
+" since it will not be updated otherwise"
msgstr ""
-#: po/placeholder.h:54 urpm.pm:295
+#: po/placeholder.h:54 urpm.pm:326
#, c-format
-msgid "write config file [%s]"
+msgid "medium \"%s\" already exists"
msgstr ""
#: po/placeholder.h:55
@@ -270,172 +270,186 @@ msgstr ""
msgid "unable to write list file of \"%s\""
msgstr "ne mogu kreirati medij \"%s\"\n"
-#: po/placeholder.h:56 urpm.pm:1817
-#, c-format
-msgid "retrieving [%s]"
-msgstr ""
-
-#: po/placeholder.h:57 urpm.pm:1819
+#: po/placeholder.h:56 urpm.pm:310
#, c-format
-msgid "wget of [%s] failed"
+msgid "write config file [%s]"
msgstr ""
-#: po/placeholder.h:58 urpm.pm:1101
+#: po/placeholder.h:57 urpm.pm:1107
#, c-format
msgid "no package named %s"
msgstr ""
-#: po/placeholder.h:59 urpm.pm:848
+#: po/placeholder.h:58 urpm.pm:854
#, fuzzy, c-format
msgid "unable to read compss file [%s]"
msgstr "ne mogu kreirati medij \"%s\"\n"
-#: 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 ""
-#: po/placeholder.h:61
-#, c-format
+#: po/placeholder.h:60
+#, fuzzy, c-format
msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "ne mogu update-irati medij \"%s\"\n"
+
+#: po/placeholder.h:61
+msgid "computing dependencies"
msgstr ""
#: po/placeholder.h:62
-msgid "computing dependencies"
+#, c-format
+msgid "retrieve of [%s] failed"
msgstr ""
-#: po/placeholder.h:63 urpm.pm:868
+#: po/placeholder.h:63 urpm.pm:874
#, c-format
msgid "write provides file [%s]"
msgstr ""
-#: po/placeholder.h:64 urpm.pm:803
+#: po/placeholder.h:64 urpm.pm:809
#, fuzzy, c-format
msgid "mounting %s"
msgstr "instaliram %s\n"
-#: 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 "
"medium"
msgstr ""
-#: po/placeholder.h:66 urpm.pm:148
-#, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
-msgstr ""
-
-#: po/placeholder.h:67
-#, c-format
+#: po/placeholder.h:66
+#, fuzzy, c-format
msgid "reading hdlist file [%s]"
-msgstr ""
+msgstr "ne mogu kreirati medij \"%s\"\n"
-#: po/placeholder.h:68 urpm.pm:873
+#: po/placeholder.h:67 urpm.pm:879
#, c-format
msgid "write compss file [%s]"
msgstr ""
-#: po/placeholder.h:69 urpm.pm:827
+#: po/placeholder.h:68 urpm.pm:833
#, c-format
msgid "read depslist file [%s]"
msgstr ""
-#: po/placeholder.h:70
+#: 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 "trying to select inexistant medium \"%s\""
+msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "ne mogu kreirati medij \"%s\"\n"
-#: po/placeholder.h:71 urpm.pm:1812
+#: po/placeholder.h:71 urpm.pm:1668
#, c-format
msgid "malformed input: [%s]"
msgstr ""
-#: 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"
+msgid "there are multiple packages with the same rpm filename \"%s\""
msgstr ""
-#: 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 ""
-#: po/placeholder.h:77 urpm.pm:865
+#: po/placeholder.h:74 urpm.pm:871
#, fuzzy, c-format
msgid "unable to write provides file [%s]"
msgstr "ne mogu kreirati medij \"%s\"\n"
-#: 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 ""
-#: po/placeholder.h:79 urpm.pm:1005
+#: po/placeholder.h:76 urpm.pm:1215
+#, fuzzy
+msgid "unable to find all synthesis file, using parsehdlist server"
+msgstr "ne mogu update-irati medij \"%s\"\n"
+
+#: po/placeholder.h:77 urpm.pm:1011
#, fuzzy
msgid "unable to register rpm file"
msgstr "ne mogu kreirati medij \"%s\"\n"
-#: po/placeholder.h:80 urpm.pm:1362
-msgid "unable to find all synthesis file, using parsehdlist server"
+#: po/placeholder.h:78 urpm.pm:256
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
msgstr ""
-#: po/placeholder.h:81 urpm.pm:241
+#: po/placeholder.h:79 urpm.pm:272
#, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "too many mount points for removable medium \"%s\""
msgstr ""
-#: po/placeholder.h:82 urpm.pm:233
+#: po/placeholder.h:80 urpm.pm:248
#, c-format
msgid "incoherent list file for \"%s\", medium ignored"
msgstr ""
-#: po/placeholder.h:83
+#: po/placeholder.h:81
#, c-format
msgid "copy of [%s] failed"
msgstr ""
-#: po/placeholder.h:84 urpm.pm:907 urpm.pm:1338 urpm.pm:1616 urpm.pm:1623
+#: po/placeholder.h:82
+#, fuzzy, c-format
+msgid "trying to remove inexistent medium \"%s\""
+msgstr "ne mogu kreirati medij \"%s\"\n"
+
+#: po/placeholder.h:83 urpm.pm:913 urpm.pm:1191 urpm.pm:1473 urpm.pm:1480
#, fuzzy, c-format
msgid "unable to parse correctly [%s]"
msgstr "ne mogu update-irati medij \"%s\"\n"
-#: po/placeholder.h:85 urpm.pm:824
+#: po/placeholder.h:84 urpm.pm:1192
#, fuzzy, c-format
-msgid "unable to read depslist file [%s]"
+msgid "read synthesis file [%s]"
msgstr "ne mogu kreirati medij \"%s\"\n"
-#: po/placeholder.h:86
-msgid "removable medium not selected"
-msgstr ""
+#: po/placeholder.h:85 urpm.pm:830
+#, fuzzy, c-format
+msgid "unable to read depslist file [%s]"
+msgstr "ne mogu kreirati medij \"%s\"\n"
-#: po/placeholder.h:87 urpm.pm:851
+#: po/placeholder.h:86 urpm.pm:857
#, c-format
msgid "read compss file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:89
-#, c-format
+#: po/placeholder.h:88
+#, fuzzy, c-format
msgid "building hdlist [%s]"
-msgstr ""
+msgstr "ne mogu update-irati medij \"%s\"\n"
-#: po/placeholder.h:90 urpm.pm:1746
+#: po/placeholder.h:89 urpm.pm:1603
#, fuzzy, c-format
msgid "unable to read rpm file [%s] from medium \"%s\""
msgstr "ne mogu kreirati medij \"%s\"\n"
-#: po/placeholder.h:91 urpm.pm:1009
+#: po/placeholder.h:90 urpm.pm:1015
msgid "error registering local packages"
msgstr ""
-#: 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 ""
@@ -445,119 +459,199 @@ msgstr ""
msgid "unable to build hdlist: %s"
msgstr "ne mogu update-irati medij \"%s\"\n"
-#: po/placeholder.h:94 urpm.pm:1000
-#, c-format
-msgid "invalid rpm file name [%s]"
-msgstr ""
-
-#: po/placeholder.h:95 urpm.pm:1736 urpm.pm:1739 urpm.pm:1758
+#: po/placeholder.h:94 urpm.pm:1593 urpm.pm:1596 urpm.pm:1615
#, c-format
msgid "medium \"%s\" is not selected"
msgstr ""
-#: po/placeholder.h:96 urpm.pm:207
+#: po/placeholder.h:95 urpm.pm:1006
#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "invalid rpm file name [%s]"
msgstr ""
-#: po/placeholder.h:97 urpm.pm:863
+#: po/placeholder.h:96 urpm.pm:1175
#, c-format
-msgid "write depslist file [%s]"
+msgid "unknown data associated with %s"
msgstr ""
-#: po/placeholder.h:98 urpm.pm:1322
+#: po/placeholder.h:97 urpm.pm:222
#, c-format
-msgid "unknown data associated with %s"
+msgid "trying to bypass existing medium \"%s\", avoiding"
msgstr ""
-#: po/placeholder.h:99
+#: po/placeholder.h:98 urpm.pm:869
#, c-format
-msgid "source of [%s] not found as [%s]"
+msgid "write depslist file [%s]"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: po/placeholder.h:102
-#, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
-msgstr ""
-
-#: po/placeholder.h:103 urpm.pm:1001
+#: po/placeholder.h:101 urpm.pm:1007
#, fuzzy, c-format
msgid "unable to access rpm file [%s]"
msgstr "ne mogu kreirati medij \"%s\"\n"
-#: po/placeholder.h:104 urpm.pm:860
+#: po/placeholder.h:102 urpm.pm:866
#, fuzzy, c-format
msgid "unable to write depslist file [%s]"
msgstr "ne mogu kreirati medij \"%s\"\n"
-#: po/placeholder.h:105 urpm.pm:327 urpm.pm:1773
+#: po/placeholder.h:103
+#, 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
#, fuzzy, c-format
msgid "unable to access medium \"%s\""
msgstr "ne mogu update-irati medij \"%s\"\n"
-#: po/placeholder.h:106 urpm.pm:988
+#: po/placeholder.h:108 urpm.pm:994
#, c-format
msgid "relocated %s entries in depslist"
msgstr ""
-#: po/placeholder.h:107 urpm.pm:914 urpm.pm:1629 urpm.pm:1680
-#, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
+#: po/placeholder.h:109
+#, fuzzy, c-format
+msgid "trying to select inexistent medium \"%s\""
+msgstr "ne mogu kreirati medij \"%s\"\n"
+
+#: po/placeholder.h:110 urpm.pm:97
+msgid "wget failed\n"
msgstr ""
-#: 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]"
+msgid "unable to parse correctly [%s] on value \"%s\""
msgstr ""
-#: po/placeholder.h:109 urpm.pm:1104
+#: po/placeholder.h:112 urpm.pm:1110
#, fuzzy, c-format
msgid "The following packages contain %s: %s"
msgstr "Jedan od sljede�ih paketa je potreban:"
-#: 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\""
+msgid "no rpm files found from [%s]"
msgstr ""
-#: po/placeholder.h:111 urpm.pm:1920
+#: po/placeholder.h:114 urpm.pm:1772
#, c-format
msgid "selecting %s using obsoletes"
msgstr ""
-#: po/placeholder.h:112 urpm.pm:2031
+#: po/placeholder.h:115 urpm.pm:1888
#, c-format
msgid "selecting %s by selection on files"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:114 urpmi:308 urpmi:315 urpmi:328 urpmi:339 urpmi:352
+#: po/placeholder.h:120
+msgid " --help - print this help message.\n"
+msgstr ""
+
+#: po/placeholder.h:121 urpmi:361
+msgid "everything already installed"
+msgstr "sve je ve� instalirano"
+
+#: po/placeholder.h:122 urpmi:98
+#, fuzzy, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: nepoznata opcija \"-$1\", provjeri upotrebu sa --help\n"
+
+#: po/placeholder.h:123 urpmi:194
+msgid "One of the following packages is needed:"
+msgstr "Jedan od sljede�ih paketa je potreban:"
+
+#: 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 "Instalacija nije uspjela"
-#: po/placeholder.h:115 urpmi:279
-msgid "Press enter when it's done..."
-msgstr "Pritisnite enter kada zavr�i..."
+#: 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 "�ao mi je, lo� izbor, probaj kasnije\n"
+#: po/placeholder.h:134
+msgid " --X - use X interface.\n"
+msgstr ""
-#: 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 ""
+"Da bi zadovoljili dependencies, sljede�i paketi �e biti instalirani (%d MB)"
+
+#: po/placeholder.h:136 urpmi:320 urpmi:344
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Poku�aj instalaciju bez provjere dependencies? (d/N)"
+
+#: 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
+msgid " -q - quiet mode.\n"
+msgstr ""
+
+#: po/placeholder.h:144 urpmi:202
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "Va� izbor je? (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"
@@ -565,91 +659,68 @@ msgid ""
"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 ""
-"urpmi verzija %s\n"
-"Autorska prava (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"Ovo je slobodan software i mo�e se distribuirati pod uslovima GNU GPL.\n"
-"koristi:\n"
-" --help - printa ovu pomo�nu poruku.\n"
-" --auto - automatski izabere dobar pakete u izborima.\n"
-" --auto-select - automatski izabere pkete za nadogradnju sistema.\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"
-" -q - quiet mode.\n"
-" -v - verbose mode.\n"
-" names or rpm files (only for root) given on command line are installed.\n"
+"Ovo je slobodan software i mo�e biti distribuiran pod uslovima GNU GPL-e."
-#: po/placeholder.h:142 urpmi:362
-msgid "everything already installed"
-msgstr "sve je ve� instalirano"
+#: po/placeholder.h:152 urpmi:328 urpmi:352
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Poku�aj instalaciju jo� ja�e (--force opcija)? (d/N) "
-#: po/placeholder.h:143 urpmi:247
-#, c-format
+#: po/placeholder.h:154
msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+" --force - force invocation even if some packages do not exist.\n"
msgstr ""
-"Da bi zadovoljili dependencies, sljede�i paketi �e biti instalirani (%d MB)"
-#: po/placeholder.h:144 urpmi:296
-#, c-format
-msgid "installing %s\n"
-msgstr "instaliram %s\n"
+#: po/placeholder.h:155 urpmi:205
+msgid "Sorry, bad choice, try again\n"
+msgstr "�ao mi je, lo� izbor, probaj kasnije\n"
-#: po/placeholder.h:145 urpmi:198
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Va� izbor je? (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 "Poku�aj instalaciju bez provjere dependencies? (d/N)"
+#: 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 "Jedan od sljede�ih paketa je potreban:"
+#: po/placeholder.h:159
+msgid " --curl - use curl to retrieve distant files.\n"
+msgstr ""
-#: po/placeholder.h:148 urpmi:149
+#: po/placeholder.h:160 urpmi:294
+#, c-format
+msgid "installing %s\n"
+msgstr "instaliram %s\n"
+
+#: po/placeholder.h:161 urpmi:152
msgid "Only superuser is allowed to install local packages"
msgstr "Jedino super korisnik (root) mo�e instalirati lokalne pakete"
-#: 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 "Molim ubacite medij sa imenom \"%s\" u ure�aj [%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 "ne mogu dobiti izvorni paket, prekidam"
-#: po/placeholder.h:151 urpmi:329 urpmi:353
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Poku�aj instalaciju jo� ja�e (--force opcija)? (d/N) "
+#: po/placeholder.h:165 urpmi:102
+#, fuzzy
+msgid "Only superuser is allowed to install packages"
+msgstr "Jedino super korisnik (root) mo�e instalirati lokalne pakete"
+
+#: po/placeholder.h:166 urpmi:193
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Jedan od sljede�ih paketa je potreban:"
-#: po/placeholder.h:155 urpmi.addmedia:46
+#: po/placeholder.h:167 urpmi:277
+msgid "Press Enter when it's done..."
+msgstr "Pritisnite enter kada zavr�i..."
+
+#: po/placeholder.h:168 urpmi.addmedia:46
#, c-format
msgid ""
"%s\n"
@@ -658,7 +729,7 @@ msgstr ""
"%s\n"
"`with' nedostaje za ftp medij\n"
-#: po/placeholder.h:159
+#: po/placeholder.h:172
#, fuzzy
msgid ""
"usage: urpmi.addmedia [--update] <name> <url>\n"
@@ -679,17 +750,17 @@ msgstr ""
" http://<host>/<path> with <relativnim nazivom datoteke hdlist>\n"
" removable_<ure�aj>://<putanja>\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 "ne mogu kreirati medij \"%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 "ne mogu update-irati medij \"%s\"\n"
-#: po/placeholder.h:170 urpmi.addmedia:42
+#: po/placeholder.h:183 urpmi.addmedia:42
#, c-format
msgid ""
"%s\n"
@@ -698,7 +769,7 @@ msgstr ""
"%s\n"
"ure�aj `%s' ne postoji\n"
-#: po/placeholder.h:174 urpmi.addmedia:44
+#: po/placeholder.h:187 urpmi.addmedia:44
#, c-format
msgid ""
"%s\n"
@@ -707,7 +778,7 @@ msgstr ""
"%s\n"
"<relativna putanja do datoteke hdlist> nedostaje\n"
-#: po/placeholder.h:178
+#: po/placeholder.h:191
#, fuzzy, c-format
msgid ""
"usage: urpmi.update [-a] <name> ...\n"
@@ -726,11 +797,11 @@ msgstr ""
"\n"
"nepoznate opcije '%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 "ni�ta za update (koriti urpmi.addmedia da doda� medij)\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"
@@ -739,11 +810,11 @@ msgstr ""
"stavka za update nedostaje\n"
"(jedan od %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 "ni�ta za uklanjanje (koristi urpmi.addmedia da doda� medij)\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"
@@ -752,7 +823,7 @@ msgstr ""
"stavka za brisanje nedostaje\n"
"(jedan od %s)\n"
-#: po/placeholder.h:197
+#: po/placeholder.h:210
#, c-format
msgid ""
"usage: urpmi.removemedia [-a] <name> ...\n"
@@ -767,17 +838,11 @@ msgstr ""
"\n"
"nepoznate opcije '%s'\n"
-#: po/placeholder.h:204 urpmq:85
-#, fuzzy, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: ne mogu pro�itati rpm datoteku \"$_\"\n"
-
-#: po/placeholder.h:206 urpmq:82
-#, fuzzy, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: nepoznata opcija \"-$1\", provjeri upotrebu sa --help\n"
+#: po/placeholder.h:217
+msgid " -h - print this help message.\n"
+msgstr ""
-#: 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"
@@ -785,87 +850,100 @@ msgstr ""
"neki paketi trebaju biti uklonjeni da bi mogli biti nadogra�eni, ovo jo� "
"nije podr�ano\n"
-#: po/placeholder.h:208
-#, c-format
+#: po/placeholder.h:219
+msgid " -g - print groups too with name.\n"
+msgstr ""
+
+#: po/placeholder.h:220 urpmq:84
+#, fuzzy, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: ne mogu pro�itati rpm datoteku \"$_\"\n"
+
+#: po/placeholder.h:221
+msgid " names or rpm files given on command line are queried.\n"
+msgstr ""
+
+#: po/placeholder.h:223
+msgid " -r - print version and release too with name.\n"
+msgstr ""
+
+#: 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"
+msgstr ""
+"Ovo je slobodan software i mo�e biti distribuiran pod uslovima GNU GPL-e."
+
+#: po/placeholder.h:231
+msgid " -d - extend query to package dependencies.\n"
+msgstr ""
+
+#: po/placeholder.h:232
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
+msgstr ""
+
+#: po/placeholder.h:233
+msgid ""
" -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"
+msgstr ""
+
+#: po/placeholder.h:235 urpmq:81
+#, fuzzy, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: nepoznata opcija \"-$1\", provjeri upotrebu sa --help\n"
+
+#: po/placeholder.h:236
+msgid ""
" --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 package do not exist.\n"
-" names or rpm files given on command line are queried.\n"
msgstr ""
-#: urpm.pm:257
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:243
+msgid ""
+" -u - remove package if a better version is already installed.\n"
msgstr ""
-#: urpm.pm:258
-#, c-format
-msgid "taking removable device as \"%s\""
+#: po/placeholder.h:244
+msgid ""
+" --force - force invocation even if some packages do not\n"
+"exist.\n"
msgstr ""
-#: urpm.pm:262
+#: urpm.pm:1796 urpm.pm:1805
#, c-format
-msgid "using different removable device [%s] for \"%s\""
+msgid "removing %s to upgrade to %s ..."
msgstr ""
-#: urpm.pm:266 urpm.pm:269
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "ne mogu kreirati medij \"%s\"\n"
+#: urpm.pm:1797 urpm.pm:1806
+msgid ", $otherPackage, "
+msgstr ", $otherPackage, "
-#: urpm.pm:1339
-#, fuzzy, c-format
-msgid "read synthesis file [%s]"
-msgstr "ne mogu kreirati medij \"%s\"\n"
+#: urpm.pm:1797 urpm.pm:1806
+msgid "));"
+msgstr "));"
+
+#: urpm.pm:1802
+msgid "$p->{name}-$p->{version}-$p->{release}"
+msgstr "$p->{name}-$p->{version}-$p->{release}"
-#: urpmi:49
+#: urpm.pm:1812
+msgid "$prefix/$_"
+msgstr "$prefix/$_"
+
+#: urpmi:48
#, c-format
msgid "urpmi version %s"
msgstr "urpmi verzija %s"
-#: urpmi:98
-#, fuzzy, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: nepoznata opcija \"-$1\", provjeri upotrebu sa --help\n"
-
-#: urpmi:102
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr "Jedino super korisnik (root) mo�e instalirati lokalne pakete"
-
-#: urpmi:189
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Jedan od sljede�ih paketa je potreban:"
-
-#: urpmi:301
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
-msgstr ""
-
#: urpmi.addmedia:30
#, fuzzy
msgid "usage: urpmi.addmedia [--update] <name> <url>"
@@ -898,3 +976,53 @@ msgstr "), $_);"
#, c-format
msgid "urpmq version %s"
msgstr "urpmq verzija %s"
+
+#, fuzzy
+#~ 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 ""
+#~ "urpmi verzija %s\n"
+#~ "Autorska prava (C) 1999, 2000, 2001 MandrakeSoft.\n"
+#~ "Ovo je slobodan software i mo�e se distribuirati pod uslovima GNU GPL.\n"
+#~ "koristi:\n"
+#~ " --help - printa ovu pomo�nu poruku.\n"
+#~ " --auto - automatski izabere dobar pakete u izborima.\n"
+#~ " --auto-select - automatski izabere pkete za nadogradnju sistema.\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"
+#~ " -q - quiet mode.\n"
+#~ " -v - verbose mode.\n"
+#~ " names or rpm files (only for root) given on command line are "
+#~ "installed.\n"
diff --git a/po/ca.po b/po/ca.po
index 8ad94264..abfa6648 100644
--- a/po/ca.po
+++ b/po/ca.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-05-07 22:25+0200\n"
"Last-Translator: Softcatal� <tradgnome@softcatala.org>\n"
"Language-Team: Catalan <info@softcatala.org>\n"
@@ -25,27 +25,27 @@ msgstr ""
"Instal�laci� autom�tica dels paquets...\n"
"Heu demanat la instal�laci� del paquet $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 "�s correcte?"
-#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:281
+#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:279
msgid "Ok"
msgstr "D'acord"
-#: _irpm:34 po/placeholder.h:116 urpmi:252 urpmi:282
+#: _irpm:34 po/placeholder.h:119 urpmi:252 urpmi:280
msgid "Cancel"
msgstr "Cancel�la"
-#: _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 "Nn"
-#: _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 "SsYy"
-#: _irpm:42 po/placeholder.h:118 urpmi:258
+#: _irpm:42 po/placeholder.h:157 urpmi:258
msgid " (Y/n) "
msgstr " (S/n) "
@@ -149,120 +149,120 @@ msgstr ""
msgid "urpmi is not installed"
msgstr "l'urpmi no est� instal�lat"
-#: po/placeholder.h:29 urpm.pm:283
+#: po/placeholder.h:29
+#, fuzzy, c-format
+msgid "reading synthesis file [%s]"
+msgstr "no es pot crear el suport \"%s\"\n"
+
+#: po/placeholder.h:30 urpm.pm:298
#, c-format
msgid "unable to write config file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:31
+#: po/placeholder.h:32
#, c-format
msgid "nothing to write in list file for \"%s\""
msgstr ""
-#: 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 ""
-#: po/placeholder.h:33
+#: po/placeholder.h:34
#, fuzzy, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "no es pot actualitzar el suport \"%s\"\n"
-#: po/placeholder.h:34
+#: po/placeholder.h:35
#, c-format
msgid "nothing written in list file for \"%s\""
msgstr ""
-#: po/placeholder.h:35 urpm.pm:1951
-#, c-format
-msgid ""
-"removing %s to upgrade ...\n"
-" to %s since it will not upgrade correctly!"
-msgstr ""
-
-#: po/placeholder.h:39 urpm.pm:839
+#: po/placeholder.h:36 urpm.pm:845
#, c-format
msgid "read provides file [%s]"
msgstr ""
-#: po/placeholder.h:40
-#, fuzzy, c-format
-msgid "trying to remove inexistant medium \"%s\""
-msgstr "no es pot crear el suport \"%s\"\n"
-
-#: po/placeholder.h:41 urpm.pm:1692
+#: po/placeholder.h:37 urpm.pm:1549
#, c-format
msgid "package %s is not found."
msgstr ""
-#: po/placeholder.h:42
-#, c-format
-msgid "unable to copy source of [%s] from [%s]"
-msgstr ""
-
-#: po/placeholder.h:43 urpm.pm:870
+#: po/placeholder.h:38 urpm.pm:876
#, fuzzy, c-format
msgid "unable to write compss file [%s]"
msgstr "no es pot crear el suport \"%s\"\n"
-#: po/placeholder.h:44 urpm.pm:813
+#: po/placeholder.h:39 urpm.pm:819
#, c-format
msgid "unmounting %s"
msgstr ""
-#: po/placeholder.h:45
+#: po/placeholder.h:40
#, c-format
msgid "removing %d obsolete headers in cache"
msgstr ""
-#: 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 ""
-#: 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 ""
+
+#: po/placeholder.h:43 urpm.pm:184
+#, c-format
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+
+#: po/placeholder.h:44 urpm.pm:191
#, c-format
msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
msgstr ""
-#: po/placeholder.h:48
+#: po/placeholder.h:45
msgid "keeping only files referenced in provides"
msgstr ""
-#: po/placeholder.h:49
+#: po/placeholder.h:46
#, fuzzy, c-format
msgid "unable to build synthesis file for medium \"%s\""
msgstr "no es pot actualitzar el suport \"%s\"\n"
-#: po/placeholder.h:50
+#: po/placeholder.h:47
#, c-format
msgid "found %d headers in cache"
msgstr ""
-#: po/placeholder.h:51 urpm.pm:836
+#: po/placeholder.h:48 urpm.pm:842
#, fuzzy, c-format
msgid "unable to read provides file [%s]"
msgstr "no es pot crear el suport \"%s\"\n"
-#: 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 ""
-#: po/placeholder.h:53 urpm.pm:311
+#: po/placeholder.h:50
#, c-format
-msgid "medium \"%s\" already exists"
+msgid ""
+"removing %s to upgrade to %s ...\n"
+" since it will not be updated otherwise"
msgstr ""
-#: po/placeholder.h:54 urpm.pm:295
+#: po/placeholder.h:54 urpm.pm:326
#, c-format
-msgid "write config file [%s]"
+msgid "medium \"%s\" already exists"
msgstr ""
#: po/placeholder.h:55
@@ -270,172 +270,186 @@ msgstr ""
msgid "unable to write list file of \"%s\""
msgstr "no es pot crear el suport \"%s\"\n"
-#: po/placeholder.h:56 urpm.pm:1817
-#, c-format
-msgid "retrieving [%s]"
-msgstr ""
-
-#: po/placeholder.h:57 urpm.pm:1819
+#: po/placeholder.h:56 urpm.pm:310
#, c-format
-msgid "wget of [%s] failed"
+msgid "write config file [%s]"
msgstr ""
-#: po/placeholder.h:58 urpm.pm:1101
+#: po/placeholder.h:57 urpm.pm:1107
#, fuzzy, c-format
msgid "no package named %s"
msgstr "no hi cap paquet anomenat %s\n"
-#: po/placeholder.h:59 urpm.pm:848
+#: po/placeholder.h:58 urpm.pm:854
#, fuzzy, c-format
msgid "unable to read compss file [%s]"
msgstr "no es pot crear el suport \"%s\"\n"
-#: 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 ""
-#: po/placeholder.h:61
+#: po/placeholder.h:60
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr ""
-#: po/placeholder.h:62
+#: po/placeholder.h:61
msgid "computing dependencies"
msgstr ""
-#: po/placeholder.h:63 urpm.pm:868
+#: po/placeholder.h:62
+#, c-format
+msgid "retrieve of [%s] failed"
+msgstr ""
+
+#: po/placeholder.h:63 urpm.pm:874
#, c-format
msgid "write provides file [%s]"
msgstr ""
-#: po/placeholder.h:64 urpm.pm:803
+#: po/placeholder.h:64 urpm.pm:809
#, fuzzy, c-format
msgid "mounting %s"
msgstr "s'est� instal�lant %s\n"
-#: 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 "
"medium"
msgstr ""
-#: po/placeholder.h:66 urpm.pm:148
-#, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
-msgstr ""
-
-#: po/placeholder.h:67
+#: po/placeholder.h:66
#, c-format
msgid "reading hdlist file [%s]"
msgstr ""
-#: po/placeholder.h:68 urpm.pm:873
+#: po/placeholder.h:67 urpm.pm:879
#, c-format
msgid "write compss file [%s]"
msgstr ""
-#: po/placeholder.h:69 urpm.pm:827
+#: po/placeholder.h:68 urpm.pm:833
#, c-format
msgid "read depslist file [%s]"
msgstr ""
-#: po/placeholder.h:70
+#: 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 "trying to select inexistant medium \"%s\""
+msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "no es pot crear el suport \"%s\"\n"
-#: po/placeholder.h:71 urpm.pm:1812
+#: po/placeholder.h:71 urpm.pm:1668
#, c-format
msgid "malformed input: [%s]"
msgstr ""
-#: 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"
+msgid "there are multiple packages with the same rpm filename \"%s\""
msgstr ""
-#: 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 ""
-#: po/placeholder.h:77 urpm.pm:865
+#: po/placeholder.h:74 urpm.pm:871
#, fuzzy, c-format
msgid "unable to write provides file [%s]"
msgstr "no es pot crear el suport \"%s\"\n"
-#: 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 ""
-#: po/placeholder.h:79 urpm.pm:1005
+#: po/placeholder.h:76 urpm.pm:1215
+#, fuzzy
+msgid "unable to find all synthesis file, using parsehdlist server"
+msgstr "no es pot actualitzar el suport \"%s\"\n"
+
+#: po/placeholder.h:77 urpm.pm:1011
#, fuzzy
msgid "unable to register rpm file"
msgstr "no es pot crear el suport \"%s\"\n"
-#: po/placeholder.h:80 urpm.pm:1362
-msgid "unable to find all synthesis file, using parsehdlist server"
+#: po/placeholder.h:78 urpm.pm:256
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
msgstr ""
-#: po/placeholder.h:81 urpm.pm:241
+#: po/placeholder.h:79 urpm.pm:272
#, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "too many mount points for removable medium \"%s\""
msgstr ""
-#: po/placeholder.h:82 urpm.pm:233
+#: po/placeholder.h:80 urpm.pm:248
#, c-format
msgid "incoherent list file for \"%s\", medium ignored"
msgstr ""
-#: po/placeholder.h:83
+#: po/placeholder.h:81
#, c-format
msgid "copy of [%s] failed"
msgstr ""
-#: po/placeholder.h:84 urpm.pm:907 urpm.pm:1338 urpm.pm:1616 urpm.pm:1623
+#: po/placeholder.h:82
+#, fuzzy, c-format
+msgid "trying to remove inexistent medium \"%s\""
+msgstr "no es pot crear el suport \"%s\"\n"
+
+#: po/placeholder.h:83 urpm.pm:913 urpm.pm:1191 urpm.pm:1473 urpm.pm:1480
#, fuzzy, c-format
msgid "unable to parse correctly [%s]"
msgstr "no es pot actualitzar el suport \"%s\"\n"
-#: po/placeholder.h:85 urpm.pm:824
+#: po/placeholder.h:84 urpm.pm:1192
#, fuzzy, c-format
-msgid "unable to read depslist file [%s]"
+msgid "read synthesis file [%s]"
msgstr "no es pot crear el suport \"%s\"\n"
-#: po/placeholder.h:86
-msgid "removable medium not selected"
-msgstr ""
+#: po/placeholder.h:85 urpm.pm:830
+#, fuzzy, c-format
+msgid "unable to read depslist file [%s]"
+msgstr "no es pot crear el suport \"%s\"\n"
-#: po/placeholder.h:87 urpm.pm:851
+#: po/placeholder.h:86 urpm.pm:857
#, c-format
msgid "read compss file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:89
+#: po/placeholder.h:88
#, c-format
msgid "building hdlist [%s]"
msgstr ""
-#: po/placeholder.h:90 urpm.pm:1746
+#: po/placeholder.h:89 urpm.pm:1603
#, fuzzy, c-format
msgid "unable to read rpm file [%s] from medium \"%s\""
msgstr "no es pot crear el suport \"%s\"\n"
-#: po/placeholder.h:91 urpm.pm:1009
+#: po/placeholder.h:90 urpm.pm:1015
msgid "error registering local packages"
msgstr ""
-#: 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 ""
@@ -445,176 +459,160 @@ msgstr ""
msgid "unable to build hdlist: %s"
msgstr "no es pot actualitzar el suport \"%s\"\n"
-#: po/placeholder.h:94 urpm.pm:1000
-#, c-format
-msgid "invalid rpm file name [%s]"
-msgstr ""
-
-#: po/placeholder.h:95 urpm.pm:1736 urpm.pm:1739 urpm.pm:1758
+#: po/placeholder.h:94 urpm.pm:1593 urpm.pm:1596 urpm.pm:1615
#, c-format
msgid "medium \"%s\" is not selected"
msgstr ""
-#: po/placeholder.h:96 urpm.pm:207
+#: po/placeholder.h:95 urpm.pm:1006
#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "invalid rpm file name [%s]"
msgstr ""
-#: po/placeholder.h:97 urpm.pm:863
+#: po/placeholder.h:96 urpm.pm:1175
#, c-format
-msgid "write depslist file [%s]"
+msgid "unknown data associated with %s"
msgstr ""
-#: po/placeholder.h:98 urpm.pm:1322
+#: po/placeholder.h:97 urpm.pm:222
#, c-format
-msgid "unknown data associated with %s"
+msgid "trying to bypass existing medium \"%s\", avoiding"
msgstr ""
-#: po/placeholder.h:99
+#: po/placeholder.h:98 urpm.pm:869
#, c-format
-msgid "source of [%s] not found as [%s]"
+msgid "write depslist file [%s]"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: po/placeholder.h:102
-#, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
-msgstr ""
-
-#: po/placeholder.h:103 urpm.pm:1001
+#: po/placeholder.h:101 urpm.pm:1007
#, fuzzy, c-format
msgid "unable to access rpm file [%s]"
msgstr "no es pot crear el suport \"%s\"\n"
-#: po/placeholder.h:104 urpm.pm:860
+#: po/placeholder.h:102 urpm.pm:866
#, fuzzy, c-format
msgid "unable to write depslist file [%s]"
msgstr "no es pot crear el suport \"%s\"\n"
-#: po/placeholder.h:105 urpm.pm:327 urpm.pm:1773
+#: po/placeholder.h:103
+#, 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
#, fuzzy, c-format
msgid "unable to access medium \"%s\""
msgstr "no es pot actualitzar el suport \"%s\"\n"
-#: po/placeholder.h:106 urpm.pm:988
+#: po/placeholder.h:108 urpm.pm:994
#, c-format
msgid "relocated %s entries in depslist"
msgstr ""
-#: po/placeholder.h:107 urpm.pm:914 urpm.pm:1629 urpm.pm:1680
-#, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
+#: po/placeholder.h:109
+#, fuzzy, c-format
+msgid "trying to select inexistent medium \"%s\""
+msgstr "no es pot crear el suport \"%s\"\n"
+
+#: po/placeholder.h:110 urpm.pm:97
+msgid "wget failed\n"
msgstr ""
-#: 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]"
+msgid "unable to parse correctly [%s] on value \"%s\""
msgstr ""
-#: po/placeholder.h:109 urpm.pm:1104
+#: po/placeholder.h:112 urpm.pm:1110
#, fuzzy, c-format
msgid "The following packages contain %s: %s"
msgstr "Els paquets seg�ents contenen %s: %s\n"
-#: 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\""
+msgid "no rpm files found from [%s]"
msgstr ""
-#: po/placeholder.h:111 urpm.pm:1920
+#: po/placeholder.h:114 urpm.pm:1772
#, c-format
msgid "selecting %s using obsoletes"
msgstr ""
-#: po/placeholder.h:112 urpm.pm:2031
+#: po/placeholder.h:115 urpm.pm:1888
#, c-format
msgid "selecting %s by selection on files"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:114 urpmi:308 urpmi:315 urpmi:328 urpmi:339 urpmi:352
-msgid "Installation failed"
-msgstr "La instal�laci� ha fallat"
-
-#: po/placeholder.h:115 urpmi:279
-msgid "Press enter when it's done..."
-msgstr "Premeu Intro quan estigui fet..."
+#: po/placeholder.h:120
+msgid " --help - print this help message.\n"
+msgstr ""
-#: po/placeholder.h:117 urpmi:201
-msgid "Sorry, bad choice, try again\n"
-msgstr "Elecci� incorrecta, torneu-ho a provar\n"
+#: po/placeholder.h:121 urpmi:361
+msgid "everything already installed"
+msgstr "ja est� tot instal�lat"
-#: po/placeholder.h:120
+#: po/placeholder.h:122 urpmi:98
#, fuzzy, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: opci� desconeguda \"-$1\", comproveu-ne la sintaxi amb --help\n"
+
+#: po/placeholder.h:123 urpmi:194
+msgid "One of the following packages is needed:"
+msgstr "Cal un dels paquets seg�ents:"
+
+#: po/placeholder.h:124 po/placeholder.h:222
+msgid " --update - use only update media.\n"
+msgstr ""
+
+#: po/placeholder.h:125 urpmi:299
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"
+"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 "La instal�laci� ha fallat"
+
+#: po/placeholder.h:132 po/placeholder.h:234
+msgid ""
+" --auto-select - automatically select packages for upgrading the system.\n"
+msgstr ""
+
+#: po/placeholder.h:134
+msgid " --X - use X interface.\n"
msgstr ""
-"urpmi versi� %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"Aquest programari �s lliure i es pot redistribuir sota els termes de la GPL "
-"de GNU.\n"
-"sintaxi:\n"
-" --help - imprimeix aquest missatge d'ajuda.\n"
-" --auto - selecciona autom�ticament un paquet bo en les "
-"eleccions.\n"
-" --auto-select - selecciona autom�ticament els paquets per actualitzar "
-"el sistema.\n"
-" --force - imposa la invocaci� encara que algun paquet no "
-"existeixi.\n"
-" --X - utilitza la interf�cie X.\n"
-" --best-output - tria la millor interf�cie segons l'entorn:\n"
-" X or mode de text.\n"
-" -a - selecciona totes les coincid�ncies en la l�nia "
-"d'ordres.\n"
-" -m - tria la clausura m�nima de requeriments "
-"(predeterminat).\n"
-" -M - tria la clausura m�xima de requeriments.\n"
-" -c - tria el m�tode complet per a la resoluci� (requereix "
-"clausura).\n"
-" -q - mode silenci�s.\n"
-" -v - mode detallat.\n"
-" s'instal�len els noms dels fitxers rpm (nom�s per al superusuari) que "
-"s'indiquen a la l�nia d'ordres.\n"
-
-#: po/placeholder.h:142 urpmi:362
-msgid "everything already installed"
-msgstr "ja est� tot instal�lat"
-#: po/placeholder.h:143 urpmi:247
+#: po/placeholder.h:135 urpmi:247
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -622,43 +620,107 @@ msgid ""
msgstr ""
"Per complir les depend�ncies, s'instal�laran els paquets seg�ents (%d MB)"
-#: po/placeholder.h:144 urpmi:296
-#, c-format
-msgid "installing %s\n"
-msgstr "s'est� instal�lant %s\n"
+#: po/placeholder.h:136 urpmi:320 urpmi:344
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr ""
+"Voleu intentar la instal�laci� sense comprovar les depend�ncies? (s/N) "
+
+#: 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
+msgid " -q - quiet mode.\n"
+msgstr ""
-#: po/placeholder.h:145 urpmi:198
+#: po/placeholder.h:144 urpmi:202
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Quina �s la vostra elecci�? (1-%d) "
-#: po/placeholder.h:146 urpmi:321 urpmi:345
-msgid "Try installation without checking dependencies? (y/N) "
+#: po/placeholder.h:145
+msgid " --wget - use wget to retrieve distant files.\n"
msgstr ""
-"Voleu intentar la instal�laci� sense comprovar les depend�ncies? (s/N) "
-#: po/placeholder.h:147 urpmi:190
-msgid "One of the following packages is needed:"
-msgstr "Cal un dels paquets seg�ents:"
+#: po/placeholder.h:146
+#, 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"
+msgstr ""
+
+#: po/placeholder.h:152 urpmi:328 urpmi:352
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Voleu intentar la insta�laci� encara amb m�s for�a (--force)? (s/N) "
+
+#: po/placeholder.h:154
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+
+#: po/placeholder.h:155 urpmi:205
+msgid "Sorry, bad choice, try again\n"
+msgstr "Elecci� incorrecta, torneu-ho a provar\n"
+
+#: po/placeholder.h:156
+msgid ""
+" names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: po/placeholder.h:158
+msgid " -a - select all matches on command line.\n"
+msgstr ""
-#: po/placeholder.h:148 urpmi:149
+#: 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 "s'est� instal�lant %s\n"
+
+#: po/placeholder.h:161 urpmi:152
msgid "Only superuser is allowed to install local packages"
msgstr "El superusuari �s l'�nic autoritzat per instal�lar paquets locals"
-#: 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 "Si us plau, inseriu el suport anomenat \"%s\" al dispositiu [%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 "no es poden recuperar els paquets font. S'est� interrompent"
-#: po/placeholder.h:151 urpmi:329 urpmi:353
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Voleu intentar la insta�laci� encara amb m�s for�a (--force)? (s/N) "
+#: po/placeholder.h:165 urpmi:102
+#, fuzzy
+msgid "Only superuser is allowed to install packages"
+msgstr "El superusuari �s l'�nic autoritzat per instal�lar paquets locals"
-#: po/placeholder.h:155 urpmi.addmedia:46
+#: po/placeholder.h:166 urpmi:193
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Cal un dels paquets seg�ents:"
+
+#: po/placeholder.h:167 urpmi:277
+msgid "Press Enter when it's done..."
+msgstr "Premeu Intro quan estigui fet..."
+
+#: po/placeholder.h:168 urpmi.addmedia:46
#, c-format
msgid ""
"%s\n"
@@ -667,7 +729,7 @@ msgstr ""
"%s\n"
"falta el `with' per als suports FTP\n"
-#: po/placeholder.h:159
+#: po/placeholder.h:172
#, fuzzy
msgid ""
"usage: urpmi.addmedia [--update] <name> <url>\n"
@@ -690,17 +752,17 @@ msgstr ""
"d'hdlist>\n"
" removable_<dispositiu>://<cam�>\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 "no es pot crear el suport \"%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 "no es pot actualitzar el suport \"%s\"\n"
-#: po/placeholder.h:170 urpmi.addmedia:42
+#: po/placeholder.h:183 urpmi.addmedia:42
#, c-format
msgid ""
"%s\n"
@@ -709,7 +771,7 @@ msgstr ""
"%s\n"
"el dispositiu `%s' no existeix\n"
-#: po/placeholder.h:174 urpmi.addmedia:44
+#: po/placeholder.h:187 urpmi.addmedia:44
#, c-format
msgid ""
"%s\n"
@@ -718,7 +780,7 @@ msgstr ""
"%s\n"
"falta el <cam� relatiu de l'hdlist>\n"
-#: po/placeholder.h:178
+#: po/placeholder.h:191
#, fuzzy, c-format
msgid ""
"usage: urpmi.update [-a] <name> ...\n"
@@ -737,13 +799,13 @@ msgstr ""
"\n"
"opcions desconegudes '%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 ""
"no hi ha res per actualitzar (utilitzeu urpmi.addmedia per afegir un "
"suport)\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"
@@ -752,12 +814,12 @@ msgstr ""
"falta l'entrada per actualitzar\n"
"(una de %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 ""
"no hi ha res per eliminar (utilitzeu urpmi.addmedia per afegir un suport)\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"
@@ -766,7 +828,7 @@ msgstr ""
"falta l'entrada per eliminar\n"
"(una de %s)\n"
-#: po/placeholder.h:197
+#: po/placeholder.h:210
#, c-format
msgid ""
"usage: urpmi.removemedia [-a] <name> ...\n"
@@ -781,17 +843,11 @@ msgstr ""
"\n"
"opcions desconegudes '%s'\n"
-#: po/placeholder.h:204 urpmq:85
-#, fuzzy, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: no es pot llegir el fitxer rpm \"$_\"\n"
-
-#: po/placeholder.h:206 urpmq:82
-#, fuzzy, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: opci� desconeguda \"-$1\", comproveu-ne la sintaxi amb --help\n"
+#: po/placeholder.h:217
+msgid " -h - print this help message.\n"
+msgstr ""
-#: 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"
@@ -799,7 +855,28 @@ msgstr ""
"s'han d'eliminar alguns paquets per poder actualitzar-los, aix� encara no es "
"pot fer\n"
-#: po/placeholder.h:208
+#: po/placeholder.h:219
+msgid " -g - print groups too with name.\n"
+msgstr ""
+
+#: po/placeholder.h:220 urpmq:84
+#, fuzzy, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: no es pot llegir el fitxer rpm \"$_\"\n"
+
+#: po/placeholder.h:221
+msgid " names or rpm files given on command line are queried.\n"
+msgstr ""
+
+#: po/placeholder.h:223
+msgid " -r - print version and release too with name.\n"
+msgstr ""
+
+#: po/placeholder.h:224
+msgid " -f - print version, release and arch with name.\n"
+msgstr ""
+
+#: po/placeholder.h:225
#, c-format
msgid ""
"urpmq version %s\n"
@@ -807,79 +884,70 @@ msgid ""
"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"
+msgstr ""
+
+#: po/placeholder.h:231
+msgid " -d - extend query to package dependencies.\n"
+msgstr ""
+
+#: po/placeholder.h:232
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
+msgstr ""
+
+#: po/placeholder.h:233
+msgid ""
" -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"
+msgstr ""
+
+#: po/placeholder.h:235 urpmq:81
+#, fuzzy, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: opci� desconeguda \"-$1\", comproveu-ne la sintaxi amb --help\n"
+
+#: po/placeholder.h:236
+msgid ""
" --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 package do not exist.\n"
-" names or rpm files given on command line are queried.\n"
msgstr ""
-#: urpm.pm:257
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:243
+msgid ""
+" -u - remove package if a better version is already installed.\n"
msgstr ""
-#: urpm.pm:258
-#, c-format
-msgid "taking removable device as \"%s\""
+#: po/placeholder.h:244
+msgid ""
+" --force - force invocation even if some packages do not\n"
+"exist.\n"
msgstr ""
-#: urpm.pm:262
+#: urpm.pm:1796 urpm.pm:1805
#, c-format
-msgid "using different removable device [%s] for \"%s\""
+msgid "removing %s to upgrade to %s ..."
msgstr ""
-#: urpm.pm:266 urpm.pm:269
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "no es pot crear el suport \"%s\"\n"
+#: urpm.pm:1797 urpm.pm:1806
+msgid ", $otherPackage, "
+msgstr ", $otherPackage, "
-#: urpm.pm:1339
-#, fuzzy, c-format
-msgid "read synthesis file [%s]"
-msgstr "no es pot crear el suport \"%s\"\n"
+#: urpm.pm:1797 urpm.pm:1806
+msgid "));"
+msgstr "));"
+
+#: urpm.pm:1802
+msgid "$p->{name}-$p->{version}-$p->{release}"
+msgstr "$p->{name}-$p->{version}-$p->{release}"
+
+#: urpm.pm:1812
+msgid "$prefix/$_"
+msgstr "$prefix/$_"
-#: urpmi:49
+#: urpmi:48
#, c-format
msgid "urpmi version %s"
msgstr "urpmi versi� %s"
-#: urpmi:98
-#, fuzzy, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: opci� desconeguda \"-$1\", comproveu-ne la sintaxi amb --help\n"
-
-#: urpmi:102
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr "El superusuari �s l'�nic autoritzat per instal�lar paquets locals"
-
-#: urpmi:189
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Cal un dels paquets seg�ents:"
-
-#: urpmi:301
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
-msgstr ""
-
#: urpmi.addmedia:30
#, fuzzy
msgid "usage: urpmi.addmedia [--update] <name> <url>"
@@ -911,11 +979,60 @@ msgstr ", $_);"
msgid "urpmq version %s"
msgstr "urpmq versi� %s"
-#~ msgid "));"
-#~ msgstr "));"
-
-#~ msgid "), $_);"
-#~ msgstr "), $_);"
+#, fuzzy
+#~ 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 ""
+#~ "urpmi versi� %s\n"
+#~ "Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+#~ "Aquest programari �s lliure i es pot redistribuir sota els termes de la "
+#~ "GPL de GNU.\n"
+#~ "sintaxi:\n"
+#~ " --help - imprimeix aquest missatge d'ajuda.\n"
+#~ " --auto - selecciona autom�ticament un paquet bo en les "
+#~ "eleccions.\n"
+#~ " --auto-select - selecciona autom�ticament els paquets per "
+#~ "actualitzar el sistema.\n"
+#~ " --force - imposa la invocaci� encara que algun paquet no "
+#~ "existeixi.\n"
+#~ " --X - utilitza la interf�cie X.\n"
+#~ " --best-output - tria la millor interf�cie segons l'entorn:\n"
+#~ " X or mode de text.\n"
+#~ " -a - selecciona totes les coincid�ncies en la l�nia "
+#~ "d'ordres.\n"
+#~ " -m - tria la clausura m�nima de requeriments "
+#~ "(predeterminat).\n"
+#~ " -M - tria la clausura m�xima de requeriments.\n"
+#~ " -c - tria el m�tode complet per a la resoluci� (requereix "
+#~ "clausura).\n"
+#~ " -q - mode silenci�s.\n"
+#~ " -v - mode detallat.\n"
+#~ " s'instal�len els noms dels fitxers rpm (nom�s per al superusuari) que "
+#~ "s'indiquen a la l�nia d'ordres.\n"
#~ msgid "unknown options \"%s\"\n"
#~ msgstr "opcions desconegudes \"%s\"\n"
diff --git a/po/create_placeholder b/po/create_placeholder
index 13dd0024..13d8310e 100755
--- a/po/create_placeholder
+++ b/po/create_placeholder
@@ -8,10 +8,18 @@ echo -e "\
char *foobar[] = { " > placeholder.h.$$
cat ../urpmf | perl -ne 's/.*\$ECHO\s+(".*").*/N_($1),/g and print' >> placeholder.h.$$
-for i in $*
-do
- ./pl_create_placeholder $i >> placeholder.h.$$
-done
+if [ "$*" = "" ]; then
+ for i in ../_irpm ../urpm.pm ../urpmf ../urpmi ../urpmi.addmedia \
+ ../urpmi.update ../urpmi.removemedia ../urpmq
+ do
+ ./pl_create_placeholder $i >> placeholder.h.$$
+ done
+else
+ for i in $*
+ do
+ ./pl_create_placeholder $i >> placeholder.h.$$
+ done
+fi
echo "};" >> placeholder.h.$$
diff --git a/po/cs.po b/po/cs.po
index 9badb9c9..7e94d363 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,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-09-15 13:23GMT+0200\n"
"Last-Translator: Radek Vyb�ral <Radek.Vybiral@vsb.cz>\n"
"Language-Team: czech <cs@li.org>\n"
@@ -27,27 +27,27 @@ msgstr ""
"Automatick� instalace bal��k�....\n"
"Zadal jste instalaci bal��ku $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 "Je to spr�vn�?"
-#: _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 "Zru�it"
-#: _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 "Nn"
-#: _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 "AaYy"
-#: _irpm:42 po/placeholder.h:118 urpmi:258
+#: _irpm:42 po/placeholder.h:157 urpmi:258
msgid " (Y/n) "
msgstr " (A/n) "
@@ -160,178 +160,179 @@ msgstr "zadejte urpmf --help pro z�sk�n� v�ce voleb"
msgid "urpmi is not installed"
msgstr "urpmi nen� nainstalov�n"
-#: po/placeholder.h:29 urpm.pm:283
+#: po/placeholder.h:29
+#, fuzzy, c-format
+msgid "reading synthesis file [%s]"
+msgstr "na��t�m soubor depslist [%s]"
+
+#: po/placeholder.h:30 urpm.pm:298
#, c-format
msgid "unable to write config file [%s]"
msgstr "nelze zapsat konfigura�n� soubor [%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 ""
-"nelze pou��t jm�no \"%s\" pro nepojmenovan� zdroj proto�e to je ji� pou�ito"
-#: po/placeholder.h:31
+#: po/placeholder.h:32
#, c-format
msgid "nothing to write in list file for \"%s\""
msgstr "nen� co zapisovat do seznamu soubor� pro \"%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 "nelze naj�t souznam soubor� pro \"%s\", zdroj se ignoruje"
-#: po/placeholder.h:33
+#: po/placeholder.h:34
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "nelze zpracovat soubor hdlist pro zdroj \"%s\""
-#: po/placeholder.h:34
+#: po/placeholder.h:35
#, c-format
msgid "nothing written in list file for \"%s\""
msgstr "nen� co zapisovat v seznamu soubor� pro \"%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 ""
-"odeb�r�m %s pro aktualizaci ...\n"
-" proto�e jinak by se aktualizace %s nezda�ila!"
-
-#: po/placeholder.h:39 urpm.pm:839
+#: po/placeholder.h:36 urpm.pm:845
#, c-format
msgid "read provides file [%s]"
msgstr "na��t�m soubor provides [%s]"
-#: po/placeholder.h:40
-#, c-format
-msgid "trying to remove inexistant medium \"%s\""
-msgstr "nelze odebrat neexistuj�c� zdroj \"%s\""
-
-#: po/placeholder.h:41 urpm.pm:1692
+#: po/placeholder.h:37 urpm.pm:1549
#, c-format
msgid "package %s is not found."
msgstr "bal��ek %s nenalezen"
-#: po/placeholder.h:42
-#, c-format
-msgid "unable to copy source of [%s] from [%s]"
-msgstr "nelze zkop�rovat zdroj [%s] na [%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 "nelze zapsat soubor compss [%s]"
-#: po/placeholder.h:44 urpm.pm:813
+#: po/placeholder.h:39 urpm.pm:819
#, c-format
msgid "unmounting %s"
msgstr "odpojuji %s"
-#: po/placeholder.h:45
+#: po/placeholder.h:40
#, c-format
msgid "removing %d obsolete headers in cache"
msgstr "odeb�r�m %d star�ch hlavi�ek"
-#: 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 "nebyl nalezen soubor hdlist pro zdroj \"%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 ""
+"zdroj \"%s\" bude ignorov�n, proto�e se pokou�� pou��t pou�it� soubor hdlist"
+
+#: po/placeholder.h:43 urpm.pm:184
+#, c-format
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"nelze pou��t jm�no \"%s\" pro nepojmenovan� zdroj proto�e to je ji� pou�ito"
+
+#: po/placeholder.h:44 urpm.pm:191
#, c-format
msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
msgstr ""
"pokud neexistuje seznam soubor��[%s], nelze za�adit zdroj \"%s\" mezi "
"pou��van�"
-#: po/placeholder.h:48
+#: po/placeholder.h:45
msgid "keeping only files referenced in provides"
msgstr "ponech�v�m pouze soubory uveden� v sekci poskytuj�c�ch"
-#: po/placeholder.h:49
+#: po/placeholder.h:46
#, c-format
msgid "unable to build synthesis file for medium \"%s\""
msgstr "nelze vytvo�it soubor synthesis pro zdroj \"%s\""
-#: po/placeholder.h:50
+#: po/placeholder.h:47
#, c-format
msgid "found %d headers in cache"
msgstr "nalezeno %d hlavi�ek"
-#: po/placeholder.h:51 urpm.pm:836
+#: po/placeholder.h:48 urpm.pm:842
#, c-format
msgid "unable to read provides file [%s]"
msgstr "nelze na��st soubor provides pro zdroj \"%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 ""
"vyhn�te se v�b�ru %s, pokud tak� nen� vybr�na podpora pro lok�ln� jazyk"
-#: 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 ""
+"odeb�r�m %s pro aktualizaci ...\n"
+" jinak %s nebude �sp�n� aktualizov�n"
+
+#: po/placeholder.h:54 urpm.pm:326
#, c-format
msgid "medium \"%s\" already exists"
msgstr "zdroj \"%s\" ji� existuje"
-#: po/placeholder.h:54 urpm.pm:295
-#, c-format
-msgid "write config file [%s]"
-msgstr "zapisuji konfigura�n� soubor [%s]"
-
#: po/placeholder.h:55
#, c-format
msgid "unable to write list file of \"%s\""
msgstr "nelze zapsat seznam soubor� pro zdroj \"%s\""
-#: po/placeholder.h:56 urpm.pm:1817
-#, c-format
-msgid "retrieving [%s]"
-msgstr "na��t�m [%s]"
-
-#: po/placeholder.h:57 urpm.pm:1819
+#: po/placeholder.h:56 urpm.pm:310
#, c-format
-msgid "wget of [%s] failed"
-msgstr "pokus o wget souboru [%s] selhal"
+msgid "write config file [%s]"
+msgstr "zapisuji konfigura�n� soubor [%s]"
-#: po/placeholder.h:58 urpm.pm:1101
+#: po/placeholder.h:57 urpm.pm:1107
#, c-format
msgid "no package named %s"
msgstr "��dn� bal��ek nem� jm�no %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 "nelze na��st soubor compss pro zdroj \"%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 "nelze nal�zt soubor hdlist pro \"%s\", zdroj bude ignorov�n"
-#: po/placeholder.h:61
+#: po/placeholder.h:60
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "vytv���m soubor hdlist pro zdroj \"%s\""
-#: po/placeholder.h:62
+#: po/placeholder.h:61
msgid "computing dependencies"
msgstr "zpracov�v�m z�vislosti"
-#: po/placeholder.h:63 urpm.pm:868
+#: po/placeholder.h:62
+#, fuzzy, c-format
+msgid "retrieve of [%s] failed"
+msgstr "pokus o wget souboru [%s] selhal"
+
+#: po/placeholder.h:63 urpm.pm:874
#, c-format
msgid "write provides file [%s]"
msgstr "zapisuji soubor provides [%s]"
-#: po/placeholder.h:64 urpm.pm:803
+#: po/placeholder.h:64 urpm.pm:809
#, c-format
msgid "mounting %s"
msgstr "p�ipojuji %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 "
@@ -339,125 +340,136 @@ msgid ""
msgstr ""
"nelze pracovat se zdrojem \"%s\", pokud je seznam soubor� vyu��v�n jin�m"
-#: po/placeholder.h:66 urpm.pm:148
-#, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
-msgstr ""
-"zdroj \"%s\" bude ignorov�n, proto�e se pokou�� pou��t ji� pou�it� seznam"
-
-#: po/placeholder.h:67
+#: po/placeholder.h:66
#, c-format
msgid "reading hdlist file [%s]"
msgstr "na��t�m soubor hdlist [%s]"
-#: po/placeholder.h:68 urpm.pm:873
+#: po/placeholder.h:67 urpm.pm:879
#, c-format
msgid "write compss file [%s]"
msgstr "zapisuji soubor compss [%s]"
-#: po/placeholder.h:69 urpm.pm:827
+#: po/placeholder.h:68 urpm.pm:833
#, c-format
msgid "read depslist file [%s]"
msgstr "na��t�m soubor depslist [%s]"
-#: po/placeholder.h:70
-#, c-format
-msgid "trying to select inexistant medium \"%s\""
-msgstr "nelze vybrat neexistuj�c� zdroj \"%s\""
+#: po/placeholder.h:69 urpm.pm:103
+msgid "curl failed\n"
+msgstr ""
-#: po/placeholder.h:71 urpm.pm:1812
+#: po/placeholder.h:70 urpm.pm:281 urpm.pm:284
+#, fuzzy, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "nelze vytvo�it zdroj \"%s\"\n"
+
+#: po/placeholder.h:71 urpm.pm:1668
#, c-format
msgid "malformed input: [%s]"
msgstr "nespr�vn� vstup: [%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 ""
-"zdroj \"%s\" bude ignorov�n, proto�e se pokou�� pou��t pou�it� soubor hdlist"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "v�ce bal��k� m� stejn� jm�no rpm souboru \"%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 ""
-"odeb�r�m %s pro aktualizaci ...\n"
-" jinak %s nebude �sp�n� aktualizov�n"
+"zdroj \"%s\" bude ignorov�n, proto�e se pokou�� pou��t ji� pou�it� seznam"
-#: po/placeholder.h:77 urpm.pm:865
+#: po/placeholder.h:74 urpm.pm:871
#, c-format
msgid "unable to write provides file [%s]"
msgstr "nelze zapsat soubor provides [%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 ""
"zdroj \"%s\" bude ignorov�n, proto�e nelze na��st soubor hdlist pro zdroj"
-#: po/placeholder.h:79 urpm.pm:1005
-msgid "unable to register rpm file"
-msgstr "nelze zaregistrovat rpm soubor"
-
-#: 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 "nelze nal�zt v�echny soubory, pou�iju parsehdlist server"
-#: po/placeholder.h:81 urpm.pm:241
+#: po/placeholder.h:77 urpm.pm:1011
+msgid "unable to register rpm file"
+msgstr "nelze zaregistrovat rpm soubor"
+
+#: po/placeholder.h:78 urpm.pm:256
#, c-format
msgid "unable to inspect list file for \"%s\", medium ignored"
msgstr "nelze prozkoumat seznam soubor� pro \"%s\", zdroj bude ignorov�n"
-#: 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 "nesouvisl� seznam soubor� pro \"%s\", zdroj bude ignorov�n"
-#: po/placeholder.h:83
+#: po/placeholder.h:81
#, c-format
msgid "copy of [%s] failed"
msgstr "kop�rov�n� [%s] selhalo"
-#: 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 "nelze odebrat neexistuj�c� zdroj \"%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 "nelze spr�vn� zpracovat [%s]"
-#: po/placeholder.h:85 urpm.pm:824
+#: po/placeholder.h:84 urpm.pm:1192
+#, fuzzy, c-format
+msgid "read synthesis file [%s]"
+msgstr "na��t�m soubor depslist [%s]"
+
+#: po/placeholder.h:85 urpm.pm:830
#, c-format
msgid "unable to read depslist file [%s]"
msgstr "nelze na��st soubor depslist [%s]"
-#: po/placeholder.h:86
-msgid "removable medium not selected"
-msgstr "nebylo vybr�no vyj�mateln� m�dium"
-
-#: po/placeholder.h:87 urpm.pm:851
+#: po/placeholder.h:86 urpm.pm:857
#, c-format
msgid "read compss file [%s]"
msgstr "na��t�m compss soubor [%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 "syntaktick� chyba v konfigura�n�m souboru na ��dku %s"
-#: po/placeholder.h:89
+#: po/placeholder.h:88
#, c-format
msgid "building hdlist [%s]"
msgstr "vytv���m 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 "nelze na��st rpm soubor [%s] pro zdroj \"%s\""
-#: po/placeholder.h:91 urpm.pm:1009
+#: po/placeholder.h:90 urpm.pm:1015
msgid "error registering local packages"
msgstr "chyba p�i registraci lok�ln�ch bal��k�"
-#: 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 "nesouvisl� m�dium \"%s\" je ozna�eno jako vyj�mateln�"
@@ -467,215 +479,276 @@ msgstr "nesouvisl� m�dium \"%s\" je ozna�eno jako vyj�mateln�"
msgid "unable to build hdlist: %s"
msgstr "nelze vytvo�it 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 "zdroj \"%s\" nen� vybr�n"
+
+#: po/placeholder.h:95 urpm.pm:1006
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "nespr�vn� jm�no rpm souboru [%s]"
-#: 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 "zdroj \"%s\" nen� vybr�n"
+msgid "unknown data associated with %s"
+msgstr "nezn�m� data asociov�na s %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 "pokus o vynech�n� existuj�c�ho zdroje \"%s\""
-#: po/placeholder.h:97 urpm.pm:863
+#: po/placeholder.h:98 urpm.pm:869
#, c-format
msgid "write depslist file [%s]"
msgstr "zapisuji soubor depslist [%s]"
-#: po/placeholder.h:98 urpm.pm:1322
-#, c-format
-msgid "unknown data associated with %s"
-msgstr "nezn�m� data asociov�na s %s"
-
-#: po/placeholder.h:99
-#, c-format
-msgid "source of [%s] not found as [%s]"
-msgstr "zdroj pro [%s] nenalezeno jako [%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 "nelze z�skat seznam soubor� pro \"%s\", zdroj bude ignorov�n"
-#: 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 "vyvarujte se vybrat %s dokud nebude dost soubor� aktualizov�no"
-#: po/placeholder.h:102
-#, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
-msgstr "pokus o wget souboru [%s] selhal (nechyb� 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 "nelze zp��stupnit rpm soubor [%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 "nelze zapsat depslist soubor [%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 ""
+"odeb�r�m %s pro aktualizaci ...\n"
+" proto�e jinak by se aktualizace %s nezda�ila!"
+
+#: po/placeholder.h:107 urpm.pm:342 urpm.pm:1630
#, c-format
msgid "unable to access medium \"%s\""
msgstr "nelze p�istoupit na zdroj \"%s\""
-#: po/placeholder.h:106 urpm.pm:988
+#: po/placeholder.h:108 urpm.pm:994
#, c-format
msgid "relocated %s entries in depslist"
msgstr "p�esunut� polo�ky %s v souboru depslist"
-#: 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 "nelze korektn� zpracovat [%s] kv�li hodnot� \"%s\""
+msgid "trying to select inexistent medium \"%s\""
+msgstr "nelze vybrat neexistuj�c� zdroj \"%s\""
+
+#: po/placeholder.h:110 urpm.pm:97
+#, fuzzy
+msgid "wget failed\n"
+msgstr "pokus o wget souboru [%s] selhal"
-#: 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 "nebyl nalezen ��dn� rpm soubor na [%s]"
+msgid "unable to parse correctly [%s] on value \"%s\""
+msgstr "nelze korektn� zpracovat [%s] kv�li hodnot� \"%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 "N�sleduj�c� bal��ky obsahuj�: %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 "v�ce bal��k� m� stejn� jm�no rpm souboru \"%s\""
+msgid "no rpm files found from [%s]"
+msgstr "nebyl nalezen ��dn� rpm soubor na [%s]"
-#: po/placeholder.h:111 urpm.pm:1920
+#: po/placeholder.h:114 urpm.pm:1772
#, c-format
msgid "selecting %s using obsoletes"
msgstr "vyb�r�m %s za pou�it� vlastnosti nahrazen�"
-#: po/placeholder.h:112 urpm.pm:2031
+#: po/placeholder.h:115 urpm.pm:1888
#, c-format
msgid "selecting %s by selection on files"
msgstr "vyb�r�m %s na z�klad� v�b�ru soubor�"
-#: 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 "nelze zjistit zdroj pro tento soubor 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 - vyp��e v�echny tagy."
+
+#: po/placeholder.h:121 urpmi:361
+msgid "everything already installed"
+msgstr "v�e je ji� nainstalov�no"
+
+#: po/placeholder.h:122 urpmi:98
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: nezn�m� volba \"%s\", zp�sob pou�it� vyvol�te zad�n�m --help\n"
+
+#: po/placeholder.h:123 urpmi:194
+msgid "One of the following packages is needed:"
+msgstr "Je zapot�eb� jeden z n�sleduj�c�ch bal��k�:"
+
+#: 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 "Chyba p�i instalaci"
-#: po/placeholder.h:115 urpmi:279
-msgid "Press enter when it's done..."
-msgstr "A potom stiskn�te Enter..."
+#: 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 "Je mi l�to, to je �patn� volba. Zkuste to znovu\n"
+#: po/placeholder.h:134
+#, fuzzy
+msgid " --X - use X interface.\n"
+msgstr " --all - vyp��e v�echny tagy."
-#: 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 ""
+"Aby byly spln�ny z�vislosti, budou nainstalov�ny n�sleduj�c� bal��ky (%d MB)"
+
+#: po/placeholder.h:136 urpmi:320 urpmi:344
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "M�m zkusit instalaci bez kontroly z�vislost�? (a/N) "
+
+#: 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 - vyp��e v�echny tagy."
+
+#: po/placeholder.h:144 urpmi:202
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "Jak� je va�e volba? (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 ""
-"urpmi verze %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"Tento software lze voln� ���it podle licence GNU GPL.\n"
-"pou�it�:\n"
-" --help - zobraz� tuto n�pov�du.\n"
-" --update - pou�ije pouze zdroje pro aktualizace.\n"
-" --auto - automaticky vybere z voleb spr�vn� bal��ek.\n"
-" --auto-select - automaticky vybere bal��ky pro aktualizaci syst�mu.\n"
-" --force - provede spu�t�n� i tehdy, pokud n�kter� bal��ek chyb�.\n"
-" --X - pou�it� v X.\n"
-" --best-output - vybere nejlep�� rozhran� podle prost�ed�:\n"
-"X nebo textov� re�im.\n"
-" -a - vybere v�echny vyhovuj�c� z p��kazov� ��dky.\n"
-" -m - vybere minim�ln� mno�inu z pot�ebn�ch (v�choz�).\n"
-" -M - vybere maxim�ln� mno�inu z pot�ebn�ch.\n"
-" -c - vybere kompletn� metodu pro rozhodov�n� o pot�ebn�ch\n"
-" mno�in�ch.\n"
-" --p - vyhled� bal��ek ve skupin� provides\n"
-" -q - tich� re�im.\n"
-" -v - re�im s v�pisy.\n"
-" jm�no nebo rpm soubory (pouze pro roota) zadan� z p��kazov� ��dky jsou\n"
-" instalov�ny.\n"
-
-#: po/placeholder.h:142 urpmi:362
-msgid "everything already installed"
-msgstr "v�e je ji� nainstalov�no"
+"Toto je svobodn� software a je voln� �i�iteln� podle podm�nek licence 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 "M�m zkusit instalaci je�t� razantn�ji (--force)? (a/N) "
+
+#: po/placeholder.h:154
msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+" --force - force invocation even if some packages do not exist.\n"
msgstr ""
-"Aby byly spln�ny z�vislosti, budou nainstalov�ny n�sleduj�c� bal��ky (%d MB)"
-#: po/placeholder.h:144 urpmi:296
-#, c-format
-msgid "installing %s\n"
-msgstr "instaluji %s\n"
+#: po/placeholder.h:155 urpmi:205
+msgid "Sorry, bad choice, try again\n"
+msgstr "Je mi l�to, to je �patn� volba. Zkuste to znovu\n"
-#: po/placeholder.h:145 urpmi:198
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Jak� je va�e volba? (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 "M�m zkusit instalaci bez kontroly z�vislost�? (a/N) "
+#: 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 "Je zapot�eb� jeden z n�sleduj�c�ch bal��k�:"
+#: 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 "instaluji %s\n"
-#: po/placeholder.h:148 urpmi:149
+#: po/placeholder.h:161 urpmi:152
msgid "Only superuser is allowed to install local packages"
msgstr "Instalovat bal�ky m��e pouze root"
-#: 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 "Pros�m vlo�te m�dium nazvan� \"%s\" do za��zen� [%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 "nelze z�skat zdrojov� bal��ek, kon��m"
-#: po/placeholder.h:151 urpmi:329 urpmi:353
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "M�m zkusit instalaci je�t� razantn�ji (--force)? (a/N) "
+#: po/placeholder.h:165 urpmi:102
+#, fuzzy
+msgid "Only superuser is allowed to install packages"
+msgstr "Instalovat bal�ky m��e pouze root"
-#: po/placeholder.h:155 urpmi.addmedia:46
+#: po/placeholder.h:166 urpmi:193
+#, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr ""
+"Pro instalaci %s je zapot�eb� nainstalovat jeden z n�sleduj�c�ch bal��k�:"
+
+#: po/placeholder.h:167 urpmi:277
+msgid "Press Enter when it's done..."
+msgstr "A potom stiskn�te Enter..."
+
+#: po/placeholder.h:168 urpmi.addmedia:46
#, c-format
msgid ""
"%s\n"
@@ -684,7 +757,7 @@ msgstr ""
"%s\n"
" chyb� pro FTP zdroj\n"
-#: po/placeholder.h:159
+#: po/placeholder.h:172
msgid ""
"usage: urpmi.addmedia [--update] <name> <url>\n"
"where <url> is one of\n"
@@ -704,17 +777,17 @@ msgstr ""
" http://<host>/<cesta> with <relativn�m jm�nem souboru hdlist>\n"
" removable_<za��zen�>://<cesta>\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 "nelze vytvo�it zdroj \"%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 "nelze aktualizovat zdroj \"%s\"\n"
-#: po/placeholder.h:170 urpmi.addmedia:42
+#: po/placeholder.h:183 urpmi.addmedia:42
#, c-format
msgid ""
"%s\n"
@@ -723,7 +796,7 @@ msgstr ""
"%s\n"
"za��zen� '%s' neexistuje\n"
-#: po/placeholder.h:174 urpmi.addmedia:44
+#: po/placeholder.h:187 urpmi.addmedia:44
#, c-format
msgid ""
"%s\n"
@@ -732,7 +805,7 @@ msgstr ""
"%s\n"
"<relativn� cestak hdlistu> chyb�\n"
-#: po/placeholder.h:178
+#: po/placeholder.h:191
#, c-format
msgid ""
"usage: urpmi.update [-a] <name> ...\n"
@@ -751,11 +824,11 @@ msgstr ""
"\n"
"nezn�m� volba '%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 "nic k aktualizaci (pou�ijte urpmi.addmedia pro p�id�n� zdroje)\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"
@@ -764,11 +837,11 @@ msgstr ""
"z�znam pro update chyb�\n"
"(jeden z %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 "nic k odebr�n� (pou�ijte urpmi.addmedia pro p�id�n� zdroje)\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"
@@ -777,7 +850,7 @@ msgstr ""
"z�znam pro odebr�n� chyb�\n"
"(jeden z %s)\n"
-#: po/placeholder.h:197
+#: po/placeholder.h:210
#, c-format
msgid ""
"usage: urpmi.removemedia [-a] <name> ...\n"
@@ -792,134 +865,115 @@ msgstr ""
"\n"
"nezn�m� volba '%s'\n"
-#: po/placeholder.h:204 urpmq:85
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: nemohu p�e��st rpm soubor \"%s\"\n"
-
-#: po/placeholder.h:206 urpmq:82
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: nezn�m� volba \"%s\", zp�sob pou�it� vyvol�te s --help\n"
+#: po/placeholder.h:217
+#, fuzzy
+msgid " -h - print this help message.\n"
+msgstr " --all - vyp��e v�echny tagy."
-#: 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 ""
"n�kter� bal��ky pro upgrade se mus� odebrat, toto je zat�m nepodporov�no\n"
-#: po/placeholder.h:208
+#: po/placeholder.h:219
+#, fuzzy
+msgid " -g - print groups too with name.\n"
+msgstr " --group - vyp��e tag skupina: group."
+
+#: po/placeholder.h:220 urpmq:84
#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: nemohu p�e��st rpm soubor \"%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 " zad�n na p��kazov� ��dce ale bez jm�na bal��ku)."
+
+#: 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"
+msgstr ""
+"Toto je svobodn� software a je voln� �i�iteln� podle podm�nek licence GNU "
+"GPL."
+
+#: po/placeholder.h:231
+#, fuzzy
+msgid " -d - extend query to package dependencies.\n"
+msgstr " zad�n na p��kazov� ��dce ale bez jm�na bal��ku)."
+
+#: po/placeholder.h:232
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
+msgstr ""
+
+#: po/placeholder.h:233
+msgid ""
" -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"
+msgstr ""
+
+#: po/placeholder.h:235 urpmq:81
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: nezn�m� volba \"%s\", zp�sob pou�it� vyvol�te s --help\n"
+
+#: po/placeholder.h:236
+msgid ""
" --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 package do not exist.\n"
-" names or rpm files given on command line are queried.\n"
msgstr ""
-"urpmq verze: %s\n"
-"Copyright (C) 2000, 2001 MandrakeSoft.\n"
-"Tento software lze voln� ���it podle licence GNU GPL.\n"
-"pou�it�:\n"
-" -h - zobraz� tuto n�pov�du.\n"
-" -v - re�im s v�pisy.\n"
-" -d - roz���en� dotaz na z�vislosti bal��k�.\n"
-" -u - odebere bal��ek, pokud je ji� nainstalov�na nov�j�� "
-"verze.\n"
-" -m - roz���en� dotaz na z�vislosti bal��k�, odebere ji� "
-"instalovan�\n"
-" bal��ky, kter� poskytuj� nezbytn� z�vislosti, p�id� "
-"bal��ky,\n"
-" kter� mohou blokovat aktualizaci.\n"
-" -M - roz���en� dotaz na z�vislosti bal��k�, kdy odebere ji�\n"
-" nainstalovan� bal��ky pouze pokud jsou nov�j�� �i "
-"stejn�.\n"
-" -c - vybere kompletn� metodu pro rozhodov�n� o pot�ebn�ch\n"
-" mno�in�ch.\n"
-" --p - vyhled� bal��ek ve skupin� provides.\n"
-" -g - krom� jm�na vyp��e tak� skupinu.\n"
-" --update - pou��t pouze zdroje pro aktualizace.\n"
-" --auto-select - automaticky vybere bal��ky pro aktualizaci syst�mu.\n"
-" --headers - vyp��e hlavi�ky rpm bal��k� z datab�ze pro urpmi na "
-"standardn�\n"
-" - v�stup (pouze pro u�ivatele root).\n"
-" --sources - vyp��e seznam v�ech zdroj� d��ve ne� za�ne stahov�n�\n"
-" (pouze pro u�ivatele root).\n"
-" --force - provede spu�t�n� i tehdy, pokud n�kter� bal��ek chyb�.\n"
-" jm�no nebo rpm soubory zadan� z p��kazov� ��dky jsou vy�adov�ny.\n"
-
-#: urpm.pm:257
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+
+#: po/placeholder.h:243
+msgid ""
+" -u - remove package if a better version is already installed.\n"
msgstr ""
-#: urpm.pm:258
-#, c-format
-msgid "taking removable device as \"%s\""
+#: po/placeholder.h:244
+msgid ""
+" --force - force invocation even if some packages do not\n"
+"exist.\n"
msgstr ""
-#: urpm.pm:262
+#: urpm.pm:1796 urpm.pm:1805
#, c-format
-msgid "using different removable device [%s] for \"%s\""
+msgid "removing %s to upgrade to %s ..."
msgstr ""
-#: urpm.pm:266 urpm.pm:269
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "nelze vytvo�it zdroj \"%s\"\n"
-
-#: urpm.pm:1339
-#, fuzzy, c-format
-msgid "read synthesis file [%s]"
-msgstr "na��t�m soubor depslist [%s]"
+#: urpm.pm:1797 urpm.pm:1806
+msgid ", $otherPackage, "
+msgstr ", $otherPackage, "
-#: urpmi:49
-#, c-format
-msgid "urpmi version %s"
-msgstr "urpmi verze %s"
+#: urpm.pm:1797 urpm.pm:1806
+msgid "));"
+msgstr "));"
-#: urpmi:98
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: nezn�m� volba \"%s\", zp�sob pou�it� vyvol�te zad�n�m --help\n"
+#: urpm.pm:1802
+msgid "$p->{name}-$p->{version}-$p->{release}"
+msgstr "$p->{name}-$p->{version}-$p->{release}"
-#: urpmi:102
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr "Instalovat bal�ky m��e pouze root"
+#: urpm.pm:1812
+msgid "$prefix/$_"
+msgstr "$prefix/$_"
-#: urpmi:189
+#: urpmi:48
#, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr ""
-"Pro instalaci %s je zapot�eb� nainstalovat jeden z n�sleduj�c�ch bal��k�:"
-
-#: urpmi:301
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
-msgstr ""
+msgid "urpmi version %s"
+msgstr "urpmi verze %s"
#: urpmi.addmedia:30
msgid "usage: urpmi.addmedia [--update] <name> <url>"
@@ -950,3 +1004,134 @@ msgstr ", $_);"
#, c-format
msgid "urpmq version %s"
msgstr "urpmq verze %s"
+
+#~ msgid "retrieving [%s]"
+#~ msgstr "na��t�m [%s]"
+
+#~ msgid "wget of [%s] failed (maybe wget is missing?)"
+#~ msgstr "pokus o wget souboru [%s] selhal (nechyb� wget?)"
+
+#~ msgid "unable to copy source of [%s] from [%s]"
+#~ msgstr "nelze zkop�rovat zdroj [%s] na [%s]"
+
+#~ msgid "removable medium not selected"
+#~ msgstr "nebylo vybr�no vyj�mateln� m�dium"
+
+#~ msgid "source of [%s] not found as [%s]"
+#~ msgstr "zdroj pro [%s] nenalezeno jako [%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 ""
+#~ "urpmi verze %s\n"
+#~ "Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+#~ "Tento software lze voln� ���it podle licence GNU GPL.\n"
+#~ "pou�it�:\n"
+#~ " --help - zobraz� tuto n�pov�du.\n"
+#~ " --update - pou�ije pouze zdroje pro aktualizace.\n"
+#~ " --auto - automaticky vybere z voleb spr�vn� bal��ek.\n"
+#~ " --auto-select - automaticky vybere bal��ky pro aktualizaci syst�mu.\n"
+#~ " --force - provede spu�t�n� i tehdy, pokud n�kter� bal��ek "
+#~ "chyb�.\n"
+#~ " --X - pou�it� v X.\n"
+#~ " --best-output - vybere nejlep�� rozhran� podle prost�ed�:\n"
+#~ "X nebo textov� re�im.\n"
+#~ " -a - vybere v�echny vyhovuj�c� z p��kazov� ��dky.\n"
+#~ " -m - vybere minim�ln� mno�inu z pot�ebn�ch (v�choz�).\n"
+#~ " -M - vybere maxim�ln� mno�inu z pot�ebn�ch.\n"
+#~ " -c - vybere kompletn� metodu pro rozhodov�n� o "
+#~ "pot�ebn�ch\n"
+#~ " mno�in�ch.\n"
+#~ " --p - vyhled� bal��ek ve skupin� provides\n"
+#~ " -q - tich� re�im.\n"
+#~ " -v - re�im s v�pisy.\n"
+#~ " jm�no nebo rpm soubory (pouze pro roota) zadan� z p��kazov� ��dky jsou\n"
+#~ " instalov�ny.\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 ""
+#~ "urpmq verze: %s\n"
+#~ "Copyright (C) 2000, 2001 MandrakeSoft.\n"
+#~ "Tento software lze voln� ���it podle licence GNU GPL.\n"
+#~ "pou�it�:\n"
+#~ " -h - zobraz� tuto n�pov�du.\n"
+#~ " -v - re�im s v�pisy.\n"
+#~ " -d - roz���en� dotaz na z�vislosti bal��k�.\n"
+#~ " -u - odebere bal��ek, pokud je ji� nainstalov�na nov�j�� "
+#~ "verze.\n"
+#~ " -m - roz���en� dotaz na z�vislosti bal��k�, odebere ji� "
+#~ "instalovan�\n"
+#~ " bal��ky, kter� poskytuj� nezbytn� z�vislosti, p�id� "
+#~ "bal��ky,\n"
+#~ " kter� mohou blokovat aktualizaci.\n"
+#~ " -M - roz���en� dotaz na z�vislosti bal��k�, kdy odebere ji�\n"
+#~ " nainstalovan� bal��ky pouze pokud jsou nov�j�� �i "
+#~ "stejn�.\n"
+#~ " -c - vybere kompletn� metodu pro rozhodov�n� o pot�ebn�ch\n"
+#~ " mno�in�ch.\n"
+#~ " --p - vyhled� bal��ek ve skupin� provides.\n"
+#~ " -g - krom� jm�na vyp��e tak� skupinu.\n"
+#~ " --update - pou��t pouze zdroje pro aktualizace.\n"
+#~ " --auto-select - automaticky vybere bal��ky pro aktualizaci syst�mu.\n"
+#~ " --headers - vyp��e hlavi�ky rpm bal��k� z datab�ze pro urpmi na "
+#~ "standardn�\n"
+#~ " - v�stup (pouze pro u�ivatele root).\n"
+#~ " --sources - vyp��e seznam v�ech zdroj� d��ve ne� za�ne stahov�n�\n"
+#~ " (pouze pro u�ivatele root).\n"
+#~ " --force - provede spu�t�n� i tehdy, pokud n�kter� bal��ek "
+#~ "chyb�.\n"
+#~ " jm�no nebo rpm soubory zadan� z p��kazov� ��dky jsou vy�adov�ny.\n"
diff --git a/po/da.po b/po/da.po
index 4d9a65bb..c37b33e3 100644
--- a/po/da.po
+++ b/po/da.po
@@ -9,7 +9,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-11-23 14:45+0100\n"
"Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
"Language-Team: dansk <dansk@klid.dk>\n"
@@ -30,27 +30,27 @@ msgstr ""
"Automatisk installation af pakker...\n"
"Du bestilte installation af pakke $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 "Er det o.k.?"
-#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:281
+#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:279
msgid "Ok"
msgstr "O.k."
-#: _irpm:34 po/placeholder.h:116 urpmi:252 urpmi:282
+#: _irpm:34 po/placeholder.h:119 urpmi:252 urpmi:280
msgid "Cancel"
msgstr "Annull�r"
-#: _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 "Nn"
-#: _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 "YyJj"
-#: _irpm:42 po/placeholder.h:118 urpmi:258
+#: _irpm:42 po/placeholder.h:157 urpmi:258
msgid " (Y/n) "
msgstr " (J/n) "
@@ -162,176 +162,176 @@ msgstr "pr�v urpmf --help for flere valgmuligheder"
msgid "urpmi is not installed"
msgstr "urpmi er ikke installeret"
-#: po/placeholder.h:29 urpm.pm:283
+#: po/placeholder.h:29
+#, fuzzy, c-format
+msgid "reading synthesis file [%s]"
+msgstr "l�s syntese-fil [%s]"
+
+#: po/placeholder.h:30 urpm.pm:298
#, c-format
msgid "unable to write config file [%s]"
msgstr "kunne ikke skrive config-fil [%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"
-msgstr ""
-"kunne ikke bruge navn \"%s\" for media uden navn da navnet allerede er brugt"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "bruger en anden udskiftelig enhed [%s] for \"%s\""
-#: po/placeholder.h:31
+#: po/placeholder.h:32
#, c-format
msgid "nothing to write in list file for \"%s\""
msgstr "ingenting at skrive i listefil for \"%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 "kunne ikke finde listefil for \"%s\", media ignoreret"
-#: po/placeholder.h:33
+#: po/placeholder.h:34
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "kunne ikke fortolke hdlist-filen \"%s\""
-#: po/placeholder.h:34
+#: po/placeholder.h:35
#, c-format
msgid "nothing written in list file for \"%s\""
msgstr "ingenting skrevet i listefil for \"%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 ""
-"fjerner %s for at opgradere ...\n"
-" til %s da den ikke vil opgradere korrekt!"
-
-#: po/placeholder.h:39 urpm.pm:839
+#: po/placeholder.h:36 urpm.pm:845
#, c-format
msgid "read provides file [%s]"
msgstr "l�s tilbuds-fil [%s]"
-#: po/placeholder.h:40
-#, c-format
-msgid "trying to remove inexistant medium \"%s\""
-msgstr "pr�ver at fjerne media \"%s\" som ikke eksisterer"
-
-#: po/placeholder.h:41 urpm.pm:1692
+#: po/placeholder.h:37 urpm.pm:1549
#, c-format
msgid "package %s is not found."
msgstr "pakke %s er ikke fundet."
-#: po/placeholder.h:42
-#, c-format
-msgid "unable to copy source of [%s] from [%s]"
-msgstr "kunne ikke kopiere kilde for [%s] fra [%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 "kunne ikke skrive compss-fil [%s]"
-#: po/placeholder.h:44 urpm.pm:813
+#: po/placeholder.h:39 urpm.pm:819
#, c-format
msgid "unmounting %s"
msgstr "afmonterer %s"
-#: po/placeholder.h:45
+#: po/placeholder.h:40
#, c-format
msgid "removing %d obsolete headers in cache"
msgstr "fjerner %d for�ldede hoveder i hurtiglager"
-#: 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 "ingen hdlist-fil fundet for media \"%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 "media \"%s\" pr�ver at bruge en allerede brugt hdlist, media ignoreret"
+
+#: po/placeholder.h:43 urpm.pm:184
+#, c-format
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"kunne ikke bruge navn \"%s\" for media uden navn da navnet allerede er brugt"
+
+#: po/placeholder.h:44 urpm.pm:191
#, c-format
msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
msgstr ""
"kunne ikke tage media \"%s\" i beregning da ingen listefil [%s] eksisterer"
-#: po/placeholder.h:48
+#: po/placeholder.h:45
msgid "keeping only files referenced in provides"
msgstr "behold kun filer n�vnt i tilbud"
-#: po/placeholder.h:49
+#: po/placeholder.h:46
#, c-format
msgid "unable to build synthesis file for medium \"%s\""
msgstr "kunne ikke bygge synthesis fil for media \"%s\""
-#: po/placeholder.h:50
+#: po/placeholder.h:47
#, c-format
msgid "found %d headers in cache"
msgstr "fandt %d hoveder i hurtiglager"
-#: po/placeholder.h:51 urpm.pm:836
+#: po/placeholder.h:48 urpm.pm:842
#, c-format
msgid "unable to read provides file [%s]"
msgstr "kunne ikke l�se tilbuds-fil [%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 "undg� valg af %s da dens lokale sprog ikke er valgt allerede"
-#: 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 ""
+"fjerner %s for at opgradere ...\n"
+" til %s da den ikke vil blive opdateret ellers"
+
+#: po/placeholder.h:54 urpm.pm:326
#, c-format
msgid "medium \"%s\" already exists"
msgstr "media \"%s\" eksisterer allerede"
-#: po/placeholder.h:54 urpm.pm:295
-#, c-format
-msgid "write config file [%s]"
-msgstr "skriv config fil [%s]"
-
#: po/placeholder.h:55
#, c-format
msgid "unable to write list file of \"%s\""
msgstr "kunne ikke skrive listefil for \"%s\""
-#: po/placeholder.h:56 urpm.pm:1817
+#: po/placeholder.h:56 urpm.pm:310
#, c-format
-msgid "retrieving [%s]"
-msgstr "modtager [%s]"
-
-#: po/placeholder.h:57 urpm.pm:1819
-#, c-format
-msgid "wget of [%s] failed"
-msgstr "wget af [%s] mislykkedes"
+msgid "write config file [%s]"
+msgstr "skriv config fil [%s]"
-#: po/placeholder.h:58 urpm.pm:1101
+#: po/placeholder.h:57 urpm.pm:1107
#, c-format
msgid "no package named %s"
msgstr "ingen pakke kaldet %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 "kunne ikke l�se compss-fil [%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 "kunne ikke finde hdlist-fil for \"%s\", media ignoreret"
-#: po/placeholder.h:61
+#: po/placeholder.h:60
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "byggede hdlist synthesis fil for media \"%s\""
-#: po/placeholder.h:62
+#: po/placeholder.h:61
msgid "computing dependencies"
msgstr "beregner afh�ngigheder"
-#: po/placeholder.h:63 urpm.pm:868
+#: po/placeholder.h:62
+#, fuzzy, c-format
+msgid "retrieve of [%s] failed"
+msgstr "wget af [%s] mislykkedes"
+
+#: po/placeholder.h:63 urpm.pm:874
#, c-format
msgid "write provides file [%s]"
msgstr "skriv tilbuds-fil [%s]"
-#: po/placeholder.h:64 urpm.pm:803
+#: po/placeholder.h:64 urpm.pm:809
#, c-format
msgid "mounting %s"
msgstr "monterer %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 "
@@ -340,122 +340,134 @@ msgstr ""
"kan ikke behandle media \"%s\" da listefil allerede bliver brugt af et andet "
"media"
-#: po/placeholder.h:66 urpm.pm:148
-#, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
-msgstr "media \"%s\" pr�ver at bruge en allerede brugt liste, media ignoreret"
-
-#: po/placeholder.h:67
+#: po/placeholder.h:66
#, c-format
msgid "reading hdlist file [%s]"
msgstr "l�ser hdlist-fil [%s]"
-#: po/placeholder.h:68 urpm.pm:873
+#: po/placeholder.h:67 urpm.pm:879
#, c-format
msgid "write compss file [%s]"
msgstr "skriv compss-fil [%s]"
-#: po/placeholder.h:69 urpm.pm:827
+#: po/placeholder.h:68 urpm.pm:833
#, c-format
msgid "read depslist file [%s]"
msgstr "l�s depslist-fil [%s]"
-#: po/placeholder.h:70
+#: po/placeholder.h:69 urpm.pm:103
+msgid "curl failed\n"
+msgstr ""
+
+#: po/placeholder.h:70 urpm.pm:281 urpm.pm:284
#, c-format
-msgid "trying to select inexistant medium \"%s\""
-msgstr "pr�ver at v�lge ikke-eksisterende media \"%s\""
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "kan ikke finde stinavn for udskifteligt medie \"%s\""
-#: po/placeholder.h:71 urpm.pm:1812
+#: po/placeholder.h:71 urpm.pm:1668
#, c-format
msgid "malformed input: [%s]"
msgstr "malformed input: [%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 "media \"%s\" pr�ver at bruge en allerede brugt hdlist, media ignoreret"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "der er flere pakker med samme rpm-filnavn \"%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"
-msgstr ""
-"fjerner %s for at opgradere ...\n"
-" til %s da den ikke vil blive opdateret ellers"
+msgid "medium \"%s\" tries to use an already used list, medium ignored"
+msgstr "media \"%s\" pr�ver at bruge en allerede brugt liste, media ignoreret"
-#: po/placeholder.h:77 urpm.pm:865
+#: po/placeholder.h:74 urpm.pm:871
#, c-format
msgid "unable to write provides file [%s]"
msgstr "kunne ikke skrive tilbuds-fil [%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 "kunne ikke n� hdlist-fil af \"%s\", media ignoreret"
-#: po/placeholder.h:79 urpm.pm:1005
-msgid "unable to register rpm file"
-msgstr "kunne ikke registrere rpm-fil"
-
-#: 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 "kunne ikke finde alle synthesis file, bruger parsehdlist tjener"
-#: po/placeholder.h:81 urpm.pm:241
+#: po/placeholder.h:77 urpm.pm:1011
+msgid "unable to register rpm file"
+msgstr "kunne ikke registrere rpm-fil"
+
+#: po/placeholder.h:78 urpm.pm:256
#, c-format
msgid "unable to inspect list file for \"%s\", medium ignored"
msgstr "kunne ikke inspicere listefil for \"%s\", media ignoreret"
-#: 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 "For mange monteringspunkter for udskifteligt medium \"%s\""
+
+#: po/placeholder.h:80 urpm.pm:248
#, c-format
msgid "incoherent list file for \"%s\", medium ignored"
msgstr "inkonsistent listefil for \"%s\", media ignoreret"
-#: po/placeholder.h:83
+#: po/placeholder.h:81
#, c-format
msgid "copy of [%s] failed"
msgstr "kopi af [%s] mislykkedes"
-#: 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 "pr�ver at fjerne media \"%s\" som ikke eksisterer"
+
+#: 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 "kunne ikke fortolke [%s] korrekt"
-#: po/placeholder.h:85 urpm.pm:824
+#: po/placeholder.h:84 urpm.pm:1192
+#, c-format
+msgid "read synthesis file [%s]"
+msgstr "l�s syntese-fil [%s]"
+
+#: po/placeholder.h:85 urpm.pm:830
#, c-format
msgid "unable to read depslist file [%s]"
msgstr "kunne ikke l�se depslist fil [%s]"
-#: po/placeholder.h:86
-msgid "removable medium not selected"
-msgstr "fjernbart media ikke valgt"
-
-#: po/placeholder.h:87 urpm.pm:851
+#: po/placeholder.h:86 urpm.pm:857
#, c-format
msgid "read compss file [%s]"
msgstr "l�s compss fil [%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 "syntaksfejl i config fil ved linje %s"
-#: po/placeholder.h:89
+#: po/placeholder.h:88
#, c-format
msgid "building hdlist [%s]"
msgstr "bygger 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 "kunne ikke l�se rpm-fil [%s] fra media \"%s\""
-#: po/placeholder.h:91 urpm.pm:1009
+#: po/placeholder.h:90 urpm.pm:1015
msgid "error registering local packages"
msgstr "fejl ved registrering af lokale pakker"
-#: po/placeholder.h:92 urpm.pm:1762
+#: po/placeholder.h:91 urpm.pm:273
+#, c-format
+msgid "taking removable device as \"%s\""
+msgstr "tager udskifteligt medium som \"%s\""
+
+#: po/placeholder.h:92 urpm.pm:1619
#, c-format
msgid "incoherent medium \"%s\" marked removable but not really"
msgstr "inkonsistent media \"%s\" m�rket fjernbart, men er det ikke"
@@ -465,173 +477,165 @@ msgstr "inkonsistent media \"%s\" m�rket fjernbart, men er det ikke"
msgid "unable to build hdlist: %s"
msgstr "kunne ikke bygge 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 "media \"%s\" er ikke valgt"
+
+#: po/placeholder.h:95 urpm.pm:1006
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "ugyldigt rpm-filnavn [%s]"
-#: 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 "media \"%s\" er ikke valgt"
+msgid "unknown data associated with %s"
+msgstr "ukendt data associeret med %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 "pr�ver at forbig� eksisterende media \"%s\", undg�r"
-#: po/placeholder.h:97 urpm.pm:863
+#: po/placeholder.h:98 urpm.pm:869
#, c-format
msgid "write depslist file [%s]"
msgstr "skriv depslist fil [%s]"
-#: po/placeholder.h:98 urpm.pm:1322
-#, c-format
-msgid "unknown data associated with %s"
-msgstr "ukendt data associeret med %s"
-
-#: po/placeholder.h:99
-#, c-format
-msgid "source of [%s] not found as [%s]"
-msgstr "kilden til [%s] ikke fundet som [%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 "kan ikke f� adgang til filen \"%s\", media ignoreret"
-#: 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 "undg�r at v�lge %s da ikke nok filer vil blive opdateret"
-#: po/placeholder.h:102
-#, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
-msgstr "wget af [%s] mislykkedes (m�ske mangler 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 "kunne ikke n� rpm fil [%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 "kunne ikke skrive depslist fil [%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 ""
+"fjerner %s for at opgradere ...\n"
+" til %s da den ikke vil opgradere korrekt!"
+
+#: po/placeholder.h:107 urpm.pm:342 urpm.pm:1630
#, c-format
msgid "unable to access medium \"%s\""
msgstr "kunne ikke n� media \"%s\""
-#: po/placeholder.h:106 urpm.pm:988
+#: po/placeholder.h:108 urpm.pm:994
#, c-format
msgid "relocated %s entries in depslist"
msgstr "omflyttede %s indgange i depsliste"
-#: 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 "kunne ikke fortolke [%s] korrekt bed v�rdi \"%s\""
+msgid "trying to select inexistent medium \"%s\""
+msgstr "pr�ver at v�lge ikke-eksisterende media \"%s\""
-#: po/placeholder.h:108
+#: po/placeholder.h:110 urpm.pm:97
+#, fuzzy
+msgid "wget failed\n"
+msgstr "wget af [%s] mislykkedes"
+
+#: po/placeholder.h:111 urpm.pm:920 urpm.pm:1486 urpm.pm:1537
#, c-format
-msgid "no rpm files found from [%s]"
-msgstr "ingen rpm filer fundet fra [%s]"
+msgid "unable to parse correctly [%s] on value \"%s\""
+msgstr "kunne ikke fortolke [%s] korrekt bed v�rdi \"%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 "F�lgende pakker indeholder %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 "der er flere pakker med samme rpm-filnavn \"%s\""
+msgid "no rpm files found from [%s]"
+msgstr "ingen rpm filer fundet fra [%s]"
-#: po/placeholder.h:111 urpm.pm:1920
+#: po/placeholder.h:114 urpm.pm:1772
#, c-format
msgid "selecting %s using obsoletes"
msgstr "v�lger %s ved at bruge obsolete"
-#: po/placeholder.h:112 urpm.pm:2031
+#: po/placeholder.h:115 urpm.pm:1888
#, c-format
msgid "selecting %s by selection on files"
msgstr "v�lger %s ved valg af filer"
-#: 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 "kunne ikke bedstemme media for denne hdlist-fil [%s]"
-#: po/placeholder.h:114 urpmi:308 urpmi:315 urpmi:328 urpmi:339 urpmi:352
-msgid "Installation failed"
-msgstr "Installationen fejlede"
-
-#: po/placeholder.h:115 urpmi:279
-msgid "Press enter when it's done..."
-msgstr "Tryk p� retur, n�r den er f�rdig..."
+#: po/placeholder.h:120
+#, fuzzy
+msgid " --help - print this help message.\n"
+msgstr " --all - skriv alle m�rker."
-#: po/placeholder.h:117 urpmi:201
-msgid "Sorry, bad choice, try again\n"
-msgstr "Undskyld, d�rligt valg, pr�v igen\n"
+#: po/placeholder.h:121 urpmi:361
+msgid "everything already installed"
+msgstr "alting er allerede installeret"
-#: po/placeholder.h:120
+#: po/placeholder.h:122 urpmi:98
#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: ukendt parameter \"-%s\", tjek brug med --help\n"
+
+#: po/placeholder.h:123 urpmi:194
+msgid "One of the following packages is needed:"
+msgstr "Der er brug for en af de f�lgende pakker:"
+
+#: po/placeholder.h:124 po/placeholder.h:222
+msgid " --update - use only update media.\n"
+msgstr ""
+
+#: po/placeholder.h:125 urpmi:299
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"
+"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 "Installationen fejlede"
+
+#: po/placeholder.h:132 po/placeholder.h:234
+msgid ""
+" --auto-select - automatically select packages for upgrading the system.\n"
msgstr ""
-"urpmi version %s\n"
-"Ophavsret (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"Dette er frit programmel, og det m� videredistribueres under betingelserne i "
-"GNU GPL.\n"
-"brug:\n"
-" --help - udskriv denne hj�lpebesked.\n"
-" --update - brug kun opdateringmedia.\n"
-" --auto - v�lg automatisk en god pakke iblandt udvalget.\n"
-" --auto-select - v�lg automatisk pakker til opgradering af systemet.\n"
-" --force - gennemtving anvendelse selv om nogen pakker ikke "
-"eksisterer.\n"
-" --X - brug X-gr�nseflade.\n"
-" --best-output - v�lg bedste gr�nseflade i henhold til milj�et:\n"
-" X- eller tekst-udgave.\n"
-" -a - v�lg alle tr�ffere p� kommandolinjen.\n"
-" -m - v�lg minimum komplethed for krav (standard).\n"
-" -M - v�lg maksimum komplethed for krav.\n"
-" -c - v�lg kompletteringsmetode for at l�se uopfyldte krav.\n"
-" -p - tillad s�gning i opgivne for at finde pakke.\n"
-" -q - stille tilstand.\n"
-" -v - snaksalig tilstand.\n"
-" navne eller rpm filer (kun for root) givet p� kommandolinjen bliver "
-"installeret.\n"
-
-#: po/placeholder.h:142 urpmi:362
-msgid "everything already installed"
-msgstr "alting er allerede installeret"
-#: po/placeholder.h:143 urpmi:247
+#: po/placeholder.h:134
+#, fuzzy
+msgid " --X - use X interface.\n"
+msgstr " --all - skriv alle m�rker."
+
+#: po/placeholder.h:135 urpmi:247
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -640,42 +644,107 @@ msgstr ""
"For at tilfredsstille afh�ngigheder vil de f�lgende pakker blive installeret "
"(%d Mb)"
-#: po/placeholder.h:144 urpmi:296
-#, c-format
-msgid "installing %s\n"
-msgstr "installerer %s\n"
+#: po/placeholder.h:136 urpmi:320 urpmi:344
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Pr�v installation uden at tjekke afh�ngigheder? (j/N) "
+
+#: po/placeholder.h:137
+msgid ""
+" --best-output - choose best interface according to the environment:\n"
+" X or text mode.\n"
+msgstr ""
-#: po/placeholder.h:145 urpmi:198
+#: 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 - skriv alle m�rker."
+
+#: po/placeholder.h:144 urpmi:202
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Hvad er dit valg? (1-%d) "
-#: po/placeholder.h:146 urpmi:321 urpmi:345
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Pr�v installation uden at tjekke afh�ngigheder? (j/N) "
+#: po/placeholder.h:145
+msgid " --wget - use wget to retrieve distant files.\n"
+msgstr ""
-#: po/placeholder.h:147 urpmi:190
-msgid "One of the following packages is needed:"
-msgstr "Der er brug for en af de f�lgende pakker:"
+#: 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"
+msgstr ""
+"Dette er frit programmel og kan redistribueres under vilk�rene til GNU GPL."
-#: po/placeholder.h:148 urpmi:149
+#: po/placeholder.h:152 urpmi:328 urpmi:352
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Pr�v installation med endnu st�rre kraft (--force)? (j/N) "
+
+#: po/placeholder.h:154
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+
+#: po/placeholder.h:155 urpmi:205
+msgid "Sorry, bad choice, try again\n"
+msgstr "Undskyld, d�rligt valg, pr�v igen\n"
+
+#: po/placeholder.h:156
+msgid ""
+" names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: po/placeholder.h:158
+msgid " -a - select all matches on command line.\n"
+msgstr ""
+
+#: 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 "installerer %s\n"
+
+#: po/placeholder.h:161 urpmi:152
msgid "Only superuser is allowed to install local packages"
msgstr "Kun superbrugeren har lov til at installere lokale pakker"
-#: 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 "V�r venlig at inds�tte mediet med navnet %s i enhed [%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 "kan ikke hente kilde-pakker, afslutter med fejl"
-#: po/placeholder.h:151 urpmi:329 urpmi:353
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Pr�v installation med endnu st�rre kraft (--force)? (j/N) "
+#: po/placeholder.h:165 urpmi:102
+msgid "Only superuser is allowed to install packages"
+msgstr "Kun superbrugeren har lov til at installere pakker"
-#: po/placeholder.h:155 urpmi.addmedia:46
+#: po/placeholder.h:166 urpmi:193
+#, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Der er brug for en af de f�lgende pakker for at installere %s:"
+
+#: po/placeholder.h:167 urpmi:277
+msgid "Press Enter when it's done..."
+msgstr "Tryk p� retur, n�r den er f�rdig..."
+
+#: po/placeholder.h:168 urpmi.addmedia:46
#, c-format
msgid ""
"%s\n"
@@ -684,7 +753,7 @@ msgstr ""
"%s\n"
"'with' mangler for ftp-medie\n"
-#: po/placeholder.h:159
+#: po/placeholder.h:172
msgid ""
"usage: urpmi.addmedia [--update] <name> <url>\n"
"where <url> is one of\n"
@@ -704,17 +773,17 @@ msgstr ""
" http://<v�rt>/<sti> with <relativt filnavn for hdlist>\n"
" removable_<enhed>://<sti>\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 "kan ikke oprette medie \"%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 "kan ikke opdatere medie \"%s\"\n"
-#: po/placeholder.h:170 urpmi.addmedia:42
+#: po/placeholder.h:183 urpmi.addmedia:42
#, c-format
msgid ""
"%s\n"
@@ -723,7 +792,7 @@ msgstr ""
"%s\n"
"enhed '%s' eksisterer ikke\n"
-#: po/placeholder.h:174 urpmi.addmedia:44
+#: po/placeholder.h:187 urpmi.addmedia:44
#, c-format
msgid ""
"%s\n"
@@ -732,7 +801,7 @@ msgstr ""
"%s\n"
"<relativ sti for hdlist> mangler\n"
-#: po/placeholder.h:178
+#: po/placeholder.h:191
#, c-format
msgid ""
"usage: urpmi.update [-a] <name> ...\n"
@@ -752,11 +821,11 @@ msgstr ""
"\n"
"ukendte valg '%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 "ingenting at opdatere (brug urpmi.addmedia til at tilf�je et medie)\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"
@@ -765,11 +834,11 @@ msgstr ""
"mangler det element der skal opdateres\n"
"(�n af %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 "ingenting at fjerne (brug urpmi.addmedia til at tilf�je et medie)\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"
@@ -778,7 +847,7 @@ msgstr ""
"mangler det element der skal fjernes\n"
"(�n af %s)\n"
-#: po/placeholder.h:197
+#: po/placeholder.h:210
#, c-format
msgid ""
"usage: urpmi.removemedia [-a] <name> ...\n"
@@ -793,17 +862,12 @@ msgstr ""
"\n"
"ukendte valg '%s'\n"
-#: po/placeholder.h:204 urpmq:85
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: kan ikke l�se rpm-fil \"%s\"\n"
-
-#: po/placeholder.h:206 urpmq:82
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: ukendt parameter \"-%s\", tjek brug med --help\n"
+#: po/placeholder.h:217
+#, fuzzy
+msgid " -h - print this help message.\n"
+msgstr " --all - skriv alle m�rker."
-#: 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"
@@ -811,112 +875,102 @@ msgstr ""
"en pakke skal fjernes f�r den kan opgraderes, dette er ikke underst�ttet "
"endnu.\n"
-#: po/placeholder.h:208
+#: po/placeholder.h:219
+#, fuzzy
+msgid " -g - print groups too with name.\n"
+msgstr " --group - skriv m�rkegruppe: gruppe."
+
+#: po/placeholder.h:220 urpmq:84
#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: kan ikke l�se rpm-fil \"%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 " kommandolinje, men uden pakkenavn)."
+
+#: 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"
+msgstr ""
+"Dette er frit programmel og kan redistribueres under vilk�rene til GNU GPL."
+
+#: po/placeholder.h:231
+#, fuzzy
+msgid " -d - extend query to package dependencies.\n"
+msgstr " kommandolinje, men uden pakkenavn)."
+
+#: po/placeholder.h:232
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
+msgstr ""
+
+#: po/placeholder.h:233
+msgid ""
" -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"
+msgstr ""
+
+#: po/placeholder.h:235 urpmq:81
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: ukendt parameter \"-%s\", tjek brug med --help\n"
+
+#: po/placeholder.h:236
+msgid ""
" --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 package do not exist.\n"
-" names or rpm files given on command line are queried.\n"
msgstr ""
-"urpmq version %s\n"
-"Copyright (C) 2000, 2001 MandrakeSoft.\n"
-"Dette er fri programmel og kan videredistribueres under vilk�rene til GNU "
-"GPL.\n"
-"brug:\n"
-" --help - vis denne hj�lpebesked.\n"
-" -v - snakkesalig tilstand.\n"
-" -d - udvid sp�rgsm�l til pakkeafh�ngigheder.\n"
-" -u - fjern pakke hvis en bedre version allerede er "
-"installeret.\n"
-" -m - udvid sp�rgsm�l til pakkeafh�ngigheder, fjern allerede\n"
-" installerede pakker som indeholder det som er "
-"n�dvendigt,\n"
-" tilf�j pakker som muligvis kan blokere opgradering.\n"
-" -M - udvid sp�rgsm�l til pakkeafh�ngigheder og fjern allerede\n"
-" installerede pakker kun hvis de er nyere eller de samme.\n"
-" -c - v�lg komplet metode for som bestemt beh�ver lukning.\n"
-" -p - tillad s�gning i tilbud for at finde pakker.\n"
-" -g - vis grupper ogs� med navn.\n"
-" -r - vis version og udgivelse ogs� med navn.\n"
-" --update - brug kun opdaterings-media.\n"
-" --auto-select - v�lg automatisk pakker for opgradering af systemet.\n"
-" --headers - udpak hoveder for pakker listet fra urpmi db til\n"
-" stdout (kun root).\n"
-" --sources - giver alle kildepakker f�r nedhentning (kun root).\n"
-" --force - tving udf�relse selv om nogen pakker ikke eksisterer.\n"
-" navn eller rpm filer givet p� kommandolinjen er forespurgt.\n"
-
-#: urpm.pm:257
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "For mange monteringspunkter for udskifteligt medium \"%s\""
-#: urpm.pm:258
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "tager udskifteligt medium som \"%s\""
+#: po/placeholder.h:243
+msgid ""
+" -u - remove package if a better version is already installed.\n"
+msgstr ""
-#: urpm.pm:262
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "bruger en anden udskiftelig enhed [%s] for \"%s\""
+#: po/placeholder.h:244
+msgid ""
+" --force - force invocation even if some packages do not\n"
+"exist.\n"
+msgstr ""
-#: urpm.pm:266 urpm.pm:269
+#: urpm.pm:1796 urpm.pm:1805
#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "kan ikke finde stinavn for udskifteligt medie \"%s\""
+msgid "removing %s to upgrade to %s ..."
+msgstr ""
-#: urpm.pm:1339
-#, c-format
-msgid "read synthesis file [%s]"
-msgstr "l�s syntese-fil [%s]"
+#: urpm.pm:1797 urpm.pm:1806
+msgid ", $otherPackage, "
+msgstr ", $otherPackage, "
-#: urpmi:49
-#, c-format
-msgid "urpmi version %s"
-msgstr "urpmi version %s"
+#: urpm.pm:1797 urpm.pm:1806
+msgid "));"
+msgstr ");"
-#: urpmi:98
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: ukendt parameter \"-%s\", tjek brug med --help\n"
+#: urpm.pm:1802
+msgid "$p->{name}-$p->{version}-$p->{release}"
+msgstr "$p->{name}-$p->{version}-$p->{release}"
-#: urpmi:102
-msgid "Only superuser is allowed to install packages"
-msgstr "Kun superbrugeren har lov til at installere pakker"
+#: urpm.pm:1812
+msgid "$prefix/$_"
+msgstr "$prefix/$_"
-#: urpmi:189
+#: urpmi:48
#, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Der er brug for en af de f�lgende pakker for at installere %s:"
-
-#: urpmi:301
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
-msgstr ""
+msgid "urpmi version %s"
+msgstr "urpmi version %s"
#: urpmi.addmedia:30
msgid "usage: urpmi.addmedia [--update] <name> <url>"
@@ -948,6 +1002,136 @@ msgstr ", $_);"
msgid "urpmq version %s"
msgstr "urpmq version %s"
+#~ msgid "retrieving [%s]"
+#~ msgstr "modtager [%s]"
+
+#~ msgid "wget of [%s] failed (maybe wget is missing?)"
+#~ msgstr "wget af [%s] mislykkedes (m�ske mangler wget?)"
+
+#~ msgid "unable to copy source of [%s] from [%s]"
+#~ msgstr "kunne ikke kopiere kilde for [%s] fra [%s]"
+
+#~ msgid "removable medium not selected"
+#~ msgstr "fjernbart media ikke valgt"
+
+#~ msgid "source of [%s] not found as [%s]"
+#~ msgstr "kilden til [%s] ikke fundet som [%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 ""
+#~ "urpmi version %s\n"
+#~ "Ophavsret (C) 1999, 2000, 2001 MandrakeSoft.\n"
+#~ "Dette er frit programmel, og det m� videredistribueres under "
+#~ "betingelserne i GNU GPL.\n"
+#~ "brug:\n"
+#~ " --help - udskriv denne hj�lpebesked.\n"
+#~ " --update - brug kun opdateringmedia.\n"
+#~ " --auto - v�lg automatisk en god pakke iblandt udvalget.\n"
+#~ " --auto-select - v�lg automatisk pakker til opgradering af systemet.\n"
+#~ " --force - gennemtving anvendelse selv om nogen pakker ikke "
+#~ "eksisterer.\n"
+#~ " --X - brug X-gr�nseflade.\n"
+#~ " --best-output - v�lg bedste gr�nseflade i henhold til milj�et:\n"
+#~ " X- eller tekst-udgave.\n"
+#~ " -a - v�lg alle tr�ffere p� kommandolinjen.\n"
+#~ " -m - v�lg minimum komplethed for krav (standard).\n"
+#~ " -M - v�lg maksimum komplethed for krav.\n"
+#~ " -c - v�lg kompletteringsmetode for at l�se uopfyldte "
+#~ "krav.\n"
+#~ " -p - tillad s�gning i opgivne for at finde pakke.\n"
+#~ " -q - stille tilstand.\n"
+#~ " -v - snaksalig tilstand.\n"
+#~ " navne eller rpm filer (kun for root) givet p� kommandolinjen bliver "
+#~ "installeret.\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 ""
+#~ "urpmq version %s\n"
+#~ "Copyright (C) 2000, 2001 MandrakeSoft.\n"
+#~ "Dette er fri programmel og kan videredistribueres under vilk�rene til GNU "
+#~ "GPL.\n"
+#~ "brug:\n"
+#~ " --help - vis denne hj�lpebesked.\n"
+#~ " -v - snakkesalig tilstand.\n"
+#~ " -d - udvid sp�rgsm�l til pakkeafh�ngigheder.\n"
+#~ " -u - fjern pakke hvis en bedre version allerede er "
+#~ "installeret.\n"
+#~ " -m - udvid sp�rgsm�l til pakkeafh�ngigheder, fjern "
+#~ "allerede\n"
+#~ " installerede pakker som indeholder det som er "
+#~ "n�dvendigt,\n"
+#~ " tilf�j pakker som muligvis kan blokere opgradering.\n"
+#~ " -M - udvid sp�rgsm�l til pakkeafh�ngigheder og fjern "
+#~ "allerede\n"
+#~ " installerede pakker kun hvis de er nyere eller de "
+#~ "samme.\n"
+#~ " -c - v�lg komplet metode for som bestemt beh�ver lukning.\n"
+#~ " -p - tillad s�gning i tilbud for at finde pakker.\n"
+#~ " -g - vis grupper ogs� med navn.\n"
+#~ " -r - vis version og udgivelse ogs� med navn.\n"
+#~ " --update - brug kun opdaterings-media.\n"
+#~ " --auto-select - v�lg automatisk pakker for opgradering af systemet.\n"
+#~ " --headers - udpak hoveder for pakker listet fra urpmi db til\n"
+#~ " stdout (kun root).\n"
+#~ " --sources - giver alle kildepakker f�r nedhentning (kun root).\n"
+#~ " --force - tving udf�relse selv om nogen pakker ikke eksisterer.\n"
+#~ " navn eller rpm filer givet p� kommandolinjen er forespurgt.\n"
+
#~ msgid "mismatch arch for registering rpm file"
#~ msgstr "arch stemmer ikke for registrering af rpm-fil"
@@ -960,9 +1144,6 @@ msgstr "urpmq version %s"
#~ msgid "mismatch version for registering rpm file"
#~ msgstr "uoverensstemmende version for registering af rpm-fil"
-#~ msgid "));"
-#~ msgstr ");"
-
#~ msgid "), $_);"
#~ msgstr ", $_);"
diff --git a/po/de.po b/po/de.po
index 806484e9..17e4e7c5 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,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-09-13 09:47+0200\n"
"Last-Translator: Stefan Siegel <siegel@linux-mandrake.de>\n"
"Language-Team: German <de@li.org>\n"
@@ -26,27 +26,27 @@ msgstr ""
"Automatische Installation von Paketen ...\n"
"Sie wünschen die Installation von Paket „$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 "Ist das in Ordnung?"
-#: _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 "Abbruch"
-#: _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 "Nn"
-#: _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 "JjYy"
-#: _irpm:42 po/placeholder.h:118 urpmi:258
+#: _irpm:42 po/placeholder.h:157 urpmi:258
msgid " (Y/n) "
msgstr " (J/n) "
@@ -166,182 +166,184 @@ msgstr "Mit „urmpf --help“ erhatlen Sie weitere Optionen"
msgid "urpmi is not installed"
msgstr "urpmi ist nicht installiert."
-#: po/placeholder.h:29 urpm.pm:283
+#: po/placeholder.h:29
+#, fuzzy, c-format
+msgid "reading synthesis file [%s]"
+msgstr "Lesen der Depslist-Datei [%s]"
+
+#: po/placeholder.h:30 urpm.pm:298
#, c-format
msgid "unable to write config file [%s]"
msgstr "Die Konfigurationsdatei [%s] kann nicht geschrieben werden."
-#: 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 ""
-"Sie können „%s“ nicht als Name für dieses Medium verwenden, da er bereits "
-"verwendet wird."
-#: po/placeholder.h:31
+#: po/placeholder.h:32
#, c-format
msgid "nothing to write in list file for \"%s\""
msgstr "Für die Dateiliste von „%s“ muss nichts geschrieben werden."
-#: 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 ""
"Die Dateiliste für das Medium „%s“ wurde nicht gefunden, es wird ignoriert."
-#: po/placeholder.h:33
+#: po/placeholder.h:34
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "Die Struktur der HD-Liste von „%s“ ist nicht korrekt."
-#: po/placeholder.h:34
+#: po/placeholder.h:35
#, c-format
msgid "nothing written in list file for \"%s\""
msgstr "Es wurde nichts in die Dateiliste von „%s“ geschrieben."
-#: po/placeholder.h:35 urpm.pm:1951
-#, c-format
-msgid ""
-"removing %s to upgrade ...\n"
-" to %s since it will not upgrade correctly!"
-msgstr ""
-"Entfernen von %s für die Aktualisierung ...\n"
-"auf %s da die Aktualisierung sont nicht korrekt funktioniert!"
-
-#: po/placeholder.h:39 urpm.pm:839
+#: po/placeholder.h:36 urpm.pm:845
#, c-format
msgid "read provides file [%s]"
msgstr "Lesen der Anbieter-Datei [%s]"
-#: po/placeholder.h:40
-#, c-format
-msgid "trying to remove inexistant medium \"%s\""
-msgstr "Ich versuche das nicht existierende Medium „%s“ zu entfernen."
-
-#: po/placeholder.h:41 urpm.pm:1692
+#: po/placeholder.h:37 urpm.pm:1549
#, c-format
msgid "package %s is not found."
msgstr "Paket %s wurde nicht gefunden."
-#: po/placeholder.h:42
-#, c-format
-msgid "unable to copy source of [%s] from [%s]"
-msgstr "Ich kann die Quelle von [%s] von Medium [%s] nicht lesen."
-
-#: po/placeholder.h:43 urpm.pm:870
+#: po/placeholder.h:38 urpm.pm:876
#, c-format
msgid "unable to write compss file [%s]"
msgstr "Ich kann die Datei [%s] nicht anlegen."
-#: po/placeholder.h:44 urpm.pm:813
+#: po/placeholder.h:39 urpm.pm:819
#, c-format
msgid "unmounting %s"
msgstr "Aushängen von „%s“"
-#: po/placeholder.h:45
+#: po/placeholder.h:40
#, c-format
msgid "removing %d obsolete headers in cache"
msgstr "Entferne %d veraltete Informationen aus dem 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 "Keine HD-Liste für das Medium „%s“ gefunden."
-#: 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 ""
+"Das Medium „%s“ versucht eine bereits verwendete HD-Liste ebenfalls zu "
+"verwenden, es wird daher ignoriert."
+
+#: po/placeholder.h:43 urpm.pm:184
+#, c-format
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"Sie können „%s“ nicht als Name für dieses Medium verwenden, da er bereits "
+"verwendet wird."
+
+#: po/placeholder.h:44 urpm.pm:191
#, c-format
msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
msgstr ""
"Es ist nicht möglich, das Medium „%s“ zu verwenden, da keine Dateilise [%s] "
"existiert."
-#: po/placeholder.h:48
+#: po/placeholder.h:45
msgid "keeping only files referenced in provides"
msgstr "Nur Behalten der Dateien, die als Anbieter referenziert werden."
-#: po/placeholder.h:49
+#: po/placeholder.h:46
#, c-format
msgid "unable to build synthesis file for medium \"%s\""
msgstr "Ich kann die Synthese-Datei für das Medium „%s“ nicht aktualisieren."
-#: po/placeholder.h:50
+#: po/placeholder.h:47
#, c-format
msgid "found %d headers in cache"
msgstr "%d Informationen im Cache gefunden."
-#: po/placeholder.h:51 urpm.pm:836
+#: po/placeholder.h:48 urpm.pm:842
#, c-format
msgid "unable to read provides file [%s]"
msgstr "Ich kann die Anbieter-Datei [%s] nicht lesen."
-#: 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 ""
"Vermeide die Auswahl von „%s“, das die entsprechenden Spracheinstellungen "
"nicht installiert sind."
-#: 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 ""
+"Entfernen von %s für die Aktualisierung ...\n"
+"auf %s da die Aktualisierung sont nicht korrekt funktioniert!"
+
+#: po/placeholder.h:54 urpm.pm:326
#, c-format
msgid "medium \"%s\" already exists"
msgstr "Das Medium „%s“ existiert bereits."
-#: po/placeholder.h:54 urpm.pm:295
-#, c-format
-msgid "write config file [%s]"
-msgstr "Schreiben der Konfigurationsdatei [%s]."
-
#: po/placeholder.h:55
#, c-format
msgid "unable to write list file of \"%s\""
msgstr "Ich kann die Dateiliste für „%s“ nicht schreiben."
-#: po/placeholder.h:56 urpm.pm:1817
-#, c-format
-msgid "retrieving [%s]"
-msgstr "Holen von [%s]"
-
-#: po/placeholder.h:57 urpm.pm:1819
+#: po/placeholder.h:56 urpm.pm:310
#, c-format
-msgid "wget of [%s] failed"
-msgstr "Wget von [%s] schlug fehl."
+msgid "write config file [%s]"
+msgstr "Schreiben der Konfigurationsdatei [%s]."
-#: po/placeholder.h:58 urpm.pm:1101
+#: po/placeholder.h:57 urpm.pm:1107
#, c-format
msgid "no package named %s"
msgstr "Kein Paket namens %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 "Ich kann die Compss-Datei [%s] nicht lesen"
-#: 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 ""
"Die hd-Liste für das Medium „%s“ wurde nicht gefunden, es wird ignoriert."
-#: po/placeholder.h:61
+#: po/placeholder.h:60
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "Erstellen der HD-Liste für das Medium „%s“"
-#: po/placeholder.h:62
+#: po/placeholder.h:61
msgid "computing dependencies"
msgstr "Berechnen der Abhängigkeiten"
-#: po/placeholder.h:63 urpm.pm:868
+#: po/placeholder.h:62
+#, fuzzy, c-format
+msgid "retrieve of [%s] failed"
+msgstr "Wget von [%s] schlug fehl."
+
+#: po/placeholder.h:63 urpm.pm:874
#, c-format
msgid "write provides file [%s]"
msgstr "Schreiben der Anbieter-Datei [%s]."
-#: po/placeholder.h:64 urpm.pm:803
+#: po/placeholder.h:64 urpm.pm:809
#, c-format
msgid "mounting %s"
msgstr "Einhängen von „%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 "
@@ -350,130 +352,140 @@ msgstr ""
"Das Medium „%s“ kann nicht verwendet werden, da die Dateiliste bereits von "
"einem anderen Medium verwendet wird."
-#: po/placeholder.h:66 urpm.pm:148
-#, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
-msgstr ""
-"Das Medium „%s“ versucht eine bereits verwendete Liste ebenfalls zu "
-"verwenden, es wird daher ignoriert."
-
-#: po/placeholder.h:67
+#: po/placeholder.h:66
#, c-format
msgid "reading hdlist file [%s]"
msgstr "Lesen der HD-Liste [%s]"
-#: po/placeholder.h:68 urpm.pm:873
+#: po/placeholder.h:67 urpm.pm:879
#, c-format
msgid "write compss file [%s]"
msgstr "Schreiben der Compss-Datei [%s]"
-#: po/placeholder.h:69 urpm.pm:827
+#: po/placeholder.h:68 urpm.pm:833
#, c-format
msgid "read depslist file [%s]"
msgstr "Lesen der Depslist-Datei [%s]"
-#: po/placeholder.h:70
-#, c-format
-msgid "trying to select inexistant medium \"%s\""
-msgstr "Versuch, das nicht existierende Medium „%s“ auszuwählen."
+#: po/placeholder.h:69 urpm.pm:103
+msgid "curl failed\n"
+msgstr ""
-#: po/placeholder.h:71 urpm.pm:1812
+#: po/placeholder.h:70 urpm.pm:281 urpm.pm:284
+#, fuzzy, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "Ich kann das Medium „%s“ nicht anlegen.\n"
+
+#: po/placeholder.h:71 urpm.pm:1668
#, c-format
msgid "malformed input: [%s]"
msgstr "Inkorrekte Eingabe: [%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"
+msgid "there are multiple packages with the same rpm filename \"%s\""
msgstr ""
-"Das Medium „%s“ versucht eine bereits verwendete HD-Liste ebenfalls zu "
-"verwenden, es wird daher ignoriert."
-#: 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 ""
-"Entfernen von %s für die Aktualisierung ...\n"
-"auf %s da die Aktualisierung sont nicht korrekt funktioniert!"
+"Das Medium „%s“ versucht eine bereits verwendete Liste ebenfalls zu "
+"verwenden, es wird daher ignoriert."
-#: po/placeholder.h:77 urpm.pm:865
+#: po/placeholder.h:74 urpm.pm:871
#, c-format
msgid "unable to write provides file [%s]"
msgstr "Ich kann die Anbieter-Datei [%s] nicht schreiben."
-#: 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 ""
"Es ist nicht möglich, auf die HD-Liste „%s“ zuzugreifen,\n"
"das Medium wird daher ignoriert."
-#: po/placeholder.h:79 urpm.pm:1005
-msgid "unable to register rpm file"
-msgstr "Die RPM-Datei kann nicht registriert werden."
-
-#: 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 ""
"Ich kann keine Synthese-Dateien finden - verwende den Parsedhdlist-Server"
-#: po/placeholder.h:81 urpm.pm:241
+#: po/placeholder.h:77 urpm.pm:1011
+msgid "unable to register rpm file"
+msgstr "Die RPM-Datei kann nicht registriert werden."
+
+#: po/placeholder.h:78 urpm.pm:256
#, c-format
msgid "unable to inspect list file for \"%s\", medium ignored"
msgstr ""
"Die Dateiliste für „%s“ kann nicht kontrolliert werden, es wird ignoriert."
-#: 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 "Die Dateiliste für „%s“ ist inkonsistent, das Medium wird ignoriert."
-#: po/placeholder.h:83
+#: po/placeholder.h:81
#, c-format
msgid "copy of [%s] failed"
msgstr "Kopieren von [%s] schlug fehl."
-#: 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 "Ich versuche das nicht existierende Medium „%s“ zu entfernen."
+
+#: 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 "Die Struktur von [%s] ist nicht korrekt."
-#: po/placeholder.h:85 urpm.pm:824
+#: po/placeholder.h:84 urpm.pm:1192
+#, fuzzy, c-format
+msgid "read synthesis file [%s]"
+msgstr "Lesen der Depslist-Datei [%s]"
+
+#: po/placeholder.h:85 urpm.pm:830
#, c-format
msgid "unable to read depslist file [%s]"
msgstr "Ich kann die Deplist-Datei [%s] nicht lesen."
-#: po/placeholder.h:86
-msgid "removable medium not selected"
-msgstr "Entfehrnbares Medium nich ausgewählt"
-
-#: po/placeholder.h:87 urpm.pm:851
+#: po/placeholder.h:86 urpm.pm:857
#, c-format
msgid "read compss file [%s]"
msgstr "Lesen der Compss-DAtei [%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 "Syntax-Fehler in Konfigurationsdatei auf Linie %s"
-#: po/placeholder.h:89
+#: po/placeholder.h:88
#, c-format
msgid "building hdlist [%s]"
msgstr "Erstellen der HD-Liste [%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 "Ich kann das RPM-Paket „%s“ von Medium „%s“ nicht lesen."
-#: po/placeholder.h:91 urpm.pm:1009
+#: po/placeholder.h:90 urpm.pm:1015
msgid "error registering local packages"
msgstr "Fehler bei der Registrierung lokaler Pakete"
-#: 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 "„%s“ wurde als Wechselmedium angegeben, ist es aber nicht."
@@ -483,178 +495,167 @@ msgstr "„%s“ wurde als Wechselmedium angegeben, ist es aber nicht."
msgid "unable to build hdlist: %s"
msgstr "Ich kann die HD-Liste „%s“ nicht erzeugen."
-#: 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 "Das Medium „%s“ wurde nicht ausgewählt."
+
+#: po/placeholder.h:95 urpm.pm:1006
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "Ungültiger RPM Name [%s]."
-#: 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 "Das Medium „%s“ wurde nicht ausgewählt."
+msgid "unknown data associated with %s"
+msgstr ""
-#: 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 ""
-#: po/placeholder.h:97 urpm.pm:863
+#: po/placeholder.h:98 urpm.pm:869
#, c-format
msgid "write depslist file [%s]"
msgstr "Schreiben der Abhängigheitsliste [%s]."
-#: po/placeholder.h:98 urpm.pm:1322
-#, c-format
-msgid "unknown data associated with %s"
-msgstr ""
-
-#: po/placeholder.h:99
-#, c-format
-msgid "source of [%s] not found as [%s]"
-msgstr ""
-
-#: 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 ""
-#: 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 ""
-#: po/placeholder.h:102
-#, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
-msgstr "Wget von [%s] schlug fehl (ist wget installiert?)"
-
-#: po/placeholder.h:103 urpm.pm:1001
+#: po/placeholder.h:101 urpm.pm:1007
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "Ich habe keinen Zugriff auf die RPM-Datei [%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 "Ich kann die Deplist-Datei [%s] nicht schreiben."
-#: 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 ""
+"Entfernen von %s für die Aktualisierung ...\n"
+"auf %s da die Aktualisierung sont nicht korrekt funktioniert!"
+
+#: po/placeholder.h:107 urpm.pm:342 urpm.pm:1630
#, c-format
msgid "unable to access medium \"%s\""
msgstr "Ich kann auf das Medium „%s“ nicht zugreifen."
-#: po/placeholder.h:106 urpm.pm:988
+#: po/placeholder.h:108 urpm.pm:994
#, c-format
msgid "relocated %s entries in depslist"
msgstr ""
-#: po/placeholder.h:107 urpm.pm:914 urpm.pm:1629 urpm.pm:1680
+#: po/placeholder.h:109
+#, c-format
+msgid "trying to select inexistent medium \"%s\""
+msgstr "Versuch, das nicht existierende Medium „%s“ auszuwählen."
+
+#: po/placeholder.h:110 urpm.pm:97
+#, fuzzy
+msgid "wget failed\n"
+msgstr "Wget von [%s] schlug fehl."
+
+#: 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:108
-#, fuzzy, c-format
-msgid "no rpm files found from [%s]"
-msgstr "Ungültiger RPM Name „%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 "Die folgenden Pakete enthalten „%s“: %s"
-#: po/placeholder.h:110 urpm.pm:1645 urpm.pm:1671
-#, c-format
-msgid "there are multiples packages with the same rpm filename \"%s\""
-msgstr ""
+#: po/placeholder.h:113
+#, fuzzy, c-format
+msgid "no rpm files found from [%s]"
+msgstr "Ungültiger RPM Name „%s“"
-#: po/placeholder.h:111 urpm.pm:1920
+#: po/placeholder.h:114 urpm.pm:1772
#, c-format
msgid "selecting %s using obsoletes"
msgstr ""
-#: po/placeholder.h:112 urpm.pm:2031
+#: po/placeholder.h:115 urpm.pm:1888
#, c-format
msgid "selecting %s by selection on files"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:114 urpmi:308 urpmi:315 urpmi:328 urpmi:339 urpmi:352
-msgid "Installation failed"
-msgstr "Die Installation schlug Fehl"
-
-#: po/placeholder.h:115 urpmi:279
-msgid "Press enter when it's done..."
-msgstr "Bestätigen Sie dies durch drücken der Return Taste ..."
+#: po/placeholder.h:120
+#, fuzzy
+msgid " --help - print this help message.\n"
+msgstr " --all - Alle Parameter ausgeben."
-#: po/placeholder.h:117 urpmi:201
-msgid "Sorry, bad choice, try again\n"
-msgstr "Eine schlechte Wahl, versuchen Sie es erneut\n"
+#: po/placeholder.h:121 urpmi:361
+msgid "everything already installed"
+msgstr "Alles bereits installiert"
-#: po/placeholder.h:120
+#: po/placeholder.h:122 urpmi:98
#, fuzzy, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr ""
+"urpmq: unbekannte Option „-$1“. Weitere Infos erhalten Sie \n"
+"mittels „urpmq --help“\n"
+
+#: po/placeholder.h:123 urpmi:194
+msgid "One of the following packages is needed:"
+msgstr "Eines der folgenden Pakete wird benötigt:"
+
+#: po/placeholder.h:124 po/placeholder.h:222
+msgid " --update - use only update media.\n"
+msgstr ""
+
+#: po/placeholder.h:125 urpmi:299
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"
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
msgstr ""
-"urpmi Version %s\n"
-"Copyright © 1999-2001 MandrakeSoft.\n"
-"Dieses Programm wird in der Hoffnung verteilt, dass es nützlich ist.\n"
-"Es gibt KEINERLEI Garantie, nicht einmal für die TAUGLICHKEIT oder die,\n"
-"VERWENDBARKEIT FÜR EINEN BESTIMMTEN ZWECK. In den Quellen befindet sich die\n"
-"Lizenz- und Kopierbedingung; die Einzelheiten sind in der Datei COPYING\n"
-"(GNU General Public License) beschrieben.\n"
-"\n"
-"Verwendung:\n"
-" --help - Anzeigen dieser Hilfe und beenden.\n"
-" --auto - Automatische Wahl eines guten Pakets.\n"
-" --auto-select - Automatische Wahl der Pakete zur Aktualisierung des "
-"Systems.\n"
-" --force - Führe den Befehl aus, selbst wenn einige Pakete nicht "
-"existieren.\n"
-" --X - Verwende die grafische Oberfläche (X11).\n"
-" --best-output - Verwende beste Oberfläche anhand der Umgebung:\n"
-" X11 oder Text-Modus.\n"
-" -a - Wähle alle Treffer in der Kommandozeile.\n"
-" -m - Wähle minimale Auflösung von Abhängigkeiten "
-"(standard).\n"
-" -M - Wähle maximale Auflösung von Abhängigkeiten.\n"
-" -c - Wähle komplette Methode zum Auflösen von "
-"Abhängigkeiten.\n"
-" -q - Vermeide Ausgaben (quiet).\n"
-" -v - Erzeuge aufwendigere Ausgaben (verbose).\n"
-"Namen oder RPM-Dateien (nur für das privileg. Kennzeichen) die auf der "
-"Kommandozeile angegeben werden, werden installiert.\n"
-
-#: po/placeholder.h:142 urpmi:362
-msgid "everything already installed"
-msgstr "Alles bereits installiert"
-#: po/placeholder.h:143 urpmi:247
+#: 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 "Die Installation schlug Fehl"
+
+#: po/placeholder.h:132 po/placeholder.h:234
+msgid ""
+" --auto-select - automatically select packages for upgrading the system.\n"
+msgstr ""
+
+#: po/placeholder.h:134
+#, fuzzy
+msgid " --X - use X interface.\n"
+msgstr " --all - Alle Parameter ausgeben."
+
+#: po/placeholder.h:135 urpmi:247
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -663,44 +664,113 @@ msgstr ""
"Um die Abhängigkeiten zu erfüllen, werden die folgenden Pakete installiert (%"
"d MB)"
-#: po/placeholder.h:144 urpmi:296
-#, c-format
-msgid "installing %s\n"
-msgstr "Installiere %s\n"
+#: po/placeholder.h:136 urpmi:320 urpmi:344
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Soll ich eine Installation ohne Abhängigkeitstest versuchen? (j/N) "
-#: po/placeholder.h:145 urpmi:198
+#: 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 - Alle Parameter ausgeben."
+
+#: po/placeholder.h:144 urpmi:202
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Ihre Wahl? (1-%d) "
-#: po/placeholder.h:146 urpmi:321 urpmi:345
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Soll ich eine Installation ohne Abhängigkeitstest versuchen? (j/N) "
+#: po/placeholder.h:145
+msgid " --wget - use wget to retrieve distant files.\n"
+msgstr ""
-#: po/placeholder.h:147 urpmi:190
-msgid "One of the following packages is needed:"
-msgstr "Eines der folgenden Pakete wird benötigt:"
+#: 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"
+msgstr ""
+"Dies ist freie Software und kann unter den Bedingungen der GNU GPL weiter "
+"Vertrieben werden."
-#: po/placeholder.h:148 urpmi:149
+#: po/placeholder.h:152 urpmi:328 urpmi:352
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Soll ich eine Installation mit Gewalt (--force) versuchen? (j/N) "
+
+#: po/placeholder.h:154
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+
+#: po/placeholder.h:155 urpmi:205
+msgid "Sorry, bad choice, try again\n"
+msgstr "Eine schlechte Wahl, versuchen Sie es erneut\n"
+
+#: po/placeholder.h:156
+msgid ""
+" names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: po/placeholder.h:158
+msgid " -a - select all matches on command line.\n"
+msgstr ""
+
+#: 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 "Installiere %s\n"
+
+#: po/placeholder.h:161 urpmi:152
msgid "Only superuser is allowed to install local packages"
msgstr ""
"Nur der Systemadministrator mit dem privilegierten \n"
"Benutzerkennzeichen darf Pakete installieren."
-#: 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 "Bitte legen Sie das Medium mit Namen „%s“ in Gerät „%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 "Ich kann die Quellpakete nicht finden, Abbruch."
-#: po/placeholder.h:151 urpmi:329 urpmi:353
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Soll ich eine Installation mit Gewalt (--force) versuchen? (j/N) "
+#: po/placeholder.h:165 urpmi:102
+#, fuzzy
+msgid "Only superuser is allowed to install packages"
+msgstr ""
+"Nur der Systemadministrator mit dem privilegierten \n"
+"Benutzerkennzeichen darf Pakete installieren."
+
+#: po/placeholder.h:166 urpmi:193
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Eines der folgenden Pakete wird benötigt:"
-#: po/placeholder.h:155 urpmi.addmedia:46
+#: po/placeholder.h:167 urpmi:277
+msgid "Press Enter when it's done..."
+msgstr "Bestätigen Sie dies durch drücken der Return Taste ..."
+
+#: po/placeholder.h:168 urpmi.addmedia:46
#, c-format
msgid ""
"%s\n"
@@ -709,7 +779,7 @@ msgstr ""
"%s\n"
"„with“ fehlt für FTP-Medien.\n"
-#: po/placeholder.h:159
+#: po/placeholder.h:172
msgid ""
"usage: urpmi.addmedia [--update] <name> <url>\n"
"where <url> is one of\n"
@@ -729,17 +799,17 @@ msgstr ""
" http://<Rechner>/<Pfad> with <relativer Pfad zur HD-Liste>\n"
" removable_<Gerät>://<Pfad>\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 "Ich kann das Medium „%s“ nicht anlegen.\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 "Ich kann das Medium „%s“ nicht aktualisieren.\n"
-#: po/placeholder.h:170 urpmi.addmedia:42
+#: po/placeholder.h:183 urpmi.addmedia:42
#, c-format
msgid ""
"%s\n"
@@ -748,7 +818,7 @@ msgstr ""
"%s\n"
"Das Gerät „%s“ existiert nicht.\n"
-#: po/placeholder.h:174 urpmi.addmedia:44
+#: po/placeholder.h:187 urpmi.addmedia:44
#, c-format
msgid ""
"%s\n"
@@ -757,7 +827,7 @@ msgstr ""
"%s\n"
"<relativer Pfad zur HD-Liste> fehlt.\n"
-#: po/placeholder.h:178
+#: po/placeholder.h:191
#, fuzzy, c-format
msgid ""
"usage: urpmi.update [-a] <name> ...\n"
@@ -776,13 +846,13 @@ msgstr ""
"\n"
"Unbekannte Option „%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 ""
"Es gibt nichts zu aktualisieren (verwenden Sie „urpmi.addmedia“, \n"
"um neue Medien hinzuzufügen)\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"
@@ -791,13 +861,13 @@ msgstr ""
"Was soll aktualisiert werden?\n"
"(eins aus %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 ""
"Es gibt nichts zu entfernen (verwenden Sie „urpmi.addmedia“, \n"
"um neue Medien hinzuzufügen)\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"
@@ -806,7 +876,7 @@ msgstr ""
"Was soll entfernt werden?\n"
"(eins aus %s)\n"
-#: po/placeholder.h:197
+#: po/placeholder.h:210
#, c-format
msgid ""
"usage: urpmi.removemedia [-a] <name> ...\n"
@@ -821,19 +891,12 @@ msgstr ""
"\n"
"Unbekannte Option „%s“\n"
-#: po/placeholder.h:204 urpmq:85
-#, fuzzy, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: Ich kann die Datei „$_“ nicht lesen.\n"
-
-#: po/placeholder.h:206 urpmq:82
-#, fuzzy, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-"urpmq: unbekannte Option „-$1“. Weitere Infos erhalten Sie \n"
-"mittels „urpmq --help“\n"
+#: po/placeholder.h:217
+#, fuzzy
+msgid " -h - print this help message.\n"
+msgstr " --all - Alle Parameter ausgeben."
-#: 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"
@@ -841,91 +904,108 @@ msgstr ""
"Einige Pakete müssen entfernt werden, bevor die diese Aktualisierungen \n"
"durchführen können. Diese Funktionalität wird noch nicht angeboten.\n"
-#: po/placeholder.h:208
-#, c-format
+#: po/placeholder.h:219
+#, fuzzy
+msgid " -g - print groups too with name.\n"
+msgstr " --group - Ausgabe des Attributs „Gruppe“."
+
+#: po/placeholder.h:220 urpmq:84
+#, fuzzy, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: Ich kann die Datei „$_“ nicht lesen.\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 ""
+" wird angenommen, wenn kein Parameter angegeben wird)"
+
+#: 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"
-" --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 ""
+"Dies ist freie Software und kann unter den Bedingungen der GNU GPL weiter "
+"Vertrieben werden."
-#: urpm.pm:257
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:231
+#, fuzzy
+msgid " -d - extend query to package dependencies.\n"
msgstr ""
+" wird angenommen, wenn kein Parameter angegeben wird)"
-#: urpm.pm:258
-#, c-format
-msgid "taking removable device as \"%s\""
+#: po/placeholder.h:232
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
msgstr ""
-#: urpm.pm:262
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
+#: po/placeholder.h:233
+msgid ""
+" -c - choose complete method for resolving requires closure.\n"
msgstr ""
-#: urpm.pm:266 urpm.pm:269
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "Ich kann das Medium „%s“ nicht anlegen.\n"
-
-#: urpm.pm:1339
+#: po/placeholder.h:235 urpmq:81
#, fuzzy, c-format
-msgid "read synthesis file [%s]"
-msgstr "Lesen der Depslist-Datei [%s]"
-
-#: urpmi:49
-#, c-format
-msgid "urpmi version %s"
-msgstr "urpmi Version %s"
-
-#: urpmi:98
-#, fuzzy, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
msgstr ""
"urpmq: unbekannte Option „-$1“. Weitere Infos erhalten Sie \n"
"mittels „urpmq --help“\n"
-#: urpmi:102
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
+#: po/placeholder.h:236
+msgid ""
+" --headers - extract headers for package listed from urpmi db to\n"
+" stdout (root only).\n"
msgstr ""
-"Nur der Systemadministrator mit dem privilegierten \n"
-"Benutzerkennzeichen darf Pakete installieren."
-#: urpmi:189
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Eines der folgenden Pakete wird benötigt:"
+#: po/placeholder.h:243
+msgid ""
+" -u - remove package if a better version is already installed.\n"
+msgstr ""
-#: urpmi:301
+#: po/placeholder.h:244
msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+" --force - force invocation even if some packages do not\n"
+"exist.\n"
msgstr ""
+#: urpm.pm:1796 urpm.pm:1805
+#, c-format
+msgid "removing %s to upgrade to %s ..."
+msgstr ""
+
+#: urpm.pm:1797 urpm.pm:1806
+msgid ", $otherPackage, "
+msgstr ", $otherPackage, "
+
+#: urpm.pm:1797 urpm.pm:1806
+msgid "));"
+msgstr "));"
+
+#: urpm.pm:1802
+msgid "$p->{name}-$p->{version}-$p->{release}"
+msgstr "$p->{name}-$p->{version}-$p->{release}"
+
+#: urpm.pm:1812
+msgid "$prefix/$_"
+msgstr "$prefix/$_"
+
+#: urpmi:48
+#, c-format
+msgid "urpmi version %s"
+msgstr "urpmi Version %s"
+
#: urpmi.addmedia:30
msgid "usage: urpmi.addmedia [--update] <name> <url>"
msgstr "Verwendung: urpmi.addmedia [--update] <Name> <URL>"
@@ -956,8 +1036,75 @@ msgstr ", $_);"
msgid "urpmq version %s"
msgstr "urpmq Version %s"
-#~ msgid "));"
-#~ msgstr "));"
+#~ msgid "retrieving [%s]"
+#~ msgstr "Holen von [%s]"
+
+#~ msgid "wget of [%s] failed (maybe wget is missing?)"
+#~ msgstr "Wget von [%s] schlug fehl (ist wget installiert?)"
+
+#~ msgid "unable to copy source of [%s] from [%s]"
+#~ msgstr "Ich kann die Quelle von [%s] von Medium [%s] nicht lesen."
+
+#~ msgid "removable medium not selected"
+#~ msgstr "Entfehrnbares Medium nich ausgewählt"
+
+#, fuzzy
+#~ 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 ""
+#~ "urpmi Version %s\n"
+#~ "Copyright © 1999-2001 MandrakeSoft.\n"
+#~ "Dieses Programm wird in der Hoffnung verteilt, dass es nützlich ist.\n"
+#~ "Es gibt KEINERLEI Garantie, nicht einmal für die TAUGLICHKEIT oder die,\n"
+#~ "VERWENDBARKEIT FÜR EINEN BESTIMMTEN ZWECK. In den Quellen befindet sich "
+#~ "die\n"
+#~ "Lizenz- und Kopierbedingung; die Einzelheiten sind in der Datei COPYING\n"
+#~ "(GNU General Public License) beschrieben.\n"
+#~ "\n"
+#~ "Verwendung:\n"
+#~ " --help - Anzeigen dieser Hilfe und beenden.\n"
+#~ " --auto - Automatische Wahl eines guten Pakets.\n"
+#~ " --auto-select - Automatische Wahl der Pakete zur Aktualisierung des "
+#~ "Systems.\n"
+#~ " --force - Führe den Befehl aus, selbst wenn einige Pakete "
+#~ "nicht existieren.\n"
+#~ " --X - Verwende die grafische Oberfläche (X11).\n"
+#~ " --best-output - Verwende beste Oberfläche anhand der Umgebung:\n"
+#~ " X11 oder Text-Modus.\n"
+#~ " -a - Wähle alle Treffer in der Kommandozeile.\n"
+#~ " -m - Wähle minimale Auflösung von Abhängigkeiten "
+#~ "(standard).\n"
+#~ " -M - Wähle maximale Auflösung von Abhängigkeiten.\n"
+#~ " -c - Wähle komplette Methode zum Auflösen von "
+#~ "Abhängigkeiten.\n"
+#~ " -q - Vermeide Ausgaben (quiet).\n"
+#~ " -v - Erzeuge aufwendigere Ausgaben (verbose).\n"
+#~ "Namen oder RPM-Dateien (nur für das privileg. Kennzeichen) die auf der "
+#~ "Kommandozeile angegeben werden, werden installiert.\n"
#~ msgid "), $_);"
#~ msgstr "), $_);"
diff --git a/po/el.po b/po/el.po
index cf5e9a7b..e42aa798 100644
--- a/po/el.po
+++ b/po/el.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-08-22 22:42+0300\n"
"Last-Translator: Thanos Kyritsis <djart@hellug.gr>\n"
"Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -26,27 +26,27 @@ msgstr ""
"�������� ����������� �������...\n"
"�������� ��� ����������� ��� ������� $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 "����� �������;"
-#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:281
+#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:279
msgid "Ok"
msgstr "�������"
-#: _irpm:34 po/placeholder.h:116 urpmi:252 urpmi:282
+#: _irpm:34 po/placeholder.h:119 urpmi:252 urpmi:280
msgid "Cancel"
msgstr "�����"
-#: _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 "��"
-#: _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 "��"
-#: _irpm:42 po/placeholder.h:118 urpmi:258
+#: _irpm:42 po/placeholder.h:157 urpmi:258
msgid " (Y/n) "
msgstr " (�/�) "
@@ -167,179 +167,181 @@ msgstr "����������� �� urpmf --help ��� ������������ ��������"
msgid "urpmi is not installed"
msgstr "�� urpmi ��� ����� �������������"
-#: po/placeholder.h:29 urpm.pm:283
+#: po/placeholder.h:29
+#, fuzzy, c-format
+msgid "reading synthesis file [%s]"
+msgstr "�������� depslist ������� [%s]"
+
+#: po/placeholder.h:30 urpm.pm:298
#, c-format
msgid "unable to write config file [%s]"
msgstr "�������� �������� ������� ��������� [%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 ""
-"�������� ������ �������� \"%s\" ��� �� ������� ���� ����� ��� ���������������"
-#: po/placeholder.h:31
+#: po/placeholder.h:32
#, c-format
msgid "nothing to write in list file for \"%s\""
msgstr "������ ��� ������� ��� ������ ������ ��� �� \"%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 "�������� ������� ������� ������ ��� �� \"%s\", �� ���� �� ��������"
-#: po/placeholder.h:33
+#: po/placeholder.h:34
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "�������� ��������� ��� hdlist ������� ��� \"%s\""
-#: po/placeholder.h:34
+#: po/placeholder.h:35
#, c-format
msgid "nothing written in list file for \"%s\""
msgstr "������ ��� �������� ��� ������ ������ ��� �� \"%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 ""
-"�������� ��� %s ��� ���������� ...\n"
-" ��� %s ����� ��� �� ������������ �����!"
-
-#: po/placeholder.h:39 urpm.pm:839
+#: po/placeholder.h:36 urpm.pm:845
#, c-format
msgid "read provides file [%s]"
msgstr "�������� ������� ������� [%s]"
-#: po/placeholder.h:40
-#, c-format
-msgid "trying to remove inexistant medium \"%s\""
-msgstr "���������� ��������� �� �������� ����� \"%s\""
-
-#: po/placeholder.h:41 urpm.pm:1692
+#: po/placeholder.h:37 urpm.pm:1549
#, c-format
msgid "package %s is not found."
msgstr "�� ������ %s ��� �������."
-#: po/placeholder.h:42
-#, c-format
-msgid "unable to copy source of [%s] from [%s]"
-msgstr "�������� ���������� ������� ��� [%s] ��� �� [%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 "�������� �������� ��� compss ������� [%s]"
-#: po/placeholder.h:44 urpm.pm:813
+#: po/placeholder.h:39 urpm.pm:819
#, c-format
msgid "unmounting %s"
msgstr "����������� %s"
-#: po/placeholder.h:45
+#: po/placeholder.h:40
#, c-format
msgid "removing %d obsolete headers in cache"
msgstr "�������� %d �������� ������������ ��� ��� 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 "��� ������� hdlist ������ ��� �� ���� \"%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 ""
+"�� ���� \"%s\" ��������� �� �������������� ��� ��� ��������������� hdlist, "
+"�� ���� �� ��������"
+
+#: po/placeholder.h:43 urpm.pm:184
+#, c-format
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"�������� ������ �������� \"%s\" ��� �� ������� ���� ����� ��� ���������������"
+
+#: po/placeholder.h:44 urpm.pm:191
#, c-format
msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
msgstr ""
"������� �� ���� �� ���� \"%s\" ��� ������ ����� ��� ������� ������ ������ [%"
"s]"
-#: po/placeholder.h:48
+#: po/placeholder.h:45
msgid "keeping only files referenced in provides"
msgstr "��������� ���� ��� ������� ��� ����������� ��� provides"
-#: po/placeholder.h:49
+#: po/placeholder.h:46
#, c-format
msgid "unable to build synthesis file for medium \"%s\""
msgstr "�������� ����������� ������� �������� ��� �� ���� \"%s\""
-#: po/placeholder.h:50
+#: po/placeholder.h:47
#, c-format
msgid "found %d headers in cache"
msgstr "�������� %d ��������� ��� 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 "�������� ��������� ��� provides ������� [%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 ""
"��������� �� ��������� �� %s ����� � ������ ��� locales ��� ��� ���� ����� "
"���������"
-#: 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 ""
+"�������� ��� %s ��� ���������� ......\n"
+" ��� %s ���� ��� ������� �� ������������ ������"
+
+#: po/placeholder.h:54 urpm.pm:326
#, c-format
msgid "medium \"%s\" already exists"
msgstr "�� ���� \"%s\" ��� �������"
-#: po/placeholder.h:54 urpm.pm:295
-#, c-format
-msgid "write config file [%s]"
-msgstr "������� ������� ��������� [%s]"
-
#: po/placeholder.h:55
#, c-format
msgid "unable to write list file of \"%s\""
msgstr "�������� �������� ������� ������ ��� \"%s\""
-#: po/placeholder.h:56 urpm.pm:1817
-#, c-format
-msgid "retrieving [%s]"
-msgstr "�������� [%s]"
-
-#: po/placeholder.h:57 urpm.pm:1819
+#: po/placeholder.h:56 urpm.pm:310
#, c-format
-msgid "wget of [%s] failed"
-msgstr "�� wget ��� [%s] �������"
+msgid "write config file [%s]"
+msgstr "������� ������� ��������� [%s]"
-#: po/placeholder.h:58 urpm.pm:1101
+#: po/placeholder.h:57 urpm.pm:1107
#, c-format
msgid "no package named %s"
msgstr "������ ������ �� �� ����� %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 "�������� ��������� ��� compss ������� [%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 "�������� ������� ��� ������� hdlist ��� �� \"%s\", �� ���� �� ��������"
-#: po/placeholder.h:61
+#: po/placeholder.h:60
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "���������� ������� �������� hdlist ��� �� ���� \"%s\""
-#: po/placeholder.h:62
+#: po/placeholder.h:61
msgid "computing dependencies"
msgstr "������������� �� ����������"
-#: po/placeholder.h:63 urpm.pm:868
+#: po/placeholder.h:62
+#, fuzzy, c-format
+msgid "retrieve of [%s] failed"
+msgstr "�� wget ��� [%s] �������"
+
+#: po/placeholder.h:63 urpm.pm:874
#, c-format
msgid "write provides file [%s]"
msgstr "������� ������� ������� [%s]"
-#: po/placeholder.h:64 urpm.pm:803
+#: po/placeholder.h:64 urpm.pm:809
#, c-format
msgid "mounting %s"
msgstr "�������� �� %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 "
@@ -348,127 +350,137 @@ msgstr ""
"�������� ������� ��� ����� \"%s\" ����� �� ������ ����� ��� ��������������� "
"��� ���� ����"
-#: po/placeholder.h:66 urpm.pm:148
-#, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
-msgstr ""
-"�� ���� \"%s\" ��������� �� �������������� ��� ��� ��������������� �����, �� "
-"���� �� ��������"
-
-#: po/placeholder.h:67
+#: po/placeholder.h:66
#, c-format
msgid "reading hdlist file [%s]"
msgstr "�������� ������� hdlist [%s]"
-#: po/placeholder.h:68 urpm.pm:873
+#: po/placeholder.h:67 urpm.pm:879
#, c-format
msgid "write compss file [%s]"
msgstr "������� compss ������� [%s]"
-#: po/placeholder.h:69 urpm.pm:827
+#: po/placeholder.h:68 urpm.pm:833
#, c-format
msgid "read depslist file [%s]"
msgstr "�������� depslist ������� [%s]"
-#: po/placeholder.h:70
-#, c-format
-msgid "trying to select inexistant medium \"%s\""
-msgstr "���������� �������� ��� �� �������� ����� \"%s\""
+#: po/placeholder.h:69 urpm.pm:103
+msgid "curl failed\n"
+msgstr ""
-#: po/placeholder.h:71 urpm.pm:1812
+#: po/placeholder.h:70 urpm.pm:281 urpm.pm:284
+#, fuzzy, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "�������� ����������� ��� ����� \"%s\"\n"
+
+#: po/placeholder.h:71 urpm.pm:1668
#, c-format
msgid "malformed input: [%s]"
msgstr "��������������� �������: [%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 ""
-"�� ���� \"%s\" ��������� �� �������������� ��� ��� ��������������� hdlist, "
-"�� ���� �� ��������"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "�������� �������� ������ �� �� ���� ����� 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 ""
-"�������� ��� %s ��� ���������� ......\n"
-" ��� %s ���� ��� ������� �� ������������ ������"
+"�� ���� \"%s\" ��������� �� �������������� ��� ��� ��������������� �����, �� "
+"���� �� ��������"
-#: po/placeholder.h:77 urpm.pm:865
+#: po/placeholder.h:74 urpm.pm:871
#, c-format
msgid "unable to write provides file [%s]"
msgstr "�������� �������� ��� provides ������� [%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 "�������� ��������� ��� ������ ������ ��� \"%s\", �� ���� �� ��������"
-#: po/placeholder.h:79 urpm.pm:1005
-msgid "unable to register rpm file"
-msgstr "�������� ���������� ��� 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 ""
"�������� ������� ���� ��� ������� ��������, ����� ����������� parsehdlist"
-#: po/placeholder.h:81 urpm.pm:241
+#: po/placeholder.h:77 urpm.pm:1011
+msgid "unable to register rpm file"
+msgstr "�������� ���������� ��� rpm �������"
+
+#: po/placeholder.h:78 urpm.pm:256
#, c-format
msgid "unable to inspect list file for \"%s\", medium ignored"
msgstr "�������� ���������� ������� ������ ��� �� \"%s\", �� ���� �� ��������"
-#: 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 "�� ������� ������ ������ ��� �� \"%s\", �� ���� ���������"
-#: po/placeholder.h:83
+#: po/placeholder.h:81
#, c-format
msgid "copy of [%s] failed"
msgstr "� ��������� ��� [%s] �������"
-#: 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 "���������� ��������� �� �������� ����� \"%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 "�������� ��������� ����� [%s]"
-#: po/placeholder.h:85 urpm.pm:824
+#: po/placeholder.h:84 urpm.pm:1192
+#, fuzzy, c-format
+msgid "read synthesis file [%s]"
+msgstr "�������� depslist ������� [%s]"
+
+#: po/placeholder.h:85 urpm.pm:830
#, c-format
msgid "unable to read depslist file [%s]"
msgstr "�������� ��������� ��� depslist ������� [%s]"
-#: po/placeholder.h:86
-msgid "removable medium not selected"
-msgstr "�� ����������� ���� ��� ���� ��������"
-
-#: po/placeholder.h:87 urpm.pm:851
+#: po/placeholder.h:86 urpm.pm:857
#, c-format
msgid "read compss file [%s]"
msgstr "�������� copmss ������� [%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 "���������� ����� ��� ������ ��������� ��� ������ %s"
-#: po/placeholder.h:89
+#: po/placeholder.h:88
#, c-format
msgid "building hdlist [%s]"
msgstr "���������� 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 "�������� ��������� ��� rpm ������� [%s] ��� �� ���� \"%s\""
-#: po/placeholder.h:91 urpm.pm:1009
+#: po/placeholder.h:90 urpm.pm:1015
msgid "error registering local packages"
msgstr "������ ���������� ������� �������"
-#: 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 "�� ���� \"%s\" ���� ��������� ��� ����������� ���� ��� �����"
@@ -478,177 +490,165 @@ msgstr "�� ���� \"%s\" ���� ��������� ��� ����������� ���� ��� �����"
msgid "unable to build hdlist: %s"
msgstr "�������� ����������� ��� 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 "�� ���� \"%s\" ��� ���� ���������"
+
+#: po/placeholder.h:95 urpm.pm:1006
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "����� ����� rpm ������� [%s]"
-#: 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 "�� ���� \"%s\" ��� ���� ���������"
+msgid "unknown data associated with %s"
+msgstr "������� �������� ����������� �� �� %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 "���������� �������� ���������� ����� \"%s\""
-#: po/placeholder.h:97 urpm.pm:863
+#: po/placeholder.h:98 urpm.pm:869
#, c-format
msgid "write depslist file [%s]"
msgstr "������� depslist ������� [%s]"
-#: po/placeholder.h:98 urpm.pm:1322
-#, c-format
-msgid "unknown data associated with %s"
-msgstr "������� �������� ����������� �� �� %s"
-
-#: po/placeholder.h:99
-#, c-format
-msgid "source of [%s] not found as [%s]"
-msgstr "� ������� ��� [%s] ��� ������� ��� [%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 "�������� ��������� ��� ������ ������ ��� \"%s\", �� ���� ���������"
-#: 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 "������� �������� %s ���� ��� �� ������������� ������ ������"
-#: po/placeholder.h:102
-#, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
-msgstr "�� wget ��� [%s] ������� (���� ������ �� 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 "�������� ��������� ��� 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 "�������� �������� ��� depslist ������� [%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 ""
+"�������� ��� %s ��� ���������� ...\n"
+" ��� %s ����� ��� �� ������������ �����!"
+
+#: po/placeholder.h:107 urpm.pm:342 urpm.pm:1630
#, c-format
msgid "unable to access medium \"%s\""
msgstr "�������� ��������� ��� ���� \"%s\""
-#: po/placeholder.h:106 urpm.pm:988
+#: po/placeholder.h:108 urpm.pm:994
#, c-format
msgid "relocated %s entries in depslist"
msgstr "������������ %s ������������ ��� depslist"
-#: 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 "�������� �������� ����� ��� [%s] ���� ���� \"%s\""
+msgid "trying to select inexistent medium \"%s\""
+msgstr "���������� �������� ��� �� �������� ����� \"%s\""
-#: po/placeholder.h:108
+#: po/placeholder.h:110 urpm.pm:97
+#, fuzzy
+msgid "wget failed\n"
+msgstr "�� wget ��� [%s] �������"
+
+#: po/placeholder.h:111 urpm.pm:920 urpm.pm:1486 urpm.pm:1537
#, c-format
-msgid "no rpm files found from [%s]"
-msgstr "��� �������� rpm ������ ��� �� [%s]"
+msgid "unable to parse correctly [%s] on value \"%s\""
+msgstr "�������� �������� ����� ��� [%s] ���� ���� \"%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 "�� �������� ������ ��������� %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 "�������� �������� ������ �� �� ���� ����� rpm ������� \"%s\""
+msgid "no rpm files found from [%s]"
+msgstr "��� �������� rpm ������ ��� �� [%s]"
-#: po/placeholder.h:111 urpm.pm:1920
+#: po/placeholder.h:114 urpm.pm:1772
#, c-format
msgid "selecting %s using obsoletes"
msgstr "������� %s ����� �������������"
-#: po/placeholder.h:112 urpm.pm:2031
+#: po/placeholder.h:115 urpm.pm:1888
#, c-format
msgid "selecting %s by selection on files"
msgstr "selecting %s by selection on files"
-#: 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 "�������� �������� ��� �� ���� ����� ��� ������� hdlist [%s]"
-#: po/placeholder.h:114 urpmi:308 urpmi:315 urpmi:328 urpmi:339 urpmi:352
-msgid "Installation failed"
-msgstr "� ����������� �������"
+#: po/placeholder.h:120
+#, fuzzy
+msgid " --help - print this help message.\n"
+msgstr " --all - ������ ��� �� tags."
-#: po/placeholder.h:115 urpmi:279
-msgid "Press enter when it's done..."
-msgstr "������� enter ���� ����������..."
+#: po/placeholder.h:121 urpmi:361
+msgid "everything already installed"
+msgstr "��� ����� ��� �������������"
-#: po/placeholder.h:117 urpmi:201
-msgid "Sorry, bad choice, try again\n"
-msgstr "�������, ���� �������, ����������� ����\n"
+#: po/placeholder.h:122 urpmi:98
+#, fuzzy, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: ������� ���������� \"-%s\", ������� ��� ������� �� �� --help\n"
-#: po/placeholder.h:120
-#, c-format
+#: po/placeholder.h:123 urpmi:194
+msgid "One of the following packages is needed:"
+msgstr "��� �� ��� �������� ������� ����������:"
+
+#: po/placeholder.h:124 po/placeholder.h:222
+msgid " --update - use only update media.\n"
+msgstr ""
+
+#: po/placeholder.h:125 urpmi:299
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"
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
msgstr ""
-"urpmi ������ %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"���� ����� �������� ��������� ��� ������ �� ��������� ��� ���� ����� ��� GNU "
-"GPL.\n"
-"�����:\n"
-" --help - �������� ����� ��� ��������� ��������.\n"
-" --update - ����� ���� ����� ���������.\n"
-" --auto - �������� �������� ��� ���� ������ �� �����������.\n"
-" --auto-select - �������� �������� ������ ��� ��� ���������� ��� "
-"����������.\n"
-" --force - ������� ������������ ����� �� �� ������ ������ ��� "
-"�������.\n"
-" --X - ����� X ������������.\n"
-" --best-output - ������� ��� ��������� ������������ ������� �� �� "
-"����������:\n"
-" X � text mode.\n"
-" -a - ������� ���� ��� �������� ��� ������ �������.\n"
-" -m - ����������� ��������� ������� ���������� (��' "
-"�������).\n"
-" -M - ����������� �������� ������� ����������.\n"
-" -c - ������� ������������� ������� ��� ����������� ��� "
-"����������.\n"
-" -p - ��������� ��� provides ��� ������ ��� �������.\n"
-" -q - ����� ���������.\n"
-" -v - ���������� ���������.\n"
-" ������� ��� rpm ������� (���� ��� �� root) ������� ���� ������ ������� "
-"�������������.\n"
-
-#: po/placeholder.h:142 urpmi:362
-msgid "everything already installed"
-msgstr "��� ����� ��� �������������"
-#: po/placeholder.h:143 urpmi:247
+#: 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 "� ����������� �������"
+
+#: po/placeholder.h:132 po/placeholder.h:234
+msgid ""
+" --auto-select - automatically select packages for upgrading the system.\n"
+msgstr ""
+
+#: po/placeholder.h:134
+#, fuzzy
+msgid " --X - use X interface.\n"
+msgstr " --all - ������ ��� �� tags."
+
+#: po/placeholder.h:135 urpmi:247
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -657,44 +657,111 @@ msgstr ""
"��� �� ������������� �� ���������� (dependencies), �� �������� ������ �� "
"������������� (%d MB)"
-#: po/placeholder.h:144 urpmi:296
-#, c-format
-msgid "installing %s\n"
-msgstr "����������� %s\n"
+#: po/placeholder.h:136 urpmi:320 urpmi:344
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr ""
+"���������� ��� ����������� ����� ��� ������ ��� ���������� (dependencies); "
+"(�/�) "
+
+#: po/placeholder.h:137
+msgid ""
+" --best-output - choose best interface according to the environment:\n"
+" X or text mode.\n"
+msgstr ""
-#: po/placeholder.h:145 urpmi:198
+#: 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 - ������ ��� �� tags."
+
+#: po/placeholder.h:144 urpmi:202
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "���� ����� � ������� ���; (1-%d) "
-#: po/placeholder.h:146 urpmi:321 urpmi:345
-msgid "Try installation without checking dependencies? (y/N) "
+#: po/placeholder.h:145
+msgid " --wget - use wget to retrieve distant files.\n"
msgstr ""
-"���������� ��� ����������� ����� ��� ������ ��� ���������� (dependencies); "
-"(�/�) "
-#: po/placeholder.h:147 urpmi:190
-msgid "One of the following packages is needed:"
-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"
+msgstr ""
+"���� ����� �������� ��������� ��� ������ �� ���������� ��� ���� ����� ��� "
+"GNU GPL."
-#: po/placeholder.h:148 urpmi:149
+#: po/placeholder.h:152 urpmi:328 urpmi:352
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "���������� ��� ��� ������ ����������� (--force); (�/�) "
+
+#: po/placeholder.h:154
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+
+#: po/placeholder.h:155 urpmi:205
+msgid "Sorry, bad choice, try again\n"
+msgstr "�������, ���� �������, ����������� ����\n"
+
+#: po/placeholder.h:156
+msgid ""
+" names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: po/placeholder.h:158
+msgid " -a - select all matches on command line.\n"
+msgstr ""
+
+#: 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 "����������� %s\n"
+
+#: po/placeholder.h:161 urpmi:152
msgid "Only superuser is allowed to install local packages"
msgstr "���� � ����������� ������ �� ������������ ������ ������"
-#: 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 "�������� ����� �� ���� �� ����� \"%s\" ��� ������� [%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 "�������� ������������ ��� ������� (source) �������, �����������"
-#: po/placeholder.h:151 urpmi:329 urpmi:353
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "���������� ��� ��� ������ ����������� (--force); (�/�) "
+#: po/placeholder.h:165 urpmi:102
+#, fuzzy
+msgid "Only superuser is allowed to install packages"
+msgstr "���� � ����������� ������ �� ������������ ������ ������"
+
+#: po/placeholder.h:166 urpmi:193
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "��� �� ��� �������� ������� ����������:"
-#: po/placeholder.h:155 urpmi.addmedia:46
+#: po/placeholder.h:167 urpmi:277
+msgid "Press Enter when it's done..."
+msgstr "������� enter ���� ����������..."
+
+#: po/placeholder.h:168 urpmi.addmedia:46
#, c-format
msgid ""
"%s\n"
@@ -703,7 +770,7 @@ msgstr ""
"%s\n"
"�� `with' ������ ��� �� ftp media\n"
-#: po/placeholder.h:159
+#: po/placeholder.h:172
msgid ""
"usage: urpmi.addmedia [--update] <name> <url>\n"
"where <url> is one of\n"
@@ -723,17 +790,17 @@ msgstr ""
" http://<host>/<path> with <relative filename of hdlist>\n"
" removable_<�������>://<path>\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 "�������� ����������� ��� ����� \"%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 "�������� ����������� ��� ����� \"%s\"\n"
-#: po/placeholder.h:170 urpmi.addmedia:42
+#: po/placeholder.h:183 urpmi.addmedia:42
#, c-format
msgid ""
"%s\n"
@@ -742,7 +809,7 @@ msgstr ""
"%s\n"
"� ������� `%s' ��� �������\n"
-#: po/placeholder.h:174 urpmi.addmedia:44
+#: po/placeholder.h:187 urpmi.addmedia:44
#, c-format
msgid ""
"%s\n"
@@ -751,7 +818,7 @@ msgstr ""
"%s\n"
"� <������� �������� ��� hdlist> ������\n"
-#: po/placeholder.h:178
+#: po/placeholder.h:191
#, c-format
msgid ""
"usage: urpmi.update [-a] <name> ...\n"
@@ -771,12 +838,12 @@ msgstr ""
"\n"
"�������� �������� '%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 ""
"������ ��� ���������� (�������������� urpmi.addmedia ��� �������� �����)\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"
@@ -785,12 +852,12 @@ msgstr ""
"� ���������� ���� ���������� ������\n"
"(��� �� ��� %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 ""
"������ ��� �������� (�������������� urpmi.addmedia ��� �������� �����)\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"
@@ -799,7 +866,7 @@ msgstr ""
"� ������� ���� �������� ������\n"
"(��� �� ��� %s)\n"
-#: po/placeholder.h:197
+#: po/placeholder.h:210
#, c-format
msgid ""
"usage: urpmi.removemedia [-a] <name> ...\n"
@@ -814,17 +881,12 @@ msgstr ""
"\n"
"�������� �������� '%s'\n"
-#: po/placeholder.h:204 urpmq:85
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: �������� ��������� rpm ������� \"%s\"\n"
-
-#: po/placeholder.h:206 urpmq:82
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: ������� ���������� \"-%s\", ������� ��� ������� �� �� --help\n"
+#: po/placeholder.h:217
+#, fuzzy
+msgid " -h - print this help message.\n"
+msgstr " --all - ������ ��� �� tags."
-#: 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"
@@ -832,119 +894,103 @@ msgstr ""
"������ ������ ������ �� ��������� ��� �� ������������, ���� ��� "
"������������� �����\n"
-#: po/placeholder.h:208
+#: po/placeholder.h:219
+#, fuzzy
+msgid " -g - print groups too with name.\n"
+msgstr " --group - ������ �� tag group: group."
+
+#: po/placeholder.h:220 urpmq:84
#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: �������� ��������� 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 " ������ ������� ���� ����� ����� �������)."
+
+#: 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"
-" --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 ""
-"urpmq ������ %s\n"
-"Copyright (C) 2000, 2001 MandrakeSoft.\n"
"���� ����� �������� ��������� ��� ������ �� ���������� ��� ���� ����� ��� "
-"GNU GPL.\n"
-"�����:\n"
-" -h - �������� ����� ��� ���������� ���������.\n"
-" -v - ���������� ���������.\n"
-" -d - �������� �������� ���� ���������� ��� �������.\n"
-" -u - �������� ������� �� ��� �������� ������ ����� ��� "
-"�������������.\n"
-" -m - �������� �������� ���� ���������� ��� �������, �������� "
-"���\n"
-" �������������� ������� ��� ������� ��� �� ����������, "
-"��������\n"
-" ������� ��� ������ �� ���������� ��� ����������.\n"
-" -M - �������� �������� ���� ���������� ��� ������� ��� "
-"�������� ���\n"
-" �������������� ������� ���� �� �������� ������� ���.\n"
-" -c - ������� ������������� ������� ��� ��� ����������� ��� "
-"����������.\n"
-" -p - ��������� ��� provides ��� ������ �������.\n"
-" -g - �������� ������ ���� �� �� �����.\n"
-" -r - �������� ������� ���� �� �� �����.\n"
-" --update - ����� ���� ����� ���������.\n"
-" --auto-select - �������� ������� ������� ��� ��� ���������� ��� "
-"����������.\n"
-" --headers - �������� ������������ ��� ������� ��� ��� urpmi ���� ���\n"
-" stdout (���� ��� ��� root).\n"
-" --sources - ���� ��� �� ������ ������ ���� �� ��������� (���� ��� ��� "
-"root).\n"
-" --force - ������� ��������� ����� �� �� ��� ������ ��� �������.\n"
-" �� ������� ��� ������� rpm ��� �������� ��� ������ ������� ������� ��� "
-"��������.\n"
-
-#: urpm.pm:257
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+"GNU GPL."
+
+#: po/placeholder.h:231
+#, fuzzy
+msgid " -d - extend query to package dependencies.\n"
+msgstr " ������ ������� ���� ����� ����� �������)."
+
+#: po/placeholder.h:232
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
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: ������� ���������� \"-%s\", ������� ��� ������� �� �� --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 "�������� ����������� ��� ����� \"%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 "�������� depslist ������� [%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 "urpmi ������ %s"
+msgid "removing %s to upgrade to %s ..."
+msgstr ""
-#: urpmi:98
-#, fuzzy, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: ������� ���������� \"-%s\", ������� ��� ������� �� �� --help\n"
+#: urpm.pm:1797 urpm.pm:1806
+msgid ", $otherPackage, "
+msgstr ", $otherPackage, "
-#: urpmi:102
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr "���� � ����������� ������ �� ������������ ������ ������"
+#: urpm.pm:1797 urpm.pm:1806
+msgid "));"
+msgstr "));"
-#: urpmi:189
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "��� �� ��� �������� ������� ����������:"
+#: 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 "urpmi ������ %s"
#: urpmi.addmedia:30
msgid "usage: urpmi.addmedia [--update] <name> <url>"
@@ -975,3 +1021,140 @@ msgstr ", $_);"
#, c-format
msgid "urpmq version %s"
msgstr "urpmq ������ %s"
+
+#~ msgid "retrieving [%s]"
+#~ msgstr "�������� [%s]"
+
+#~ msgid "wget of [%s] failed (maybe wget is missing?)"
+#~ msgstr "�� wget ��� [%s] ������� (���� ������ �� wget;)"
+
+#~ msgid "unable to copy source of [%s] from [%s]"
+#~ msgstr "�������� ���������� ������� ��� [%s] ��� �� [%s]"
+
+#~ msgid "removable medium not selected"
+#~ msgstr "�� ����������� ���� ��� ���� ��������"
+
+#~ msgid "source of [%s] not found as [%s]"
+#~ msgstr "� ������� ��� [%s] ��� ������� ��� [%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 ""
+#~ "urpmi ������ %s\n"
+#~ "Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+#~ "���� ����� �������� ��������� ��� ������ �� ��������� ��� ���� ����� ��� "
+#~ "GNU GPL.\n"
+#~ "�����:\n"
+#~ " --help - �������� ����� ��� ��������� ��������.\n"
+#~ " --update - ����� ���� ����� ���������.\n"
+#~ " --auto - �������� �������� ��� ���� ������ �� �����������.\n"
+#~ " --auto-select - �������� �������� ������ ��� ��� ���������� ��� "
+#~ "����������.\n"
+#~ " --force - ������� ������������ ����� �� �� ������ ������ ��� "
+#~ "�������.\n"
+#~ " --X - ����� X ������������.\n"
+#~ " --best-output - ������� ��� ��������� ������������ ������� �� �� "
+#~ "����������:\n"
+#~ " X � text mode.\n"
+#~ " -a - ������� ���� ��� �������� ��� ������ �������.\n"
+#~ " -m - ����������� ��������� ������� ���������� (��' "
+#~ "�������).\n"
+#~ " -M - ����������� �������� ������� ����������.\n"
+#~ " -c - ������� ������������� ������� ��� ����������� ��� "
+#~ "����������.\n"
+#~ " -p - ��������� ��� provides ��� ������ ��� �������.\n"
+#~ " -q - ����� ���������.\n"
+#~ " -v - ���������� ���������.\n"
+#~ " ������� ��� rpm ������� (���� ��� �� root) ������� ���� ������ ������� "
+#~ "�������������.\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 ""
+#~ "urpmq ������ %s\n"
+#~ "Copyright (C) 2000, 2001 MandrakeSoft.\n"
+#~ "���� ����� �������� ��������� ��� ������ �� ���������� ��� ���� ����� ��� "
+#~ "GNU GPL.\n"
+#~ "�����:\n"
+#~ " -h - �������� ����� ��� ���������� ���������.\n"
+#~ " -v - ���������� ���������.\n"
+#~ " -d - �������� �������� ���� ���������� ��� �������.\n"
+#~ " -u - �������� ������� �� ��� �������� ������ ����� ��� "
+#~ "�������������.\n"
+#~ " -m - �������� �������� ���� ���������� ��� �������, "
+#~ "�������� ���\n"
+#~ " �������������� ������� ��� ������� ��� �� ����������, "
+#~ "��������\n"
+#~ " ������� ��� ������ �� ���������� ��� ����������.\n"
+#~ " -M - �������� �������� ���� ���������� ��� ������� ��� "
+#~ "�������� ���\n"
+#~ " �������������� ������� ���� �� �������� ������� ���.\n"
+#~ " -c - ������� ������������� ������� ��� ��� ����������� ��� "
+#~ "����������.\n"
+#~ " -p - ��������� ��� provides ��� ������ �������.\n"
+#~ " -g - �������� ������ ���� �� �� �����.\n"
+#~ " -r - �������� ������� ���� �� �� �����.\n"
+#~ " --update - ����� ���� ����� ���������.\n"
+#~ " --auto-select - �������� ������� ������� ��� ��� ���������� ��� "
+#~ "����������.\n"
+#~ " --headers - �������� ������������ ��� ������� ��� ��� urpmi ���� "
+#~ "���\n"
+#~ " stdout (���� ��� ��� root).\n"
+#~ " --sources - ���� ��� �� ������ ������ ���� �� ��������� (���� ��� "
+#~ "��� root).\n"
+#~ " --force - ������� ��������� ����� �� �� ��� ������ ��� �������.\n"
+#~ " �� ������� ��� ������� rpm ��� �������� ��� ������ ������� ������� ��� "
+#~ "��������.\n"
diff --git a/po/eo.po b/po/eo.po
index e983573c..8542cfee 100644
--- a/po/eo.po
+++ b/po/eo.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-09-14 07:50-0500\n"
"Last-Translator: D. Dale Gulledge <dsplat@rochester.rr.com>\n"
"Language-Team: Esperanto <eo@li.org>\n"
@@ -25,27 +25,27 @@ msgstr ""
"A�tomata instalado de paka�oj...\n"
"Vi petis instaladon de paka�o $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 "�u tio estas bona?"
-#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:281
+#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:279
msgid "Ok"
msgstr "Jes"
-#: _irpm:34 po/placeholder.h:116 urpmi:252 urpmi:282
+#: _irpm:34 po/placeholder.h:119 urpmi:252 urpmi:280
msgid "Cancel"
msgstr "Nuligu"
-#: _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 "Nn"
-#: _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 "JjYy"
-#: _irpm:42 po/placeholder.h:118 urpmi:258
+#: _irpm:42 po/placeholder.h:157 urpmi:258
msgid " (Y/n) "
msgstr " (J/n) "
@@ -163,296 +163,309 @@ msgstr "provu `urpmf --help' por pli da opcioj"
msgid "urpmi is not installed"
msgstr "urpmi ne estas instalata"
-#: po/placeholder.h:29 urpm.pm:283
+#: po/placeholder.h:29
+#, fuzzy, c-format
+msgid "reading synthesis file [%s]"
+msgstr "legu \"depslist\" dosieron [%s]"
+
+#: po/placeholder.h:30 urpm.pm:298
#, c-format
msgid "unable to write config file [%s]"
msgstr "ne povas skribi konfigurodosieron [%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"
-msgstr "ne povis uzi nomon \"%s\" por sennoma medio �ar �i jam estas uzata"
+msgid "using different removable device [%s] for \"%s\""
+msgstr ""
-#: po/placeholder.h:31
+#: po/placeholder.h:32
#, c-format
msgid "nothing to write in list file for \"%s\""
msgstr "nenio por skribi en listdosiero por \"%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 "ne povis trovi listdosieron por \"%s\", ignoris medion"
-#: po/placeholder.h:33
+#: po/placeholder.h:34
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "ne povis analizi hdlist dosieron de \"%s\""
-#: po/placeholder.h:34
+#: po/placeholder.h:35
#, c-format
msgid "nothing written in list file for \"%s\""
msgstr "skribis nenion en listdosiero por \"%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 ""
-"forigas %s por �isdatigi ...\n"
-" al %s �ar �i ne �isdatigos �uste!"
-
-#: po/placeholder.h:39 urpm.pm:839
+#: po/placeholder.h:36 urpm.pm:845
#, c-format
msgid "read provides file [%s]"
msgstr "legu \"provides\" dosieron [%s]"
-#: po/placeholder.h:40
-#, c-format
-msgid "trying to remove inexistant medium \"%s\""
-msgstr "Provas forigi neekzistantan medion \"%s\""
-
-#: po/placeholder.h:41 urpm.pm:1692
+#: po/placeholder.h:37 urpm.pm:1549
#, c-format
msgid "package %s is not found."
msgstr "paka�o %s ne estis trovata."
-#: po/placeholder.h:42
-#, c-format
-msgid "unable to copy source of [%s] from [%s]"
-msgstr "ne povis kopii fonton de [%s] el [%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 "ne povis skribi \"compss\" dosieron [%s]"
-#: po/placeholder.h:44 urpm.pm:813
+#: po/placeholder.h:39 urpm.pm:819
#, c-format
msgid "unmounting %s"
msgstr "malmuntas %s"
-#: po/placeholder.h:45
+#: po/placeholder.h:40
#, c-format
msgid "removing %d obsolete headers in cache"
msgstr "forigas %d jam ne uzatajn �apdosierojn en ka�ejo"
-#: 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 "neniu \"hdlist\" dosiero trovita por medio \"%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 "medio \"%s\" provis uzi jam uzita \"hdlist\", ignoris medion"
+
+#: po/placeholder.h:43 urpm.pm:184
+#, c-format
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr "ne povis uzi nomon \"%s\" por sennoma medio �ar �i jam estas uzata"
+
+#: po/placeholder.h:44 urpm.pm:191
#, c-format
msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
msgstr "ne povis konsideri medion \"%s\" �ar ne ekzistas listdosieron [%s]"
-#: po/placeholder.h:48
+#: po/placeholder.h:45
msgid "keeping only files referenced in provides"
msgstr "konservas nur dosierojn al kiuj \"provides\"-a dosiero aludas"
-#: po/placeholder.h:49
+#: po/placeholder.h:46
#, c-format
msgid "unable to build synthesis file for medium \"%s\""
msgstr "ne povis konstrui syntezan dosieron por medio \"%s\""
-#: po/placeholder.h:50
+#: po/placeholder.h:47
#, c-format
msgid "found %d headers in cache"
msgstr "trovis %d �apdosierojn en ka�ejo"
-#: po/placeholder.h:51 urpm.pm:836
+#: po/placeholder.h:48 urpm.pm:842
#, c-format
msgid "unable to read provides file [%s]"
msgstr "ne povis legi \"provides\" dosieron [%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 "evitu elekti %s �ar �ia lokallingvo ne estas jam elektita"
-#: 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 ""
+"forigas %s por �isdatigi ...\n"
+" al %s �ar �i ne estos �isdatigata alie"
+
+#: po/placeholder.h:54 urpm.pm:326
#, c-format
msgid "medium \"%s\" already exists"
msgstr "medio \"%s\" jam ekzistas"
-#: po/placeholder.h:54 urpm.pm:295
-#, c-format
-msgid "write config file [%s]"
-msgstr "skribu konfiguran dosieron [%s]"
-
#: po/placeholder.h:55
#, c-format
msgid "unable to write list file of \"%s\""
msgstr "ne povis skribi listdosieron de \"%s\""
-#: po/placeholder.h:56 urpm.pm:1817
-#, c-format
-msgid "retrieving [%s]"
-msgstr "reprenas [%s]"
-
-#: po/placeholder.h:57 urpm.pm:1819
+#: po/placeholder.h:56 urpm.pm:310
#, c-format
-msgid "wget of [%s] failed"
-msgstr "wget de [%s] malsukcesis"
+msgid "write config file [%s]"
+msgstr "skribu konfiguran dosieron [%s]"
-#: po/placeholder.h:58 urpm.pm:1101
+#: po/placeholder.h:57 urpm.pm:1107
#, c-format
msgid "no package named %s"
msgstr "neniu paka�o nomata %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 "ne povis legi \"compss\" dosieron [%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 "ne povis trovi \"hdlist\"-an dosieron por \"%s\", ignoris medion"
-#: po/placeholder.h:61
+#: po/placeholder.h:60
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "konstruis hdlist-an sintezan dosieron por medio \"%s\""
-#: po/placeholder.h:62
+#: po/placeholder.h:61
msgid "computing dependencies"
msgstr "kalkulas dependa�ojn"
-#: po/placeholder.h:63 urpm.pm:868
+#: po/placeholder.h:62
+#, fuzzy, c-format
+msgid "retrieve of [%s] failed"
+msgstr "wget de [%s] malsukcesis"
+
+#: po/placeholder.h:63 urpm.pm:874
#, c-format
msgid "write provides file [%s]"
msgstr "skribu \"provides\" dosieron [%s]"
-#: po/placeholder.h:64 urpm.pm:803
+#: po/placeholder.h:64 urpm.pm:809
#, c-format
msgid "mounting %s"
msgstr "muntas %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 "
"medium"
msgstr "ne povis trakti pri medion \"%s\" �ar alia medio jam uzas listdosieron"
-#: po/placeholder.h:66 urpm.pm:148
-#, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
-msgstr "medio \"%s\" provis uzi jam uzitan liston, ignoras medion"
-
-#: po/placeholder.h:67
+#: po/placeholder.h:66
#, c-format
msgid "reading hdlist file [%s]"
msgstr "legas \"hdlist\" dosieron [%s]"
-#: po/placeholder.h:68 urpm.pm:873
+#: po/placeholder.h:67 urpm.pm:879
#, c-format
msgid "write compss file [%s]"
msgstr "skribu \"compss\" dosieron [%s]"
-#: po/placeholder.h:69 urpm.pm:827
+#: po/placeholder.h:68 urpm.pm:833
#, c-format
msgid "read depslist file [%s]"
msgstr "legu \"depslist\" dosieron [%s]"
-#: po/placeholder.h:70
-#, c-format
-msgid "trying to select inexistant medium \"%s\""
-msgstr "provas elekti neekzistantan medion \"%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 "ne povis krei medion \"%s\"\n"
-#: po/placeholder.h:71 urpm.pm:1812
+#: po/placeholder.h:71 urpm.pm:1668
#, c-format
msgid "malformed input: [%s]"
msgstr "malbone formata enigo: [%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 "medio \"%s\" provis uzi jam uzita \"hdlist\", ignoris medion"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr ""
+"ekzistas plurajn paka�ojn kiuj havas la saman rpm-an dosiernomon \"%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"
-msgstr ""
-"forigas %s por �isdatigi ...\n"
-" al %s �ar �i ne estos �isdatigata alie"
+msgid "medium \"%s\" tries to use an already used list, medium ignored"
+msgstr "medio \"%s\" provis uzi jam uzitan liston, ignoras medion"
-#: po/placeholder.h:77 urpm.pm:865
+#: po/placeholder.h:74 urpm.pm:871
#, c-format
msgid "unable to write provides file [%s]"
msgstr "ne povis skribi \"provides\" dosieron [%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 "ne povas atingi \"hdlist\" dosieron de \"%s\", ignoris medion"
-#: po/placeholder.h:79 urpm.pm:1005
-msgid "unable to register rpm file"
-msgstr "ne povis registri rpm-an dosieron"
-
-#: 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 "ne povis trovi �iujn sintezadodosierojn, per \"parsehdlist\"-a servilo"
-#: po/placeholder.h:81 urpm.pm:241
+#: po/placeholder.h:77 urpm.pm:1011
+msgid "unable to register rpm file"
+msgstr "ne povis registri rpm-an dosieron"
+
+#: po/placeholder.h:78 urpm.pm:256
#, c-format
msgid "unable to inspect list file for \"%s\", medium ignored"
msgstr "ne povas inspekti listdosieron por \"%s\", ignoris medion"
-#: 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 "nekohera listdosiero por \"%s\", medio ignorita"
-#: po/placeholder.h:83
+#: po/placeholder.h:81
#, c-format
msgid "copy of [%s] failed"
msgstr "kopiado de [%s] malsukcesis"
-#: 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 "Provas forigi neekzistantan medion \"%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 "ne povis analizi �uste [%s]"
-#: po/placeholder.h:85 urpm.pm:824
+#: po/placeholder.h:84 urpm.pm:1192
+#, fuzzy, c-format
+msgid "read synthesis file [%s]"
+msgstr "legu \"depslist\" dosieron [%s]"
+
+#: po/placeholder.h:85 urpm.pm:830
#, c-format
msgid "unable to read depslist file [%s]"
msgstr "ne povis legi \"depslist\" dosieron [%s]"
-#: po/placeholder.h:86
-msgid "removable medium not selected"
-msgstr "deprenebla medio ne estis elektata"
-
-#: po/placeholder.h:87 urpm.pm:851
+#: po/placeholder.h:86 urpm.pm:857
#, c-format
msgid "read compss file [%s]"
msgstr "legu \"compss\" dosieron [%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 "sintakseraro en konfigura dosiero �e linio %s"
-#: po/placeholder.h:89
+#: po/placeholder.h:88
#, c-format
msgid "building hdlist [%s]"
msgstr "konstruas \"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 "ne povis legi rpm-an dosieron [%s] de medio \"%s\""
-#: po/placeholder.h:91 urpm.pm:1009
+#: po/placeholder.h:90 urpm.pm:1015
msgid "error registering local packages"
msgstr "eraro dum registri lokajn paka�ojn"
-#: 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 "malkohera medio \"%s\" indikita forigebla sed ne vere"
@@ -462,217 +475,274 @@ msgstr "malkohera medio \"%s\" indikita forigebla sed ne vere"
msgid "unable to build hdlist: %s"
msgstr "ne povis konstrui \"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 "medio \"%s\" ne estas elektata"
+
+#: po/placeholder.h:95 urpm.pm:1006
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "nevalida rpm-a dosiernomo [%s]"
-#: 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 "medio \"%s\" ne estas elektata"
+msgid "unknown data associated with %s"
+msgstr "nekonata dateno rilatigata kun %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 "provas �irka�iri ekzistantan medion \"%s:, evitas"
-#: po/placeholder.h:97 urpm.pm:863
+#: po/placeholder.h:98 urpm.pm:869
#, c-format
msgid "write depslist file [%s]"
msgstr "skribu \"depslist\" dosieron [%s]"
-#: po/placeholder.h:98 urpm.pm:1322
-#, c-format
-msgid "unknown data associated with %s"
-msgstr "nekonata dateno rilatigata kun %s"
-
-#: po/placeholder.h:99
-#, c-format
-msgid "source of [%s] not found as [%s]"
-msgstr "fonto de [%s] ne trovata kiel [%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 "ne povis atingi listdosieron de \"%s\", ignoris medion"
-#: 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 "evitu elekti %s �ar nesufi�e da dosieroj estos �isdatigataj"
-#: po/placeholder.h:102
-#, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
-msgstr "wget de [%s] malsukcesis (eble wget mankas?)"
-
-#: po/placeholder.h:103 urpm.pm:1001
+#: po/placeholder.h:101 urpm.pm:1007
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "ne povis atingi rpm-an dosieron [%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 "ne povis skribi \"depslist\" dosieron [%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 ""
+"forigas %s por �isdatigi ...\n"
+" al %s �ar �i ne �isdatigos �uste!"
+
+#: po/placeholder.h:107 urpm.pm:342 urpm.pm:1630
#, c-format
msgid "unable to access medium \"%s\""
msgstr "ne povis atingi medion \"%s\""
-#: po/placeholder.h:106 urpm.pm:988
+#: po/placeholder.h:108 urpm.pm:994
#, c-format
msgid "relocated %s entries in depslist"
msgstr "translokigis %s enskriba�ojn en \"depslist\""
-#: 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 "ne povis �uste analizi [%s] je valoro \"%s\""
+msgid "trying to select inexistent medium \"%s\""
+msgstr "provas elekti neekzistantan medion \"%s\""
-#: po/placeholder.h:108
+#: po/placeholder.h:110 urpm.pm:97
+#, fuzzy
+msgid "wget failed\n"
+msgstr "wget de [%s] malsukcesis"
+
+#: po/placeholder.h:111 urpm.pm:920 urpm.pm:1486 urpm.pm:1537
#, c-format
-msgid "no rpm files found from [%s]"
-msgstr "neniom da rpm-aj dosieroj trovataj de [%s]"
+msgid "unable to parse correctly [%s] on value \"%s\""
+msgstr "ne povis �uste analizi [%s] je valoro \"%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 "La sekvantaj paka�oj enhavas %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 ""
-"ekzistas plurajn paka�ojn kiuj havas la saman rpm-an dosiernomon \"%s\""
+msgid "no rpm files found from [%s]"
+msgstr "neniom da rpm-aj dosieroj trovataj de [%s]"
-#: po/placeholder.h:111 urpm.pm:1920
+#: po/placeholder.h:114 urpm.pm:1772
#, c-format
msgid "selecting %s using obsoletes"
msgstr "%s elektata per arkaika�oj"
-#: po/placeholder.h:112 urpm.pm:2031
+#: po/placeholder.h:115 urpm.pm:1888
#, c-format
msgid "selecting %s by selection on files"
msgstr "elektas %s per elektado je dosieroj"
-#: 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 "ne povis determini medion de �i tiu \"hdlist\" dosiero [%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 - printu �iujn etikedojn."
+
+#: po/placeholder.h:121 urpmi:361
+msgid "everything already installed"
+msgstr "�io jam instalita"
+
+#: po/placeholder.h:122 urpmi:98
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: nekonata opcio \"-%s\", kontrolu uzadon kun \"--help\"\n"
+
+#: po/placeholder.h:123 urpmi:194
+msgid "One of the following packages is needed:"
+msgstr "Unu el la sekvantaj paka�oj estas bezonata:"
+
+#: 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 "Instalado malsukcesis"
-#: po/placeholder.h:115 urpmi:279
-msgid "Press enter when it's done..."
-msgstr "Premu la enigklavon kiam �i estas finata..."
+#: 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 "Beda�rinde, nevalida elekto, reprovu\n"
+#: po/placeholder.h:134
+#, fuzzy
+msgid " --X - use X interface.\n"
+msgstr " --all - printu �iujn etikedojn."
-#: 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 "Por plenumi dependa�ojn, la sekvantaj paka�oj estas instalonta (%d mb)"
+
+#: po/placeholder.h:136 urpmi:320 urpmi:344
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Provu instaladon sen kontroli dependa�ojn? (j/N) "
+
+#: 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 - printu �iujn etikedojn."
+
+#: po/placeholder.h:144 urpmi:202
#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "Kiu estas via elekto? (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 ""
-"urpmi versio %s\n"
-"Kopirajtita (C) 1999, 2000, 2001 MandrakeSoft.\n"
"�i tiu estas libera programo kaj vi rajtas redistribui �i sub la kondi�oj\n"
-"de la GNU GPL.\n"
-"uzado:\n"
-" --help - printu �i tiun helpan mesa�on.\n"
-" --update - uzu nur �isdatigan medion.\n"
-" --auto - a�tomate elektu bonan paka�on el la elektoj.\n"
-" --auto-select - a�tomate elektu paka�ojn por �isdatigi la sistemon.\n"
-" --force - devigu lan�on e� se iu paka�o ne ekzistas.\n"
-" --X - uzu X interfacon.\n"
-" --best-output - elektu la pli bonan interfaco la� la medio: X a�\n"
-" tekstan re�iman.\n"
-" -a - elektu �iujn egala�ojn sur komanda linio.\n"
-" -m - elektu minimuman ferma�on de bezonatoj (defa�lto).\n"
-" -M - elektu maksimuman ferma�on de bezonatoj.\n"
-" -c - elektu plenan metodon por decidi ferma�on de "
-"bezonatoj.\n"
-" -p - permesu ser�on en provizoj trovi paka�on\n"
-" -q - kvieta re�imo.\n"
-" -v - babilema re�imo.\n"
-" nomoj a� rpm-aj dosieroj (nur por \"root\") donata sur la ordonolinio "
-"estos\n"
-" instalataj.\n"
-
-#: po/placeholder.h:142 urpmi:362
-msgid "everything already installed"
-msgstr "�io jam instalita"
+"de la 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 "Provu instaladon e� pli forte (--force)? (j/N) "
+
+#: po/placeholder.h:154
msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
-msgstr "Por plenumi dependa�ojn, la sekvantaj paka�oj estas instalonta (%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 "instalas %s\n"
+#: po/placeholder.h:155 urpmi:205
+msgid "Sorry, bad choice, try again\n"
+msgstr "Beda�rinde, nevalida elekto, reprovu\n"
-#: po/placeholder.h:145 urpmi:198
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Kiu estas via elekto? (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 "Provu instaladon sen kontroli dependa�ojn? (j/N) "
+#: 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 "Unu el la sekvantaj paka�oj estas bezonata:"
+#: 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 "instalas %s\n"
-#: po/placeholder.h:148 urpmi:149
+#: po/placeholder.h:161 urpmi:152
msgid "Only superuser is allowed to install local packages"
msgstr "Nur superuzulo rajtas instali lokajn paka�ojn"
-#: 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 "Bonvole en�ovu la medion nomata \"%s\" en aparato [%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 "Ne povas preni fontajn paka�ojn. Mi �esi�as."
-#: po/placeholder.h:151 urpmi:329 urpmi:353
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Provu instaladon e� pli forte (--force)? (j/N) "
+#: po/placeholder.h:165 urpmi:102
+#, fuzzy
+msgid "Only superuser is allowed to install packages"
+msgstr "Nur superuzulo rajtas instali lokajn paka�ojn"
+
+#: po/placeholder.h:166 urpmi:193
+#, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Unu el la sekvantaj paka�oj estas bezonata por instali %s:"
-#: po/placeholder.h:155 urpmi.addmedia:46
+#: po/placeholder.h:167 urpmi:277
+msgid "Press Enter when it's done..."
+msgstr "Premu la enigklavon kiam �i estas finata..."
+
+#: po/placeholder.h:168 urpmi.addmedia:46
#, c-format
msgid ""
"%s\n"
@@ -681,7 +751,7 @@ msgstr ""
"%s\n"
"`with' mankanta por ftp medio\n"
-#: po/placeholder.h:159
+#: po/placeholder.h:172
msgid ""
"usage: urpmi.addmedia [--update] <name> <url>\n"
"where <url> is one of\n"
@@ -703,17 +773,17 @@ msgstr ""
"listo>\n"
" removable_<aparato>://<dosierindiko>\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 "ne povis krei medion \"%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 "ne povis �isdatigi medion \"%s\"\n"
-#: po/placeholder.h:170 urpmi.addmedia:42
+#: po/placeholder.h:183 urpmi.addmedia:42
#, c-format
msgid ""
"%s\n"
@@ -722,7 +792,7 @@ msgstr ""
"%s\n"
"aparato `%s' ne ekzistas\n"
-#: po/placeholder.h:174 urpmi.addmedia:44
+#: po/placeholder.h:187 urpmi.addmedia:44
#, c-format
msgid ""
"%s\n"
@@ -731,7 +801,7 @@ msgstr ""
"%s\n"
"<relativa dosieronomo de hd-listo> mankas\n"
-#: po/placeholder.h:178
+#: po/placeholder.h:191
#, c-format
msgid ""
"usage: urpmi.update [-a] <name> ...\n"
@@ -751,11 +821,11 @@ msgstr ""
"\n"
"nekonataj opcioj '%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 "nenio por �isdatigi (uzu urpmi.addmedia por aldoni medion)\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"
@@ -764,11 +834,11 @@ msgstr ""
"la enskriba�o por �isgatigi mankas\n"
"(unu el %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 "nenio por forpreni (uzu urpmi.addmedia por aldoni medion)\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"
@@ -777,7 +847,7 @@ msgstr ""
"la enskriba�o por forpreni mankas\n"
"(unu el %s)\n"
-#: po/placeholder.h:197
+#: po/placeholder.h:210
#, c-format
msgid ""
"usage: urpmi.removemedia [-a] <name> ...\n"
@@ -792,17 +862,12 @@ msgstr ""
"\n"
"nekonataj opcioj '%s'\n"
-#: po/placeholder.h:204 urpmq:85
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: ne povas legi rpm-an dosieron \"%s\"\n"
-
-#: po/placeholder.h:206 urpmq:82
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: nekonata opcio \"-%s\", kontrolu uzadon kun \"--help\"\n"
+#: po/placeholder.h:217
+#, fuzzy
+msgid " -h - print this help message.\n"
+msgstr " --all - printu �iujn etikedojn."
-#: 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"
@@ -810,115 +875,103 @@ msgstr ""
"Por �isdatigi, iu paka�o devas esti forprenata. �i tiu ne jam estas "
"subtenata.\n"
-#: po/placeholder.h:208
+#: po/placeholder.h:219
+#, fuzzy
+msgid " -g - print groups too with name.\n"
+msgstr " --group - printu etikedan grupon: group."
+
+#: po/placeholder.h:220 urpmq:84
#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: ne povas legi rpm-an dosieron \"%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 " etikedo donata en ordonolinio sed sen paka�nomo)."
+
+#: 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 ""
+"�i tiu estas libera programo kaj vi rajtas redistribui �i sub la kondi�oj\n"
+"de la GNU GPL."
+
+#: po/placeholder.h:231
+#, fuzzy
+msgid " -d - extend query to package dependencies.\n"
+msgstr " etikedo donata en ordonolinio sed sen paka�nomo)."
+
+#: 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 ""
-"urpmq versio %s\n"
-"Kopirajto (C) 2000, 2001 MandrakeSoft.\n"
-"�i tiu estas libera softvaro kaj vi rajtas redisdoni �in kondi�e ke la "
-"kondi�ojde la �enerala Publika GNU-Permes'ilo.\n"
-"uzado:\n"
-" -h - montru �i tiun helpmesa�on.\n"
-" -v - babilema re�imo.\n"
-" -d - etendu demandon al paka�aj dependa�oj.\n"
-" -u - forigi paka�on se pli nova versio estas jam instalata.\n"
-" -m - etendu demandon al paka�aj dependa�oj, forigu jam "
-"instalitan\n"
-" paka�on kiu provizas la necesa�ojn, aldonu paka�ojn kiuj\n"
-" eble blokus la �isdatigadon.\n"
-" -M - etendu demandon al paka�aj dependa�oj kaj forigu jam\n"
-" instalitan paka�on nur se ili estas pli novaj a� "
-"sama�aj.\n"
-" -c - elektu plenan metodon por decidi ferma�on de bezonatoj.\n"
-" -p - permesu ser�on en provizoj trovi paka�on.\n"
-" -g - printu grupojn anka� kun nomo.\n"
-" -r - printu version kaj eldonon anka� kun nomo.\n"
-" --update - uzu nur �isdatigan medion.\n"
-" --auto-select - a�tomate elektu paka�ojn por �isdatigi la sistemon.\n"
-" --headers - eltiru �apdosierojn por paka�o listita en urpmi-a "
-"datumbazo\n"
-" al �efeligujo (nur kiel \"root\").\n"
-" --sources - donu �iujn fontajn paka�ojn anta� ol el�uti (nur kiel\n"
-" \"root\").\n"
-" --force - devigu alvokadon e� se iu paka�o ne ekzistas.\n"
-" nomoj a� rpm-aj dosieroj donataj sur komandlinio estas demandataj.\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: nekonata opcio \"-%s\", kontrolu uzadon kun \"--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 "ne povis krei medion \"%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 "legu \"depslist\" dosieron [%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 "urpmi versio %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: nekonata opcio \"-%s\", kontrolu uzadon kun \"--help\"\n"
+#: urpm.pm:1797 urpm.pm:1806
+msgid ", $otherPackage, "
+msgstr ", $otherPackage, "
-#: urpmi:102
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr "Nur superuzulo rajtas instali lokajn paka�ojn"
+#: urpm.pm:1797 urpm.pm:1806
+msgid "));"
+msgstr "));"
-#: urpmi:189
-#, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Unu el la sekvantaj paka�oj estas bezonata por instali %s:"
+#: 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 "urpmi versio %s"
#: urpmi.addmedia:30
msgid "usage: urpmi.addmedia [--update] <name> <url>"
@@ -949,3 +1002,136 @@ msgstr ", $_);"
#, c-format
msgid "urpmq version %s"
msgstr "urpmq versio %s"
+
+#~ msgid "retrieving [%s]"
+#~ msgstr "reprenas [%s]"
+
+#~ msgid "wget of [%s] failed (maybe wget is missing?)"
+#~ msgstr "wget de [%s] malsukcesis (eble wget mankas?)"
+
+#~ msgid "unable to copy source of [%s] from [%s]"
+#~ msgstr "ne povis kopii fonton de [%s] el [%s]"
+
+#~ msgid "removable medium not selected"
+#~ msgstr "deprenebla medio ne estis elektata"
+
+#~ msgid "source of [%s] not found as [%s]"
+#~ msgstr "fonto de [%s] ne trovata kiel [%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 ""
+#~ "urpmi versio %s\n"
+#~ "Kopirajtita (C) 1999, 2000, 2001 MandrakeSoft.\n"
+#~ "�i tiu estas libera programo kaj vi rajtas redistribui �i sub la "
+#~ "kondi�oj\n"
+#~ "de la GNU GPL.\n"
+#~ "uzado:\n"
+#~ " --help - printu �i tiun helpan mesa�on.\n"
+#~ " --update - uzu nur �isdatigan medion.\n"
+#~ " --auto - a�tomate elektu bonan paka�on el la elektoj.\n"
+#~ " --auto-select - a�tomate elektu paka�ojn por �isdatigi la sistemon.\n"
+#~ " --force - devigu lan�on e� se iu paka�o ne ekzistas.\n"
+#~ " --X - uzu X interfacon.\n"
+#~ " --best-output - elektu la pli bonan interfaco la� la medio: X a�\n"
+#~ " tekstan re�iman.\n"
+#~ " -a - elektu �iujn egala�ojn sur komanda linio.\n"
+#~ " -m - elektu minimuman ferma�on de bezonatoj (defa�lto).\n"
+#~ " -M - elektu maksimuman ferma�on de bezonatoj.\n"
+#~ " -c - elektu plenan metodon por decidi ferma�on de "
+#~ "bezonatoj.\n"
+#~ " -p - permesu ser�on en provizoj trovi paka�on\n"
+#~ " -q - kvieta re�imo.\n"
+#~ " -v - babilema re�imo.\n"
+#~ " nomoj a� rpm-aj dosieroj (nur por \"root\") donata sur la ordonolinio "
+#~ "estos\n"
+#~ " instalataj.\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 ""
+#~ "urpmq versio %s\n"
+#~ "Kopirajto (C) 2000, 2001 MandrakeSoft.\n"
+#~ "�i tiu estas libera softvaro kaj vi rajtas redisdoni �in kondi�e ke la "
+#~ "kondi�ojde la �enerala Publika GNU-Permes'ilo.\n"
+#~ "uzado:\n"
+#~ " -h - montru �i tiun helpmesa�on.\n"
+#~ " -v - babilema re�imo.\n"
+#~ " -d - etendu demandon al paka�aj dependa�oj.\n"
+#~ " -u - forigi paka�on se pli nova versio estas jam "
+#~ "instalata.\n"
+#~ " -m - etendu demandon al paka�aj dependa�oj, forigu jam "
+#~ "instalitan\n"
+#~ " paka�on kiu provizas la necesa�ojn, aldonu paka�ojn "
+#~ "kiuj\n"
+#~ " eble blokus la �isdatigadon.\n"
+#~ " -M - etendu demandon al paka�aj dependa�oj kaj forigu jam\n"
+#~ " instalitan paka�on nur se ili estas pli novaj a� "
+#~ "sama�aj.\n"
+#~ " -c - elektu plenan metodon por decidi ferma�on de "
+#~ "bezonatoj.\n"
+#~ " -p - permesu ser�on en provizoj trovi paka�on.\n"
+#~ " -g - printu grupojn anka� kun nomo.\n"
+#~ " -r - printu version kaj eldonon anka� kun nomo.\n"
+#~ " --update - uzu nur �isdatigan medion.\n"
+#~ " --auto-select - a�tomate elektu paka�ojn por �isdatigi la sistemon.\n"
+#~ " --headers - eltiru �apdosierojn por paka�o listita en urpmi-a "
+#~ "datumbazo\n"
+#~ " al �efeligujo (nur kiel \"root\").\n"
+#~ " --sources - donu �iujn fontajn paka�ojn anta� ol el�uti (nur kiel\n"
+#~ " \"root\").\n"
+#~ " --force - devigu alvokadon e� se iu paka�o ne ekzistas.\n"
+#~ " nomoj a� rpm-aj dosieroj donataj sur komandlinio estas demandataj.\n"
diff --git a/po/es.po b/po/es.po
index e79fd0b5..90e72da6 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,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-08-18 00:38-0300\n"
"Last-Translator: Fabian Mandelbaum <fabman@mandrakesoft.com>\n"
"Language-Team: Spanish <cooker-i18n@linux-mandrake.com>\n"
@@ -29,27 +29,27 @@ msgstr ""
"Instalaci�n autom�tica de paquetes...\n"
"Pidi� la instalaci�n del paquete $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 "�Est� todo bien?"
-#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:281
+#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:279
msgid "Ok"
msgstr "Aceptar"
-#: _irpm:34 po/placeholder.h:116 urpmi:252 urpmi:282
+#: _irpm:34 po/placeholder.h:119 urpmi:252 urpmi:280
msgid "Cancel"
msgstr "Cancelar"
-#: _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 "Nn"
-#: _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 "SsYy"
-#: _irpm:42 po/placeholder.h:118 urpmi:258
+#: _irpm:42 po/placeholder.h:157 urpmi:258
msgid " (Y/n) "
msgstr " (S/n) "
@@ -174,180 +174,180 @@ msgstr "prueba urpmf --help para m�s opciones"
msgid "urpmi is not installed"
msgstr "urpmi no est� instlado"
-#: po/placeholder.h:29 urpm.pm:283
+#: po/placeholder.h:29
+#, fuzzy, c-format
+msgid "reading synthesis file [%s]"
+msgstr "le�do archivo de lista de dependencias [%s]"
+
+#: po/placeholder.h:30 urpm.pm:298
#, c-format
msgid "unable to write config file [%s]"
msgstr "no se puede escribir el archivo de configuraci�n [%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 ""
-"no se puede utilizar el nombre \"%s\" para un soporte sin denominar porque "
-"ya se est� utilizando"
-#: po/placeholder.h:31
+#: po/placeholder.h:32
#, c-format
msgid "nothing to write in list file for \"%s\""
msgstr "nada para escribir en el archivo de lista para \"%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 ""
"no se puede encontrar el archivo de lista para \"%s\", soporte ignorado"
-#: po/placeholder.h:33
+#: po/placeholder.h:34
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "no se puede interpretar el archivo hdlist de \"%s\""
-#: po/placeholder.h:34
+#: po/placeholder.h:35
#, c-format
msgid "nothing written in list file for \"%s\""
msgstr "nada escrito en el archivo de lista para \"%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 ""
-"borrando %s para actualizar ...\n"
-" a %s �porque no actualizar�a correctamente!"
-
-#: po/placeholder.h:39 urpm.pm:839
+#: po/placeholder.h:36 urpm.pm:845
#, c-format
msgid "read provides file [%s]"
msgstr "le�do archivo de provides [%s]"
-#: po/placeholder.h:40
-#, c-format
-msgid "trying to remove inexistant medium \"%s\""
-msgstr "intentando quitar el soporte inexistente \"%s\""
-
-#: po/placeholder.h:41 urpm.pm:1692
+#: po/placeholder.h:37 urpm.pm:1549
#, c-format
msgid "package %s is not found."
msgstr "no se encontr� el paquete %s."
-#: po/placeholder.h:42
-#, c-format
-msgid "unable to copy source of [%s] from [%s]"
-msgstr "no se puede copiar la fuente de [%s] desde [%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 "no se puede escribir el archivo compss [%s]"
-#: po/placeholder.h:44 urpm.pm:813
+#: po/placeholder.h:39 urpm.pm:819
#, c-format
msgid "unmounting %s"
msgstr "desmontando %s"
-#: po/placeholder.h:45
+#: po/placeholder.h:40
#, c-format
msgid "removing %d obsolete headers in cache"
msgstr "quitando %d encabezados obsoletos del 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 "no se encuentra el archivo hdlist para el soporte \"%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 "soporte \"%s\" intenta utilizar un hdlist utilizado, soporte ignorado"
+
+#: po/placeholder.h:43 urpm.pm:184
+#, c-format
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"no se puede utilizar el nombre \"%s\" para un soporte sin denominar porque "
+"ya se est� utilizando"
+
+#: po/placeholder.h:44 urpm.pm:191
#, c-format
msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
msgstr ""
"no se puede tener en cuenta el soporte \"%s\", porque no existe archivo de "
"lista [%s]"
-#: po/placeholder.h:48
+#: po/placeholder.h:45
msgid "keeping only files referenced in provides"
msgstr "manteniendo s�lo los archivos referenciados en \"provides\""
-#: po/placeholder.h:49
+#: po/placeholder.h:46
#, c-format
msgid "unable to build synthesis file for medium \"%s\""
msgstr "no se puede generar el archivo de s�ntesis para el soporte \"%s\""
-#: po/placeholder.h:50
+#: po/placeholder.h:47
#, c-format
msgid "found %d headers in cache"
msgstr "se encontraron %d encabezados en el 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 "no se puede leer archivo de provides [%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 ""
"evitar seleccionar %s como sus locales. El lenguaje no est� seleccionado a�n."
-#: 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 ""
+"borrando %s para actualizar ...\n"
+" a %s ya que no se podr� actualizar de otra manera"
+
+#: po/placeholder.h:54 urpm.pm:326
#, c-format
msgid "medium \"%s\" already exists"
msgstr "ya existe el soporte \"%s\""
-#: po/placeholder.h:54 urpm.pm:295
-#, c-format
-msgid "write config file [%s]"
-msgstr "escrito archivo de configuraci�n [%s]"
-
#: po/placeholder.h:55
#, c-format
msgid "unable to write list file of \"%s\""
msgstr "no se puede escribir el archivo de lista de \"%s\""
-#: po/placeholder.h:56 urpm.pm:1817
-#, c-format
-msgid "retrieving [%s]"
-msgstr "obteniendo [%s]"
-
-#: po/placeholder.h:57 urpm.pm:1819
+#: po/placeholder.h:56 urpm.pm:310
#, c-format
-msgid "wget of [%s] failed"
-msgstr "wget de [%s] fall�"
+msgid "write config file [%s]"
+msgstr "escrito archivo de configuraci�n [%s]"
-#: po/placeholder.h:58 urpm.pm:1101
+#: po/placeholder.h:57 urpm.pm:1107
#, c-format
msgid "no package named %s"
msgstr "ning�n paquete llamado %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 "no se puede leer el archivo de compss [%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 "no se puede encontrar el archivo hdlist para \"%s\", soporte ignorado"
-#: po/placeholder.h:61
+#: po/placeholder.h:60
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "se gener� el archivo de s�ntesis hdlist para el soporte \"%s\""
-#: po/placeholder.h:62
+#: po/placeholder.h:61
msgid "computing dependencies"
msgstr "computando las dependencias"
-#: po/placeholder.h:63 urpm.pm:868
+#: po/placeholder.h:62
+#, fuzzy, c-format
+msgid "retrieve of [%s] failed"
+msgstr "wget de [%s] fall�"
+
+#: po/placeholder.h:63 urpm.pm:874
#, c-format
msgid "write provides file [%s]"
msgstr "escrito el archivo de provides [%s]"
-#: po/placeholder.h:64 urpm.pm:803
+#: po/placeholder.h:64 urpm.pm:809
#, c-format
msgid "mounting %s"
msgstr "montando %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 "
@@ -356,125 +356,137 @@ msgstr ""
"no se puede utilizar el soporte \"%s\" como archivo de lista que ya utiliza "
"otro soporte"
-#: po/placeholder.h:66 urpm.pm:148
-#, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
-msgstr "soporte \"%s\" intenta utilizar una lista ya usada, soporte ignorado"
-
-#: po/placeholder.h:67
+#: po/placeholder.h:66
#, c-format
msgid "reading hdlist file [%s]"
msgstr "leyendo el archivo hdlist [%s]"
-#: po/placeholder.h:68 urpm.pm:873
+#: po/placeholder.h:67 urpm.pm:879
#, c-format
msgid "write compss file [%s]"
msgstr "escrito archivo compss [%s]"
-#: po/placeholder.h:69 urpm.pm:827
+#: po/placeholder.h:68 urpm.pm:833
#, c-format
msgid "read depslist file [%s]"
msgstr "le�do archivo de lista de dependencias [%s]"
-#: po/placeholder.h:70
-#, c-format
-msgid "trying to select inexistant medium \"%s\""
-msgstr "intentando seleccionar el soporte inexistente \"%s\""
+#: po/placeholder.h:69 urpm.pm:103
+msgid "curl failed\n"
+msgstr ""
-#: po/placeholder.h:71 urpm.pm:1812
+#: po/placeholder.h:70 urpm.pm:281 urpm.pm:284
+#, fuzzy, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "no se puede crear soporte \"%s\"\n"
+
+#: po/placeholder.h:71 urpm.pm:1668
#, c-format
msgid "malformed input: [%s]"
msgstr "entrada mal formada [%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 "soporte \"%s\" intenta utilizar un hdlist utilizado, soporte ignorado"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "hay muchos paquetes con el mismo nombre de archivo 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"
-msgstr ""
-"borrando %s para actualizar ...\n"
-" a %s ya que no se podr� actualizar de otra manera"
+msgid "medium \"%s\" tries to use an already used list, medium ignored"
+msgstr "soporte \"%s\" intenta utilizar una lista ya usada, soporte ignorado"
-#: po/placeholder.h:77 urpm.pm:865
+#: po/placeholder.h:74 urpm.pm:871
#, c-format
msgid "unable to write provides file [%s]"
msgstr "no se puede escribir el archivo de provides [%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 "no se puede acceder al archivo hdlist de \"%s\", soporte ignorado"
-#: po/placeholder.h:79 urpm.pm:1005
-msgid "unable to register rpm file"
-msgstr "no se puede registrar el archivo 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 ""
"no se puede encontrar todos los archivos de s�ntesis, utilizando servidor "
"parsehdlist"
-#: po/placeholder.h:81 urpm.pm:241
+#: po/placeholder.h:77 urpm.pm:1011
+msgid "unable to register rpm file"
+msgstr "no se puede registrar el archivo rpm"
+
+#: po/placeholder.h:78 urpm.pm:256
#, c-format
msgid "unable to inspect list file for \"%s\", medium ignored"
msgstr ""
"no se puede inspeccionar el archivo de lista para \"%s\", soporte ignorado"
-#: 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 "archivo de lista no coherente para \"%s\", soporte ignorado"
-#: po/placeholder.h:83
+#: po/placeholder.h:81
#, c-format
msgid "copy of [%s] failed"
msgstr "fall� la copia de [%s]"
-#: 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 "intentando quitar el soporte inexistente \"%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 "no se puede analizar correctamente [%s]"
-#: po/placeholder.h:85 urpm.pm:824
+#: po/placeholder.h:84 urpm.pm:1192
+#, fuzzy, c-format
+msgid "read synthesis file [%s]"
+msgstr "le�do archivo de lista de dependencias [%s]"
+
+#: po/placeholder.h:85 urpm.pm:830
#, c-format
msgid "unable to read depslist file [%s]"
msgstr "no se puede leer archivo de lista de dependencias [%s]"
-#: po/placeholder.h:86
-msgid "removable medium not selected"
-msgstr "soporte extra�ble no seleccionado"
-
-#: po/placeholder.h:87 urpm.pm:851
+#: po/placeholder.h:86 urpm.pm:857
#, c-format
msgid "read compss file [%s]"
msgstr "le�do archivo compss [%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 "error de sintaxis en archivo de configuraci�n, en la l�nea %s"
-#: po/placeholder.h:89
+#: po/placeholder.h:88
#, c-format
msgid "building hdlist [%s]"
msgstr "generando 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 "no se puede leer el archivo rpm [%s] del soporte \"%s\""
-#: po/placeholder.h:91 urpm.pm:1009
+#: po/placeholder.h:90 urpm.pm:1015
msgid "error registering local packages"
msgstr "error registrando paquetes locales"
-#: 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 "soporte no coherente \"%s\" marcado como borrable, pero no borrado"
@@ -484,180 +496,167 @@ msgstr "soporte no coherente \"%s\" marcado como borrable, pero no borrado"
msgid "unable to build hdlist: %s"
msgstr "no se puede generar el archivo 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 "el soporte \"%s\" no est� seleccionado"
+
+#: po/placeholder.h:95 urpm.pm:1006
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "nombre de archivo rpm no v�lido [%s]"
-#: 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 "el soporte \"%s\" no est� seleccionado"
+msgid "unknown data associated with %s"
+msgstr "datos desconocidos asociados a %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 "intentando pasar al soporte existente \"%s\", evitando"
-#: po/placeholder.h:97 urpm.pm:863
+#: po/placeholder.h:98 urpm.pm:869
#, c-format
msgid "write depslist file [%s]"
msgstr "escrito archivo de lista de dependencias [%s]"
-#: po/placeholder.h:98 urpm.pm:1322
-#, c-format
-msgid "unknown data associated with %s"
-msgstr "datos desconocidos asociados a %s"
-
-#: po/placeholder.h:99
-#, c-format
-msgid "source of [%s] not found as [%s]"
-msgstr "la fuente de [%s] no se encontr� como [%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 "no se puede acceder al archivo de la lista de \"%s\", soporte ignorado"
-#: 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 ""
"evitar seleccionar %s porque no hay suficientes archivos que ser�n "
"actualizados"
-#: po/placeholder.h:102
-#, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
-msgstr "wget de [%s] fall� (�tal vez falta 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 "no se puede acceder al archivo 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 "no se puede escribir el archivo de la lista de dependencias [%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 ""
+"borrando %s para actualizar ...\n"
+" a %s �porque no actualizar�a correctamente!"
+
+#: po/placeholder.h:107 urpm.pm:342 urpm.pm:1630
#, c-format
msgid "unable to access medium \"%s\""
msgstr "no se puede acceder al soporte \"%s\""
-#: po/placeholder.h:106 urpm.pm:988
+#: po/placeholder.h:108 urpm.pm:994
#, c-format
msgid "relocated %s entries in depslist"
msgstr "relocalizadas %s entradas en la lista de dependencias"
-#: 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 "no se puede analizar correctamente [%s] sobre el valor \"%s\""
+msgid "trying to select inexistent medium \"%s\""
+msgstr "intentando seleccionar el soporte inexistente \"%s\""
+
+#: po/placeholder.h:110 urpm.pm:97
+#, fuzzy
+msgid "wget failed\n"
+msgstr "wget de [%s] fall�"
-#: 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 "no se encontraron archivos rpm en [%s]"
+msgid "unable to parse correctly [%s] on value \"%s\""
+msgstr "no se puede analizar correctamente [%s] sobre el valor \"%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 "Los siguientes paquetes contienen %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 "hay muchos paquetes con el mismo nombre de archivo rpm \"%s\""
+msgid "no rpm files found from [%s]"
+msgstr "no se encontraron archivos rpm en [%s]"
-#: po/placeholder.h:111 urpm.pm:1920
+#: po/placeholder.h:114 urpm.pm:1772
#, c-format
msgid "selecting %s using obsoletes"
msgstr "seleccionar %s utilizando obsoletos"
-#: po/placeholder.h:112 urpm.pm:2031
+#: po/placeholder.h:115 urpm.pm:1888
#, c-format
msgid "selecting %s by selection on files"
msgstr "seleccionando %s por la selecci�n de archivos"
-#: 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 "no se puede determinar el soporte de este archivo hdlist [%s]"
-#: po/placeholder.h:114 urpmi:308 urpmi:315 urpmi:328 urpmi:339 urpmi:352
-msgid "Installation failed"
-msgstr "Fall� la instalaci�n"
-
-#: po/placeholder.h:115 urpmi:279
-msgid "Press enter when it's done..."
-msgstr "Pulse �Intro� cuando est� hecho..."
+#: po/placeholder.h:120
+#, fuzzy
+msgid " --help - print this help message.\n"
+msgstr " --all - imprimir todas las etiquetas."
-#: po/placeholder.h:117 urpmi:201
-msgid "Sorry, bad choice, try again\n"
-msgstr "Disculpe, elecci�n incorrecta, reint�ntelo\n"
+#: po/placeholder.h:121 urpmi:361
+msgid "everything already installed"
+msgstr "ya est� todo instalado"
-#: po/placeholder.h:120
+#: po/placeholder.h:122 urpmi:98
#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: opci�n desconocida \"-%s\", verifique el uso con --help\n"
+
+#: po/placeholder.h:123 urpmi:194
+msgid "One of the following packages is needed:"
+msgstr "Uno de los paquetes siguientes es necesario:"
+
+#: po/placeholder.h:124 po/placeholder.h:222
+msgid " --update - use only update media.\n"
+msgstr ""
+
+#: po/placeholder.h:125 urpmi:299
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"
+"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 "Fall� la instalaci�n"
+
+#: po/placeholder.h:132 po/placeholder.h:234
+msgid ""
+" --auto-select - automatically select packages for upgrading the system.\n"
msgstr ""
-"urpmi versi�n %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"Esto es software libre y puede ser vuelto a distribuir bajo los t�rminos de "
-"la licencia GNU GPL.\n"
-"uso:\n"
-" --help - imprimir este mensaje de ayuda.\n"
-" --update - usar s�lo soportes de actualizaci�n.\n"
-" --auto - seleccionar autom�ticamente un paquete adecuado\n"
-" en las opciones.\n"
-" --auto-select - seleccionar autom�ticamente paquetes para "
-"actualizar el sistema.\n"
-" --force - forzar la llamada incluso si algun paquete no existe.\n"
-" --X - usar interfaz X.\n"
-" --best-output - elegir la mejor interfaz de acuerdo al entorno:\n"
-" X o modo texto.\n"
-" -a - seleccionar todo lo que coincida con l�nea de "
-"comandos.\n"
-" -m - elegir la m�nima cerradura de requisitos (por "
-"omisi�n).\n"
-" -M - elegir la m�xima cerradura de requisitos.\n"
-" -c - elegir el m�todo completo para resolver la cerradura\n"
-" de requisitos.\n"
-" -p - permitir b�squedas en \"provides\" para encontrar\n"
-" el paquete.\n"
-" -q - modo \"quieto\".\n"
-" -v - modo verboso.\n"
-" se instalan los nombres o archivos rpm (s�lo para root) proporcionados\n"
-" en la l�nea de comandos.\n"
-
-#: po/placeholder.h:142 urpmi:362
-msgid "everything already installed"
-msgstr "ya est� todo instalado"
-#: po/placeholder.h:143 urpmi:247
+#: po/placeholder.h:134
+#, fuzzy
+msgid " --X - use X interface.\n"
+msgstr " --all - imprimir todas las etiquetas."
+
+#: po/placeholder.h:135 urpmi:247
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -666,42 +665,109 @@ msgstr ""
"De manera a resolver las dependencias, se instalar�n los paquetes siguientes "
"(%d MB)"
-#: po/placeholder.h:144 urpmi:296
-#, c-format
-msgid "installing %s\n"
-msgstr "instalando %s\n"
+#: po/placeholder.h:136 urpmi:320 urpmi:344
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "�Intentar de instalar sin verificar las dependencias? (s/N) "
-#: po/placeholder.h:145 urpmi:198
+#: 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 - imprimir todas las etiquetas."
+
+#: po/placeholder.h:144 urpmi:202
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "�Qu� elige? (1-%d)"
-#: po/placeholder.h:146 urpmi:321 urpmi:345
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "�Intentar de instalar sin verificar las dependencias? (s/N) "
+#: po/placeholder.h:145
+msgid " --wget - use wget to retrieve distant files.\n"
+msgstr ""
-#: po/placeholder.h:147 urpmi:190
-msgid "One of the following packages is needed:"
-msgstr "Uno de los paquetes siguientes es necesario:"
+#: 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"
+msgstr ""
+"Este software es libre y se puede redistribuir bajo los t�rminos de la "
+"licencia GNU GPL."
+
+#: po/placeholder.h:152 urpmi:328 urpmi:352
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "�Intentar a�n m�s fuerte la instalaci�n (--force)? (s/N) "
+
+#: po/placeholder.h:154
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+
+#: po/placeholder.h:155 urpmi:205
+msgid "Sorry, bad choice, try again\n"
+msgstr "Disculpe, elecci�n incorrecta, reint�ntelo\n"
+
+#: po/placeholder.h:156
+msgid ""
+" names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: po/placeholder.h:158
+msgid " -a - select all matches on command line.\n"
+msgstr ""
+
+#: po/placeholder.h:159
+msgid " --curl - use curl to retrieve distant files.\n"
+msgstr ""
-#: po/placeholder.h:148 urpmi:149
+#: po/placeholder.h:160 urpmi:294
+#, c-format
+msgid "installing %s\n"
+msgstr "instalando %s\n"
+
+#: po/placeholder.h:161 urpmi:152
msgid "Only superuser is allowed to install local packages"
msgstr "S�lo el superusuario puede instalar paquetes locales"
-#: 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 "Por favor, inserte el soporte denominado \"%s\" en el dispositivo [%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 "no se pueden obtener los paquetes fuente, abortando"
-#: po/placeholder.h:151 urpmi:329 urpmi:353
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "�Intentar a�n m�s fuerte la instalaci�n (--force)? (s/N) "
+#: po/placeholder.h:165 urpmi:102
+#, fuzzy
+msgid "Only superuser is allowed to install packages"
+msgstr "S�lo el superusuario puede instalar paquetes locales"
+
+#: po/placeholder.h:166 urpmi:193
+#, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Uno de los paquetes siguientes es necesario para instalar %s:"
+
+#: po/placeholder.h:167 urpmi:277
+msgid "Press Enter when it's done..."
+msgstr "Pulse �Intro� cuando est� hecho..."
-#: po/placeholder.h:155 urpmi.addmedia:46
+#: po/placeholder.h:168 urpmi.addmedia:46
#, c-format
msgid ""
"%s\n"
@@ -710,7 +776,7 @@ msgstr ""
"%s\n"
"falta `with' para soporte por FTP\n"
-#: po/placeholder.h:159
+#: po/placeholder.h:172
msgid ""
"usage: urpmi.addmedia [--update] <name> <url>\n"
"where <url> is one of\n"
@@ -730,17 +796,17 @@ msgstr ""
" http://<host>/<ruta> con <nombre de hdlist relativo>\n"
" removable_<dispositivo>://<ruta>\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 "no se puede crear soporte \"%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 "no se puede actualizar soporte \"%s\"\n"
-#: po/placeholder.h:170 urpmi.addmedia:42
+#: po/placeholder.h:183 urpmi.addmedia:42
#, c-format
msgid ""
"%s\n"
@@ -749,7 +815,7 @@ msgstr ""
"%s\n"
"no existe el dispositivo `%s'\n"
-#: po/placeholder.h:174 urpmi.addmedia:44
+#: po/placeholder.h:187 urpmi.addmedia:44
#, c-format
msgid ""
"%s\n"
@@ -758,7 +824,7 @@ msgstr ""
"%s\n"
"falta <ruta relativa de hdlist>\n"
-#: po/placeholder.h:178
+#: po/placeholder.h:191
#, c-format
msgid ""
"usage: urpmi.update [-a] <name> ...\n"
@@ -778,11 +844,11 @@ msgstr ""
"\n"
"opciones desconocidas '%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 "nada para actualizar (use urpmi.addmedia para agregar un soporte)\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"
@@ -791,11 +857,11 @@ msgstr ""
"falta la entrada a actualizar\n"
"(una de %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 "nada para quitar (use urpmi.addmedia para agregar un soporte)\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"
@@ -804,7 +870,7 @@ msgstr ""
"falta la entrada a quitar\n"
"(una de %s)\n"
-#: po/placeholder.h:197
+#: po/placeholder.h:210
#, c-format
msgid ""
"usage: urpmi.removemedia [-a] <name> ...\n"
@@ -819,17 +885,12 @@ msgstr ""
"\n"
"opciones desconocidas '%s'\n"
-#: po/placeholder.h:204 urpmq:85
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: no se puede leer el archivo rpm \"%s\"\n"
-
-#: po/placeholder.h:206 urpmq:82
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: opci�n desconocida \"-%s\", verifique el uso con --help\n"
+#: po/placeholder.h:217
+#, fuzzy
+msgid " -h - print this help message.\n"
+msgstr " --all - imprimir todas las etiquetas."
-#: 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"
@@ -837,116 +898,107 @@ msgstr ""
"se tiene que quitar alg�n paquete para poder actualizarlo, todav�a esto no "
"est� soportado\n"
-#: po/placeholder.h:208
+#: po/placeholder.h:219
+#, fuzzy
+msgid " -g - print groups too with name.\n"
+msgstr " --group - imprimir etiqueta de grupo: group."
+
+#: po/placeholder.h:220 urpmq:84
#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: no se puede leer el archivo 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 ""
+" se da etiqueta en la l�nea de comando pero sin nombre de "
+"paquete)."
+
+#: 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"
+msgstr ""
+"Este software es libre y se puede redistribuir bajo los t�rminos de la "
+"licencia GNU GPL."
+
+#: po/placeholder.h:231
+#, fuzzy
+msgid " -d - extend query to package dependencies.\n"
+msgstr ""
+" se da etiqueta en la l�nea de comando pero sin nombre de "
+"paquete)."
+
+#: po/placeholder.h:232
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
+msgstr ""
+
+#: po/placeholder.h:233
+msgid ""
" -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"
+msgstr ""
+
+#: po/placeholder.h:235 urpmq:81
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: opci�n desconocida \"-%s\", verifique el uso con --help\n"
+
+#: po/placeholder.h:236
+msgid ""
" --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 package do not exist.\n"
-" names or rpm files given on command line are queried.\n"
msgstr ""
-"urpmq versi�n %s\n"
-"Copyright (C) 2000, 2001 MandrakeSoft.\n"
-"Este es software libre y puede ser vuelto a distribuir bajo los t�rminos de "
-"la licencia GNU GPL.\n"
-"uso:\n"
-" -h - imprimir este mensaje de ayuda.\n"
-" -v - modo verboso.\n"
-" -d - extender la consulta a las dependencias del paquete.\n"
-" -u - quitar el paquete si ya est� instalada una versi�n mejor.\n"
-" -m - extender la consulta a las dependencias de los paquetes,\n"
-" quitar el paquete ya instalado que brinda lo necesario,\n"
-" a�adir los paquetes que pueden bloquear la actualizaci�n.\n"
-" -M - extender la consulta a las dependencias de los paquetes\n"
-" y quitar el paquete ya instalado s�lo si es m�s nuevo o\n"
-" si es el mismo.\n"
-" -c - elegir el m�todo completo para resolver la cerradura de\n"
-" requisitos.\n"
-" -p - permitir la b�squeda en \"provides\" para encontrar\n"
-" el paquete.\n"
-" -r - imprimir la versi�n y tambi�n la revisi�n con el nombre.\n"
-" --update - usar s�lo los soportes de actualizaci�n.\n"
-" --auto-select - seleccionar autom�ticamente los paquetes para actualizar\n"
-" el sistema.\n"
-" --headers - extraer los encabezados para el paquete que se lista en\n"
-" la base de datos de urpmi a la salida est�ndar (s�lo "
-"root)\n"
-" --sources - dar todos los paquetes fuente antes de transferir\n"
-" (s�lo root).\n"
-" --force - forzar la llamada incluso si algun paquete no existe.\n"
-" se consultan los nombres o archivos rpm dados en la l�nea de comandos.\n"
-
-#: urpm.pm:257
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+
+#: po/placeholder.h:243
+msgid ""
+" -u - remove package if a better version is already installed.\n"
msgstr ""
-#: urpm.pm:258
-#, c-format
-msgid "taking removable device as \"%s\""
+#: po/placeholder.h:244
+msgid ""
+" --force - force invocation even if some packages do not\n"
+"exist.\n"
msgstr ""
-#: urpm.pm:262
+#: urpm.pm:1796 urpm.pm:1805
#, c-format
-msgid "using different removable device [%s] for \"%s\""
+msgid "removing %s to upgrade to %s ..."
msgstr ""
-#: urpm.pm:266 urpm.pm:269
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "no se puede crear soporte \"%s\"\n"
-
-#: urpm.pm:1339
-#, fuzzy, c-format
-msgid "read synthesis file [%s]"
-msgstr "le�do archivo de lista de dependencias [%s]"
+#: urpm.pm:1797 urpm.pm:1806
+msgid ", $otherPackage, "
+msgstr ", $otherPackage, "
-#: urpmi:49
-#, c-format
-msgid "urpmi version %s"
-msgstr "urpmi versi�n %s"
+#: urpm.pm:1797 urpm.pm:1806
+msgid "));"
+msgstr "));"
-#: urpmi:98
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: opci�n desconocida \"-%s\", verifique el uso con --help\n"
+#: urpm.pm:1802
+msgid "$p->{name}-$p->{version}-$p->{release}"
+msgstr "$p->{name}-$p->{version}-$p->{release}"
-#: urpmi:102
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr "S�lo el superusuario puede instalar paquetes locales"
+#: urpm.pm:1812
+msgid "$prefix/$_"
+msgstr "$prefix/$_"
-#: urpmi:189
+#: urpmi:48
#, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Uno de los paquetes siguientes es necesario para instalar %s:"
-
-#: urpmi:301
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
-msgstr ""
+msgid "urpmi version %s"
+msgstr "urpmi versi�n %s"
#: urpmi.addmedia:30
msgid "usage: urpmi.addmedia [--update] <name> <url>"
@@ -977,3 +1029,149 @@ msgstr ", $_);"
#, c-format
msgid "urpmq version %s"
msgstr "urpmq versi�n %s"
+
+#~ msgid "retrieving [%s]"
+#~ msgstr "obteniendo [%s]"
+
+#~ msgid "wget of [%s] failed (maybe wget is missing?)"
+#~ msgstr "wget de [%s] fall� (�tal vez falta wget?)"
+
+#~ msgid "unable to copy source of [%s] from [%s]"
+#~ msgstr "no se puede copiar la fuente de [%s] desde [%s]"
+
+#~ msgid "removable medium not selected"
+#~ msgstr "soporte extra�ble no seleccionado"
+
+#~ msgid "source of [%s] not found as [%s]"
+#~ msgstr "la fuente de [%s] no se encontr� como [%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 ""
+#~ "urpmi versi�n %s\n"
+#~ "Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+#~ "Esto es software libre y puede ser vuelto a distribuir bajo los t�rminos "
+#~ "de la licencia GNU GPL.\n"
+#~ "uso:\n"
+#~ " --help - imprimir este mensaje de ayuda.\n"
+#~ " --update - usar s�lo soportes de actualizaci�n.\n"
+#~ " --auto - seleccionar autom�ticamente un paquete adecuado\n"
+#~ " en las opciones.\n"
+#~ " --auto-select - seleccionar autom�ticamente paquetes para "
+#~ "actualizar el sistema.\n"
+#~ " --force - forzar la llamada incluso si algun paquete no "
+#~ "existe.\n"
+#~ " --X - usar interfaz X.\n"
+#~ " --best-output - elegir la mejor interfaz de acuerdo al entorno:\n"
+#~ " X o modo texto.\n"
+#~ " -a - seleccionar todo lo que coincida con l�nea de "
+#~ "comandos.\n"
+#~ " -m - elegir la m�nima cerradura de requisitos (por "
+#~ "omisi�n).\n"
+#~ " -M - elegir la m�xima cerradura de requisitos.\n"
+#~ " -c - elegir el m�todo completo para resolver la "
+#~ "cerradura\n"
+#~ " de requisitos.\n"
+#~ " -p - permitir b�squedas en \"provides\" para encontrar\n"
+#~ " el paquete.\n"
+#~ " -q - modo \"quieto\".\n"
+#~ " -v - modo verboso.\n"
+#~ " se instalan los nombres o archivos rpm (s�lo para root) proporcionados\n"
+#~ " en la l�nea de comandos.\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 ""
+#~ "urpmq versi�n %s\n"
+#~ "Copyright (C) 2000, 2001 MandrakeSoft.\n"
+#~ "Este es software libre y puede ser vuelto a distribuir bajo los t�rminos "
+#~ "de la licencia GNU GPL.\n"
+#~ "uso:\n"
+#~ " -h - imprimir este mensaje de ayuda.\n"
+#~ " -v - modo verboso.\n"
+#~ " -d - extender la consulta a las dependencias del paquete.\n"
+#~ " -u - quitar el paquete si ya est� instalada una versi�n "
+#~ "mejor.\n"
+#~ " -m - extender la consulta a las dependencias de los "
+#~ "paquetes,\n"
+#~ " quitar el paquete ya instalado que brinda lo "
+#~ "necesario,\n"
+#~ " a�adir los paquetes que pueden bloquear la "
+#~ "actualizaci�n.\n"
+#~ " -M - extender la consulta a las dependencias de los "
+#~ "paquetes\n"
+#~ " y quitar el paquete ya instalado s�lo si es m�s nuevo "
+#~ "o\n"
+#~ " si es el mismo.\n"
+#~ " -c - elegir el m�todo completo para resolver la cerradura "
+#~ "de\n"
+#~ " requisitos.\n"
+#~ " -p - permitir la b�squeda en \"provides\" para encontrar\n"
+#~ " el paquete.\n"
+#~ " -r - imprimir la versi�n y tambi�n la revisi�n con el "
+#~ "nombre.\n"
+#~ " --update - usar s�lo los soportes de actualizaci�n.\n"
+#~ " --auto-select - seleccionar autom�ticamente los paquetes para "
+#~ "actualizar\n"
+#~ " el sistema.\n"
+#~ " --headers - extraer los encabezados para el paquete que se lista "
+#~ "en\n"
+#~ " la base de datos de urpmi a la salida est�ndar (s�lo "
+#~ "root)\n"
+#~ " --sources - dar todos los paquetes fuente antes de transferir\n"
+#~ " (s�lo root).\n"
+#~ " --force - forzar la llamada incluso si algun paquete no existe.\n"
+#~ " se consultan los nombres o archivos rpm dados en la l�nea de comandos.\n"
diff --git a/po/et.po b/po/et.po
index 0b818376..be2deda5 100644
--- a/po/et.po
+++ b/po/et.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: 1999-12-11 04:18+0100\n"
"Last-Translator: Riho Kurg <rx@linux.ee>\n"
"Language-Team: Estonian <et@li.org>\n"
@@ -25,27 +25,27 @@ msgstr ""
"Automaatne pakettide installimine...\n"
"Soovisite paigaldada paketti $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 "Kas sobib?"
-#: _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 "Katkesta"
-#: _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 "EeNn"
-#: _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 "JjYy"
-#: _irpm:42 po/placeholder.h:118 urpmi:258
+#: _irpm:42 po/placeholder.h:157 urpmi:258
msgid " (Y/n) "
msgstr " (J/e) "
@@ -149,120 +149,120 @@ msgstr ""
msgid "urpmi is not installed"
msgstr "urpmi ei ole installitud"
-#: po/placeholder.h:29 urpm.pm:283
+#: po/placeholder.h:29
+#, fuzzy, c-format
+msgid "reading synthesis file [%s]"
+msgstr "ei saa luua andmekandjat \"%s\"\n"
+
+#: po/placeholder.h:30 urpm.pm:298
#, c-format
msgid "unable to write config file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:31
+#: po/placeholder.h:32
#, c-format
msgid "nothing to write in list file for \"%s\""
msgstr ""
-#: 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 ""
-#: po/placeholder.h:33
+#: po/placeholder.h:34
#, fuzzy, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "ei saa uuendada andmekandjat \"%s\"\n"
-#: po/placeholder.h:34
+#: po/placeholder.h:35
#, c-format
msgid "nothing written in list file for \"%s\""
msgstr ""
-#: po/placeholder.h:35 urpm.pm:1951
-#, c-format
-msgid ""
-"removing %s to upgrade ...\n"
-" to %s since it will not upgrade correctly!"
-msgstr ""
-
-#: po/placeholder.h:39 urpm.pm:839
+#: po/placeholder.h:36 urpm.pm:845
#, c-format
msgid "read provides file [%s]"
msgstr ""
-#: po/placeholder.h:40
-#, fuzzy, c-format
-msgid "trying to remove inexistant medium \"%s\""
-msgstr "ei saa luua andmekandjat \"%s\"\n"
-
-#: po/placeholder.h:41 urpm.pm:1692
+#: po/placeholder.h:37 urpm.pm:1549
#, c-format
msgid "package %s is not found."
msgstr ""
-#: po/placeholder.h:42
-#, c-format
-msgid "unable to copy source of [%s] from [%s]"
-msgstr ""
-
-#: po/placeholder.h:43 urpm.pm:870
+#: po/placeholder.h:38 urpm.pm:876
#, fuzzy, c-format
msgid "unable to write compss file [%s]"
msgstr "ei saa luua andmekandjat \"%s\"\n"
-#: po/placeholder.h:44 urpm.pm:813
+#: po/placeholder.h:39 urpm.pm:819
#, c-format
msgid "unmounting %s"
msgstr ""
-#: po/placeholder.h:45
+#: po/placeholder.h:40
#, c-format
msgid "removing %d obsolete headers in cache"
msgstr ""
-#: 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 ""
-#: 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 ""
+
+#: po/placeholder.h:43 urpm.pm:184
+#, c-format
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+
+#: po/placeholder.h:44 urpm.pm:191
#, c-format
msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
msgstr ""
-#: po/placeholder.h:48
+#: po/placeholder.h:45
msgid "keeping only files referenced in provides"
msgstr ""
-#: po/placeholder.h:49
+#: po/placeholder.h:46
#, fuzzy, c-format
msgid "unable to build synthesis file for medium \"%s\""
msgstr "ei saa uuendada andmekandjat \"%s\"\n"
-#: po/placeholder.h:50
+#: po/placeholder.h:47
#, c-format
msgid "found %d headers in cache"
msgstr ""
-#: po/placeholder.h:51 urpm.pm:836
+#: po/placeholder.h:48 urpm.pm:842
#, fuzzy, c-format
msgid "unable to read provides file [%s]"
msgstr "ei saa luua andmekandjat \"%s\"\n"
-#: 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 ""
-#: po/placeholder.h:53 urpm.pm:311
+#: po/placeholder.h:50
#, c-format
-msgid "medium \"%s\" already exists"
+msgid ""
+"removing %s to upgrade to %s ...\n"
+" since it will not be updated otherwise"
msgstr ""
-#: po/placeholder.h:54 urpm.pm:295
+#: po/placeholder.h:54 urpm.pm:326
#, c-format
-msgid "write config file [%s]"
+msgid "medium \"%s\" already exists"
msgstr ""
#: po/placeholder.h:55
@@ -270,172 +270,186 @@ msgstr ""
msgid "unable to write list file of \"%s\""
msgstr "ei saa luua andmekandjat \"%s\"\n"
-#: po/placeholder.h:56 urpm.pm:1817
-#, c-format
-msgid "retrieving [%s]"
-msgstr ""
-
-#: po/placeholder.h:57 urpm.pm:1819
+#: po/placeholder.h:56 urpm.pm:310
#, c-format
-msgid "wget of [%s] failed"
+msgid "write config file [%s]"
msgstr ""
-#: po/placeholder.h:58 urpm.pm:1101
+#: po/placeholder.h:57 urpm.pm:1107
#, fuzzy, c-format
msgid "no package named %s"
msgstr "paketti %s ei leitud\n"
-#: po/placeholder.h:59 urpm.pm:848
+#: po/placeholder.h:58 urpm.pm:854
#, fuzzy, c-format
msgid "unable to read compss file [%s]"
msgstr "ei saa luua andmekandjat \"%s\"\n"
-#: 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 ""
-#: po/placeholder.h:61
+#: po/placeholder.h:60
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr ""
-#: po/placeholder.h:62
+#: po/placeholder.h:61
msgid "computing dependencies"
msgstr ""
-#: po/placeholder.h:63 urpm.pm:868
+#: po/placeholder.h:62
+#, c-format
+msgid "retrieve of [%s] failed"
+msgstr ""
+
+#: po/placeholder.h:63 urpm.pm:874
#, c-format
msgid "write provides file [%s]"
msgstr ""
-#: po/placeholder.h:64 urpm.pm:803
+#: po/placeholder.h:64 urpm.pm:809
#, fuzzy, c-format
msgid "mounting %s"
msgstr "installitakse %s\n"
-#: 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 "
"medium"
msgstr ""
-#: po/placeholder.h:66 urpm.pm:148
-#, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
-msgstr ""
-
-#: po/placeholder.h:67
+#: po/placeholder.h:66
#, c-format
msgid "reading hdlist file [%s]"
msgstr ""
-#: po/placeholder.h:68 urpm.pm:873
+#: po/placeholder.h:67 urpm.pm:879
#, c-format
msgid "write compss file [%s]"
msgstr ""
-#: po/placeholder.h:69 urpm.pm:827
+#: po/placeholder.h:68 urpm.pm:833
#, c-format
msgid "read depslist file [%s]"
msgstr ""
-#: po/placeholder.h:70
+#: 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 "trying to select inexistant medium \"%s\""
+msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "ei saa luua andmekandjat \"%s\"\n"
-#: po/placeholder.h:71 urpm.pm:1812
+#: po/placeholder.h:71 urpm.pm:1668
#, c-format
msgid "malformed input: [%s]"
msgstr ""
-#: 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"
+msgid "there are multiple packages with the same rpm filename \"%s\""
msgstr ""
-#: 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 ""
-#: po/placeholder.h:77 urpm.pm:865
+#: po/placeholder.h:74 urpm.pm:871
#, fuzzy, c-format
msgid "unable to write provides file [%s]"
msgstr "ei saa luua andmekandjat \"%s\"\n"
-#: 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 ""
-#: po/placeholder.h:79 urpm.pm:1005
+#: po/placeholder.h:76 urpm.pm:1215
+#, fuzzy
+msgid "unable to find all synthesis file, using parsehdlist server"
+msgstr "ei saa uuendada andmekandjat \"%s\"\n"
+
+#: po/placeholder.h:77 urpm.pm:1011
#, fuzzy
msgid "unable to register rpm file"
msgstr "ei saa luua andmekandjat \"%s\"\n"
-#: po/placeholder.h:80 urpm.pm:1362
-msgid "unable to find all synthesis file, using parsehdlist server"
+#: po/placeholder.h:78 urpm.pm:256
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
msgstr ""
-#: po/placeholder.h:81 urpm.pm:241
+#: po/placeholder.h:79 urpm.pm:272
#, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "too many mount points for removable medium \"%s\""
msgstr ""
-#: po/placeholder.h:82 urpm.pm:233
+#: po/placeholder.h:80 urpm.pm:248
#, c-format
msgid "incoherent list file for \"%s\", medium ignored"
msgstr ""
-#: po/placeholder.h:83
+#: po/placeholder.h:81
#, c-format
msgid "copy of [%s] failed"
msgstr ""
-#: po/placeholder.h:84 urpm.pm:907 urpm.pm:1338 urpm.pm:1616 urpm.pm:1623
+#: po/placeholder.h:82
+#, fuzzy, c-format
+msgid "trying to remove inexistent medium \"%s\""
+msgstr "ei saa luua andmekandjat \"%s\"\n"
+
+#: po/placeholder.h:83 urpm.pm:913 urpm.pm:1191 urpm.pm:1473 urpm.pm:1480
#, fuzzy, c-format
msgid "unable to parse correctly [%s]"
msgstr "ei saa uuendada andmekandjat \"%s\"\n"
-#: po/placeholder.h:85 urpm.pm:824
+#: po/placeholder.h:84 urpm.pm:1192
#, fuzzy, c-format
-msgid "unable to read depslist file [%s]"
+msgid "read synthesis file [%s]"
msgstr "ei saa luua andmekandjat \"%s\"\n"
-#: po/placeholder.h:86
-msgid "removable medium not selected"
-msgstr ""
+#: po/placeholder.h:85 urpm.pm:830
+#, fuzzy, c-format
+msgid "unable to read depslist file [%s]"
+msgstr "ei saa luua andmekandjat \"%s\"\n"
-#: po/placeholder.h:87 urpm.pm:851
+#: po/placeholder.h:86 urpm.pm:857
#, c-format
msgid "read compss file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:89
+#: po/placeholder.h:88
#, c-format
msgid "building hdlist [%s]"
msgstr ""
-#: po/placeholder.h:90 urpm.pm:1746
+#: po/placeholder.h:89 urpm.pm:1603
#, fuzzy, c-format
msgid "unable to read rpm file [%s] from medium \"%s\""
msgstr "ei saa luua andmekandjat \"%s\"\n"
-#: po/placeholder.h:91 urpm.pm:1009
+#: po/placeholder.h:90 urpm.pm:1015
msgid "error registering local packages"
msgstr ""
-#: 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 ""
@@ -445,211 +459,266 @@ msgstr ""
msgid "unable to build hdlist: %s"
msgstr "ei saa uuendada andmekandjat \"%s\"\n"
-#: po/placeholder.h:94 urpm.pm:1000
-#, c-format
-msgid "invalid rpm file name [%s]"
-msgstr ""
-
-#: po/placeholder.h:95 urpm.pm:1736 urpm.pm:1739 urpm.pm:1758
+#: po/placeholder.h:94 urpm.pm:1593 urpm.pm:1596 urpm.pm:1615
#, c-format
msgid "medium \"%s\" is not selected"
msgstr ""
-#: po/placeholder.h:96 urpm.pm:207
+#: po/placeholder.h:95 urpm.pm:1006
#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "invalid rpm file name [%s]"
msgstr ""
-#: po/placeholder.h:97 urpm.pm:863
+#: po/placeholder.h:96 urpm.pm:1175
#, c-format
-msgid "write depslist file [%s]"
+msgid "unknown data associated with %s"
msgstr ""
-#: po/placeholder.h:98 urpm.pm:1322
+#: po/placeholder.h:97 urpm.pm:222
#, c-format
-msgid "unknown data associated with %s"
+msgid "trying to bypass existing medium \"%s\", avoiding"
msgstr ""
-#: po/placeholder.h:99
+#: po/placeholder.h:98 urpm.pm:869
#, c-format
-msgid "source of [%s] not found as [%s]"
+msgid "write depslist file [%s]"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: po/placeholder.h:102
-#, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
-msgstr ""
-
-#: po/placeholder.h:103 urpm.pm:1001
+#: po/placeholder.h:101 urpm.pm:1007
#, fuzzy, c-format
msgid "unable to access rpm file [%s]"
msgstr "ei saa luua andmekandjat \"%s\"\n"
-#: po/placeholder.h:104 urpm.pm:860
+#: po/placeholder.h:102 urpm.pm:866
#, fuzzy, c-format
msgid "unable to write depslist file [%s]"
msgstr "ei saa luua andmekandjat \"%s\"\n"
-#: po/placeholder.h:105 urpm.pm:327 urpm.pm:1773
+#: po/placeholder.h:103
+#, 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
#, fuzzy, c-format
msgid "unable to access medium \"%s\""
msgstr "ei saa uuendada andmekandjat \"%s\"\n"
-#: po/placeholder.h:106 urpm.pm:988
+#: po/placeholder.h:108 urpm.pm:994
#, c-format
msgid "relocated %s entries in depslist"
msgstr ""
-#: po/placeholder.h:107 urpm.pm:914 urpm.pm:1629 urpm.pm:1680
-#, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
+#: po/placeholder.h:109
+#, fuzzy, c-format
+msgid "trying to select inexistent medium \"%s\""
+msgstr "ei saa luua andmekandjat \"%s\"\n"
+
+#: po/placeholder.h:110 urpm.pm:97
+msgid "wget failed\n"
msgstr ""
-#: 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]"
+msgid "unable to parse correctly [%s] on value \"%s\""
msgstr ""
-#: po/placeholder.h:109 urpm.pm:1104
+#: po/placeholder.h:112 urpm.pm:1110
#, fuzzy, c-format
msgid "The following packages contain %s: %s"
msgstr "%s sisaldub j�rmistes pakettides: %s\n"
-#: 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\""
+msgid "no rpm files found from [%s]"
msgstr ""
-#: po/placeholder.h:111 urpm.pm:1920
+#: po/placeholder.h:114 urpm.pm:1772
#, c-format
msgid "selecting %s using obsoletes"
msgstr ""
-#: po/placeholder.h:112 urpm.pm:2031
+#: po/placeholder.h:115 urpm.pm:1888
#, c-format
msgid "selecting %s by selection on files"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:114 urpmi:308 urpmi:315 urpmi:328 urpmi:339 urpmi:352
-msgid "Installation failed"
-msgstr "Installimine eba�nnestus"
-
-#: po/placeholder.h:115 urpmi:279
-msgid "Press enter when it's done..."
-msgstr "Vajutage Enter kui see on tehtud..."
+#: po/placeholder.h:120
+msgid " --help - print this help message.\n"
+msgstr ""
-#: po/placeholder.h:117 urpmi:201
-msgid "Sorry, bad choice, try again\n"
-msgstr "Selline valik ei ole lubatud, proovige uuesti\n"
+#: po/placeholder.h:121 urpmi:361
+msgid "everything already installed"
+msgstr "k�ik on juba installitud"
-#: po/placeholder.h:120
+#: po/placeholder.h:122 urpmi:98
#, fuzzy, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: tundmatu v�ti \"-$1\", vaata igaks juhuks --help\n"
+
+#: po/placeholder.h:123 urpmi:194
+msgid "One of the following packages is needed:"
+msgstr "Vajalik on v�hemalt �ks j�rgnevatest pakettidest:"
+
+#: po/placeholder.h:124 po/placeholder.h:222
+msgid " --update - use only update media.\n"
+msgstr ""
+
+#: po/placeholder.h:125 urpmi:299
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"
+"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 "Installimine eba�nnestus"
+
+#: po/placeholder.h:132 po/placeholder.h:234
+msgid ""
+" --auto-select - automatically select packages for upgrading the system.\n"
+msgstr ""
+
+#: po/placeholder.h:134
+msgid " --X - use X interface.\n"
msgstr ""
-"urpmi versioon %s\n"
-"K�ik �igused (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"See on vaba tarkvara mida v�ib levitada vastavalt GNU �ldisele Avalikule "
-"Litsentsile (GPL).\n"
-"kasutamiseks:\n"
-" --help - see abitekst.\n"
-" --auto - vali automaatselt pakett installimiseks.\n"
-" --auto-select - vali automaatselt paketid s�steemi uuendamiseks\n"
-" --force - installi paketid iga hinna eest.\n"
-" --X - kasuta graafilist X liidest.\n"
-" --best-output - vali parim v�imalik kasutajaliides:\n"
-" X v�i tekstiresiim.\n"
-" -a - vali k�ik k�sureal leiduv.\n"
-" -m - vali minimaalne hulk s�ltuvusi (vaikimisi).\n"
-" -M - vali maksimaalne hulk s�ltuvusi.\n"
-" -c - lahenda t�ielikult k�ik n�utavad s�ltuvused.\n"
-" -q - vaikne resiim.\n"
-" -v - jutukas resiim.\n"
-" paketinimed v�i rpm-failid (ainult juurkasutaja) installimiseks.\n"
-
-#: po/placeholder.h:142 urpmi:362
-msgid "everything already installed"
-msgstr "k�ik on juba installitud"
-#: po/placeholder.h:143 urpmi:247
+#: po/placeholder.h:135 urpmi:247
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
"d MB)"
msgstr "S�ltuvuste lahendamiseks installitakse j�rgmised paketid (%d MB)"
-#: po/placeholder.h:144 urpmi:296
-#, c-format
-msgid "installing %s\n"
-msgstr "installitakse %s\n"
+#: po/placeholder.h:136 urpmi:320 urpmi:344
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Proovin paigaldada ilma s�ltuvust kontrollimata? (j/E)"
+
+#: po/placeholder.h:137
+msgid ""
+" --best-output - choose best interface according to the environment:\n"
+" X or text mode.\n"
+msgstr ""
-#: po/placeholder.h:145 urpmi:198
+#: 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
+msgid " -q - quiet mode.\n"
+msgstr ""
+
+#: po/placeholder.h:144 urpmi:202
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Millise(d) valite? (1-%d)"
-#: po/placeholder.h:146 urpmi:321 urpmi:345
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Proovin paigaldada ilma s�ltuvust kontrollimata? (j/E)"
+#: po/placeholder.h:145
+msgid " --wget - use wget to retrieve distant files.\n"
+msgstr ""
-#: po/placeholder.h:147 urpmi:190
-msgid "One of the following packages is needed:"
-msgstr "Vajalik on v�hemalt �ks j�rgnevatest pakettidest:"
+#: po/placeholder.h:146
+#, 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"
+msgstr ""
+
+#: po/placeholder.h:152 urpmi:328 urpmi:352
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Proovin paigaldada veel j�ulisemalt (--force)? (j/E) "
+
+#: po/placeholder.h:154
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+
+#: po/placeholder.h:155 urpmi:205
+msgid "Sorry, bad choice, try again\n"
+msgstr "Selline valik ei ole lubatud, proovige uuesti\n"
+
+#: po/placeholder.h:156
+msgid ""
+" names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: po/placeholder.h:158
+msgid " -a - select all matches on command line.\n"
+msgstr ""
-#: po/placeholder.h:148 urpmi:149
+#: 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 "installitakse %s\n"
+
+#: po/placeholder.h:161 urpmi:152
msgid "Only superuser is allowed to install local packages"
msgstr "Ainult juurkasutaja saab lokaalseid pakette installida"
-#: 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 "Palun pange andmekandja nimega %s seadmess [%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 "ei leia pakette, katkestan"
-#: po/placeholder.h:151 urpmi:329 urpmi:353
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Proovin paigaldada veel j�ulisemalt (--force)? (j/E) "
+#: po/placeholder.h:165 urpmi:102
+#, fuzzy
+msgid "Only superuser is allowed to install packages"
+msgstr "Ainult juurkasutaja saab lokaalseid pakette installida"
-#: po/placeholder.h:155 urpmi.addmedia:46
+#: po/placeholder.h:166 urpmi:193
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Vajalik on v�hemalt �ks j�rgnevatest pakettidest:"
+
+#: po/placeholder.h:167 urpmi:277
+msgid "Press Enter when it's done..."
+msgstr "Vajutage Enter kui see on tehtud..."
+
+#: po/placeholder.h:168 urpmi.addmedia:46
#, c-format
msgid ""
"%s\n"
@@ -658,7 +727,7 @@ msgstr ""
"%s\n"
"`with' puudub ftp asukoha jaoks\n"
-#: po/placeholder.h:159
+#: po/placeholder.h:172
msgid ""
"usage: urpmi.addmedia [--update] <name> <url>\n"
"where <url> is one of\n"
@@ -678,17 +747,17 @@ msgstr ""
" http://<masin>/<tee> with <suhteline tee hdlist juurde>\n"
" removable_<seade>://<tee>\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 "ei saa luua andmekandjat \"%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 "ei saa uuendada andmekandjat \"%s\"\n"
-#: po/placeholder.h:170 urpmi.addmedia:42
+#: po/placeholder.h:183 urpmi.addmedia:42
#, c-format
msgid ""
"%s\n"
@@ -697,7 +766,7 @@ msgstr ""
"%s\n"
"seadet `%s' ei ole olemas\n"
-#: po/placeholder.h:174 urpmi.addmedia:44
+#: po/placeholder.h:187 urpmi.addmedia:44
#, c-format
msgid ""
"%s\n"
@@ -706,7 +775,7 @@ msgstr ""
"%s\n"
"Puudub <suhteline tee hdlist -ni>\n"
-#: po/placeholder.h:178
+#: po/placeholder.h:191
#, fuzzy, c-format
msgid ""
"usage: urpmi.update [-a] <name> ...\n"
@@ -723,11 +792,11 @@ msgstr ""
"\n"
"tundmatu(d) '%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 "ei ole midagi uuendada (andmekandja lisamiseks urpmi.addmedia)\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"
@@ -736,11 +805,11 @@ msgstr ""
"puudub uuendatava nimi\n"
"(v�imalikke %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 "ei ole midagi eemaldada (andmekandja lisamiseks urpmi.addmedia)\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"
@@ -749,7 +818,7 @@ msgstr ""
"puudub eemaldatava nimi\n"
"(v�imalikke %s)\n"
-#: po/placeholder.h:197
+#: po/placeholder.h:210
#, c-format
msgid ""
"usage: urpmi.removemedia [-a] <name> ...\n"
@@ -764,17 +833,11 @@ msgstr ""
"\n"
"tundmatu(d) '%s'\n"
-#: po/placeholder.h:204 urpmq:85
-#, fuzzy, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: ei saa lugeda rpm-faili \"$_\"\n"
-
-#: po/placeholder.h:206 urpmq:82
-#, fuzzy, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: tundmatu v�ti \"-$1\", vaata igaks juhuks --help\n"
+#: po/placeholder.h:217
+msgid " -h - print this help message.\n"
+msgstr ""
-#: 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"
@@ -782,7 +845,28 @@ msgstr ""
"uuendamiseks tuleks osa pakette eemaldada, kahjuks ei ole see aga veel "
"v�imalik\n"
-#: po/placeholder.h:208
+#: po/placeholder.h:219
+msgid " -g - print groups too with name.\n"
+msgstr ""
+
+#: po/placeholder.h:220 urpmq:84
+#, fuzzy, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: ei saa lugeda rpm-faili \"$_\"\n"
+
+#: po/placeholder.h:221
+msgid " names or rpm files given on command line are queried.\n"
+msgstr ""
+
+#: po/placeholder.h:223
+msgid " -r - print version and release too with name.\n"
+msgstr ""
+
+#: po/placeholder.h:224
+msgid " -f - print version, release and arch with name.\n"
+msgstr ""
+
+#: po/placeholder.h:225
#, c-format
msgid ""
"urpmq version %s\n"
@@ -790,79 +874,70 @@ msgid ""
"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"
+msgstr ""
+
+#: po/placeholder.h:231
+msgid " -d - extend query to package dependencies.\n"
+msgstr ""
+
+#: po/placeholder.h:232
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
+msgstr ""
+
+#: po/placeholder.h:233
+msgid ""
" -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"
+msgstr ""
+
+#: po/placeholder.h:235 urpmq:81
+#, fuzzy, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: tundmatu v�ti \"-$1\", vaata igaks juhuks --help\n"
+
+#: po/placeholder.h:236
+msgid ""
" --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 package do not exist.\n"
-" names or rpm files given on command line are queried.\n"
msgstr ""
-#: urpm.pm:257
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:243
+msgid ""
+" -u - remove package if a better version is already installed.\n"
msgstr ""
-#: urpm.pm:258
-#, c-format
-msgid "taking removable device as \"%s\""
+#: po/placeholder.h:244
+msgid ""
+" --force - force invocation even if some packages do not\n"
+"exist.\n"
msgstr ""
-#: urpm.pm:262
+#: urpm.pm:1796 urpm.pm:1805
#, c-format
-msgid "using different removable device [%s] for \"%s\""
+msgid "removing %s to upgrade to %s ..."
msgstr ""
-#: urpm.pm:266 urpm.pm:269
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "ei saa luua andmekandjat \"%s\"\n"
+#: urpm.pm:1797 urpm.pm:1806
+msgid ", $otherPackage, "
+msgstr ", $otherPackage, "
-#: urpm.pm:1339
-#, fuzzy, c-format
-msgid "read synthesis file [%s]"
-msgstr "ei saa luua andmekandjat \"%s\"\n"
+#: urpm.pm:1797 urpm.pm:1806
+msgid "));"
+msgstr "));"
+
+#: urpm.pm:1802
+msgid "$p->{name}-$p->{version}-$p->{release}"
+msgstr "$p->{name}-$p->{version}-$p->{release}"
-#: urpmi:49
+#: urpm.pm:1812
+msgid "$prefix/$_"
+msgstr "$prefix/$_"
+
+#: urpmi:48
#, c-format
msgid "urpmi version %s"
msgstr "urpmi versioon %s"
-#: urpmi:98
-#, fuzzy, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: tundmatu v�ti \"-$1\", vaata igaks juhuks --help\n"
-
-#: urpmi:102
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr "Ainult juurkasutaja saab lokaalseid pakette installida"
-
-#: urpmi:189
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Vajalik on v�hemalt �ks j�rgnevatest pakettidest:"
-
-#: urpmi:301
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
-msgstr ""
-
#: urpmi.addmedia:30
#, fuzzy
msgid "usage: urpmi.addmedia [--update] <name> <url>"
@@ -894,8 +969,53 @@ msgstr ", $_);"
msgid "urpmq version %s"
msgstr "urpmq versioon %s"
-#~ msgid "));"
-#~ msgstr "));"
+#, fuzzy
+#~ 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 ""
+#~ "urpmi versioon %s\n"
+#~ "K�ik �igused (C) 1999, 2000, 2001 MandrakeSoft.\n"
+#~ "See on vaba tarkvara mida v�ib levitada vastavalt GNU �ldisele Avalikule "
+#~ "Litsentsile (GPL).\n"
+#~ "kasutamiseks:\n"
+#~ " --help - see abitekst.\n"
+#~ " --auto - vali automaatselt pakett installimiseks.\n"
+#~ " --auto-select - vali automaatselt paketid s�steemi uuendamiseks\n"
+#~ " --force - installi paketid iga hinna eest.\n"
+#~ " --X - kasuta graafilist X liidest.\n"
+#~ " --best-output - vali parim v�imalik kasutajaliides:\n"
+#~ " X v�i tekstiresiim.\n"
+#~ " -a - vali k�ik k�sureal leiduv.\n"
+#~ " -m - vali minimaalne hulk s�ltuvusi (vaikimisi).\n"
+#~ " -M - vali maksimaalne hulk s�ltuvusi.\n"
+#~ " -c - lahenda t�ielikult k�ik n�utavad s�ltuvused.\n"
+#~ " -q - vaikne resiim.\n"
+#~ " -v - jutukas resiim.\n"
+#~ " paketinimed v�i rpm-failid (ainult juurkasutaja) installimiseks.\n"
#~ msgid "), $_);"
#~ msgstr "), $_);"
diff --git a/po/eu.po b/po/eu.po
index 3e154359..dae9afd8 100644
--- a/po/eu.po
+++ b/po/eu.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-09-02 16:40GMT+1\n"
"Last-Translator: I�igo Salvador Azurmendi <xalba@euskalnet.net>\n"
"Language-Team: Euskara <linux-eu@chanae.alphanet.ch>\n"
@@ -26,27 +26,27 @@ msgstr ""
"Paketeen instalazio automatikoa...\n"
"Zuk $rpm paketearen instalazioa eskatu duzu\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 "Zuzena al da?"
-#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:281
+#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:279
msgid "Ok"
msgstr "Ados"
-#: _irpm:34 po/placeholder.h:116 urpmi:252 urpmi:282
+#: _irpm:34 po/placeholder.h:119 urpmi:252 urpmi:280
msgid "Cancel"
msgstr "Etsi"
-#: _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 "EeNn"
-#: _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 "BbYySs"
-#: _irpm:42 po/placeholder.h:118 urpmi:258
+#: _irpm:42 po/placeholder.h:157 urpmi:258
msgid " (Y/n) "
msgstr " (B/e) "
@@ -165,294 +165,308 @@ msgstr "saiatu urpmf --help aukerak ikusteko"
msgid "urpmi is not installed"
msgstr "urpmi ez dago instalatuta"
-#: po/placeholder.h:29 urpm.pm:283
+#: po/placeholder.h:29
+#, fuzzy, c-format
+msgid "reading synthesis file [%s]"
+msgstr "[%s] depslist fitxategia irakurri"
+
+#: po/placeholder.h:30 urpm.pm:298
#, c-format
msgid "unable to write config file [%s]"
msgstr "ezin da [%s] ezarpen fitxategia idatzi"
-#: 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 ""
-"ezin da erabili \"%s\" izena izengabeko mediarentzako erabili dagoeneko "
-"erabilita dagoelako"
-#: po/placeholder.h:31
+#: po/placeholder.h:32
#, c-format
msgid "nothing to write in list file for \"%s\""
msgstr "ez dago zerrenda fitxategian \"%s\"-rri buruz idazteko ezer"
-#: 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 ""
-#: po/placeholder.h:33
-#, c-format
+#: po/placeholder.h:34
+#, fuzzy, c-format
msgid "unable to parse hdlist file of \"%s\""
-msgstr ""
+msgstr "ezin da \"%s\"-ren zerrenda fitxategia irakurri"
-#: po/placeholder.h:34
+#: po/placeholder.h:35
#, c-format
msgid "nothing written in list file for \"%s\""
msgstr "ez dago zerrenda fitxategian \"%s\"-ri buruzko ezer idatzita"
-#: po/placeholder.h:35 urpm.pm:1951
-#, c-format
-msgid ""
-"removing %s to upgrade ...\n"
-" to %s since it will not upgrade correctly!"
-msgstr ""
-
-#: po/placeholder.h:39 urpm.pm:839
+#: po/placeholder.h:36 urpm.pm:845
#, c-format
msgid "read provides file [%s]"
msgstr "irakurri [%s] hornitu fitxategia"
-#: po/placeholder.h:40
-#, fuzzy, c-format
-msgid "trying to remove inexistant medium \"%s\""
-msgstr "ezin da \"%s\" bitartekoa sortu\n"
-
-#: po/placeholder.h:41 urpm.pm:1692
+#: po/placeholder.h:37 urpm.pm:1549
#, c-format
msgid "package %s is not found."
msgstr "ez da %s paketea aurkitu."
-#: po/placeholder.h:42
-#, c-format
-msgid "unable to copy source of [%s] from [%s]"
-msgstr ""
-
-#: po/placeholder.h:43 urpm.pm:870
+#: po/placeholder.h:38 urpm.pm:876
#, fuzzy, c-format
msgid "unable to write compss file [%s]"
msgstr "ezin da \"%s\" bitartekoa sortu\n"
-#: po/placeholder.h:44 urpm.pm:813
+#: po/placeholder.h:39 urpm.pm:819
#, c-format
msgid "unmounting %s"
msgstr "%s desmontatzen"
-#: po/placeholder.h:45
+#: po/placeholder.h:40
#, c-format
msgid "removing %d obsolete headers in cache"
msgstr ""
-#: 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 ""
-#: 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 ""
+
+#: po/placeholder.h:43 urpm.pm:184
+#, c-format
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"ezin da erabili \"%s\" izena izengabeko mediarentzako erabili dagoeneko "
+"erabilita dagoelako"
+
+#: po/placeholder.h:44 urpm.pm:191
#, c-format
msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
msgstr ""
-#: po/placeholder.h:48
+#: po/placeholder.h:45
msgid "keeping only files referenced in provides"
msgstr ""
-#: po/placeholder.h:49
+#: po/placeholder.h:46
#, fuzzy, c-format
msgid "unable to build synthesis file for medium \"%s\""
msgstr "ezin da \"%s\" bitartekoa eguneratu\n"
-#: po/placeholder.h:50
+#: po/placeholder.h:47
#, c-format
msgid "found %d headers in cache"
msgstr ""
-#: po/placeholder.h:51 urpm.pm:836
+#: po/placeholder.h:48 urpm.pm:842
#, c-format
msgid "unable to read provides file [%s]"
msgstr "ezin da [%s] hornitu fitxategia irakurri"
-#: 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 ""
-#: po/placeholder.h:53 urpm.pm:311
+#: po/placeholder.h:50
#, c-format
-msgid "medium \"%s\" already exists"
+msgid ""
+"removing %s to upgrade to %s ...\n"
+" since it will not be updated otherwise"
msgstr ""
-#: po/placeholder.h:54 urpm.pm:295
+#: po/placeholder.h:54 urpm.pm:326
#, c-format
-msgid "write config file [%s]"
-msgstr "idatzi [%s] ezarpen fitxategia"
+msgid "medium \"%s\" already exists"
+msgstr ""
#: po/placeholder.h:55
#, c-format
msgid "unable to write list file of \"%s\""
msgstr "ezin da \"%s\"-ren zerrenda fitxategia irakurri"
-#: po/placeholder.h:56 urpm.pm:1817
-#, c-format
-msgid "retrieving [%s]"
-msgstr "[%s] eskuratzen"
-
-#: po/placeholder.h:57 urpm.pm:1819
+#: po/placeholder.h:56 urpm.pm:310
#, c-format
-msgid "wget of [%s] failed"
-msgstr "[%s]-ren wget-ek hutsegin du"
+msgid "write config file [%s]"
+msgstr "idatzi [%s] ezarpen fitxategia"
-#: po/placeholder.h:58 urpm.pm:1101
+#: po/placeholder.h:57 urpm.pm:1107
#, c-format
msgid "no package named %s"
msgstr "ez dago %s izeneko paketerik"
-#: po/placeholder.h:59 urpm.pm:848
+#: po/placeholder.h:58 urpm.pm:854
#, fuzzy, c-format
msgid "unable to read compss file [%s]"
msgstr "ezin da \"%s\" bitartekoa sortu\n"
-#: 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 ""
-#: po/placeholder.h:61
-#, c-format
+#: po/placeholder.h:60
+#, fuzzy, c-format
msgid "built hdlist synthesis file for medium \"%s\""
-msgstr ""
+msgstr "ezin da \"%s\" bitartekoa eguneratu\n"
-#: po/placeholder.h:62
+#: po/placeholder.h:61
msgid "computing dependencies"
msgstr "menpekotasunak konputatzen"
-#: po/placeholder.h:63 urpm.pm:868
+#: po/placeholder.h:62
+#, fuzzy, c-format
+msgid "retrieve of [%s] failed"
+msgstr "[%s]-ren wget-ek hutsegin du"
+
+#: po/placeholder.h:63 urpm.pm:874
#, c-format
msgid "write provides file [%s]"
msgstr "[%s] hornitu fitxategia idatzita"
-#: po/placeholder.h:64 urpm.pm:803
+#: po/placeholder.h:64 urpm.pm:809
#, c-format
msgid "mounting %s"
msgstr "%s montatzen"
-#: 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 "
"medium"
msgstr ""
-#: po/placeholder.h:66 urpm.pm:148
-#, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
-msgstr ""
-
-#: po/placeholder.h:67
+#: po/placeholder.h:66
#, c-format
msgid "reading hdlist file [%s]"
msgstr "[%s] hdlist fitxategia irakurtzen"
-#: po/placeholder.h:68 urpm.pm:873
+#: po/placeholder.h:67 urpm.pm:879
#, c-format
msgid "write compss file [%s]"
msgstr "[%s] compss fitxategia idatzi"
-#: po/placeholder.h:69 urpm.pm:827
+#: po/placeholder.h:68 urpm.pm:833
#, c-format
msgid "read depslist file [%s]"
msgstr "[%s] depslist fitxategia irakurri"
-#: po/placeholder.h:70
+#: 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 "trying to select inexistant medium \"%s\""
+msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "ezin da \"%s\" bitartekoa sortu\n"
-#: po/placeholder.h:71 urpm.pm:1812
+#: po/placeholder.h:71 urpm.pm:1668
#, c-format
msgid "malformed input: [%s]"
msgstr "gaizki osatutako sarrera: [%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 ""
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "hainbat pakete daude rpm fitxategi izen \"%s\" berberarekin"
-#: 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 ""
-#: po/placeholder.h:77 urpm.pm:865
+#: po/placeholder.h:74 urpm.pm:871
#, c-format
msgid "unable to write provides file [%s]"
msgstr "ezin da [%s] hornitu fitxategia idatzi"
-#: 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 ""
-#: po/placeholder.h:79 urpm.pm:1005
+#: po/placeholder.h:76 urpm.pm:1215
+#, fuzzy
+msgid "unable to find all synthesis file, using parsehdlist server"
+msgstr "ezin da \"%s\" bitartekoa eguneratu\n"
+
+#: po/placeholder.h:77 urpm.pm:1011
msgid "unable to register rpm file"
msgstr "ezin da rpm fitxategia erregistratu"
-#: po/placeholder.h:80 urpm.pm:1362
-msgid "unable to find all synthesis file, using parsehdlist server"
+#: po/placeholder.h:78 urpm.pm:256
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
msgstr ""
-#: po/placeholder.h:81 urpm.pm:241
+#: po/placeholder.h:79 urpm.pm:272
#, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "too many mount points for removable medium \"%s\""
msgstr ""
-#: po/placeholder.h:82 urpm.pm:233
+#: po/placeholder.h:80 urpm.pm:248
#, c-format
msgid "incoherent list file for \"%s\", medium ignored"
msgstr ""
-#: po/placeholder.h:83
+#: po/placeholder.h:81
#, c-format
msgid "copy of [%s] failed"
msgstr "[%s]-ren kopiak hutsegin du"
-#: po/placeholder.h:84 urpm.pm:907 urpm.pm:1338 urpm.pm:1616 urpm.pm:1623
+#: po/placeholder.h:82
+#, fuzzy, c-format
+msgid "trying to remove inexistent medium \"%s\""
+msgstr "ezin da \"%s\" bitartekoa sortu\n"
+
+#: po/placeholder.h:83 urpm.pm:913 urpm.pm:1191 urpm.pm:1473 urpm.pm:1480
#, fuzzy, c-format
msgid "unable to parse correctly [%s]"
msgstr "ezin da \"%s\" bitartekoa eguneratu\n"
-#: po/placeholder.h:85 urpm.pm:824
+#: po/placeholder.h:84 urpm.pm:1192
+#, fuzzy, c-format
+msgid "read synthesis file [%s]"
+msgstr "[%s] depslist fitxategia irakurri"
+
+#: po/placeholder.h:85 urpm.pm:830
#, c-format
msgid "unable to read depslist file [%s]"
msgstr "ezin da [%s] depslist fitxategia irakurri"
-#: po/placeholder.h:86
-msgid "removable medium not selected"
-msgstr ""
-
-#: po/placeholder.h:87 urpm.pm:851
+#: po/placeholder.h:86 urpm.pm:857
#, c-format
msgid "read compss file [%s]"
msgstr "irakurri [%s] compss fitxategia"
-#: 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 ""
-#: po/placeholder.h:89
+#: po/placeholder.h:88
#, c-format
msgid "building hdlist [%s]"
msgstr "[%s] hdlist eraikitzen"
-#: po/placeholder.h:90 urpm.pm:1746
+#: po/placeholder.h:89 urpm.pm:1603
#, fuzzy, c-format
msgid "unable to read rpm file [%s] from medium \"%s\""
msgstr "ezin da \"%s\" bitartekoa sortu\n"
-#: po/placeholder.h:91 urpm.pm:1009
+#: po/placeholder.h:90 urpm.pm:1015
msgid "error registering local packages"
msgstr "okerra bertako paketeak erregistratzerakoan"
-#: 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,214 +476,272 @@ msgstr ""
msgid "unable to build hdlist: %s"
msgstr "ezin da hdlist eraiki: %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 "\"%s\" bitartekoa ez dago aukeratuta"
+
+#: po/placeholder.h:95 urpm.pm:1006
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "baliogabeko rpm fitxategi izena [%s]"
-#: 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 "\"%s\" bitartekoa ez dago aukeratuta"
+msgid "unknown data associated with %s"
+msgstr ""
-#: 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 ""
-#: po/placeholder.h:97 urpm.pm:863
+#: po/placeholder.h:98 urpm.pm:869
#, c-format
msgid "write depslist file [%s]"
msgstr "[%s] deplist fitxategia idatzi"
-#: po/placeholder.h:98 urpm.pm:1322
-#, c-format
-msgid "unknown data associated with %s"
-msgstr ""
-
-#: po/placeholder.h:99
-#, c-format
-msgid "source of [%s] not found as [%s]"
-msgstr ""
-
-#: 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 ""
-#: 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 ""
-#: po/placeholder.h:102
-#, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
-msgstr "[%s]-ren wget hutsegin du (agian wget falta da?)"
-
-#: po/placeholder.h:103 urpm.pm:1001
+#: po/placeholder.h:101 urpm.pm:1007
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "ezin da [%s] rpm fitxategira heldu"
-#: po/placeholder.h:104 urpm.pm:860
+#: po/placeholder.h:102 urpm.pm:866
#, c-format
msgid "unable to write depslist file [%s]"
msgstr "ezin da [%s] deplist fitxategia idatzi"
-#: po/placeholder.h:105 urpm.pm:327 urpm.pm:1773
+#: po/placeholder.h:103
+#, 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
#, c-format
msgid "unable to access medium \"%s\""
msgstr "ezin da \"%s\" euskarrira heldu"
-#: po/placeholder.h:106 urpm.pm:988
+#: po/placeholder.h:108 urpm.pm:994
#, c-format
msgid "relocated %s entries in depslist"
msgstr ""
-#: po/placeholder.h:107 urpm.pm:914 urpm.pm:1629 urpm.pm:1680
+#: po/placeholder.h:109
+#, fuzzy, c-format
+msgid "trying to select inexistent medium \"%s\""
+msgstr "ezin da \"%s\" bitartekoa sortu\n"
+
+#: po/placeholder.h:110 urpm.pm:97
+#, fuzzy
+msgid "wget failed\n"
+msgstr "[%s]-ren wget-ek hutsegin du"
+
+#: 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:108
-#, c-format
-msgid "no rpm files found from [%s]"
-msgstr "ez dira [%s]-n rpm fitxategiak aurkitu"
-
-#: po/placeholder.h:109 urpm.pm:1104
+#: po/placeholder.h:112 urpm.pm:1110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Ondorengo pakeek %s dute: %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 "hainbat pakete daude rpm fitxategi izen \"%s\" berberarekin"
+msgid "no rpm files found from [%s]"
+msgstr "ez dira [%s]-n rpm fitxategiak aurkitu"
-#: po/placeholder.h:111 urpm.pm:1920
+#: po/placeholder.h:114 urpm.pm:1772
#, c-format
msgid "selecting %s using obsoletes"
msgstr ""
-#: po/placeholder.h:112 urpm.pm:2031
+#: po/placeholder.h:115 urpm.pm:1888
#, c-format
msgid "selecting %s by selection on files"
msgstr ""
-#: 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 ""
-#: 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 - inprimatu etiketa guztiak."
+
+#: po/placeholder.h:121 urpmi:361
+msgid "everything already installed"
+msgstr "guztia instalatuta dago"
+
+#: po/placeholder.h:122 urpmi:98
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: aukera ezezaguna \"-%s\", begiratu erabilera --help bitartez\n"
+
+#: po/placeholder.h:123 urpmi:194
+msgid "One of the following packages is needed:"
+msgstr "Ondorengo pakeetariko bat behar da:"
+
+#: 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 "Instalazioak hutsegin du"
-#: po/placeholder.h:115 urpmi:279
-msgid "Press enter when it's done..."
-msgstr "Sartu sakatu egindakoan..."
+#: 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 "Barkatu, aukera okerra, saiatu berriro\n"
+#: po/placeholder.h:134
+#, fuzzy
+msgid " --X - use X interface.\n"
+msgstr " --all - inprimatu etiketa guztiak."
-#: 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 "Menpekotasunak asetzeko, ondorengo paketeak instalatuko dira (%d MB)"
+
+#: po/placeholder.h:136 urpmi:320 urpmi:344
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Saiatu instalatzen menpekotasunak aztertu gabe? (b/E)"
+
+#: 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 - inprimatu etiketa guztiak."
+
+#: po/placeholder.h:144 urpmi:202
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "Zein da zure aukera? (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 "Hau software askea da eta GNUren GPL baldintzapean birbanatu daiteke."
+
+#: po/placeholder.h:152 urpmi:328 urpmi:352
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Saiatu instalatzen indartsuago (--force)? (b/E) "
+
+#: po/placeholder.h:154
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
msgstr ""
-"urpmi %s bertsioa\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"Hau software askea da eta GNUren GPLak adierazitakoari jarraituz banatu "
-"daiteke.\n"
-"erabilera:\n"
-" --help - laguntza mezu hau inprimatu.\n"
-" --update - erabili soilik eguneratzeko euskarria\n"
-" --auto - automatically select a good package in choices.\n"
-" --auto-select - sistema eguneratzeko paketeak automatikoki hautatu.\n"
-" --force - deia behartu nahiz eta paketeren bat ez egon.\n"
-" --X - X interfazea erabili.\n"
-" --best-output - aukeratu inguruneari dagokionez interfaze egokiena:\n"
-" X edo testu modua.\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"
-" -q - modu isila.\n"
-" -v - modu berritsua.\n"
-" agindu lerroan emandako (rootarentzat bakarrik) izen edo rpm fitxategiak "
-"instalatzen dira.\n"
-
-#: po/placeholder.h:142 urpmi:362
-msgid "everything already installed"
-msgstr "guztia instalatuta dago"
-#: po/placeholder.h:143 urpmi:247
-#, c-format
+#: po/placeholder.h:155 urpmi:205
+msgid "Sorry, bad choice, try again\n"
+msgstr "Barkatu, aukera okerra, saiatu berriro\n"
+
+#: po/placeholder.h:156
msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
-msgstr "Menpekotasunak asetzeko, ondorengo paketeak instalatuko dira (%d MB)"
+" names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: po/placeholder.h:158
+msgid " -a - select all matches on command line.\n"
+msgstr ""
-#: po/placeholder.h:144 urpmi:296
+#: 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 "%s instalatzen\n"
-#: po/placeholder.h:145 urpmi:198
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Zein da zure aukera? (1-%d) "
-
-#: po/placeholder.h:146 urpmi:321 urpmi:345
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Saiatu instalatzen menpekotasunak aztertu gabe? (b/E)"
-
-#: po/placeholder.h:147 urpmi:190
-msgid "One of the following packages is needed:"
-msgstr "Ondorengo pakeetariko bat behar da:"
-
-#: po/placeholder.h:148 urpmi:149
+#: po/placeholder.h:161 urpmi:152
msgid "Only superuser is allowed to install local packages"
msgstr ""
"Soilik superrerabiltzaileak dauka bertako paketeak instalatzeko baimena"
-#: 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 "Mesedez, sartu bitartekoaren izena \"%s\" gailuan [%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 "ezin dira jatorria duten paketeak eskuratu, galerazten"
-#: po/placeholder.h:151 urpmi:329 urpmi:353
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Saiatu instalatzen indartsuago (--force)? (b/E) "
+#: po/placeholder.h:165 urpmi:102
+#, fuzzy
+msgid "Only superuser is allowed to install packages"
+msgstr ""
+"Soilik superrerabiltzaileak dauka bertako paketeak instalatzeko baimena"
-#: po/placeholder.h:155 urpmi.addmedia:46
+#: po/placeholder.h:166 urpmi:193
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Ondorengo pakeetariko bat behar da:"
+
+#: po/placeholder.h:167 urpmi:277
+msgid "Press Enter when it's done..."
+msgstr "Sartu sakatu egindakoan..."
+
+#: po/placeholder.h:168 urpmi.addmedia:46
#, c-format
msgid ""
"%s\n"
@@ -678,7 +750,7 @@ msgstr ""
"%s\n"
"`with' falta da ftp mediarentzat\n"
-#: po/placeholder.h:159
+#: po/placeholder.h:172
msgid ""
"usage: urpmi.addmedia [--update] <name> <url>\n"
"where <url> is one of\n"
@@ -698,17 +770,17 @@ msgstr ""
" http://<ostatua>/<bidea> with <hdlist-ren fitxategi izen erlatiboa>\n"
" removable_<gailua>://<bidea>\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 "ezin da \"%s\" bitartekoa sortu\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 "ezin da \"%s\" bitartekoa eguneratu\n"
-#: po/placeholder.h:170 urpmi.addmedia:42
+#: po/placeholder.h:183 urpmi.addmedia:42
#, c-format
msgid ""
"%s\n"
@@ -717,7 +789,7 @@ msgstr ""
"%s\n"
"'%s' gailua ez da existitzen\n"
-#: po/placeholder.h:174 urpmi.addmedia:44
+#: po/placeholder.h:187 urpmi.addmedia:44
#, c-format
msgid ""
"%s\n"
@@ -726,7 +798,7 @@ msgstr ""
"%s\n"
"<hdlist-en bide erlatiboa> falta da\n"
-#: po/placeholder.h:178
+#: po/placeholder.h:191
#, c-format
msgid ""
"usage: urpmi.update [-a] <name> ...\n"
@@ -746,11 +818,11 @@ msgstr ""
"\n"
"aukera ezezagunak '%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 "ez dago zer eguneratu (erabili urpmi.addmedia media gehitzeko)\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 +831,11 @@ msgstr ""
"eguneratzeko sarrera falta da\n"
"(%s-ko bat)\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 "ez dago zer ezabatu (erabili urpmi.addmedia media gehitzeko)\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 +844,7 @@ msgstr ""
"ezabatzeko sarrera falta da\n"
"(%s-ko bat)\n"
-#: po/placeholder.h:197
+#: po/placeholder.h:210
#, c-format
msgid ""
"usage: urpmi.removemedia [-a] <name> ...\n"
@@ -787,17 +859,12 @@ msgstr ""
"\n"
"aukera ezezagunak '%s'\n"
-#: po/placeholder.h:204 urpmq:85
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: ezin da \"%s\" rpm fitxategia irakurri\n"
-
-#: po/placeholder.h:206 urpmq:82
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: aukera ezezaguna \"-%s\", begiratu erabilera --help bitartez\n"
+#: po/placeholder.h:217
+#, fuzzy
+msgid " -h - print this help message.\n"
+msgstr " --all - inprimatu etiketa guztiak."
-#: 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"
@@ -805,88 +872,104 @@ msgstr ""
"zenbait pakete ezabatu egin behar dira eguneratu ahal izateko, ez dago "
"oraindik honetarako euskarririk\n"
-#: po/placeholder.h:208
+#: po/placeholder.h:219
+#, fuzzy
+msgid " -g - print groups too with name.\n"
+msgstr " --group - inprimatu talde etiketa: taldea."
+
+#: po/placeholder.h:220 urpmq:84
#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: ezin da \"%s\" rpm fitxategia irakurri\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 ""
+" ez bada horrela hartzen da baino pakete izena gabe)."
+
+#: 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"
+msgstr "Hau software askea da eta GNUren GPL baldintzapean birbanatu daiteke."
+
+#: po/placeholder.h:231
+#, fuzzy
+msgid " -d - extend query to package dependencies.\n"
+msgstr ""
+" ez bada horrela hartzen da baino pakete izena gabe)."
+
+#: po/placeholder.h:232
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
+msgstr ""
+
+#: po/placeholder.h:233
+msgid ""
" -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"
+msgstr ""
+
+#: po/placeholder.h:235 urpmq:81
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: aukera ezezaguna \"-%s\", begiratu erabilera --help bitartez\n"
+
+#: po/placeholder.h:236
+msgid ""
" --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 package do not exist.\n"
-" names or rpm files given on command line are queried.\n"
msgstr ""
-#: urpm.pm:257
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:243
+msgid ""
+" -u - remove package if a better version is already installed.\n"
msgstr ""
-#: urpm.pm:258
-#, c-format
-msgid "taking removable device as \"%s\""
+#: po/placeholder.h:244
+msgid ""
+" --force - force invocation even if some packages do not\n"
+"exist.\n"
msgstr ""
-#: urpm.pm:262
+#: urpm.pm:1796 urpm.pm:1805
#, c-format
-msgid "using different removable device [%s] for \"%s\""
+msgid "removing %s to upgrade to %s ..."
msgstr ""
-#: urpm.pm:266 urpm.pm:269
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "ezin da \"%s\" bitartekoa sortu\n"
+#: urpm.pm:1797 urpm.pm:1806
+msgid ", $otherPackage, "
+msgstr ", $otherPackage, "
-#: urpm.pm:1339
-#, fuzzy, c-format
-msgid "read synthesis file [%s]"
-msgstr "[%s] depslist fitxategia irakurri"
+#: urpm.pm:1797 urpm.pm:1806
+msgid "));"
+msgstr "));"
+
+#: urpm.pm:1802
+msgid "$p->{name}-$p->{version}-$p->{release}"
+msgstr "$p->{name}-$p->{version}-$p->{release}"
+
+#: urpm.pm:1812
+msgid "$prefix/$_"
+msgstr "$prefix/$_"
-#: urpmi:49
+#: urpmi:48
#, c-format
msgid "urpmi version %s"
msgstr "urpmi bertsioa %s"
-#: urpmi:98
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: aukera ezezaguna \"-%s\", begiratu erabilera --help bitartez\n"
-
-#: urpmi:102
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr ""
-"Soilik superrerabiltzaileak dauka bertako paketeak instalatzeko baimena"
-
-#: urpmi:189
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Ondorengo pakeetariko bat behar da:"
-
-#: urpmi:301
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
-msgstr ""
-
#: urpmi.addmedia:30
msgid "usage: urpmi.addmedia [--update] <name> <url>"
msgstr "erabilera: urpmi.addmedia [--update] <izena> <url>"
@@ -916,3 +999,59 @@ msgstr ", $_);"
#, c-format
msgid "urpmq version %s"
msgstr "urpmq bertsioa %s"
+
+#~ msgid "retrieving [%s]"
+#~ msgstr "[%s] eskuratzen"
+
+#~ msgid "wget of [%s] failed (maybe wget is missing?)"
+#~ msgstr "[%s]-ren wget hutsegin du (agian wget falta da?)"
+
+#~ 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 ""
+#~ "urpmi %s bertsioa\n"
+#~ "Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+#~ "Hau software askea da eta GNUren GPLak adierazitakoari jarraituz banatu "
+#~ "daiteke.\n"
+#~ "erabilera:\n"
+#~ " --help - laguntza mezu hau inprimatu.\n"
+#~ " --update - erabili soilik eguneratzeko euskarria\n"
+#~ " --auto - automatically select a good package in choices.\n"
+#~ " --auto-select - sistema eguneratzeko paketeak automatikoki hautatu.\n"
+#~ " --force - deia behartu nahiz eta paketeren bat ez egon.\n"
+#~ " --X - X interfazea erabili.\n"
+#~ " --best-output - aukeratu inguruneari dagokionez interfaze egokiena:\n"
+#~ " X edo testu modua.\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"
+#~ " -q - modu isila.\n"
+#~ " -v - modu berritsua.\n"
+#~ " agindu lerroan emandako (rootarentzat bakarrik) izen edo rpm "
+#~ "fitxategiak instalatzen dira.\n"
diff --git a/po/fi.po b/po/fi.po
index 7707261f..7c323926 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,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-04-11 18:57+0200\n"
"Last-Translator: Matias Griese <mahagr@utu.fi>\n"
"Language-Team: Finnish\n"
@@ -27,27 +27,27 @@ msgstr ""
"Pakettien automaattinen asennus...\n"
"L�hetit pyynn�n paketin $rpm asentamisesta\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 "Sopiiko t�m�?"
-#: _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 "Peruuta"
-#: _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 "EeNn"
-#: _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 "KkJjYy"
-#: _irpm:42 po/placeholder.h:118 urpmi:258
+#: _irpm:42 po/placeholder.h:157 urpmi:258
msgid " (Y/n) "
msgstr " (K/e) "
@@ -151,120 +151,120 @@ msgstr ""
msgid "urpmi is not installed"
msgstr "urpmi ei asennettu"
-#: po/placeholder.h:29 urpm.pm:283
+#: po/placeholder.h:29
+#, fuzzy, c-format
+msgid "reading synthesis file [%s]"
+msgstr "mediaa \"%s\" ei voida luoda\n"
+
+#: po/placeholder.h:30 urpm.pm:298
#, c-format
msgid "unable to write config file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:31
+#: po/placeholder.h:32
#, c-format
msgid "nothing to write in list file for \"%s\""
msgstr ""
-#: 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 ""
-#: po/placeholder.h:33
+#: po/placeholder.h:34
#, fuzzy, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "mediaa \"%s\" ei voida p�ivitt��\n"
-#: po/placeholder.h:34
+#: po/placeholder.h:35
#, c-format
msgid "nothing written in list file for \"%s\""
msgstr ""
-#: po/placeholder.h:35 urpm.pm:1951
-#, c-format
-msgid ""
-"removing %s to upgrade ...\n"
-" to %s since it will not upgrade correctly!"
-msgstr ""
-
-#: po/placeholder.h:39 urpm.pm:839
+#: po/placeholder.h:36 urpm.pm:845
#, c-format
msgid "read provides file [%s]"
msgstr ""
-#: po/placeholder.h:40
-#, fuzzy, c-format
-msgid "trying to remove inexistant medium \"%s\""
-msgstr "mediaa \"%s\" ei voida luoda\n"
-
-#: po/placeholder.h:41 urpm.pm:1692
+#: po/placeholder.h:37 urpm.pm:1549
#, c-format
msgid "package %s is not found."
msgstr ""
-#: po/placeholder.h:42
-#, c-format
-msgid "unable to copy source of [%s] from [%s]"
-msgstr ""
-
-#: po/placeholder.h:43 urpm.pm:870
+#: po/placeholder.h:38 urpm.pm:876
#, fuzzy, c-format
msgid "unable to write compss file [%s]"
msgstr "mediaa \"%s\" ei voida luoda\n"
-#: po/placeholder.h:44 urpm.pm:813
+#: po/placeholder.h:39 urpm.pm:819
#, c-format
msgid "unmounting %s"
msgstr ""
-#: po/placeholder.h:45
+#: po/placeholder.h:40
#, c-format
msgid "removing %d obsolete headers in cache"
msgstr ""
-#: 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 ""
-#: 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 ""
+
+#: po/placeholder.h:43 urpm.pm:184
+#, c-format
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+
+#: po/placeholder.h:44 urpm.pm:191
#, c-format
msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
msgstr ""
-#: po/placeholder.h:48
+#: po/placeholder.h:45
msgid "keeping only files referenced in provides"
msgstr ""
-#: po/placeholder.h:49
+#: po/placeholder.h:46
#, fuzzy, c-format
msgid "unable to build synthesis file for medium \"%s\""
msgstr "mediaa \"%s\" ei voida p�ivitt��\n"
-#: po/placeholder.h:50
+#: po/placeholder.h:47
#, c-format
msgid "found %d headers in cache"
msgstr ""
-#: po/placeholder.h:51 urpm.pm:836
+#: po/placeholder.h:48 urpm.pm:842
#, fuzzy, c-format
msgid "unable to read provides file [%s]"
msgstr "mediaa \"%s\" ei voida luoda\n"
-#: 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 ""
-#: po/placeholder.h:53 urpm.pm:311
+#: po/placeholder.h:50
#, c-format
-msgid "medium \"%s\" already exists"
+msgid ""
+"removing %s to upgrade to %s ...\n"
+" since it will not be updated otherwise"
msgstr ""
-#: po/placeholder.h:54 urpm.pm:295
+#: po/placeholder.h:54 urpm.pm:326
#, c-format
-msgid "write config file [%s]"
+msgid "medium \"%s\" already exists"
msgstr ""
#: po/placeholder.h:55
@@ -272,172 +272,186 @@ msgstr ""
msgid "unable to write list file of \"%s\""
msgstr "mediaa \"%s\" ei voida luoda\n"
-#: po/placeholder.h:56 urpm.pm:1817
-#, c-format
-msgid "retrieving [%s]"
-msgstr ""
-
-#: po/placeholder.h:57 urpm.pm:1819
+#: po/placeholder.h:56 urpm.pm:310
#, c-format
-msgid "wget of [%s] failed"
+msgid "write config file [%s]"
msgstr ""
-#: po/placeholder.h:58 urpm.pm:1101
+#: po/placeholder.h:57 urpm.pm:1107
#, c-format
msgid "no package named %s"
msgstr ""
-#: po/placeholder.h:59 urpm.pm:848
+#: po/placeholder.h:58 urpm.pm:854
#, fuzzy, c-format
msgid "unable to read compss file [%s]"
msgstr "mediaa \"%s\" ei voida luoda\n"
-#: 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 ""
-#: po/placeholder.h:61
+#: po/placeholder.h:60
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr ""
-#: po/placeholder.h:62
+#: po/placeholder.h:61
msgid "computing dependencies"
msgstr ""
-#: po/placeholder.h:63 urpm.pm:868
+#: po/placeholder.h:62
+#, c-format
+msgid "retrieve of [%s] failed"
+msgstr ""
+
+#: po/placeholder.h:63 urpm.pm:874
#, c-format
msgid "write provides file [%s]"
msgstr ""
-#: po/placeholder.h:64 urpm.pm:803
+#: po/placeholder.h:64 urpm.pm:809
#, fuzzy, c-format
msgid "mounting %s"
msgstr "asennan %s\n"
-#: 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 "
"medium"
msgstr ""
-#: po/placeholder.h:66 urpm.pm:148
-#, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
-msgstr ""
-
-#: po/placeholder.h:67
+#: po/placeholder.h:66
#, c-format
msgid "reading hdlist file [%s]"
msgstr ""
-#: po/placeholder.h:68 urpm.pm:873
+#: po/placeholder.h:67 urpm.pm:879
#, c-format
msgid "write compss file [%s]"
msgstr ""
-#: po/placeholder.h:69 urpm.pm:827
+#: po/placeholder.h:68 urpm.pm:833
#, c-format
msgid "read depslist file [%s]"
msgstr ""
-#: po/placeholder.h:70
+#: 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 "trying to select inexistant medium \"%s\""
+msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "mediaa \"%s\" ei voida luoda\n"
-#: po/placeholder.h:71 urpm.pm:1812
+#: po/placeholder.h:71 urpm.pm:1668
#, c-format
msgid "malformed input: [%s]"
msgstr ""
-#: 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"
+msgid "there are multiple packages with the same rpm filename \"%s\""
msgstr ""
-#: 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 ""
-#: po/placeholder.h:77 urpm.pm:865
+#: po/placeholder.h:74 urpm.pm:871
#, fuzzy, c-format
msgid "unable to write provides file [%s]"
msgstr "mediaa \"%s\" ei voida luoda\n"
-#: 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 ""
-#: po/placeholder.h:79 urpm.pm:1005
+#: po/placeholder.h:76 urpm.pm:1215
+#, fuzzy
+msgid "unable to find all synthesis file, using parsehdlist server"
+msgstr "mediaa \"%s\" ei voida p�ivitt��\n"
+
+#: po/placeholder.h:77 urpm.pm:1011
#, fuzzy
msgid "unable to register rpm file"
msgstr "mediaa \"%s\" ei voida luoda\n"
-#: po/placeholder.h:80 urpm.pm:1362
-msgid "unable to find all synthesis file, using parsehdlist server"
+#: po/placeholder.h:78 urpm.pm:256
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
msgstr ""
-#: po/placeholder.h:81 urpm.pm:241
+#: po/placeholder.h:79 urpm.pm:272
#, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "too many mount points for removable medium \"%s\""
msgstr ""
-#: po/placeholder.h:82 urpm.pm:233
+#: po/placeholder.h:80 urpm.pm:248
#, c-format
msgid "incoherent list file for \"%s\", medium ignored"
msgstr ""
-#: po/placeholder.h:83
+#: po/placeholder.h:81
#, c-format
msgid "copy of [%s] failed"
msgstr ""
-#: po/placeholder.h:84 urpm.pm:907 urpm.pm:1338 urpm.pm:1616 urpm.pm:1623
+#: po/placeholder.h:82
+#, fuzzy, c-format
+msgid "trying to remove inexistent medium \"%s\""
+msgstr "mediaa \"%s\" ei voida luoda\n"
+
+#: po/placeholder.h:83 urpm.pm:913 urpm.pm:1191 urpm.pm:1473 urpm.pm:1480
#, fuzzy, c-format
msgid "unable to parse correctly [%s]"
msgstr "mediaa \"%s\" ei voida p�ivitt��\n"
-#: po/placeholder.h:85 urpm.pm:824
+#: po/placeholder.h:84 urpm.pm:1192
#, fuzzy, c-format
-msgid "unable to read depslist file [%s]"
+msgid "read synthesis file [%s]"
msgstr "mediaa \"%s\" ei voida luoda\n"
-#: po/placeholder.h:86
-msgid "removable medium not selected"
-msgstr ""
+#: po/placeholder.h:85 urpm.pm:830
+#, fuzzy, c-format
+msgid "unable to read depslist file [%s]"
+msgstr "mediaa \"%s\" ei voida luoda\n"
-#: po/placeholder.h:87 urpm.pm:851
+#: po/placeholder.h:86 urpm.pm:857
#, c-format
msgid "read compss file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:89
+#: po/placeholder.h:88
#, c-format
msgid "building hdlist [%s]"
msgstr ""
-#: po/placeholder.h:90 urpm.pm:1746
+#: po/placeholder.h:89 urpm.pm:1603
#, fuzzy, c-format
msgid "unable to read rpm file [%s] from medium \"%s\""
msgstr "mediaa \"%s\" ei voida luoda\n"
-#: po/placeholder.h:91 urpm.pm:1009
+#: po/placeholder.h:90 urpm.pm:1015
msgid "error registering local packages"
msgstr ""
-#: 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 ""
@@ -447,215 +461,267 @@ msgstr ""
msgid "unable to build hdlist: %s"
msgstr "mediaa \"%s\" ei voida p�ivitt��\n"
-#: po/placeholder.h:94 urpm.pm:1000
-#, c-format
-msgid "invalid rpm file name [%s]"
-msgstr ""
-
-#: po/placeholder.h:95 urpm.pm:1736 urpm.pm:1739 urpm.pm:1758
+#: po/placeholder.h:94 urpm.pm:1593 urpm.pm:1596 urpm.pm:1615
#, c-format
msgid "medium \"%s\" is not selected"
msgstr ""
-#: po/placeholder.h:96 urpm.pm:207
+#: po/placeholder.h:95 urpm.pm:1006
#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "invalid rpm file name [%s]"
msgstr ""
-#: po/placeholder.h:97 urpm.pm:863
+#: po/placeholder.h:96 urpm.pm:1175
#, c-format
-msgid "write depslist file [%s]"
+msgid "unknown data associated with %s"
msgstr ""
-#: po/placeholder.h:98 urpm.pm:1322
+#: po/placeholder.h:97 urpm.pm:222
#, c-format
-msgid "unknown data associated with %s"
+msgid "trying to bypass existing medium \"%s\", avoiding"
msgstr ""
-#: po/placeholder.h:99
+#: po/placeholder.h:98 urpm.pm:869
#, c-format
-msgid "source of [%s] not found as [%s]"
+msgid "write depslist file [%s]"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: po/placeholder.h:102
-#, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
-msgstr ""
-
-#: po/placeholder.h:103 urpm.pm:1001
+#: po/placeholder.h:101 urpm.pm:1007
#, fuzzy, c-format
msgid "unable to access rpm file [%s]"
msgstr "mediaa \"%s\" ei voida luoda\n"
-#: po/placeholder.h:104 urpm.pm:860
+#: po/placeholder.h:102 urpm.pm:866
#, fuzzy, c-format
msgid "unable to write depslist file [%s]"
msgstr "mediaa \"%s\" ei voida luoda\n"
-#: po/placeholder.h:105 urpm.pm:327 urpm.pm:1773
+#: po/placeholder.h:103
+#, 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
#, fuzzy, c-format
msgid "unable to access medium \"%s\""
msgstr "mediaa \"%s\" ei voida p�ivitt��\n"
-#: po/placeholder.h:106 urpm.pm:988
+#: po/placeholder.h:108 urpm.pm:994
#, c-format
msgid "relocated %s entries in depslist"
msgstr ""
-#: po/placeholder.h:107 urpm.pm:914 urpm.pm:1629 urpm.pm:1680
-#, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
+#: po/placeholder.h:109
+#, fuzzy, c-format
+msgid "trying to select inexistent medium \"%s\""
+msgstr "mediaa \"%s\" ei voida luoda\n"
+
+#: po/placeholder.h:110 urpm.pm:97
+msgid "wget failed\n"
msgstr ""
-#: 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]"
+msgid "unable to parse correctly [%s] on value \"%s\""
msgstr ""
-#: po/placeholder.h:109 urpm.pm:1104
+#: po/placeholder.h:112 urpm.pm:1110
#, fuzzy, c-format
msgid "The following packages contain %s: %s"
msgstr "Yksi seuraavista paketeista tarvitaan:"
-#: 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\""
+msgid "no rpm files found from [%s]"
msgstr ""
-#: po/placeholder.h:111 urpm.pm:1920
+#: po/placeholder.h:114 urpm.pm:1772
#, c-format
msgid "selecting %s using obsoletes"
msgstr ""
-#: po/placeholder.h:112 urpm.pm:2031
+#: po/placeholder.h:115 urpm.pm:1888
#, c-format
msgid "selecting %s by selection on files"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:114 urpmi:308 urpmi:315 urpmi:328 urpmi:339 urpmi:352
-msgid "Installation failed"
-msgstr "Asennus ep�onnistui"
-
-#: po/placeholder.h:115 urpmi:279
-msgid "Press enter when it's done..."
-msgstr "Paina enteri� tehty�si sen..."
+#: po/placeholder.h:120
+msgid " --help - print this help message.\n"
+msgstr ""
-#: po/placeholder.h:117 urpmi:201
-msgid "Sorry, bad choice, try again\n"
-msgstr "Virheellinen valinta, yrit� uudelleen\n"
+#: po/placeholder.h:121 urpmi:361
+msgid "everything already installed"
+msgstr "kaikki on jo asennettu"
-#: po/placeholder.h:120
+#: po/placeholder.h:122 urpmi:98
#, fuzzy, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr ""
+"urpmq: tuntematon parametri \"-$1\", tarkista ohjelman k�ytt�: --help\n"
+
+#: po/placeholder.h:123 urpmi:194
+msgid "One of the following packages is needed:"
+msgstr "Yksi seuraavista paketeista tarvitaan:"
+
+#: po/placeholder.h:124 po/placeholder.h:222
+msgid " --update - use only update media.\n"
+msgstr ""
+
+#: po/placeholder.h:125 urpmi:299
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"
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
msgstr ""
-"urpmi versio %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"T�m� on vapaan l�hdekoodin ohjelmisto ja levitett�viss� GNU-lisenssin "
-"ehdoilla.\n"
-"k�ytt�:\n"
-" --help - tulosta t�m� ohje.\n"
-" --auto - valitse valintaruudussa automaattisesti hyv�t paketit.\n"
-" --auto-select - valitse automaattisesti j�rjestelm�n p�ivityspaketit.\n"
-" --force - pakota asentamaan jopa silloin kun jotakin pakettia ei "
-"ole olemassa.\n"
-" --X - k�yt� X-liittym��.\n"
-" --best-output - valitse nykyisen ymp�rist�n paras k�ytt�liittym�:\n"
-" X tai tekstitila.\n"
-" -a - valitse kaikki komentorivin kanssa sopivat "
-"vaihtoehdot.\n"
-" -m - valitse pienin tarvittavien komponenttien sulkeuma "
-"(vakio).\n"
-" -M - valitse suurin tarvittavien komponenttien sulkeuma.\n"
-" -c - valitse t�ydellinen metodi sulkeumien selvitt�miseksi.\n"
-" -q - hiljainen tila.\n"
-" -v - monisanainen tila.\n"
-" komentorivill� annetut nimet tai rpm-tiedostot asennetaan (vain "
-"p��k�ytt�j�n�).\n"
-
-#: po/placeholder.h:142 urpmi:362
-msgid "everything already installed"
-msgstr "kaikki on jo asennettu"
-#: po/placeholder.h:143 urpmi:247
+#: 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 "Asennus ep�onnistui"
+
+#: po/placeholder.h:132 po/placeholder.h:234
+msgid ""
+" --auto-select - automatically select packages for upgrading the system.\n"
+msgstr ""
+
+#: po/placeholder.h:134
+msgid " --X - use X interface.\n"
+msgstr ""
+
+#: po/placeholder.h:135 urpmi:247
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
"d MB)"
msgstr "Riippuvuuksien t�ytt�miseksi seuraavat paketit asennetaan (%d Mt)"
-#: po/placeholder.h:144 urpmi:296
-#, c-format
-msgid "installing %s\n"
-msgstr "asennan %s\n"
+#: po/placeholder.h:136 urpmi:320 urpmi:344
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Yrit� asentaa ilman riippuvuuksia? (k/E) "
+
+#: 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
+msgid " -q - quiet mode.\n"
+msgstr ""
-#: po/placeholder.h:145 urpmi:198
+#: po/placeholder.h:144 urpmi:202
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Mik� on valintasi? (1-%d)"
-#: po/placeholder.h:146 urpmi:321 urpmi:345
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Yrit� asentaa ilman riippuvuuksia? (k/E) "
+#: po/placeholder.h:145
+msgid " --wget - use wget to retrieve distant files.\n"
+msgstr ""
-#: po/placeholder.h:147 urpmi:190
-msgid "One of the following packages is needed:"
-msgstr "Yksi seuraavista paketeista tarvitaan:"
+#: po/placeholder.h:146
+#, 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"
+msgstr ""
+
+#: po/placeholder.h:152 urpmi:328 urpmi:352
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Yrit� asentaa pakolla (--force)? (k/E) "
+
+#: po/placeholder.h:154
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+
+#: po/placeholder.h:155 urpmi:205
+msgid "Sorry, bad choice, try again\n"
+msgstr "Virheellinen valinta, yrit� uudelleen\n"
+
+#: po/placeholder.h:156
+msgid ""
+" names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: po/placeholder.h:158
+msgid " -a - select all matches on command line.\n"
+msgstr ""
+
+#: 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 "asennan %s\n"
-#: po/placeholder.h:148 urpmi:149
+#: po/placeholder.h:161 urpmi:152
msgid "Only superuser is allowed to install local packages"
msgstr "Vain p��k�ytt�j� saa asentaa paikallisia paketteja"
-#: 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 "Aseta media nimelt��n \"%s\" laitteeseen [%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 "l�hteen paketteja ei saada, toiminto keskeytet��n"
-#: po/placeholder.h:151 urpmi:329 urpmi:353
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Yrit� asentaa pakolla (--force)? (k/E) "
+#: po/placeholder.h:165 urpmi:102
+#, fuzzy
+msgid "Only superuser is allowed to install packages"
+msgstr "Vain p��k�ytt�j� saa asentaa paikallisia paketteja"
+
+#: po/placeholder.h:166 urpmi:193
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Yksi seuraavista paketeista tarvitaan:"
-#: po/placeholder.h:155 urpmi.addmedia:46
+#: po/placeholder.h:167 urpmi:277
+msgid "Press Enter when it's done..."
+msgstr "Paina enteri� tehty�si sen..."
+
+#: po/placeholder.h:168 urpmi.addmedia:46
#, c-format
msgid ""
"%s\n"
@@ -664,7 +730,7 @@ msgstr ""
"%s\n"
"ftp-median kohta \"with\" puuttuu\n"
-#: po/placeholder.h:159
+#: po/placeholder.h:172
msgid ""
"usage: urpmi.addmedia [--update] <name> <url>\n"
"where <url> is one of\n"
@@ -684,17 +750,17 @@ msgstr ""
" http://<kone>/<polku> with <hdlist-tiedoston relatiivinen nimi>\n"
" removable_<laite>://<polku>\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 "mediaa \"%s\" ei voida luoda\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 "mediaa \"%s\" ei voida p�ivitt��\n"
-#: po/placeholder.h:170 urpmi.addmedia:42
+#: po/placeholder.h:183 urpmi.addmedia:42
#, c-format
msgid ""
"%s\n"
@@ -703,7 +769,7 @@ msgstr ""
"%s\n"
"laite `%s' ei ole olemassa\n"
-#: po/placeholder.h:174 urpmi.addmedia:44
+#: po/placeholder.h:187 urpmi.addmedia:44
#, c-format
msgid ""
"%s\n"
@@ -712,7 +778,7 @@ msgstr ""
"%s\n"
"<hdlist:in relatiivinen polku> puuttuu\n"
-#: po/placeholder.h:178
+#: po/placeholder.h:191
#, fuzzy, c-format
msgid ""
"usage: urpmi.update [-a] <name> ...\n"
@@ -729,11 +795,11 @@ msgstr ""
"\n"
"tuntemattomia parametrej� '%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 "ei mit��n p�ivitett�v�� (k�yt� urpmi.addmedia lis��ksesi median)\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"
@@ -742,11 +808,11 @@ msgstr ""
"P�ivitett�v� kohta puuttuu\n"
"(yksi seuraavista: %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 "ei mit��n poistettavaa (k�yt� urpmi.addmedia lis��ksesi median)\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"
@@ -755,7 +821,7 @@ msgstr ""
"Poistettava kohta puuttuu\n"
"(yksi seuraavista: %s)\n"
-#: po/placeholder.h:197
+#: po/placeholder.h:210
#, c-format
msgid ""
"usage: urpmi.removemedia [-a] <name> ...\n"
@@ -770,18 +836,11 @@ msgstr ""
"\n"
"tuntemattomia parametrej� '%s'\n"
-#: po/placeholder.h:204 urpmq:85
-#, fuzzy, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: ei voida lukea rpm-tiedostoa \"$_\"\n"
-
-#: po/placeholder.h:206 urpmq:82
-#, fuzzy, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#: po/placeholder.h:217
+msgid " -h - print this help message.\n"
msgstr ""
-"urpmq: tuntematon parametri \"-$1\", tarkista ohjelman k�ytt�: --help\n"
-#: 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"
@@ -789,7 +848,28 @@ msgstr ""
"jotkin paketit pit�� poistaa ohjelmiston p�ivitt�miseksi, t�t� toimintoa ei "
"tueta viel�\n"
-#: po/placeholder.h:208
+#: po/placeholder.h:219
+msgid " -g - print groups too with name.\n"
+msgstr ""
+
+#: po/placeholder.h:220 urpmq:84
+#, fuzzy, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: ei voida lukea rpm-tiedostoa \"$_\"\n"
+
+#: po/placeholder.h:221
+msgid " names or rpm files given on command line are queried.\n"
+msgstr ""
+
+#: po/placeholder.h:223
+msgid " -r - print version and release too with name.\n"
+msgstr ""
+
+#: po/placeholder.h:224
+msgid " -f - print version, release and arch with name.\n"
+msgstr ""
+
+#: po/placeholder.h:225
#, c-format
msgid ""
"urpmq version %s\n"
@@ -797,80 +877,71 @@ msgid ""
"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"
+msgstr ""
+
+#: po/placeholder.h:231
+msgid " -d - extend query to package dependencies.\n"
+msgstr ""
+
+#: po/placeholder.h:232
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
+msgstr ""
+
+#: po/placeholder.h:233
+msgid ""
" -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"
+msgstr ""
+
+#: po/placeholder.h:235 urpmq:81
+#, fuzzy, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr ""
+"urpmq: tuntematon parametri \"-$1\", tarkista ohjelman k�ytt�: --help\n"
+
+#: po/placeholder.h:236
+msgid ""
" --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 package do not exist.\n"
-" names or rpm files given on command line are queried.\n"
msgstr ""
-#: urpm.pm:257
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:243
+msgid ""
+" -u - remove package if a better version is already installed.\n"
msgstr ""
-#: urpm.pm:258
-#, c-format
-msgid "taking removable device as \"%s\""
+#: po/placeholder.h:244
+msgid ""
+" --force - force invocation even if some packages do not\n"
+"exist.\n"
msgstr ""
-#: urpm.pm:262
+#: urpm.pm:1796 urpm.pm:1805
#, c-format
-msgid "using different removable device [%s] for \"%s\""
+msgid "removing %s to upgrade to %s ..."
msgstr ""
-#: urpm.pm:266 urpm.pm:269
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "mediaa \"%s\" ei voida luoda\n"
+#: urpm.pm:1797 urpm.pm:1806
+msgid ", $otherPackage, "
+msgstr ", $otherPackage, "
-#: urpm.pm:1339
-#, fuzzy, c-format
-msgid "read synthesis file [%s]"
-msgstr "mediaa \"%s\" ei voida luoda\n"
+#: urpm.pm:1797 urpm.pm:1806
+msgid "));"
+msgstr "));"
-#: urpmi:49
+#: urpm.pm:1802
+msgid "$p->{name}-$p->{version}-$p->{release}"
+msgstr "$p->{name}-$p->{version}-$p->{release}"
+
+#: urpm.pm:1812
+msgid "$prefix/$_"
+msgstr "$prefix/$_"
+
+#: urpmi:48
#, c-format
msgid "urpmi version %s"
msgstr "urpmi versio %s"
-#: urpmi:98
-#, fuzzy, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-"urpmq: tuntematon parametri \"-$1\", tarkista ohjelman k�ytt�: --help\n"
-
-#: urpmi:102
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr "Vain p��k�ytt�j� saa asentaa paikallisia paketteja"
-
-#: urpmi:189
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Yksi seuraavista paketeista tarvitaan:"
-
-#: urpmi:301
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
-msgstr ""
-
#: urpmi.addmedia:30
#, fuzzy
msgid "usage: urpmi.addmedia [--update] <name> <url>"
@@ -902,8 +973,60 @@ msgstr ", $_);"
msgid "urpmq version %s"
msgstr "urpmq versio %s"
-#~ msgid "));"
-#~ msgstr "));"
+#, fuzzy
+#~ 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 ""
+#~ "urpmi versio %s\n"
+#~ "Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+#~ "T�m� on vapaan l�hdekoodin ohjelmisto ja levitett�viss� GNU-lisenssin "
+#~ "ehdoilla.\n"
+#~ "k�ytt�:\n"
+#~ " --help - tulosta t�m� ohje.\n"
+#~ " --auto - valitse valintaruudussa automaattisesti hyv�t "
+#~ "paketit.\n"
+#~ " --auto-select - valitse automaattisesti j�rjestelm�n "
+#~ "p�ivityspaketit.\n"
+#~ " --force - pakota asentamaan jopa silloin kun jotakin pakettia "
+#~ "ei ole olemassa.\n"
+#~ " --X - k�yt� X-liittym��.\n"
+#~ " --best-output - valitse nykyisen ymp�rist�n paras k�ytt�liittym�:\n"
+#~ " X tai tekstitila.\n"
+#~ " -a - valitse kaikki komentorivin kanssa sopivat "
+#~ "vaihtoehdot.\n"
+#~ " -m - valitse pienin tarvittavien komponenttien sulkeuma "
+#~ "(vakio).\n"
+#~ " -M - valitse suurin tarvittavien komponenttien sulkeuma.\n"
+#~ " -c - valitse t�ydellinen metodi sulkeumien "
+#~ "selvitt�miseksi.\n"
+#~ " -q - hiljainen tila.\n"
+#~ " -v - monisanainen tila.\n"
+#~ " komentorivill� annetut nimet tai rpm-tiedostot asennetaan (vain "
+#~ "p��k�ytt�j�n�).\n"
#~ msgid "), $_);"
#~ msgstr "), $_);"
diff --git a/po/fr.po b/po/fr.po
index 822055ef..23a6c058 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,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-11-21 21:01+0100\n"
"Last-Translator: David BAUDENS <baudens@mandrakesoft.com>\n"
"Language-Team: French\n"
@@ -29,27 +29,27 @@ msgstr ""
"Installation automatique des packages...\n"
"Vous avez demand� l'installation du paquetage $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 "Est-ce correct ?"
-#: _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 "Annuler"
-#: _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 "Nn"
-#: _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 "OoYy"
-#: _irpm:42 po/placeholder.h:118 urpmi:258
+#: _irpm:42 po/placeholder.h:157 urpmi:258
msgid " (Y/n) "
msgstr " (O/n) "
@@ -168,303 +168,315 @@ msgstr "essayez urpmf --help pour plus d'options"
msgid "urpmi is not installed"
msgstr "urpmi n'est pas install�"
-#: po/placeholder.h:29 urpm.pm:283
+#: po/placeholder.h:29
+#, fuzzy, c-format
+msgid "reading synthesis file [%s]"
+msgstr "lit le fichier de synthese [%s]"
+
+#: po/placeholder.h:30 urpm.pm:298
#, c-format
msgid "unable to write config file [%s]"
msgstr "impossible d'�crire le fichier de configuration [%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"
-msgstr ""
-"impossible d'utiliser le nom \"%s\" pour le m�dia non nomm� car ce nom est "
-"d�j� utilis�"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "utilisation de diff�rents p�riph�riques amovibles [%s] pour \"%s\""
-#: po/placeholder.h:31
+#: po/placeholder.h:32
#, c-format
msgid "nothing to write in list file for \"%s\""
msgstr "rien � �crire dans le fichier liste pour \"%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 "impossible de trouver le fichier list de \"%s\", m�dia ignor�"
-#: po/placeholder.h:33
+#: po/placeholder.h:34
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "impossible d'analyser le fichier hdlist de \"%s\""
-#: po/placeholder.h:34
+#: po/placeholder.h:35
#, c-format
msgid "nothing written in list file for \"%s\""
msgstr "rien n'a �t� �crit dans le fichier-liste pour [%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 ""
-" %s est enlev� pour mettre a jour ...\n"
-" ver %s car il ne peut etre mis a jour correctement!"
-
-#: po/placeholder.h:39 urpm.pm:839
+#: po/placeholder.h:36 urpm.pm:845
#, c-format
msgid "read provides file [%s]"
msgstr "lit le fichier provides [%s]"
-#: po/placeholder.h:40
-#, c-format
-msgid "trying to remove inexistant medium \"%s\""
-msgstr "essaye d'enlever le m�dia inexistant \"%s\""
-
-#: po/placeholder.h:41 urpm.pm:1692
+#: po/placeholder.h:37 urpm.pm:1549
#, c-format
msgid "package %s is not found."
msgstr "paquetage %s non trouv�"
-#: po/placeholder.h:42
-#, c-format
-msgid "unable to copy source of [%s] from [%s]"
-msgstr "impossible de copier la source de [%s] depuis [%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 "impossible d'�crire le fichier compss [%s]"
-#: po/placeholder.h:44 urpm.pm:813
+#: po/placeholder.h:39 urpm.pm:819
#, c-format
msgid "unmounting %s"
msgstr "d�montage de %s"
-#: po/placeholder.h:45
+#: po/placeholder.h:40
#, c-format
msgid "removing %d obsolete headers in cache"
msgstr "destruction de %d en-t�tes obsoletes dans le 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 "pas de hdlist trouv� pour le m�dia \"%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 "le m�dia \"%s\" essaye d'utiliser un hdlist d�ja utilis�, m�dia ignor�"
+
+#: po/placeholder.h:43 urpm.pm:184
+#, c-format
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"impossible d'utiliser le nom \"%s\" pour le m�dia non nomm� car ce nom est "
+"d�j� utilis�"
+
+#: po/placeholder.h:44 urpm.pm:191
#, c-format
msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
msgstr ""
"impossible de prendre le m�dia \"%s\" en compte car aucun fichier-liste [%s] "
"n'existe"
-#: po/placeholder.h:48
+#: po/placeholder.h:45
msgid "keeping only files referenced in provides"
msgstr "on ne garde que les fichiers r�f�renc�s dans le fichier provides"
-#: po/placeholder.h:49
+#: po/placeholder.h:46
#, c-format
msgid "unable to build synthesis file for medium \"%s\""
msgstr "impossible de cr�er le fichier de synthese pour le media \"%s\""
-#: po/placeholder.h:50
+#: po/placeholder.h:47
#, c-format
msgid "found %d headers in cache"
msgstr "%d en-t�tes trouv� dans le 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 "impossible de lire le fichier provides [%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 ""
"�vite de s�lectionner %s car la locale de son langage n'est pas d�ja "
"s�lectionn�"
-#: 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 ""
+" %s est enlev? pour mettre a jour ...\n"
+" ver %s car il ne peut etre mis a jour autrement!"
+
+#: po/placeholder.h:54 urpm.pm:326
#, c-format
msgid "medium \"%s\" already exists"
msgstr "le m�dia \"%s\" existe d�j�"
-#: po/placeholder.h:54 urpm.pm:295
-#, c-format
-msgid "write config file [%s]"
-msgstr "�criture du fichier de configuration [%s]"
-
#: po/placeholder.h:55
#, c-format
msgid "unable to write list file of \"%s\""
msgstr "impossible d'�crire le fichier-liste \"%s\""
-#: po/placeholder.h:56 urpm.pm:1817
-#, c-format
-msgid "retrieving [%s]"
-msgstr "r�cup�ration [%s]"
-
-#: po/placeholder.h:57 urpm.pm:1819
+#: po/placeholder.h:56 urpm.pm:310
#, c-format
-msgid "wget of [%s] failed"
-msgstr "l'ex�cution wget pour [%s] a �chou�"
+msgid "write config file [%s]"
+msgstr "�criture du fichier de configuration [%s]"
-#: po/placeholder.h:58 urpm.pm:1101
+#: po/placeholder.h:57 urpm.pm:1107
#, c-format
msgid "no package named %s"
msgstr "pas de paquetage nomm� %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 "impossible de lire le fichier compss [%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 "impossible de trouver le fichier hdlist pour \"%s\", m�dia ignor�"
-#: po/placeholder.h:61
+#: po/placeholder.h:60
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "cr�� le fichier de synthese pour le m�dia \"%s\""
-#: po/placeholder.h:62
+#: po/placeholder.h:61
msgid "computing dependencies"
msgstr "calcul des d�pendances"
-#: po/placeholder.h:63 urpm.pm:868
+#: po/placeholder.h:62
+#, fuzzy, c-format
+msgid "retrieve of [%s] failed"
+msgstr "l'ex�cution wget pour [%s] a �chou�"
+
+#: po/placeholder.h:63 urpm.pm:874
#, c-format
msgid "write provides file [%s]"
msgstr "�criture du fichier provides [%s]"
-#: po/placeholder.h:64 urpm.pm:803
+#: po/placeholder.h:64 urpm.pm:809
#, c-format
msgid "mounting %s"
msgstr "montage de %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 "
"medium"
msgstr ""
-#: po/placeholder.h:66 urpm.pm:148
-#, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
-msgstr ""
-"le m�dia \"%s\" essaye d'utiliser une liste d�ja utilis�e, m�dia ignor�"
-
-#: po/placeholder.h:67
+#: po/placeholder.h:66
#, c-format
msgid "reading hdlist file [%s]"
msgstr "lecture du fichier hdlist [%s]"
-#: po/placeholder.h:68 urpm.pm:873
+#: po/placeholder.h:67 urpm.pm:879
#, c-format
msgid "write compss file [%s]"
msgstr "�criture du fichier compss [%s]"
-#: po/placeholder.h:69 urpm.pm:827
+#: po/placeholder.h:68 urpm.pm:833
#, c-format
msgid "read depslist file [%s]"
msgstr "lit le fichier depslist [%s]"
-#: po/placeholder.h:70
+#: po/placeholder.h:69 urpm.pm:103
+msgid "curl failed\n"
+msgstr ""
+
+#: po/placeholder.h:70 urpm.pm:281 urpm.pm:284
#, c-format
-msgid "trying to select inexistant medium \"%s\""
-msgstr "essaye de s�lectionner un m�dia inexistant \"%s\""
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "impossbile de d'acc�der au chemin du m�dia amovible \"%s\""
-#: po/placeholder.h:71 urpm.pm:1812
+#: po/placeholder.h:71 urpm.pm:1668
#, c-format
msgid "malformed input: [%s]"
msgstr "entr�e mal form�e: [%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 "le m�dia \"%s\" essaye d'utiliser un hdlist d�ja utilis�, m�dia ignor�"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "il y a plusieurs paquetages avec le m�me nom de fichier \"%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 ""
-" %s est enlev? pour mettre a jour ...\n"
-" ver %s car il ne peut etre mis a jour autrement!"
+"le m�dia \"%s\" essaye d'utiliser une liste d�ja utilis�e, m�dia ignor�"
-#: po/placeholder.h:77 urpm.pm:865
+#: po/placeholder.h:74 urpm.pm:871
#, c-format
msgid "unable to write provides file [%s]"
msgstr "impossible d'�crire le fichier provides [%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 "impossible d'acc�der au fichier hdlist de \"%s\", m�dia ignor�"
-#: po/placeholder.h:79 urpm.pm:1005
-msgid "unable to register rpm file"
-msgstr "impossible d'enregistrer le fichier"
-
-#: 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 "�"
-#: po/placeholder.h:81 urpm.pm:241
+#: po/placeholder.h:77 urpm.pm:1011
+msgid "unable to register rpm file"
+msgstr "impossible d'enregistrer le fichier"
+
+#: po/placeholder.h:78 urpm.pm:256
#, c-format
msgid "unable to inspect list file for \"%s\", medium ignored"
msgstr "impossible de consulter le fichier-liste pour \"%s\", m�dia ignor�"
-#: 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 "trop de points de montage pour le m�dia amovible \"%s\""
+
+#: po/placeholder.h:80 urpm.pm:248
#, c-format
msgid "incoherent list file for \"%s\", medium ignored"
msgstr "fichier de liste incoh�rent pour \"%s\", m�dia ignor�"
-#: po/placeholder.h:83
+#: po/placeholder.h:81
#, c-format
msgid "copy of [%s] failed"
msgstr "la copie de [%s] a �chou�e"
-#: 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 "essaye d'enlever le m�dia inexistant \"%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 "impossible d'analyser correctement [%s]"
-#: po/placeholder.h:85 urpm.pm:824
+#: po/placeholder.h:84 urpm.pm:1192
+#, c-format
+msgid "read synthesis file [%s]"
+msgstr "lit le fichier de synthese [%s]"
+
+#: po/placeholder.h:85 urpm.pm:830
#, c-format
msgid "unable to read depslist file [%s]"
msgstr "impossible de lire le fichier depslist [%s]"
-#: po/placeholder.h:86
-msgid "removable medium not selected"
-msgstr "m�dia amovible non s�lectionn�"
-
-#: po/placeholder.h:87 urpm.pm:851
+#: po/placeholder.h:86 urpm.pm:857
#, c-format
msgid "read compss file [%s]"
msgstr "lit le fichier compss [%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 "erreur de syntaxe dans le fichier de configuration � la ligne %s"
-#: po/placeholder.h:89
+#: po/placeholder.h:88
#, c-format
msgid "building hdlist [%s]"
msgstr "cr�ation de 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 "impossible de lire le fichier rpm [%s] depuis le m�dia \"%s\""
-#: po/placeholder.h:91 urpm.pm:1009
+#: po/placeholder.h:90 urpm.pm:1015
msgid "error registering local packages"
msgstr "erreur lors de l'enregistrement des paquetages locaux"
-#: po/placeholder.h:92 urpm.pm:1762
+#: po/placeholder.h:91 urpm.pm:273
+#, c-format
+msgid "taking removable device as \"%s\""
+msgstr "p�riph�rique du m�dia amovible pris sur \"%s\""
+
+#: po/placeholder.h:92 urpm.pm:1619
#, c-format
msgid "incoherent medium \"%s\" marked removable but not really"
msgstr "m�dia incoh�rent \"%s\" marqu� amovible mais ne l'est pas r�ellement"
@@ -474,152 +486,166 @@ msgstr "m�dia incoh�rent \"%s\" marqu� amovible mais ne l'est pas r�ellement"
msgid "unable to build hdlist: %s"
msgstr "impossible de cr�er le fichier 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 "le m�dia \"%s\" n'est pas s�lectionn�"
+
+#: po/placeholder.h:95 urpm.pm:1006
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "le nom du fichier rpm est invalide [%s]"
-#: 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 "le m�dia \"%s\" n'est pas s�lectionn�"
+msgid "unknown data associated with %s"
+msgstr "donn�e inconnue associ�e � %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 ""
-#: po/placeholder.h:97 urpm.pm:863
+#: po/placeholder.h:98 urpm.pm:869
#, c-format
msgid "write depslist file [%s]"
msgstr "�criture du fichier depslist [%s]"
-#: po/placeholder.h:98 urpm.pm:1322
-#, c-format
-msgid "unknown data associated with %s"
-msgstr "donn�e inconnue associ�e � %s"
-
-#: po/placeholder.h:99
-#, c-format
-msgid "source of [%s] not found as [%s]"
-msgstr "la source de [%s] n'est pas trouv�e sur [%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 "impossible d'acc�der au fichier-liste de \"%s\", m�dia ignor�"
-#: 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 ""
"�vite de s�lectionner %s car il n'y pas assez de fichier � mettre � jour"
-#: po/placeholder.h:102
-#, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
-msgstr ""
-"l'ex�cution wget pour [%s] a �chou� (peut-�tre wget n'est-il pas install� ?)"
-
-#: po/placeholder.h:103 urpm.pm:1001
+#: po/placeholder.h:101 urpm.pm:1007
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "impossible d'acc�der au fichier 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 "impossible d'�crire dans le fichier depslist [%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 ""
+" %s est enlev� pour mettre a jour ...\n"
+" ver %s car il ne peut etre mis a jour correctement!"
+
+#: po/placeholder.h:107 urpm.pm:342 urpm.pm:1630
#, c-format
msgid "unable to access medium \"%s\""
msgstr "impossible d'acc�der au m�dia \"%s\""
-#: po/placeholder.h:106 urpm.pm:988
+#: po/placeholder.h:108 urpm.pm:994
#, c-format
msgid "relocated %s entries in depslist"
msgstr "%s entr�es d�plac�es dans la depslist"
-#: 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 "impossible d'analyser correctement [%s] pour la valeur \"%s\""
+msgid "trying to select inexistent medium \"%s\""
+msgstr "essaye de s�lectionner un m�dia inexistant \"%s\""
+
+#: po/placeholder.h:110 urpm.pm:97
+#, fuzzy
+msgid "wget failed\n"
+msgstr "l'ex�cution wget pour [%s] a �chou�"
-#: 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 "pas de fichier rpm trouv� pour [%s]"
+msgid "unable to parse correctly [%s] on value \"%s\""
+msgstr "impossible d'analyser correctement [%s] pour la valeur \"%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 "Les paquetages suivants contiennent %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 "il y a plusieurs paquetages avec le m�me nom de fichier \"%s\""
+msgid "no rpm files found from [%s]"
+msgstr "pas de fichier rpm trouv� pour [%s]"
-#: po/placeholder.h:111 urpm.pm:1920
+#: po/placeholder.h:114 urpm.pm:1772
#, c-format
msgid "selecting %s using obsoletes"
msgstr "s�lection de %s en utilisant obsoletes"
-#: po/placeholder.h:112 urpm.pm:2031
+#: po/placeholder.h:115 urpm.pm:1888
#, c-format
msgid "selecting %s by selection on files"
msgstr "s�lection de %s par s�lection de fichiers"
-#: 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 "impossible de d�termer le m�dia de ce fichier hdlist [%s]"
-#: po/placeholder.h:114 urpmi:308 urpmi:315 urpmi:328 urpmi:339 urpmi:352
-msgid "Installation failed"
-msgstr "L'installation a �chou�e"
-
-#: po/placeholder.h:115 urpmi:279
-msgid "Press enter when it's done..."
-msgstr "Appuyez ensuite sur la touche Entr�e..."
+#: po/placeholder.h:120
+#, fuzzy
+msgid " --help - print this help message.\n"
+msgstr " --all - afficher tous les tags"
-#: po/placeholder.h:117 urpmi:201
-msgid "Sorry, bad choice, try again\n"
-msgstr "D�sol�, mauvais choix, veuillez r�essayez\n"
+#: po/placeholder.h:121 urpmi:361
+msgid "everything already installed"
+msgstr "tout est d�ja install�"
-#: po/placeholder.h:120
+#: po/placeholder.h:122 urpmi:98
#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: option \"-%s\" inconnue, v�rifiez l'usage avec --help\n"
+
+#: po/placeholder.h:123 urpmi:194
+msgid "One of the following packages is needed:"
+msgstr "Un des paquetages suivants est n�cessaire :"
+
+#: po/placeholder.h:124 po/placeholder.h:222
+msgid " --update - use only update media.\n"
+msgstr ""
+
+#: po/placeholder.h:125 urpmi:299
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"
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
msgstr ""
-#: po/placeholder.h:142 urpmi:362
-msgid "everything already installed"
-msgstr "tout est d�ja install�"
+#: 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 "L'installation a �chou�e"
+
+#: po/placeholder.h:132 po/placeholder.h:234
+msgid ""
+" --auto-select - automatically select packages for upgrading the system.\n"
+msgstr ""
+
+#: po/placeholder.h:134
+#, fuzzy
+msgid " --X - use X interface.\n"
+msgstr " --all - afficher tous les tags"
-#: po/placeholder.h:143 urpmi:247
+#: po/placeholder.h:135 urpmi:247
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -628,43 +654,109 @@ msgstr ""
"Pour satisfaire les d�pendences, les paquetages suivants vont �tre install�s "
"(%d Mo)"
-#: po/placeholder.h:144 urpmi:296
-#, c-format
-msgid "installing %s\n"
-msgstr "installation de %s\n"
+#: po/placeholder.h:136 urpmi:320 urpmi:344
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Essayer d'installer sans v�rifier les d�pendences ? (o/N) "
+
+#: 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 - afficher tous les tags"
-#: po/placeholder.h:145 urpmi:198
+#: po/placeholder.h:144 urpmi:202
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Lequel choisissez-vous ? (1-%d)"
-#: po/placeholder.h:146 urpmi:321 urpmi:345
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Essayer d'installer sans v�rifier les d�pendences ? (o/N) "
+#: po/placeholder.h:145
+msgid " --wget - use wget to retrieve distant files.\n"
+msgstr ""
-#: po/placeholder.h:147 urpmi:190
-msgid "One of the following packages is needed:"
-msgstr "Un des paquetages suivants est n�cessaire :"
+#: 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"
+msgstr ""
+"Ceci est un logiciel libre pouvant etre redistribue selon les termes de la "
+"licence GNU GPL"
-#: po/placeholder.h:148 urpmi:149
+#: po/placeholder.h:152 urpmi:328 urpmi:352
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Essayer de forcer l'installation (--force) ? (o/N) "
+
+#: po/placeholder.h:154
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+
+#: po/placeholder.h:155 urpmi:205
+msgid "Sorry, bad choice, try again\n"
+msgstr "D�sol�, mauvais choix, veuillez r�essayez\n"
+
+#: po/placeholder.h:156
+msgid ""
+" names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: po/placeholder.h:158
+msgid " -a - select all matches on command line.\n"
+msgstr ""
+
+#: 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 "installation de %s\n"
+
+#: po/placeholder.h:161 urpmi:152
msgid "Only superuser is allowed to install local packages"
msgstr ""
"Seul l'administrateur syst�me (root) peut installer des paquetages locaux"
-#: 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 "Veuillez ins�rer le support nomm� ��%s�� dans le p�riph�rique [%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 "impossible de r�cup�rer les paquetages sources, abandon"
-#: po/placeholder.h:151 urpmi:329 urpmi:353
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Essayer de forcer l'installation (--force) ? (o/N) "
+#: po/placeholder.h:165 urpmi:102
+msgid "Only superuser is allowed to install packages"
+msgstr "Seul l'administrateur syst�me (root) peut installer des paquetages"
-#: po/placeholder.h:155 urpmi.addmedia:46
+#: po/placeholder.h:166 urpmi:193
+#, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "L'un des paquetages suivants est n�cessaire pour installer %s:"
+
+#: po/placeholder.h:167 urpmi:277
+msgid "Press Enter when it's done..."
+msgstr "Appuyez ensuite sur la touche Entr�e..."
+
+#: po/placeholder.h:168 urpmi.addmedia:46
#, c-format
msgid ""
"%s\n"
@@ -673,7 +765,7 @@ msgstr ""
"%s\n"
"`with' manquant pour le m�dia ftp\n"
-#: po/placeholder.h:159
+#: po/placeholder.h:172
msgid ""
"usage: urpmi.addmedia [--update] <name> <url>\n"
"where <url> is one of\n"
@@ -693,17 +785,17 @@ msgstr ""
" http://<host>/<chemin> with <relative filename of hdlist>\n"
" removable_<p�riph�rique>://<chemin>\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 "impossbile de cr�er le m�dia \"%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 "impossible de mettre � jour le m�dia \"%s\"\n"
-#: po/placeholder.h:170 urpmi.addmedia:42
+#: po/placeholder.h:183 urpmi.addmedia:42
#, c-format
msgid ""
"%s\n"
@@ -712,7 +804,7 @@ msgstr ""
"%s\n"
"le p�riph�rique `%s' n'existe pas\n"
-#: po/placeholder.h:174 urpmi.addmedia:44
+#: po/placeholder.h:187 urpmi.addmedia:44
#, c-format
msgid ""
"%s\n"
@@ -721,7 +813,7 @@ msgstr ""
"%s\n"
"<chemin relatif de hdlist> manquant\n"
-#: po/placeholder.h:178
+#: po/placeholder.h:191
#, c-format
msgid ""
"usage: urpmi.update [-a] <name> ...\n"
@@ -733,11 +825,11 @@ msgid ""
"unknown options '%s'\n"
msgstr ""
-#: 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 "rien � mettre � jour (utiliser urpmi.addmedia pour ajouter un m�dia)\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"
@@ -746,11 +838,11 @@ msgstr ""
"l'entr�e � mettre � jour est manquante\n"
"(un parmi de %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 "rien � enlever (utiliser urpmi.addmedia pour ajouter un m�dia)\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"
@@ -759,7 +851,7 @@ msgstr ""
"L'entr�e � enlever est manquante\n"
" (l'une parmi %s)\n"
-#: po/placeholder.h:197
+#: po/placeholder.h:210
#, c-format
msgid ""
"usage: urpmi.removemedia [-a] <name> ...\n"
@@ -769,17 +861,12 @@ msgid ""
"unknown options '%s'\n"
msgstr ""
-#: po/placeholder.h:204 urpmq:85
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: impossible de lire le fichier rpm \"%s\"\n"
-
-#: po/placeholder.h:206 urpmq:82
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: option \"-%s\" inconnue, v�rifiez l'usage avec --help\n"
+#: po/placeholder.h:217
+#, fuzzy
+msgid " -h - print this help message.\n"
+msgstr " --all - afficher tous les tags"
-#: 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"
@@ -787,85 +874,101 @@ msgstr ""
"certains paquetages doivent �tre d�sinstall�s pour �tre mis � jour, ce qui "
"n'est pas encore support�\n"
-#: po/placeholder.h:208
+#: po/placeholder.h:219
+#, fuzzy
+msgid " -g - print groups too with name.\n"
+msgstr " --group - afficher le tag group: groupe"
+
+#: po/placeholder.h:220 urpmq:84
#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: impossible de lire le fichier rpm \"%s\"\n"
+
+#: po/placeholder.h:221
+msgid " names or rpm files given on command line are queried.\n"
+msgstr ""
+
+#: po/placeholder.h:223
+msgid " -r - print version and release too with name.\n"
+msgstr ""
+
+#: 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 ""
+"Ceci est un logiciel libre pouvant etre redistribue selon les termes de la "
+"licence GNU GPL"
+
+#: po/placeholder.h:231
+msgid " -d - extend query to package dependencies.\n"
+msgstr ""
+
+#: 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 ""
-#: urpm.pm:257
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "trop de points de montage pour le m�dia amovible \"%s\""
+#: po/placeholder.h:233
+msgid ""
+" -c - choose complete method for resolving requires closure.\n"
+msgstr ""
-#: urpm.pm:258
+#: po/placeholder.h:235 urpmq:81
#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "p�riph�rique du m�dia amovible pris sur \"%s\""
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: option \"-%s\" inconnue, v�rifiez l'usage avec --help\n"
-#: urpm.pm:262
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "utilisation de diff�rents p�riph�riques amovibles [%s] pour \"%s\""
+#: 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
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "impossbile de d'acc�der au chemin du m�dia amovible \"%s\""
+#: po/placeholder.h:243
+msgid ""
+" -u - remove package if a better version is already installed.\n"
+msgstr ""
-#: urpm.pm:1339
-#, c-format
-msgid "read synthesis file [%s]"
-msgstr "lit le fichier de synthese [%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 "urpmi version %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: option \"-%s\" inconnue, v�rifiez l'usage avec --help\n"
+#: urpm.pm:1797 urpm.pm:1806
+msgid ", $otherPackage, "
+msgstr ", $otherPackage, "
-#: urpmi:102
-msgid "Only superuser is allowed to install packages"
-msgstr "Seul l'administrateur syst�me (root) peut installer des paquetages"
+#: urpm.pm:1797 urpm.pm:1806
+msgid "));"
+msgstr "));"
-#: urpmi:189
-#, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "L'un des paquetages suivants est n�cessaire pour installer %s:"
+#: 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 "urpmi version %s"
#: urpmi.addmedia:30
msgid "usage: urpmi.addmedia [--update] <name> <url>"
@@ -897,6 +1000,23 @@ msgstr ", $_);"
msgid "urpmq version %s"
msgstr "urpmq version %s"
+#~ msgid "retrieving [%s]"
+#~ msgstr "r�cup�ration [%s]"
+
+#~ msgid "wget of [%s] failed (maybe wget is missing?)"
+#~ msgstr ""
+#~ "l'ex�cution wget pour [%s] a �chou� (peut-�tre wget n'est-il pas "
+#~ "install� ?)"
+
+#~ msgid "unable to copy source of [%s] from [%s]"
+#~ msgstr "impossible de copier la source de [%s] depuis [%s]"
+
+#~ msgid "removable medium not selected"
+#~ msgstr "m�dia amovible non s�lectionn�"
+
+#~ msgid "source of [%s] not found as [%s]"
+#~ msgstr "la source de [%s] n'est pas trouv�e sur [%s]"
+
#~ msgid "mismatch arch for registering rpm file"
#~ msgstr "l'architecture des paquetages � enregistrer n'est pas la bonne"
@@ -909,9 +1029,6 @@ msgstr "urpmq version %s"
#~ msgid "mismatch version for registering rpm file"
#~ msgstr "erreur de version pour le fichier rpm � enregistrer"
-#~ msgid "));"
-#~ msgstr "));"
-
#~ msgid "), $_);"
#~ msgstr "), $_);"
diff --git a/po/ga.po b/po/ga.po
index 9845833e..92df4230 100644
--- a/po/ga.po
+++ b/po/ga.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: 2000-04-06 10:25+0100\n"
"Last-Translator: Proinnsias Breathnach <breatpro@dublin.ml.com>\n"
"Language-Team: Gaeilge <ga@li.org>\n"
@@ -23,27 +23,27 @@ msgid ""
"You requested installation of package $rpm\n"
msgstr ""
-#: _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 "An bhfuil sin Ok ?"
-#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:281
+#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:279
msgid "Ok"
msgstr "Ceart go Leor"
-#: _irpm:34 po/placeholder.h:116 urpmi:252 urpmi:282
+#: _irpm:34 po/placeholder.h:119 urpmi:252 urpmi:280
msgid "Cancel"
msgstr "Cealaigh"
-#: _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 "Nn"
-#: _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 "TtYy"
-#: _irpm:42 po/placeholder.h:118 urpmi:258
+#: _irpm:42 po/placeholder.h:157 urpmi:258
msgid " (Y/n) "
msgstr " (T/n) "
@@ -146,120 +146,120 @@ msgstr ""
msgid "urpmi is not installed"
msgstr "N�l feisti� urpmi ann."
-#: po/placeholder.h:29 urpm.pm:283
+#: po/placeholder.h:29
+#, fuzzy, c-format
+msgid "reading synthesis file [%s]"
+msgstr "l�amh depslist comhad [%s]"
+
+#: po/placeholder.h:30 urpm.pm:298
#, c-format
msgid "unable to write config file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:31
+#: po/placeholder.h:32
#, c-format
msgid "nothing to write in list file for \"%s\""
msgstr ""
-#: 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 ""
-#: po/placeholder.h:33
+#: po/placeholder.h:34
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr ""
-#: po/placeholder.h:34
+#: po/placeholder.h:35
#, c-format
msgid "nothing written in list file for \"%s\""
msgstr ""
-#: po/placeholder.h:35 urpm.pm:1951
-#, c-format
-msgid ""
-"removing %s to upgrade ...\n"
-" to %s since it will not upgrade correctly!"
-msgstr ""
-
-#: po/placeholder.h:39 urpm.pm:839
+#: po/placeholder.h:36 urpm.pm:845
#, c-format
msgid "read provides file [%s]"
msgstr ""
-#: po/placeholder.h:40
+#: po/placeholder.h:37 urpm.pm:1549
#, c-format
-msgid "trying to remove inexistant medium \"%s\""
+msgid "package %s is not found."
msgstr ""
-#: po/placeholder.h:41 urpm.pm:1692
+#: po/placeholder.h:38 urpm.pm:876
#, c-format
-msgid "package %s is not found."
+msgid "unable to write compss file [%s]"
msgstr ""
-#: po/placeholder.h:42
+#: po/placeholder.h:39 urpm.pm:819
#, c-format
-msgid "unable to copy source of [%s] from [%s]"
+msgid "unmounting %s"
msgstr ""
-#: po/placeholder.h:43 urpm.pm:870
+#: po/placeholder.h:40
#, c-format
-msgid "unable to write compss file [%s]"
+msgid "removing %d obsolete headers in cache"
msgstr ""
-#: po/placeholder.h:44 urpm.pm:813
+#: po/placeholder.h:41 urpm.pm:925 urpm.pm:1491
#, c-format
-msgid "unmounting %s"
+msgid "no hdlist file found for medium \"%s\""
msgstr ""
-#: po/placeholder.h:45
+#: po/placeholder.h:42 urpm.pm:160
#, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
msgstr ""
-#: po/placeholder.h:46 urpm.pm:919 urpm.pm:1634
+#: po/placeholder.h:43 urpm.pm:184
#, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
msgstr ""
-#: po/placeholder.h:47 urpm.pm:176
+#: po/placeholder.h:44 urpm.pm:191
#, c-format
msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
msgstr ""
-#: po/placeholder.h:48
+#: po/placeholder.h:45
msgid "keeping only files referenced in provides"
msgstr ""
-#: po/placeholder.h:49
+#: po/placeholder.h:46
#, c-format
msgid "unable to build synthesis file for medium \"%s\""
msgstr ""
-#: po/placeholder.h:50
+#: po/placeholder.h:47
#, c-format
msgid "found %d headers in cache"
msgstr ""
-#: po/placeholder.h:51 urpm.pm:836
+#: po/placeholder.h:48 urpm.pm:842
#, c-format
msgid "unable to read provides file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:53 urpm.pm:311
+#: po/placeholder.h:50
#, c-format
-msgid "medium \"%s\" already exists"
+msgid ""
+"removing %s to upgrade to %s ...\n"
+" since it will not be updated otherwise"
msgstr ""
-#: po/placeholder.h:54 urpm.pm:295
+#: po/placeholder.h:54 urpm.pm:326
#, c-format
-msgid "write config file [%s]"
+msgid "medium \"%s\" already exists"
msgstr ""
#: po/placeholder.h:55
@@ -267,171 +267,184 @@ msgstr ""
msgid "unable to write list file of \"%s\""
msgstr ""
-#: po/placeholder.h:56 urpm.pm:1817
-#, c-format
-msgid "retrieving [%s]"
-msgstr ""
-
-#: po/placeholder.h:57 urpm.pm:1819
+#: po/placeholder.h:56 urpm.pm:310
#, c-format
-msgid "wget of [%s] failed"
+msgid "write config file [%s]"
msgstr ""
-#: po/placeholder.h:58 urpm.pm:1101
+#: po/placeholder.h:57 urpm.pm:1107
#, c-format
msgid "no package named %s"
msgstr "pac�iste ar bith den ainm %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 ""
-#: 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 ""
-#: po/placeholder.h:61
+#: po/placeholder.h:60
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr ""
-#: po/placeholder.h:62
+#: po/placeholder.h:61
msgid "computing dependencies"
msgstr ""
-#: po/placeholder.h:63 urpm.pm:868
+#: po/placeholder.h:62
+#, fuzzy, c-format
+msgid "retrieve of [%s] failed"
+msgstr "T�ip c�ip do [%s]"
+
+#: po/placeholder.h:63 urpm.pm:874
#, c-format
msgid "write provides file [%s]"
msgstr ""
-#: po/placeholder.h:64 urpm.pm:803
+#: po/placeholder.h:64 urpm.pm:809
#, c-format
msgid "mounting %s"
msgstr "ag feisti� %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 "
"medium"
msgstr ""
-#: po/placeholder.h:66 urpm.pm:148
-#, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
-msgstr ""
-
-#: po/placeholder.h:67
-#, c-format
+#: po/placeholder.h:66
+#, fuzzy, c-format
msgid "reading hdlist file [%s]"
-msgstr ""
+msgstr "l�amh depslist comhad [%s]"
-#: po/placeholder.h:68 urpm.pm:873
+#: po/placeholder.h:67 urpm.pm:879
#, c-format
msgid "write compss file [%s]"
msgstr ""
-#: po/placeholder.h:69 urpm.pm:827
+#: po/placeholder.h:68 urpm.pm:833
#, c-format
msgid "read depslist file [%s]"
msgstr "l�amh depslist comhad [%s]"
-#: po/placeholder.h:70
+#: po/placeholder.h:69 urpm.pm:103
+msgid "curl failed\n"
+msgstr ""
+
+#: po/placeholder.h:70 urpm.pm:281 urpm.pm:284
#, c-format
-msgid "trying to select inexistant medium \"%s\""
+msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr ""
-#: po/placeholder.h:71 urpm.pm:1812
+#: po/placeholder.h:71 urpm.pm:1668
#, c-format
msgid "malformed input: [%s]"
msgstr ""
-#: 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"
+msgid "there are multiple packages with the same rpm filename \"%s\""
msgstr ""
-#: 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 ""
-#: po/placeholder.h:77 urpm.pm:865
+#: po/placeholder.h:74 urpm.pm:871
#, c-format
msgid "unable to write provides file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:79 urpm.pm:1005
-msgid "unable to register rpm file"
+#: po/placeholder.h:76 urpm.pm:1215
+msgid "unable to find all synthesis file, using parsehdlist server"
msgstr ""
-#: po/placeholder.h:80 urpm.pm:1362
-msgid "unable to find all synthesis file, using parsehdlist server"
+#: po/placeholder.h:77 urpm.pm:1011
+msgid "unable to register rpm file"
msgstr ""
-#: po/placeholder.h:81 urpm.pm:241
+#: po/placeholder.h:78 urpm.pm:256
#, c-format
msgid "unable to inspect list file for \"%s\", medium ignored"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:83
+#: po/placeholder.h:81
#, c-format
msgid "copy of [%s] failed"
msgstr "T�ip c�ip do [%s]"
-#: po/placeholder.h:84 urpm.pm:907 urpm.pm:1338 urpm.pm:1616 urpm.pm:1623
+#: po/placeholder.h:82
#, c-format
-msgid "unable to parse correctly [%s]"
+msgid "trying to remove inexistent medium \"%s\""
msgstr ""
-#: po/placeholder.h:85 urpm.pm:824
+#: po/placeholder.h:83 urpm.pm:913 urpm.pm:1191 urpm.pm:1473 urpm.pm:1480
#, c-format
-msgid "unable to read depslist file [%s]"
+msgid "unable to parse correctly [%s]"
msgstr ""
-#: po/placeholder.h:86
-msgid "removable medium not selected"
+#: po/placeholder.h:84 urpm.pm:1192
+#, fuzzy, c-format
+msgid "read synthesis file [%s]"
+msgstr "l�amh depslist comhad [%s]"
+
+#: po/placeholder.h:85 urpm.pm:830
+#, c-format
+msgid "unable to read depslist file [%s]"
msgstr ""
-#: po/placeholder.h:87 urpm.pm:851
+#: po/placeholder.h:86 urpm.pm:857
#, c-format
msgid "read compss file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:89
+#: po/placeholder.h:88
#, c-format
msgid "building hdlist [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:91 urpm.pm:1009
+#: po/placeholder.h:90 urpm.pm:1015
msgid "error registering local packages"
msgstr ""
-#: 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 ""
@@ -441,119 +454,198 @@ msgstr ""
msgid "unable to build hdlist: %s"
msgstr ""
-#: po/placeholder.h:94 urpm.pm:1000
-#, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "T� droch ainmchomad rpm [%s]"
-
-#: po/placeholder.h:95 urpm.pm:1736 urpm.pm:1739 urpm.pm:1758
+#: po/placeholder.h:94 urpm.pm:1593 urpm.pm:1596 urpm.pm:1615
#, c-format
msgid "medium \"%s\" is not selected"
msgstr ""
-#: po/placeholder.h:96 urpm.pm:207
+#: po/placeholder.h:95 urpm.pm:1006
#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr ""
+msgid "invalid rpm file name [%s]"
+msgstr "T� droch ainmchomad rpm [%s]"
-#: po/placeholder.h:97 urpm.pm:863
+#: po/placeholder.h:96 urpm.pm:1175
#, c-format
-msgid "write depslist file [%s]"
+msgid "unknown data associated with %s"
msgstr ""
-#: po/placeholder.h:98 urpm.pm:1322
+#: po/placeholder.h:97 urpm.pm:222
#, c-format
-msgid "unknown data associated with %s"
+msgid "trying to bypass existing medium \"%s\", avoiding"
msgstr ""
-#: po/placeholder.h:99
+#: po/placeholder.h:98 urpm.pm:869
#, c-format
-msgid "source of [%s] not found as [%s]"
+msgid "write depslist file [%s]"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: po/placeholder.h:102
+#: po/placeholder.h:101 urpm.pm:1007
#, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
+msgid "unable to access rpm file [%s]"
msgstr ""
-#: po/placeholder.h:103 urpm.pm:1001
+#: po/placeholder.h:102 urpm.pm:866
#, c-format
-msgid "unable to access rpm file [%s]"
+msgid "unable to write depslist file [%s]"
msgstr ""
-#: po/placeholder.h:104 urpm.pm:860
+#: po/placeholder.h:103
#, c-format
-msgid "unable to write depslist file [%s]"
+msgid ""
+"removing %s to upgrade to %s ...\n"
+" since it will not upgrade correctly!"
msgstr ""
-#: po/placeholder.h:105 urpm.pm:327 urpm.pm:1773
+#: po/placeholder.h:107 urpm.pm:342 urpm.pm:1630
#, c-format
msgid "unable to access medium \"%s\""
msgstr ""
-#: po/placeholder.h:106 urpm.pm:988
+#: po/placeholder.h:108 urpm.pm:994
#, c-format
msgid "relocated %s entries in depslist"
msgstr ""
-#: 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\""
+msgid "trying to select inexistent medium \"%s\""
+msgstr ""
+
+#: po/placeholder.h:110 urpm.pm:97
+msgid "wget failed\n"
msgstr ""
-#: 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]"
+msgid "unable to parse correctly [%s] on value \"%s\""
msgstr ""
-#: po/placeholder.h:109 urpm.pm:1104
+#: po/placeholder.h:112 urpm.pm:1110
#, fuzzy, c-format
msgid "The following packages contain %s: %s"
msgstr "T� %s ins na pac�ist� a leanas: %s \n"
-#: po/placeholder.h:110 urpm.pm:1645 urpm.pm:1671
-#, c-format
-msgid "there are multiples packages with the same rpm filename \"%s\""
-msgstr ""
+#: po/placeholder.h:113
+#, fuzzy, c-format
+msgid "no rpm files found from [%s]"
+msgstr "T� droch ainmchomad rpm [%s]"
-#: po/placeholder.h:111 urpm.pm:1920
+#: po/placeholder.h:114 urpm.pm:1772
#, c-format
msgid "selecting %s using obsoletes"
msgstr ""
-#: po/placeholder.h:112 urpm.pm:2031
+#: po/placeholder.h:115 urpm.pm:1888
#, c-format
msgid "selecting %s by selection on files"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:114 urpmi:308 urpmi:315 urpmi:328 urpmi:339 urpmi:352
+#: po/placeholder.h:120
+msgid " --help - print this help message.\n"
+msgstr ""
+
+#: po/placeholder.h:121 urpmi:361
+msgid "everything already installed"
+msgstr "t� gach rud ann cheana f�in"
+
+#: po/placeholder.h:122 urpmi:98
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr ""
+
+#: po/placeholder.h:123 urpmi:194
+msgid "One of the following packages is needed:"
+msgstr "T� ceann de na pac�ist� seo de dh�th:"
+
+#: 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 "Theip ar feisti�"
-#: po/placeholder.h:115 urpmi:279
-msgid "Press enter when it's done..."
-msgstr "Br� Enter nuair at� sin d�anta agat..."
+#: 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 "Droch-rogha, athtrialaigh!\n"
+#: po/placeholder.h:134
+msgid " --X - use X interface.\n"
+msgstr ""
-#: 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 ""
+
+#: po/placeholder.h:136 urpmi:320 urpmi:344
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr ""
+
+#: 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
+msgid " -q - quiet mode.\n"
+msgstr ""
+
+#: po/placeholder.h:144 urpmi:202
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "C�ard � do rogha? (1-%d) "
+
+#: po/placeholder.h:145
+msgid " --wget - use wget to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:146
#, c-format
msgid ""
"urpmi version %s\n"
@@ -561,79 +653,73 @@ msgid ""
"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 ""
-#: po/placeholder.h:142 urpmi:362
-msgid "everything already installed"
-msgstr "t� gach rud ann cheana f�in"
+#: po/placeholder.h:152 urpmi:328 urpmi:352
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr ""
-#: po/placeholder.h:143 urpmi:247
-#, c-format
+#: po/placeholder.h:154
msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"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 "ag feisti� %s\n"
+#: po/placeholder.h:155 urpmi:205
+msgid "Sorry, bad choice, try again\n"
+msgstr "Droch-rogha, athtrialaigh!\n"
-#: po/placeholder.h:145 urpmi:198
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "C�ard � do rogha? (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) "
+#: 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 "T� ceann de na pac�ist� seo de dh�th:"
+#: 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 "ag feisti� %s\n"
-#: po/placeholder.h:148 urpmi:149
+#: po/placeholder.h:161 urpmi:152
msgid "Only superuser is allowed to install local packages"
msgstr ""
-#: po/placeholder.h:149 urpmi:278
+#: po/placeholder.h:162 urpmi:276
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Led' thoil ionchur an %s ainmnithe %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 ""
-#: po/placeholder.h:151 urpmi:329 urpmi:353
-msgid "Try installation even more strongly (--force)? (y/N) "
+#: po/placeholder.h:165 urpmi:102
+msgid "Only superuser is allowed to install packages"
msgstr ""
-#: po/placeholder.h:155 urpmi.addmedia:46
+#: po/placeholder.h:166 urpmi:193
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "T� ceann de na pac�ist� seo de dh�th:"
+
+#: po/placeholder.h:167 urpmi:277
+msgid "Press Enter when it's done..."
+msgstr "Br� Enter nuair at� sin d�anta agat..."
+
+#: po/placeholder.h:168 urpmi.addmedia:46
#, c-format
msgid ""
"%s\n"
"`with' missing for ftp media\n"
msgstr ""
-#: po/placeholder.h:159
+#: po/placeholder.h:172
msgid ""
"usage: urpmi.addmedia [--update] <name> <url>\n"
"where <url> is one of\n"
@@ -645,17 +731,17 @@ msgid ""
" removable_<device>://<path>\n"
msgstr ""
-#: po/placeholder.h:168 urpmi.addmedia:57
+#: po/placeholder.h:181 urpmi.addmedia:57
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr ""
-#: po/placeholder.h:169 urpmi.addmedia:58
+#: po/placeholder.h:182 urpmi.addmedia:58
#, c-format
msgid "unable to update medium \"%s\"\n"
msgstr ""
-#: po/placeholder.h:170 urpmi.addmedia:42
+#: po/placeholder.h:183 urpmi.addmedia:42
#, c-format
msgid ""
"%s\n"
@@ -664,14 +750,14 @@ msgstr ""
"%s\n"
"N�l aon gairead `%s'\n"
-#: po/placeholder.h:174 urpmi.addmedia:44
+#: po/placeholder.h:187 urpmi.addmedia:44
#, c-format
msgid ""
"%s\n"
"<relative path of hdlist> missing\n"
msgstr ""
-#: po/placeholder.h:178
+#: po/placeholder.h:191
#, c-format
msgid ""
"usage: urpmi.update [-a] <name> ...\n"
@@ -683,29 +769,29 @@ msgid ""
"unknown options '%s'\n"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:188 urpmi.update:53
+#: po/placeholder.h:201 urpmi.update:53
#, c-format
msgid ""
"the entry to update is missing\n"
"(one of %s)\n"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:193 urpmi.removemedia:46
+#: po/placeholder.h:206 urpmi.removemedia:46
#, c-format
msgid ""
"the entry to remove is missing\n"
"(one of %s)\n"
msgstr ""
-#: po/placeholder.h:197
+#: po/placeholder.h:210
#, c-format
msgid ""
"usage: urpmi.removemedia [-a] <name> ...\n"
@@ -715,23 +801,38 @@ msgid ""
"unknown options '%s'\n"
msgstr ""
-#: po/placeholder.h:204 urpmq:85
+#: po/placeholder.h:217
+msgid " -h - print this help message.\n"
+msgstr ""
+
+#: po/placeholder.h:218 urpmq:130
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+
+#: po/placeholder.h:219
+msgid " -g - print groups too with name.\n"
+msgstr ""
+
+#: po/placeholder.h:220 urpmq:84
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr ""
-#: po/placeholder.h:206 urpmq:82
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#: po/placeholder.h:221
+msgid " names or rpm files given on command line are queried.\n"
msgstr ""
-#: po/placeholder.h:207 urpmq:131
-msgid ""
-"some package have to be removed for being upgraded, this is not supported "
-"yet\n"
+#: po/placeholder.h:223
+msgid " -r - print version and release too with name.\n"
+msgstr ""
+
+#: po/placeholder.h:224
+msgid " -f - print version, release and arch with name.\n"
msgstr ""
-#: po/placeholder.h:208
+#: po/placeholder.h:225
#, c-format
msgid ""
"urpmq version %s\n"
@@ -739,77 +840,69 @@ msgid ""
"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 package do not exist.\n"
-" names or rpm files given on command line are queried.\n"
msgstr ""
-#: urpm.pm:257
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:231
+msgid " -d - extend query to package dependencies.\n"
msgstr ""
-#: urpm.pm:258
-#, c-format
-msgid "taking removable device as \"%s\""
+#: po/placeholder.h:232
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
msgstr ""
-#: urpm.pm:262
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
+#: po/placeholder.h:233
+msgid ""
+" -c - choose complete method for resolving requires closure.\n"
msgstr ""
-#: urpm.pm:266 urpm.pm:269
+#: po/placeholder.h:235 urpmq:81
#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
msgstr ""
-#: urpm.pm:1339
-#, fuzzy, c-format
-msgid "read synthesis file [%s]"
-msgstr "l�amh depslist comhad [%s]"
+#: po/placeholder.h:236
+msgid ""
+" --headers - extract headers for package listed from urpmi db to\n"
+" stdout (root only).\n"
+msgstr ""
-#: urpmi:49
-#, c-format
-msgid "urpmi version %s"
-msgstr "urpmi leagan %s"
+#: po/placeholder.h:243
+msgid ""
+" -u - remove package if a better version is already installed.\n"
+msgstr ""
-#: urpmi:98
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#: po/placeholder.h:244
+msgid ""
+" --force - force invocation even if some packages do not\n"
+"exist.\n"
msgstr ""
-#: urpmi:102
-msgid "Only superuser is allowed to install packages"
+#: urpm.pm:1796 urpm.pm:1805
+#, c-format
+msgid "removing %s to upgrade to %s ..."
msgstr ""
-#: urpmi:189
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "T� ceann de na pac�ist� seo de dh�th:"
+#: urpm.pm:1797 urpm.pm:1806
+msgid ", $otherPackage, "
+msgstr ", $otherPackage, "
-#: urpmi:301
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
-msgstr ""
+#: urpm.pm:1797 urpm.pm:1806
+msgid "));"
+msgstr "));"
+
+#: urpm.pm:1802
+msgid "$p->{name}-$p->{version}-$p->{release}"
+msgstr "$p->{name}-$p->{version}-$p->{release}"
+
+#: urpm.pm:1812
+msgid "$prefix/$_"
+msgstr "$prefix/$_"
+
+#: urpmi:48
+#, c-format
+msgid "urpmi version %s"
+msgstr "urpmi leagan %s"
#: urpmi.addmedia:30
msgid "usage: urpmi.addmedia [--update] <name> <url>"
diff --git a/po/gl.po b/po/gl.po
index ca183636..d8b4e5cf 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,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: 2000-05-09 23:50+0200\n"
"Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
"Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -24,27 +24,27 @@ msgid ""
"You requested installation of package $rpm\n"
msgstr ""
-#: _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 "�Est� ben?"
-#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:281
+#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:279
msgid "Ok"
msgstr "Aceptar"
-#: _irpm:34 po/placeholder.h:116 urpmi:252 urpmi:282
+#: _irpm:34 po/placeholder.h:119 urpmi:252 urpmi:280
msgid "Cancel"
msgstr "Cancelar"
-#: _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 "Nn"
-#: _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 "SsYy"
-#: _irpm:42 po/placeholder.h:118 urpmi:258
+#: _irpm:42 po/placeholder.h:157 urpmi:258
msgid " (Y/n) "
msgstr " (S/n) "
@@ -147,120 +147,120 @@ msgstr ""
msgid "urpmi is not installed"
msgstr ""
-#: po/placeholder.h:29 urpm.pm:283
+#: po/placeholder.h:29
+#, c-format
+msgid "reading synthesis file [%s]"
+msgstr ""
+
+#: po/placeholder.h:30 urpm.pm:298
#, c-format
msgid "unable to write config file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:31
+#: po/placeholder.h:32
#, c-format
msgid "nothing to write in list file for \"%s\""
msgstr ""
-#: 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 ""
-#: po/placeholder.h:33
+#: po/placeholder.h:34
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr ""
-#: po/placeholder.h:34
+#: po/placeholder.h:35
#, c-format
msgid "nothing written in list file for \"%s\""
msgstr ""
-#: po/placeholder.h:35 urpm.pm:1951
-#, c-format
-msgid ""
-"removing %s to upgrade ...\n"
-" to %s since it will not upgrade correctly!"
-msgstr ""
-
-#: po/placeholder.h:39 urpm.pm:839
+#: po/placeholder.h:36 urpm.pm:845
#, c-format
msgid "read provides file [%s]"
msgstr ""
-#: po/placeholder.h:40
+#: po/placeholder.h:37 urpm.pm:1549
#, c-format
-msgid "trying to remove inexistant medium \"%s\""
+msgid "package %s is not found."
msgstr ""
-#: po/placeholder.h:41 urpm.pm:1692
+#: po/placeholder.h:38 urpm.pm:876
#, c-format
-msgid "package %s is not found."
+msgid "unable to write compss file [%s]"
msgstr ""
-#: po/placeholder.h:42
+#: po/placeholder.h:39 urpm.pm:819
#, c-format
-msgid "unable to copy source of [%s] from [%s]"
+msgid "unmounting %s"
msgstr ""
-#: po/placeholder.h:43 urpm.pm:870
+#: po/placeholder.h:40
#, c-format
-msgid "unable to write compss file [%s]"
+msgid "removing %d obsolete headers in cache"
msgstr ""
-#: po/placeholder.h:44 urpm.pm:813
+#: po/placeholder.h:41 urpm.pm:925 urpm.pm:1491
#, c-format
-msgid "unmounting %s"
+msgid "no hdlist file found for medium \"%s\""
msgstr ""
-#: po/placeholder.h:45
+#: po/placeholder.h:42 urpm.pm:160
#, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
msgstr ""
-#: po/placeholder.h:46 urpm.pm:919 urpm.pm:1634
+#: po/placeholder.h:43 urpm.pm:184
#, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
msgstr ""
-#: po/placeholder.h:47 urpm.pm:176
+#: po/placeholder.h:44 urpm.pm:191
#, c-format
msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
msgstr ""
-#: po/placeholder.h:48
+#: po/placeholder.h:45
msgid "keeping only files referenced in provides"
msgstr ""
-#: po/placeholder.h:49
+#: po/placeholder.h:46
#, c-format
msgid "unable to build synthesis file for medium \"%s\""
msgstr ""
-#: po/placeholder.h:50
+#: po/placeholder.h:47
#, c-format
msgid "found %d headers in cache"
msgstr ""
-#: po/placeholder.h:51 urpm.pm:836
+#: po/placeholder.h:48 urpm.pm:842
#, c-format
msgid "unable to read provides file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:53 urpm.pm:311
+#: po/placeholder.h:50
#, c-format
-msgid "medium \"%s\" already exists"
+msgid ""
+"removing %s to upgrade to %s ...\n"
+" since it will not be updated otherwise"
msgstr ""
-#: po/placeholder.h:54 urpm.pm:295
+#: po/placeholder.h:54 urpm.pm:326
#, c-format
-msgid "write config file [%s]"
+msgid "medium \"%s\" already exists"
msgstr ""
#: po/placeholder.h:55
@@ -268,324 +268,347 @@ msgstr ""
msgid "unable to write list file of \"%s\""
msgstr ""
-#: po/placeholder.h:56 urpm.pm:1817
-#, c-format
-msgid "retrieving [%s]"
-msgstr ""
-
-#: po/placeholder.h:57 urpm.pm:1819
+#: po/placeholder.h:56 urpm.pm:310
#, c-format
-msgid "wget of [%s] failed"
+msgid "write config file [%s]"
msgstr ""
-#: po/placeholder.h:58 urpm.pm:1101
+#: po/placeholder.h:57 urpm.pm:1107
#, fuzzy, c-format
msgid "no package named %s"
msgstr "non hai ning�n paquete co nome %s\n"
-#: po/placeholder.h:59 urpm.pm:848
+#: po/placeholder.h:58 urpm.pm:854
#, c-format
msgid "unable to read compss file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:61
+#: po/placeholder.h:60
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr ""
-#: po/placeholder.h:62
+#: po/placeholder.h:61
msgid "computing dependencies"
msgstr ""
-#: po/placeholder.h:63 urpm.pm:868
+#: po/placeholder.h:62
+#, c-format
+msgid "retrieve of [%s] failed"
+msgstr ""
+
+#: po/placeholder.h:63 urpm.pm:874
#, c-format
msgid "write provides file [%s]"
msgstr ""
-#: po/placeholder.h:64 urpm.pm:803
+#: po/placeholder.h:64 urpm.pm:809
#, fuzzy, c-format
msgid "mounting %s"
msgstr "instalando %s\n"
-#: 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 "
"medium"
msgstr ""
-#: po/placeholder.h:66 urpm.pm:148
-#, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
-msgstr ""
-
-#: po/placeholder.h:67
+#: po/placeholder.h:66
#, c-format
msgid "reading hdlist file [%s]"
msgstr ""
-#: po/placeholder.h:68 urpm.pm:873
+#: po/placeholder.h:67 urpm.pm:879
#, c-format
msgid "write compss file [%s]"
msgstr ""
-#: po/placeholder.h:69 urpm.pm:827
+#: po/placeholder.h:68 urpm.pm:833
#, c-format
msgid "read depslist file [%s]"
msgstr ""
-#: po/placeholder.h:70
+#: po/placeholder.h:69 urpm.pm:103
+msgid "curl failed\n"
+msgstr ""
+
+#: po/placeholder.h:70 urpm.pm:281 urpm.pm:284
#, c-format
-msgid "trying to select inexistant medium \"%s\""
+msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr ""
-#: po/placeholder.h:71 urpm.pm:1812
+#: po/placeholder.h:71 urpm.pm:1668
#, c-format
msgid "malformed input: [%s]"
msgstr ""
-#: 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"
+msgid "there are multiple packages with the same rpm filename \"%s\""
msgstr ""
-#: 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 ""
-#: po/placeholder.h:77 urpm.pm:865
+#: po/placeholder.h:74 urpm.pm:871
#, c-format
msgid "unable to write provides file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:79 urpm.pm:1005
-msgid "unable to register rpm file"
+#: po/placeholder.h:76 urpm.pm:1215
+msgid "unable to find all synthesis file, using parsehdlist server"
msgstr ""
-#: po/placeholder.h:80 urpm.pm:1362
-msgid "unable to find all synthesis file, using parsehdlist server"
+#: po/placeholder.h:77 urpm.pm:1011
+msgid "unable to register rpm file"
msgstr ""
-#: po/placeholder.h:81 urpm.pm:241
+#: po/placeholder.h:78 urpm.pm:256
#, c-format
msgid "unable to inspect list file for \"%s\", medium ignored"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:83
+#: po/placeholder.h:81
#, c-format
msgid "copy of [%s] failed"
msgstr ""
-#: 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 ""
+
+#: 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 ""
-#: po/placeholder.h:85 urpm.pm:824
+#: po/placeholder.h:84 urpm.pm:1192
#, c-format
-msgid "unable to read depslist file [%s]"
+msgid "read synthesis file [%s]"
msgstr ""
-#: po/placeholder.h:86
-msgid "removable medium not selected"
+#: po/placeholder.h:85 urpm.pm:830
+#, c-format
+msgid "unable to read depslist file [%s]"
msgstr ""
-#: po/placeholder.h:87 urpm.pm:851
+#: po/placeholder.h:86 urpm.pm:857
#, c-format
msgid "read compss file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:89
+#: po/placeholder.h:88
#, c-format
msgid "building hdlist [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:91 urpm.pm:1009
+#: po/placeholder.h:90 urpm.pm:1015
msgid "error registering local packages"
msgstr ""
-#: po/placeholder.h:92 urpm.pm:1762
+#: po/placeholder.h:91 urpm.pm:273
#, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "taking removable device as \"%s\""
msgstr ""
-#: po/placeholder.h:93
+#: po/placeholder.h:92 urpm.pm:1619
#, c-format
-msgid "unable to build hdlist: %s"
+msgid "incoherent medium \"%s\" marked removable but not really"
msgstr ""
-#: po/placeholder.h:94 urpm.pm:1000
+#: po/placeholder.h:93
#, c-format
-msgid "invalid rpm file name [%s]"
+msgid "unable to build hdlist: %s"
msgstr ""
-#: po/placeholder.h:95 urpm.pm:1736 urpm.pm:1739 urpm.pm:1758
+#: po/placeholder.h:94 urpm.pm:1593 urpm.pm:1596 urpm.pm:1615
#, c-format
msgid "medium \"%s\" is not selected"
msgstr ""
-#: po/placeholder.h:96 urpm.pm:207
+#: po/placeholder.h:95 urpm.pm:1006
#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "invalid rpm file name [%s]"
msgstr ""
-#: po/placeholder.h:97 urpm.pm:863
+#: po/placeholder.h:96 urpm.pm:1175
#, c-format
-msgid "write depslist file [%s]"
+msgid "unknown data associated with %s"
msgstr ""
-#: po/placeholder.h:98 urpm.pm:1322
+#: po/placeholder.h:97 urpm.pm:222
#, c-format
-msgid "unknown data associated with %s"
+msgid "trying to bypass existing medium \"%s\", avoiding"
msgstr ""
-#: po/placeholder.h:99
+#: po/placeholder.h:98 urpm.pm:869
#, c-format
-msgid "source of [%s] not found as [%s]"
+msgid "write depslist file [%s]"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: po/placeholder.h:102
+#: po/placeholder.h:101 urpm.pm:1007
#, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
+msgid "unable to access rpm file [%s]"
msgstr ""
-#: po/placeholder.h:103 urpm.pm:1001
+#: po/placeholder.h:102 urpm.pm:866
#, c-format
-msgid "unable to access rpm file [%s]"
+msgid "unable to write depslist file [%s]"
msgstr ""
-#: po/placeholder.h:104 urpm.pm:860
+#: po/placeholder.h:103
#, c-format
-msgid "unable to write depslist file [%s]"
+msgid ""
+"removing %s to upgrade to %s ...\n"
+" since it will not upgrade correctly!"
msgstr ""
-#: po/placeholder.h:105 urpm.pm:327 urpm.pm:1773
+#: po/placeholder.h:107 urpm.pm:342 urpm.pm:1630
#, c-format
msgid "unable to access medium \"%s\""
msgstr ""
-#: po/placeholder.h:106 urpm.pm:988
+#: po/placeholder.h:108 urpm.pm:994
#, c-format
msgid "relocated %s entries in depslist"
msgstr ""
-#: 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\""
+msgid "trying to select inexistent medium \"%s\""
msgstr ""
-#: po/placeholder.h:108
+#: 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 "no rpm files found from [%s]"
+msgid "unable to parse correctly [%s] on value \"%s\""
msgstr ""
-#: po/placeholder.h:109 urpm.pm:1104
+#: po/placeholder.h:112 urpm.pm:1110
#, fuzzy, c-format
msgid "The following packages contain %s: %s"
msgstr "Os seguintes paquetes conte�en %s: %s\n"
-#: 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\""
+msgid "no rpm files found from [%s]"
msgstr ""
-#: po/placeholder.h:111 urpm.pm:1920
+#: po/placeholder.h:114 urpm.pm:1772
#, c-format
msgid "selecting %s using obsoletes"
msgstr ""
-#: po/placeholder.h:112 urpm.pm:2031
+#: po/placeholder.h:115 urpm.pm:1888
#, c-format
msgid "selecting %s by selection on files"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:114 urpmi:308 urpmi:315 urpmi:328 urpmi:339 urpmi:352
-msgid "Installation failed"
-msgstr "A instalaci�n fallou"
-
-#: po/placeholder.h:115 urpmi:279
-msgid "Press enter when it's done..."
-msgstr "Prema enter cando estea..."
+#: po/placeholder.h:120
+msgid " --help - print this help message.\n"
+msgstr ""
-#: po/placeholder.h:117 urpmi:201
-msgid "Sorry, bad choice, try again\n"
-msgstr "Mala elecci�n, probe de novo\n"
+#: po/placeholder.h:121 urpmi:361
+msgid "everything already installed"
+msgstr "xa est� todo instalado"
-#: po/placeholder.h:120
+#: po/placeholder.h:122 urpmi:98
#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr ""
+
+#: po/placeholder.h:123 urpmi:194
+msgid "One of the following packages is needed:"
+msgstr "Neces�tase un dos seguintes paquetes:"
+
+#: po/placeholder.h:124 po/placeholder.h:222
+msgid " --update - use only update media.\n"
+msgstr ""
+
+#: po/placeholder.h:125 urpmi:299
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"
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
msgstr ""
-#: po/placeholder.h:142 urpmi:362
-msgid "everything already installed"
-msgstr "xa est� todo instalado"
+#: 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 "A instalaci�n fallou"
+
+#: po/placeholder.h:132 po/placeholder.h:234
+msgid ""
+" --auto-select - automatically select packages for upgrading the system.\n"
+msgstr ""
+
+#: po/placeholder.h:134
+msgid " --X - use X interface.\n"
+msgstr ""
-#: po/placeholder.h:143 urpmi:247
+#: po/placeholder.h:135 urpmi:247
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -594,49 +617,113 @@ msgstr ""
"Para satisfacer as dependencias, os seguintes paquetes van ser instalados (%"
"d MB)"
-#: po/placeholder.h:144 urpmi:296
-#, c-format
-msgid "installing %s\n"
-msgstr "instalando %s\n"
+#: po/placeholder.h:136 urpmi:320 urpmi:344
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "�Probar a instalaci�n sen comprobar as dependencias? (s/N) "
+
+#: 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
+msgid " -q - quiet mode.\n"
+msgstr ""
-#: po/placeholder.h:145 urpmi:198
+#: po/placeholder.h:144 urpmi:202
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "�Cal � a s�a elecci�n? (1-%d) "
-#: po/placeholder.h:146 urpmi:321 urpmi:345
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "�Probar a instalaci�n sen comprobar as dependencias? (s/N) "
+#: po/placeholder.h:145
+msgid " --wget - use wget to retrieve distant files.\n"
+msgstr ""
-#: po/placeholder.h:147 urpmi:190
-msgid "One of the following packages is needed:"
-msgstr "Neces�tase un dos seguintes paquetes:"
+#: po/placeholder.h:146
+#, 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"
+msgstr ""
-#: po/placeholder.h:148 urpmi:149
+#: po/placeholder.h:152 urpmi:328 urpmi:352
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "�Probar a instalaci�n con menos comprobaci�ns (--force)? (s/N) "
+
+#: po/placeholder.h:154
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+
+#: po/placeholder.h:155 urpmi:205
+msgid "Sorry, bad choice, try again\n"
+msgstr "Mala elecci�n, probe de novo\n"
+
+#: po/placeholder.h:156
+msgid ""
+" names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: po/placeholder.h:158
+msgid " -a - select all matches on command line.\n"
+msgstr ""
+
+#: 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 "instalando %s\n"
+
+#: po/placeholder.h:161 urpmi:152
msgid "Only superuser is allowed to install local packages"
msgstr "S� se lle permite � superusuario instalar paquetes locais"
-#: po/placeholder.h:149 urpmi:278
+#: po/placeholder.h:162 urpmi:276
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Por favor, insira o %s nomeado %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 ""
-#: po/placeholder.h:151 urpmi:329 urpmi:353
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "�Probar a instalaci�n con menos comprobaci�ns (--force)? (s/N) "
+#: po/placeholder.h:165 urpmi:102
+#, fuzzy
+msgid "Only superuser is allowed to install packages"
+msgstr "S� se lle permite � superusuario instalar paquetes locais"
+
+#: po/placeholder.h:166 urpmi:193
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Neces�tase un dos seguintes paquetes:"
-#: po/placeholder.h:155 urpmi.addmedia:46
+#: po/placeholder.h:167 urpmi:277
+msgid "Press Enter when it's done..."
+msgstr "Prema enter cando estea..."
+
+#: po/placeholder.h:168 urpmi.addmedia:46
#, c-format
msgid ""
"%s\n"
"`with' missing for ftp media\n"
msgstr ""
-#: po/placeholder.h:159
+#: po/placeholder.h:172
msgid ""
"usage: urpmi.addmedia [--update] <name> <url>\n"
"where <url> is one of\n"
@@ -648,31 +735,31 @@ msgid ""
" removable_<device>://<path>\n"
msgstr ""
-#: po/placeholder.h:168 urpmi.addmedia:57
+#: po/placeholder.h:181 urpmi.addmedia:57
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr ""
-#: po/placeholder.h:169 urpmi.addmedia:58
+#: po/placeholder.h:182 urpmi.addmedia:58
#, c-format
msgid "unable to update medium \"%s\"\n"
msgstr ""
-#: po/placeholder.h:170 urpmi.addmedia:42
+#: po/placeholder.h:183 urpmi.addmedia:42
#, c-format
msgid ""
"%s\n"
"device `%s' do not exist\n"
msgstr ""
-#: po/placeholder.h:174 urpmi.addmedia:44
+#: po/placeholder.h:187 urpmi.addmedia:44
#, c-format
msgid ""
"%s\n"
"<relative path of hdlist> missing\n"
msgstr ""
-#: po/placeholder.h:178
+#: po/placeholder.h:191
#, c-format
msgid ""
"usage: urpmi.update [-a] <name> ...\n"
@@ -684,29 +771,29 @@ msgid ""
"unknown options '%s'\n"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:188 urpmi.update:53
+#: po/placeholder.h:201 urpmi.update:53
#, c-format
msgid ""
"the entry to update is missing\n"
"(one of %s)\n"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:193 urpmi.removemedia:46
+#: po/placeholder.h:206 urpmi.removemedia:46
#, c-format
msgid ""
"the entry to remove is missing\n"
"(one of %s)\n"
msgstr ""
-#: po/placeholder.h:197
+#: po/placeholder.h:210
#, c-format
msgid ""
"usage: urpmi.removemedia [-a] <name> ...\n"
@@ -716,23 +803,38 @@ msgid ""
"unknown options '%s'\n"
msgstr ""
-#: po/placeholder.h:204 urpmq:85
+#: po/placeholder.h:217
+msgid " -h - print this help message.\n"
+msgstr ""
+
+#: po/placeholder.h:218 urpmq:130
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+
+#: po/placeholder.h:219
+msgid " -g - print groups too with name.\n"
+msgstr ""
+
+#: po/placeholder.h:220 urpmq:84
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr ""
-#: po/placeholder.h:206 urpmq:82
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#: po/placeholder.h:221
+msgid " names or rpm files given on command line are queried.\n"
msgstr ""
-#: po/placeholder.h:207 urpmq:131
-msgid ""
-"some package have to be removed for being upgraded, this is not supported "
-"yet\n"
+#: po/placeholder.h:223
+msgid " -r - print version and release too with name.\n"
msgstr ""
-#: po/placeholder.h:208
+#: po/placeholder.h:224
+msgid " -f - print version, release and arch with name.\n"
+msgstr ""
+
+#: po/placeholder.h:225
#, c-format
msgid ""
"urpmq version %s\n"
@@ -740,77 +842,68 @@ msgid ""
"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 package do not exist.\n"
-" names or rpm files given on command line are queried.\n"
msgstr ""
-#: urpm.pm:257
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:231
+msgid " -d - extend query to package dependencies.\n"
msgstr ""
-#: urpm.pm:258
-#, c-format
-msgid "taking removable device as \"%s\""
+#: po/placeholder.h:232
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
msgstr ""
-#: urpm.pm:262
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
+#: po/placeholder.h:233
+msgid ""
+" -c - choose complete method for resolving requires closure.\n"
msgstr ""
-#: urpm.pm:266 urpm.pm:269
+#: po/placeholder.h:235 urpmq:81
#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
msgstr ""
-#: urpm.pm:1339
-#, c-format
-msgid "read synthesis file [%s]"
+#: po/placeholder.h:236
+msgid ""
+" --headers - extract headers for package listed from urpmi db to\n"
+" stdout (root only).\n"
msgstr ""
-#: urpmi:49
-#, c-format
-msgid "urpmi version %s"
+#: po/placeholder.h:243
+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 ""
-#: urpmi:98
+#: urpm.pm:1796 urpm.pm:1805
#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgid "removing %s to upgrade to %s ..."
msgstr ""
-#: urpmi:102
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr "S� se lle permite � superusuario instalar paquetes locais"
+#: urpm.pm:1797 urpm.pm:1806
+msgid ", $otherPackage, "
+msgstr ", $otherPackage, "
-#: urpmi:189
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Neces�tase un dos seguintes paquetes:"
+#: urpm.pm:1797 urpm.pm:1806
+msgid "));"
+msgstr "));"
-#: urpmi:301
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+#: urpm.pm:1802
+msgid "$p->{name}-$p->{version}-$p->{release}"
+msgstr "$p->{name}-$p->{version}-$p->{release}"
+
+#: urpm.pm:1812
+msgid "$prefix/$_"
+msgstr "$prefix/$_"
+
+#: urpmi:48
+#, c-format
+msgid "urpmi version %s"
msgstr ""
#: urpmi.addmedia:30
@@ -843,9 +936,6 @@ msgstr ", $_);"
msgid "urpmq version %s"
msgstr ""
-#~ msgid "));"
-#~ msgstr "));"
-
#~ msgid "), $_);"
#~ msgstr "), $_);"
diff --git a/po/hr.po b/po/hr.po
index 24fc2c71..83b482a5 100644
--- a/po/hr.po
+++ b/po/hr.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-09-15 11:40+CET\n"
"Last-Translator: Vlatko Kosturjak <kost@iname.com>\n"
"Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -25,27 +25,27 @@ msgstr ""
"Automatska instalacija paketa...\n"
"Zatra�ili ste instalaciju paketa $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 "Da li se sla�ete s tim?"
-#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:281
+#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:279
msgid "Ok"
msgstr "U redu"
-#: _irpm:34 po/placeholder.h:116 urpmi:252 urpmi:282
+#: _irpm:34 po/placeholder.h:119 urpmi:252 urpmi:280
msgid "Cancel"
msgstr "Odustani"
-#: _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 "Nn"
-#: _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 "YyDd"
-#: _irpm:42 po/placeholder.h:118 urpmi:258
+#: _irpm:42 po/placeholder.h:157 urpmi:258
msgid " (Y/n) "
msgstr " (D/n) "
@@ -158,176 +158,176 @@ msgstr "probajte urpmf --help za vi�e opcija"
msgid "urpmi is not installed"
msgstr "urpmi nije instaliran"
-#: po/placeholder.h:29 urpm.pm:283
+#: po/placeholder.h:29
+#, fuzzy, c-format
+msgid "reading synthesis file [%s]"
+msgstr "�itanje depslist datoteke [%s]"
+
+#: po/placeholder.h:30 urpm.pm:298
#, c-format
msgid "unable to write config file [%s]"
msgstr "ne mogu zapisati config datoteku [%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 ""
-"ne mogu koristiti \"%s\" za bezimeni medij zato �to se to ime ve� koristi"
-#: po/placeholder.h:31
+#: po/placeholder.h:32
#, c-format
msgid "nothing to write in list file for \"%s\""
msgstr "nema ni�ta za zapisati u list datoteku za \"%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 "ne mogu prona�i list datoteku za \"%s\", medij ignoriran"
-#: po/placeholder.h:33
+#: po/placeholder.h:34
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "ne mogu obraditi hdlist datoteku od \"%s\""
-#: po/placeholder.h:34
+#: po/placeholder.h:35
#, c-format
msgid "nothing written in list file for \"%s\""
msgstr "nema ni�ta za zapisati u list datoteku za \"%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 ""
-"uklanjam %s za dogradnju ...\n"
-" na %s jer ina�e ne�e biti ispravno dogra�eno!"
-
-#: po/placeholder.h:39 urpm.pm:839
+#: po/placeholder.h:36 urpm.pm:845
#, c-format
msgid "read provides file [%s]"
msgstr "�itanje provides datoteke [%s]"
-#: po/placeholder.h:40
-#, c-format
-msgid "trying to remove inexistant medium \"%s\""
-msgstr "poku�avam ukloniti nepostoje�i medij \"%s\""
-
-#: po/placeholder.h:41 urpm.pm:1692
+#: po/placeholder.h:37 urpm.pm:1549
#, c-format
msgid "package %s is not found."
msgstr "paket %s nije prona�en."
-#: po/placeholder.h:42
-#, c-format
-msgid "unable to copy source of [%s] from [%s]"
-msgstr "ne mogu kopirati izvor od [%s] iz [%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 "ne mogu zapisati compss datoteku [%s]"
-#: po/placeholder.h:44 urpm.pm:813
+#: po/placeholder.h:39 urpm.pm:819
#, c-format
msgid "unmounting %s"
msgstr "odmontiravam %s"
-#: po/placeholder.h:45
+#: po/placeholder.h:40
#, c-format
msgid "removing %d obsolete headers in cache"
msgstr "uklanjam %d zastarjelih zaglavlja u priru�noj memoriji"
-#: 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 "nije prona�ena hdlist datoteka za medij \"%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 "medij \"%s\" poku�ava koristiti ve� kori�teni hdlist, medij ignoriran"
+
+#: po/placeholder.h:43 urpm.pm:184
+#, c-format
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"ne mogu koristiti \"%s\" za bezimeni medij zato �to se to ime ve� koristi"
+
+#: po/placeholder.h:44 urpm.pm:191
#, c-format
msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
msgstr "ne mogu uzeti medij \"%s\" u ra�un po�to list datoteka [%s] ne postoji"
-#: po/placeholder.h:48
+#: po/placeholder.h:45
msgid "keeping only files referenced in provides"
msgstr "zadr�ava samo datoteke referencirane u provides"
-#: po/placeholder.h:49
+#: po/placeholder.h:46
#, c-format
msgid "unable to build synthesis file for medium \"%s\""
msgstr "ne mogu napraviti sinteznu(synthesis) datoteku za medij \"%s\""
-#: po/placeholder.h:50
+#: po/placeholder.h:47
#, c-format
msgid "found %d headers in cache"
msgstr "prona�eno %d zaglavlja u priru�noj memoriji"
-#: po/placeholder.h:51 urpm.pm:836
+#: po/placeholder.h:48 urpm.pm:842
#, c-format
msgid "unable to read provides file [%s]"
msgstr "ne mogu pro�itati provides datoteku [%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 ""
"izbjegavam odabiranje %s kao lokalnog jezika jer on zapravo nije izabran"
-#: 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 ""
+"uklanjam %s za dogradnju ...\n"
+" na %s jer se ne�e dograditi druga�ije"
+
+#: po/placeholder.h:54 urpm.pm:326
#, c-format
msgid "medium \"%s\" already exists"
msgstr "medij \"%s\" ve� postoji"
-#: po/placeholder.h:54 urpm.pm:295
-#, c-format
-msgid "write config file [%s]"
-msgstr "zapisana config datoteka [%s]"
-
#: po/placeholder.h:55
#, c-format
msgid "unable to write list file of \"%s\""
msgstr "ne mogu zapisati list datoteku za \"%s\""
-#: po/placeholder.h:56 urpm.pm:1817
+#: po/placeholder.h:56 urpm.pm:310
#, c-format
-msgid "retrieving [%s]"
-msgstr "dohva�am [%s]"
-
-#: po/placeholder.h:57 urpm.pm:1819
-#, c-format
-msgid "wget of [%s] failed"
-msgstr "wget-iranje [%s] neuspje�no"
+msgid "write config file [%s]"
+msgstr "zapisana config datoteka [%s]"
-#: po/placeholder.h:58 urpm.pm:1101
+#: po/placeholder.h:57 urpm.pm:1107
#, c-format
msgid "no package named %s"
msgstr "ne postoji paket pod nazivom %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 "ne mogu pro�itati compss datoteku [%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 "ne mogu prona�i hdlist datoteku za \"%s\", medij ignoriran"
-#: po/placeholder.h:61
+#: po/placeholder.h:60
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "napravljen hdlist sintezna datoteka za medij \"%s\""
-#: po/placeholder.h:62
+#: po/placeholder.h:61
msgid "computing dependencies"
msgstr "izra�unavam ovisnosti"
-#: po/placeholder.h:63 urpm.pm:868
+#: po/placeholder.h:62
+#, fuzzy, c-format
+msgid "retrieve of [%s] failed"
+msgstr "wget-iranje [%s] neuspje�no"
+
+#: po/placeholder.h:63 urpm.pm:874
#, c-format
msgid "write provides file [%s]"
msgstr "zapisivanje provides datoteke [%s]"
-#: po/placeholder.h:64 urpm.pm:803
+#: po/placeholder.h:64 urpm.pm:809
#, c-format
msgid "mounting %s"
msgstr "montiram %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 "
@@ -336,124 +336,136 @@ msgstr ""
"ne mogu se pobriniti za medij \"%s\" po�to se list datoteka ve� koristi za "
"drugi medij"
-#: po/placeholder.h:66 urpm.pm:148
-#, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
-msgstr "medij \"%s\" poku�ava koristiti ve� kori�teni popis, medij ignoriran"
-
-#: po/placeholder.h:67
+#: po/placeholder.h:66
#, c-format
msgid "reading hdlist file [%s]"
msgstr "�itam hdlist datoteku [%s]"
-#: po/placeholder.h:68 urpm.pm:873
+#: po/placeholder.h:67 urpm.pm:879
#, c-format
msgid "write compss file [%s]"
msgstr "zapisivanje compss datoteke [%s]"
-#: po/placeholder.h:69 urpm.pm:827
+#: po/placeholder.h:68 urpm.pm:833
#, c-format
msgid "read depslist file [%s]"
msgstr "�itanje depslist datoteke [%s]"
-#: po/placeholder.h:70
-#, c-format
-msgid "trying to select inexistant medium \"%s\""
-msgstr "poku�avam izabrati nepostoje�i medij \"%s\""
+#: po/placeholder.h:69 urpm.pm:103
+msgid "curl failed\n"
+msgstr ""
-#: po/placeholder.h:71 urpm.pm:1812
+#: po/placeholder.h:70 urpm.pm:281 urpm.pm:284
+#, fuzzy, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "ne mogu napraviti medij \"%s\"\n"
+
+#: po/placeholder.h:71 urpm.pm:1668
#, c-format
msgid "malformed input: [%s]"
msgstr "nepravilan unos: [%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 "medij \"%s\" poku�ava koristiti ve� kori�teni hdlist, medij ignoriran"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "postoji vi�e paketa sa istim rpm imenom datoteke \"%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"
-msgstr ""
-"uklanjam %s za dogradnju ...\n"
-" na %s jer se ne�e dograditi druga�ije"
+msgid "medium \"%s\" tries to use an already used list, medium ignored"
+msgstr "medij \"%s\" poku�ava koristiti ve� kori�teni popis, medij ignoriran"
-#: po/placeholder.h:77 urpm.pm:865
+#: po/placeholder.h:74 urpm.pm:871
#, c-format
msgid "unable to write provides file [%s]"
msgstr "ne mogu zapisati provides datoteku [%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 "ne mogu pristupiti hdlist datoteci od \"%s\", medij ignoriran"
-#: po/placeholder.h:79 urpm.pm:1005
-msgid "unable to register rpm file"
-msgstr "ne mogu registrirati rpm datoteku"
-
-#: 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 ""
"ne mogu prona�i sve sintezne(synthesis) datoteke, koristim parsehdlist "
"poslu�itelj"
-#: po/placeholder.h:81 urpm.pm:241
+#: po/placeholder.h:77 urpm.pm:1011
+msgid "unable to register rpm file"
+msgstr "ne mogu registrirati rpm datoteku"
+
+#: po/placeholder.h:78 urpm.pm:256
#, c-format
msgid "unable to inspect list file for \"%s\", medium ignored"
msgstr "ne mogu provjeriti list datoteku za \"%s\", medij ignoriran"
-#: 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 "nepotpuna list datoteka za \"%s\", medij ignoriran"
-#: po/placeholder.h:83
+#: po/placeholder.h:81
#, c-format
msgid "copy of [%s] failed"
msgstr "kopiranje [%s] neuspje�no"
-#: 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 "poku�avam ukloniti nepostoje�i medij \"%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 "ne mogu obraditi ispravno [%s]"
-#: po/placeholder.h:85 urpm.pm:824
+#: po/placeholder.h:84 urpm.pm:1192
+#, fuzzy, c-format
+msgid "read synthesis file [%s]"
+msgstr "�itanje depslist datoteke [%s]"
+
+#: po/placeholder.h:85 urpm.pm:830
#, c-format
msgid "unable to read depslist file [%s]"
msgstr "ne mogu �itati depslist datoteku [%s]"
-#: po/placeholder.h:86
-msgid "removable medium not selected"
-msgstr "prijenosni medij nije izabran"
-
-#: po/placeholder.h:87 urpm.pm:851
+#: po/placeholder.h:86 urpm.pm:857
#, c-format
msgid "read compss file [%s]"
msgstr "�itanje compss datoteke [%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 "gre�ka u sintaksi u config datoteci na liniji %s"
-#: po/placeholder.h:89
+#: po/placeholder.h:88
#, c-format
msgid "building hdlist [%s]"
msgstr "izgra�ujem 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 "ne mogu pro�itati rpm datoteku [%s] sa medija \"%s\""
-#: po/placeholder.h:91 urpm.pm:1009
+#: po/placeholder.h:90 urpm.pm:1015
msgid "error registering local packages"
msgstr "gre�ka prilikom registriranja lokalnih paketa"
-#: 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 "nepotpun medij \"%s\" ozna�en kao prenosiv ali nije zapravo"
@@ -463,173 +475,165 @@ msgstr "nepotpun medij \"%s\" ozna�en kao prenosiv ali nije zapravo"
msgid "unable to build hdlist: %s"
msgstr "ne mogu napraviti 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 "medij \"%s\" nije izabran"
+
+#: po/placeholder.h:95 urpm.pm:1006
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "nepravilno ime rpm datoteke [%s]"
-#: 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 "medij \"%s\" nije izabran"
+msgid "unknown data associated with %s"
+msgstr "nepoznati podaci asocirani sa %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 "poku�avam zaobi�i postoje�i medij \"%s\", izbjegavam"
-#: po/placeholder.h:97 urpm.pm:863
+#: po/placeholder.h:98 urpm.pm:869
#, c-format
msgid "write depslist file [%s]"
msgstr "zapisivanje depslist datoteke [%s]"
-#: po/placeholder.h:98 urpm.pm:1322
-#, c-format
-msgid "unknown data associated with %s"
-msgstr "nepoznati podaci asocirani sa %s"
-
-#: po/placeholder.h:99
-#, c-format
-msgid "source of [%s] not found as [%s]"
-msgstr "izvor od [%s] nije prona�en kao [%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 "ne mogu pristupiti list datoteci od \"%s\", medij ignoriran"
-#: 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 "izbjegavam izabiranje %s po�to ne�e biti dovoljno datoteka dogra�eno"
-#: po/placeholder.h:102
-#, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
-msgstr "wget-iranje [%s] neuspje�no (mo�da wget nedostaje?)"
-
-#: po/placeholder.h:103 urpm.pm:1001
+#: po/placeholder.h:101 urpm.pm:1007
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "ne mogu pristupiti rpm datoteci [%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 "ne mogu zapisati depslist datoteku [%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 ""
+"uklanjam %s za dogradnju ...\n"
+" na %s jer ina�e ne�e biti ispravno dogra�eno!"
+
+#: po/placeholder.h:107 urpm.pm:342 urpm.pm:1630
#, c-format
msgid "unable to access medium \"%s\""
msgstr "ne mogu pristupiti mediju \"%s\""
-#: po/placeholder.h:106 urpm.pm:988
+#: po/placeholder.h:108 urpm.pm:994
#, c-format
msgid "relocated %s entries in depslist"
msgstr "premje�teno %s unosa u depslist-u"
-#: 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 "ne mogu obraditi ispravno [%s] na vrijednosti \"%s\""
+msgid "trying to select inexistent medium \"%s\""
+msgstr "poku�avam izabrati nepostoje�i medij \"%s\""
-#: po/placeholder.h:108
+#: po/placeholder.h:110 urpm.pm:97
+#, fuzzy
+msgid "wget failed\n"
+msgstr "wget-iranje [%s] neuspje�no"
+
+#: po/placeholder.h:111 urpm.pm:920 urpm.pm:1486 urpm.pm:1537
#, c-format
-msgid "no rpm files found from [%s]"
-msgstr "nisu prona�ene rpm datoteke u [%s]"
+msgid "unable to parse correctly [%s] on value \"%s\""
+msgstr "ne mogu obraditi ispravno [%s] na vrijednosti \"%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 "Slijede�i paketi sadr�e %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 "postoji vi�e paketa sa istim rpm imenom datoteke \"%s\""
+msgid "no rpm files found from [%s]"
+msgstr "nisu prona�ene rpm datoteke u [%s]"
-#: po/placeholder.h:111 urpm.pm:1920
+#: po/placeholder.h:114 urpm.pm:1772
#, c-format
msgid "selecting %s using obsoletes"
msgstr "odabirem %s koriste�i zastare"
-#: po/placeholder.h:112 urpm.pm:2031
+#: po/placeholder.h:115 urpm.pm:1888
#, c-format
msgid "selecting %s by selection on files"
msgstr "odabirem %s izabiranjem datoteka"
-#: 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 "ne mogu odrediti medij od navedene hdlist datoteke [%s]"
-#: po/placeholder.h:114 urpmi:308 urpmi:315 urpmi:328 urpmi:339 urpmi:352
-msgid "Installation failed"
-msgstr "Instalacija nije uspjela"
-
-#: po/placeholder.h:115 urpmi:279
-msgid "Press enter when it's done..."
-msgstr "Pritisnite Enter kada ste gotovi..."
+#: po/placeholder.h:120
+#, fuzzy
+msgid " --help - print this help message.\n"
+msgstr " --all - ispi�i sve oznake."
-#: po/placeholder.h:117 urpmi:201
-msgid "Sorry, bad choice, try again\n"
-msgstr "�alim, lo� odabir, poku�ajte ponovo\n"
+#: po/placeholder.h:121 urpmi:361
+msgid "everything already installed"
+msgstr "sve je ve� instalirano"
-#: po/placeholder.h:120
+#: po/placeholder.h:122 urpmi:98
#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: nepoznata opcija \"-%s\", provjerite uporabu sa --help\n"
+
+#: po/placeholder.h:123 urpmi:194
+msgid "One of the following packages is needed:"
+msgstr "Jedan od slijede�ih paketa je potreban:"
+
+#: po/placeholder.h:124 po/placeholder.h:222
+msgid " --update - use only update media.\n"
+msgstr ""
+
+#: po/placeholder.h:125 urpmi:299
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"
+"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 ""
-"urpmi verzija %s\n"
-"Autorska prava (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"Ovo je slobodan program i mo�e se distribuirati pod stavkama GNU licence.\n"
-"uporaba:\n"
-" --help - ispi�i ovaj pomo�ni tekst.\n"
-" --update - koristi samo medije za dogradnju.\n"
-" --auto - automatski izaberi dobar paket u izborima.\n"
-" --auto-select - automatski odaberi pakete za nadogradnju sustava.\n"
-" --force - prisili pozivanje iako neki paketi ne postoje.\n"
-" --X - koristi X su�elje.\n"
-" --best-output - izaberi najbolje su�elje prema okru�ju: Xi ili tekst "
-"mod.\n"
-" -a - izaberi sve prona�ene u komandnoj liniji.\n"
-" -m - izaberi minimalno paketa za zatvaranje ovisnosti "
-"(pretpostavljeno).\n"
-" -M - izabeir maksimalno paketa za zatvaranje ovisnoti.\n"
-" -c - izaberi kompletnu metodu za zatvaranje ovisnosti.\n"
-" -p - dozvoli pretra�ivanje u provides za pronala�enje "
-"paketa.\n"
-" -q - tihi mod.\n"
-" -v - op�iran mod.\n"
-" imena rpm datoteka (samo za administratora) dana na komandnoj liniji su "
-"instalirana.\n"
-
-#: po/placeholder.h:142 urpmi:362
-msgid "everything already installed"
-msgstr "sve je ve� instalirano"
-#: po/placeholder.h:143 urpmi:247
+#: po/placeholder.h:131 urpmi:307 urpmi:314 urpmi:327 urpmi:338 urpmi:351
+msgid "Installation failed"
+msgstr "Instalacija nije uspjela"
+
+#: po/placeholder.h:132 po/placeholder.h:234
+msgid ""
+" --auto-select - automatically select packages for upgrading the system.\n"
+msgstr ""
+
+#: po/placeholder.h:134
+#, fuzzy
+msgid " --X - use X interface.\n"
+msgstr " --all - ispi�i sve oznake."
+
+#: po/placeholder.h:135 urpmi:247
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -638,42 +642,108 @@ msgstr ""
"Kako bi zadovoljili sve ovisnosti paketa slijede�i moram instalirati "
"slijede�e pakete (%d MB)"
-#: po/placeholder.h:144 urpmi:296
-#, c-format
-msgid "installing %s\n"
-msgstr "instaliram %s\n"
+#: po/placeholder.h:136 urpmi:320 urpmi:344
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Poku�ati instalaciju bez provjere ovisnosti (d/N) "
+
+#: po/placeholder.h:137
+msgid ""
+" --best-output - choose best interface according to the environment:\n"
+" X or text mode.\n"
+msgstr ""
-#: po/placeholder.h:145 urpmi:198
+#: 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 - ispi�i sve oznake."
+
+#: po/placeholder.h:144 urpmi:202
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Izaberite jedan? (1-%d) "
-#: po/placeholder.h:146 urpmi:321 urpmi:345
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Poku�ati instalaciju bez provjere ovisnosti (d/N) "
+#: po/placeholder.h:145
+msgid " --wget - use wget to retrieve distant files.\n"
+msgstr ""
-#: po/placeholder.h:147 urpmi:190
-msgid "One of the following packages is needed:"
-msgstr "Jedan od slijede�ih paketa je potreban:"
+#: 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"
+msgstr ""
+"Ovo je slobodan software i mo�e biti redistribuiran pod stavkama GNU GPL."
+
+#: po/placeholder.h:152 urpmi:328 urpmi:352
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Poku�ati instalaciju jo� sna�nije (--force)? (d/N) "
+
+#: po/placeholder.h:154
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+
+#: po/placeholder.h:155 urpmi:205
+msgid "Sorry, bad choice, try again\n"
+msgstr "�alim, lo� odabir, poku�ajte ponovo\n"
+
+#: po/placeholder.h:156
+msgid ""
+" names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
-#: po/placeholder.h:148 urpmi:149
+#: po/placeholder.h:158
+msgid " -a - select all matches on command line.\n"
+msgstr ""
+
+#: 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 "instaliram %s\n"
+
+#: po/placeholder.h:161 urpmi:152
msgid "Only superuser is allowed to install local packages"
msgstr "Samo administrator mo�e instalirati lokalne pakete"
-#: 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 "Molim umetnite medij pod nazivom \"%s\" u ure�aj [%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 "ne mogu dohvatiti izvorne (source) pakete, prekidam"
-#: po/placeholder.h:151 urpmi:329 urpmi:353
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Poku�ati instalaciju jo� sna�nije (--force)? (d/N) "
+#: po/placeholder.h:165 urpmi:102
+#, fuzzy
+msgid "Only superuser is allowed to install packages"
+msgstr "Samo administrator mo�e instalirati lokalne pakete"
+
+#: po/placeholder.h:166 urpmi:193
+#, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Jedan od slijede�ih paketa je potreban za instaliranje %s:"
+
+#: po/placeholder.h:167 urpmi:277
+msgid "Press Enter when it's done..."
+msgstr "Pritisnite Enter kada ste gotovi..."
-#: po/placeholder.h:155 urpmi.addmedia:46
+#: po/placeholder.h:168 urpmi.addmedia:46
#, c-format
msgid ""
"%s\n"
@@ -682,7 +752,7 @@ msgstr ""
"%s\n"
"`with' nedostaje za ftp medij\n"
-#: po/placeholder.h:159
+#: po/placeholder.h:172
msgid ""
"usage: urpmi.addmedia [--update] <name> <url>\n"
"where <url> is one of\n"
@@ -702,17 +772,17 @@ msgstr ""
" http://<poslu�itelj>/<putanja> with <relativna datoteka hdlist>\n"
" removeable_<ure�aj>://<putanja>\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 "ne mogu napraviti medij \"%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 "ne mogu a�urirati medij \"%s\"\n"
-#: po/placeholder.h:170 urpmi.addmedia:42
+#: po/placeholder.h:183 urpmi.addmedia:42
#, c-format
msgid ""
"%s\n"
@@ -721,7 +791,7 @@ msgstr ""
"%s\n"
"ure�aj `%s' ne postoji\n"
-#: po/placeholder.h:174 urpmi.addmedia:44
+#: po/placeholder.h:187 urpmi.addmedia:44
#, c-format
msgid ""
"%s\n"
@@ -730,7 +800,7 @@ msgstr ""
"%s\n"
"<relativna putanja do hdlist> nedostaje\n"
-#: po/placeholder.h:178
+#: po/placeholder.h:191
#, c-format
msgid ""
"usage: urpmi.update [-a] <name> ...\n"
@@ -750,12 +820,12 @@ msgstr ""
"\n"
"nepoznate opcije '%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 ""
"nema ni�ta za nadogradnju (koristite urpmi.addmedia za dodavanje medija)\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"
@@ -764,12 +834,12 @@ msgstr ""
"nedostaje unos za nadogradnju\n"
"(jedan od %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 ""
"nema ni�ta za uklanjanje (koristite urpmi.addmedia za dodavanje medija)\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"
@@ -778,7 +848,7 @@ msgstr ""
"nedostaje unos za uklanjanje\n"
"(jedan od %s)\n"
-#: po/placeholder.h:197
+#: po/placeholder.h:210
#, c-format
msgid ""
"usage: urpmi.removemedia [-a] <name> ...\n"
@@ -793,17 +863,12 @@ msgstr ""
"\n"
"nepoznate opcije '%s'\n"
-#: po/placeholder.h:204 urpmq:85
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: ne mogu pro�itati rpm datoteku \"%s\"\n"
-
-#: po/placeholder.h:206 urpmq:82
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: nepoznate opcije \"-%s\", provjerite uporabu sa --help\n"
+#: po/placeholder.h:217
+#, fuzzy
+msgid " -h - print this help message.\n"
+msgstr " --all - ispi�i sve oznake."
-#: 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"
@@ -811,112 +876,102 @@ msgstr ""
"neki paketi moraju biti uklonjeni da bi mogli biti nadogra�eni, ovo jo� "
"uvijek nije podr�ano\n"
-#: po/placeholder.h:208
+#: po/placeholder.h:219
+#, fuzzy
+msgid " -g - print groups too with name.\n"
+msgstr " --group -ispisuje oznaku group: grupu."
+
+#: po/placeholder.h:220 urpmq:84
#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: ne mogu pro�itati rpm datoteku \"%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 " komandnoj liniji ali bez imena paketa)."
+
+#: 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 ""
+"Ovo je slobodan software i mo�e biti redistribuiran pod stavkama GNU GPL."
+
+#: po/placeholder.h:231
+#, fuzzy
+msgid " -d - extend query to package dependencies.\n"
+msgstr " komandnoj liniji ali bez imena paketa)."
+
+#: 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 ""
-"urpmq verzija %s\n"
-"Autorska prava (C) 2000, 2001 MandrakeSoft.\n"
-"Ovo je slobodan software i mo�e biti redistribuiran pod stavkama GNU GPL.\n"
-"uporaba:\n"
-" -h - ispisuje ovaj tekst pomo�i.\n"
-" -v - op�iran mod.\n"
-" -d - pro�ireni upit na ovisnosti paketa.\n"
-" -u - ukloni paket ukoliko je bolja verzija ve� instalirana.\n"
-" -m - pro�iri upit na ovisnosti paketa, ukloni ve� instalirane\n"
-" pakete koje pru�aju ono najva�nije, dodaj\n"
-" pakete koji mogu zablokirati dogradnju.\n"
-" -M - pro�iri upit na ovisnosti paketa i ukloni ve� postoje�e\n"
-" instalirane pakete samo ako su noviji ili isti.\n"
-" -c - izabiranje kompletne metode za rje�avanje zatvaranja "
-"ovisnosti.\n"
-" -p - dozvoli pretra�ivanje u provides za pronala�enje paketa.\n"
-" -g - ispi�i grupe tako�er sa imenom.\n"
-" -r - ispi�i verziju i izdanje tako�er sa imenom.\n"
-" --update - koristi samo medije za dogradnju.\n"
-" --auto-select - automatski izabire pakete za dogradnju sustava.\n"
-" --headers - izvla�i zaglavlja za popisane paketa iz urpmi baze na\n"
-" stdout (root samo).\n"
-" --sources - daje sve izvorne (source) pakete prije skidanja (root "
-"samo).\n"
-" --force - prisiljava izvr�avanja iako neki paket ne postoji.\n"
-" imena ili rpm datoteke navedena na komandnoj liniji �e biti upitana.\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: nepoznate opcije \"-%s\", provjerite uporabu sa --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 "ne mogu napraviti medij \"%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 "�itanje depslist datoteke [%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 "urpmi verzija %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: nepoznata opcija \"-%s\", provjerite uporabu sa --help\n"
+#: urpm.pm:1797 urpm.pm:1806
+msgid ", $otherPackage, "
+msgstr ", $otherPackage, "
-#: urpmi:102
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr "Samo administrator mo�e instalirati lokalne pakete"
+#: urpm.pm:1797 urpm.pm:1806
+msgid "));"
+msgstr "));"
-#: urpmi:189
-#, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Jedan od slijede�ih paketa je potreban za instaliranje %s:"
+#: 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 "urpmi verzija %s"
#: urpmi.addmedia:30
msgid "usage: urpmi.addmedia [--update] <name> <url>"
@@ -948,6 +1003,137 @@ msgstr ", $_);"
msgid "urpmq version %s"
msgstr "urpmq verzija %s"
+#~ msgid "retrieving [%s]"
+#~ msgstr "dohva�am [%s]"
+
+#~ msgid "wget of [%s] failed (maybe wget is missing?)"
+#~ msgstr "wget-iranje [%s] neuspje�no (mo�da wget nedostaje?)"
+
+#~ msgid "unable to copy source of [%s] from [%s]"
+#~ msgstr "ne mogu kopirati izvor od [%s] iz [%s]"
+
+#~ msgid "removable medium not selected"
+#~ msgstr "prijenosni medij nije izabran"
+
+#~ msgid "source of [%s] not found as [%s]"
+#~ msgstr "izvor od [%s] nije prona�en kao [%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 ""
+#~ "urpmi verzija %s\n"
+#~ "Autorska prava (C) 1999, 2000, 2001 MandrakeSoft.\n"
+#~ "Ovo je slobodan program i mo�e se distribuirati pod stavkama GNU "
+#~ "licence.\n"
+#~ "uporaba:\n"
+#~ " --help - ispi�i ovaj pomo�ni tekst.\n"
+#~ " --update - koristi samo medije za dogradnju.\n"
+#~ " --auto - automatski izaberi dobar paket u izborima.\n"
+#~ " --auto-select - automatski odaberi pakete za nadogradnju sustava.\n"
+#~ " --force - prisili pozivanje iako neki paketi ne postoje.\n"
+#~ " --X - koristi X su�elje.\n"
+#~ " --best-output - izaberi najbolje su�elje prema okru�ju: Xi ili tekst "
+#~ "mod.\n"
+#~ " -a - izaberi sve prona�ene u komandnoj liniji.\n"
+#~ " -m - izaberi minimalno paketa za zatvaranje ovisnosti "
+#~ "(pretpostavljeno).\n"
+#~ " -M - izabeir maksimalno paketa za zatvaranje ovisnoti.\n"
+#~ " -c - izaberi kompletnu metodu za zatvaranje ovisnosti.\n"
+#~ " -p - dozvoli pretra�ivanje u provides za pronala�enje "
+#~ "paketa.\n"
+#~ " -q - tihi mod.\n"
+#~ " -v - op�iran mod.\n"
+#~ " imena rpm datoteka (samo za administratora) dana na komandnoj liniji "
+#~ "su instalirana.\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 ""
+#~ "urpmq verzija %s\n"
+#~ "Autorska prava (C) 2000, 2001 MandrakeSoft.\n"
+#~ "Ovo je slobodan software i mo�e biti redistribuiran pod stavkama GNU "
+#~ "GPL.\n"
+#~ "uporaba:\n"
+#~ " -h - ispisuje ovaj tekst pomo�i.\n"
+#~ " -v - op�iran mod.\n"
+#~ " -d - pro�ireni upit na ovisnosti paketa.\n"
+#~ " -u - ukloni paket ukoliko je bolja verzija ve� "
+#~ "instalirana.\n"
+#~ " -m - pro�iri upit na ovisnosti paketa, ukloni ve� "
+#~ "instalirane\n"
+#~ " pakete koje pru�aju ono najva�nije, dodaj\n"
+#~ " pakete koji mogu zablokirati dogradnju.\n"
+#~ " -M - pro�iri upit na ovisnosti paketa i ukloni ve� "
+#~ "postoje�e\n"
+#~ " instalirane pakete samo ako su noviji ili isti.\n"
+#~ " -c - izabiranje kompletne metode za rje�avanje zatvaranja "
+#~ "ovisnosti.\n"
+#~ " -p - dozvoli pretra�ivanje u provides za pronala�enje "
+#~ "paketa.\n"
+#~ " -g - ispi�i grupe tako�er sa imenom.\n"
+#~ " -r - ispi�i verziju i izdanje tako�er sa imenom.\n"
+#~ " --update - koristi samo medije za dogradnju.\n"
+#~ " --auto-select - automatski izabire pakete za dogradnju sustava.\n"
+#~ " --headers - izvla�i zaglavlja za popisane paketa iz urpmi baze na\n"
+#~ " stdout (root samo).\n"
+#~ " --sources - daje sve izvorne (source) pakete prije skidanja (root "
+#~ "samo).\n"
+#~ " --force - prisiljava izvr�avanja iako neki paket ne postoji.\n"
+#~ " imena ili rpm datoteke navedena na komandnoj liniji �e biti upitana.\n"
+
#~ msgid "mismatch arch for registering rpm file"
#~ msgstr "neslaganje arh. za registrirane rpm datoteke"
@@ -960,9 +1146,6 @@ msgstr "urpmq verzija %s"
#~ msgid "mismatch version for registering rpm file"
#~ msgstr "neslaganje verzija za registrirane rpm datoteke"
-#~ msgid "));"
-#~ msgstr "));"
-
#~ msgid "), $_);"
#~ msgstr "), $_);"
diff --git a/po/hu.po b/po/hu.po
index ddaa58a5..15e9c089 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2001-11-24 14:46+0100\n"
-"PO-Revision-Date: 2001-11-22 01:31GMT+1\n"
+"POT-Creation-Date: 2001-11-27 19:52+0100\n"
+"PO-Revision-Date: 2001-11-27 00:07GMT+1\n"
"Last-Translator: Arpad Biro <biro_arpad@yahoo.com>\n"
"Language-Team: Hungarian\n"
"MIME-Version: 1.0\n"
@@ -28,27 +28,27 @@ msgstr ""
"A csomagok automatikus telep�t�se...\n"
"A(z) $rpm csomag telep�t�s�t k�rte...\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 "�gy rendben van?"
-#: _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 "M�gsem"
-#: _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 "Nn"
-#: _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 "IiyY"
-#: _irpm:42 po/placeholder.h:118 urpmi:258
+#: _irpm:42 po/placeholder.h:157 urpmi:258
msgid " (Y/n) "
msgstr " (I/n) "
@@ -157,179 +157,181 @@ msgstr "tov�bbi opci�k�rt pr�b�lja meg az \"urpmf --help\" parancsot"
msgid "urpmi is not installed"
msgstr "Az urpmi nincs telep�tve"
-#: po/placeholder.h:29 urpm.pm:283
+#: po/placeholder.h:29
+#, fuzzy, c-format
+msgid "reading synthesis file [%s]"
+msgstr "kiterjesztett f�gg�s�glista olvas�sa: \"%s\""
+
+#: po/placeholder.h:30 urpm.pm:298
#, c-format
msgid "unable to write config file [%s]"
msgstr "a be�ll�t�sok ment�se nem siker�lt: \"%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"
-msgstr "\"%s\" n�v nem adhat� az adatforr�snak, mivel m�r van ilyen n�v"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "elt�r� cser�lhet� eszk�z (\"%s\") haszn�lata ehhez: \"%s\""
-#: po/placeholder.h:31
+#: po/placeholder.h:32
#, c-format
msgid "nothing to write in list file for \"%s\""
msgstr "nincs mit �rni a listaf�jlba: \"%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 ""
"\"%s\" listaf�jlja nem tal�lhat�; az adatforr�s nem ker�l feldolgoz�sra"
-#: po/placeholder.h:33
+#: po/placeholder.h:34
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "fejl�clista nem elemezhet�: \"%s\""
-#: po/placeholder.h:34
+#: po/placeholder.h:35
#, c-format
msgid "nothing written in list file for \"%s\""
msgstr "semmi nem ker�lt a listaf�jlba: \"%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 ""
-"\"%s\" elt�vol�t�sa a k�vetkez�re val� friss�t�s\n"
-"�rdek�ben: \"%s\""
-
-#: po/placeholder.h:39 urpm.pm:839
+#: po/placeholder.h:36 urpm.pm:845
#, c-format
msgid "read provides file [%s]"
msgstr "szolg�ltat�sjegyz�k (provides) olvas�sa: \"%s\""
-#: po/placeholder.h:40
-#, c-format
-msgid "trying to remove inexistant medium \"%s\""
-msgstr "nem l�tez� adatforr�s elt�vol�t�sa: \"%s\""
-
-#: po/placeholder.h:41 urpm.pm:1692
+#: po/placeholder.h:37 urpm.pm:1549
#, c-format
msgid "package %s is not found."
msgstr "a csomag nem tal�lhat�: \"%s\""
-#: po/placeholder.h:42
-#, c-format
-msgid "unable to copy source of [%s] from [%s]"
-msgstr "\"%s\" nem m�solhat� innen: \"%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 "a csomaglistaf�jl (compss) nem �rhat�: \"%s\""
-#: po/placeholder.h:44 urpm.pm:813
+#: po/placeholder.h:39 urpm.pm:819
#, c-format
msgid "unmounting %s"
msgstr "%s lev�laszt�sa"
-#: po/placeholder.h:45
+#: po/placeholder.h:40
#, c-format
msgid "removing %d obsolete headers in cache"
msgstr "%d elavult fejl�c elt�vol�t�sa a gyorst�rb�l"
-#: 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 "a(z) \"%s\" adatforr�shoz nem tal�lhat� fejl�clista (hdlist)"
-#: 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 ""
+"a(z) \"%s\" adatforr�s egy haszn�latban lev� fejl�clist�t pr�b�lt haszn�lni; "
+"az adatforr�s nem ker�l feldolgoz�sra"
+
+#: po/placeholder.h:43 urpm.pm:184
+#, c-format
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr "\"%s\" n�v nem adhat� az adatforr�snak, mivel m�r van ilyen n�v"
+
+#: po/placeholder.h:44 urpm.pm:191
#, c-format
msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
msgstr ""
"a(z) \"%s\" adatforr�s nem vehet� figyelembe, mivel \"%s\" listaf�jl nem "
"l�tezik"
-#: po/placeholder.h:48
+#: po/placeholder.h:45
msgid "keeping only files referenced in provides"
msgstr "csak a szolg�ltat�sjegyz�kben szerepl� f�jlok lesznek megtartva"
-#: po/placeholder.h:49
+#: po/placeholder.h:46
#, c-format
msgid "unable to build synthesis file for medium \"%s\""
msgstr ""
"nem k�sz�thet� kiterjesztett f�gg�s�glista ehhez az adatforr�shoz: \"%s\""
-#: po/placeholder.h:50
+#: po/placeholder.h:47
#, c-format
msgid "found %d headers in cache"
msgstr "%d fejl�c tal�lhat� a gyorst�rban"
-#: po/placeholder.h:51 urpm.pm:836
+#: po/placeholder.h:48 urpm.pm:842
#, c-format
msgid "unable to read provides file [%s]"
msgstr "a szolg�ltat�sjegyz�k nem olvashat�: \"%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 "ne jel�lje ki ezt: \"%s\", mivel annak nyelve m�g nincs kijel�lve"
-#: 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 ""
+"\"%s\" elt�vol�t�sa a k�vetkez�re val� friss�t�s\n"
+"�rdek�ben: \"%s\""
+
+#: po/placeholder.h:54 urpm.pm:326
#, c-format
msgid "medium \"%s\" already exists"
msgstr "\"%s\" adatforr�s m�r l�tezik"
-#: po/placeholder.h:54 urpm.pm:295
-#, c-format
-msgid "write config file [%s]"
-msgstr "be�ll�t�sok ment�se: \"%s\""
-
#: po/placeholder.h:55
#, c-format
msgid "unable to write list file of \"%s\""
msgstr "a(z) \"%s\" listaf�jlja nem �rhat�"
-#: po/placeholder.h:56 urpm.pm:1817
-#, c-format
-msgid "retrieving [%s]"
-msgstr "\"%s\" feldolgoz�sa"
-
-#: po/placeholder.h:57 urpm.pm:1819
+#: po/placeholder.h:56 urpm.pm:310
#, c-format
-msgid "wget of [%s] failed"
-msgstr "a(z) \"%s\" wget-tel val� megszerz�se nem siker�lt"
+msgid "write config file [%s]"
+msgstr "be�ll�t�sok ment�se: \"%s\""
-#: po/placeholder.h:58 urpm.pm:1101
+#: po/placeholder.h:57 urpm.pm:1107
#, c-format
msgid "no package named %s"
msgstr "nincs ilyen nev� csomag: %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 "a csomaglistaf�jl (compss) nem olvashat�: \"%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 ""
"\"%s\" fejl�clist�ja nem tal�lhat�; az adatforr�s nem ker�l feldolgoz�sra"
-#: po/placeholder.h:61
+#: po/placeholder.h:60
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "kiterjesztett f�gg�s�glista k�sz�t�se ehhez: \"%s\""
-#: po/placeholder.h:62
+#: po/placeholder.h:61
msgid "computing dependencies"
msgstr "f�gg�s�gek elemz�se"
-#: po/placeholder.h:63 urpm.pm:868
+#: po/placeholder.h:62
+#, fuzzy, c-format
+msgid "retrieve of [%s] failed"
+msgstr "a(z) \"%s\" wget-tel val� megszerz�se nem siker�lt"
+
+#: po/placeholder.h:63 urpm.pm:874
#, c-format
msgid "write provides file [%s]"
msgstr "szolg�ltat�sjegyz�k �r�sa: \"%s\""
-#: po/placeholder.h:64 urpm.pm:803
+#: po/placeholder.h:64 urpm.pm:809
#, c-format
msgid "mounting %s"
msgstr "%s csatlakoztat�sa"
-#: 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 "
@@ -338,133 +340,143 @@ msgstr ""
"a(z) \"%s\" adatforr�s nem kezelhet�, mivel a listaf�jlt m�r haszn�lja egy "
"m�sik adatforr�s"
-#: po/placeholder.h:66 urpm.pm:148
-#, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
-msgstr ""
-"a(z) \"%s\" adatforr�s egy haszn�latban lev� list�t pr�b�lt haszn�lni; az "
-"adatforr�s nem ker�l feldolgoz�sra"
-
-#: po/placeholder.h:67
+#: po/placeholder.h:66
#, c-format
msgid "reading hdlist file [%s]"
msgstr "fejl�clista olvas�sa: \"%s\""
-#: po/placeholder.h:68 urpm.pm:873
+#: po/placeholder.h:67 urpm.pm:879
#, c-format
msgid "write compss file [%s]"
msgstr "csomaglistaf�jl �r�sa: \"%s\""
-#: po/placeholder.h:69 urpm.pm:827
+#: po/placeholder.h:68 urpm.pm:833
#, c-format
msgid "read depslist file [%s]"
msgstr "f�gg�s�glista olvas�sa: \"%s\""
-#: po/placeholder.h:70
+#: po/placeholder.h:69 urpm.pm:103
+msgid "curl failed\n"
+msgstr ""
+
+#: po/placeholder.h:70 urpm.pm:281 urpm.pm:284
#, c-format
-msgid "trying to select inexistant medium \"%s\""
-msgstr "nem l�tez� adatforr�s kijel�l�se: \"%s\""
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "a k�vetkez� cser�lhet� adatforr�s �tvonala nem �rhet� el: \"%s\""
-#: po/placeholder.h:71 urpm.pm:1812
+#: po/placeholder.h:71 urpm.pm:1668
#, c-format
msgid "malformed input: [%s]"
msgstr "hib�s bevitel: \"%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 ""
-"a(z) \"%s\" adatforr�s egy haszn�latban lev� fejl�clist�t pr�b�lt haszn�lni; "
-"az adatforr�s nem ker�l feldolgoz�sra"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "t�bb csomag l�tezik azonos RPM f�jln�vvel: \"%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 ""
-"\"%s\" elt�vol�t�sa a k�vetkez�re val� friss�t�s\n"
-"�rdek�ben: \"%s\""
+"a(z) \"%s\" adatforr�s egy haszn�latban lev� list�t pr�b�lt haszn�lni; az "
+"adatforr�s nem ker�l feldolgoz�sra"
-#: po/placeholder.h:77 urpm.pm:865
+#: po/placeholder.h:74 urpm.pm:871
#, c-format
msgid "unable to write provides file [%s]"
msgstr "a szolg�ltat�sjegyz�k (provides) nem �rhat�: \"%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 ""
"\"%s\" fejl�clist�ja nem el�rhet�; az adatforr�s nem ker�l feldolgoz�sra"
-#: po/placeholder.h:79 urpm.pm:1005
-msgid "unable to register rpm file"
-msgstr "a csomagf�jl (RPM) nem regisztr�lhat�"
-
-#: 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 ""
"nem tal�lhat� az �sszes kiterjesztett f�gg�s�glista; a parsehdlist program "
"lesz felhaszn�lva"
-#: po/placeholder.h:81 urpm.pm:241
+#: po/placeholder.h:77 urpm.pm:1011
+msgid "unable to register rpm file"
+msgstr "a csomagf�jl (RPM) nem regisztr�lhat�"
+
+#: po/placeholder.h:78 urpm.pm:256
#, c-format
msgid "unable to inspect list file for \"%s\", medium ignored"
msgstr ""
"\"%s\" listaf�jlj�nak vizsg�lata sikertelen; az adatforr�s nem ker�l "
"feldolgoz�sra"
-#: 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 "t�l sok csatlakoztat�si pont ehhez a cser�lhet� adatforr�shoz: \"%s\""
+
+#: po/placeholder.h:80 urpm.pm:248
#, c-format
msgid "incoherent list file for \"%s\", medium ignored"
msgstr ""
"hib�s listaf�jl a(z) \"%s\" adatforr�shoz; az adatforr�s nem ker�l "
"feldolgoz�sra"
-#: po/placeholder.h:83
+#: po/placeholder.h:81
#, c-format
msgid "copy of [%s] failed"
msgstr "a(z) \"%s\" m�sol�sa nem siker�lt"
-#: 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 "nem l�tez� adatforr�s elt�vol�t�sa: \"%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 "\"%s\" nem elemezhet�"
-#: po/placeholder.h:85 urpm.pm:824
+#: po/placeholder.h:84 urpm.pm:1192
+#, c-format
+msgid "read synthesis file [%s]"
+msgstr "kiterjesztett f�gg�s�glista olvas�sa: \"%s\""
+
+#: po/placeholder.h:85 urpm.pm:830
#, c-format
msgid "unable to read depslist file [%s]"
msgstr "a f�gg�s�glista nem olvashat�: \"%s\""
-#: po/placeholder.h:86
-msgid "removable medium not selected"
-msgstr "cser�lhet� adatforr�s nincs kijel�lve"
-
-#: po/placeholder.h:87 urpm.pm:851
+#: po/placeholder.h:86 urpm.pm:857
#, c-format
msgid "read compss file [%s]"
msgstr "csomaglista (compss) olvas�sa: \"%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 "szintaktikai hiba a konfigur�ci�s f�jl k�vetkez� sor�ban: %s"
-#: po/placeholder.h:89
+#: po/placeholder.h:88
#, c-format
msgid "building hdlist [%s]"
msgstr "fejl�clista k�sz�t�se: \"%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 "a(z) \"%s\" csomagf�jl (RPM) nem olvashat� a(z) \"%s\" adatforr�sb�l"
-#: po/placeholder.h:91 urpm.pm:1009
+#: po/placeholder.h:90 urpm.pm:1015
msgid "error registering local packages"
msgstr "hiba a helyi csomagok regisztr�l�sakor"
-#: po/placeholder.h:92 urpm.pm:1762
+#: po/placeholder.h:91 urpm.pm:273
+#, c-format
+msgid "taking removable device as \"%s\""
+msgstr "a cser�lhet� eszk�z a k�vetkez�nek lesz v�ve: \"%s\""
+
+#: po/placeholder.h:92 urpm.pm:1619
#, c-format
msgid "incoherent medium \"%s\" marked removable but not really"
msgstr "a(z) \"%s\" hib�s adatforr�s cser�lhet�nek van jel�lve, pedig nem az"
@@ -474,220 +486,277 @@ msgstr "a(z) \"%s\" hib�s adatforr�s cser�lhet�nek van jel�lve, pedig nem az"
msgid "unable to build hdlist: %s"
msgstr "fejl�clista k�sz�t�se nem siker�lt: %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 "a(z) \"%s\" adatforr�s nincs kijel�lve"
+
+#: po/placeholder.h:95 urpm.pm:1006
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "�rv�nytelen csomagf�jln�v: \"%s\""
-#: 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 "a(z) \"%s\" adatforr�s nincs kijel�lve"
+msgid "unknown data associated with %s"
+msgstr "ismeretlen adat van ehhez rendelve: %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 "a(z) \"%s\" n�ven l�tez� adatforr�s elker�l�se"
-#: po/placeholder.h:97 urpm.pm:863
+#: po/placeholder.h:98 urpm.pm:869
#, c-format
msgid "write depslist file [%s]"
msgstr "f�gg�s�glista �r�sa: \"%s\""
-#: po/placeholder.h:98 urpm.pm:1322
-#, c-format
-msgid "unknown data associated with %s"
-msgstr "ismeretlen adat van ehhez rendelve: %s"
-
-#: po/placeholder.h:99
-#, c-format
-msgid "source of [%s] not found as [%s]"
-msgstr "\"%s\" forr�sa nem tal�lhat�: \"%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 "\"%s\" listaf�jlja nem el�rhet�; az adatforr�s nem ker�l feldolgoz�sra"
-#: 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 "ne jel�lje ki ezt: \"%s\", mivel nem lenne el�g f�jl friss�tve"
-#: po/placeholder.h:102
-#, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
-msgstr ""
-"a(z) \"%s\" wget-tel val� megszerz�se nem siker�lt (esetleg hi�nyzik a 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 "a csomagf�jl nem �rhet� el: \"%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 "a f�gg�s�glista nem �rhat�: \"%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 ""
+"\"%s\" elt�vol�t�sa a k�vetkez�re val� friss�t�s\n"
+"�rdek�ben: \"%s\""
+
+#: po/placeholder.h:107 urpm.pm:342 urpm.pm:1630
#, c-format
msgid "unable to access medium \"%s\""
msgstr "a(z) \"%s\" adatforr�s nem �rhet� el"
-#: po/placeholder.h:106 urpm.pm:988
+#: po/placeholder.h:108 urpm.pm:994
#, c-format
msgid "relocated %s entries in depslist"
msgstr "bejegyz�sek �thelyezve a f�gg�s�glist�ban: %s"
-#: 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 "\"%s\" elemz�se sikertelen; a helytelen �rt�k: \"%s\""
+msgid "trying to select inexistent medium \"%s\""
+msgstr "nem l�tez� adatforr�s kijel�l�se: \"%s\""
+
+#: po/placeholder.h:110 urpm.pm:97
+#, fuzzy
+msgid "wget failed\n"
+msgstr "a(z) \"%s\" wget-tel val� megszerz�se nem siker�lt"
-#: 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 "csomagf�jlok (RPM) nem tal�lhat�k: \"%s\""
+msgid "unable to parse correctly [%s] on value \"%s\""
+msgstr "\"%s\" elemz�se sikertelen; a helytelen �rt�k: \"%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 "A k�vetkez� csomagok tartalmazz�k a(z) %s komponenst: %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 "t�bb csomag l�tezik azonos RPM f�jln�vvel: \"%s\""
+msgid "no rpm files found from [%s]"
+msgstr "csomagf�jlok (RPM) nem tal�lhat�k: \"%s\""
-#: po/placeholder.h:111 urpm.pm:1920
+#: po/placeholder.h:114 urpm.pm:1772
#, c-format
msgid "selecting %s using obsoletes"
msgstr "%s kijel�l�se t�rl�sre (elavultt� v�lt)"
-#: po/placeholder.h:112 urpm.pm:2031
+#: po/placeholder.h:115 urpm.pm:1888
#, c-format
msgid "selecting %s by selection on files"
msgstr "%s kijel�l�se friss�t�sre (f�jl-�tk�z�sek miatt)"
-#: 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 "a fejl�clist�hoz tartoz� adatforr�s nem hat�rozhat� meg: \"%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 - az �sszes adat megjelen�t�se"
+
+#: po/placeholder.h:121 urpmi:361
+msgid "everything already installed"
+msgstr "m�r minden telep�tve van"
+
+#: po/placeholder.h:122 urpmi:98
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr ""
+"urpmi: ismeretlen param�ter: \"-%s\". A lehets�ges param�tereket\n"
+"a --help param�ter megad�s�val lehet kilist�zni.\n"
+
+#: po/placeholder.h:123 urpmi:194
+msgid "One of the following packages is needed:"
+msgstr "A k�vetkez� csomagok valamelyik�re sz�ks�g van:"
+
+#: 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 ""
+"A telep�t�s nem siker�lt, mivel bizonyos f�jlok hi�nyoznak.\n"
+"�rdemes lehet friss�teni az urpmi adatb�zist."
+
+#: 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 "A telep�t�s nem siker�lt"
-#: po/placeholder.h:115 urpmi:279
-msgid "Press enter when it's done..."
-msgstr "Ut�na nyomja le az Enter billenty�t..."
+#: 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 "Ezt nem lehet v�lasztani, pr�b�lja meg �jra\n"
+#: po/placeholder.h:134
+#, fuzzy
+msgid " --X - use X interface.\n"
+msgstr " --all - az �sszes adat megjelen�t�se"
-#: 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 ""
+"A f�gg�s�gek felold�s�hoz a k�vetkez� csomagokat fogom telep�teni (%d MB)"
+
+#: po/placeholder.h:136 urpmi:320 urpmi:344
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Pr�b�ljam meg a telep�t�st a f�gg�s�gek ellen�rz�se n�lk�l? (i/N) "
+
+#: 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 - az �sszes adat megjelen�t�se"
+
+#: po/placeholder.h:144 urpmi:202
#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "Melyiket v�lasztja? (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 ""
-"urpmi %s\n"
-"Copyright (C) MandrakeSoft, 1999, 2000, 2001.\n"
-"Ez a program szabad szoftver, a GNU GPL licenc felt�telei szerint\n"
-"terjeszthet�.\n"
-"Haszn�lat:\n"
-" --help - megjelen�ti ezt a sz�veget\n"
-" --update - csak friss�t�si adatforr�s legyen haszn�lva\n"
-" --auto - v�laszt�si lehet�s�gn�l automatikusan kiv�lasztja a\n"
-" megfelel� csomagokat\n"
-" --auto-select - automatikusan kiv�lasztja a friss�thet� csomagokat\n"
-" --force - akkor is elind�tja a m�veletet, ha n�h�ny sz�ks�ges\n"
-" csomag nem �rhet� el\n"
-" --X - futtat�s az X grafikus fel�leten\n"
-" --best-output - a lehet�s�gek k�z�l a legmegfelel�bb fel�letet\n"
-" haszn�lja a program: grafikus (X) vagy karakteres\n"
-" -a - kijel�l�s a parancssorban megadott minta szerint\n"
-" -m - a lehet� legkevesebb csomag kijel�l�se a f�gg�s�gek\n"
-" ellen�rz�s�n�l (alap�rtelmez�s)\n"
-" -M - t�bb csomag kijel�l�se a f�gg�s�gek ellen�rz�s�n�l\n"
-" -c - teljes kijel�l�s a f�gg�s�gek ellen�rz�s�n�l\n"
-" -p - csomag keres�se a szolg�ltat�sjegyz�kben\n"
-" -q - n�ma �zemm�d\n"
-" -v - r�szletes kimenet (verbose mode)\n"
-"\n"
-" a parancssorban megadott csomagok illetve RPM f�jlok (csak rendszergazdai\n"
-" jogosults�g eset�n) lesznek telep�tve\n"
+"Ez a program szabad szoftver; a GNU GPL felt�telei szerint terjeszthet�."
-#: po/placeholder.h:142 urpmi:362
-msgid "everything already installed"
-msgstr "m�r minden telep�tve van"
+#: po/placeholder.h:152 urpmi:328 urpmi:352
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Mindenk�ppen megk�s�reljem a telep�t�st (--force)? (i/N) "
-#: po/placeholder.h:143 urpmi:247
-#, c-format
+#: po/placeholder.h:154
msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+" --force - force invocation even if some packages do not exist.\n"
msgstr ""
-"A f�gg�s�gek felold�s�hoz a k�vetkez� csomagokat fogom telep�teni (%d MB)"
-#: po/placeholder.h:144 urpmi:296
-#, c-format
-msgid "installing %s\n"
-msgstr "%s telep�t�se folyik\n"
+#: po/placeholder.h:155 urpmi:205
+msgid "Sorry, bad choice, try again\n"
+msgstr "Ezt nem lehet v�lasztani, pr�b�lja meg �jra\n"
-#: po/placeholder.h:145 urpmi:198
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Melyiket v�lasztja? (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 "Pr�b�ljam meg a telep�t�st a f�gg�s�gek ellen�rz�se n�lk�l? (i/N) "
+#: 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 "A k�vetkez� csomagok valamelyik�re sz�ks�g van:"
+#: po/placeholder.h:159
+msgid " --curl - use curl to retrieve distant files.\n"
+msgstr ""
-#: po/placeholder.h:148 urpmi:149
+#: po/placeholder.h:160 urpmi:294
+#, c-format
+msgid "installing %s\n"
+msgstr "%s telep�t�se folyik\n"
+
+#: po/placeholder.h:161 urpmi:152
msgid "Only superuser is allowed to install local packages"
msgstr "Helyi csomagok telep�t�s�hez rendszergazdai jogosults�g sz�ks�ges"
-#: 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 "Helyezze be a(z) \"%s\" nev� adathordoz�t a(z) \"%s\" meghajt�ba"
-#: 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 "a forr�scsomagok nem �rhet�k el, ez�rt a m�velet f�lbeszakad"
-#: po/placeholder.h:151 urpmi:329 urpmi:353
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Mindenk�ppen megk�s�reljem a telep�t�st (--force)? (i/N) "
+#: po/placeholder.h:165 urpmi:102
+msgid "Only superuser is allowed to install packages"
+msgstr "Csomagok telep�t�s�hez rendszergazdai jogosults�g sz�ks�ges"
-#: po/placeholder.h:155 urpmi.addmedia:46
+#: po/placeholder.h:166 urpmi:193
+#, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "A k�vetkez� csomagok valamelyik�re sz�ks�g van a(z) %s telep�t�s�hez:"
+
+#: po/placeholder.h:167 urpmi:277
+msgid "Press Enter when it's done..."
+msgstr "Ut�na nyomja le az Enter billenty�t..."
+
+#: po/placeholder.h:168 urpmi.addmedia:46
#, c-format
msgid ""
"%s\n"
@@ -696,7 +765,7 @@ msgstr ""
"%s\n"
"hi�nyz� \"with\" param�ter az FTP-s c�mn�l\n"
-#: po/placeholder.h:159
+#: po/placeholder.h:172
msgid ""
"usage: urpmi.addmedia [--update] <name> <url>\n"
"where <url> is one of\n"
@@ -716,17 +785,17 @@ msgstr ""
" http://<g�pn�v>/<el�r�si �t> with <a fejl�clista relat�v f�jlneve>\n"
" removable_<lemezeszk�z>://<el�r�si �t>\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 "a(z) \"%s\" adatforr�s l�trehoz�sa nem siker�lt\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 "a(z) \"%s\" adatforr�s friss�t�se nem siker�lt\n"
-#: po/placeholder.h:170 urpmi.addmedia:42
+#: po/placeholder.h:183 urpmi.addmedia:42
#, c-format
msgid ""
"%s\n"
@@ -735,7 +804,7 @@ msgstr ""
"%s\n"
"\"%s\" eszk�z nem l�tezik\n"
-#: po/placeholder.h:174 urpmi.addmedia:44
+#: po/placeholder.h:187 urpmi.addmedia:44
#, c-format
msgid ""
"%s\n"
@@ -744,7 +813,7 @@ msgstr ""
"%s\n"
"<a fejl�clista relat�v �tvonala> hi�nyzik\n"
-#: po/placeholder.h:178
+#: po/placeholder.h:191
#, c-format
msgid ""
"usage: urpmi.update [-a] <name> ...\n"
@@ -764,13 +833,13 @@ msgstr ""
"\n"
"ismeretlen param�terek: \"%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 ""
"nincs mit friss�teni (haszn�lja az urpmi.addmedia parancsot adatforr�s "
"felv�tel�hez)\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"
@@ -779,13 +848,13 @@ msgstr ""
"a friss�tend� bejegyz�s hi�nyzik\n"
"(valamelyik ezek k�z�l: %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 ""
"nincs mit elt�vol�tani (haszn�lja az urpmi.addmedia parancsot adatforr�s "
"felv�tel�hez)\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"
@@ -794,7 +863,7 @@ msgstr ""
"a t�rlend� bejegyz�s hi�nyzik\n"
"(valamelyik ezek k�z�l: %s)\n"
-#: po/placeholder.h:197
+#: po/placeholder.h:210
#, c-format
msgid ""
"usage: urpmi.removemedia [-a] <name> ...\n"
@@ -809,19 +878,12 @@ msgstr ""
"\n"
"ismeretlen param�terek: \"%s\"\n"
-#: po/placeholder.h:204 urpmq:85
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: egy RPM f�jl nem olvashat�: \"%s\"\n"
-
-#: po/placeholder.h:206 urpmq:82
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-"urpmq: ismeretlen param�ter: \"-%s\". A lehets�ges param�tereket a --help "
-"param�ter megad�s�val lehet kilist�zni.\n"
+#: po/placeholder.h:217
+#, fuzzy
+msgid " -h - print this help message.\n"
+msgstr " --all - az �sszes adat megjelen�t�se"
-#: 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"
@@ -829,117 +891,104 @@ msgstr ""
"n�h�ny csomagot el kell t�vol�tani a friss�t�s el�tt, de ezt a programnak ez "
"a verzi�ja m�g nem k�pes v�grehajtani\n"
-#: po/placeholder.h:208
+#: po/placeholder.h:219
+#, fuzzy
+msgid " -g - print groups too with name.\n"
+msgstr " --group - csoport megjelen�t�se"
+
+#: po/placeholder.h:220 urpmq:84
#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: egy RPM f�jl nem olvashat�: \"%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 " akkor automatikusan �letbe l�p)"
+
+#: 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"
-" --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 ""
-"urpmq %s\n"
-"Copyright (C) MandrakeSoft, 2000, 2001.\n"
-"Ez a program szabad szoftver, a GNU GPL licenc felt�telei szerint\n"
-"terjeszthet�.\n"
-"Haszn�lat:\n"
-" -h - megjelen�ti ezt a sz�veget\n"
-" -v - r�szletes kimenet (verbose mode)\n"
-" -d - a lek�rdez�s terjedjen ki a csomagf�gg�s�gekre is\n"
-" -u - csomag kihagy�sa, ha m�r van �jabb verzi� telep�tve\n"
-" -m - a lek�rdez�s terjedjen ki a csomagf�gg�s�gekre is; a m�r\n"
-" telep�tett csomagok ne legyenek figyelembe v�ve, azok\n"
-" viszont igen, amelyek megakad�lyozn�k a friss�t�st\n"
-" -M - a lek�rdez�s terjedjen ki a csomagf�gg�s�gekre is; a m�r\n"
-" telep�tett csomagok csak akkor legyenek figyelembe v�ve,\n"
-" ha r�gebbi verzi� van telep�tve bel�l�k\n"
-" -c - teljes lek�rdez�s a f�gg�s�gek ellen�rz�s�n�l\n"
-" -p - csomag keres�se a szolg�ltat�sjegyz�kben\n"
-" -g - a n�vvel egy�tt a csoportok is jelenjenek meg\n"
-" -r - a n�vvel egy�tt a verzi� �s a kiad�ssz�m is jelenjen meg\n"
-" --update - csak friss�t�si adatforr�s legyen haszn�lva\n"
-" --auto-select - automatikusan kiv�lasztja a friss�thet� csomagokat\n"
-" --headers - a csomagok urpmi-adatb�zisban t�rolt fejl�ceinek ki�r�sa\n"
-" a standard kimenetre (stdout) - a m�velethez\n"
-" rendszergazdai jogosults�g sz�ks�ges\n"
-" --sources - a csomagok el�r�si �tj�nak list�z�sa let�lt�s el�tt\n"
-" (rendszergazdai jogosults�g sz�ks�ges)\n"
-" --force - akkor is elind�tja a m�veletet, ha n�h�ny sz�ks�ges\n"
-" csomag nem �rhet� el\n"
-"\n"
-" a parancssorban megadott csomagok illetve RPM f�jlok lesznek lek�rdezve\n"
+msgstr ""
+"Ez a program szabad szoftver; a GNU GPL felt�telei szerint terjeszthet�."
-#: urpm.pm:257
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "t�l sok csatlakoztat�si pont ehhez a cser�lhet� adatforr�shoz: \"%s\""
+#: po/placeholder.h:231
+#, fuzzy
+msgid " -d - extend query to package dependencies.\n"
+msgstr " akkor automatikusan �letbe l�p)"
-#: urpm.pm:258
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "a cser�lhet� eszk�z a k�vetkez�nek lesz v�ve: \"%s\""
+#: po/placeholder.h:232
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
+msgstr ""
-#: urpm.pm:262
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "elt�r� cser�lhet� eszk�z (\"%s\") haszn�lata ehhez: \"%s\""
+#: po/placeholder.h:233
+msgid ""
+" -c - choose complete method for resolving requires closure.\n"
+msgstr ""
-#: urpm.pm:266 urpm.pm:269
+#: po/placeholder.h:235 urpmq:81
#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "a k�vetkez� cser�lhet� adatforr�s �tvonala nem �rhet� el: \"%s\""
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr ""
+"urpmq: ismeretlen param�ter: \"-%s\". A lehets�ges param�tereket a --help "
+"param�ter megad�s�val lehet kilist�zni.\n"
-#: urpm.pm:1339
-#, c-format
-msgid "read synthesis file [%s]"
-msgstr "kiterjesztett f�gg�s�glista olvas�sa: \"%s\""
+#: po/placeholder.h:236
+msgid ""
+" --headers - extract headers for package listed from urpmi db to\n"
+" stdout (root only).\n"
+msgstr ""
-#: urpmi:49
-#, c-format
-msgid "urpmi version %s"
-msgstr "urpmi %s"
+#: po/placeholder.h:243
+msgid ""
+" -u - remove package if a better version is already installed.\n"
+msgstr ""
-#: urpmi:98
+#: po/placeholder.h:244
+msgid ""
+" --force - force invocation even if some packages do not\n"
+"exist.\n"
+msgstr ""
+
+#: urpm.pm:1796 urpm.pm:1805
#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgid "removing %s to upgrade to %s ..."
msgstr ""
-"urpmi: ismeretlen param�ter: \"-%s\". A lehets�ges param�tereket\n"
-"a --help param�ter megad�s�val lehet kilist�zni.\n"
-#: urpmi:102
-msgid "Only superuser is allowed to install packages"
-msgstr "Csomagok telep�t�s�hez rendszergazdai jogosults�g sz�ks�ges"
+#: urpm.pm:1797 urpm.pm:1806
+msgid ", $otherPackage, "
+msgstr ", $otherPackage, "
-#: urpmi:189
-#, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "A k�vetkez� csomagok valamelyik�re sz�ks�g van a(z) %s telep�t�s�hez:"
+#: urpm.pm:1797 urpm.pm:1806
+msgid "));"
+msgstr "));"
-#: urpmi:301
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
-msgstr ""
+#: urpm.pm:1802
+msgid "$p->{name}-$p->{version}-$p->{release}"
+msgstr "$p->{name}-$p->{version}-$p->{release}"
+
+#: urpm.pm:1812
+msgid "$prefix/$_"
+msgstr "$prefix/$_"
+
+#: urpmi:48
+#, c-format
+msgid "urpmi version %s"
+msgstr "urpmi %s"
#: urpmi.addmedia:30
msgid "usage: urpmi.addmedia [--update] <name> <url>"
@@ -970,3 +1019,144 @@ msgstr ", $_);"
#, c-format
msgid "urpmq version %s"
msgstr "urpmq %s"
+
+#~ msgid "retrieving [%s]"
+#~ msgstr "\"%s\" feldolgoz�sa"
+
+#~ msgid "wget of [%s] failed (maybe wget is missing?)"
+#~ msgstr ""
+#~ "a(z) \"%s\" wget-tel val� megszerz�se nem siker�lt (esetleg hi�nyzik a "
+#~ "wget?)"
+
+#~ msgid "unable to copy source of [%s] from [%s]"
+#~ msgstr "\"%s\" nem m�solhat� innen: \"%s\""
+
+#~ msgid "removable medium not selected"
+#~ msgstr "cser�lhet� adatforr�s nincs kijel�lve"
+
+#~ msgid "source of [%s] not found as [%s]"
+#~ msgstr "\"%s\" forr�sa nem tal�lhat�: \"%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 ""
+#~ "urpmi %s\n"
+#~ "Copyright (C) MandrakeSoft, 1999, 2000, 2001.\n"
+#~ "Ez a program szabad szoftver, a GNU GPL licenc felt�telei szerint\n"
+#~ "terjeszthet�.\n"
+#~ "Haszn�lat:\n"
+#~ " --help - megjelen�ti ezt a sz�veget\n"
+#~ " --update - csak friss�t�si adatforr�s legyen haszn�lva\n"
+#~ " --auto - v�laszt�si lehet�s�gn�l automatikusan kiv�lasztja a\n"
+#~ " megfelel� csomagokat\n"
+#~ " --auto-select - automatikusan kiv�lasztja a friss�thet� csomagokat\n"
+#~ " --force - akkor is elind�tja a m�veletet, ha n�h�ny sz�ks�ges\n"
+#~ " csomag nem �rhet� el\n"
+#~ " --X - futtat�s az X grafikus fel�leten\n"
+#~ " --best-output - a lehet�s�gek k�z�l a legmegfelel�bb fel�letet\n"
+#~ " haszn�lja a program: grafikus (X) vagy karakteres\n"
+#~ " -a - kijel�l�s a parancssorban megadott minta szerint\n"
+#~ " -m - a lehet� legkevesebb csomag kijel�l�se a f�gg�s�gek\n"
+#~ " ellen�rz�s�n�l (alap�rtelmez�s)\n"
+#~ " -M - t�bb csomag kijel�l�se a f�gg�s�gek ellen�rz�s�n�l\n"
+#~ " -c - teljes kijel�l�s a f�gg�s�gek ellen�rz�s�n�l\n"
+#~ " -p - csomag keres�se a szolg�ltat�sjegyz�kben\n"
+#~ " -q - n�ma �zemm�d\n"
+#~ " -v - r�szletes kimenet (verbose mode)\n"
+#~ "\n"
+#~ " a parancssorban megadott csomagok illetve RPM f�jlok (csak "
+#~ "rendszergazdai\n"
+#~ " jogosults�g eset�n) lesznek telep�tve\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 ""
+#~ "urpmq %s\n"
+#~ "Copyright (C) MandrakeSoft, 2000, 2001.\n"
+#~ "Ez a program szabad szoftver, a GNU GPL licenc felt�telei szerint\n"
+#~ "terjeszthet�.\n"
+#~ "Haszn�lat:\n"
+#~ " -h - megjelen�ti ezt a sz�veget\n"
+#~ " -v - r�szletes kimenet (verbose mode)\n"
+#~ " -d - a lek�rdez�s terjedjen ki a csomagf�gg�s�gekre is\n"
+#~ " -u - csomag kihagy�sa, ha m�r van �jabb verzi� telep�tve\n"
+#~ " -m - a lek�rdez�s terjedjen ki a csomagf�gg�s�gekre is; a "
+#~ "m�r\n"
+#~ " telep�tett csomagok ne legyenek figyelembe v�ve, azok\n"
+#~ " viszont igen, amelyek megakad�lyozn�k a friss�t�st\n"
+#~ " -M - a lek�rdez�s terjedjen ki a csomagf�gg�s�gekre is; a "
+#~ "m�r\n"
+#~ " telep�tett csomagok csak akkor legyenek figyelembe "
+#~ "v�ve,\n"
+#~ " ha r�gebbi verzi� van telep�tve bel�l�k\n"
+#~ " -c - teljes lek�rdez�s a f�gg�s�gek ellen�rz�s�n�l\n"
+#~ " -p - csomag keres�se a szolg�ltat�sjegyz�kben\n"
+#~ " -g - a n�vvel egy�tt a csoportok is jelenjenek meg\n"
+#~ " -r - a n�vvel egy�tt a verzi� �s a kiad�ssz�m is jelenjen "
+#~ "meg\n"
+#~ " --update - csak friss�t�si adatforr�s legyen haszn�lva\n"
+#~ " --auto-select - automatikusan kiv�lasztja a friss�thet� csomagokat\n"
+#~ " --headers - a csomagok urpmi-adatb�zisban t�rolt fejl�ceinek "
+#~ "ki�r�sa\n"
+#~ " a standard kimenetre (stdout) - a m�velethez\n"
+#~ " rendszergazdai jogosults�g sz�ks�ges\n"
+#~ " --sources - a csomagok el�r�si �tj�nak list�z�sa let�lt�s el�tt\n"
+#~ " (rendszergazdai jogosults�g sz�ks�ges)\n"
+#~ " --force - akkor is elind�tja a m�veletet, ha n�h�ny sz�ks�ges\n"
+#~ " csomag nem �rhet� el\n"
+#~ "\n"
+#~ " a parancssorban megadott csomagok illetve RPM f�jlok lesznek "
+#~ "lek�rdezve\n"
diff --git a/po/id.po b/po/id.po
index d34452a5..709cce06 100644
--- a/po/id.po
+++ b/po/id.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-10-10 00:00+0900\n"
"Last-Translator: Budi Rachmanto <rac@linux-mandrake.com>\n"
"Language-Team: Indonesian <rac@linux-mandrake.com>\n"
@@ -25,27 +25,27 @@ msgstr ""
"Instalasi paket otomatis...\n"
"Anda telah meminta instalasi paket $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 "Semua beres?"
-#: _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 "Batal"
-#: _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 "TtNn"
-#: _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 "Yy"
-#: _irpm:42 po/placeholder.h:118 urpmi:258
+#: _irpm:42 po/placeholder.h:157 urpmi:258
msgid " (Y/n) "
msgstr " (Y/t) "
@@ -151,174 +151,174 @@ msgstr "coba urpmf --help utk opsi lain"
msgid "urpmi is not installed"
msgstr "urpmi tak terinstal"
-#: po/placeholder.h:29 urpm.pm:283
+#: po/placeholder.h:29
+#, fuzzy, c-format
+msgid "reading synthesis file [%s]"
+msgstr "baca file ketergantungan [%s]"
+
+#: po/placeholder.h:30 urpm.pm:298
#, c-format
msgid "unable to write config file [%s]"
msgstr "gagal tulis file konfigurasi [%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"
-msgstr "\"%s\" telah dipakai, tak dapat digunakan utk media tak bernama"
+msgid "using different removable device [%s] for \"%s\""
+msgstr ""
-#: po/placeholder.h:31
+#: po/placeholder.h:32
#, c-format
msgid "nothing to write in list file for \"%s\""
msgstr "tiada yg ditulis dlm file daftar \"%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 "gagal cari file daftar \"%s\", media diabaikan"
-#: po/placeholder.h:33
+#: po/placeholder.h:34
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "gagal olah file hdlist \"%s\""
-#: po/placeholder.h:34
+#: po/placeholder.h:35
#, c-format
msgid "nothing written in list file for \"%s\""
msgstr "tak ada yg ditulis dlm file daftar \"%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 ""
-"hapus %s utk upgrade ...\n"
-" ke %s karena takkan ter-upgrade dg benar!"
-
-#: po/placeholder.h:39 urpm.pm:839
+#: po/placeholder.h:36 urpm.pm:845
#, c-format
msgid "read provides file [%s]"
msgstr "baca file sediaan [%s]"
-#: po/placeholder.h:40
-#, c-format
-msgid "trying to remove inexistant medium \"%s\""
-msgstr "coba hapus media \"%s\" yg tak ada"
-
-#: po/placeholder.h:41 urpm.pm:1692
+#: po/placeholder.h:37 urpm.pm:1549
#, c-format
msgid "package %s is not found."
msgstr "paket %s tak tertemukan."
-#: po/placeholder.h:42
-#, c-format
-msgid "unable to copy source of [%s] from [%s]"
-msgstr "gagal copy source [%s] dari [%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 "gagal tulis file compss [%s]"
-#: po/placeholder.h:44 urpm.pm:813
+#: po/placeholder.h:39 urpm.pm:819
#, c-format
msgid "unmounting %s"
msgstr "lepas mount %s"
-#: po/placeholder.h:45
+#: po/placeholder.h:40
#, c-format
msgid "removing %d obsolete headers in cache"
msgstr "hapus %d header kadaluarsa dlm 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 "file hdlist utk media \"%s\" tak ditemukan"
-#: 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 "media \"%s\" coba memakai hdlist yg telah dipakai, media diabaikan"
+
+#: po/placeholder.h:43 urpm.pm:184
+#, c-format
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr "\"%s\" telah dipakai, tak dapat digunakan utk media tak bernama"
+
+#: po/placeholder.h:44 urpm.pm:191
#, c-format
msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
msgstr "media \"%s\" tak terpakai karena file daftar [%s] tak ada"
-#: po/placeholder.h:48
+#: po/placeholder.h:45
msgid "keeping only files referenced in provides"
msgstr "hanya simpan file yg tertulis di sediaan (provides)"
-#: po/placeholder.h:49
+#: po/placeholder.h:46
#, c-format
msgid "unable to build synthesis file for medium \"%s\""
msgstr "gagal buat file sintesis media \"%s\""
-#: po/placeholder.h:50
+#: po/placeholder.h:47
#, c-format
msgid "found %d headers in cache"
msgstr "temukan %d header di 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 "gagal baca file sediaan [%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 "abaikan %s karena bhs lokalnya belum dipilih"
-#: 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 ""
+"hapus %s utk upgrade ...\n"
+" ke %s karena takkan terupdate dg benar"
+
+#: po/placeholder.h:54 urpm.pm:326
#, c-format
msgid "medium \"%s\" already exists"
msgstr "media \"%s\" telah ada"
-#: po/placeholder.h:54 urpm.pm:295
-#, c-format
-msgid "write config file [%s]"
-msgstr "tulis file konfigurasi [%s]"
-
#: po/placeholder.h:55
#, c-format
msgid "unable to write list file of \"%s\""
msgstr "gagal baca file list \"%s\""
-#: po/placeholder.h:56 urpm.pm:1817
+#: po/placeholder.h:56 urpm.pm:310
#, c-format
-msgid "retrieving [%s]"
-msgstr "ambil [%s]"
-
-#: po/placeholder.h:57 urpm.pm:1819
-#, c-format
-msgid "wget of [%s] failed"
-msgstr "wget [%s] gagal"
+msgid "write config file [%s]"
+msgstr "tulis file konfigurasi [%s]"
-#: po/placeholder.h:58 urpm.pm:1101
+#: po/placeholder.h:57 urpm.pm:1107
#, c-format
msgid "no package named %s"
msgstr "tiada paket bernama %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 "gagal baca file compss [%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 "gagal temukan file hdlist \"%s\", media diabaikan"
-#: po/placeholder.h:61
+#: po/placeholder.h:60
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "bangun file sintesa hdlist utk media \"%s\""
-#: po/placeholder.h:62
+#: po/placeholder.h:61
msgid "computing dependencies"
msgstr "hitung ketergantungan"
-#: po/placeholder.h:63 urpm.pm:868
+#: po/placeholder.h:62
+#, fuzzy, c-format
+msgid "retrieve of [%s] failed"
+msgstr "wget [%s] gagal"
+
+#: po/placeholder.h:63 urpm.pm:874
#, c-format
msgid "write provides file [%s]"
msgstr "tulis file sediaan [%s]"
-#: po/placeholder.h:64 urpm.pm:803
+#: po/placeholder.h:64 urpm.pm:809
#, c-format
msgid "mounting %s"
msgstr "gandeng %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 "
@@ -326,122 +326,134 @@ msgid ""
msgstr ""
"gagal pakai media \"%s\" sbg file list karena telah dipakai oleh media lain"
-#: po/placeholder.h:66 urpm.pm:148
-#, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
-msgstr "media \"%s\" mencoba memakai list yg telah dipakai, media diabaikan"
-
-#: po/placeholder.h:67
+#: po/placeholder.h:66
#, c-format
msgid "reading hdlist file [%s]"
msgstr "baca file hdlist [%s]"
-#: po/placeholder.h:68 urpm.pm:873
+#: po/placeholder.h:67 urpm.pm:879
#, c-format
msgid "write compss file [%s]"
msgstr "tulis file compss [%s]"
-#: po/placeholder.h:69 urpm.pm:827
+#: po/placeholder.h:68 urpm.pm:833
#, c-format
msgid "read depslist file [%s]"
msgstr "baca file ketergantungan [%s]"
-#: po/placeholder.h:70
-#, c-format
-msgid "trying to select inexistant medium \"%s\""
-msgstr "sedang mencoba memilih media tak eksis \"%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 "gagal membuat media \"%s\"\n"
-#: po/placeholder.h:71 urpm.pm:1812
+#: po/placeholder.h:71 urpm.pm:1668
#, c-format
msgid "malformed input: [%s]"
msgstr "input cacat: [%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 "media \"%s\" coba memakai hdlist yg telah dipakai, media diabaikan"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "banyak paket dg nama file rpm sama \"%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"
-msgstr ""
-"hapus %s utk upgrade ...\n"
-" ke %s karena takkan terupdate dg benar"
+msgid "medium \"%s\" tries to use an already used list, medium ignored"
+msgstr "media \"%s\" mencoba memakai list yg telah dipakai, media diabaikan"
-#: po/placeholder.h:77 urpm.pm:865
+#: po/placeholder.h:74 urpm.pm:871
#, c-format
msgid "unable to write provides file [%s]"
msgstr "gagal tulis file sediaan [%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 "gagal mengakses file hdlist \"%s\", media diabaikan"
-#: po/placeholder.h:79 urpm.pm:1005
-msgid "unable to register rpm file"
-msgstr "registrasi file rpm gagal"
-
-#: 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 "gagal cari semua file sintesa, gunakan server parsehdlist"
-#: po/placeholder.h:81 urpm.pm:241
+#: po/placeholder.h:77 urpm.pm:1011
+msgid "unable to register rpm file"
+msgstr "registrasi file rpm gagal"
+
+#: po/placeholder.h:78 urpm.pm:256
#, c-format
msgid "unable to inspect list file for \"%s\", medium ignored"
msgstr "gagal periksa file daftar \"%s\", media diabaikan"
-#: 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 "file list \"%s\" tak koheren, media diabaikan"
-#: po/placeholder.h:83
+#: po/placeholder.h:81
#, c-format
msgid "copy of [%s] failed"
msgstr "gagal salin [%s]"
-#: 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 "coba hapus media \"%s\" yg tak ada"
+
+#: 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 "gagal olah [%s] dg benar"
-#: po/placeholder.h:85 urpm.pm:824
+#: po/placeholder.h:84 urpm.pm:1192
+#, fuzzy, c-format
+msgid "read synthesis file [%s]"
+msgstr "baca file ketergantungan [%s]"
+
+#: po/placeholder.h:85 urpm.pm:830
#, c-format
msgid "unable to read depslist file [%s]"
msgstr "gagal baca file depslist [%s]"
-#: po/placeholder.h:86
-msgid "removable medium not selected"
-msgstr "media portabel tak dipilih"
-
-#: po/placeholder.h:87 urpm.pm:851
+#: po/placeholder.h:86 urpm.pm:857
#, c-format
msgid "read compss file [%s]"
msgstr "baca file compss [%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 "salah syntax dlm file konfigurasi baris %s"
-#: po/placeholder.h:89
+#: po/placeholder.h:88
#, c-format
msgid "building hdlist [%s]"
msgstr "bangun 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 "gagal baca file rpm [%s] dari media \"%s\""
-#: po/placeholder.h:91 urpm.pm:1009
+#: po/placeholder.h:90 urpm.pm:1015
msgid "error registering local packages"
msgstr "salah registrasi paket lokal"
-#: 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 "media nonkoheren \"%s\" bertanda removable, seharusnya tidak"
@@ -451,211 +463,273 @@ msgstr "media nonkoheren \"%s\" bertanda removable, seharusnya tidak"
msgid "unable to build hdlist: %s"
msgstr "gagal bangun 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 "media \"%s\" tak dipilih"
+
+#: po/placeholder.h:95 urpm.pm:1006
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "nama file rpm [%s] tak berlaku"
-#: 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 "media \"%s\" tak dipilih"
+msgid "unknown data associated with %s"
+msgstr "data tak dikenal terasosiasi dg %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 "coba bypass media \"%s\", abaikan"
-#: po/placeholder.h:97 urpm.pm:863
+#: po/placeholder.h:98 urpm.pm:869
#, c-format
msgid "write depslist file [%s]"
msgstr "tulis file depslist [%s]"
-#: po/placeholder.h:98 urpm.pm:1322
-#, c-format
-msgid "unknown data associated with %s"
-msgstr "data tak dikenal terasosiasi dg %s"
-
-#: po/placeholder.h:99
-#, c-format
-msgid "source of [%s] not found as [%s]"
-msgstr "source [%s] tak ditemukan sbg [%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 "gagal mengakses file list \"%s\", media diabaikan"
-#: 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 "hindari pilih %s karena file yg diupdate tak cukup"
-#: po/placeholder.h:102
-#, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
-msgstr "wget [%s] gagal (mungkin wget hilang?)"
-
-#: po/placeholder.h:103 urpm.pm:1001
+#: po/placeholder.h:101 urpm.pm:1007
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "gagal akses file 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 "gagal tulis file depslist [%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 ""
+"hapus %s utk upgrade ...\n"
+" ke %s karena takkan ter-upgrade dg benar!"
+
+#: po/placeholder.h:107 urpm.pm:342 urpm.pm:1630
#, c-format
msgid "unable to access medium \"%s\""
msgstr "gagal akses media \"%s\""
-#: po/placeholder.h:106 urpm.pm:988
+#: po/placeholder.h:108 urpm.pm:994
#, c-format
msgid "relocated %s entries in depslist"
msgstr "%s entri di depslist direlokasikan"
-#: 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 "gagal olah dg benar [%s] pada nilai \"%s\""
+msgid "trying to select inexistent medium \"%s\""
+msgstr "sedang mencoba memilih media tak eksis \"%s\""
+
+#: po/placeholder.h:110 urpm.pm:97
+#, fuzzy
+msgid "wget failed\n"
+msgstr "wget [%s] gagal"
-#: 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 "tiada file rpm tertemukan dari [%s]"
+msgid "unable to parse correctly [%s] on value \"%s\""
+msgstr "gagal olah dg benar [%s] pada nilai \"%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 "Paket berikut berisi %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 "banyak paket dg nama file rpm sama \"%s\""
+msgid "no rpm files found from [%s]"
+msgstr "tiada file rpm tertemukan dari [%s]"
-#: po/placeholder.h:111 urpm.pm:1920
+#: po/placeholder.h:114 urpm.pm:1772
#, c-format
msgid "selecting %s using obsoletes"
msgstr "pilih %s menggunakan daftar kadaluarsa"
-#: po/placeholder.h:112 urpm.pm:2031
+#: po/placeholder.h:115 urpm.pm:1888
#, c-format
msgid "selecting %s by selection on files"
msgstr "pilih %s menggunakan pilihan file"
-#: 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 "gagal tentukan media file hdlist [%s] ini"
-#: 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 - cetak semua tag."
+
+#: po/placeholder.h:121 urpmi:361
+msgid "everything already installed"
+msgstr "semua telah terinstal"
+
+#: po/placeholder.h:122 urpmi:98
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: opsi \"-%s\" tak dikenal, cek pemakaian dg --help\n"
+
+#: po/placeholder.h:123 urpmi:194
+msgid "One of the following packages is needed:"
+msgstr "Salah satu paket berikut dibutuhkan:"
+
+#: 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 "Instalasi gagal"
-#: po/placeholder.h:115 urpmi:279
-msgid "Press enter when it's done..."
-msgstr "Tekan [Enter] jika selesai.."
+#: 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 "Salah pilih, coba lagi\n"
+#: po/placeholder.h:134
+#, fuzzy
+msgid " --X - use X interface.\n"
+msgstr " --all - cetak semua 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 ""
+"Paket berikut akan di-install agar syarat ketergantungan terpenuhi (%d MB)"
+
+#: po/placeholder.h:136 urpmi:320 urpmi:344
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Coba instalasi tanpa cek ketergantungan? (y/T) "
+
+#: 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 - cetak semua tag."
+
+#: po/placeholder.h:144 urpmi:202
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "Pilihan Anda? (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 "Ini software gratis dan boleh disebar sesuai lisensi publik GNU."
+
+#: po/placeholder.h:152 urpmi:328 urpmi:352
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Coba instalasi lebih keras (--force)? (y/T) "
+
+#: po/placeholder.h:154
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
msgstr ""
-"urpmi versi %s\n"
-"Hak Cipta (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"Ini adalah piranti lunak gratis & boleh disebar sesuai GNU GPL.\n"
-"pemakaian:\n"
-" --help - tampilan pertolongan.\n"
-" --auto - seleksi otomatis paket terbaik.\n"
-" --auto-select - seleksi otomatis paket utk upgrade system.\n"
-" --force - paksa pemanggilan meski beberapa paket tak ada.\n"
-" --X - pakai interface X.\n"
-" --best-output - pilih interface terbaik menurut mode: X atau teks.\n"
-" -a - pilih semua yg cocok dg baris perintah.\n"
-" -m - pilih perlengkapan minimum yg dibutuhkan (standar).\n"
-" -M - pilih perlengkapan maximum yg dibutuhkan.\n"
-" -c - pilih metode komplit utk solusi kebutuhan.\n"
-" -p - allow search in provides to find package.\n"
-" -q - mode diam.\n"
-" -v - mode cerewet.\n"
-" nama / file rpm (hanya utk root) di kalimat perintan telah terinstal.\n"
-
-#: po/placeholder.h:142 urpmi:362
-msgid "everything already installed"
-msgstr "semua telah terinstal"
-#: po/placeholder.h:143 urpmi:247
-#, c-format
+#: po/placeholder.h:155 urpmi:205
+msgid "Sorry, bad choice, try again\n"
+msgstr "Salah pilih, coba lagi\n"
+
+#: po/placeholder.h:156
msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+" names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: po/placeholder.h:158
+msgid " -a - select all matches on command line.\n"
+msgstr ""
+
+#: po/placeholder.h:159
+msgid " --curl - use curl to retrieve distant files.\n"
msgstr ""
-"Paket berikut akan di-install agar syarat ketergantungan terpenuhi (%d MB)"
-#: po/placeholder.h:144 urpmi:296
+#: po/placeholder.h:160 urpmi:294
#, c-format
msgid "installing %s\n"
msgstr "instalasi %s\n"
-#: po/placeholder.h:145 urpmi:198
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Pilihan Anda? (1-%d) "
-
-#: po/placeholder.h:146 urpmi:321 urpmi:345
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Coba instalasi tanpa cek ketergantungan? (y/T) "
-
-#: po/placeholder.h:147 urpmi:190
-msgid "One of the following packages is needed:"
-msgstr "Salah satu paket berikut dibutuhkan:"
-
-#: po/placeholder.h:148 urpmi:149
+#: po/placeholder.h:161 urpmi:152
msgid "Only superuser is allowed to install local packages"
msgstr "Hanya superuser yang dapat meng-install paket lokal"
-#: 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 "Masukkan media \"%s\" ke perangkat [%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 "tak dapat mengambil paket asal, batal"
-#: po/placeholder.h:151 urpmi:329 urpmi:353
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Coba instalasi lebih keras (--force)? (y/T) "
+#: po/placeholder.h:165 urpmi:102
+#, fuzzy
+msgid "Only superuser is allowed to install packages"
+msgstr "Hanya superuser yang dapat meng-install paket lokal"
+
+#: po/placeholder.h:166 urpmi:193
+#, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Salah satu paket berikut dibutuhkan utk instalasi %s:"
+
+#: po/placeholder.h:167 urpmi:277
+msgid "Press Enter when it's done..."
+msgstr "Tekan [Enter] jika selesai.."
-#: po/placeholder.h:155 urpmi.addmedia:46
+#: po/placeholder.h:168 urpmi.addmedia:46
#, c-format
msgid ""
"%s\n"
@@ -664,7 +738,7 @@ msgstr ""
"%s\n"
"`with' tak tercantum utk media ftp\n"
-#: po/placeholder.h:159
+#: po/placeholder.h:172
msgid ""
"usage: urpmi.addmedia [--update] <name> <url>\n"
"where <url> is one of\n"
@@ -684,17 +758,17 @@ msgstr ""
" http://<host>/<path> with <nama file relatif hdlist>\n"
" removable_<device>://<path>\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 "gagal membuat media \"%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 "gagal update media \"%s\"\n"
-#: po/placeholder.h:170 urpmi.addmedia:42
+#: po/placeholder.h:183 urpmi.addmedia:42
#, c-format
msgid ""
"%s\n"
@@ -703,7 +777,7 @@ msgstr ""
"%s\n"
"device `%s' tak ada\n"
-#: po/placeholder.h:174 urpmi.addmedia:44
+#: po/placeholder.h:187 urpmi.addmedia:44
#, c-format
msgid ""
"%s\n"
@@ -712,7 +786,7 @@ msgstr ""
"%s\n"
"<path relatif hdlist> hilang\n"
-#: po/placeholder.h:178
+#: po/placeholder.h:191
#, c-format
msgid ""
"usage: urpmi.update [-a] <name> ...\n"
@@ -731,11 +805,11 @@ msgstr ""
"\n"
"opsi tak terfahami '%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 "tak ada update (pakailah urpmi.addmedia utk tambah media)\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"
@@ -744,11 +818,11 @@ msgstr ""
"masukan update hilang\n"
"(satu dari %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 "tak ada penghapusan (pakailah urpmi.addmedia utk tambah media)\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"
@@ -757,7 +831,7 @@ msgstr ""
"masukan utk penghapusan hilang\n"
"(satu dari %s)\n"
-#: po/placeholder.h:197
+#: po/placeholder.h:210
#, c-format
msgid ""
"usage: urpmi.removemedia [-a] <name> ...\n"
@@ -772,125 +846,112 @@ msgstr ""
"\n"
"opsi tak dipahami '%s'\n"
-#: po/placeholder.h:204 urpmq:85
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: tak dapat membaca file rpm \"%s\"\n"
-
-#: po/placeholder.h:206 urpmq:82
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: opsi asing \"-%s\", cek pemakaian dg --help\n"
+#: po/placeholder.h:217
+#, fuzzy
+msgid " -h - print this help message.\n"
+msgstr " --all - cetak semua 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 "bbrpp paket harus dihapus agr ter-upgrade, ini belum ter-support\n"
-#: po/placeholder.h:208
+#: po/placeholder.h:219
+#, fuzzy
+msgid " -g - print groups too with name.\n"
+msgstr " --group - cetak grup tag: grup."
+
+#: po/placeholder.h:220 urpmq:84
#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: tak dapat membaca file 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 " baris perintah tapi tanpa nama paket)."
+
+#: 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 "Ini software gratis dan boleh disebar sesuai lisensi publik GNU."
+
+#: po/placeholder.h:231
+#, fuzzy
+msgid " -d - extend query to package dependencies.\n"
+msgstr " baris perintah tapi tanpa nama paket)."
+
+#: 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 ""
-"urpmq versi %s\n"
-"Hakcipta (C) 2000, 2001 MandrakeSoft.\n"
-"Ini adalah piranti lunak gratis dan boleh disebar dg lisensi publik GNU.\n"
-"pemakaian:\n"
-" -h - cetak pertolongan.\n"
-" -v - mode lengkap.\n"
-" -d - tambah query ketergantungan paket.\n"
-" -u - hapus paket jika versi yg lebih baik telah terinstal.\n"
-" -m - tambah query ketergantungan paket, hapus paket terinstal\n"
-" yg menyediakan keperluan, tambah paket yg mungkin\n"
-" menghalangi upgrade.\n"
-" -M - tambah query ketergantungan paket, hapus paket terinstal\n"
-" hanya jika sama atau lebih baru.\n"
-" -c - pilih metode komplit utk solusi kebutuhan.\n"
-" -p - izinkan pencarian dlm sediaan utk menemukan paket.\n"
-" -g - cetak juga grup dg nama.\n"
-" -r - cetak juga versi dan release dg nama.\n"
-" --update - pakai hanya media update.\n"
-" --auto-select - pilih otomatis paket utk upgrade sistem.\n"
-" --headers - urai header paket dlm db urpmi ke stdout (hanya root).\n"
-" --sources - berikan semua paket source sebelum download (root saja).\n"
-" --force - paksa eksekusi meski bbrp paket tak ada.\n"
-" nama atau file rpm dlm baris perintah telah ditanyakan.\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: opsi asing \"-%s\", cek pemakaian dg --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 "gagal membuat media \"%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 "baca file ketergantungan [%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 "urpmi versi %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: opsi \"-%s\" tak dikenal, cek pemakaian dg --help\n"
+#: urpm.pm:1797 urpm.pm:1806
+msgid ", $otherPackage, "
+msgstr ", $otherPackage, "
-#: urpmi:102
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr "Hanya superuser yang dapat meng-install paket lokal"
+#: urpm.pm:1797 urpm.pm:1806
+msgid "));"
+msgstr "));"
-#: urpmi:189
-#, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Salah satu paket berikut dibutuhkan utk instalasi %s:"
+#: 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 "urpmi versi %s"
#: urpmi.addmedia:30
msgid "usage: urpmi.addmedia [--update] <name> <url>"
@@ -922,8 +983,126 @@ msgstr ", $_);"
msgid "urpmq version %s"
msgstr "urpmq versi %s"
-#~ msgid "));"
-#~ msgstr "));"
+#~ msgid "retrieving [%s]"
+#~ msgstr "ambil [%s]"
+
+#~ msgid "wget of [%s] failed (maybe wget is missing?)"
+#~ msgstr "wget [%s] gagal (mungkin wget hilang?)"
+
+#~ msgid "unable to copy source of [%s] from [%s]"
+#~ msgstr "gagal copy source [%s] dari [%s]"
+
+#~ msgid "removable medium not selected"
+#~ msgstr "media portabel tak dipilih"
+
+#~ msgid "source of [%s] not found as [%s]"
+#~ msgstr "source [%s] tak ditemukan sbg [%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 ""
+#~ "urpmi versi %s\n"
+#~ "Hak Cipta (C) 1999, 2000, 2001 MandrakeSoft.\n"
+#~ "Ini adalah piranti lunak gratis & boleh disebar sesuai GNU GPL.\n"
+#~ "pemakaian:\n"
+#~ " --help - tampilan pertolongan.\n"
+#~ " --auto - seleksi otomatis paket terbaik.\n"
+#~ " --auto-select - seleksi otomatis paket utk upgrade system.\n"
+#~ " --force - paksa pemanggilan meski beberapa paket tak ada.\n"
+#~ " --X - pakai interface X.\n"
+#~ " --best-output - pilih interface terbaik menurut mode: X atau teks.\n"
+#~ " -a - pilih semua yg cocok dg baris perintah.\n"
+#~ " -m - pilih perlengkapan minimum yg dibutuhkan (standar).\n"
+#~ " -M - pilih perlengkapan maximum yg dibutuhkan.\n"
+#~ " -c - pilih metode komplit utk solusi kebutuhan.\n"
+#~ " -p - allow search in provides to find package.\n"
+#~ " -q - mode diam.\n"
+#~ " -v - mode cerewet.\n"
+#~ " nama / file rpm (hanya utk root) di kalimat perintan telah terinstal.\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 ""
+#~ "urpmq versi %s\n"
+#~ "Hakcipta (C) 2000, 2001 MandrakeSoft.\n"
+#~ "Ini adalah piranti lunak gratis dan boleh disebar dg lisensi publik GNU.\n"
+#~ "pemakaian:\n"
+#~ " -h - cetak pertolongan.\n"
+#~ " -v - mode lengkap.\n"
+#~ " -d - tambah query ketergantungan paket.\n"
+#~ " -u - hapus paket jika versi yg lebih baik telah terinstal.\n"
+#~ " -m - tambah query ketergantungan paket, hapus paket "
+#~ "terinstal\n"
+#~ " yg menyediakan keperluan, tambah paket yg mungkin\n"
+#~ " menghalangi upgrade.\n"
+#~ " -M - tambah query ketergantungan paket, hapus paket "
+#~ "terinstal\n"
+#~ " hanya jika sama atau lebih baru.\n"
+#~ " -c - pilih metode komplit utk solusi kebutuhan.\n"
+#~ " -p - izinkan pencarian dlm sediaan utk menemukan paket.\n"
+#~ " -g - cetak juga grup dg nama.\n"
+#~ " -r - cetak juga versi dan release dg nama.\n"
+#~ " --update - pakai hanya media update.\n"
+#~ " --auto-select - pilih otomatis paket utk upgrade sistem.\n"
+#~ " --headers - urai header paket dlm db urpmi ke stdout (hanya "
+#~ "root).\n"
+#~ " --sources - berikan semua paket source sebelum download (root "
+#~ "saja).\n"
+#~ " --force - paksa eksekusi meski bbrp paket tak ada.\n"
+#~ " nama atau file rpm dlm baris perintah telah ditanyakan.\n"
#~ msgid "), $_);"
#~ msgstr "), $_);"
diff --git a/po/is.po b/po/is.po
index e640256d..3709bd8d 100644
--- a/po/is.po
+++ b/po/is.po
@@ -6,7 +6,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: 2000-04-19 23:05-0400\n"
"Last-Translator: Thorarinn R. Einarsson <thori@mindspring.com>\n"
"Language-Team: is <kde-isl@mmedia.is>\n"
@@ -24,27 +24,27 @@ msgid ""
"You requested installation of package $rpm\n"
msgstr ""
-#: _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 "Er �a� � lagi?"
-#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:281
+#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:279
msgid "Ok"
msgstr "� lagi"
-#: _irpm:34 po/placeholder.h:116 urpmi:252 urpmi:282
+#: _irpm:34 po/placeholder.h:119 urpmi:252 urpmi:280
msgid "Cancel"
msgstr "H�tta vi�"
-#: _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 "Nn"
-#: _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 "JjYy"
-#: _irpm:42 po/placeholder.h:118 urpmi:258
+#: _irpm:42 po/placeholder.h:157 urpmi:258
msgid " (Y/n) "
msgstr " (J/n) "
@@ -147,120 +147,120 @@ msgstr ""
msgid "urpmi is not installed"
msgstr ""
-#: po/placeholder.h:29 urpm.pm:283
+#: po/placeholder.h:29
+#, c-format
+msgid "reading synthesis file [%s]"
+msgstr ""
+
+#: po/placeholder.h:30 urpm.pm:298
#, c-format
msgid "unable to write config file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:31
+#: po/placeholder.h:32
#, c-format
msgid "nothing to write in list file for \"%s\""
msgstr ""
-#: 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 ""
-#: po/placeholder.h:33
+#: po/placeholder.h:34
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr ""
-#: po/placeholder.h:34
+#: po/placeholder.h:35
#, c-format
msgid "nothing written in list file for \"%s\""
msgstr ""
-#: po/placeholder.h:35 urpm.pm:1951
-#, c-format
-msgid ""
-"removing %s to upgrade ...\n"
-" to %s since it will not upgrade correctly!"
-msgstr ""
-
-#: po/placeholder.h:39 urpm.pm:839
+#: po/placeholder.h:36 urpm.pm:845
#, c-format
msgid "read provides file [%s]"
msgstr ""
-#: po/placeholder.h:40
+#: po/placeholder.h:37 urpm.pm:1549
#, c-format
-msgid "trying to remove inexistant medium \"%s\""
+msgid "package %s is not found."
msgstr ""
-#: po/placeholder.h:41 urpm.pm:1692
+#: po/placeholder.h:38 urpm.pm:876
#, c-format
-msgid "package %s is not found."
+msgid "unable to write compss file [%s]"
msgstr ""
-#: po/placeholder.h:42
+#: po/placeholder.h:39 urpm.pm:819
#, c-format
-msgid "unable to copy source of [%s] from [%s]"
+msgid "unmounting %s"
msgstr ""
-#: po/placeholder.h:43 urpm.pm:870
+#: po/placeholder.h:40
#, c-format
-msgid "unable to write compss file [%s]"
+msgid "removing %d obsolete headers in cache"
msgstr ""
-#: po/placeholder.h:44 urpm.pm:813
+#: po/placeholder.h:41 urpm.pm:925 urpm.pm:1491
#, c-format
-msgid "unmounting %s"
+msgid "no hdlist file found for medium \"%s\""
msgstr ""
-#: po/placeholder.h:45
+#: po/placeholder.h:42 urpm.pm:160
#, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
msgstr ""
-#: po/placeholder.h:46 urpm.pm:919 urpm.pm:1634
+#: po/placeholder.h:43 urpm.pm:184
#, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
msgstr ""
-#: po/placeholder.h:47 urpm.pm:176
+#: po/placeholder.h:44 urpm.pm:191
#, c-format
msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
msgstr ""
-#: po/placeholder.h:48
+#: po/placeholder.h:45
msgid "keeping only files referenced in provides"
msgstr ""
-#: po/placeholder.h:49
+#: po/placeholder.h:46
#, c-format
msgid "unable to build synthesis file for medium \"%s\""
msgstr ""
-#: po/placeholder.h:50
+#: po/placeholder.h:47
#, c-format
msgid "found %d headers in cache"
msgstr ""
-#: po/placeholder.h:51 urpm.pm:836
+#: po/placeholder.h:48 urpm.pm:842
#, c-format
msgid "unable to read provides file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:53 urpm.pm:311
+#: po/placeholder.h:50
#, c-format
-msgid "medium \"%s\" already exists"
+msgid ""
+"removing %s to upgrade to %s ...\n"
+" since it will not be updated otherwise"
msgstr ""
-#: po/placeholder.h:54 urpm.pm:295
+#: po/placeholder.h:54 urpm.pm:326
#, c-format
-msgid "write config file [%s]"
+msgid "medium \"%s\" already exists"
msgstr ""
#: po/placeholder.h:55
@@ -268,324 +268,347 @@ msgstr ""
msgid "unable to write list file of \"%s\""
msgstr ""
-#: po/placeholder.h:56 urpm.pm:1817
+#: po/placeholder.h:56 urpm.pm:310
#, c-format
-msgid "retrieving [%s]"
-msgstr ""
-
-#: po/placeholder.h:57 urpm.pm:1819
-#, c-format
-msgid "wget of [%s] failed"
+msgid "write config file [%s]"
msgstr ""
-#: po/placeholder.h:58 urpm.pm:1101
+#: po/placeholder.h:57 urpm.pm:1107
#, fuzzy, c-format
msgid "no package named %s"
msgstr "Enginn '%s' pakki\n"
-#: po/placeholder.h:59 urpm.pm:848
+#: po/placeholder.h:58 urpm.pm:854
#, c-format
msgid "unable to read compss file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:61
+#: po/placeholder.h:60
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr ""
-#: po/placeholder.h:62
+#: po/placeholder.h:61
msgid "computing dependencies"
msgstr ""
-#: po/placeholder.h:63 urpm.pm:868
+#: po/placeholder.h:62
+#, c-format
+msgid "retrieve of [%s] failed"
+msgstr ""
+
+#: po/placeholder.h:63 urpm.pm:874
#, c-format
msgid "write provides file [%s]"
msgstr ""
-#: po/placeholder.h:64 urpm.pm:803
+#: po/placeholder.h:64 urpm.pm:809
#, fuzzy, c-format
msgid "mounting %s"
msgstr "Set inn %s\n"
-#: 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 "
"medium"
msgstr ""
-#: po/placeholder.h:66 urpm.pm:148
-#, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
-msgstr ""
-
-#: po/placeholder.h:67
+#: po/placeholder.h:66
#, c-format
msgid "reading hdlist file [%s]"
msgstr ""
-#: po/placeholder.h:68 urpm.pm:873
+#: po/placeholder.h:67 urpm.pm:879
#, c-format
msgid "write compss file [%s]"
msgstr ""
-#: po/placeholder.h:69 urpm.pm:827
+#: po/placeholder.h:68 urpm.pm:833
#, c-format
msgid "read depslist file [%s]"
msgstr ""
-#: po/placeholder.h:70
+#: po/placeholder.h:69 urpm.pm:103
+msgid "curl failed\n"
+msgstr ""
+
+#: po/placeholder.h:70 urpm.pm:281 urpm.pm:284
#, c-format
-msgid "trying to select inexistant medium \"%s\""
+msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr ""
-#: po/placeholder.h:71 urpm.pm:1812
+#: po/placeholder.h:71 urpm.pm:1668
#, c-format
msgid "malformed input: [%s]"
msgstr ""
-#: 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"
+msgid "there are multiple packages with the same rpm filename \"%s\""
msgstr ""
-#: 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 ""
-#: po/placeholder.h:77 urpm.pm:865
+#: po/placeholder.h:74 urpm.pm:871
#, c-format
msgid "unable to write provides file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:79 urpm.pm:1005
-msgid "unable to register rpm file"
+#: po/placeholder.h:76 urpm.pm:1215
+msgid "unable to find all synthesis file, using parsehdlist server"
msgstr ""
-#: po/placeholder.h:80 urpm.pm:1362
-msgid "unable to find all synthesis file, using parsehdlist server"
+#: po/placeholder.h:77 urpm.pm:1011
+msgid "unable to register rpm file"
msgstr ""
-#: po/placeholder.h:81 urpm.pm:241
+#: po/placeholder.h:78 urpm.pm:256
#, c-format
msgid "unable to inspect list file for \"%s\", medium ignored"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:83
+#: po/placeholder.h:81
#, c-format
msgid "copy of [%s] failed"
msgstr ""
-#: 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 ""
+
+#: 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 ""
-#: po/placeholder.h:85 urpm.pm:824
+#: po/placeholder.h:84 urpm.pm:1192
#, c-format
-msgid "unable to read depslist file [%s]"
+msgid "read synthesis file [%s]"
msgstr ""
-#: po/placeholder.h:86
-msgid "removable medium not selected"
+#: po/placeholder.h:85 urpm.pm:830
+#, c-format
+msgid "unable to read depslist file [%s]"
msgstr ""
-#: po/placeholder.h:87 urpm.pm:851
+#: po/placeholder.h:86 urpm.pm:857
#, c-format
msgid "read compss file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:89
+#: po/placeholder.h:88
#, c-format
msgid "building hdlist [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:91 urpm.pm:1009
+#: po/placeholder.h:90 urpm.pm:1015
msgid "error registering local packages"
msgstr ""
-#: po/placeholder.h:92 urpm.pm:1762
+#: po/placeholder.h:91 urpm.pm:273
#, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "taking removable device as \"%s\""
msgstr ""
-#: po/placeholder.h:93
+#: po/placeholder.h:92 urpm.pm:1619
#, c-format
-msgid "unable to build hdlist: %s"
+msgid "incoherent medium \"%s\" marked removable but not really"
msgstr ""
-#: po/placeholder.h:94 urpm.pm:1000
+#: po/placeholder.h:93
#, c-format
-msgid "invalid rpm file name [%s]"
+msgid "unable to build hdlist: %s"
msgstr ""
-#: po/placeholder.h:95 urpm.pm:1736 urpm.pm:1739 urpm.pm:1758
+#: po/placeholder.h:94 urpm.pm:1593 urpm.pm:1596 urpm.pm:1615
#, c-format
msgid "medium \"%s\" is not selected"
msgstr ""
-#: po/placeholder.h:96 urpm.pm:207
+#: po/placeholder.h:95 urpm.pm:1006
#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "invalid rpm file name [%s]"
msgstr ""
-#: po/placeholder.h:97 urpm.pm:863
+#: po/placeholder.h:96 urpm.pm:1175
#, c-format
-msgid "write depslist file [%s]"
+msgid "unknown data associated with %s"
msgstr ""
-#: po/placeholder.h:98 urpm.pm:1322
+#: po/placeholder.h:97 urpm.pm:222
#, c-format
-msgid "unknown data associated with %s"
+msgid "trying to bypass existing medium \"%s\", avoiding"
msgstr ""
-#: po/placeholder.h:99
+#: po/placeholder.h:98 urpm.pm:869
#, c-format
-msgid "source of [%s] not found as [%s]"
+msgid "write depslist file [%s]"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: po/placeholder.h:102
+#: po/placeholder.h:101 urpm.pm:1007
#, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
+msgid "unable to access rpm file [%s]"
msgstr ""
-#: po/placeholder.h:103 urpm.pm:1001
+#: po/placeholder.h:102 urpm.pm:866
#, c-format
-msgid "unable to access rpm file [%s]"
+msgid "unable to write depslist file [%s]"
msgstr ""
-#: po/placeholder.h:104 urpm.pm:860
+#: po/placeholder.h:103
#, c-format
-msgid "unable to write depslist file [%s]"
+msgid ""
+"removing %s to upgrade to %s ...\n"
+" since it will not upgrade correctly!"
msgstr ""
-#: po/placeholder.h:105 urpm.pm:327 urpm.pm:1773
+#: po/placeholder.h:107 urpm.pm:342 urpm.pm:1630
#, c-format
msgid "unable to access medium \"%s\""
msgstr ""
-#: po/placeholder.h:106 urpm.pm:988
+#: po/placeholder.h:108 urpm.pm:994
#, c-format
msgid "relocated %s entries in depslist"
msgstr ""
-#: 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\""
+msgid "trying to select inexistent medium \"%s\""
+msgstr ""
+
+#: po/placeholder.h:110 urpm.pm:97
+msgid "wget failed\n"
msgstr ""
-#: 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]"
+msgid "unable to parse correctly [%s] on value \"%s\""
msgstr ""
-#: po/placeholder.h:109 urpm.pm:1104
+#: po/placeholder.h:112 urpm.pm:1110
#, fuzzy, c-format
msgid "The following packages contain %s: %s"
msgstr "Eftirfarandi pakkar innihalda %s: %s\n"
-#: 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\""
+msgid "no rpm files found from [%s]"
msgstr ""
-#: po/placeholder.h:111 urpm.pm:1920
+#: po/placeholder.h:114 urpm.pm:1772
#, c-format
msgid "selecting %s using obsoletes"
msgstr ""
-#: po/placeholder.h:112 urpm.pm:2031
+#: po/placeholder.h:115 urpm.pm:1888
#, c-format
msgid "selecting %s by selection on files"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:114 urpmi:308 urpmi:315 urpmi:328 urpmi:339 urpmi:352
-msgid "Installation failed"
-msgstr "Innsetning br�st"
-
-#: po/placeholder.h:115 urpmi:279
-msgid "Press enter when it's done..."
-msgstr "Sl��u � ENTER eftir�..."
+#: po/placeholder.h:120
+msgid " --help - print this help message.\n"
+msgstr ""
-#: po/placeholder.h:117 urpmi:201
-msgid "Sorry, bad choice, try again\n"
-msgstr "Sl�mt val. Reyndu aftur\n"
+#: po/placeholder.h:121 urpmi:361
+msgid "everything already installed"
+msgstr "Allt er n� �egar komi� inn"
-#: po/placeholder.h:120
+#: po/placeholder.h:122 urpmi:98
#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr ""
+
+#: po/placeholder.h:123 urpmi:194
+msgid "One of the following packages is needed:"
+msgstr "Krefst einnig eins af af eftirt�ldum p�kkum:"
+
+#: po/placeholder.h:124 po/placeholder.h:222
+msgid " --update - use only update media.\n"
+msgstr ""
+
+#: po/placeholder.h:125 urpmi:299
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"
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
msgstr ""
-#: po/placeholder.h:142 urpmi:362
-msgid "everything already installed"
-msgstr "Allt er n� �egar komi� inn"
+#: 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 "Innsetning br�st"
-#: po/placeholder.h:143 urpmi:247
+#: po/placeholder.h:132 po/placeholder.h:234
+msgid ""
+" --auto-select - automatically select packages for upgrading the system.\n"
+msgstr ""
+
+#: po/placeholder.h:134
+msgid " --X - use X interface.\n"
+msgstr ""
+
+#: po/placeholder.h:135 urpmi:247
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -594,49 +617,112 @@ msgstr ""
"Til a� uppfylla innsetningarkr�fur ver�a eftirtaldir pakkar settir inn (%d "
"MB)"
-#: po/placeholder.h:144 urpmi:296
-#, c-format
-msgid "installing %s\n"
-msgstr "Set inn %s\n"
+#: po/placeholder.h:136 urpmi:320 urpmi:344
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Pr�fa innsetningu �n �ess a� athuga hva�a skr�r �arf? (j/N) "
+
+#: 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:145 urpmi:198
+#: po/placeholder.h:142 po/placeholder.h:241
+msgid " -v - verbose mode.\n"
+msgstr ""
+
+#: po/placeholder.h:143
+msgid " -q - quiet mode.\n"
+msgstr ""
+
+#: po/placeholder.h:144 urpmi:202
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Hva� viltu? (1-%d) "
-#: po/placeholder.h:146 urpmi:321 urpmi:345
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Pr�fa innsetningu �n �ess a� athuga hva�a skr�r �arf? (j/N) "
+#: po/placeholder.h:145
+msgid " --wget - use wget to retrieve distant files.\n"
+msgstr ""
-#: po/placeholder.h:147 urpmi:190
-msgid "One of the following packages is needed:"
-msgstr "Krefst einnig eins af af eftirt�ldum p�kkum:"
+#: po/placeholder.h:146
+#, 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"
+msgstr ""
+
+#: po/placeholder.h:152 urpmi:328 urpmi:352
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Pr�fa sterkari innsetningu (--force)? (j/N) "
+
+#: po/placeholder.h:154
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+
+#: po/placeholder.h:155 urpmi:205
+msgid "Sorry, bad choice, try again\n"
+msgstr "Sl�mt val. Reyndu aftur\n"
+
+#: po/placeholder.h:156
+msgid ""
+" names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: po/placeholder.h:158
+msgid " -a - select all matches on command line.\n"
+msgstr ""
-#: po/placeholder.h:148 urpmi:149
+#: 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 "Set inn %s\n"
+
+#: po/placeholder.h:161 urpmi:152
msgid "Only superuser is allowed to install local packages"
msgstr ""
-#: po/placeholder.h:149 urpmi:278
+#: po/placeholder.h:162 urpmi:276
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Vinsamlega settu inn %s %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 ""
-#: po/placeholder.h:151 urpmi:329 urpmi:353
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Pr�fa sterkari innsetningu (--force)? (j/N) "
+#: po/placeholder.h:165 urpmi:102
+msgid "Only superuser is allowed to install packages"
+msgstr ""
+
+#: po/placeholder.h:166 urpmi:193
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Krefst einnig eins af af eftirt�ldum p�kkum:"
-#: po/placeholder.h:155 urpmi.addmedia:46
+#: po/placeholder.h:167 urpmi:277
+msgid "Press Enter when it's done..."
+msgstr "Sl��u � ENTER eftir�..."
+
+#: po/placeholder.h:168 urpmi.addmedia:46
#, c-format
msgid ""
"%s\n"
"`with' missing for ftp media\n"
msgstr ""
-#: po/placeholder.h:159
+#: po/placeholder.h:172
msgid ""
"usage: urpmi.addmedia [--update] <name> <url>\n"
"where <url> is one of\n"
@@ -648,31 +734,31 @@ msgid ""
" removable_<device>://<path>\n"
msgstr ""
-#: po/placeholder.h:168 urpmi.addmedia:57
+#: po/placeholder.h:181 urpmi.addmedia:57
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr ""
-#: po/placeholder.h:169 urpmi.addmedia:58
+#: po/placeholder.h:182 urpmi.addmedia:58
#, c-format
msgid "unable to update medium \"%s\"\n"
msgstr ""
-#: po/placeholder.h:170 urpmi.addmedia:42
+#: po/placeholder.h:183 urpmi.addmedia:42
#, c-format
msgid ""
"%s\n"
"device `%s' do not exist\n"
msgstr ""
-#: po/placeholder.h:174 urpmi.addmedia:44
+#: po/placeholder.h:187 urpmi.addmedia:44
#, c-format
msgid ""
"%s\n"
"<relative path of hdlist> missing\n"
msgstr ""
-#: po/placeholder.h:178
+#: po/placeholder.h:191
#, c-format
msgid ""
"usage: urpmi.update [-a] <name> ...\n"
@@ -684,29 +770,29 @@ msgid ""
"unknown options '%s'\n"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:188 urpmi.update:53
+#: po/placeholder.h:201 urpmi.update:53
#, c-format
msgid ""
"the entry to update is missing\n"
"(one of %s)\n"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:193 urpmi.removemedia:46
+#: po/placeholder.h:206 urpmi.removemedia:46
#, c-format
msgid ""
"the entry to remove is missing\n"
"(one of %s)\n"
msgstr ""
-#: po/placeholder.h:197
+#: po/placeholder.h:210
#, c-format
msgid ""
"usage: urpmi.removemedia [-a] <name> ...\n"
@@ -716,23 +802,38 @@ msgid ""
"unknown options '%s'\n"
msgstr ""
-#: po/placeholder.h:204 urpmq:85
+#: po/placeholder.h:217
+msgid " -h - print this help message.\n"
+msgstr ""
+
+#: po/placeholder.h:218 urpmq:130
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+
+#: po/placeholder.h:219
+msgid " -g - print groups too with name.\n"
+msgstr ""
+
+#: po/placeholder.h:220 urpmq:84
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr ""
-#: po/placeholder.h:206 urpmq:82
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#: po/placeholder.h:221
+msgid " names or rpm files given on command line are queried.\n"
msgstr ""
-#: po/placeholder.h:207 urpmq:131
-msgid ""
-"some package have to be removed for being upgraded, this is not supported "
-"yet\n"
+#: po/placeholder.h:223
+msgid " -r - print version and release too with name.\n"
+msgstr ""
+
+#: po/placeholder.h:224
+msgid " -f - print version, release and arch with name.\n"
msgstr ""
-#: po/placeholder.h:208
+#: po/placeholder.h:225
#, c-format
msgid ""
"urpmq version %s\n"
@@ -740,76 +841,68 @@ msgid ""
"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 package do not exist.\n"
-" names or rpm files given on command line are queried.\n"
msgstr ""
-#: urpm.pm:257
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:231
+msgid " -d - extend query to package dependencies.\n"
msgstr ""
-#: urpm.pm:258
-#, c-format
-msgid "taking removable device as \"%s\""
+#: po/placeholder.h:232
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
msgstr ""
-#: urpm.pm:262
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
+#: po/placeholder.h:233
+msgid ""
+" -c - choose complete method for resolving requires closure.\n"
msgstr ""
-#: urpm.pm:266 urpm.pm:269
+#: po/placeholder.h:235 urpmq:81
#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
msgstr ""
-#: urpm.pm:1339
-#, c-format
-msgid "read synthesis file [%s]"
+#: po/placeholder.h:236
+msgid ""
+" --headers - extract headers for package listed from urpmi db to\n"
+" stdout (root only).\n"
msgstr ""
-#: urpmi:49
-#, c-format
-msgid "urpmi version %s"
+#: po/placeholder.h:243
+msgid ""
+" -u - remove package if a better version is already installed.\n"
msgstr ""
-#: urpmi:98
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#: po/placeholder.h:244
+msgid ""
+" --force - force invocation even if some packages do not\n"
+"exist.\n"
msgstr ""
-#: urpmi:102
-msgid "Only superuser is allowed to install packages"
+#: urpm.pm:1796 urpm.pm:1805
+#, c-format
+msgid "removing %s to upgrade to %s ..."
msgstr ""
-#: urpmi:189
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Krefst einnig eins af af eftirt�ldum p�kkum:"
+#: urpm.pm:1797 urpm.pm:1806
+msgid ", $otherPackage, "
+msgstr ", $otherPackage, "
-#: urpmi:301
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+#: urpm.pm:1797 urpm.pm:1806
+msgid "));"
+msgstr "));"
+
+#: urpm.pm:1802
+msgid "$p->{name}-$p->{version}-$p->{release}"
+msgstr "$p->{name}-$p->{version}-$p->{release}"
+
+#: urpm.pm:1812
+msgid "$prefix/$_"
+msgstr "$prefix/$_"
+
+#: urpmi:48
+#, c-format
+msgid "urpmi version %s"
msgstr ""
#: urpmi.addmedia:30
@@ -842,9 +935,6 @@ msgstr ", $_);"
msgid "urpmq version %s"
msgstr ""
-#~ msgid "));"
-#~ msgstr "));"
-
#~ msgid "), $_);"
#~ msgstr "), $_);"
diff --git a/po/it.po b/po/it.po
index b3ab4b4a..800b6df4 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,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: 1999-12-29 11:10+0100\n"
"Last-Translator: Daniele Pighin <daniele@dcs.it>\n"
"Language-Team: Italian <it@li.org>\n"
@@ -27,27 +27,27 @@ msgstr ""
"Installazione automatica dei pacchetti...\n"
"Hai richiesto l'installazione del pacchetto $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 "E' corretto?"
-#: _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 "Cancella"
-#: _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 "Nn"
-#: _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 "Yy"
-#: _irpm:42 po/placeholder.h:118 urpmi:258
+#: _irpm:42 po/placeholder.h:157 urpmi:258
msgid " (Y/n) "
msgstr " (Y/n) "
@@ -155,176 +155,176 @@ msgstr "prova urmpf --help per pi� opzioni"
msgid "urpmi is not installed"
msgstr "urpmi non � installato"
-#: po/placeholder.h:29 urpm.pm:283
+#: po/placeholder.h:29
+#, fuzzy, c-format
+msgid "reading synthesis file [%s]"
+msgstr "leggi il depslist file [%s]"
+
+#: po/placeholder.h:30 urpm.pm:298
#, c-format
msgid "unable to write config file [%s]"
msgstr "non riesco a scrivere sul file di configurazione [%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"
-msgstr "non riesco ad usare il nome \"%s\" per il supporto perch� � gi� in uso"
+msgid "using different removable device [%s] for \"%s\""
+msgstr ""
-#: po/placeholder.h:31
+#: po/placeholder.h:32
#, c-format
msgid "nothing to write in list file for \"%s\""
msgstr "niente da scrivere nel list file per \"%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 "non riesco a trovare il list file per \"%s\", ignoro il supporto"
-#: po/placeholder.h:33
+#: po/placeholder.h:34
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "non riesco ad analizzare l'hdlist file di \"%s\""
-#: po/placeholder.h:34
+#: po/placeholder.h:35
#, c-format
msgid "nothing written in list file for \"%s\""
msgstr "niente scritto nel list file per \"%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 ""
-"sto rimuovendo %s per l'upgrade ...\n"
-" per %s poich� altrimenti non si aggiornerebbe correttamente!"
-
-#: po/placeholder.h:39 urpm.pm:839
+#: po/placeholder.h:36 urpm.pm:845
#, c-format
msgid "read provides file [%s]"
msgstr "leggi il provides file [%s]"
-#: po/placeholder.h:40
-#, c-format
-msgid "trying to remove inexistant medium \"%s\""
-msgstr "sto cercando di rimuovere il supporto inesistente \"%s\""
-
-#: po/placeholder.h:41 urpm.pm:1692
+#: po/placeholder.h:37 urpm.pm:1549
#, c-format
msgid "package %s is not found."
msgstr "il pacchetto %s non � stato trovato"
-#: po/placeholder.h:42
-#, c-format
-msgid "unable to copy source of [%s] from [%s]"
-msgstr "non riesco a copiare i sorgenti di [%s] da [%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 "non riesco a scrivere il compss file [%s]"
-#: po/placeholder.h:44 urpm.pm:813
+#: po/placeholder.h:39 urpm.pm:819
#, c-format
msgid "unmounting %s"
msgstr "sto smontando %s"
-#: po/placeholder.h:45
+#: po/placeholder.h:40
#, c-format
msgid "removing %d obsolete headers in cache"
msgstr "sto rimuovendo %d intestazioni obsolete in 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 "non trovo l'hdlist file per il supporto \"%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 "il supporto \"%s\" cerca di usare una hdlist gi� usata, lo ignoro"
+
+#: po/placeholder.h:43 urpm.pm:184
+#, c-format
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr "non riesco ad usare il nome \"%s\" per il supporto perch� � gi� in uso"
+
+#: po/placeholder.h:44 urpm.pm:191
#, c-format
msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
msgstr ""
"non riesco a prendere in considerazione il supporto \"%s\" poich� non esiste "
"un list file [%s]"
-#: po/placeholder.h:48
+#: po/placeholder.h:45
msgid "keeping only files referenced in provides"
msgstr "sto tenendo solo i file referenziati in provides"
-#: po/placeholder.h:49
+#: po/placeholder.h:46
#, c-format
msgid "unable to build synthesis file for medium \"%s\""
msgstr "non riesco a costruire un file di sintesi per il supporto \"%s\""
-#: po/placeholder.h:50
+#: po/placeholder.h:47
#, c-format
msgid "found %d headers in cache"
msgstr "%d intestazioni trovate in 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 "non riesco a leggere il provides file [%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 "evita di selezionare %s, linguaggio locale non ancora selezionato"
-#: 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 ""
+"sto rimuovendo %s per l'aggiornamento ...\n"
+" per %s poich� altrimenti non si aggiornerebbe"
+
+#: po/placeholder.h:54 urpm.pm:326
#, c-format
msgid "medium \"%s\" already exists"
msgstr "il supporto \"%s\" gi� esiste"
-#: po/placeholder.h:54 urpm.pm:295
-#, c-format
-msgid "write config file [%s]"
-msgstr "scrivi il file di configurazione [%s]"
-
#: po/placeholder.h:55
#, c-format
msgid "unable to write list file of \"%s\""
msgstr "non riesco a scrivere il list file di \"%s\""
-#: po/placeholder.h:56 urpm.pm:1817
+#: po/placeholder.h:56 urpm.pm:310
#, c-format
-msgid "retrieving [%s]"
-msgstr "sto recuperando [%s]"
-
-#: po/placeholder.h:57 urpm.pm:1819
-#, c-format
-msgid "wget of [%s] failed"
-msgstr "wget di [%s] fallito"
+msgid "write config file [%s]"
+msgstr "scrivi il file di configurazione [%s]"
-#: po/placeholder.h:58 urpm.pm:1101
+#: po/placeholder.h:57 urpm.pm:1107
#, c-format
msgid "no package named %s"
msgstr "nessun pacchettto denominato %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 "non riesco a leggere il compss file [%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 "non riesco a trovare l'hdlist file per \"%s\", supporto ignorato"
-#: po/placeholder.h:61
+#: po/placeholder.h:60
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "ho costruito la sintesi dell'hdlist file per il supporto \"%s\""
-#: po/placeholder.h:62
+#: po/placeholder.h:61
msgid "computing dependencies"
msgstr "sto valutando le dipendenze"
-#: po/placeholder.h:63 urpm.pm:868
+#: po/placeholder.h:62
+#, fuzzy, c-format
+msgid "retrieve of [%s] failed"
+msgstr "wget di [%s] fallito"
+
+#: po/placeholder.h:63 urpm.pm:874
#, c-format
msgid "write provides file [%s]"
msgstr "scrivi il provides file [%s]"
-#: po/placeholder.h:64 urpm.pm:803
+#: po/placeholder.h:64 urpm.pm:809
#, c-format
msgid "mounting %s"
msgstr "sto montando %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 "
@@ -333,123 +333,135 @@ msgstr ""
"non risco ad occuparmi del supporto \"%s\", il list file � gi� usato da un "
"altro supporto"
-#: po/placeholder.h:66 urpm.pm:148
-#, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
-msgstr "il supporto \"%s\" cerca di usare una lista gi� usata, lo ignoro"
-
-#: po/placeholder.h:67
+#: po/placeholder.h:66
#, c-format
msgid "reading hdlist file [%s]"
msgstr "sto leggendo l'hdlist file [%s]"
-#: po/placeholder.h:68 urpm.pm:873
+#: po/placeholder.h:67 urpm.pm:879
#, c-format
msgid "write compss file [%s]"
msgstr "scrivi il compss file [%s]"
-#: po/placeholder.h:69 urpm.pm:827
+#: po/placeholder.h:68 urpm.pm:833
#, c-format
msgid "read depslist file [%s]"
msgstr "leggi il depslist file [%s]"
-#: po/placeholder.h:70
-#, c-format
-msgid "trying to select inexistant medium \"%s\""
-msgstr "tentativo di selezionare un supporto inesistente \"%s\""
+#: po/placeholder.h:69 urpm.pm:103
+msgid "curl failed\n"
+msgstr ""
-#: po/placeholder.h:71 urpm.pm:1812
+#: po/placeholder.h:70 urpm.pm:281 urpm.pm:284
+#, fuzzy, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "non riesco a creare il supporto \"%s\"\n"
+
+#: po/placeholder.h:71 urpm.pm:1668
#, c-format
msgid "malformed input: [%s]"
msgstr "input malformato: [%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 "il supporto \"%s\" cerca di usare una hdlist gi� usata, lo ignoro"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "ci sono diversi pacchetti rpm con lo stesso nome di file \"%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"
-msgstr ""
-"sto rimuovendo %s per l'aggiornamento ...\n"
-" per %s poich� altrimenti non si aggiornerebbe"
+msgid "medium \"%s\" tries to use an already used list, medium ignored"
+msgstr "il supporto \"%s\" cerca di usare una lista gi� usata, lo ignoro"
-#: po/placeholder.h:77 urpm.pm:865
+#: po/placeholder.h:74 urpm.pm:871
#, c-format
msgid "unable to write provides file [%s]"
msgstr "non riesco a scrivere il provides file [%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 "non riesco ad accedere all'hdlist file di \"%s\", ignoro il supporto"
-#: po/placeholder.h:79 urpm.pm:1005
-msgid "unable to register rpm file"
-msgstr "non riesco a registrare il file 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 ""
"non riesco a trovare tutti i file di sintesi, uso il parsehdlist server"
-#: po/placeholder.h:81 urpm.pm:241
+#: po/placeholder.h:77 urpm.pm:1011
+msgid "unable to register rpm file"
+msgstr "non riesco a registrare il file rpm"
+
+#: po/placeholder.h:78 urpm.pm:256
#, c-format
msgid "unable to inspect list file for \"%s\", medium ignored"
msgstr "non riesco ad analizzare il list file per \"%s\", ignoro il supporto"
-#: 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 "list file incoerente per \"%s\", ignoro il supporto"
-#: po/placeholder.h:83
+#: po/placeholder.h:81
#, c-format
msgid "copy of [%s] failed"
msgstr "copia di [%s] fallita"
-#: 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 "sto cercando di rimuovere il supporto inesistente \"%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 "non riesco ad analizzare correttamente [%s]"
-#: po/placeholder.h:85 urpm.pm:824
+#: po/placeholder.h:84 urpm.pm:1192
+#, fuzzy, c-format
+msgid "read synthesis file [%s]"
+msgstr "leggi il depslist file [%s]"
+
+#: po/placeholder.h:85 urpm.pm:830
#, c-format
msgid "unable to read depslist file [%s]"
msgstr "non riesco a leggere il deplist file [%s]"
-#: po/placeholder.h:86
-msgid "removable medium not selected"
-msgstr "supporto removibile non selezionato"
-
-#: po/placeholder.h:87 urpm.pm:851
+#: po/placeholder.h:86 urpm.pm:857
#, c-format
msgid "read compss file [%s]"
msgstr "leggi il compss file [%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 "errore di sintassi nel file di configurazione alla linea %s"
-#: po/placeholder.h:89
+#: po/placeholder.h:88
#, c-format
msgid "building hdlist [%s]"
msgstr "sto costruendo l'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 "non riesco a leggere il file rpm [%s] dal supporto \"%s\""
-#: po/placeholder.h:91 urpm.pm:1009
+#: po/placeholder.h:90 urpm.pm:1015
msgid "error registering local packages"
msgstr "errore durante la registrazione dei pacchetti locali"
-#: 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 "supporto incoerente \"%s\", segnato come removibile ma non tale"
@@ -459,220 +471,276 @@ msgstr "supporto incoerente \"%s\", segnato come removibile ma non tale"
msgid "unable to build hdlist: %s"
msgstr "non riesco a scrivere l'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 "il supporto \"%s\" non � selezionato"
+
+#: po/placeholder.h:95 urpm.pm:1006
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "nome del file rpm non valido [%s]"
-#: 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 "il supporto \"%s\" non � selezionato"
+msgid "unknown data associated with %s"
+msgstr "dati sconosciuti associati a %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 "cerco di bypassare il supporto esistente \"%s\", evito"
-#: po/placeholder.h:97 urpm.pm:863
+#: po/placeholder.h:98 urpm.pm:869
#, c-format
msgid "write depslist file [%s]"
msgstr "scrivi il deplist file [%s]"
-#: po/placeholder.h:98 urpm.pm:1322
-#, c-format
-msgid "unknown data associated with %s"
-msgstr "dati sconosciuti associati a %s"
-
-#: po/placeholder.h:99
-#, c-format
-msgid "source of [%s] not found as [%s]"
-msgstr "sorgente di [%s] non trovato come [%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 "non riesco ad accedere il list file di \"%s\", ignoro il supporto"
-#: 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 "evita di selezionare %s poich� non saranno aggiornati abbastanza file"
-#: po/placeholder.h:102
-#, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
-msgstr "wget of [%s] fallito (forse manca 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 "non riesco ad accedere al file 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 "non riesco a scrivere il deplist file [%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 ""
+"sto rimuovendo %s per l'upgrade ...\n"
+" per %s poich� altrimenti non si aggiornerebbe correttamente!"
+
+#: po/placeholder.h:107 urpm.pm:342 urpm.pm:1630
#, c-format
msgid "unable to access medium \"%s\""
msgstr "non riesco ad accedere al supporto \"%s\""
-#: po/placeholder.h:106 urpm.pm:988
+#: po/placeholder.h:108 urpm.pm:994
#, c-format
msgid "relocated %s entries in depslist"
msgstr "%s lemmi riposizionati nella deplist"
-#: 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 "non riesco ad analizzare correttamente [%s] al valore \"%s\""
+msgid "trying to select inexistent medium \"%s\""
+msgstr "tentativo di selezionare un supporto inesistente \"%s\""
-#: po/placeholder.h:108
+#: po/placeholder.h:110 urpm.pm:97
+#, fuzzy
+msgid "wget failed\n"
+msgstr "wget di [%s] fallito"
+
+#: po/placeholder.h:111 urpm.pm:920 urpm.pm:1486 urpm.pm:1537
#, c-format
-msgid "no rpm files found from [%s]"
-msgstr "nessun file rpm trovato da [%s]"
+msgid "unable to parse correctly [%s] on value \"%s\""
+msgstr "non riesco ad analizzare correttamente [%s] al valore \"%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 "I seguenti pacchetti contengono %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 "ci sono diversi pacchetti rpm con lo stesso nome di file \"%s\""
+msgid "no rpm files found from [%s]"
+msgstr "nessun file rpm trovato da [%s]"
-#: po/placeholder.h:111 urpm.pm:1920
+#: po/placeholder.h:114 urpm.pm:1772
#, c-format
msgid "selecting %s using obsoletes"
msgstr "sto selezionando %s usando obsoletes"
-#: po/placeholder.h:112 urpm.pm:2031
+#: po/placeholder.h:115 urpm.pm:1888
#, c-format
msgid "selecting %s by selection on files"
msgstr "sto selezionando %s attraverso selezione su file"
-#: 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 "non riesco a determinare il supporto di questo hdlist file [%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 - stampa tutti i tag."
+
+#: po/placeholder.h:121 urpmi:361
+msgid "everything already installed"
+msgstr "tutto gi� installato"
+
+#: po/placeholder.h:122 urpmi:98
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: opzione sconosciuta \"-%s\", controlla l'uso con --help\n"
+
+#: po/placeholder.h:123 urpmi:194
+msgid "One of the following packages is needed:"
+msgstr "E' richiesto uno dei seguenti pacchetti:"
+
+#: 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 "Installazione fallita"
-#: po/placeholder.h:115 urpmi:279
-msgid "Press enter when it's done..."
-msgstr "Premi enter appena terminato..."
+#: 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 "Spiacente, scelta errata, prova di nuovo\n"
+#: po/placeholder.h:134
+#, fuzzy
+msgid " --X - use X interface.\n"
+msgstr " --all - stampa tutti i 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 ""
+"Per soddisfare le dipendenze, saranno installati i seguenti pacchetti(%d MB)"
+
+#: po/placeholder.h:136 urpmi:320 urpmi:344
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Provo l'installazione senza controllare le dipendenze? (y/N) "
+
+#: 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 - stampa tutti i tag."
+
+#: po/placeholder.h:144 urpmi:202
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "Qual'� la tua scelta? (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 ""
-"urpmi versione %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"Questo � software libero e pu� essere ridistribuito sotto i termini della "
-"GNU GPL.\n"
-"uso:\n"
-" --help - stampa questo messaggio d'aiuto.\n"
-" --auto - seleziona automaticamente un buon pacchetto nelle "
-"scelte.\n"
-" --auto-select - seleziona automaticamente i pacchetti per aggiornare il "
-"sistema.\n"
-" --force - forza invocazione anche se qualche pacchetto non "
-"esiste.\n"
-" --X - usa interfaccia X.\n"
-" --best-output - scegli la migliore interfaccia in base all'ambiente:\n"
-" X o modo testo.\n"
-" -a - seleziona tutto ci� che assomiglia alla linea di "
-"comando.\n"
-" -m - scegli la minima chiusura dei requires (default).\n"
-" -M - scegli la massima chiusura dei requires.\n"
-" -c - scegli metodo completo per risoluzione chiusura "
-"requires.\n"
-" -p - permetti di cercare il pacchetto tra i provides.\n"
-" -q - modo silenzioso.\n"
-" -v - modo prolisso.\n"
-" nomi o files rpm (solo per root) messi in linea di comando sono "
-"installati.\n"
-
-#: po/placeholder.h:142 urpmi:362
-msgid "everything already installed"
-msgstr "tutto gi� installato"
+"Questo software � gratuito e pu� essere ridistribuito sotto i termini della "
+"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 "Provo l'installazione ancora pi� forzata (--force)? (y/N) "
+
+#: po/placeholder.h:154
msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+" --force - force invocation even if some packages do not exist.\n"
msgstr ""
-"Per soddisfare le dipendenze, saranno installati i seguenti pacchetti(%d MB)"
-#: po/placeholder.h:144 urpmi:296
-#, c-format
-msgid "installing %s\n"
-msgstr "sto installando %s\n"
+#: po/placeholder.h:155 urpmi:205
+msgid "Sorry, bad choice, try again\n"
+msgstr "Spiacente, scelta errata, prova di nuovo\n"
-#: po/placeholder.h:145 urpmi:198
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Qual'� la tua scelta? (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 "Provo l'installazione senza controllare le dipendenze? (y/N) "
+#: 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 "E' richiesto uno dei seguenti pacchetti:"
+#: po/placeholder.h:159
+msgid " --curl - use curl to retrieve distant files.\n"
+msgstr ""
-#: po/placeholder.h:148 urpmi:149
+#: po/placeholder.h:160 urpmi:294
+#, c-format
+msgid "installing %s\n"
+msgstr "sto installando %s\n"
+
+#: po/placeholder.h:161 urpmi:152
msgid "Only superuser is allowed to install local packages"
msgstr "Solo un superuser � abilitato ad installare pacchetti locali"
-#: 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 ""
"Per favore inserisci il supporto denominato \"%s\" nel dispositivo [%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 "non riesco a recuperare pacchetto sorgente, interrompo"
-#: po/placeholder.h:151 urpmi:329 urpmi:353
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Provo l'installazione ancora pi� forzata (--force)? (y/N) "
+#: po/placeholder.h:165 urpmi:102
+#, fuzzy
+msgid "Only superuser is allowed to install packages"
+msgstr "Solo un superuser � abilitato ad installare pacchetti locali"
+
+#: po/placeholder.h:166 urpmi:193
+#, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Per installare %s � richiesto uno dei seguenti pacchetti:"
+
+#: po/placeholder.h:167 urpmi:277
+msgid "Press Enter when it's done..."
+msgstr "Premi enter appena terminato..."
-#: po/placeholder.h:155 urpmi.addmedia:46
+#: po/placeholder.h:168 urpmi.addmedia:46
#, c-format
msgid ""
"%s\n"
@@ -681,7 +749,7 @@ msgstr ""
"%s\n"
"`with` mancante per media ftp\n"
-#: po/placeholder.h:159
+#: po/placeholder.h:172
msgid ""
"usage: urpmi.addmedia [--update] <name> <url>\n"
"where <url> is one of\n"
@@ -701,17 +769,17 @@ msgstr ""
" http://<host>/<path> with <relativo nome di hdlist file>\n"
" removable_<device>://<path>\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 "non riesco a creare il supporto \"%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 "non riesco ad aggiornare il supporto \"%s\"\n"
-#: po/placeholder.h:170 urpmi.addmedia:42
+#: po/placeholder.h:183 urpmi.addmedia:42
#, c-format
msgid ""
"%s\n"
@@ -720,7 +788,7 @@ msgstr ""
"%s\n"
"il dispositivo `%s` non esiste\n"
-#: po/placeholder.h:174 urpmi.addmedia:44
+#: po/placeholder.h:187 urpmi.addmedia:44
#, c-format
msgid ""
"%s\n"
@@ -729,7 +797,7 @@ msgstr ""
"%s\n"
"manca <relativo percorso di hdlist>\n"
-#: po/placeholder.h:178
+#: po/placeholder.h:191
#, c-format
msgid ""
"usage: urpmi.update [-a] <name> ...\n"
@@ -749,11 +817,11 @@ msgstr ""
"\n"
"opzioni sconosciute '%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 "niente da aggiornare (usa urpmi.addmedia per aggiungere un supporto)\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"
@@ -762,11 +830,11 @@ msgstr ""
"il lemma da aggiornare � mancante\n"
"(uno di %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 "niente da rimuovere (usa urpmi.addmedia per aggiungere un supporto)\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"
@@ -775,7 +843,7 @@ msgstr ""
"il lemma da rimuovere � mancante\n"
"(uno di %s)\n"
-#: po/placeholder.h:197
+#: po/placeholder.h:210
#, c-format
msgid ""
"usage: urpmi.removemedia [-a] <name> ...\n"
@@ -790,17 +858,12 @@ msgstr ""
"\n"
"opzioni sconosciute '%s'\n"
-#: po/placeholder.h:204 urpmq:85
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: non posso leggere il file rpm \"%s\"\n"
-
-#: po/placeholder.h:206 urpmq:82
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: opzione sconosciuta \"-%s\", controlla l'uso con --help\n"
+#: po/placeholder.h:217
+#, fuzzy
+msgid " -h - print this help message.\n"
+msgstr " --all - stampa tutti i 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"
@@ -808,117 +871,103 @@ msgstr ""
"alcuni pacchetti devono essere rimossi per venire aggiornati, questo non �\n"
"ancora supportato\n"
-#: po/placeholder.h:208
+#: po/placeholder.h:219
+#, fuzzy
+msgid " -g - print groups too with name.\n"
+msgstr " --group - stampa il gruppo del tag: group."
+
+#: po/placeholder.h:220 urpmq:84
#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: non posso leggere il file 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 " in riga di comando ma senza nome del pacchetto)."
+
+#: 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"
+msgstr ""
+"Questo software � gratuito e pu� essere ridistribuito sotto i termini della "
+"GNU GPL."
+
+#: po/placeholder.h:231
+#, fuzzy
+msgid " -d - extend query to package dependencies.\n"
+msgstr " in riga di comando ma senza nome del pacchetto)."
+
+#: po/placeholder.h:232
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
+msgstr ""
+
+#: po/placeholder.h:233
+msgid ""
" -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"
+msgstr ""
+
+#: po/placeholder.h:235 urpmq:81
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: opzione sconosciuta \"-%s\", controlla l'uso con --help\n"
+
+#: po/placeholder.h:236
+msgid ""
" --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 package do not exist.\n"
-" names or rpm files given on command line are queried.\n"
msgstr ""
-"urpmq versione %s\n"
-"Copyright (C) 2000, 2001 MandrakeSoft.\n"
-"Questo � software libero e pu� essere ridistribuito sotto i termini della "
-"GNU GPL.\n"
-"uso:\n"
-" -h - stampa questo messaggio di aiuto.\n"
-" -v - modo prolisso.\n"
-" -d - estendi la richiesta alle dipendenze del pacchetto.\n"
-" -u - rimuovi i pacchetti, se � gi� installata una versione\n"
-" migliore.\n"
-" -m - estendi la richiesta alle dipendenze del pacchettoe,\n"
-" rimuovi i pacchetti gi� installati che forniscono quello\n"
-" che � necessario, aggiungi i pacchetti che potrebbero\n"
-" bloccare l'aggiornamento.\n"
-" -M - estendi la richiesta alle dipendenze del pacchettoe, e\n"
-" rimuovi i pacchetti gi� installati solo se sono pi�\n"
-" recenti o uguali.\n"
-" -c - scegli il modo completo per risolvere le chiusire dei\n"
-" requires.\n"
-" -p - permetti la ricerca del pacchetto tra i provides.\n"
-" -g - stampa anche i gruppi col nome.\n"
-" -r - stampa la versione e il anche la release col nome.\n"
-" --update - usa solo l'aggiornamento dei supporti.\n"
-" --auto-select - seleziona automaticamente i pacchetti per aggiornare\n"
-" il sistema.\n"
-" --headers - estrai le intestazioni del pacchetto da urpmi db allo\n"
-" stdout (solo root).\n"
-" --sources - dai tutti i pacchetti sorgenti prima del download\n"
-" (solo root).\n"
-" --force - forza l'invocazione anche se dei pacchetti non esistono.\n"
-" i nomi o i file rpm forniti da riga di comando vengono richiesti.\n"
-
-#: urpm.pm:257
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+
+#: po/placeholder.h:243
+msgid ""
+" -u - remove package if a better version is already installed.\n"
msgstr ""
-#: urpm.pm:258
-#, c-format
-msgid "taking removable device as \"%s\""
+#: po/placeholder.h:244
+msgid ""
+" --force - force invocation even if some packages do not\n"
+"exist.\n"
msgstr ""
-#: urpm.pm:262
+#: urpm.pm:1796 urpm.pm:1805
#, c-format
-msgid "using different removable device [%s] for \"%s\""
+msgid "removing %s to upgrade to %s ..."
msgstr ""
-#: urpm.pm:266 urpm.pm:269
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "non riesco a creare il supporto \"%s\"\n"
-
-#: urpm.pm:1339
-#, fuzzy, c-format
-msgid "read synthesis file [%s]"
-msgstr "leggi il depslist file [%s]"
+#: urpm.pm:1797 urpm.pm:1806
+msgid ", $otherPackage, "
+msgstr ", $otherPackage, "
-#: urpmi:49
-#, c-format
-msgid "urpmi version %s"
-msgstr "urpmi versione %s"
+#: urpm.pm:1797 urpm.pm:1806
+msgid "));"
+msgstr "));"
-#: urpmi:98
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: opzione sconosciuta \"-%s\", controlla l'uso con --help\n"
+#: urpm.pm:1802
+msgid "$p->{name}-$p->{version}-$p->{release}"
+msgstr "$p->{name}-$p->{version}-$p->{release}"
-#: urpmi:102
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr "Solo un superuser � abilitato ad installare pacchetti locali"
+#: urpm.pm:1812
+msgid "$prefix/$_"
+msgstr "$prefix/$_"
-#: urpmi:189
+#: urpmi:48
#, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Per installare %s � richiesto uno dei seguenti pacchetti:"
-
-#: urpmi:301
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
-msgstr ""
+msgid "urpmi version %s"
+msgstr "urpmi versione %s"
#: urpmi.addmedia:30
msgid "usage: urpmi.addmedia [--update] <name> <url>"
@@ -950,8 +999,142 @@ msgstr ", $_);"
msgid "urpmq version %s"
msgstr "urpmq versione %s"
-#~ msgid "));"
-#~ msgstr "));"
+#~ msgid "retrieving [%s]"
+#~ msgstr "sto recuperando [%s]"
+
+#~ msgid "wget of [%s] failed (maybe wget is missing?)"
+#~ msgstr "wget of [%s] fallito (forse manca wget?)"
+
+#~ msgid "unable to copy source of [%s] from [%s]"
+#~ msgstr "non riesco a copiare i sorgenti di [%s] da [%s]"
+
+#~ msgid "removable medium not selected"
+#~ msgstr "supporto removibile non selezionato"
+
+#~ msgid "source of [%s] not found as [%s]"
+#~ msgstr "sorgente di [%s] non trovato come [%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 ""
+#~ "urpmi versione %s\n"
+#~ "Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+#~ "Questo � software libero e pu� essere ridistribuito sotto i termini della "
+#~ "GNU GPL.\n"
+#~ "uso:\n"
+#~ " --help - stampa questo messaggio d'aiuto.\n"
+#~ " --auto - seleziona automaticamente un buon pacchetto nelle "
+#~ "scelte.\n"
+#~ " --auto-select - seleziona automaticamente i pacchetti per aggiornare "
+#~ "il sistema.\n"
+#~ " --force - forza invocazione anche se qualche pacchetto non "
+#~ "esiste.\n"
+#~ " --X - usa interfaccia X.\n"
+#~ " --best-output - scegli la migliore interfaccia in base "
+#~ "all'ambiente:\n"
+#~ " X o modo testo.\n"
+#~ " -a - seleziona tutto ci� che assomiglia alla linea di "
+#~ "comando.\n"
+#~ " -m - scegli la minima chiusura dei requires (default).\n"
+#~ " -M - scegli la massima chiusura dei requires.\n"
+#~ " -c - scegli metodo completo per risoluzione chiusura "
+#~ "requires.\n"
+#~ " -p - permetti di cercare il pacchetto tra i provides.\n"
+#~ " -q - modo silenzioso.\n"
+#~ " -v - modo prolisso.\n"
+#~ " nomi o files rpm (solo per root) messi in linea di comando sono "
+#~ "installati.\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 ""
+#~ "urpmq versione %s\n"
+#~ "Copyright (C) 2000, 2001 MandrakeSoft.\n"
+#~ "Questo � software libero e pu� essere ridistribuito sotto i termini della "
+#~ "GNU GPL.\n"
+#~ "uso:\n"
+#~ " -h - stampa questo messaggio di aiuto.\n"
+#~ " -v - modo prolisso.\n"
+#~ " -d - estendi la richiesta alle dipendenze del pacchetto.\n"
+#~ " -u - rimuovi i pacchetti, se � gi� installata una versione\n"
+#~ " migliore.\n"
+#~ " -m - estendi la richiesta alle dipendenze del pacchettoe,\n"
+#~ " rimuovi i pacchetti gi� installati che forniscono "
+#~ "quello\n"
+#~ " che � necessario, aggiungi i pacchetti che potrebbero\n"
+#~ " bloccare l'aggiornamento.\n"
+#~ " -M - estendi la richiesta alle dipendenze del pacchettoe, "
+#~ "e\n"
+#~ " rimuovi i pacchetti gi� installati solo se sono pi�\n"
+#~ " recenti o uguali.\n"
+#~ " -c - scegli il modo completo per risolvere le chiusire dei\n"
+#~ " requires.\n"
+#~ " -p - permetti la ricerca del pacchetto tra i provides.\n"
+#~ " -g - stampa anche i gruppi col nome.\n"
+#~ " -r - stampa la versione e il anche la release col nome.\n"
+#~ " --update - usa solo l'aggiornamento dei supporti.\n"
+#~ " --auto-select - seleziona automaticamente i pacchetti per aggiornare\n"
+#~ " il sistema.\n"
+#~ " --headers - estrai le intestazioni del pacchetto da urpmi db allo\n"
+#~ " stdout (solo root).\n"
+#~ " --sources - dai tutti i pacchetti sorgenti prima del download\n"
+#~ " (solo root).\n"
+#~ " --force - forza l'invocazione anche se dei pacchetti non "
+#~ "esistono.\n"
+#~ " i nomi o i file rpm forniti da riga di comando vengono richiesti.\n"
#~ msgid "), $_);"
#~ msgstr "), $_);"
diff --git a/po/ja.po b/po/ja.po
index 2644f70f..0c77c4bf 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-24 14:46+0100\n"
+"POT-Creation-Date: 2001-11-27 19:52+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:152 urpmi:248
-msgid "Is it ok?"
+#: _irpm:31 po/placeholder.h:163 urpmi:248
+msgid "Is it OK?"
msgstr "��������Ǥ��礦����"
-#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:281
+#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:279
msgid "Ok"
msgstr "�Ϥ���³�Ԥ����"
-#: _irpm:34 po/placeholder.h:116 urpmi:252 urpmi:282
+#: _irpm:34 po/placeholder.h:119 urpmi:252 urpmi:280
msgid "Cancel"
msgstr "����������ߤ����"
-#: _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 "Nn�Σ��"
-#: _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 "Yy�٣��ϥ�"
# ��
-#: _irpm:42 po/placeholder.h:118 urpmi:258
+#: _irpm:42 po/placeholder.h:157 urpmi:258
msgid " (Y/n) "
msgstr " (�Ϥ�(Y)/������(n)) [�Ϥ�] "
@@ -149,120 +149,120 @@ msgstr ""
msgid "urpmi is not installed"
msgstr "urpmi �ϥ��󥹥ȡ��뤵��Ƥ��ޤ���"
-#: po/placeholder.h:29 urpm.pm:283
+#: po/placeholder.h:29
+#, fuzzy, c-format
+msgid "reading synthesis file [%s]"
+msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
+
+#: po/placeholder.h:30 urpm.pm:298
#, c-format
msgid "unable to write config file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:31
+#: po/placeholder.h:32
#, c-format
msgid "nothing to write in list file for \"%s\""
msgstr ""
-#: 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 ""
-#: po/placeholder.h:33
+#: po/placeholder.h:34
#, fuzzy, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "���åץǡ��Ȥ��%s�פˤĤ��ƹԤʤ����Ȥ��Ǥ��ޤ���Ǥ���\n"
-#: po/placeholder.h:34
+#: po/placeholder.h:35
#, c-format
msgid "nothing written in list file for \"%s\""
msgstr ""
-#: po/placeholder.h:35 urpm.pm:1951
-#, c-format
-msgid ""
-"removing %s to upgrade ...\n"
-" to %s since it will not upgrade correctly!"
-msgstr ""
-
-#: po/placeholder.h:39 urpm.pm:839
+#: po/placeholder.h:36 urpm.pm:845
#, c-format
msgid "read provides file [%s]"
msgstr ""
-#: po/placeholder.h:40
-#, fuzzy, c-format
-msgid "trying to remove inexistant medium \"%s\""
-msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
-
-#: po/placeholder.h:41 urpm.pm:1692
+#: po/placeholder.h:37 urpm.pm:1549
#, c-format
msgid "package %s is not found."
msgstr ""
-#: po/placeholder.h:42
-#, c-format
-msgid "unable to copy source of [%s] from [%s]"
-msgstr ""
-
-#: po/placeholder.h:43 urpm.pm:870
+#: po/placeholder.h:38 urpm.pm:876
#, fuzzy, c-format
msgid "unable to write compss file [%s]"
msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
-#: po/placeholder.h:44 urpm.pm:813
+#: po/placeholder.h:39 urpm.pm:819
#, c-format
msgid "unmounting %s"
msgstr ""
-#: po/placeholder.h:45
+#: po/placeholder.h:40
#, c-format
msgid "removing %d obsolete headers in cache"
msgstr ""
-#: 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 ""
-#: 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 ""
+
+#: po/placeholder.h:43 urpm.pm:184
+#, c-format
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+
+#: po/placeholder.h:44 urpm.pm:191
#, c-format
msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
msgstr ""
-#: po/placeholder.h:48
+#: po/placeholder.h:45
msgid "keeping only files referenced in provides"
msgstr ""
-#: po/placeholder.h:49
+#: po/placeholder.h:46
#, fuzzy, c-format
msgid "unable to build synthesis file for medium \"%s\""
msgstr "���åץǡ��Ȥ��%s�פˤĤ��ƹԤʤ����Ȥ��Ǥ��ޤ���Ǥ���\n"
-#: po/placeholder.h:50
+#: po/placeholder.h:47
#, c-format
msgid "found %d headers in cache"
msgstr ""
-#: po/placeholder.h:51 urpm.pm:836
+#: po/placeholder.h:48 urpm.pm:842
#, fuzzy, c-format
msgid "unable to read provides file [%s]"
msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
-#: 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 ""
-#: po/placeholder.h:53 urpm.pm:311
+#: po/placeholder.h:50
#, c-format
-msgid "medium \"%s\" already exists"
+msgid ""
+"removing %s to upgrade to %s ...\n"
+" since it will not be updated otherwise"
msgstr ""
-#: po/placeholder.h:54 urpm.pm:295
+#: po/placeholder.h:54 urpm.pm:326
#, c-format
-msgid "write config file [%s]"
+msgid "medium \"%s\" already exists"
msgstr ""
#: po/placeholder.h:55
@@ -270,172 +270,186 @@ msgstr ""
msgid "unable to write list file of \"%s\""
msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
-#: po/placeholder.h:56 urpm.pm:1817
+#: po/placeholder.h:56 urpm.pm:310
#, c-format
-msgid "retrieving [%s]"
-msgstr ""
-
-#: po/placeholder.h:57 urpm.pm:1819
-#, c-format
-msgid "wget of [%s] failed"
+msgid "write config file [%s]"
msgstr ""
-#: po/placeholder.h:58 urpm.pm:1101
+#: po/placeholder.h:57 urpm.pm:1107
#, fuzzy, c-format
msgid "no package named %s"
msgstr "%s �Ȥ����ѥå������Ϥ���ޤ���\n"
-#: po/placeholder.h:59 urpm.pm:848
+#: po/placeholder.h:58 urpm.pm:854
#, fuzzy, c-format
msgid "unable to read compss file [%s]"
msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
-#: 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 ""
-#: po/placeholder.h:61
+#: po/placeholder.h:60
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr ""
-#: po/placeholder.h:62
+#: po/placeholder.h:61
msgid "computing dependencies"
msgstr ""
-#: po/placeholder.h:63 urpm.pm:868
+#: po/placeholder.h:62
+#, c-format
+msgid "retrieve of [%s] failed"
+msgstr ""
+
+#: po/placeholder.h:63 urpm.pm:874
#, c-format
msgid "write provides file [%s]"
msgstr ""
-#: po/placeholder.h:64 urpm.pm:803
+#: po/placeholder.h:64 urpm.pm:809
#, fuzzy, c-format
msgid "mounting %s"
msgstr "%s �򥤥󥹥ȡ������\n"
-#: 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 "
"medium"
msgstr ""
-#: po/placeholder.h:66 urpm.pm:148
-#, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
-msgstr ""
-
-#: po/placeholder.h:67
+#: po/placeholder.h:66
#, c-format
msgid "reading hdlist file [%s]"
msgstr ""
-#: po/placeholder.h:68 urpm.pm:873
+#: po/placeholder.h:67 urpm.pm:879
#, c-format
msgid "write compss file [%s]"
msgstr ""
-#: po/placeholder.h:69 urpm.pm:827
+#: po/placeholder.h:68 urpm.pm:833
#, c-format
msgid "read depslist file [%s]"
msgstr ""
-#: po/placeholder.h:70
+#: 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 "trying to select inexistant medium \"%s\""
+msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
-#: po/placeholder.h:71 urpm.pm:1812
+#: po/placeholder.h:71 urpm.pm:1668
#, c-format
msgid "malformed input: [%s]"
msgstr ""
-#: 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"
+msgid "there are multiple packages with the same rpm filename \"%s\""
msgstr ""
-#: 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 ""
-#: po/placeholder.h:77 urpm.pm:865
+#: po/placeholder.h:74 urpm.pm:871
#, fuzzy, c-format
msgid "unable to write provides file [%s]"
msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
-#: 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 ""
-#: po/placeholder.h:79 urpm.pm:1005
+#: po/placeholder.h:76 urpm.pm:1215
+#, fuzzy
+msgid "unable to find all synthesis file, using parsehdlist server"
+msgstr "���åץǡ��Ȥ��%s�פˤĤ��ƹԤʤ����Ȥ��Ǥ��ޤ���Ǥ���\n"
+
+#: po/placeholder.h:77 urpm.pm:1011
#, fuzzy
msgid "unable to register rpm file"
msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
-#: po/placeholder.h:80 urpm.pm:1362
-msgid "unable to find all synthesis file, using parsehdlist server"
+#: po/placeholder.h:78 urpm.pm:256
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
msgstr ""
-#: po/placeholder.h:81 urpm.pm:241
+#: po/placeholder.h:79 urpm.pm:272
#, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "too many mount points for removable medium \"%s\""
msgstr ""
-#: po/placeholder.h:82 urpm.pm:233
+#: po/placeholder.h:80 urpm.pm:248
#, c-format
msgid "incoherent list file for \"%s\", medium ignored"
msgstr ""
-#: po/placeholder.h:83
+#: po/placeholder.h:81
#, c-format
msgid "copy of [%s] failed"
msgstr ""
-#: po/placeholder.h:84 urpm.pm:907 urpm.pm:1338 urpm.pm:1616 urpm.pm:1623
+#: po/placeholder.h:82
+#, 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
#, fuzzy, c-format
msgid "unable to parse correctly [%s]"
msgstr "���åץǡ��Ȥ��%s�פˤĤ��ƹԤʤ����Ȥ��Ǥ��ޤ���Ǥ���\n"
-#: po/placeholder.h:85 urpm.pm:824
+#: po/placeholder.h:84 urpm.pm:1192
#, fuzzy, c-format
-msgid "unable to read depslist file [%s]"
+msgid "read synthesis file [%s]"
msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
-#: po/placeholder.h:86
-msgid "removable medium not selected"
-msgstr ""
+#: po/placeholder.h:85 urpm.pm:830
+#, fuzzy, c-format
+msgid "unable to read depslist file [%s]"
+msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
-#: po/placeholder.h:87 urpm.pm:851
+#: po/placeholder.h:86 urpm.pm:857
#, c-format
msgid "read compss file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:89
+#: po/placeholder.h:88
#, c-format
msgid "building hdlist [%s]"
msgstr ""
-#: po/placeholder.h:90 urpm.pm:1746
+#: po/placeholder.h:89 urpm.pm:1603
#, fuzzy, c-format
msgid "unable to read rpm file [%s] from medium \"%s\""
msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
-#: po/placeholder.h:91 urpm.pm:1009
+#: po/placeholder.h:90 urpm.pm:1015
msgid "error registering local packages"
msgstr ""
-#: 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 ""
@@ -445,218 +459,273 @@ msgstr ""
msgid "unable to build hdlist: %s"
msgstr "���åץǡ��Ȥ��%s�פˤĤ��ƹԤʤ����Ȥ��Ǥ��ޤ���Ǥ���\n"
-#: po/placeholder.h:94 urpm.pm:1000
-#, c-format
-msgid "invalid rpm file name [%s]"
-msgstr ""
-
-#: po/placeholder.h:95 urpm.pm:1736 urpm.pm:1739 urpm.pm:1758
+#: po/placeholder.h:94 urpm.pm:1593 urpm.pm:1596 urpm.pm:1615
#, c-format
msgid "medium \"%s\" is not selected"
msgstr ""
-#: po/placeholder.h:96 urpm.pm:207
+#: po/placeholder.h:95 urpm.pm:1006
#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "invalid rpm file name [%s]"
msgstr ""
-#: po/placeholder.h:97 urpm.pm:863
+#: po/placeholder.h:96 urpm.pm:1175
#, c-format
-msgid "write depslist file [%s]"
+msgid "unknown data associated with %s"
msgstr ""
-#: po/placeholder.h:98 urpm.pm:1322
+#: po/placeholder.h:97 urpm.pm:222
#, c-format
-msgid "unknown data associated with %s"
+msgid "trying to bypass existing medium \"%s\", avoiding"
msgstr ""
-#: po/placeholder.h:99
+#: po/placeholder.h:98 urpm.pm:869
#, c-format
-msgid "source of [%s] not found as [%s]"
+msgid "write depslist file [%s]"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: po/placeholder.h:102
-#, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
-msgstr ""
-
-#: po/placeholder.h:103 urpm.pm:1001
+#: po/placeholder.h:101 urpm.pm:1007
#, fuzzy, c-format
msgid "unable to access rpm file [%s]"
msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
-#: po/placeholder.h:104 urpm.pm:860
+#: po/placeholder.h:102 urpm.pm:866
#, fuzzy, c-format
msgid "unable to write depslist file [%s]"
msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
-#: po/placeholder.h:105 urpm.pm:327 urpm.pm:1773
+#: po/placeholder.h:103
+#, 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
#, fuzzy, c-format
msgid "unable to access medium \"%s\""
msgstr "���åץǡ��Ȥ��%s�פˤĤ��ƹԤʤ����Ȥ��Ǥ��ޤ���Ǥ���\n"
-#: po/placeholder.h:106 urpm.pm:988
+#: po/placeholder.h:108 urpm.pm:994
#, c-format
msgid "relocated %s entries in depslist"
msgstr ""
-#: po/placeholder.h:107 urpm.pm:914 urpm.pm:1629 urpm.pm:1680
-#, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
+#: po/placeholder.h:109
+#, 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:108
+#: po/placeholder.h:111 urpm.pm:920 urpm.pm:1486 urpm.pm:1537
#, c-format
-msgid "no rpm files found from [%s]"
+msgid "unable to parse correctly [%s] on value \"%s\""
msgstr ""
-#: po/placeholder.h:109 urpm.pm:1104
+#: po/placeholder.h:112 urpm.pm:1110
#, fuzzy, c-format
msgid "The following packages contain %s: %s"
msgstr "%s �ϼ��Υѥå���������ˤ���ޤ�: %s\n"
-#: 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\""
+msgid "no rpm files found from [%s]"
msgstr ""
-#: po/placeholder.h:111 urpm.pm:1920
+#: po/placeholder.h:114 urpm.pm:1772
#, c-format
msgid "selecting %s using obsoletes"
msgstr ""
-#: po/placeholder.h:112 urpm.pm:2031
+#: po/placeholder.h:115 urpm.pm:1888
#, c-format
msgid "selecting %s by selection on files"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:114 urpmi:308 urpmi:315 urpmi:328 urpmi:339 urpmi:352
-msgid "Installation failed"
-msgstr "���󥹥ȡ���˼��Ԥ��ޤ���"
-
-#: po/placeholder.h:115 urpmi:279
-msgid "Press enter when it's done..."
-msgstr "����ä���ϥ꥿���󥭡��򲡤��Ʋ�������"
+#: po/placeholder.h:120
+msgid " --help - print this help message.\n"
+msgstr ""
-#: po/placeholder.h:117 urpmi:201
-msgid "Sorry, bad choice, try again\n"
-msgstr "ͭ��������ǤϤ���ޤ��󡣤⤦���٤��ꤤ���ޤ�\n"
+#: po/placeholder.h:121 urpmi:361
+msgid "everything already installed"
+msgstr "���٤ƴ��˥��󥹥ȡ��뤵��Ƥ��ޤ�"
-#: po/placeholder.h:120
+#: po/placeholder.h:122 urpmi:98
#, fuzzy, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr ""
+"̤�ΤΥ��ץ�����\"-$1\"�ˤǤ���\n"
+"������ˡ�� --help ���ץ����dz�ǧ���Ƥ���������\n"
+
+#: po/placeholder.h:123 urpmi:194
+msgid "One of the following packages is needed:"
+msgstr "���Υѥå������Τ����줫��ɬ�פǤ�:"
+
+#: po/placeholder.h:124 po/placeholder.h:222
+msgid " --update - use only update media.\n"
+msgstr ""
+
+#: po/placeholder.h:125 urpmi:299
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"
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
msgstr ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"�����ʤϥե꡼���եȥ������Ǥ��ꡢGNU GPL �ε���˽��ä�\n"
-"�����ۤ��뤳�Ȥ����Ĥ���Ƥ��ޤ���\n"
-"���ץ�������:\n"
-" --help - ���Υ�å�������ɽ�����ޤ�\n"
-" --auto - ��Ŭ�ʥѥå�������ư���򤷤ޤ�\n"
-" --auto-select - �����ƥॢ�åץ��졼�ɤ�ɬ�פʥѥå�������ư���򤷤�"
-"��\n"
-" --force - ¸�ߤ��ʤ��ѥå�������������Ǥ�³�Ԥ��ޤ�\n"
-" --X - ɽ���� X �����Ѥ��ޤ���GUI��\n"
-" --best-output - ɽ���� X ���ƥ����ȤΤ����줫��ưȽ�ꤷ�����Ѥ��ޤ�\n"
-" -a - ���ޥ�ɥ饤��Ǥλ���˹��פ����Τ����򤷤ޤ�\n"
-" -m - �Ǿ���ɬ�פ�ʬ���������򤷤ޤ��ʥǥե���ȡ�\n"
-" -M - ��ǽ�ʸ¤�Τ��٤Ƥ����򤷤ޤ�\n"
-" -c - ��¸�ط��β��Ϥ򸷳ʤ˹Ԥʤ��ޤ�\n"
-" -q - ɽ����å�������Ǿ��¤ˤ��ޤ�\n"
-" -v - �ܺ٤�ɽ����å�������Ф��ޤ�\n"
-"\n"
-" ���ꤵ�줿̾���Ǽ����Ǥ���ѥå��������⤷���ϡʴ����Ԥ��¹Ԥ��Ƥ���\n"
-" ���Τߡ�ľ�� RPM �ե�����̾�ˤ����ꤵ���ѥå������򥤥󥹥ȡ���\n"
-" ���ޤ���\n"
-#: po/placeholder.h:142 urpmi:362
-msgid "everything already installed"
-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 "���󥹥ȡ���˼��Ԥ��ޤ���"
+
+#: po/placeholder.h:132 po/placeholder.h:234
+msgid ""
+" --auto-select - automatically select packages for upgrading the system.\n"
+msgstr ""
-#: po/placeholder.h:143 urpmi:247
+#: po/placeholder.h:134
+msgid " --X - use X interface.\n"
+msgstr ""
+
+#: po/placeholder.h:135 urpmi:247
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
"d MB)"
msgstr "��¸�ط��Τ��ᡢ���Υѥå������⥤�󥹥ȡ��뤷�ޤ� (%d MB)"
-#: po/placeholder.h:144 urpmi:296
-#, c-format
-msgid "installing %s\n"
-msgstr "%s �򥤥󥹥ȡ������\n"
+#: po/placeholder.h:136 urpmi:320 urpmi:344
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr ""
+"��¸�ط����ǧ�����˥��󥹥ȡ�����ߤޤ����� (�Ϥ�(y)/������(N)) [������] "
+
+#: po/placeholder.h:137
+msgid ""
+" --best-output - choose best interface according to the environment:\n"
+" X or text mode.\n"
+msgstr ""
-#: po/placeholder.h:145 urpmi:198
+#: 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
+msgid " -q - quiet mode.\n"
+msgstr ""
+
+#: po/placeholder.h:144 urpmi:202
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "�ɤ�����Ӥޤ�����(1-%d) "
-#: po/placeholder.h:146 urpmi:321 urpmi:345
-msgid "Try installation without checking dependencies? (y/N) "
+#: po/placeholder.h:145
+msgid " --wget - use wget to retrieve distant files.\n"
msgstr ""
-"��¸�ط����ǧ�����˥��󥹥ȡ�����ߤޤ����� (�Ϥ�(y)/������(N)) [������] "
-#: po/placeholder.h:147 urpmi:190
-msgid "One of the following packages is needed:"
-msgstr "���Υѥå������Τ����줫��ɬ�פǤ�:"
+#: po/placeholder.h:146
+#, 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"
+msgstr ""
+
+#: po/placeholder.h:152 urpmi:328 urpmi:352
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr ""
+"���٥��󥹥ȡ�����ߤޤ�������--force �����Ǥ��� (�Ϥ�(y)/������(N)) [����"
+"��] "
+
+#: po/placeholder.h:154
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+
+#: po/placeholder.h:155 urpmi:205
+msgid "Sorry, bad choice, try again\n"
+msgstr "ͭ��������ǤϤ���ޤ��󡣤⤦���٤��ꤤ���ޤ�\n"
+
+#: po/placeholder.h:156
+msgid ""
+" names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: po/placeholder.h:158
+msgid " -a - select all matches on command line.\n"
+msgstr ""
-#: po/placeholder.h:148 urpmi:149
+#: 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 "%s �򥤥󥹥ȡ������\n"
+
+#: po/placeholder.h:161 urpmi:152
msgid "Only superuser is allowed to install local packages"
msgstr ""
"��������ѥå������Υ��󥹥ȡ���ϥ����ѡ��桼�����Ǥʤ��ƤϤǤ��ޤ���"
-#: 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 "��ǥ�����%s�ˤ� %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 "�������ѥå�����������Ǥ��ޤ���Ǥ��������Τޤ޽�λ���ޤ�"
-#: po/placeholder.h:151 urpmi:329 urpmi:353
-msgid "Try installation even more strongly (--force)? (y/N) "
+#: po/placeholder.h:165 urpmi:102
+#, fuzzy
+msgid "Only superuser is allowed to install packages"
msgstr ""
-"���٥��󥹥ȡ�����ߤޤ�������--force �����Ǥ��� (�Ϥ�(y)/������(N)) [����"
-"��] "
+"��������ѥå������Υ��󥹥ȡ���ϥ����ѡ��桼�����Ǥʤ��ƤϤǤ��ޤ���"
+
+#: po/placeholder.h:166 urpmi:193
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "���Υѥå������Τ����줫��ɬ�פǤ�:"
-#: po/placeholder.h:155 urpmi.addmedia:46
+#: po/placeholder.h:167 urpmi:277
+msgid "Press Enter when it's done..."
+msgstr "����ä���ϥ꥿���󥭡��򲡤��Ʋ�������"
+
+#: po/placeholder.h:168 urpmi.addmedia:46
#, c-format
msgid ""
"%s\n"
@@ -665,7 +734,7 @@ msgstr ""
"%s\n"
"��with ...�װʹߤλ��꤬ ftp �ˤĤ��Ƥ�ɬ�פǤ�\n"
-#: po/placeholder.h:159
+#: po/placeholder.h:172
msgid ""
"usage: urpmi.addmedia [--update] <name> <url>\n"
"where <url> is one of\n"
@@ -684,17 +753,17 @@ msgstr ""
" http://<host>/<path> with <relative filename of hdlist>\n"
" removable_<device>://<path>\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 "��%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 "���åץǡ��Ȥ��%s�פˤĤ��ƹԤʤ����Ȥ��Ǥ��ޤ���Ǥ���\n"
-#: po/placeholder.h:170 urpmi.addmedia:42
+#: po/placeholder.h:183 urpmi.addmedia:42
#, c-format
msgid ""
"%s\n"
@@ -703,7 +772,7 @@ msgstr ""
"%s\n"
"����ΥǥХ�����%s�ˤ����Ĥ���ޤ���\n"
-#: po/placeholder.h:174 urpmi.addmedia:44
+#: po/placeholder.h:187 urpmi.addmedia:44
#, c-format
msgid ""
"%s\n"
@@ -712,7 +781,7 @@ msgstr ""
"%s\n"
"��<relative path of hdlist>����ʬ�λ��꤬����ޤ���\n"
-#: po/placeholder.h:178
+#: po/placeholder.h:191
#, fuzzy, c-format
msgid ""
"usage: urpmi.update [-a] <name> ...\n"
@@ -731,13 +800,13 @@ msgstr ""
"\n"
"���ݡ��Ȥ���Ƥ��ʤ����ץ����Ǥ�: %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 ""
"���åץǡ��Ȥ�ɬ�פʤ�ΤϤ���ޤ���\n"
"��ǥ������ɲä������ urpmi.addmedia ����Ѥ��Ʋ�������\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"
@@ -746,13 +815,13 @@ msgstr ""
"���åץǡ����оݤ����Ĥ���ޤ���\n"
"(%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 ""
"\"�����ɬ�פʤ�ΤϤ���ޤ���\\n\"\n"
"\"��ǥ������ɲä������ urpmi.addmedia ����Ѥ��Ʋ�������\\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"
@@ -761,7 +830,7 @@ msgstr ""
"����оݤ����Ĥ���ޤ���\n"
"(%s ����Τ����줫)\n"
-#: po/placeholder.h:197
+#: po/placeholder.h:210
#, c-format
msgid ""
"usage: urpmi.removemedia [-a] <name> ...\n"
@@ -776,19 +845,11 @@ msgstr ""
"\n"
"���ݡ��Ȥ���Ƥ��ʤ����ץ����Ǥ�: %s\n"
-#: po/placeholder.h:204 urpmq:85
-#, fuzzy, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: RPM�ե������$_�ˤ��ɤळ�Ȥ�����ޤ���Ǥ���\n"
-
-#: po/placeholder.h:206 urpmq:82
-#, fuzzy, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#: po/placeholder.h:217
+msgid " -h - print this help message.\n"
msgstr ""
-"̤�ΤΥ��ץ�����\"-$1\"�ˤǤ���\n"
-"������ˡ�� --help ���ץ����dz�ǧ���Ƥ���������\n"
-#: 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"
@@ -796,7 +857,28 @@ msgstr ""
"���åץ��졼�ɤΤ���ˤϤ����Ĥ��Υѥå�������������\n"
"ɬ�פ�����ޤ��ʤ����̤�����Ǥ���\n"
-#: po/placeholder.h:208
+#: po/placeholder.h:219
+msgid " -g - print groups too with name.\n"
+msgstr ""
+
+#: po/placeholder.h:220 urpmq:84
+#, fuzzy, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: RPM�ե������$_�ˤ��ɤळ�Ȥ�����ޤ���Ǥ���\n"
+
+#: po/placeholder.h:221
+msgid " names or rpm files given on command line are queried.\n"
+msgstr ""
+
+#: po/placeholder.h:223
+msgid " -r - print version and release too with name.\n"
+msgstr ""
+
+#: po/placeholder.h:224
+msgid " -f - print version, release and arch with name.\n"
+msgstr ""
+
+#: po/placeholder.h:225
#, c-format
msgid ""
"urpmq version %s\n"
@@ -804,82 +886,72 @@ msgid ""
"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 package do not exist.\n"
-" names or rpm files given on command line are queried.\n"
msgstr ""
-#: urpm.pm:257
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:231
+msgid " -d - extend query to package dependencies.\n"
msgstr ""
-#: urpm.pm:258
-#, c-format
-msgid "taking removable device as \"%s\""
+#: po/placeholder.h:232
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
msgstr ""
-#: urpm.pm:262
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
+#: po/placeholder.h:233
+msgid ""
+" -c - choose complete method for resolving requires closure.\n"
msgstr ""
-#: urpm.pm:266 urpm.pm:269
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
-
-#: urpm.pm:1339
-#, fuzzy, c-format
-msgid "read synthesis file [%s]"
-msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
-
-#: urpmi:49
-#, c-format
-msgid "urpmi version %s"
-msgstr "urpmi ������� %s"
-
-#: urpmi:98
+#: po/placeholder.h:235 urpmq:81
#, fuzzy, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
msgstr ""
"̤�ΤΥ��ץ�����\"-$1\"�ˤǤ���\n"
"������ˡ�� --help ���ץ����dz�ǧ���Ƥ���������\n"
-#: urpmi:102
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
+#: po/placeholder.h:236
+msgid ""
+" --headers - extract headers for package listed from urpmi db to\n"
+" stdout (root only).\n"
msgstr ""
-"��������ѥå������Υ��󥹥ȡ���ϥ����ѡ��桼�����Ǥʤ��ƤϤǤ��ޤ���"
-#: urpmi:189
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "���Υѥå������Τ����줫��ɬ�פǤ�:"
+#: po/placeholder.h:243
+msgid ""
+" -u - remove package if a better version is already installed.\n"
+msgstr ""
-#: urpmi:301
+#: po/placeholder.h:244
msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+" --force - force invocation even if some packages do not\n"
+"exist.\n"
msgstr ""
+#: urpm.pm:1796 urpm.pm:1805
+#, c-format
+msgid "removing %s to upgrade to %s ..."
+msgstr ""
+
+#: urpm.pm:1797 urpm.pm:1806
+msgid ", $otherPackage, "
+msgstr ", $otherPackage, "
+
+#: urpm.pm:1797 urpm.pm:1806
+msgid "));"
+msgstr "));"
+
+#: urpm.pm:1802
+msgid "$p->{name}-$p->{version}-$p->{release}"
+msgstr "$p->{name}-$p->{version}-$p->{release}"
+
+#: urpm.pm:1812
+msgid "$prefix/$_"
+msgstr "$prefix/$_"
+
+#: urpmi:48
+#, c-format
+msgid "urpmi version %s"
+msgstr "urpmi ������� %s"
+
#: urpmi.addmedia:30
#, fuzzy
msgid "usage: urpmi.addmedia [--update] <name> <url>"
@@ -911,8 +983,57 @@ msgstr ", $_);"
msgid "urpmq version %s"
msgstr "urpmq version %s"
-#~ msgid "));"
-#~ msgstr "));"
+#, fuzzy
+#~ 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 ""
+#~ "urpmi version %s\n"
+#~ "Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+#~ "�����ʤϥե꡼���եȥ������Ǥ��ꡢGNU GPL �ε���˽��ä�\n"
+#~ "�����ۤ��뤳�Ȥ����Ĥ���Ƥ��ޤ���\n"
+#~ "���ץ�������:\n"
+#~ " --help - ���Υ�å�������ɽ�����ޤ�\n"
+#~ " --auto - ��Ŭ�ʥѥå�������ư���򤷤ޤ�\n"
+#~ " --auto-select - �����ƥॢ�åץ��졼�ɤ�ɬ�פʥѥå�������ư����"
+#~ "�ޤ�\n"
+#~ " --force - ¸�ߤ��ʤ��ѥå�������������Ǥ�³�Ԥ��ޤ�\n"
+#~ " --X - ɽ���� X �����Ѥ��ޤ���GUI��\n"
+#~ " --best-output - ɽ���� X ���ƥ����ȤΤ����줫��ưȽ�ꤷ�����Ѥ���"
+#~ "��\n"
+#~ " -a - ���ޥ�ɥ饤��Ǥλ���˹��פ����Τ����򤷤ޤ�\n"
+#~ " -m - �Ǿ���ɬ�פ�ʬ���������򤷤ޤ��ʥǥե���ȡ�\n"
+#~ " -M - ��ǽ�ʸ¤�Τ��٤Ƥ����򤷤ޤ�\n"
+#~ " -c - ��¸�ط��β��Ϥ򸷳ʤ˹Ԥʤ��ޤ�\n"
+#~ " -q - ɽ����å�������Ǿ��¤ˤ��ޤ�\n"
+#~ " -v - �ܺ٤�ɽ����å�������Ф��ޤ�\n"
+#~ "\n"
+#~ " ���ꤵ�줿̾���Ǽ����Ǥ���ѥå��������⤷���ϡʴ����Ԥ��¹Ԥ��Ƥ���\n"
+#~ " ���Τߡ�ľ�� RPM �ե�����̾�ˤ����ꤵ���ѥå������򥤥󥹥ȡ���\n"
+#~ " ���ޤ���\n"
#~ msgid "), $_);"
#~ msgstr "), $_);"
diff --git a/po/ka.po b/po/ka.po
index 5a4d8a5e..6b32a1e4 100644
--- a/po/ka.po
+++ b/po/ka.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: 2000-05-15 18:58+0200\n"
"Last-Translator: Aiet Kolkhi <aiet@gmx.net>\n"
"Language-Team: Georgian\n"
@@ -23,27 +23,27 @@ msgid ""
"You requested installation of package $rpm\n"
msgstr ""
-#: _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 "თანახმა ხართ?"
-#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:281
+#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:279
msgid "Ok"
msgstr "ო-ქეი"
-#: _irpm:34 po/placeholder.h:116 urpmi:252 urpmi:282
+#: _irpm:34 po/placeholder.h:119 urpmi:252 urpmi:280
msgid "Cancel"
msgstr "გამოქცევა"
-#: _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 "nNaAა"
-#: _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 "yYkKxXხ"
-#: _irpm:42 po/placeholder.h:118 urpmi:258
+#: _irpm:42 po/placeholder.h:157 urpmi:258
msgid " (Y/n) "
msgstr " (ხ/ა) [ხ] "
@@ -146,120 +146,120 @@ msgstr ""
msgid "urpmi is not installed"
msgstr ""
-#: po/placeholder.h:29 urpm.pm:283
+#: po/placeholder.h:29
+#, c-format
+msgid "reading synthesis file [%s]"
+msgstr ""
+
+#: po/placeholder.h:30 urpm.pm:298
#, c-format
msgid "unable to write config file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:31
+#: po/placeholder.h:32
#, c-format
msgid "nothing to write in list file for \"%s\""
msgstr ""
-#: 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 ""
-#: po/placeholder.h:33
+#: po/placeholder.h:34
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr ""
-#: po/placeholder.h:34
+#: po/placeholder.h:35
#, c-format
msgid "nothing written in list file for \"%s\""
msgstr ""
-#: po/placeholder.h:35 urpm.pm:1951
-#, c-format
-msgid ""
-"removing %s to upgrade ...\n"
-" to %s since it will not upgrade correctly!"
-msgstr ""
-
-#: po/placeholder.h:39 urpm.pm:839
+#: po/placeholder.h:36 urpm.pm:845
#, c-format
msgid "read provides file [%s]"
msgstr ""
-#: po/placeholder.h:40
+#: po/placeholder.h:37 urpm.pm:1549
#, c-format
-msgid "trying to remove inexistant medium \"%s\""
+msgid "package %s is not found."
msgstr ""
-#: po/placeholder.h:41 urpm.pm:1692
+#: po/placeholder.h:38 urpm.pm:876
#, c-format
-msgid "package %s is not found."
+msgid "unable to write compss file [%s]"
msgstr ""
-#: po/placeholder.h:42
+#: po/placeholder.h:39 urpm.pm:819
#, c-format
-msgid "unable to copy source of [%s] from [%s]"
+msgid "unmounting %s"
msgstr ""
-#: po/placeholder.h:43 urpm.pm:870
+#: po/placeholder.h:40
#, c-format
-msgid "unable to write compss file [%s]"
+msgid "removing %d obsolete headers in cache"
msgstr ""
-#: po/placeholder.h:44 urpm.pm:813
+#: po/placeholder.h:41 urpm.pm:925 urpm.pm:1491
#, c-format
-msgid "unmounting %s"
+msgid "no hdlist file found for medium \"%s\""
msgstr ""
-#: po/placeholder.h:45
+#: po/placeholder.h:42 urpm.pm:160
#, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
msgstr ""
-#: po/placeholder.h:46 urpm.pm:919 urpm.pm:1634
+#: po/placeholder.h:43 urpm.pm:184
#, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
msgstr ""
-#: po/placeholder.h:47 urpm.pm:176
+#: po/placeholder.h:44 urpm.pm:191
#, c-format
msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
msgstr ""
-#: po/placeholder.h:48
+#: po/placeholder.h:45
msgid "keeping only files referenced in provides"
msgstr ""
-#: po/placeholder.h:49
+#: po/placeholder.h:46
#, c-format
msgid "unable to build synthesis file for medium \"%s\""
msgstr ""
-#: po/placeholder.h:50
+#: po/placeholder.h:47
#, c-format
msgid "found %d headers in cache"
msgstr ""
-#: po/placeholder.h:51 urpm.pm:836
+#: po/placeholder.h:48 urpm.pm:842
#, c-format
msgid "unable to read provides file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:53 urpm.pm:311
+#: po/placeholder.h:50
#, c-format
-msgid "medium \"%s\" already exists"
+msgid ""
+"removing %s to upgrade to %s ...\n"
+" since it will not be updated otherwise"
msgstr ""
-#: po/placeholder.h:54 urpm.pm:295
+#: po/placeholder.h:54 urpm.pm:326
#, c-format
-msgid "write config file [%s]"
+msgid "medium \"%s\" already exists"
msgstr ""
#: po/placeholder.h:55
@@ -267,293 +267,385 @@ msgstr ""
msgid "unable to write list file of \"%s\""
msgstr ""
-#: po/placeholder.h:56 urpm.pm:1817
-#, c-format
-msgid "retrieving [%s]"
-msgstr ""
-
-#: po/placeholder.h:57 urpm.pm:1819
+#: po/placeholder.h:56 urpm.pm:310
#, c-format
-msgid "wget of [%s] failed"
+msgid "write config file [%s]"
msgstr ""
-#: po/placeholder.h:58 urpm.pm:1101
+#: po/placeholder.h:57 urpm.pm:1107
#, fuzzy, c-format
msgid "no package named %s"
msgstr "არც ერთ პაკეტს არ ქვია %s\n"
-#: po/placeholder.h:59 urpm.pm:848
+#: po/placeholder.h:58 urpm.pm:854
#, c-format
msgid "unable to read compss file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:61
+#: po/placeholder.h:60
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr ""
-#: po/placeholder.h:62
+#: po/placeholder.h:61
msgid "computing dependencies"
msgstr ""
-#: po/placeholder.h:63 urpm.pm:868
+#: po/placeholder.h:62
+#, c-format
+msgid "retrieve of [%s] failed"
+msgstr ""
+
+#: po/placeholder.h:63 urpm.pm:874
#, c-format
msgid "write provides file [%s]"
msgstr ""
-#: po/placeholder.h:64 urpm.pm:803
+#: po/placeholder.h:64 urpm.pm:809
#, fuzzy, c-format
msgid "mounting %s"
msgstr "ვაინსტალირებ: %s\n"
-#: 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 "
"medium"
msgstr ""
-#: po/placeholder.h:66 urpm.pm:148
-#, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
-msgstr ""
-
-#: po/placeholder.h:67
+#: po/placeholder.h:66
#, c-format
msgid "reading hdlist file [%s]"
msgstr ""
-#: po/placeholder.h:68 urpm.pm:873
+#: po/placeholder.h:67 urpm.pm:879
#, c-format
msgid "write compss file [%s]"
msgstr ""
-#: po/placeholder.h:69 urpm.pm:827
+#: po/placeholder.h:68 urpm.pm:833
#, c-format
msgid "read depslist file [%s]"
msgstr ""
-#: po/placeholder.h:70
+#: po/placeholder.h:69 urpm.pm:103
+msgid "curl failed\n"
+msgstr ""
+
+#: po/placeholder.h:70 urpm.pm:281 urpm.pm:284
#, c-format
-msgid "trying to select inexistant medium \"%s\""
+msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr ""
-#: po/placeholder.h:71 urpm.pm:1812
+#: po/placeholder.h:71 urpm.pm:1668
#, c-format
msgid "malformed input: [%s]"
msgstr ""
-#: 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"
+msgid "there are multiple packages with the same rpm filename \"%s\""
msgstr ""
-#: 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 ""
-#: po/placeholder.h:77 urpm.pm:865
+#: po/placeholder.h:74 urpm.pm:871
#, c-format
msgid "unable to write provides file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:79 urpm.pm:1005
-msgid "unable to register rpm file"
+#: po/placeholder.h:76 urpm.pm:1215
+msgid "unable to find all synthesis file, using parsehdlist server"
msgstr ""
-#: po/placeholder.h:80 urpm.pm:1362
-msgid "unable to find all synthesis file, using parsehdlist server"
+#: po/placeholder.h:77 urpm.pm:1011
+msgid "unable to register rpm file"
msgstr ""
-#: po/placeholder.h:81 urpm.pm:241
+#: po/placeholder.h:78 urpm.pm:256
#, c-format
msgid "unable to inspect list file for \"%s\", medium ignored"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:83
+#: po/placeholder.h:81
#, c-format
msgid "copy of [%s] failed"
msgstr ""
-#: 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 ""
+
+#: 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 ""
-#: po/placeholder.h:85 urpm.pm:824
+#: po/placeholder.h:84 urpm.pm:1192
#, c-format
-msgid "unable to read depslist file [%s]"
+msgid "read synthesis file [%s]"
msgstr ""
-#: po/placeholder.h:86
-msgid "removable medium not selected"
+#: po/placeholder.h:85 urpm.pm:830
+#, c-format
+msgid "unable to read depslist file [%s]"
msgstr ""
-#: po/placeholder.h:87 urpm.pm:851
+#: po/placeholder.h:86 urpm.pm:857
#, c-format
msgid "read compss file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:89
+#: po/placeholder.h:88
#, c-format
msgid "building hdlist [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:91 urpm.pm:1009
+#: po/placeholder.h:90 urpm.pm:1015
msgid "error registering local packages"
msgstr ""
-#: po/placeholder.h:92 urpm.pm:1762
+#: po/placeholder.h:91 urpm.pm:273
#, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "taking removable device as \"%s\""
msgstr ""
-#: po/placeholder.h:93
+#: po/placeholder.h:92 urpm.pm:1619
#, c-format
-msgid "unable to build hdlist: %s"
+msgid "incoherent medium \"%s\" marked removable but not really"
msgstr ""
-#: po/placeholder.h:94 urpm.pm:1000
+#: po/placeholder.h:93
#, c-format
-msgid "invalid rpm file name [%s]"
+msgid "unable to build hdlist: %s"
msgstr ""
-#: po/placeholder.h:95 urpm.pm:1736 urpm.pm:1739 urpm.pm:1758
+#: po/placeholder.h:94 urpm.pm:1593 urpm.pm:1596 urpm.pm:1615
#, c-format
msgid "medium \"%s\" is not selected"
msgstr ""
-#: po/placeholder.h:96 urpm.pm:207
+#: po/placeholder.h:95 urpm.pm:1006
#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "invalid rpm file name [%s]"
msgstr ""
-#: po/placeholder.h:97 urpm.pm:863
+#: po/placeholder.h:96 urpm.pm:1175
#, c-format
-msgid "write depslist file [%s]"
+msgid "unknown data associated with %s"
msgstr ""
-#: po/placeholder.h:98 urpm.pm:1322
+#: po/placeholder.h:97 urpm.pm:222
#, c-format
-msgid "unknown data associated with %s"
+msgid "trying to bypass existing medium \"%s\", avoiding"
msgstr ""
-#: po/placeholder.h:99
+#: po/placeholder.h:98 urpm.pm:869
#, c-format
-msgid "source of [%s] not found as [%s]"
+msgid "write depslist file [%s]"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: po/placeholder.h:102
+#: po/placeholder.h:101 urpm.pm:1007
#, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
+msgid "unable to access rpm file [%s]"
msgstr ""
-#: po/placeholder.h:103 urpm.pm:1001
+#: po/placeholder.h:102 urpm.pm:866
#, c-format
-msgid "unable to access rpm file [%s]"
+msgid "unable to write depslist file [%s]"
msgstr ""
-#: po/placeholder.h:104 urpm.pm:860
+#: po/placeholder.h:103
#, c-format
-msgid "unable to write depslist file [%s]"
+msgid ""
+"removing %s to upgrade to %s ...\n"
+" since it will not upgrade correctly!"
msgstr ""
-#: po/placeholder.h:105 urpm.pm:327 urpm.pm:1773
+#: po/placeholder.h:107 urpm.pm:342 urpm.pm:1630
#, c-format
msgid "unable to access medium \"%s\""
msgstr ""
-#: po/placeholder.h:106 urpm.pm:988
+#: po/placeholder.h:108 urpm.pm:994
#, c-format
msgid "relocated %s entries in depslist"
msgstr ""
-#: 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\""
+msgid "trying to select inexistent medium \"%s\""
msgstr ""
-#: po/placeholder.h:108
+#: 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 "no rpm files found from [%s]"
+msgid "unable to parse correctly [%s] on value \"%s\""
msgstr ""
-#: po/placeholder.h:109 urpm.pm:1104
+#: po/placeholder.h:112 urpm.pm:1110
#, fuzzy, c-format
msgid "The following packages contain %s: %s"
msgstr "%s შედმეგ პაკეტებშია: %s\n"
-#: 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\""
+msgid "no rpm files found from [%s]"
msgstr ""
-#: po/placeholder.h:111 urpm.pm:1920
+#: po/placeholder.h:114 urpm.pm:1772
#, c-format
msgid "selecting %s using obsoletes"
msgstr ""
-#: po/placeholder.h:112 urpm.pm:2031
+#: po/placeholder.h:115 urpm.pm:1888
#, c-format
msgid "selecting %s by selection on files"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:114 urpmi:308 urpmi:315 urpmi:328 urpmi:339 urpmi:352
+#: po/placeholder.h:120
+msgid " --help - print this help message.\n"
+msgstr ""
+
+#: po/placeholder.h:121 urpmi:361
+msgid "everything already installed"
+msgstr "უკვე ყველაფერი ჩაწერილია"
+
+#: po/placeholder.h:122 urpmi:98
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr ""
+
+#: po/placeholder.h:123 urpmi:194
+msgid "One of the following packages is needed:"
+msgstr "ერთერთი შემდეგი პაკეტი საჭიროა:"
+
+#: 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 "ინსტალაცია ჩაიშალა"
-#: po/placeholder.h:115 urpmi:279
-msgid "Press enter when it's done..."
-msgstr "გთხოვთ დაგვიდასტუროთ Enter ღილაკზე დაჭერით..."
+#: 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 "ცუდი არჩევანია, კიდევ სცადეთ\n"
+#: po/placeholder.h:134
+msgid " --X - use X interface.\n"
+msgstr ""
-#: 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 "დამოკიდებულებების შესასრულებლად შემდეგი პაკეტები ჩაიწერება (%d მბ)"
+
+#: po/placeholder.h:136 urpmi:320 urpmi:344
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "გნებავთ ვცადე ჩაწერა დამოკიდებულებების შემოწმების გარეშე? (ხ/ა) [ა] "
+
+#: 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
+msgid " -q - quiet mode.\n"
+msgstr ""
+
+#: po/placeholder.h:144 urpmi:202
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "თქვენი არჩევანი? (1-%d) "
+
+#: po/placeholder.h:145
+msgid " --wget - use wget to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:146
#, c-format
msgid ""
"urpmi version %s\n"
@@ -561,81 +653,78 @@ msgid ""
"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 ""
-#: po/placeholder.h:142 urpmi:362
-msgid "everything already installed"
-msgstr "უკვე ყველაფერი ჩაწერილია"
+#: po/placeholder.h:152 urpmi:328 urpmi:352
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "გნებავთ ვცადო ჩაწერა ძალით (--force)? (ხ/ა) [ა] "
-#: po/placeholder.h:143 urpmi:247
-#, c-format
+#: po/placeholder.h:154
msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
-msgstr "დამოკიდებულებების შესასრულებლად შემდეგი პაკეტები ჩაიწერება (%d მბ)"
+" --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 "ვაინსტალირებ: %s\n"
+#: po/placeholder.h:155 urpmi:205
+msgid "Sorry, bad choice, try again\n"
+msgstr "ცუდი არჩევანია, კიდევ სცადეთ\n"
-#: po/placeholder.h:145 urpmi:198
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "თქვენი არჩევანი? (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 "გნებავთ ვცადე ჩაწერა დამოკიდებულებების შემოწმების გარეშე? (ხ/ა) [ა] "
+#: 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 "ერთერთი შემდეგი პაკეტი საჭიროა:"
+#: 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 "ვაინსტალირებ: %s\n"
-#: po/placeholder.h:148 urpmi:149
+#: po/placeholder.h:161 urpmi:152
msgid "Only superuser is allowed to install local packages"
msgstr ""
"მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
"ჩაწეროს პაკეტები."
-#: po/placeholder.h:149 urpmi:278
+#: po/placeholder.h:162 urpmi:276
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "გთხოვთ ჩადოთ: %s სახელით: %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 ""
-#: po/placeholder.h:151 urpmi:329 urpmi:353
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "გნებავთ ვცადო ჩაწერა ძალით (--force)? (ხ/ა) [ა] "
+#: po/placeholder.h:165 urpmi:102
+#, fuzzy
+msgid "Only superuser is allowed to install packages"
+msgstr ""
+"მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
+"ჩაწეროს პაკეტები."
+
+#: po/placeholder.h:166 urpmi:193
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "ერთერთი შემდეგი პაკეტი საჭიროა:"
+
+#: po/placeholder.h:167 urpmi:277
+msgid "Press Enter when it's done..."
+msgstr "გთხოვთ დაგვიდასტუროთ Enter ღილაკზე დაჭერით..."
-#: po/placeholder.h:155 urpmi.addmedia:46
+#: po/placeholder.h:168 urpmi.addmedia:46
#, c-format
msgid ""
"%s\n"
"`with' missing for ftp media\n"
msgstr ""
-#: po/placeholder.h:159
+#: po/placeholder.h:172
msgid ""
"usage: urpmi.addmedia [--update] <name> <url>\n"
"where <url> is one of\n"
@@ -647,31 +736,31 @@ msgid ""
" removable_<device>://<path>\n"
msgstr ""
-#: po/placeholder.h:168 urpmi.addmedia:57
+#: po/placeholder.h:181 urpmi.addmedia:57
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr ""
-#: po/placeholder.h:169 urpmi.addmedia:58
+#: po/placeholder.h:182 urpmi.addmedia:58
#, c-format
msgid "unable to update medium \"%s\"\n"
msgstr ""
-#: po/placeholder.h:170 urpmi.addmedia:42
+#: po/placeholder.h:183 urpmi.addmedia:42
#, c-format
msgid ""
"%s\n"
"device `%s' do not exist\n"
msgstr ""
-#: po/placeholder.h:174 urpmi.addmedia:44
+#: po/placeholder.h:187 urpmi.addmedia:44
#, c-format
msgid ""
"%s\n"
"<relative path of hdlist> missing\n"
msgstr ""
-#: po/placeholder.h:178
+#: po/placeholder.h:191
#, c-format
msgid ""
"usage: urpmi.update [-a] <name> ...\n"
@@ -683,29 +772,29 @@ msgid ""
"unknown options '%s'\n"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:188 urpmi.update:53
+#: po/placeholder.h:201 urpmi.update:53
#, c-format
msgid ""
"the entry to update is missing\n"
"(one of %s)\n"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:193 urpmi.removemedia:46
+#: po/placeholder.h:206 urpmi.removemedia:46
#, c-format
msgid ""
"the entry to remove is missing\n"
"(one of %s)\n"
msgstr ""
-#: po/placeholder.h:197
+#: po/placeholder.h:210
#, c-format
msgid ""
"usage: urpmi.removemedia [-a] <name> ...\n"
@@ -715,23 +804,38 @@ msgid ""
"unknown options '%s'\n"
msgstr ""
-#: po/placeholder.h:204 urpmq:85
+#: po/placeholder.h:217
+msgid " -h - print this help message.\n"
+msgstr ""
+
+#: po/placeholder.h:218 urpmq:130
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+
+#: po/placeholder.h:219
+msgid " -g - print groups too with name.\n"
+msgstr ""
+
+#: po/placeholder.h:220 urpmq:84
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr ""
-#: po/placeholder.h:206 urpmq:82
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#: po/placeholder.h:221
+msgid " names or rpm files given on command line are queried.\n"
msgstr ""
-#: po/placeholder.h:207 urpmq:131
-msgid ""
-"some package have to be removed for being upgraded, this is not supported "
-"yet\n"
+#: po/placeholder.h:223
+msgid " -r - print version and release too with name.\n"
+msgstr ""
+
+#: po/placeholder.h:224
+msgid " -f - print version, release and arch with name.\n"
msgstr ""
-#: po/placeholder.h:208
+#: po/placeholder.h:225
#, c-format
msgid ""
"urpmq version %s\n"
@@ -739,79 +843,68 @@ msgid ""
"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 package do not exist.\n"
-" names or rpm files given on command line are queried.\n"
msgstr ""
-#: urpm.pm:257
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:231
+msgid " -d - extend query to package dependencies.\n"
msgstr ""
-#: urpm.pm:258
-#, c-format
-msgid "taking removable device as \"%s\""
+#: po/placeholder.h:232
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
msgstr ""
-#: urpm.pm:262
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
+#: po/placeholder.h:233
+msgid ""
+" -c - choose complete method for resolving requires closure.\n"
msgstr ""
-#: urpm.pm:266 urpm.pm:269
+#: po/placeholder.h:235 urpmq:81
#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
msgstr ""
-#: urpm.pm:1339
-#, c-format
-msgid "read synthesis file [%s]"
+#: po/placeholder.h:236
+msgid ""
+" --headers - extract headers for package listed from urpmi db to\n"
+" stdout (root only).\n"
msgstr ""
-#: urpmi:49
-#, c-format
-msgid "urpmi version %s"
+#: po/placeholder.h:243
+msgid ""
+" -u - remove package if a better version is already installed.\n"
msgstr ""
-#: urpmi:98
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#: po/placeholder.h:244
+msgid ""
+" --force - force invocation even if some packages do not\n"
+"exist.\n"
msgstr ""
-#: urpmi:102
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
+#: urpm.pm:1796 urpm.pm:1805
+#, c-format
+msgid "removing %s to upgrade to %s ..."
msgstr ""
-"მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
-"ჩაწეროს პაკეტები."
-#: urpmi:189
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "ერთერთი შემდეგი პაკეტი საჭიროა:"
+#: urpm.pm:1797 urpm.pm:1806
+msgid ", $otherPackage, "
+msgstr ", $otherPackage, "
-#: urpmi:301
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+#: urpm.pm:1797 urpm.pm:1806
+msgid "));"
+msgstr "));"
+
+#: urpm.pm:1802
+msgid "$p->{name}-$p->{version}-$p->{release}"
+msgstr "$p->{name}-$p->{version}-$p->{release}"
+
+#: urpm.pm:1812
+msgid "$prefix/$_"
+msgstr "$prefix/$_"
+
+#: urpmi:48
+#, c-format
+msgid "urpmi version %s"
msgstr ""
#: urpmi.addmedia:30
@@ -844,9 +937,6 @@ msgstr ", $_);"
msgid "urpmq version %s"
msgstr ""
-#~ msgid "));"
-#~ msgstr "));"
-
#~ msgid "), $_);"
#~ msgstr "), $_);"
diff --git a/po/ko.po b/po/ko.po
index 1c1dd26e..7242265b 100644
--- a/po/ko.po
+++ b/po/ko.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-09-22 03:14+0900\n"
"Last-Translator: Jaegeum Choe <baedaron@hananet.net>\n"
"Language-Team: Korean <baedaron@hananet.net>\n"
@@ -25,27 +25,27 @@ msgstr ""
"��Ű�� �ڵ� ��ġ...\n"
"���� ��Ű�� $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 "����ұ��?"
-#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:281
+#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:279
msgid "Ok"
msgstr "Ȯ��"
-#: _irpm:34 po/placeholder.h:116 urpmi:252 urpmi:282
+#: _irpm:34 po/placeholder.h:119 urpmi:252 urpmi:280
msgid "Cancel"
msgstr "���"
-#: _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 "Nn"
-#: _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 "Yy"
-#: _irpm:42 po/placeholder.h:118 urpmi:258
+#: _irpm:42 po/placeholder.h:157 urpmi:258
msgid " (Y/n) "
msgstr " (Y/n) "
@@ -148,175 +148,175 @@ msgstr "�� ���� �ɼ��� ������ urpmf --help��� ġ����."
msgid "urpmi is not installed"
msgstr "urpmi�� ��ġ�Ǿ� ���� �ʽ��ϴ�."
-#: po/placeholder.h:29 urpm.pm:283
+#: po/placeholder.h:29
+#, fuzzy, c-format
+msgid "reading synthesis file [%s]"
+msgstr "������� ���� [%s] �б�"
+
+#: po/placeholder.h:30 urpm.pm:298
#, c-format
msgid "unable to write config file [%s]"
msgstr "���� ���� [%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"
-msgstr "��ü �̸� ��%s���� ����� �� �����ϴ�. ���� ��� ���Դϴ�."
+msgid "using different removable device [%s] for \"%s\""
+msgstr ""
-#: po/placeholder.h:31
+#: po/placeholder.h:32
#, c-format
msgid "nothing to write in list file for \"%s\""
msgstr "��%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 "��%s���� ���� ��� ������ ã�� �� �����ϴ�. ��ü ���õ�."
-#: po/placeholder.h:33
+#: po/placeholder.h:34
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "��%s���� ��������� �м��� �� �����ϴ�."
-#: po/placeholder.h:34
+#: po/placeholder.h:35
#, c-format
msgid "nothing written in list file for \"%s\""
msgstr "��� ���Ͽ���%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 ""
-"%2$s�� ���׷��̵��ϱ� ���� %1$s ������...\n"
-"�ùٸ� ���׷��̵带 ���� �ʿ��մϴ�!"
-
-#: po/placeholder.h:39 urpm.pm:839
+#: po/placeholder.h:36 urpm.pm:845
#, c-format
msgid "read provides file [%s]"
msgstr "���� ���� [%s] �б�"
-#: po/placeholder.h:40
-#, c-format
-msgid "trying to remove inexistant medium \"%s\""
-msgstr "�������� �ʴ� ��ü��%s���� ���� �õ�"
-
-#: po/placeholder.h:41 urpm.pm:1692
+#: po/placeholder.h:37 urpm.pm:1549
#, c-format
msgid "package %s is not found."
msgstr "��Ű�� %s�� ã�� �� �����ϴ�."
-#: po/placeholder.h:42
-#, c-format
-msgid "unable to copy source of [%s] from [%s]"
-msgstr "[%2$s]���� [%1$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 "compss ���� ��%s���� ����� �� �����ϴ�."
-#: po/placeholder.h:44 urpm.pm:813
+#: po/placeholder.h:39 urpm.pm:819
#, c-format
msgid "unmounting %s"
msgstr "%s ����Ʈ ���� ��"
-#: po/placeholder.h:45
+#: po/placeholder.h:40
#, c-format
msgid "removing %d obsolete headers in cache"
msgstr "ij������ %d ���� ��� ���� ��"
-#: 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 "��ü��%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 "��ü ��%s���� �̹� ��� ���� ��������� ����Ϸ� �մϴ�. ��ü ���õ�."
+
+#: po/placeholder.h:43 urpm.pm:184
+#, c-format
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr "��ü �̸� ��%s���� ����� �� �����ϴ�. ���� ��� ���Դϴ�."
+
+#: po/placeholder.h:44 urpm.pm:191
#, c-format
msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
msgstr ""
"��� ���� [%2$s]�� �������� �ʱ� ������, ��ü��%1$s���� ó���� �� �����ϴ�."
-#: po/placeholder.h:48
+#: po/placeholder.h:45
msgid "keeping only files referenced in provides"
msgstr "���� ��Ͽ��� �����Ǵ� ���ϵ鸸 ���� ��"
-#: po/placeholder.h:49
+#: po/placeholder.h:46
#, c-format
msgid "unable to build synthesis file for medium \"%s\""
msgstr "��%s����ü�� ���� �ռ� ������ ���� �� �����ϴ�."
-#: po/placeholder.h:50
+#: po/placeholder.h:47
#, c-format
msgid "found %d headers in cache"
msgstr "ij������ %d ����� ã�ҽ��ϴ�."
-#: po/placeholder.h:51 urpm.pm:836
+#: po/placeholder.h:48 urpm.pm:842
#, c-format
msgid "unable to read provides file [%s]"
msgstr "���� ���ϡ�%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 "������ �� ���� ���õ��� �ʾ����Ƿ�, %s�� ������ ���ϼ���."
-#: 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 ""
+"%2$s�� ���׷��̵带 ���� %s ���� �� ...\n"
+"�� ����ܿ��� �޸� ���׷��̵� ����� �����ϴ�."
+
+#: po/placeholder.h:54 urpm.pm:326
#, c-format
msgid "medium \"%s\" already exists"
msgstr "��ü��%s���� �̹� �����մϴ�."
-#: po/placeholder.h:54 urpm.pm:295
-#, c-format
-msgid "write config file [%s]"
-msgstr "���� ���� [%s]�� ���"
-
#: po/placeholder.h:55
#, c-format
msgid "unable to write list file of \"%s\""
msgstr "��%s���� ��� ������ ����� �� �����ϴ�."
-#: po/placeholder.h:56 urpm.pm:1817
-#, c-format
-msgid "retrieving [%s]"
-msgstr "[%s] ���� ��"
-
-#: po/placeholder.h:57 urpm.pm:1819
+#: po/placeholder.h:56 urpm.pm:310
#, c-format
-msgid "wget of [%s] failed"
-msgstr "[%s]�� wget ����"
+msgid "write config file [%s]"
+msgstr "���� ���� [%s]�� ���"
-#: po/placeholder.h:58 urpm.pm:1101
+#: po/placeholder.h:57 urpm.pm:1107
#, c-format
msgid "no package named %s"
msgstr "%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 "compss ���ϡ�%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 "��%s���� ���� ��� ������ ã�� �� �����ϴ�. ��ü ���õ�."
-#: po/placeholder.h:61
+#: po/placeholder.h:60
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "��ü��%s���� ���� ��� �ռ� ���� ���� �Ϸ�."
-#: po/placeholder.h:62
+#: po/placeholder.h:61
msgid "computing dependencies"
msgstr "������ �ľ� ��"
-#: po/placeholder.h:63 urpm.pm:868
+#: po/placeholder.h:62
+#, fuzzy, c-format
+msgid "retrieve of [%s] failed"
+msgstr "[%s]�� wget ����"
+
+#: po/placeholder.h:63 urpm.pm:874
#, c-format
msgid "write provides file [%s]"
msgstr "���� ���� [%s] �� ���"
-#: po/placeholder.h:64 urpm.pm:803
+#: po/placeholder.h:64 urpm.pm:809
#, c-format
msgid "mounting %s"
msgstr "%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 "
@@ -325,122 +325,134 @@ msgstr ""
"��� ������ �ٸ� ��ü�� ���� �̹� ���ǰ� �ֱ� ������, ��ü ��%s���� ����� "
"�� �����ϴ�."
-#: po/placeholder.h:66 urpm.pm:148
-#, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
-msgstr "��ü ��%s���� �̹� ���Ǵ� ����� ����Ϸ� �մϴ�. ��ü ���õ�."
-
-#: po/placeholder.h:67
+#: po/placeholder.h:66
#, c-format
msgid "reading hdlist file [%s]"
msgstr "��� ���� [%s] �д� ��"
-#: po/placeholder.h:68 urpm.pm:873
+#: po/placeholder.h:67 urpm.pm:879
#, c-format
msgid "write compss file [%s]"
msgstr "COMPSS ���� [%s]�� ���"
-#: po/placeholder.h:69 urpm.pm:827
+#: po/placeholder.h:68 urpm.pm:833
#, c-format
msgid "read depslist file [%s]"
msgstr "������� ���� [%s] �б�"
-#: po/placeholder.h:70
-#, c-format
-msgid "trying to select inexistant medium \"%s\""
-msgstr "�������� �ʴ� ��ü��%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 "��%s����ü�� ������ �� �����ϴ�.\n"
-#: po/placeholder.h:71 urpm.pm:1812
+#: po/placeholder.h:71 urpm.pm:1668
#, c-format
msgid "malformed input: [%s]"
msgstr "�߸��� ������ �Է�: [%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 "��ü ��%s���� �̹� ��� ���� ��������� ����Ϸ� �մϴ�. ��ü ���õ�."
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "������ ���� �̸� ��%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"
-msgstr ""
-"%2$s�� ���׷��̵带 ���� %s ���� �� ...\n"
-"�� ����ܿ��� �޸� ���׷��̵� ����� �����ϴ�."
+msgid "medium \"%s\" tries to use an already used list, medium ignored"
+msgstr "��ü ��%s���� �̹� ���Ǵ� ����� ����Ϸ� �մϴ�. ��ü ���õ�."
-#: po/placeholder.h:77 urpm.pm:865
+#: po/placeholder.h:74 urpm.pm:871
#, c-format
msgid "unable to write provides file [%s]"
msgstr "���� ���ϡ�%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 "��%s���� ��� ���Ͽ� ������ �� �����ϴ�. ��ü ���õ�."
-#: po/placeholder.h:79 urpm.pm:1005
+#: po/placeholder.h:76 urpm.pm:1215
+#, fuzzy
+msgid "unable to find all synthesis file, using parsehdlist server"
+msgstr "��%s����ü�� ���� �ռ� ������ ���� �� �����ϴ�."
+
+#: po/placeholder.h:77 urpm.pm:1011
msgid "unable to register rpm file"
msgstr "RPM ������ ����� �� �����ϴ�."
-#: po/placeholder.h:80 urpm.pm:1362
-msgid "unable to find all synthesis file, using parsehdlist server"
+#: po/placeholder.h:78 urpm.pm:256
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
msgstr ""
-#: po/placeholder.h:81 urpm.pm:241
+#: po/placeholder.h:79 urpm.pm:272
#, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "too many mount points for removable medium \"%s\""
msgstr ""
-#: po/placeholder.h:82 urpm.pm:233
+#: po/placeholder.h:80 urpm.pm:248
#, c-format
msgid "incoherent list file for \"%s\", medium ignored"
msgstr ""
-#: po/placeholder.h:83
+#: po/placeholder.h:81
#, c-format
msgid "copy of [%s] failed"
msgstr "[%s] ���� ����."
-#: 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 "�������� �ʴ� ��ü��%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 "��%s���� �ùٸ��� �м��� �� �����ϴ�."
-#: po/placeholder.h:85 urpm.pm:824
+#: po/placeholder.h:84 urpm.pm:1192
+#, fuzzy, c-format
+msgid "read synthesis file [%s]"
+msgstr "������� ���� [%s] �б�"
+
+#: po/placeholder.h:85 urpm.pm:830
#, c-format
msgid "unable to read depslist file [%s]"
msgstr "������� ���ϡ�%s���� ���� �� �����ϴ�."
-#: po/placeholder.h:86
-msgid "removable medium not selected"
-msgstr "Ż���� ��ü�� ���õ��� �ʾҽ��ϴ�."
-
-#: po/placeholder.h:87 urpm.pm:851
+#: po/placeholder.h:86 urpm.pm:857
#, c-format
msgid "read compss file [%s]"
msgstr "COMPSS ���� [%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 "���� ������ %s �ٿ� ���� ����"
-#: po/placeholder.h:89
+#: po/placeholder.h:88
#, c-format
msgid "building hdlist [%s]"
msgstr "��� [%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 "��ü��%2$s������ RPM ���ϡ�%1$s���� ���� �� �����ϴ�."
-#: po/placeholder.h:91 urpm.pm:1009
+#: po/placeholder.h:90 urpm.pm:1015
msgid "error registering local packages"
msgstr "���� ���� ��� ����"
-#: 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 ""
@@ -450,119 +462,201 @@ msgstr ""
msgid "unable to build hdlist: %s"
msgstr "��� ������ ������ �� �����ϴ�: %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 "��ü [%s]�� ���õ��� �ʾҽ��ϴ�."
+
+#: po/placeholder.h:95 urpm.pm:1006
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "��ȿ���� ���� RPM ���� �̸� [%s]"
-#: 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 "��ü [%s]�� ���õ��� �ʾҽ��ϴ�."
+msgid "unknown data associated with %s"
+msgstr "%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 ""
-#: po/placeholder.h:97 urpm.pm:863
+#: po/placeholder.h:98 urpm.pm:869
#, c-format
msgid "write depslist file [%s]"
msgstr "���� ��� ���� [%s] ���"
-#: po/placeholder.h:98 urpm.pm:1322
-#, c-format
-msgid "unknown data associated with %s"
-msgstr "%s�� ���õ� �� �� ���� ������"
-
-#: po/placeholder.h:99
-#, c-format
-msgid "source of [%s] not found as [%s]"
-msgstr "[%s]�� �ҽ��� [%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 "��%s���� ��� ���Ͽ� ������ �� �����ϴ�. ��ü ���õ�."
-#: 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 ""
-#: po/placeholder.h:102
-#, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
-msgstr "[%s]�� wget ���� (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 "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 "������� ���ϡ�%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 ""
+"%2$s�� ���׷��̵��ϱ� ���� %1$s ������...\n"
+"�ùٸ� ���׷��̵带 ���� �ʿ��մϴ�!"
+
+#: po/placeholder.h:107 urpm.pm:342 urpm.pm:1630
#, c-format
msgid "unable to access medium \"%s\""
msgstr "��ü��%s���� ������ �� �����ϴ�."
-#: po/placeholder.h:106 urpm.pm:988
+#: po/placeholder.h:108 urpm.pm:994
#, c-format
msgid "relocated %s entries in depslist"
msgstr "������Ͽ��� %s �׸� ��ġ ������"
-#: 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 ""
+msgid "trying to select inexistent medium \"%s\""
+msgstr "�������� �ʴ� ��ü��%s�� ���� �õ�"
+
+#: po/placeholder.h:110 urpm.pm:97
+#, fuzzy
+msgid "wget failed\n"
+msgstr "[%s]�� wget ����"
-#: 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 "[%s]���� RPM ������ ã�� �� �����ϴ�."
+msgid "unable to parse correctly [%s] on value \"%s\""
+msgstr ""
-#: po/placeholder.h:109 urpm.pm:1104
+#: po/placeholder.h:112 urpm.pm:1110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "���� ��Ű������ %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 "������ ���� �̸� ��%s���� ���� ���� ���� ��Ű���� �����մϴ�."
+msgid "no rpm files found from [%s]"
+msgstr "[%s]���� RPM ������ ã�� �� �����ϴ�."
-#: po/placeholder.h:111 urpm.pm:1920
+#: po/placeholder.h:114 urpm.pm:1772
#, c-format
msgid "selecting %s using obsoletes"
msgstr ""
-#: po/placeholder.h:112 urpm.pm:2031
+#: po/placeholder.h:115 urpm.pm:1888
#, c-format
msgid "selecting %s by selection on files"
msgstr ""
-#: 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 "�� ������� [%s]�� ��ü�� ������ �� �����ϴ�."
-#: po/placeholder.h:114 urpmi:308 urpmi:315 urpmi:328 urpmi:339 urpmi:352
+#: po/placeholder.h:120
+msgid " --help - print this help message.\n"
+msgstr ""
+
+#: po/placeholder.h:121 urpmi:361
+msgid "everything already installed"
+msgstr "��� ���� �̹� ��ġ�Ǿ� �ֽ��ϴ�."
+
+#: po/placeholder.h:122 urpmi:98
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: �� �� ���� �ɼ� ��-%s��, ��--help���ɼ����� ������ ������.\n"
+
+#: po/placeholder.h:123 urpmi:194
+msgid "One of the following packages is needed:"
+msgstr "���� ��Ű���� �� �ϳ��� �ʿ��մϴ�:"
+
+#: 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 "��ġ ����."
-#: po/placeholder.h:115 urpmi:279
-msgid "Press enter when it's done..."
-msgstr "�� �Ǿ����� ENTERŰ�� ��������..."
+#: 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 "������ �߸��Ǿ����ϴ�. �ٽ� �õ��ϼ���.\n"
+#: po/placeholder.h:134
+msgid " --X - use X interface.\n"
+msgstr ""
-#: 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 "�������� ������Ű�� ����, ���� ��Ű���鵵 ��ġ�� ���Դϴ�. (%d MB)"
+
+#: po/placeholder.h:136 urpmi:320 urpmi:344
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "������ �˻���� ��ġ�մϱ�? (y/N) "
+
+#: 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
+msgid " -q - quiet mode.\n"
+msgstr ""
+
+#: po/placeholder.h:144 urpmi:202
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "��� ���� �����Ͻðڽ��ϱ�? (1-%d) "
+
+#: po/placeholder.h:145
+msgid " --wget - use wget to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:146
#, c-format
msgid ""
"urpmi version %s\n"
@@ -570,91 +664,67 @@ msgid ""
"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 ""
-"urpmi ���� %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"�̰��� ���� ����Ʈ�����̸�, GNU GPL ����༭�� ���� ������� �� �ֽ��ϴ�.\n"
-"����:\n"
-" --help - �� ������ ���� �ݴϴ�.\n"
-" --update - ������Ʈ ��ü�� ���\n"
-" --auto - �ڵ����� ���� ��Ű������ �����մϴ�.\n"
-" --auto-select - �ڵ����� �ý����� ���׷��̵��� ��Ű���� �����մϴ�.\n"
-" --force - �Ϻ� ��Ű���� �������� �ʴ��� ���� �����մϴ�.\n"
-" --X - X �������̽��� ����մϴ�.\n"
-" --best-output - ȯ�濡 ���� ������ �������̽��� ����մϴ�:\n"
-" X �Ǵ� �ؽ�Ʈ ���.\n"
-" -a - �����ٿ� ������ �Ͱ� ��ġ�ϴ� ��� ���� �����մϴ�.\n"
-" -m - �ּ� ������ ���Ǹ��� �����մϴ�. (�⺻��)\n"
-" -M - �ִ� ������ ������ �����մϴ�.\n"
-" -c - ������ ������ �ذ��ϱ� ���� ��� ����� �����մϴ�.\n"
-" -q - �޽��� ����� ���� �ʽ��ϴ�.\n"
-" -v - �ڼ��� �޽��� ����� �մϴ�.\n"
-" (��Ʈ ����ڰ�) �����ٿ� ������ ��Ű���� �Ǵ� RPM ������ ��ġ�մϴ�.\n"
-
-#: po/placeholder.h:142 urpmi:362
-msgid "everything already installed"
-msgstr "��� ���� �̹� ��ġ�Ǿ� �ֽ��ϴ�."
-#: 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 "��ġ�� ���� �����մϱ�? (y/N) "
+
+#: po/placeholder.h:154
msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
-msgstr "�������� ������Ű�� ����, ���� ��Ű���鵵 ��ġ�� ���Դϴ�. (%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 "%s ��ġ ��...\n"
+#: po/placeholder.h:155 urpmi:205
+msgid "Sorry, bad choice, try again\n"
+msgstr "������ �߸��Ǿ����ϴ�. �ٽ� �õ��ϼ���.\n"
-#: po/placeholder.h:145 urpmi:198
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "��� ���� �����Ͻðڽ��ϱ�? (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 "������ �˻���� ��ġ�մϱ�? (y/N) "
+#: 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 "���� ��Ű���� �� �ϳ��� �ʿ��մϴ�:"
+#: po/placeholder.h:159
+msgid " --curl - use curl to retrieve distant files.\n"
+msgstr ""
-#: po/placeholder.h:148 urpmi:149
+#: po/placeholder.h:160 urpmi:294
+#, c-format
+msgid "installing %s\n"
+msgstr "%s ��ġ ��...\n"
+
+#: po/placeholder.h:161 urpmi:152
msgid "Only superuser is allowed to install local packages"
msgstr "��Ʈ ����ڸ��� ���� ��Ű���� ��ġ�� �� �ֽ��ϴ�."
-#: 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 "��ġ [%2$s]�� ��%1$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 "�ҽ� ��Ű���� ���� �� �����ϴ�, �ߴ��մϴ�."
-#: po/placeholder.h:151 urpmi:329 urpmi:353
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "��ġ�� ���� �����մϱ�? (y/N) "
+#: po/placeholder.h:165 urpmi:102
+#, fuzzy
+msgid "Only superuser is allowed to install packages"
+msgstr "��Ʈ ����ڸ��� ���� ��Ű���� ��ġ�� �� �ֽ��ϴ�."
-#: po/placeholder.h:155 urpmi.addmedia:46
+#: po/placeholder.h:166 urpmi:193
+#, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "���� ��Ű���� �� �ϳ��� %s�� ��ġ�ϴµ� �ʿ��մϴ�:"
+
+#: po/placeholder.h:167 urpmi:277
+msgid "Press Enter when it's done..."
+msgstr "�� �Ǿ����� ENTERŰ�� ��������..."
+
+#: po/placeholder.h:168 urpmi.addmedia:46
#, c-format
msgid ""
"%s\n"
@@ -663,7 +733,7 @@ msgstr ""
"%s\n"
"FTP �̵� ���� ��with���� �����ֽ��ϴ�.\n"
-#: po/placeholder.h:159
+#: po/placeholder.h:172
msgid ""
"usage: urpmi.addmedia [--update] <name> <url>\n"
"where <url> is one of\n"
@@ -683,17 +753,17 @@ msgstr ""
" http://<ȣ��Ʈ>/<���> with <��Ű�� ��� ������ �����>\n"
" removable_<��ġ>://<���>\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 "��%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 "��%s����ü�� ������Ʈ�� �� �����ϴ�.\n"
-#: po/placeholder.h:170 urpmi.addmedia:42
+#: po/placeholder.h:183 urpmi.addmedia:42
#, c-format
msgid ""
"%s\n"
@@ -702,7 +772,7 @@ msgstr ""
"%s\n"
"��ġ ��%s���� �������� �ʽ��ϴ�.\n"
-#: po/placeholder.h:174 urpmi.addmedia:44
+#: po/placeholder.h:187 urpmi.addmedia:44
#, c-format
msgid ""
"%s\n"
@@ -711,7 +781,7 @@ msgstr ""
"%s\n"
"<��Ű�� ��� ������ �����>�� ���� �ֽ��ϴ�.\n"
-#: po/placeholder.h:178
+#: po/placeholder.h:191
#, c-format
msgid ""
"usage: urpmi.update [-a] <name> ...\n"
@@ -730,13 +800,13 @@ msgstr ""
"\n"
"�� �� ���� �ɼ� ��%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 ""
"������Ʈ�� ���� �����ϴ�. (�̵� �߰��Ϸ��� ��urpmi.addmedia���� ����ϼ�"
"��.\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"
@@ -745,12 +815,12 @@ msgstr ""
"������Ʈ�Ϸ��� �׸��� �����ֽ��ϴ�.\n"
"(%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 ""
"������ ���� �����ϴ�. (�̵� �߰��Ϸ��� ��urpmi.addmedia���� ����ϼ���.\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"
@@ -759,7 +829,7 @@ msgstr ""
"�����Ϸ��� �׸��� �����ֽ��ϴ�.\n"
"(%s �� �ϳ�)\n"
-#: po/placeholder.h:197
+#: po/placeholder.h:210
#, c-format
msgid ""
"usage: urpmi.removemedia [-a] <name> ...\n"
@@ -774,17 +844,11 @@ msgstr ""
"\n"
"�� �� ���� �ɼ� ��%s��\n"
-#: po/placeholder.h:204 urpmq:85
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: RPM ���� ��%s���� ���� �� �����ϴ�.\n"
-
-#: po/placeholder.h:206 urpmq:82
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: �� �� ���� �ɼ� ��-%s��, ��--help���ɼ����� ������ ������.\n"
+#: po/placeholder.h:217
+msgid " -h - print this help message.\n"
+msgstr ""
-#: 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"
@@ -792,7 +856,28 @@ msgstr ""
"���׷��̵��ϱ� ���ؼ��� �Ϻ� ��Ű���� ���ŵǾ�� �մϴ�. �� ����� ���� ����"
"���� �ʽ��ϴ�.\n"
-#: po/placeholder.h:208
+#: po/placeholder.h:219
+msgid " -g - print groups too with name.\n"
+msgstr ""
+
+#: po/placeholder.h:220 urpmq:84
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: RPM ���� ��%s���� ���� �� �����ϴ�.\n"
+
+#: po/placeholder.h:221
+msgid " names or rpm files given on command line are queried.\n"
+msgstr ""
+
+#: po/placeholder.h:223
+msgid " -r - print version and release too with name.\n"
+msgstr ""
+
+#: po/placeholder.h:224
+msgid " -f - print version, release and arch with name.\n"
+msgstr ""
+
+#: po/placeholder.h:225
#, c-format
msgid ""
"urpmq version %s\n"
@@ -800,78 +885,69 @@ msgid ""
"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"
+msgstr ""
+
+#: po/placeholder.h:231
+msgid " -d - extend query to package dependencies.\n"
+msgstr ""
+
+#: po/placeholder.h:232
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
+msgstr ""
+
+#: po/placeholder.h:233
+msgid ""
" -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"
+msgstr ""
+
+#: po/placeholder.h:235 urpmq:81
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: �� �� ���� �ɼ� ��-%s��, ��--help���ɼ����� ������ ������.\n"
+
+#: po/placeholder.h:236
+msgid ""
" --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 package do not exist.\n"
-" names or rpm files given on command line are queried.\n"
msgstr ""
-#: urpm.pm:257
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:243
+msgid ""
+" -u - remove package if a better version is already installed.\n"
msgstr ""
-#: urpm.pm:258
-#, c-format
-msgid "taking removable device as \"%s\""
+#: po/placeholder.h:244
+msgid ""
+" --force - force invocation even if some packages do not\n"
+"exist.\n"
msgstr ""
-#: urpm.pm:262
+#: urpm.pm:1796 urpm.pm:1805
#, c-format
-msgid "using different removable device [%s] for \"%s\""
+msgid "removing %s to upgrade to %s ..."
msgstr ""
-#: urpm.pm:266 urpm.pm:269
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "��%s����ü�� ������ �� �����ϴ�.\n"
+#: urpm.pm:1797 urpm.pm:1806
+msgid ", $otherPackage, "
+msgstr ", $otherPackage, "
-#: urpm.pm:1339
-#, fuzzy, c-format
-msgid "read synthesis file [%s]"
-msgstr "������� ���� [%s] �б�"
+#: urpm.pm:1797 urpm.pm:1806
+msgid "));"
+msgstr "));"
-#: urpmi:49
-#, c-format
-msgid "urpmi version %s"
-msgstr "urpmi ���� %s"
+#: urpm.pm:1802
+msgid "$p->{name}-$p->{version}-$p->{release}"
+msgstr "$p->{name}-$p->{version}-$p->{release}"
-#: urpmi:98
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: �� �� ���� �ɼ� ��-%s��, ��--help���ɼ����� ������ ������.\n"
+#: urpm.pm:1812
+msgid "$prefix/$_"
+msgstr "$prefix/$_"
-#: urpmi:102
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr "��Ʈ ����ڸ��� ���� ��Ű���� ��ġ�� �� �ֽ��ϴ�."
-
-#: urpmi:189
+#: urpmi:48
#, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "���� ��Ű���� �� �ϳ��� %s�� ��ġ�ϴµ� �ʿ��մϴ�:"
-
-#: urpmi:301
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
-msgstr ""
+msgid "urpmi version %s"
+msgstr "urpmi ���� %s"
#: urpmi.addmedia:30
msgid "usage: urpmi.addmedia [--update] <name> <url>"
@@ -902,3 +978,66 @@ msgstr ", $_);"
#, c-format
msgid "urpmq version %s"
msgstr "urpmq ���� %s"
+
+#~ msgid "retrieving [%s]"
+#~ msgstr "[%s] ���� ��"
+
+#~ msgid "wget of [%s] failed (maybe wget is missing?)"
+#~ msgstr "[%s]�� wget ���� (wget�� ��ġ�Ǿ� �ֽ��ϱ�?)"
+
+#~ msgid "unable to copy source of [%s] from [%s]"
+#~ msgstr "[%2$s]���� [%1$s]�� �ҽ��� ������ �� �����ϴ�."
+
+#~ msgid "removable medium not selected"
+#~ msgstr "Ż���� ��ü�� ���õ��� �ʾҽ��ϴ�."
+
+#~ msgid "source of [%s] not found as [%s]"
+#~ msgstr "[%s]�� �ҽ��� [%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 ""
+#~ "urpmi ���� %s\n"
+#~ "Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+#~ "�̰��� ���� ����Ʈ�����̸�, GNU GPL ����༭�� ���� ������� �� �ֽ���"
+#~ "��.\n"
+#~ "����:\n"
+#~ " --help - �� ������ ���� �ݴϴ�.\n"
+#~ " --update - ������Ʈ ��ü�� ���\n"
+#~ " --auto - �ڵ����� ���� ��Ű������ �����մϴ�.\n"
+#~ " --auto-select - �ڵ����� �ý����� ���׷��̵��� ��Ű���� �����մϴ�.\n"
+#~ " --force - �Ϻ� ��Ű���� �������� �ʴ��� ���� �����մϴ�.\n"
+#~ " --X - X �������̽��� ����մϴ�.\n"
+#~ " --best-output - ȯ�濡 ���� ������ �������̽��� ����մϴ�:\n"
+#~ " X �Ǵ� �ؽ�Ʈ ���.\n"
+#~ " -a - �����ٿ� ������ �Ͱ� ��ġ�ϴ� ��� ���� �����մϴ�.\n"
+#~ " -m - �ּ� ������ ���Ǹ��� �����մϴ�. (�⺻��)\n"
+#~ " -M - �ִ� ������ ������ �����մϴ�.\n"
+#~ " -c - ������ ������ �ذ��ϱ� ���� ��� ����� �����մϴ�.\n"
+#~ " -q - �޽��� ����� ���� �ʽ��ϴ�.\n"
+#~ " -v - �ڼ��� �޽��� ����� �մϴ�.\n"
+#~ " (��Ʈ ����ڰ�) �����ٿ� ������ ��Ű���� �Ǵ� RPM ������ ��ġ�մϴ�.\n"
diff --git a/po/lt.po b/po/lt.po
index 882084fd..38f41f85 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,7 +6,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-04 15:40+0200\n"
"Last-Translator: Mykolas Norvai�as <Myka@centras.lt>\n"
"Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -26,27 +26,27 @@ msgstr ""
"Automatinis paket� �diegimas...\n"
"J�s� u�klaust� paket� �diegimas $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 "Ar taip gerai?"
-#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:281
+#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:279
msgid "Ok"
msgstr "Gerai"
-#: _irpm:34 po/placeholder.h:116 urpmi:252 urpmi:282
+#: _irpm:34 po/placeholder.h:119 urpmi:252 urpmi:280
msgid "Cancel"
msgstr "Nutraukti"
-#: _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 "Nn"
-#: _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 "TtYy"
-#: _irpm:42 po/placeholder.h:118 urpmi:258
+#: _irpm:42 po/placeholder.h:157 urpmi:258
msgid " (Y/n) "
msgstr " (T/n) "
@@ -150,120 +150,120 @@ msgstr ""
msgid "urpmi is not installed"
msgstr "urpmi ne�diegtas"
-#: po/placeholder.h:29 urpm.pm:283
+#: po/placeholder.h:29
+#, c-format
+msgid "reading synthesis file [%s]"
+msgstr ""
+
+#: po/placeholder.h:30 urpm.pm:298
#, c-format
msgid "unable to write config file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:31
+#: po/placeholder.h:32
#, c-format
msgid "nothing to write in list file for \"%s\""
msgstr ""
-#: 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 ""
-#: po/placeholder.h:33
+#: po/placeholder.h:34
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr ""
-#: po/placeholder.h:34
+#: po/placeholder.h:35
#, c-format
msgid "nothing written in list file for \"%s\""
msgstr ""
-#: po/placeholder.h:35 urpm.pm:1951
-#, c-format
-msgid ""
-"removing %s to upgrade ...\n"
-" to %s since it will not upgrade correctly!"
-msgstr ""
-
-#: po/placeholder.h:39 urpm.pm:839
+#: po/placeholder.h:36 urpm.pm:845
#, c-format
msgid "read provides file [%s]"
msgstr ""
-#: po/placeholder.h:40
+#: po/placeholder.h:37 urpm.pm:1549
#, c-format
-msgid "trying to remove inexistant medium \"%s\""
+msgid "package %s is not found."
msgstr ""
-#: po/placeholder.h:41 urpm.pm:1692
+#: po/placeholder.h:38 urpm.pm:876
#, c-format
-msgid "package %s is not found."
+msgid "unable to write compss file [%s]"
msgstr ""
-#: po/placeholder.h:42
+#: po/placeholder.h:39 urpm.pm:819
#, c-format
-msgid "unable to copy source of [%s] from [%s]"
+msgid "unmounting %s"
msgstr ""
-#: po/placeholder.h:43 urpm.pm:870
+#: po/placeholder.h:40
#, c-format
-msgid "unable to write compss file [%s]"
+msgid "removing %d obsolete headers in cache"
msgstr ""
-#: po/placeholder.h:44 urpm.pm:813
+#: po/placeholder.h:41 urpm.pm:925 urpm.pm:1491
#, c-format
-msgid "unmounting %s"
+msgid "no hdlist file found for medium \"%s\""
msgstr ""
-#: po/placeholder.h:45
+#: po/placeholder.h:42 urpm.pm:160
#, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
msgstr ""
-#: po/placeholder.h:46 urpm.pm:919 urpm.pm:1634
+#: po/placeholder.h:43 urpm.pm:184
#, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
msgstr ""
-#: po/placeholder.h:47 urpm.pm:176
+#: po/placeholder.h:44 urpm.pm:191
#, c-format
msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
msgstr ""
-#: po/placeholder.h:48
+#: po/placeholder.h:45
msgid "keeping only files referenced in provides"
msgstr ""
-#: po/placeholder.h:49
+#: po/placeholder.h:46
#, c-format
msgid "unable to build synthesis file for medium \"%s\""
msgstr ""
-#: po/placeholder.h:50
+#: po/placeholder.h:47
#, c-format
msgid "found %d headers in cache"
msgstr ""
-#: po/placeholder.h:51 urpm.pm:836
+#: po/placeholder.h:48 urpm.pm:842
#, c-format
msgid "unable to read provides file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:53 urpm.pm:311
+#: po/placeholder.h:50
#, c-format
-msgid "medium \"%s\" already exists"
+msgid ""
+"removing %s to upgrade to %s ...\n"
+" since it will not be updated otherwise"
msgstr ""
-#: po/placeholder.h:54 urpm.pm:295
+#: po/placeholder.h:54 urpm.pm:326
#, c-format
-msgid "write config file [%s]"
+msgid "medium \"%s\" already exists"
msgstr ""
#: po/placeholder.h:55
@@ -271,384 +271,454 @@ msgstr ""
msgid "unable to write list file of \"%s\""
msgstr ""
-#: po/placeholder.h:56 urpm.pm:1817
+#: po/placeholder.h:56 urpm.pm:310
#, c-format
-msgid "retrieving [%s]"
-msgstr ""
-
-#: po/placeholder.h:57 urpm.pm:1819
-#, c-format
-msgid "wget of [%s] failed"
+msgid "write config file [%s]"
msgstr ""
-#: po/placeholder.h:58 urpm.pm:1101
+#: po/placeholder.h:57 urpm.pm:1107
#, fuzzy, c-format
msgid "no package named %s"
msgstr "n�ra paketo su tokiu pavadinimu %s\n"
-#: po/placeholder.h:59 urpm.pm:848
+#: po/placeholder.h:58 urpm.pm:854
#, c-format
msgid "unable to read compss file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:61
+#: po/placeholder.h:60
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr ""
-#: po/placeholder.h:62
+#: po/placeholder.h:61
msgid "computing dependencies"
msgstr ""
-#: po/placeholder.h:63 urpm.pm:868
+#: po/placeholder.h:62
+#, c-format
+msgid "retrieve of [%s] failed"
+msgstr ""
+
+#: po/placeholder.h:63 urpm.pm:874
#, c-format
msgid "write provides file [%s]"
msgstr ""
-#: po/placeholder.h:64 urpm.pm:803
+#: po/placeholder.h:64 urpm.pm:809
#, fuzzy, c-format
msgid "mounting %s"
msgstr "�diegiamas %s\n"
-#: 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 "
"medium"
msgstr ""
-#: po/placeholder.h:66 urpm.pm:148
-#, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
-msgstr ""
-
-#: po/placeholder.h:67
+#: po/placeholder.h:66
#, c-format
msgid "reading hdlist file [%s]"
msgstr ""
-#: po/placeholder.h:68 urpm.pm:873
+#: po/placeholder.h:67 urpm.pm:879
#, c-format
msgid "write compss file [%s]"
msgstr ""
-#: po/placeholder.h:69 urpm.pm:827
+#: po/placeholder.h:68 urpm.pm:833
#, c-format
msgid "read depslist file [%s]"
msgstr ""
-#: po/placeholder.h:70
+#: po/placeholder.h:69 urpm.pm:103
+msgid "curl failed\n"
+msgstr ""
+
+#: po/placeholder.h:70 urpm.pm:281 urpm.pm:284
#, c-format
-msgid "trying to select inexistant medium \"%s\""
+msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr ""
-#: po/placeholder.h:71 urpm.pm:1812
+#: po/placeholder.h:71 urpm.pm:1668
#, c-format
msgid "malformed input: [%s]"
msgstr ""
-#: 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"
+msgid "there are multiple packages with the same rpm filename \"%s\""
msgstr ""
-#: 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 ""
-#: po/placeholder.h:77 urpm.pm:865
+#: po/placeholder.h:74 urpm.pm:871
#, c-format
msgid "unable to write provides file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:79 urpm.pm:1005
-msgid "unable to register rpm file"
+#: po/placeholder.h:76 urpm.pm:1215
+msgid "unable to find all synthesis file, using parsehdlist server"
msgstr ""
-#: po/placeholder.h:80 urpm.pm:1362
-msgid "unable to find all synthesis file, using parsehdlist server"
+#: po/placeholder.h:77 urpm.pm:1011
+msgid "unable to register rpm file"
msgstr ""
-#: po/placeholder.h:81 urpm.pm:241
+#: po/placeholder.h:78 urpm.pm:256
#, c-format
msgid "unable to inspect list file for \"%s\", medium ignored"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:83
+#: po/placeholder.h:81
#, c-format
msgid "copy of [%s] failed"
msgstr ""
-#: 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 ""
+
+#: 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 ""
-#: po/placeholder.h:85 urpm.pm:824
+#: po/placeholder.h:84 urpm.pm:1192
#, c-format
-msgid "unable to read depslist file [%s]"
+msgid "read synthesis file [%s]"
msgstr ""
-#: po/placeholder.h:86
-msgid "removable medium not selected"
+#: po/placeholder.h:85 urpm.pm:830
+#, c-format
+msgid "unable to read depslist file [%s]"
msgstr ""
-#: po/placeholder.h:87 urpm.pm:851
+#: po/placeholder.h:86 urpm.pm:857
#, c-format
msgid "read compss file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:89
+#: po/placeholder.h:88
#, c-format
msgid "building hdlist [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:91 urpm.pm:1009
+#: po/placeholder.h:90 urpm.pm:1015
msgid "error registering local packages"
msgstr ""
-#: po/placeholder.h:92 urpm.pm:1762
+#: po/placeholder.h:91 urpm.pm:273
#, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "taking removable device as \"%s\""
msgstr ""
-#: po/placeholder.h:93
+#: po/placeholder.h:92 urpm.pm:1619
#, c-format
-msgid "unable to build hdlist: %s"
+msgid "incoherent medium \"%s\" marked removable but not really"
msgstr ""
-#: po/placeholder.h:94 urpm.pm:1000
+#: po/placeholder.h:93
#, c-format
-msgid "invalid rpm file name [%s]"
+msgid "unable to build hdlist: %s"
msgstr ""
-#: po/placeholder.h:95 urpm.pm:1736 urpm.pm:1739 urpm.pm:1758
+#: po/placeholder.h:94 urpm.pm:1593 urpm.pm:1596 urpm.pm:1615
#, c-format
msgid "medium \"%s\" is not selected"
msgstr ""
-#: po/placeholder.h:96 urpm.pm:207
+#: po/placeholder.h:95 urpm.pm:1006
#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "invalid rpm file name [%s]"
msgstr ""
-#: po/placeholder.h:97 urpm.pm:863
+#: po/placeholder.h:96 urpm.pm:1175
#, c-format
-msgid "write depslist file [%s]"
+msgid "unknown data associated with %s"
msgstr ""
-#: po/placeholder.h:98 urpm.pm:1322
+#: po/placeholder.h:97 urpm.pm:222
#, c-format
-msgid "unknown data associated with %s"
+msgid "trying to bypass existing medium \"%s\", avoiding"
msgstr ""
-#: po/placeholder.h:99
+#: po/placeholder.h:98 urpm.pm:869
#, c-format
-msgid "source of [%s] not found as [%s]"
+msgid "write depslist file [%s]"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: po/placeholder.h:102
+#: po/placeholder.h:101 urpm.pm:1007
#, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
+msgid "unable to access rpm file [%s]"
msgstr ""
-#: po/placeholder.h:103 urpm.pm:1001
+#: po/placeholder.h:102 urpm.pm:866
#, c-format
-msgid "unable to access rpm file [%s]"
+msgid "unable to write depslist file [%s]"
msgstr ""
-#: po/placeholder.h:104 urpm.pm:860
+#: po/placeholder.h:103
#, c-format
-msgid "unable to write depslist file [%s]"
+msgid ""
+"removing %s to upgrade to %s ...\n"
+" since it will not upgrade correctly!"
msgstr ""
-#: po/placeholder.h:105 urpm.pm:327 urpm.pm:1773
+#: po/placeholder.h:107 urpm.pm:342 urpm.pm:1630
#, c-format
msgid "unable to access medium \"%s\""
msgstr ""
-#: po/placeholder.h:106 urpm.pm:988
+#: po/placeholder.h:108 urpm.pm:994
#, c-format
msgid "relocated %s entries in depslist"
msgstr ""
-#: 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\""
+msgid "trying to select inexistent medium \"%s\""
+msgstr ""
+
+#: po/placeholder.h:110 urpm.pm:97
+msgid "wget failed\n"
msgstr ""
-#: 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]"
+msgid "unable to parse correctly [%s] on value \"%s\""
msgstr ""
-#: po/placeholder.h:109 urpm.pm:1104
+#: po/placeholder.h:112 urpm.pm:1110
#, fuzzy, c-format
msgid "The following packages contain %s: %s"
msgstr "�iuose paketuose yra %s: %s\n"
-#: 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\""
+msgid "no rpm files found from [%s]"
msgstr ""
-#: po/placeholder.h:111 urpm.pm:1920
+#: po/placeholder.h:114 urpm.pm:1772
#, c-format
msgid "selecting %s using obsoletes"
msgstr ""
-#: po/placeholder.h:112 urpm.pm:2031
+#: po/placeholder.h:115 urpm.pm:1888
#, c-format
msgid "selecting %s by selection on files"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:114 urpmi:308 urpmi:315 urpmi:328 urpmi:339 urpmi:352
-msgid "Installation failed"
-msgstr "�diegimas nepavyko"
-
-#: po/placeholder.h:115 urpmi:279
-msgid "Press enter when it's done..."
-msgstr "Pra�ome spausti 'enter', kada bus baigta..."
+#: po/placeholder.h:120
+msgid " --help - print this help message.\n"
+msgstr ""
-#: po/placeholder.h:117 urpmi:201
-msgid "Sorry, bad choice, try again\n"
-msgstr "Atsipra�au, blogas pasirinkimas, pakartokit\n"
+#: po/placeholder.h:121 urpmi:361
+msgid "everything already installed"
+msgstr "viskas ir taip jau �diegta"
-#: po/placeholder.h:120
+#: po/placeholder.h:122 urpmi:98
#, fuzzy, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr ""
+"urpmq: ne�inomas nustatymas \"-$1\", patikrinkite naudojim� su --help\n"
+
+#: po/placeholder.h:123 urpmi:194
+msgid "One of the following packages is needed:"
+msgstr "Vienas i� �i� paket� yra reikalingas."
+
+#: po/placeholder.h:124 po/placeholder.h:222
+msgid " --update - use only update media.\n"
+msgstr ""
+
+#: po/placeholder.h:125 urpmi:299
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"
+"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 "�diegimas nepavyko"
+
+#: po/placeholder.h:132 po/placeholder.h:234
+msgid ""
+" --auto-select - automatically select packages for upgrading the system.\n"
+msgstr ""
+
+#: po/placeholder.h:134
+msgid " --X - use X interface.\n"
msgstr ""
-"urpmi verija %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"Tai yra nemokama programa ir gali b�ti platinama pagal GNU GPL. \n"
-"naudojimas:\n"
-" --help - parodo �� prane�im�.\n"
-" --auto - automati�kai pasirineka gerus paketus.\n"
-" --auto-select - automati�kai pasirineka paketus sistemos "
-"atnaujinimui --force - priversit diegti net jei keleto paket� "
-"n�ra.\n"
-" --X - naudoti X.\n"
-" --best-output - pasirinkti atvaizdavimo re�im� pagal situalicij�:\n"
-" X arba tekstin�.\n"
-" -a - pasirinkti visus magal kauk�.\n"
-" -c - choose complete method for resolving requires closure.\n"
-" -q - tylus re�imas.\n"
-" -v - �odinis re�imas.\n"
-" vardai arba rpm bylos (tik root vartotojui) parodyti komandin�je eilut�je "
-"yra �diegti.\n"
-
-#: po/placeholder.h:142 urpmi:362
-msgid "everything already installed"
-msgstr "viskas ir taip jau �diegta"
-#: po/placeholder.h:143 urpmi:247
+#: po/placeholder.h:135 urpmi:247
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
"d MB)"
msgstr "Priklausomybi� patenkinimui, bus �diegti �ie paketai(%d Mb)"
-#: po/placeholder.h:144 urpmi:296
-#, c-format
-msgid "installing %s\n"
-msgstr "�diegiamas %s\n"
+#: po/placeholder.h:136 urpmi:320 urpmi:344
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Pabandyti �diegim� be priklausomybi� tikrinimo? (t/N) "
-#: po/placeholder.h:145 urpmi:198
+#: 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
+msgid " -q - quiet mode.\n"
+msgstr ""
+
+#: po/placeholder.h:144 urpmi:202
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Koks J�s� pasirinkimas? (1-%d)"
-#: po/placeholder.h:146 urpmi:321 urpmi:345
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Pabandyti �diegim� be priklausomybi� tikrinimo? (t/N) "
+#: po/placeholder.h:145
+msgid " --wget - use wget to retrieve distant files.\n"
+msgstr ""
-#: po/placeholder.h:147 urpmi:190
-msgid "One of the following packages is needed:"
-msgstr "Vienas i� �i� paket� yra reikalingas."
+#: po/placeholder.h:146
+#, 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"
+msgstr ""
+
+#: po/placeholder.h:152 urpmi:328 urpmi:352
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Pabandyti �diegim� priverstinai (--force)? (t/N) "
+
+#: po/placeholder.h:154
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+
+#: po/placeholder.h:155 urpmi:205
+msgid "Sorry, bad choice, try again\n"
+msgstr "Atsipra�au, blogas pasirinkimas, pakartokit\n"
-#: po/placeholder.h:148 urpmi:149
+#: po/placeholder.h:156
+msgid ""
+" names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: po/placeholder.h:158
+msgid " -a - select all matches on command line.\n"
+msgstr ""
+
+#: 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 "�diegiamas %s\n"
+
+#: po/placeholder.h:161 urpmi:152
msgid "Only superuser is allowed to install local packages"
msgstr "Tik root vartotojas gali �diegti vietinius paketus"
-#: 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 "Pra�ome �ki�ti laikmen� pavadint� \"%s\", � �rengin� [%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 "negaliu gauti pirmini� byl�, nutraukiu"
-#: po/placeholder.h:151 urpmi:329 urpmi:353
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Pabandyti �diegim� priverstinai (--force)? (t/N) "
+#: po/placeholder.h:165 urpmi:102
+#, fuzzy
+msgid "Only superuser is allowed to install packages"
+msgstr "Tik root vartotojas gali �diegti vietinius paketus"
+
+#: po/placeholder.h:166 urpmi:193
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Vienas i� �i� paket� yra reikalingas."
+
+#: po/placeholder.h:167 urpmi:277
+msgid "Press Enter when it's done..."
+msgstr "Pra�ome spausti 'enter', kada bus baigta..."
-#: po/placeholder.h:155 urpmi.addmedia:46
+#: po/placeholder.h:168 urpmi.addmedia:46
#, c-format
msgid ""
"%s\n"
@@ -657,7 +727,7 @@ msgstr ""
"%s\n"
"`with' t�kstama ftp laikmena\n"
-#: po/placeholder.h:159
+#: po/placeholder.h:172
msgid ""
"usage: urpmi.addmedia [--update] <name> <url>\n"
"where <url> is one of\n"
@@ -677,17 +747,17 @@ msgstr ""
" http://<host>/<path> with <relatyviu hdlist bylos vardu>\n"
" removable_<device>://<path>\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 ""
-#: po/placeholder.h:169 urpmi.addmedia:58
+#: po/placeholder.h:182 urpmi.addmedia:58
#, c-format
msgid "unable to update medium \"%s\"\n"
msgstr ""
-#: po/placeholder.h:170 urpmi.addmedia:42
+#: po/placeholder.h:183 urpmi.addmedia:42
#, c-format
msgid ""
"%s\n"
@@ -696,7 +766,7 @@ msgstr ""
"%s\n"
"�renginys `%s' neegzistuoja\n"
-#: po/placeholder.h:174 urpmi.addmedia:44
+#: po/placeholder.h:187 urpmi.addmedia:44
#, c-format
msgid ""
"%s\n"
@@ -705,7 +775,7 @@ msgstr ""
"%s\n"
"<relatyviu keliu iki hdlist> tr�ksta\n"
-#: po/placeholder.h:178
+#: po/placeholder.h:191
#, c-format
msgid ""
"usage: urpmi.update [-a] <name> ...\n"
@@ -717,11 +787,11 @@ msgid ""
"unknown options '%s'\n"
msgstr ""
-#: 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 "n�ra k� atnaujinti (prid�ti laikmenai naudokite urpmi.addmedia)\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"
@@ -730,11 +800,11 @@ msgstr ""
"tr�ksta �ra�o atnaujinimui\n"
"(vienas i� %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 "n�ra k� atnaujinti (prid�ti laikmenai naudokite urpmi.addmedia)\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"
@@ -743,7 +813,7 @@ msgstr ""
"t�ksta �ra�o i�metimui\n"
"(vienas i� %s)\n"
-#: po/placeholder.h:197
+#: po/placeholder.h:210
#, c-format
msgid ""
"usage: urpmi.removemedia [-a] <name> ...\n"
@@ -753,25 +823,39 @@ msgid ""
"unknown options '%s'\n"
msgstr ""
-#: po/placeholder.h:204 urpmq:85
-#, fuzzy, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: negai perskaityti rpm bylos \"$_\"\n"
-
-#: po/placeholder.h:206 urpmq:82
-#, fuzzy, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#: po/placeholder.h:217
+msgid " -h - print this help message.\n"
msgstr ""
-"urpmq: ne�inomas nustatymas \"-$1\", patikrinkite naudojim� su --help\n"
-#: 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 ""
"kaikuriuos paketus reikia i�mesti prie� atnaujinant, tai dar nepalaikoma \n"
-#: po/placeholder.h:208
+#: po/placeholder.h:219
+msgid " -g - print groups too with name.\n"
+msgstr ""
+
+#: po/placeholder.h:220 urpmq:84
+#, fuzzy, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: negai perskaityti rpm bylos \"$_\"\n"
+
+#: po/placeholder.h:221
+msgid " names or rpm files given on command line are queried.\n"
+msgstr ""
+
+#: po/placeholder.h:223
+msgid " -r - print version and release too with name.\n"
+msgstr ""
+
+#: po/placeholder.h:224
+msgid " -f - print version, release and arch with name.\n"
+msgstr ""
+
+#: po/placeholder.h:225
#, c-format
msgid ""
"urpmq version %s\n"
@@ -779,79 +863,70 @@ msgid ""
"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 ""
+
+#: po/placeholder.h:231
+msgid " -d - extend query to package dependencies.\n"
+msgstr ""
+
+#: 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 ""
-#: urpm.pm:257
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:233
+msgid ""
+" -c - choose complete method for resolving requires closure.\n"
msgstr ""
-#: urpm.pm:258
-#, c-format
-msgid "taking removable device as \"%s\""
+#: po/placeholder.h:235 urpmq:81
+#, fuzzy, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
msgstr ""
+"urpmq: ne�inomas nustatymas \"-$1\", patikrinkite naudojim� su --help\n"
-#: urpm.pm:262
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
+#: 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
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
+#: po/placeholder.h:243
+msgid ""
+" -u - remove package if a better version is already installed.\n"
msgstr ""
-#: urpm.pm:1339
-#, c-format
-msgid "read synthesis file [%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 "urpmi versija %s"
-
-#: urpmi:98
-#, fuzzy, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgid "removing %s to upgrade to %s ..."
msgstr ""
-"urpmq: ne�inomas nustatymas \"-$1\", patikrinkite naudojim� su --help\n"
-#: urpmi:102
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr "Tik root vartotojas gali �diegti vietinius paketus"
+#: urpm.pm:1797 urpm.pm:1806
+msgid ", $otherPackage, "
+msgstr ", $otherPackage, "
-#: urpmi:189
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Vienas i� �i� paket� yra reikalingas."
+#: urpm.pm:1797 urpm.pm:1806
+msgid "));"
+msgstr "));"
-#: urpmi:301
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
-msgstr ""
+#: urpm.pm:1802
+msgid "$p->{name}-$p->{version}-$p->{release}"
+msgstr "$p->{name}-$p->{version}-$p->{release}"
+
+#: urpm.pm:1812
+msgid "$prefix/$_"
+msgstr "$prefix/$_"
+
+#: urpmi:48
+#, c-format
+msgid "urpmi version %s"
+msgstr "urpmi versija %s"
#: urpmi.addmedia:30
#, fuzzy
@@ -886,8 +961,53 @@ msgstr ", $_);"
msgid "urpmq version %s"
msgstr "urpmq versija %s"
-#~ msgid "));"
-#~ msgstr "));"
+#, fuzzy
+#~ 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 ""
+#~ "urpmi verija %s\n"
+#~ "Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+#~ "Tai yra nemokama programa ir gali b�ti platinama pagal GNU GPL. \n"
+#~ "naudojimas:\n"
+#~ " --help - parodo �� prane�im�.\n"
+#~ " --auto - automati�kai pasirineka gerus paketus.\n"
+#~ " --auto-select - automati�kai pasirineka paketus sistemos "
+#~ "atnaujinimui --force - priversit diegti net jei keleto paket� "
+#~ "n�ra.\n"
+#~ " --X - naudoti X.\n"
+#~ " --best-output - pasirinkti atvaizdavimo re�im� pagal situalicij�:\n"
+#~ " X arba tekstin�.\n"
+#~ " -a - pasirinkti visus magal kauk�.\n"
+#~ " -c - choose complete method for resolving requires "
+#~ "closure.\n"
+#~ " -q - tylus re�imas.\n"
+#~ " -v - �odinis re�imas.\n"
+#~ " vardai arba rpm bylos (tik root vartotojui) parodyti komandin�je "
+#~ "eilut�je yra �diegti.\n"
#~ msgid "), $_);"
#~ msgstr "), $_);"
diff --git a/po/lv.po b/po/lv.po
index c3b1464a..756999a0 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -7,7 +7,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-08-25 16:06+0200\n"
"Last-Translator: Juris Kudi�� <cooker@inbox.lv>\n"
"Language-Team: Latvian\n"
@@ -27,27 +27,27 @@ msgstr ""
"Autom�tik� pakot�u uzst�d��ana...\n"
"J�s l�dz�t uzst�d�t pakotni $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 "Vai piekr�tat?"
-#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:281
+#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:279
msgid "Ok"
msgstr "Labi"
-#: _irpm:34 po/placeholder.h:116 urpmi:252 urpmi:282
+#: _irpm:34 po/placeholder.h:119 urpmi:252 urpmi:280
msgid "Cancel"
msgstr "Atcelt"
-#: _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 "Nn"
-#: _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 "jJYy"
-#: _irpm:42 po/placeholder.h:118 urpmi:258
+#: _irpm:42 po/placeholder.h:157 urpmi:258
msgid " (Y/n) "
msgstr " (J/n) "
@@ -154,123 +154,123 @@ msgstr "m��iniet urpmf --help priek� palpildus pal�dz�bas"
msgid "urpmi is not installed"
msgstr "urpmi nav uzst�d�ts"
-#: po/placeholder.h:29 urpm.pm:283
+#: po/placeholder.h:29
+#, c-format
+msgid "reading synthesis file [%s]"
+msgstr ""
+
+#: po/placeholder.h:30 urpm.pm:298
#, c-format
msgid "unable to write config file [%s]"
msgstr "nevar saglab�t konfigur�cijas failu [%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 ""
-"nevar izmantor v�rdu \"%s\" priek� bezv�rda datu nes�ja, jo v�rds ir jau "
-"izmantots"
-#: po/placeholder.h:31
+#: po/placeholder.h:32
#, c-format
msgid "nothing to write in list file for \"%s\""
msgstr "nav ko rakst�t saraksa fail� \"%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 ""
"nevar atrasta saraksta failu priek� \"%s\", datu nes�js neiks �emts v�r�"
-#: po/placeholder.h:33
+#: po/placeholder.h:34
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "nevaru izanaliz�t \"%s\" hdlist failu"
-#: po/placeholder.h:34
+#: po/placeholder.h:35
#, c-format
msgid "nothing written in list file for \"%s\""
msgstr "saraksta fails priek� \"%s\" ir tuk�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 ""
-
-#: po/placeholder.h:39 urpm.pm:839
+#: po/placeholder.h:36 urpm.pm:845
#, c-format
msgid "read provides file [%s]"
msgstr ""
-#: po/placeholder.h:40
+#: po/placeholder.h:37 urpm.pm:1549
#, c-format
-msgid "trying to remove inexistant medium \"%s\""
+msgid "package %s is not found."
msgstr ""
-#: po/placeholder.h:41 urpm.pm:1692
+#: po/placeholder.h:38 urpm.pm:876
#, c-format
-msgid "package %s is not found."
+msgid "unable to write compss file [%s]"
msgstr ""
-#: po/placeholder.h:42
+#: po/placeholder.h:39 urpm.pm:819
#, c-format
-msgid "unable to copy source of [%s] from [%s]"
+msgid "unmounting %s"
msgstr ""
-#: po/placeholder.h:43 urpm.pm:870
+#: po/placeholder.h:40
#, c-format
-msgid "unable to write compss file [%s]"
+msgid "removing %d obsolete headers in cache"
msgstr ""
-#: po/placeholder.h:44 urpm.pm:813
+#: po/placeholder.h:41 urpm.pm:925 urpm.pm:1491
#, c-format
-msgid "unmounting %s"
+msgid "no hdlist file found for medium \"%s\""
msgstr ""
-#: po/placeholder.h:45
+#: po/placeholder.h:42 urpm.pm:160
#, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
msgstr ""
-#: po/placeholder.h:46 urpm.pm:919 urpm.pm:1634
+#: po/placeholder.h:43 urpm.pm:184
#, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
msgstr ""
+"nevar izmantor v�rdu \"%s\" priek� bezv�rda datu nes�ja, jo v�rds ir jau "
+"izmantots"
-#: po/placeholder.h:47 urpm.pm:176
+#: po/placeholder.h:44 urpm.pm:191
#, c-format
msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
msgstr ""
-#: po/placeholder.h:48
+#: po/placeholder.h:45
msgid "keeping only files referenced in provides"
msgstr ""
-#: po/placeholder.h:49
+#: po/placeholder.h:46
#, c-format
msgid "unable to build synthesis file for medium \"%s\""
msgstr ""
-#: po/placeholder.h:50
+#: po/placeholder.h:47
#, c-format
msgid "found %d headers in cache"
msgstr ""
-#: po/placeholder.h:51 urpm.pm:836
+#: po/placeholder.h:48 urpm.pm:842
#, c-format
msgid "unable to read provides file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:53 urpm.pm:311
+#: po/placeholder.h:50
#, c-format
-msgid "medium \"%s\" already exists"
+msgid ""
+"removing %s to upgrade to %s ...\n"
+" since it will not be updated otherwise"
msgstr ""
-#: po/placeholder.h:54 urpm.pm:295
+#: po/placeholder.h:54 urpm.pm:326
#, c-format
-msgid "write config file [%s]"
+msgid "medium \"%s\" already exists"
msgstr ""
#: po/placeholder.h:55
@@ -278,366 +278,457 @@ msgstr ""
msgid "unable to write list file of \"%s\""
msgstr ""
-#: po/placeholder.h:56 urpm.pm:1817
-#, c-format
-msgid "retrieving [%s]"
-msgstr ""
-
-#: po/placeholder.h:57 urpm.pm:1819
+#: po/placeholder.h:56 urpm.pm:310
#, c-format
-msgid "wget of [%s] failed"
+msgid "write config file [%s]"
msgstr ""
-#: po/placeholder.h:58 urpm.pm:1101
+#: po/placeholder.h:57 urpm.pm:1107
#, c-format
msgid "no package named %s"
msgstr "nav pakotnes ar nosaukumu %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 ""
-#: 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 ""
-#: po/placeholder.h:61
+#: po/placeholder.h:60
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr ""
-#: po/placeholder.h:62
+#: po/placeholder.h:61
msgid "computing dependencies"
msgstr ""
-#: po/placeholder.h:63 urpm.pm:868
+#: po/placeholder.h:62
+#, c-format
+msgid "retrieve of [%s] failed"
+msgstr ""
+
+#: po/placeholder.h:63 urpm.pm:874
#, c-format
msgid "write provides file [%s]"
msgstr ""
-#: po/placeholder.h:64 urpm.pm:803
+#: po/placeholder.h:64 urpm.pm:809
#, c-format
msgid "mounting %s"
msgstr "mont�ju %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 "
"medium"
msgstr ""
-#: po/placeholder.h:66 urpm.pm:148
-#, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
-msgstr ""
-
-#: po/placeholder.h:67
+#: po/placeholder.h:66
#, c-format
msgid "reading hdlist file [%s]"
msgstr ""
-#: po/placeholder.h:68 urpm.pm:873
+#: po/placeholder.h:67 urpm.pm:879
#, c-format
msgid "write compss file [%s]"
msgstr ""
-#: po/placeholder.h:69 urpm.pm:827
+#: po/placeholder.h:68 urpm.pm:833
#, c-format
msgid "read depslist file [%s]"
msgstr ""
-#: po/placeholder.h:70
-#, c-format
-msgid "trying to select inexistant medium \"%s\""
+#: po/placeholder.h:69 urpm.pm:103
+msgid "curl failed\n"
msgstr ""
-#: po/placeholder.h:71 urpm.pm:1812
+#: po/placeholder.h:70 urpm.pm:281 urpm.pm:284
+#, fuzzy, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "nevar izveidot datu nes�ju \"%s\"\n"
+
+#: po/placeholder.h:71 urpm.pm:1668
#, c-format
msgid "malformed input: [%s]"
msgstr ""
-#: 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"
+msgid "there are multiple packages with the same rpm filename \"%s\""
msgstr ""
-#: 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 ""
-#: po/placeholder.h:77 urpm.pm:865
+#: po/placeholder.h:74 urpm.pm:871
#, c-format
msgid "unable to write provides file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:79 urpm.pm:1005
-msgid "unable to register rpm file"
+#: po/placeholder.h:76 urpm.pm:1215
+msgid "unable to find all synthesis file, using parsehdlist server"
msgstr ""
-#: po/placeholder.h:80 urpm.pm:1362
-msgid "unable to find all synthesis file, using parsehdlist server"
+#: po/placeholder.h:77 urpm.pm:1011
+msgid "unable to register rpm file"
msgstr ""
-#: po/placeholder.h:81 urpm.pm:241
+#: po/placeholder.h:78 urpm.pm:256
#, c-format
msgid "unable to inspect list file for \"%s\", medium ignored"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:83
+#: po/placeholder.h:81
#, c-format
msgid "copy of [%s] failed"
msgstr ""
-#: 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 ""
+
+#: 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 ""
-#: po/placeholder.h:85 urpm.pm:824
+#: po/placeholder.h:84 urpm.pm:1192
#, c-format
-msgid "unable to read depslist file [%s]"
+msgid "read synthesis file [%s]"
msgstr ""
-#: po/placeholder.h:86
-msgid "removable medium not selected"
+#: po/placeholder.h:85 urpm.pm:830
+#, c-format
+msgid "unable to read depslist file [%s]"
msgstr ""
-#: po/placeholder.h:87 urpm.pm:851
+#: po/placeholder.h:86 urpm.pm:857
#, c-format
msgid "read compss file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:89
+#: po/placeholder.h:88
#, c-format
msgid "building hdlist [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:91 urpm.pm:1009
+#: po/placeholder.h:90 urpm.pm:1015
msgid "error registering local packages"
msgstr ""
-#: po/placeholder.h:92 urpm.pm:1762
+#: po/placeholder.h:91 urpm.pm:273
#, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "taking removable device as \"%s\""
msgstr ""
-#: po/placeholder.h:93
+#: po/placeholder.h:92 urpm.pm:1619
#, c-format
-msgid "unable to build hdlist: %s"
+msgid "incoherent medium \"%s\" marked removable but not really"
msgstr ""
-#: po/placeholder.h:94 urpm.pm:1000
+#: po/placeholder.h:93
#, c-format
-msgid "invalid rpm file name [%s]"
+msgid "unable to build hdlist: %s"
msgstr ""
-#: po/placeholder.h:95 urpm.pm:1736 urpm.pm:1739 urpm.pm:1758
+#: po/placeholder.h:94 urpm.pm:1593 urpm.pm:1596 urpm.pm:1615
#, c-format
msgid "medium \"%s\" is not selected"
msgstr ""
-#: po/placeholder.h:96 urpm.pm:207
+#: po/placeholder.h:95 urpm.pm:1006
#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "invalid rpm file name [%s]"
msgstr ""
-#: po/placeholder.h:97 urpm.pm:863
+#: po/placeholder.h:96 urpm.pm:1175
#, c-format
-msgid "write depslist file [%s]"
+msgid "unknown data associated with %s"
msgstr ""
-#: po/placeholder.h:98 urpm.pm:1322
+#: po/placeholder.h:97 urpm.pm:222
#, c-format
-msgid "unknown data associated with %s"
+msgid "trying to bypass existing medium \"%s\", avoiding"
msgstr ""
-#: po/placeholder.h:99
+#: po/placeholder.h:98 urpm.pm:869
#, c-format
-msgid "source of [%s] not found as [%s]"
+msgid "write depslist file [%s]"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: po/placeholder.h:102
+#: po/placeholder.h:101 urpm.pm:1007
#, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
+msgid "unable to access rpm file [%s]"
msgstr ""
-#: po/placeholder.h:103 urpm.pm:1001
+#: po/placeholder.h:102 urpm.pm:866
#, c-format
-msgid "unable to access rpm file [%s]"
+msgid "unable to write depslist file [%s]"
msgstr ""
-#: po/placeholder.h:104 urpm.pm:860
+#: po/placeholder.h:103
#, c-format
-msgid "unable to write depslist file [%s]"
+msgid ""
+"removing %s to upgrade to %s ...\n"
+" since it will not upgrade correctly!"
msgstr ""
-#: po/placeholder.h:105 urpm.pm:327 urpm.pm:1773
+#: po/placeholder.h:107 urpm.pm:342 urpm.pm:1630
#, c-format
msgid "unable to access medium \"%s\""
msgstr ""
-#: po/placeholder.h:106 urpm.pm:988
+#: po/placeholder.h:108 urpm.pm:994
#, c-format
msgid "relocated %s entries in depslist"
msgstr ""
-#: 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\""
+msgid "trying to select inexistent medium \"%s\""
msgstr ""
-#: po/placeholder.h:108
+#: 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 "no rpm files found from [%s]"
+msgid "unable to parse correctly [%s] on value \"%s\""
msgstr ""
-#: po/placeholder.h:109 urpm.pm:1104
+#: po/placeholder.h:112 urpm.pm:1110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Sekojo�as pakotnes satur %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\""
+msgid "no rpm files found from [%s]"
msgstr ""
-#: po/placeholder.h:111 urpm.pm:1920
+#: po/placeholder.h:114 urpm.pm:1772
#, c-format
msgid "selecting %s using obsoletes"
msgstr ""
-#: po/placeholder.h:112 urpm.pm:2031
+#: po/placeholder.h:115 urpm.pm:1888
#, c-format
msgid "selecting %s by selection on files"
msgstr ""
-#: 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 ""
-#: 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 - druk�t visas iez�mes."
+
+#: po/placeholder.h:121 urpmi:361
+msgid "everything already installed"
+msgstr "viss jau ir instal�ts"
+
+#: po/placeholder.h:122 urpmi:98
+#, fuzzy, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: nezin�ms parametrs \"-%s\", p�rbaudiet lietojumu --help\n"
+
+#: po/placeholder.h:123 urpmi:194
+msgid "One of the following packages is needed:"
+msgstr "Ir nepiecie�ama viena no sekojo��m pakotn�m:"
+
+#: 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 "Instal��ana neizdev�s"
-#: po/placeholder.h:115 urpmi:279
-msgid "Press enter when it's done..."
-msgstr "Nospiediet ievada tausti�u, kad tas izdar�ts..."
+#: 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 "Atvainojiet, nepareiza izv�le. M��iniet v�lreiz\n"
+#: po/placeholder.h:134
+#, fuzzy
+msgid " --X - use X interface.\n"
+msgstr " --all - druk�t visas iez�mes."
-#: 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 "Lai apmierin�tu atkar�bas, tiks instal�tas sekojo�as pakotnes (%d MB)"
+
+#: po/placeholder.h:136 urpmi:320 urpmi:344
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Vai m��in�t instal�t bez atkar�bu p�rbaudes? (j/N) "
+
+#: 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 - druk�t visas iez�mes."
+
+#: po/placeholder.h:144 urpmi:202
#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "K�da ir j�su izv�le? (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 ""
+"�� ir br�v� programmat�ra, un dr�kst tikt izplat�ta saska�� ar GNU GPL."
-#: po/placeholder.h:142 urpmi:362
-msgid "everything already installed"
-msgstr "viss jau ir instal�ts"
+#: po/placeholder.h:152 urpmi:328 urpmi:352
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Vai m��in�t instal�t v�l uzst�j�g�k (--force)? (j/N) "
-#: po/placeholder.h:143 urpmi:247
-#, c-format
+#: po/placeholder.h:154
msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
-msgstr "Lai apmierin�tu atkar�bas, tiks instal�tas sekojo�as pakotnes (%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 "tiek instal�ta %s\n"
+#: po/placeholder.h:155 urpmi:205
+msgid "Sorry, bad choice, try again\n"
+msgstr "Atvainojiet, nepareiza izv�le. M��iniet v�lreiz\n"
-#: po/placeholder.h:145 urpmi:198
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "K�da ir j�su izv�le? (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 "Vai m��in�t instal�t bez atkar�bu p�rbaudes? (j/N) "
+#: 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 "Ir nepiecie�ama viena no sekojo��m pakotn�m:"
+#: 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 "tiek instal�ta %s\n"
-#: po/placeholder.h:148 urpmi:149
+#: po/placeholder.h:161 urpmi:152
msgid "Only superuser is allowed to install local packages"
msgstr "Tikai root dr�kst instal�t lok�l�s pakotnes"
-#: 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 "L�dzu ielieciet datu nes�ju \"%s\" ier�c� [%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 "nevar dab�t koda pakotnes, p�rtraucu"
-#: po/placeholder.h:151 urpmi:329 urpmi:353
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Vai m��in�t instal�t v�l uzst�j�g�k (--force)? (j/N) "
+#: po/placeholder.h:165 urpmi:102
+#, fuzzy
+msgid "Only superuser is allowed to install packages"
+msgstr "Tikai root dr�kst instal�t lok�l�s pakotnes"
+
+#: po/placeholder.h:166 urpmi:193
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Ir nepiecie�ama viena no sekojo��m pakotn�m:"
+
+#: po/placeholder.h:167 urpmi:277
+msgid "Press Enter when it's done..."
+msgstr "Nospiediet ievada tausti�u, kad tas izdar�ts..."
-#: po/placeholder.h:155 urpmi.addmedia:46
+#: po/placeholder.h:168 urpmi.addmedia:46
#, c-format
msgid ""
"%s\n"
@@ -646,7 +737,7 @@ msgstr ""
"%s\n"
"`with' tr�kst priek� ftp datu avota\n"
-#: po/placeholder.h:159
+#: po/placeholder.h:172
msgid ""
"usage: urpmi.addmedia [--update] <name> <url>\n"
"where <url> is one of\n"
@@ -666,17 +757,17 @@ msgstr ""
" http://<host>/<path> with <relative filename of hdlist>\n"
" removable_<ier�c�>://<path>\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 "nevar izveidot datu nes�ju \"%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 "nevar atjaunot datu nes�ju \"%s\"\n"
-#: po/placeholder.h:170 urpmi.addmedia:42
+#: po/placeholder.h:183 urpmi.addmedia:42
#, c-format
msgid ""
"%s\n"
@@ -685,7 +776,7 @@ msgstr ""
"%s\n"
"nav ier�ces `%s'\n"
-#: po/placeholder.h:174 urpmi.addmedia:44
+#: po/placeholder.h:187 urpmi.addmedia:44
#, c-format
msgid ""
"%s\n"
@@ -694,7 +785,7 @@ msgstr ""
"%s\n"
"<relative path of hdlist> tr�kst\n"
-#: po/placeholder.h:178
+#: po/placeholder.h:191
#, c-format
msgid ""
"usage: urpmi.update [-a] <name> ...\n"
@@ -713,12 +804,12 @@ msgstr ""
"\n"
"unknown options '%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 ""
"nav ko atjaunin�t (lietojiet urpmi.addmedia, lai pievienotu datu nes�ju)\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"
@@ -727,18 +818,18 @@ msgstr ""
"atjunin�jum� tr�kst k�da ieraksta\n"
"(viens no %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 "nav ko no�emt (lietojiet urpmi.addmedia, lai pievienotu datu nes�ju)\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"
"(one of %s)\n"
msgstr ""
-#: po/placeholder.h:197
+#: po/placeholder.h:210
#, c-format
msgid ""
"usage: urpmi.removemedia [-a] <name> ...\n"
@@ -748,17 +839,12 @@ msgid ""
"unknown options '%s'\n"
msgstr ""
-#: po/placeholder.h:204 urpmq:85
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: nav iesp�jams nolas�t rpm failu \"%s\"\n"
-
-#: po/placeholder.h:206 urpmq:82
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: nezin�ms parametrs \"-%s\", p�rbaudiet lietojumu --help\n"
+#: po/placeholder.h:217
+#, fuzzy
+msgid " -h - print this help message.\n"
+msgstr " --all - druk�t visas iez�mes."
-#: 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"
@@ -766,7 +852,30 @@ msgstr ""
"k�da no pakotn�m ir j�no�em, lai tiktu uzlabota, diem��l tas pagaid�m netiek "
"atbalst�ts\n"
-#: po/placeholder.h:208
+#: po/placeholder.h:219
+#, fuzzy
+msgid " -g - print groups too with name.\n"
+msgstr " --group - druk�t iez�mi: grupa."
+
+#: po/placeholder.h:220 urpmq:84
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: nav iesp�jams nolas�t rpm failu \"%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 " dota komandrind�; bez pakotnes v�rda)."
+
+#: 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"
@@ -774,102 +883,71 @@ msgid ""
"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 package do not exist.\n"
-" names or rpm files given on command line are queried.\n"
-msgstr ""
-"urpmq versija %s\n"
-"Autorties�bas (C) 2000, 2001 MandrakeSoft.\n"
-"�� ir br�v� prgrammat�ra, un var tikt izplat�ta saska�� ar GNU GPL licenzi.\n"
-"Lietojums:\n"
-" -h - par�d�t �o pa��dz�bu.\n"
-" -v - \"run�gais\" (papildus inform�cijas) re��ms.\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 ""
+"�� ir br�v� programmat�ra, un dr�kst tikt izplat�ta saska�� ar GNU GPL."
+
+#: po/placeholder.h:231
+#, fuzzy
+msgid " -d - extend query to package dependencies.\n"
+msgstr " dota komandrind�; bez pakotnes v�rda)."
+
+#: 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 ""
-#: urpm.pm:257
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:233
+msgid ""
+" -c - choose complete method for resolving requires closure.\n"
msgstr ""
-#: urpm.pm:258
+#: po/placeholder.h:235 urpmq:81
#, c-format
-msgid "taking removable device as \"%s\""
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: nezin�ms parametrs \"-%s\", p�rbaudiet lietojumu --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:262
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
+#: po/placeholder.h:243
+msgid ""
+" -u - remove package if a better version is already installed.\n"
msgstr ""
-#: urpm.pm:266 urpm.pm:269
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "nevar izveidot datu nes�ju \"%s\"\n"
+#: po/placeholder.h:244
+msgid ""
+" --force - force invocation even if some packages do not\n"
+"exist.\n"
+msgstr ""
-#: urpm.pm:1339
+#: urpm.pm:1796 urpm.pm:1805
#, c-format
-msgid "read synthesis file [%s]"
+msgid "removing %s to upgrade to %s ..."
msgstr ""
-#: urpmi:49
-#, c-format
-msgid "urpmi version %s"
-msgstr "urpmi versija %s"
+#: urpm.pm:1797 urpm.pm:1806
+msgid ", $otherPackage, "
+msgstr ", $otherPackage, "
-#: urpmi:98
-#, fuzzy, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: nezin�ms parametrs \"-%s\", p�rbaudiet lietojumu --help\n"
+#: urpm.pm:1797 urpm.pm:1806
+msgid "));"
+msgstr "));"
-#: urpmi:102
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr "Tikai root dr�kst instal�t lok�l�s pakotnes"
+#: urpm.pm:1802
+msgid "$p->{name}-$p->{version}-$p->{release}"
+msgstr "$p->{name}-$p->{version}-$p->{release}"
-#: urpmi:189
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Ir nepiecie�ama viena no sekojo��m pakotn�m:"
+#: urpm.pm:1812
+msgid "$prefix/$_"
+msgstr "$prefix/$_"
-#: urpmi:301
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
-msgstr ""
+#: urpmi:48
+#, c-format
+msgid "urpmi version %s"
+msgstr "urpmi versija %s"
#: urpmi.addmedia:30
msgid "usage: urpmi.addmedia [--update] <name> <url>"
@@ -901,8 +979,69 @@ msgstr ", $_);"
msgid "urpmq version %s"
msgstr "urpmq versija %s"
-#~ msgid "));"
-#~ msgstr "));"
+#, fuzzy
+#~ 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 ""
+#~ "urpmq versija %s\n"
+#~ "Autorties�bas (C) 2000, 2001 MandrakeSoft.\n"
+#~ "�� ir br�v� prgrammat�ra, un var tikt izplat�ta saska�� ar GNU GPL "
+#~ "licenzi.\n"
+#~ "Lietojums:\n"
+#~ " -h - par�d�t �o pa��dz�bu.\n"
+#~ " -v - \"run�gais\" (papildus inform�cijas) re��ms.\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"
#~ msgid "), $_);"
#~ msgstr "), $_);"
diff --git a/po/nl.po b/po/nl.po
index 9f0ddacc..12fc16c9 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,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: 2000-09-18 23:40+0200\n"
"Last-Translator: NIELS GRAS <niels.gras@wanadoo.nl>\n"
"Language-Team: Dutch\n"
@@ -24,27 +24,27 @@ msgid ""
"You requested installation of package $rpm\n"
msgstr ""
-#: _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 "Is het goed?"
-#: _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 "Annuleren"
-#: _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 "Nn"
-#: _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 "JjYy"
-#: _irpm:42 po/placeholder.h:118 urpmi:258
+#: _irpm:42 po/placeholder.h:157 urpmi:258
msgid " (Y/n) "
msgstr " (J/n) "
@@ -147,120 +147,120 @@ msgstr ""
msgid "urpmi is not installed"
msgstr ""
-#: po/placeholder.h:29 urpm.pm:283
+#: po/placeholder.h:29
+#, c-format
+msgid "reading synthesis file [%s]"
+msgstr ""
+
+#: po/placeholder.h:30 urpm.pm:298
#, c-format
msgid "unable to write config file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:31
+#: po/placeholder.h:32
#, c-format
msgid "nothing to write in list file for \"%s\""
msgstr ""
-#: 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 ""
-#: po/placeholder.h:33
+#: po/placeholder.h:34
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr ""
-#: po/placeholder.h:34
+#: po/placeholder.h:35
#, c-format
msgid "nothing written in list file for \"%s\""
msgstr ""
-#: po/placeholder.h:35 urpm.pm:1951
-#, c-format
-msgid ""
-"removing %s to upgrade ...\n"
-" to %s since it will not upgrade correctly!"
-msgstr ""
-
-#: po/placeholder.h:39 urpm.pm:839
+#: po/placeholder.h:36 urpm.pm:845
#, c-format
msgid "read provides file [%s]"
msgstr ""
-#: po/placeholder.h:40
+#: po/placeholder.h:37 urpm.pm:1549
#, c-format
-msgid "trying to remove inexistant medium \"%s\""
+msgid "package %s is not found."
msgstr ""
-#: po/placeholder.h:41 urpm.pm:1692
+#: po/placeholder.h:38 urpm.pm:876
#, c-format
-msgid "package %s is not found."
+msgid "unable to write compss file [%s]"
msgstr ""
-#: po/placeholder.h:42
+#: po/placeholder.h:39 urpm.pm:819
#, c-format
-msgid "unable to copy source of [%s] from [%s]"
+msgid "unmounting %s"
msgstr ""
-#: po/placeholder.h:43 urpm.pm:870
+#: po/placeholder.h:40
#, c-format
-msgid "unable to write compss file [%s]"
+msgid "removing %d obsolete headers in cache"
msgstr ""
-#: po/placeholder.h:44 urpm.pm:813
+#: po/placeholder.h:41 urpm.pm:925 urpm.pm:1491
#, c-format
-msgid "unmounting %s"
+msgid "no hdlist file found for medium \"%s\""
msgstr ""
-#: po/placeholder.h:45
+#: po/placeholder.h:42 urpm.pm:160
#, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
msgstr ""
-#: po/placeholder.h:46 urpm.pm:919 urpm.pm:1634
+#: po/placeholder.h:43 urpm.pm:184
#, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
msgstr ""
-#: po/placeholder.h:47 urpm.pm:176
+#: po/placeholder.h:44 urpm.pm:191
#, c-format
msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
msgstr ""
-#: po/placeholder.h:48
+#: po/placeholder.h:45
msgid "keeping only files referenced in provides"
msgstr ""
-#: po/placeholder.h:49
+#: po/placeholder.h:46
#, c-format
msgid "unable to build synthesis file for medium \"%s\""
msgstr ""
-#: po/placeholder.h:50
+#: po/placeholder.h:47
#, c-format
msgid "found %d headers in cache"
msgstr ""
-#: po/placeholder.h:51 urpm.pm:836
+#: po/placeholder.h:48 urpm.pm:842
#, c-format
msgid "unable to read provides file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:53 urpm.pm:311
+#: po/placeholder.h:50
#, c-format
-msgid "medium \"%s\" already exists"
+msgid ""
+"removing %s to upgrade to %s ...\n"
+" since it will not be updated otherwise"
msgstr ""
-#: po/placeholder.h:54 urpm.pm:295
+#: po/placeholder.h:54 urpm.pm:326
#, c-format
-msgid "write config file [%s]"
+msgid "medium \"%s\" already exists"
msgstr ""
#: po/placeholder.h:55
@@ -268,324 +268,347 @@ msgstr ""
msgid "unable to write list file of \"%s\""
msgstr ""
-#: po/placeholder.h:56 urpm.pm:1817
-#, c-format
-msgid "retrieving [%s]"
-msgstr ""
-
-#: po/placeholder.h:57 urpm.pm:1819
+#: po/placeholder.h:56 urpm.pm:310
#, c-format
-msgid "wget of [%s] failed"
+msgid "write config file [%s]"
msgstr ""
-#: po/placeholder.h:58 urpm.pm:1101
+#: po/placeholder.h:57 urpm.pm:1107
#, fuzzy, c-format
msgid "no package named %s"
msgstr "geen archief genaamd %s\n"
-#: po/placeholder.h:59 urpm.pm:848
+#: po/placeholder.h:58 urpm.pm:854
#, c-format
msgid "unable to read compss file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:61
+#: po/placeholder.h:60
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr ""
-#: po/placeholder.h:62
+#: po/placeholder.h:61
msgid "computing dependencies"
msgstr ""
-#: po/placeholder.h:63 urpm.pm:868
+#: po/placeholder.h:62
+#, c-format
+msgid "retrieve of [%s] failed"
+msgstr ""
+
+#: po/placeholder.h:63 urpm.pm:874
#, c-format
msgid "write provides file [%s]"
msgstr ""
-#: po/placeholder.h:64 urpm.pm:803
+#: po/placeholder.h:64 urpm.pm:809
#, fuzzy, c-format
msgid "mounting %s"
msgstr "bezig met installeren van %s\n"
-#: 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 "
"medium"
msgstr ""
-#: po/placeholder.h:66 urpm.pm:148
-#, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
-msgstr ""
-
-#: po/placeholder.h:67
+#: po/placeholder.h:66
#, c-format
msgid "reading hdlist file [%s]"
msgstr ""
-#: po/placeholder.h:68 urpm.pm:873
+#: po/placeholder.h:67 urpm.pm:879
#, c-format
msgid "write compss file [%s]"
msgstr ""
-#: po/placeholder.h:69 urpm.pm:827
+#: po/placeholder.h:68 urpm.pm:833
#, c-format
msgid "read depslist file [%s]"
msgstr ""
-#: po/placeholder.h:70
+#: po/placeholder.h:69 urpm.pm:103
+msgid "curl failed\n"
+msgstr ""
+
+#: po/placeholder.h:70 urpm.pm:281 urpm.pm:284
#, c-format
-msgid "trying to select inexistant medium \"%s\""
+msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr ""
-#: po/placeholder.h:71 urpm.pm:1812
+#: po/placeholder.h:71 urpm.pm:1668
#, c-format
msgid "malformed input: [%s]"
msgstr ""
-#: 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"
+msgid "there are multiple packages with the same rpm filename \"%s\""
msgstr ""
-#: 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 ""
-#: po/placeholder.h:77 urpm.pm:865
+#: po/placeholder.h:74 urpm.pm:871
#, c-format
msgid "unable to write provides file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:79 urpm.pm:1005
-msgid "unable to register rpm file"
+#: po/placeholder.h:76 urpm.pm:1215
+msgid "unable to find all synthesis file, using parsehdlist server"
msgstr ""
-#: po/placeholder.h:80 urpm.pm:1362
-msgid "unable to find all synthesis file, using parsehdlist server"
+#: po/placeholder.h:77 urpm.pm:1011
+msgid "unable to register rpm file"
msgstr ""
-#: po/placeholder.h:81 urpm.pm:241
+#: po/placeholder.h:78 urpm.pm:256
#, c-format
msgid "unable to inspect list file for \"%s\", medium ignored"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:83
+#: po/placeholder.h:81
#, c-format
msgid "copy of [%s] failed"
msgstr ""
-#: 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 ""
+
+#: 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 ""
-#: po/placeholder.h:85 urpm.pm:824
+#: po/placeholder.h:84 urpm.pm:1192
#, c-format
-msgid "unable to read depslist file [%s]"
+msgid "read synthesis file [%s]"
msgstr ""
-#: po/placeholder.h:86
-msgid "removable medium not selected"
+#: po/placeholder.h:85 urpm.pm:830
+#, c-format
+msgid "unable to read depslist file [%s]"
msgstr ""
-#: po/placeholder.h:87 urpm.pm:851
+#: po/placeholder.h:86 urpm.pm:857
#, c-format
msgid "read compss file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:89
+#: po/placeholder.h:88
#, c-format
msgid "building hdlist [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:91 urpm.pm:1009
+#: po/placeholder.h:90 urpm.pm:1015
msgid "error registering local packages"
msgstr ""
-#: po/placeholder.h:92 urpm.pm:1762
+#: po/placeholder.h:91 urpm.pm:273
#, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "taking removable device as \"%s\""
msgstr ""
-#: po/placeholder.h:93
+#: po/placeholder.h:92 urpm.pm:1619
#, c-format
-msgid "unable to build hdlist: %s"
+msgid "incoherent medium \"%s\" marked removable but not really"
msgstr ""
-#: po/placeholder.h:94 urpm.pm:1000
+#: po/placeholder.h:93
#, c-format
-msgid "invalid rpm file name [%s]"
+msgid "unable to build hdlist: %s"
msgstr ""
-#: po/placeholder.h:95 urpm.pm:1736 urpm.pm:1739 urpm.pm:1758
+#: po/placeholder.h:94 urpm.pm:1593 urpm.pm:1596 urpm.pm:1615
#, c-format
msgid "medium \"%s\" is not selected"
msgstr ""
-#: po/placeholder.h:96 urpm.pm:207
+#: po/placeholder.h:95 urpm.pm:1006
#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "invalid rpm file name [%s]"
msgstr ""
-#: po/placeholder.h:97 urpm.pm:863
+#: po/placeholder.h:96 urpm.pm:1175
#, c-format
-msgid "write depslist file [%s]"
+msgid "unknown data associated with %s"
msgstr ""
-#: po/placeholder.h:98 urpm.pm:1322
+#: po/placeholder.h:97 urpm.pm:222
#, c-format
-msgid "unknown data associated with %s"
+msgid "trying to bypass existing medium \"%s\", avoiding"
msgstr ""
-#: po/placeholder.h:99
+#: po/placeholder.h:98 urpm.pm:869
#, c-format
-msgid "source of [%s] not found as [%s]"
+msgid "write depslist file [%s]"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: po/placeholder.h:102
+#: po/placeholder.h:101 urpm.pm:1007
#, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
+msgid "unable to access rpm file [%s]"
msgstr ""
-#: po/placeholder.h:103 urpm.pm:1001
+#: po/placeholder.h:102 urpm.pm:866
#, c-format
-msgid "unable to access rpm file [%s]"
+msgid "unable to write depslist file [%s]"
msgstr ""
-#: po/placeholder.h:104 urpm.pm:860
+#: po/placeholder.h:103
#, c-format
-msgid "unable to write depslist file [%s]"
+msgid ""
+"removing %s to upgrade to %s ...\n"
+" since it will not upgrade correctly!"
msgstr ""
-#: po/placeholder.h:105 urpm.pm:327 urpm.pm:1773
+#: po/placeholder.h:107 urpm.pm:342 urpm.pm:1630
#, c-format
msgid "unable to access medium \"%s\""
msgstr ""
-#: po/placeholder.h:106 urpm.pm:988
+#: po/placeholder.h:108 urpm.pm:994
#, c-format
msgid "relocated %s entries in depslist"
msgstr ""
-#: 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\""
+msgid "trying to select inexistent medium \"%s\""
msgstr ""
-#: po/placeholder.h:108
+#: 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 "no rpm files found from [%s]"
+msgid "unable to parse correctly [%s] on value \"%s\""
msgstr ""
-#: po/placeholder.h:109 urpm.pm:1104
+#: po/placeholder.h:112 urpm.pm:1110
#, fuzzy, c-format
msgid "The following packages contain %s: %s"
msgstr "De volgende archieven bevatten %s: %s\n"
-#: 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\""
+msgid "no rpm files found from [%s]"
msgstr ""
-#: po/placeholder.h:111 urpm.pm:1920
+#: po/placeholder.h:114 urpm.pm:1772
#, c-format
msgid "selecting %s using obsoletes"
msgstr ""
-#: po/placeholder.h:112 urpm.pm:2031
+#: po/placeholder.h:115 urpm.pm:1888
#, c-format
msgid "selecting %s by selection on files"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:114 urpmi:308 urpmi:315 urpmi:328 urpmi:339 urpmi:352
-msgid "Installation failed"
-msgstr "Installatie mislukt"
-
-#: po/placeholder.h:115 urpmi:279
-msgid "Press enter when it's done..."
-msgstr "Druk op enter wanneer het klaar is..."
+#: po/placeholder.h:120
+msgid " --help - print this help message.\n"
+msgstr ""
-#: po/placeholder.h:117 urpmi:201
-msgid "Sorry, bad choice, try again\n"
-msgstr "Sorry, foute keuze, probeer een andere\n"
+#: po/placeholder.h:121 urpmi:361
+msgid "everything already installed"
+msgstr "alles is al ge�nstalleerd"
-#: po/placeholder.h:120
+#: po/placeholder.h:122 urpmi:98
#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr ""
+
+#: po/placeholder.h:123 urpmi:194
+msgid "One of the following packages is needed:"
+msgstr "Een van de volgende archieven is benodigd:"
+
+#: po/placeholder.h:124 po/placeholder.h:222
+msgid " --update - use only update media.\n"
+msgstr ""
+
+#: po/placeholder.h:125 urpmi:299
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"
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
msgstr ""
-#: po/placeholder.h:142 urpmi:362
-msgid "everything already installed"
-msgstr "alles is al ge�nstalleerd"
+#: 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 "Installatie mislukt"
+
+#: po/placeholder.h:132 po/placeholder.h:234
+msgid ""
+" --auto-select - automatically select packages for upgrading the system.\n"
+msgstr ""
+
+#: po/placeholder.h:134
+msgid " --X - use X interface.\n"
+msgstr ""
-#: po/placeholder.h:143 urpmi:247
+#: po/placeholder.h:135 urpmi:247
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -594,49 +617,113 @@ msgstr ""
"Om dependencies te gebruiken, worden de volgende archieven ge�nstalleerd (%d "
"MB)"
-#: po/placeholder.h:144 urpmi:296
-#, c-format
-msgid "installing %s\n"
-msgstr "bezig met installeren van %s\n"
+#: po/placeholder.h:136 urpmi:320 urpmi:344
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Proberen te installeren zonder de dependencies te controleren? (j/N) "
+
+#: 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
+msgid " -q - quiet mode.\n"
+msgstr ""
-#: po/placeholder.h:145 urpmi:198
+#: po/placeholder.h:144 urpmi:202
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Wat is uw keuze? (1-%d)"
-#: po/placeholder.h:146 urpmi:321 urpmi:345
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Proberen te installeren zonder de dependencies te controleren? (j/N) "
+#: po/placeholder.h:145
+msgid " --wget - use wget to retrieve distant files.\n"
+msgstr ""
-#: po/placeholder.h:147 urpmi:190
-msgid "One of the following packages is needed:"
-msgstr "Een van de volgende archieven is benodigd:"
+#: po/placeholder.h:146
+#, 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"
+msgstr ""
-#: po/placeholder.h:148 urpmi:149
+#: po/placeholder.h:152 urpmi:328 urpmi:352
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Installatie forceren (--force)? (j/N) "
+
+#: po/placeholder.h:154
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+
+#: po/placeholder.h:155 urpmi:205
+msgid "Sorry, bad choice, try again\n"
+msgstr "Sorry, foute keuze, probeer een andere\n"
+
+#: po/placeholder.h:156
+msgid ""
+" names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: po/placeholder.h:158
+msgid " -a - select all matches on command line.\n"
+msgstr ""
+
+#: 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 "bezig met installeren van %s\n"
+
+#: po/placeholder.h:161 urpmi:152
msgid "Only superuser is allowed to install local packages"
msgstr "Alleen de superuser kan locale archieven installeren"
-#: po/placeholder.h:149 urpmi:278
+#: po/placeholder.h:162 urpmi:276
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Voeg a.u.b. de %s genaamd %s in"
-#: 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 ""
-#: po/placeholder.h:151 urpmi:329 urpmi:353
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Installatie forceren (--force)? (j/N) "
+#: po/placeholder.h:165 urpmi:102
+#, fuzzy
+msgid "Only superuser is allowed to install packages"
+msgstr "Alleen de superuser kan locale archieven installeren"
+
+#: po/placeholder.h:166 urpmi:193
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Een van de volgende archieven is benodigd:"
-#: po/placeholder.h:155 urpmi.addmedia:46
+#: po/placeholder.h:167 urpmi:277
+msgid "Press Enter when it's done..."
+msgstr "Druk op enter wanneer het klaar is..."
+
+#: po/placeholder.h:168 urpmi.addmedia:46
#, c-format
msgid ""
"%s\n"
"`with' missing for ftp media\n"
msgstr ""
-#: po/placeholder.h:159
+#: po/placeholder.h:172
msgid ""
"usage: urpmi.addmedia [--update] <name> <url>\n"
"where <url> is one of\n"
@@ -648,31 +735,31 @@ msgid ""
" removable_<device>://<path>\n"
msgstr ""
-#: po/placeholder.h:168 urpmi.addmedia:57
+#: po/placeholder.h:181 urpmi.addmedia:57
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr ""
-#: po/placeholder.h:169 urpmi.addmedia:58
+#: po/placeholder.h:182 urpmi.addmedia:58
#, c-format
msgid "unable to update medium \"%s\"\n"
msgstr ""
-#: po/placeholder.h:170 urpmi.addmedia:42
+#: po/placeholder.h:183 urpmi.addmedia:42
#, c-format
msgid ""
"%s\n"
"device `%s' do not exist\n"
msgstr ""
-#: po/placeholder.h:174 urpmi.addmedia:44
+#: po/placeholder.h:187 urpmi.addmedia:44
#, c-format
msgid ""
"%s\n"
"<relative path of hdlist> missing\n"
msgstr ""
-#: po/placeholder.h:178
+#: po/placeholder.h:191
#, c-format
msgid ""
"usage: urpmi.update [-a] <name> ...\n"
@@ -684,29 +771,29 @@ msgid ""
"unknown options '%s'\n"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:188 urpmi.update:53
+#: po/placeholder.h:201 urpmi.update:53
#, c-format
msgid ""
"the entry to update is missing\n"
"(one of %s)\n"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:193 urpmi.removemedia:46
+#: po/placeholder.h:206 urpmi.removemedia:46
#, c-format
msgid ""
"the entry to remove is missing\n"
"(one of %s)\n"
msgstr ""
-#: po/placeholder.h:197
+#: po/placeholder.h:210
#, c-format
msgid ""
"usage: urpmi.removemedia [-a] <name> ...\n"
@@ -716,23 +803,38 @@ msgid ""
"unknown options '%s'\n"
msgstr ""
-#: po/placeholder.h:204 urpmq:85
+#: po/placeholder.h:217
+msgid " -h - print this help message.\n"
+msgstr ""
+
+#: po/placeholder.h:218 urpmq:130
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+
+#: po/placeholder.h:219
+msgid " -g - print groups too with name.\n"
+msgstr ""
+
+#: po/placeholder.h:220 urpmq:84
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr ""
-#: po/placeholder.h:206 urpmq:82
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#: po/placeholder.h:221
+msgid " names or rpm files given on command line are queried.\n"
msgstr ""
-#: po/placeholder.h:207 urpmq:131
-msgid ""
-"some package have to be removed for being upgraded, this is not supported "
-"yet\n"
+#: po/placeholder.h:223
+msgid " -r - print version and release too with name.\n"
msgstr ""
-#: po/placeholder.h:208
+#: po/placeholder.h:224
+msgid " -f - print version, release and arch with name.\n"
+msgstr ""
+
+#: po/placeholder.h:225
#, c-format
msgid ""
"urpmq version %s\n"
@@ -740,77 +842,68 @@ msgid ""
"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 package do not exist.\n"
-" names or rpm files given on command line are queried.\n"
msgstr ""
-#: urpm.pm:257
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:231
+msgid " -d - extend query to package dependencies.\n"
msgstr ""
-#: urpm.pm:258
-#, c-format
-msgid "taking removable device as \"%s\""
+#: po/placeholder.h:232
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
msgstr ""
-#: urpm.pm:262
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
+#: po/placeholder.h:233
+msgid ""
+" -c - choose complete method for resolving requires closure.\n"
msgstr ""
-#: urpm.pm:266 urpm.pm:269
+#: po/placeholder.h:235 urpmq:81
#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
msgstr ""
-#: urpm.pm:1339
-#, c-format
-msgid "read synthesis file [%s]"
+#: po/placeholder.h:236
+msgid ""
+" --headers - extract headers for package listed from urpmi db to\n"
+" stdout (root only).\n"
msgstr ""
-#: urpmi:49
-#, c-format
-msgid "urpmi version %s"
+#: po/placeholder.h:243
+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 ""
-#: urpmi:98
+#: urpm.pm:1796 urpm.pm:1805
#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgid "removing %s to upgrade to %s ..."
msgstr ""
-#: urpmi:102
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr "Alleen de superuser kan locale archieven installeren"
+#: urpm.pm:1797 urpm.pm:1806
+msgid ", $otherPackage, "
+msgstr ", $otherPackage, "
-#: urpmi:189
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Een van de volgende archieven is benodigd:"
+#: urpm.pm:1797 urpm.pm:1806
+msgid "));"
+msgstr "));"
-#: urpmi:301
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+#: urpm.pm:1802
+msgid "$p->{name}-$p->{version}-$p->{release}"
+msgstr "$p->{name}-$p->{version}-$p->{release}"
+
+#: urpm.pm:1812
+msgid "$prefix/$_"
+msgstr "$prefix/$_"
+
+#: urpmi:48
+#, c-format
+msgid "urpmi version %s"
msgstr ""
#: urpmi.addmedia:30
@@ -843,9 +936,6 @@ msgstr ", $_);"
msgid "urpmq version %s"
msgstr ""
-#~ msgid "));"
-#~ msgstr "));"
-
#~ msgid "), $_);"
#~ msgstr "), $_);"
diff --git a/po/no.po b/po/no.po
index 9ed2c664..4796b4a5 100644
--- a/po/no.po
+++ b/po/no.po
@@ -6,7 +6,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-09-23 13:59CET\n"
"Last-Translator: Andreas Bergstr�m <abergstr@halden.net>\n"
"Language-Team: Norsk\n"
@@ -27,27 +27,27 @@ msgstr ""
"Automatisk installasjon av pakker...\n"
"Du ba om installasjon av pakke $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 "Er det ok?"
-#: _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 "Avbryt"
-#: _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 "Nn"
-#: _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 "Jj"
-#: _irpm:42 po/placeholder.h:118 urpmi:258
+#: _irpm:42 po/placeholder.h:157 urpmi:258
msgid " (Y/n) "
msgstr " (J/n) "
@@ -154,176 +154,176 @@ msgstr "pr�v urpmf --help for flere valg"
msgid "urpmi is not installed"
msgstr "urpmi er ikke installert"
-#: po/placeholder.h:29 urpm.pm:283
+#: po/placeholder.h:29
+#, fuzzy, c-format
+msgid "reading synthesis file [%s]"
+msgstr "les depsliste fil [%s]"
+
+#: po/placeholder.h:30 urpm.pm:298
#, c-format
msgid "unable to write config file [%s]"
msgstr "kunne ikke skrive config fil [%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 ""
-"kunne ikke bruke navn \"%s\" for media uten navn da det allerede er brukt"
-#: po/placeholder.h:31
+#: po/placeholder.h:32
#, c-format
msgid "nothing to write in list file for \"%s\""
msgstr "ingenting � skrive i liste fil for \"%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 "kunne ikke finne liste fil for \"%s\", media ignorert"
-#: po/placeholder.h:33
+#: po/placeholder.h:34
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "unable to parse hdlist file of \"%s\""
-#: po/placeholder.h:34
+#: po/placeholder.h:35
#, c-format
msgid "nothing written in list file for \"%s\""
msgstr "ingenting skrevet i liste fil for \"%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 ""
-"fjerner %s fra � oppgradere ...\n"
-" til %s siden den ikke vil oppgradere korrekt!"
-
-#: po/placeholder.h:39 urpm.pm:839
+#: po/placeholder.h:36 urpm.pm:845
#, c-format
msgid "read provides file [%s]"
msgstr "les provides fil [%s]"
-#: po/placeholder.h:40
-#, c-format
-msgid "trying to remove inexistant medium \"%s\""
-msgstr "pr�ver � fjerne media \"%s\" som ikke eksisterer"
-
-#: po/placeholder.h:41 urpm.pm:1692
+#: po/placeholder.h:37 urpm.pm:1549
#, c-format
msgid "package %s is not found."
msgstr "pakke %s er ikke funnet."
-#: po/placeholder.h:42
-#, c-format
-msgid "unable to copy source of [%s] from [%s]"
-msgstr "kunne ikke kopiere kilde av [%s] fra [%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 "kunne ikke skrive compss fil [%s]"
-#: po/placeholder.h:44 urpm.pm:813
+#: po/placeholder.h:39 urpm.pm:819
#, c-format
msgid "unmounting %s"
msgstr "demonterer %s"
-#: po/placeholder.h:45
+#: po/placeholder.h:40
#, c-format
msgid "removing %d obsolete headers in cache"
msgstr "fjerner %d obsolete hoder i 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 "ingen hdlist fil funnet for media \"%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 "media \"%s\" pr�ver � bruke en allerede brukt hdlist, media ignorert"
+
+#: po/placeholder.h:43 urpm.pm:184
+#, c-format
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"kunne ikke bruke navn \"%s\" for media uten navn da det allerede er brukt"
+
+#: po/placeholder.h:44 urpm.pm:191
#, c-format
msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
msgstr ""
"kunne ikke ta media \"%s\" inn til konto da ingen liste fil [%s] eksisterer"
-#: po/placeholder.h:48
+#: po/placeholder.h:45
msgid "keeping only files referenced in provides"
msgstr "beholder bare provides filer"
-#: po/placeholder.h:49
+#: po/placeholder.h:46
#, c-format
msgid "unable to build synthesis file for medium \"%s\""
msgstr "kunne ikke bygge synthesis fil for media \"%s\""
-#: po/placeholder.h:50
+#: po/placeholder.h:47
#, c-format
msgid "found %d headers in cache"
msgstr "fant %d hoder i 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 "kunne ikke lese provides fil [%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 "ung� valg av %s da dens lokale spr�k ikke er valgt allerede"
-#: 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 ""
+"fjerner %s for � oppgradere ...\n"
+" til %s siden den ikke vil bli oppdatert ellers"
+
+#: po/placeholder.h:54 urpm.pm:326
#, c-format
msgid "medium \"%s\" already exists"
msgstr "media \"%s\" eksisterer allerede"
-#: po/placeholder.h:54 urpm.pm:295
-#, c-format
-msgid "write config file [%s]"
-msgstr "skriv config fil [%s]"
-
#: po/placeholder.h:55
#, c-format
msgid "unable to write list file of \"%s\""
msgstr "kunne ikke skrive liste fil av \"%s\""
-#: po/placeholder.h:56 urpm.pm:1817
-#, c-format
-msgid "retrieving [%s]"
-msgstr "mottar [%s]"
-
-#: po/placeholder.h:57 urpm.pm:1819
+#: po/placeholder.h:56 urpm.pm:310
#, c-format
-msgid "wget of [%s] failed"
-msgstr "wget av [%s] mislykket"
+msgid "write config file [%s]"
+msgstr "skriv config fil [%s]"
-#: po/placeholder.h:58 urpm.pm:1101
+#: po/placeholder.h:57 urpm.pm:1107
#, c-format
msgid "no package named %s"
msgstr "ingen pakke kalt %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 "kunne ikke lese compss fil [%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 "kunne ikke finne hdlist fil for \"%s\", media ignorert"
-#: po/placeholder.h:61
+#: po/placeholder.h:60
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "bygd hdlist synthesis fil for media \"%s\""
-#: po/placeholder.h:62
+#: po/placeholder.h:61
msgid "computing dependencies"
msgstr "beregner avhengigheter"
-#: po/placeholder.h:63 urpm.pm:868
+#: po/placeholder.h:62
+#, fuzzy, c-format
+msgid "retrieve of [%s] failed"
+msgstr "wget av [%s] mislykket"
+
+#: po/placeholder.h:63 urpm.pm:874
#, c-format
msgid "write provides file [%s]"
msgstr "skriv provides fil [%s]"
-#: po/placeholder.h:64 urpm.pm:803
+#: po/placeholder.h:64 urpm.pm:809
#, c-format
msgid "mounting %s"
msgstr "monterer %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,123 +332,135 @@ msgstr ""
"kan ikke ta h�nd om media \"%s\" da liste fil allerede blir brukt av et "
"annet media"
-#: po/placeholder.h:66 urpm.pm:148
-#, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
-msgstr "media \"%s\" pr�ver � bruke en allerede brukt liste, media ignorert"
-
-#: po/placeholder.h:67
+#: po/placeholder.h:66
#, c-format
msgid "reading hdlist file [%s]"
msgstr "leser hdlist fil [%s]"
-#: po/placeholder.h:68 urpm.pm:873
+#: po/placeholder.h:67 urpm.pm:879
#, c-format
msgid "write compss file [%s]"
msgstr "skriv compss fil [%s]"
-#: po/placeholder.h:69 urpm.pm:827
+#: po/placeholder.h:68 urpm.pm:833
#, c-format
msgid "read depslist file [%s]"
msgstr "les depsliste fil [%s]"
-#: po/placeholder.h:70
-#, c-format
-msgid "trying to select inexistant medium \"%s\""
-msgstr "pr�ver � velge ikke eksisterende media \"%s\""
+#: po/placeholder.h:69 urpm.pm:103
+msgid "curl failed\n"
+msgstr ""
-#: po/placeholder.h:71 urpm.pm:1812
+#: po/placeholder.h:70 urpm.pm:281 urpm.pm:284
+#, fuzzy, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "kunne ikke opprette medium \"%s\"\n"
+
+#: po/placeholder.h:71 urpm.pm:1668
#, c-format
msgid "malformed input: [%s]"
msgstr "malformed input: [%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 "media \"%s\" pr�ver � bruke en allerede brukt hdlist, media ignorert"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "det er flere pakker med samme rpm filnavn \"%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"
-msgstr ""
-"fjerner %s for � oppgradere ...\n"
-" til %s siden den ikke vil bli oppdatert ellers"
+msgid "medium \"%s\" tries to use an already used list, medium ignored"
+msgstr "media \"%s\" pr�ver � bruke en allerede brukt liste, media ignorert"
-#: po/placeholder.h:77 urpm.pm:865
+#: po/placeholder.h:74 urpm.pm:871
#, c-format
msgid "unable to write provides file [%s]"
msgstr "kunne ikke skrive provides fil [%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 "kunne ikke n� hdlist fil av \"%s\", media ignorert"
+#: po/placeholder.h:76 urpm.pm:1215
+#, fuzzy
+msgid "unable to find all synthesis file, using parsehdlist server"
+msgstr "kunne ikke finne alle synthesis file, bruker parsehdlist tjener"
+
#
-#: po/placeholder.h:79 urpm.pm:1005
+#: po/placeholder.h:77 urpm.pm:1011
msgid "unable to register rpm file"
msgstr "kunne ikke registrere rpm-fil"
-#: po/placeholder.h:80 urpm.pm:1362
-msgid "unable to find all synthesis file, using parsehdlist server"
-msgstr "kunne ikke finne alle synthesis file, bruker parsehdlist tjener"
-
-#: po/placeholder.h:81 urpm.pm:241
+#: po/placeholder.h:78 urpm.pm:256
#, c-format
msgid "unable to inspect list file for \"%s\", medium ignored"
msgstr "kunne ikke inspisere liste fil for \"%s\", media ignorert"
-#: 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 "incoherent list file for \"%s\", medium ignored"
-#: po/placeholder.h:83
+#: po/placeholder.h:81
#, c-format
msgid "copy of [%s] failed"
msgstr "kopi av [%s] mislykket"
-#: 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 "pr�ver � fjerne media \"%s\" som ikke eksisterer"
+
+#: 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 "unable to parse correctly [%s]"
-#: po/placeholder.h:85 urpm.pm:824
+#: po/placeholder.h:84 urpm.pm:1192
+#, fuzzy, c-format
+msgid "read synthesis file [%s]"
+msgstr "les depsliste fil [%s]"
+
+#: po/placeholder.h:85 urpm.pm:830
#, c-format
msgid "unable to read depslist file [%s]"
msgstr "kunne ikke lese depsliste fil [%s]"
-#: po/placeholder.h:86
-msgid "removable medium not selected"
-msgstr "fjernbart media ikke valgt"
-
-#: po/placeholder.h:87 urpm.pm:851
+#: po/placeholder.h:86 urpm.pm:857
#, c-format
msgid "read compss file [%s]"
msgstr "les compss fil [%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 "syntaks feil i config fil ved linje %s"
-#: po/placeholder.h:89
+#: po/placeholder.h:88
#, c-format
msgid "building hdlist [%s]"
msgstr "bygger 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 "kunne ikke lese rpm fil [%s] fra media \"%s\""
-#: po/placeholder.h:91 urpm.pm:1009
+#: po/placeholder.h:90 urpm.pm:1015
msgid "error registering local packages"
msgstr "feil ved registrering av lokale pakker"
-#: 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 "incoherent media \"%s\" merket fjernbart, men er det ikke"
@@ -458,215 +470,273 @@ msgstr "incoherent media \"%s\" merket fjernbart, men er det ikke"
msgid "unable to build hdlist: %s"
msgstr "kunne ikke bygge 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 "media \"%s\" er ikke valgt"
+
+#: po/placeholder.h:95 urpm.pm:1006
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "invalid rpm filnavn [%s]"
-#: 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 "media \"%s\" er ikke valgt"
+msgid "unknown data associated with %s"
+msgstr "ukjent data assosiert med %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 "pr�ver � g� forbi eksisterende media \"%s\", unng�r"
-#: po/placeholder.h:97 urpm.pm:863
+#: po/placeholder.h:98 urpm.pm:869
#, c-format
msgid "write depslist file [%s]"
msgstr "skriv depsliste fil [%s]"
-#: po/placeholder.h:98 urpm.pm:1322
-#, c-format
-msgid "unknown data associated with %s"
-msgstr "ukjent data assosiert med %s"
-
-#: po/placeholder.h:99
-#, c-format
-msgid "source of [%s] not found as [%s]"
-msgstr "kilden til [%s] ikke funnet som [%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 "kan ikke f� tilgang til filen til \"%s\", media ignorert"
-#: 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 "unng�r � velge %s da ikke nok filer vil bli oppdatert"
-#: po/placeholder.h:102
-#, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
-msgstr "wget av [%s] mislykket (kanskje wget mangler?)"
-
-#: po/placeholder.h:103 urpm.pm:1001
+#: po/placeholder.h:101 urpm.pm:1007
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "kunne ikke n� rpm fil [%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 "kunne ikke skrive depsliste fil [%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 ""
+"fjerner %s fra � oppgradere ...\n"
+" til %s siden den ikke vil oppgradere korrekt!"
+
+#: po/placeholder.h:107 urpm.pm:342 urpm.pm:1630
#, c-format
msgid "unable to access medium \"%s\""
msgstr "kunne ikke n� media \"%s\""
-#: po/placeholder.h:106 urpm.pm:988
+#: po/placeholder.h:108 urpm.pm:994
#, c-format
msgid "relocated %s entries in depslist"
msgstr "fant igjen %s innganger i depsliste"
-#: 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 "unable to parse correctly [%s] on value \"%s\""
+msgid "trying to select inexistent medium \"%s\""
+msgstr "pr�ver � velge ikke eksisterende media \"%s\""
-#: po/placeholder.h:108
+#: po/placeholder.h:110 urpm.pm:97
+#, fuzzy
+msgid "wget failed\n"
+msgstr "wget av [%s] mislykket"
+
+#: po/placeholder.h:111 urpm.pm:920 urpm.pm:1486 urpm.pm:1537
#, c-format
-msgid "no rpm files found from [%s]"
-msgstr "ingen rpm filer funnet fra [%s]"
+msgid "unable to parse correctly [%s] on value \"%s\""
+msgstr "unable to parse correctly [%s] on value \"%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 "F�lgende pakker inneholder %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 "det er flere pakker med samme rpm filnavn \"%s\""
+msgid "no rpm files found from [%s]"
+msgstr "ingen rpm filer funnet fra [%s]"
-#: po/placeholder.h:111 urpm.pm:1920
+#: po/placeholder.h:114 urpm.pm:1772
#, c-format
msgid "selecting %s using obsoletes"
msgstr "velger %s ved � bruke obsolete"
-#: po/placeholder.h:112 urpm.pm:2031
+#: po/placeholder.h:115 urpm.pm:1888
#, c-format
msgid "selecting %s by selection on files"
msgstr "velger %s ved valg av filer"
-#: 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 "kunne ikke bestemme media av denne hdlist filen [%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 - print all tags."
+
+#: po/placeholder.h:121 urpmi:361
+msgid "everything already installed"
+msgstr "alt er allerede installert"
+
+#: po/placeholder.h:122 urpmi:98
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: ukjent valg \"-%s\", sjekk bruk med --help\n"
+
+#: po/placeholder.h:123 urpmi:194
+msgid "One of the following packages is needed:"
+msgstr "En av f�lgende pakker beh�ves:"
+
+#: 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 "Installasjon mislykket"
-#: po/placeholder.h:115 urpmi:279
-msgid "Press enter when it's done..."
-msgstr "Trykk enter n�r det er ferdig..."
+#: 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 "Beklager, d�rlig valg, pr�v igjen\n"
+#: po/placeholder.h:134
+#, fuzzy
+msgid " --X - use X interface.\n"
+msgstr " --all - print all tags."
-#: 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 ""
+"F�lgende pakker vil bli installert for � tilfredstille avhengigheter (%d MB)"
+
+#: po/placeholder.h:136 urpmi:320 urpmi:344
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Pr�ve � installere uten � sjekke avhengigheter? (j/N) "
+
+#: 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 - print all tags."
+
+#: po/placeholder.h:144 urpmi:202
#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "Hva er ditt valg? (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 "Dette er fri programvare og kan redistribueres uder vilk�rene til GNU "
+
+#: po/placeholder.h:152 urpmi:328 urpmi:352
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Pr�ve � installere enda hardere (--force)? (j/N) "
+
+#: po/placeholder.h:154
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
msgstr ""
-"urpmi versjon %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"Dette er fri programvare og kan videredistribueres under betingelsene til "
-"GNU GPL.\n"
-"bruk:\n"
-" --help - vis denne hjelp meldingen.\n"
-" --update - bruk bare oppdater media.\n"
-" --auto - velg automatisk en god pakke i valg.\n"
-" --auto-select - velg automatisk pakker for oppgradering av systemet.\n"
-" --force - tving p�kallelse selv om noen pakker ikke eksisterer.\n"
-" --X - bruk X grensesnitt.\n"
-" --best-output - velg beste grensesnitt som passer til milj�et:\n"
-" X eller tekstmodus.\n"
-" -a - velg alle som stemmer p� kommandolinjen.\n"
-" -m - velg minimal kravreferanse (standard).\n"
-" -M -velg maksimal kravreferanse.\n"
-" -c - velg komplett metode som bestemt trenger lukking.\n"
-" -p - tillat s�k i provides for � finne pakker.\n"
-" -q - stille modus.\n"
-" -v - ordrikt modus.\n"
-" navn eller rpm filer (bare for root) gitt p� kommandolinjen er "
-"installert.\n"
-
-#: po/placeholder.h:142 urpmi:362
-msgid "everything already installed"
-msgstr "alt er allerede installert"
-#: po/placeholder.h:143 urpmi:247
-#, c-format
+#: po/placeholder.h:155 urpmi:205
+msgid "Sorry, bad choice, try again\n"
+msgstr "Beklager, d�rlig valg, pr�v igjen\n"
+
+#: po/placeholder.h:156
msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+" names or rpm files (only for root) given on command line are installed.\n"
msgstr ""
-"F�lgende pakker vil bli installert for � tilfredstille avhengigheter (%d MB)"
-#: po/placeholder.h:144 urpmi:296
+#: po/placeholder.h:158
+msgid " -a - select all matches on command line.\n"
+msgstr ""
+
+#: 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 "installerer %s\n"
-#: po/placeholder.h:145 urpmi:198
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Hva er ditt valg? (1-%d) "
-
-#: po/placeholder.h:146 urpmi:321 urpmi:345
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Pr�ve � installere uten � sjekke avhengigheter? (j/N) "
-
-#: po/placeholder.h:147 urpmi:190
-msgid "One of the following packages is needed:"
-msgstr "En av f�lgende pakker beh�ves:"
-
-#: po/placeholder.h:148 urpmi:149
+#: po/placeholder.h:161 urpmi:152
msgid "Only superuser is allowed to install local packages"
msgstr "Bare superbruker har adgang til � installere lokale pakker"
-#: 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 "Vennligst sett inn mediumet kalt \"%s\" p� enhet [%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 "kunne ikke f� tak i kildepakker, avslutter"
-#: po/placeholder.h:151 urpmi:329 urpmi:353
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Pr�ve � installere enda hardere (--force)? (j/N) "
+#: po/placeholder.h:165 urpmi:102
+#, fuzzy
+msgid "Only superuser is allowed to install packages"
+msgstr "Bare superbruker har adgang til � installere lokale pakker"
-#: po/placeholder.h:155 urpmi.addmedia:46
+#: po/placeholder.h:166 urpmi:193
+#, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "En av f�lgende pakker beh�ves for � installere %s:"
+
+#: po/placeholder.h:167 urpmi:277
+msgid "Press Enter when it's done..."
+msgstr "Trykk enter n�r det er ferdig..."
+
+#: po/placeholder.h:168 urpmi.addmedia:46
#, c-format
msgid ""
"%s\n"
@@ -675,7 +745,7 @@ msgstr ""
"%s\n"
"`with' mangler for ftp media\n"
-#: po/placeholder.h:159
+#: po/placeholder.h:172
msgid ""
"usage: urpmi.addmedia [--update] <name> <url>\n"
"where <url> is one of\n"
@@ -695,17 +765,17 @@ msgstr ""
" http://<vert>/<sti> with <relative filename of hdlist>\n"
" removable_<enhet>://<sti>\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 "kunne ikke opprette medium \"%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 "kunne ikke oppdatere medium \"%s\"\n"
-#: po/placeholder.h:170 urpmi.addmedia:42
+#: po/placeholder.h:183 urpmi.addmedia:42
#, c-format
msgid ""
"%s\n"
@@ -714,7 +784,7 @@ msgstr ""
"%s\n"
"enhet `%s' finnes ikke\n"
-#: po/placeholder.h:174 urpmi.addmedia:44
+#: po/placeholder.h:187 urpmi.addmedia:44
#, c-format
msgid ""
"%s\n"
@@ -723,7 +793,7 @@ msgstr ""
"%s\n"
"<relative path of hdlist> mangler\n"
-#: po/placeholder.h:178
+#: po/placeholder.h:191
#, c-format
msgid ""
"usage: urpmi.update [-a] <name> ...\n"
@@ -743,11 +813,11 @@ msgstr ""
"\n"
"ukjente valg '%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 "ingenting � oppdatere (bruk urpmi.addmedia for � legge til et media)\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"
@@ -756,11 +826,11 @@ msgstr ""
"inngangen til oppdatering mangler\n"
"(en av %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 "ingenting � fjerne (bruk urpmi.addmedia for � legge til et media)\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"
@@ -769,7 +839,7 @@ msgstr ""
"inngangen til fjern mangler\n"
"(en av %s)\n"
-#: po/placeholder.h:197
+#: po/placeholder.h:210
#, c-format
msgid ""
"usage: urpmi.removemedia [-a] <name> ...\n"
@@ -784,130 +854,113 @@ msgstr ""
"\n"
"ukjente valg '%s'\n"
-#: po/placeholder.h:204 urpmq:85
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: kan ikke lese rpm fil \"%s\"\n"
-
-#: po/placeholder.h:206 urpmq:82
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: ukjent valg \"-%s\", sjekk bruk med --help\n"
+#: po/placeholder.h:217
+#, fuzzy
+msgid " -h - print this help message.\n"
+msgstr " --all - print all tags."
-#: 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 ""
"Noen pakker m� fjernes for � bli oppgradert, dette er ikke st�ttet enn�\n"
-#: po/placeholder.h:208
+#: po/placeholder.h:219
+#, fuzzy
+msgid " -g - print groups too with name.\n"
+msgstr " --group - print tag group: group."
+
+#: po/placeholder.h:220 urpmq:84
#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: kan ikke lese rpm fil \"%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 " kommandolinje, men uten pakkenavn)."
+
+#: 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"
+msgstr "Dette er fri programvare og kan redistribueres uder vilk�rene til GNU "
+
+#: po/placeholder.h:231
+#, fuzzy
+msgid " -d - extend query to package dependencies.\n"
+msgstr " kommandolinje, men uten pakkenavn)."
+
+#: po/placeholder.h:232
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
+msgstr ""
+
+#: po/placeholder.h:233
+msgid ""
" -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"
+msgstr ""
+
+#: po/placeholder.h:235 urpmq:81
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: ukjent valg \"-%s\", sjekk bruk med --help\n"
+
+#: po/placeholder.h:236
+msgid ""
" --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 package do not exist.\n"
-" names or rpm files given on command line are queried.\n"
msgstr ""
-"urpmq version %s\n"
-"Copyright (C) 2000, 2001 MandrakeSoft.\n"
-"Dette er fri programvare og kan videredistribueres under vilk�rende til GNU "
-"GPL.\n"
-"bruk:\n"
-" --help - vis denne hjelp meldingen.\n"
-" -v - ordrikt modus.\n"
-" -d - utvid sp�rsm�l ttil pakkeavhengigheter.\n"
-" -u - fjern pakke hvis en bedre versjon allerede er "
-"installert.\n"
-" -m - utvid sp�rsm�l til pakkeavhengigheter, fjern allerede\n"
-" installerte pakker som inneholder det som er n�dvendig, "
-"legg\n"
-" til pakker som muligens kan blokkere oppgradering.\n"
-" -M - utvid sp�rsm�l til pakkeavhengigheter og fjern allerede\n"
-" installerte pakker bare hvis de er nyere eller de samme.\n"
-" -c - velg komplett metode for som bestemt trenger lukking.\n"
-" -p - tillat s�k i provides for � finne pakker.\n"
-" -g - vis grupper ogs� med navn.\n"
-" -r - vis versjon og utgivelse ogs� med navn.\n"
-" --update - bruk bare oppdater media.\n"
-" --auto-select - velg automatisk pakker for oppgradering av systemet.\n"
-" --headers - pakk ut hoder for pakker listet fra urpmi db til\n"
-" stdout (kun root).\n"
-" --sources - gir alle kildepakker f�r nedlasting (kun root).\n"
-" --force - tving p�kallelse selv om noen pakker ikke eksisterer.\n"
-" navn eller rpm filer gitt p� kommandolinjen er forespurt.\n"
-
-#: urpm.pm:257
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+
+#: po/placeholder.h:243
+msgid ""
+" -u - remove package if a better version is already installed.\n"
msgstr ""
-#: urpm.pm:258
-#, c-format
-msgid "taking removable device as \"%s\""
+#: po/placeholder.h:244
+msgid ""
+" --force - force invocation even if some packages do not\n"
+"exist.\n"
msgstr ""
-#: urpm.pm:262
+#: urpm.pm:1796 urpm.pm:1805
#, c-format
-msgid "using different removable device [%s] for \"%s\""
+msgid "removing %s to upgrade to %s ..."
msgstr ""
-#: urpm.pm:266 urpm.pm:269
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "kunne ikke opprette medium \"%s\"\n"
+#: urpm.pm:1797 urpm.pm:1806
+msgid ", $otherPackage, "
+msgstr ", $otherPackage, "
-#: urpm.pm:1339
-#, fuzzy, c-format
-msgid "read synthesis file [%s]"
-msgstr "les depsliste fil [%s]"
+#: urpm.pm:1797 urpm.pm:1806
+msgid "));"
+msgstr "));"
-#: urpmi:49
-#, c-format
-msgid "urpmi version %s"
-msgstr "urpmi versjon %s"
-
-#: urpmi:98
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: ukjent valg \"-%s\", sjekk bruk med --help\n"
+#: urpm.pm:1802
+msgid "$p->{name}-$p->{version}-$p->{release}"
+msgstr "$p->{name}-$p->{version}-$p->{release}"
-#: urpmi:102
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr "Bare superbruker har adgang til � installere lokale pakker"
+#: urpm.pm:1812
+msgid "$prefix/$_"
+msgstr "$prefix/$_"
-#: urpmi:189
+#: urpmi:48
#, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "En av f�lgende pakker beh�ves for � installere %s:"
-
-#: urpmi:301
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
-msgstr ""
+msgid "urpmi version %s"
+msgstr "urpmi versjon %s"
#: urpmi.addmedia:30
msgid "usage: urpmi.addmedia [--update] <name> <url>"
@@ -938,3 +991,134 @@ msgstr ", $_);"
#, c-format
msgid "urpmq version %s"
msgstr "urpmq versjon %s"
+
+#~ msgid "retrieving [%s]"
+#~ msgstr "mottar [%s]"
+
+#~ msgid "wget of [%s] failed (maybe wget is missing?)"
+#~ msgstr "wget av [%s] mislykket (kanskje wget mangler?)"
+
+#~ msgid "unable to copy source of [%s] from [%s]"
+#~ msgstr "kunne ikke kopiere kilde av [%s] fra [%s]"
+
+#~ msgid "removable medium not selected"
+#~ msgstr "fjernbart media ikke valgt"
+
+#~ msgid "source of [%s] not found as [%s]"
+#~ msgstr "kilden til [%s] ikke funnet som [%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 ""
+#~ "urpmi versjon %s\n"
+#~ "Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+#~ "Dette er fri programvare og kan videredistribueres under betingelsene til "
+#~ "GNU GPL.\n"
+#~ "bruk:\n"
+#~ " --help - vis denne hjelp meldingen.\n"
+#~ " --update - bruk bare oppdater media.\n"
+#~ " --auto - velg automatisk en god pakke i valg.\n"
+#~ " --auto-select - velg automatisk pakker for oppgradering av "
+#~ "systemet.\n"
+#~ " --force - tving p�kallelse selv om noen pakker ikke "
+#~ "eksisterer.\n"
+#~ " --X - bruk X grensesnitt.\n"
+#~ " --best-output - velg beste grensesnitt som passer til milj�et:\n"
+#~ " X eller tekstmodus.\n"
+#~ " -a - velg alle som stemmer p� kommandolinjen.\n"
+#~ " -m - velg minimal kravreferanse (standard).\n"
+#~ " -M -velg maksimal kravreferanse.\n"
+#~ " -c - velg komplett metode som bestemt trenger lukking.\n"
+#~ " -p - tillat s�k i provides for � finne pakker.\n"
+#~ " -q - stille modus.\n"
+#~ " -v - ordrikt modus.\n"
+#~ " navn eller rpm filer (bare for root) gitt p� kommandolinjen er "
+#~ "installert.\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 ""
+#~ "urpmq version %s\n"
+#~ "Copyright (C) 2000, 2001 MandrakeSoft.\n"
+#~ "Dette er fri programvare og kan videredistribueres under vilk�rende til "
+#~ "GNU GPL.\n"
+#~ "bruk:\n"
+#~ " --help - vis denne hjelp meldingen.\n"
+#~ " -v - ordrikt modus.\n"
+#~ " -d - utvid sp�rsm�l ttil pakkeavhengigheter.\n"
+#~ " -u - fjern pakke hvis en bedre versjon allerede er "
+#~ "installert.\n"
+#~ " -m - utvid sp�rsm�l til pakkeavhengigheter, fjern allerede\n"
+#~ " installerte pakker som inneholder det som er "
+#~ "n�dvendig, legg\n"
+#~ " til pakker som muligens kan blokkere oppgradering.\n"
+#~ " -M - utvid sp�rsm�l til pakkeavhengigheter og fjern "
+#~ "allerede\n"
+#~ " installerte pakker bare hvis de er nyere eller de "
+#~ "samme.\n"
+#~ " -c - velg komplett metode for som bestemt trenger lukking.\n"
+#~ " -p - tillat s�k i provides for � finne pakker.\n"
+#~ " -g - vis grupper ogs� med navn.\n"
+#~ " -r - vis versjon og utgivelse ogs� med navn.\n"
+#~ " --update - bruk bare oppdater media.\n"
+#~ " --auto-select - velg automatisk pakker for oppgradering av "
+#~ "systemet.\n"
+#~ " --headers - pakk ut hoder for pakker listet fra urpmi db til\n"
+#~ " stdout (kun root).\n"
+#~ " --sources - gir alle kildepakker f�r nedlasting (kun root).\n"
+#~ " --force - tving p�kallelse selv om noen pakker ikke "
+#~ "eksisterer.\n"
+#~ " navn eller rpm filer gitt p� kommandolinjen er forespurt.\n"
diff --git a/po/pl.po b/po/pl.po
index ef24de45..0d59160b 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -4,7 +4,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: 2000-09-08 12:48:03+0200\n"
"Last-Translator: Pawel Jablonski <pj@linux-mandrake.com>\n"
"Language-Team: Polish <pl@li.org>\n"
@@ -23,27 +23,27 @@ msgid ""
"You requested installation of package $rpm\n"
msgstr ""
-#: _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 "W porz�dku?"
-#: _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 "Anuluj"
-#: _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 "Nn"
-#: _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 "TtYy"
-#: _irpm:42 po/placeholder.h:118 urpmi:258
+#: _irpm:42 po/placeholder.h:157 urpmi:258
msgid " (Y/n) "
msgstr " (T/n) "
@@ -146,120 +146,120 @@ msgstr ""
msgid "urpmi is not installed"
msgstr ""
-#: po/placeholder.h:29 urpm.pm:283
+#: po/placeholder.h:29
+#, c-format
+msgid "reading synthesis file [%s]"
+msgstr ""
+
+#: po/placeholder.h:30 urpm.pm:298
#, c-format
msgid "unable to write config file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:31
+#: po/placeholder.h:32
#, c-format
msgid "nothing to write in list file for \"%s\""
msgstr ""
-#: 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 ""
-#: po/placeholder.h:33
+#: po/placeholder.h:34
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr ""
-#: po/placeholder.h:34
+#: po/placeholder.h:35
#, c-format
msgid "nothing written in list file for \"%s\""
msgstr ""
-#: po/placeholder.h:35 urpm.pm:1951
-#, c-format
-msgid ""
-"removing %s to upgrade ...\n"
-" to %s since it will not upgrade correctly!"
-msgstr ""
-
-#: po/placeholder.h:39 urpm.pm:839
+#: po/placeholder.h:36 urpm.pm:845
#, c-format
msgid "read provides file [%s]"
msgstr ""
-#: po/placeholder.h:40
+#: po/placeholder.h:37 urpm.pm:1549
#, c-format
-msgid "trying to remove inexistant medium \"%s\""
+msgid "package %s is not found."
msgstr ""
-#: po/placeholder.h:41 urpm.pm:1692
+#: po/placeholder.h:38 urpm.pm:876
#, c-format
-msgid "package %s is not found."
+msgid "unable to write compss file [%s]"
msgstr ""
-#: po/placeholder.h:42
+#: po/placeholder.h:39 urpm.pm:819
#, c-format
-msgid "unable to copy source of [%s] from [%s]"
+msgid "unmounting %s"
msgstr ""
-#: po/placeholder.h:43 urpm.pm:870
+#: po/placeholder.h:40
#, c-format
-msgid "unable to write compss file [%s]"
+msgid "removing %d obsolete headers in cache"
msgstr ""
-#: po/placeholder.h:44 urpm.pm:813
+#: po/placeholder.h:41 urpm.pm:925 urpm.pm:1491
#, c-format
-msgid "unmounting %s"
+msgid "no hdlist file found for medium \"%s\""
msgstr ""
-#: po/placeholder.h:45
+#: po/placeholder.h:42 urpm.pm:160
#, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
msgstr ""
-#: po/placeholder.h:46 urpm.pm:919 urpm.pm:1634
+#: po/placeholder.h:43 urpm.pm:184
#, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
msgstr ""
-#: po/placeholder.h:47 urpm.pm:176
+#: po/placeholder.h:44 urpm.pm:191
#, c-format
msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
msgstr ""
-#: po/placeholder.h:48
+#: po/placeholder.h:45
msgid "keeping only files referenced in provides"
msgstr ""
-#: po/placeholder.h:49
+#: po/placeholder.h:46
#, c-format
msgid "unable to build synthesis file for medium \"%s\""
msgstr ""
-#: po/placeholder.h:50
+#: po/placeholder.h:47
#, c-format
msgid "found %d headers in cache"
msgstr ""
-#: po/placeholder.h:51 urpm.pm:836
+#: po/placeholder.h:48 urpm.pm:842
#, c-format
msgid "unable to read provides file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:53 urpm.pm:311
+#: po/placeholder.h:50
#, c-format
-msgid "medium \"%s\" already exists"
+msgid ""
+"removing %s to upgrade to %s ...\n"
+" since it will not be updated otherwise"
msgstr ""
-#: po/placeholder.h:54 urpm.pm:295
+#: po/placeholder.h:54 urpm.pm:326
#, c-format
-msgid "write config file [%s]"
+msgid "medium \"%s\" already exists"
msgstr ""
#: po/placeholder.h:55
@@ -267,324 +267,347 @@ msgstr ""
msgid "unable to write list file of \"%s\""
msgstr ""
-#: po/placeholder.h:56 urpm.pm:1817
-#, c-format
-msgid "retrieving [%s]"
-msgstr ""
-
-#: po/placeholder.h:57 urpm.pm:1819
+#: po/placeholder.h:56 urpm.pm:310
#, c-format
-msgid "wget of [%s] failed"
+msgid "write config file [%s]"
msgstr ""
-#: po/placeholder.h:58 urpm.pm:1101
+#: po/placeholder.h:57 urpm.pm:1107
#, fuzzy, c-format
msgid "no package named %s"
msgstr "brak pakietu o nazwie %s\n"
-#: po/placeholder.h:59 urpm.pm:848
+#: po/placeholder.h:58 urpm.pm:854
#, c-format
msgid "unable to read compss file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:61
+#: po/placeholder.h:60
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr ""
-#: po/placeholder.h:62
+#: po/placeholder.h:61
msgid "computing dependencies"
msgstr ""
-#: po/placeholder.h:63 urpm.pm:868
+#: po/placeholder.h:62
+#, c-format
+msgid "retrieve of [%s] failed"
+msgstr ""
+
+#: po/placeholder.h:63 urpm.pm:874
#, c-format
msgid "write provides file [%s]"
msgstr ""
-#: po/placeholder.h:64 urpm.pm:803
+#: po/placeholder.h:64 urpm.pm:809
#, fuzzy, c-format
msgid "mounting %s"
msgstr "instalowanie %s\n"
-#: 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 "
"medium"
msgstr ""
-#: po/placeholder.h:66 urpm.pm:148
-#, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
-msgstr ""
-
-#: po/placeholder.h:67
+#: po/placeholder.h:66
#, c-format
msgid "reading hdlist file [%s]"
msgstr ""
-#: po/placeholder.h:68 urpm.pm:873
+#: po/placeholder.h:67 urpm.pm:879
#, c-format
msgid "write compss file [%s]"
msgstr ""
-#: po/placeholder.h:69 urpm.pm:827
+#: po/placeholder.h:68 urpm.pm:833
#, c-format
msgid "read depslist file [%s]"
msgstr ""
-#: po/placeholder.h:70
+#: po/placeholder.h:69 urpm.pm:103
+msgid "curl failed\n"
+msgstr ""
+
+#: po/placeholder.h:70 urpm.pm:281 urpm.pm:284
#, c-format
-msgid "trying to select inexistant medium \"%s\""
+msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr ""
-#: po/placeholder.h:71 urpm.pm:1812
+#: po/placeholder.h:71 urpm.pm:1668
#, c-format
msgid "malformed input: [%s]"
msgstr ""
-#: 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"
+msgid "there are multiple packages with the same rpm filename \"%s\""
msgstr ""
-#: 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 ""
-#: po/placeholder.h:77 urpm.pm:865
+#: po/placeholder.h:74 urpm.pm:871
#, c-format
msgid "unable to write provides file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:79 urpm.pm:1005
-msgid "unable to register rpm file"
+#: po/placeholder.h:76 urpm.pm:1215
+msgid "unable to find all synthesis file, using parsehdlist server"
msgstr ""
-#: po/placeholder.h:80 urpm.pm:1362
-msgid "unable to find all synthesis file, using parsehdlist server"
+#: po/placeholder.h:77 urpm.pm:1011
+msgid "unable to register rpm file"
msgstr ""
-#: po/placeholder.h:81 urpm.pm:241
+#: po/placeholder.h:78 urpm.pm:256
#, c-format
msgid "unable to inspect list file for \"%s\", medium ignored"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:83
+#: po/placeholder.h:81
#, c-format
msgid "copy of [%s] failed"
msgstr ""
-#: 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 ""
+
+#: 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 ""
-#: po/placeholder.h:85 urpm.pm:824
+#: po/placeholder.h:84 urpm.pm:1192
#, c-format
-msgid "unable to read depslist file [%s]"
+msgid "read synthesis file [%s]"
msgstr ""
-#: po/placeholder.h:86
-msgid "removable medium not selected"
+#: po/placeholder.h:85 urpm.pm:830
+#, c-format
+msgid "unable to read depslist file [%s]"
msgstr ""
-#: po/placeholder.h:87 urpm.pm:851
+#: po/placeholder.h:86 urpm.pm:857
#, c-format
msgid "read compss file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:89
+#: po/placeholder.h:88
#, c-format
msgid "building hdlist [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:91 urpm.pm:1009
+#: po/placeholder.h:90 urpm.pm:1015
msgid "error registering local packages"
msgstr ""
-#: po/placeholder.h:92 urpm.pm:1762
+#: po/placeholder.h:91 urpm.pm:273
#, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "taking removable device as \"%s\""
msgstr ""
-#: po/placeholder.h:93
+#: po/placeholder.h:92 urpm.pm:1619
#, c-format
-msgid "unable to build hdlist: %s"
+msgid "incoherent medium \"%s\" marked removable but not really"
msgstr ""
-#: po/placeholder.h:94 urpm.pm:1000
+#: po/placeholder.h:93
#, c-format
-msgid "invalid rpm file name [%s]"
+msgid "unable to build hdlist: %s"
msgstr ""
-#: po/placeholder.h:95 urpm.pm:1736 urpm.pm:1739 urpm.pm:1758
+#: po/placeholder.h:94 urpm.pm:1593 urpm.pm:1596 urpm.pm:1615
#, c-format
msgid "medium \"%s\" is not selected"
msgstr ""
-#: po/placeholder.h:96 urpm.pm:207
+#: po/placeholder.h:95 urpm.pm:1006
#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "invalid rpm file name [%s]"
msgstr ""
-#: po/placeholder.h:97 urpm.pm:863
+#: po/placeholder.h:96 urpm.pm:1175
#, c-format
-msgid "write depslist file [%s]"
+msgid "unknown data associated with %s"
msgstr ""
-#: po/placeholder.h:98 urpm.pm:1322
+#: po/placeholder.h:97 urpm.pm:222
#, c-format
-msgid "unknown data associated with %s"
+msgid "trying to bypass existing medium \"%s\", avoiding"
msgstr ""
-#: po/placeholder.h:99
+#: po/placeholder.h:98 urpm.pm:869
#, c-format
-msgid "source of [%s] not found as [%s]"
+msgid "write depslist file [%s]"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: po/placeholder.h:102
+#: po/placeholder.h:101 urpm.pm:1007
#, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
+msgid "unable to access rpm file [%s]"
msgstr ""
-#: po/placeholder.h:103 urpm.pm:1001
+#: po/placeholder.h:102 urpm.pm:866
#, c-format
-msgid "unable to access rpm file [%s]"
+msgid "unable to write depslist file [%s]"
msgstr ""
-#: po/placeholder.h:104 urpm.pm:860
+#: po/placeholder.h:103
#, c-format
-msgid "unable to write depslist file [%s]"
+msgid ""
+"removing %s to upgrade to %s ...\n"
+" since it will not upgrade correctly!"
msgstr ""
-#: po/placeholder.h:105 urpm.pm:327 urpm.pm:1773
+#: po/placeholder.h:107 urpm.pm:342 urpm.pm:1630
#, c-format
msgid "unable to access medium \"%s\""
msgstr ""
-#: po/placeholder.h:106 urpm.pm:988
+#: po/placeholder.h:108 urpm.pm:994
#, c-format
msgid "relocated %s entries in depslist"
msgstr ""
-#: 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\""
+msgid "trying to select inexistent medium \"%s\""
msgstr ""
-#: po/placeholder.h:108
+#: 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 "no rpm files found from [%s]"
+msgid "unable to parse correctly [%s] on value \"%s\""
msgstr ""
-#: po/placeholder.h:109 urpm.pm:1104
+#: po/placeholder.h:112 urpm.pm:1110
#, fuzzy, c-format
msgid "The following packages contain %s: %s"
msgstr "Nast�puj�ce pakiety zawieraj� %s: %s\n"
-#: 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\""
+msgid "no rpm files found from [%s]"
msgstr ""
-#: po/placeholder.h:111 urpm.pm:1920
+#: po/placeholder.h:114 urpm.pm:1772
#, c-format
msgid "selecting %s using obsoletes"
msgstr ""
-#: po/placeholder.h:112 urpm.pm:2031
+#: po/placeholder.h:115 urpm.pm:1888
#, c-format
msgid "selecting %s by selection on files"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:114 urpmi:308 urpmi:315 urpmi:328 urpmi:339 urpmi:352
-msgid "Installation failed"
-msgstr "Instalacja nie powiod�a si�"
-
-#: po/placeholder.h:115 urpmi:279
-msgid "Press enter when it's done..."
-msgstr "Naci�nij enter, gdy to zrobisz..."
+#: po/placeholder.h:120
+msgid " --help - print this help message.\n"
+msgstr ""
-#: po/placeholder.h:117 urpmi:201
-msgid "Sorry, bad choice, try again\n"
-msgstr "Niestety, z�y wyb�r, spr�buj ponownie\n"
+#: po/placeholder.h:121 urpmi:361
+msgid "everything already installed"
+msgstr "wszystko jest ju� zainstalowane"
-#: po/placeholder.h:120
+#: po/placeholder.h:122 urpmi:98
#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr ""
+
+#: po/placeholder.h:123 urpmi:194
+msgid "One of the following packages is needed:"
+msgstr "Potrzebny jest jeden z nast�puj�cych pakiet�w:"
+
+#: po/placeholder.h:124 po/placeholder.h:222
+msgid " --update - use only update media.\n"
+msgstr ""
+
+#: po/placeholder.h:125 urpmi:299
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"
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
msgstr ""
-#: po/placeholder.h:142 urpmi:362
-msgid "everything already installed"
-msgstr "wszystko jest ju� zainstalowane"
+#: 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 "Instalacja nie powiod�a si�"
+
+#: po/placeholder.h:132 po/placeholder.h:234
+msgid ""
+" --auto-select - automatically select packages for upgrading the system.\n"
+msgstr ""
+
+#: po/placeholder.h:134
+msgid " --X - use X interface.\n"
+msgstr ""
-#: po/placeholder.h:143 urpmi:247
+#: po/placeholder.h:135 urpmi:247
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -593,49 +616,113 @@ msgstr ""
"Zostan� zainstalowane nast�puj�ce pakiety w celu spe�nienia zale�no�ci (%d "
"MB)"
-#: po/placeholder.h:144 urpmi:296
-#, c-format
-msgid "installing %s\n"
-msgstr "instalowanie %s\n"
+#: po/placeholder.h:136 urpmi:320 urpmi:344
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Pr�bowa� instalowa� bez sprawdzania zale�no�ci? (t/N) "
+
+#: 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
+msgid " -q - quiet mode.\n"
+msgstr ""
-#: po/placeholder.h:145 urpmi:198
+#: po/placeholder.h:144 urpmi:202
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Jaki jest Tw�j wyb�r? (1-%d) "
-#: po/placeholder.h:146 urpmi:321 urpmi:345
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Pr�bowa� instalowa� bez sprawdzania zale�no�ci? (t/N) "
+#: po/placeholder.h:145
+msgid " --wget - use wget to retrieve distant files.\n"
+msgstr ""
-#: po/placeholder.h:147 urpmi:190
-msgid "One of the following packages is needed:"
-msgstr "Potrzebny jest jeden z nast�puj�cych pakiet�w:"
+#: po/placeholder.h:146
+#, 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"
+msgstr ""
-#: po/placeholder.h:148 urpmi:149
+#: po/placeholder.h:152 urpmi:328 urpmi:352
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Pr�bowa� wymusi� instalacj� (--force)? (t/N) "
+
+#: po/placeholder.h:154
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+
+#: po/placeholder.h:155 urpmi:205
+msgid "Sorry, bad choice, try again\n"
+msgstr "Niestety, z�y wyb�r, spr�buj ponownie\n"
+
+#: po/placeholder.h:156
+msgid ""
+" names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: po/placeholder.h:158
+msgid " -a - select all matches on command line.\n"
+msgstr ""
+
+#: 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 "instalowanie %s\n"
+
+#: po/placeholder.h:161 urpmi:152
msgid "Only superuser is allowed to install local packages"
msgstr "Tylko root ma prawo instalowa� pakiety lokalne"
-#: po/placeholder.h:149 urpmi:278
+#: po/placeholder.h:162 urpmi:276
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Prosz� w�o�y� %s o nazwie %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 ""
-#: po/placeholder.h:151 urpmi:329 urpmi:353
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Pr�bowa� wymusi� instalacj� (--force)? (t/N) "
+#: po/placeholder.h:165 urpmi:102
+#, fuzzy
+msgid "Only superuser is allowed to install packages"
+msgstr "Tylko root ma prawo instalowa� pakiety lokalne"
+
+#: po/placeholder.h:166 urpmi:193
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Potrzebny jest jeden z nast�puj�cych pakiet�w:"
-#: po/placeholder.h:155 urpmi.addmedia:46
+#: po/placeholder.h:167 urpmi:277
+msgid "Press Enter when it's done..."
+msgstr "Naci�nij enter, gdy to zrobisz..."
+
+#: po/placeholder.h:168 urpmi.addmedia:46
#, c-format
msgid ""
"%s\n"
"`with' missing for ftp media\n"
msgstr ""
-#: po/placeholder.h:159
+#: po/placeholder.h:172
msgid ""
"usage: urpmi.addmedia [--update] <name> <url>\n"
"where <url> is one of\n"
@@ -647,31 +734,31 @@ msgid ""
" removable_<device>://<path>\n"
msgstr ""
-#: po/placeholder.h:168 urpmi.addmedia:57
+#: po/placeholder.h:181 urpmi.addmedia:57
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr ""
-#: po/placeholder.h:169 urpmi.addmedia:58
+#: po/placeholder.h:182 urpmi.addmedia:58
#, c-format
msgid "unable to update medium \"%s\"\n"
msgstr ""
-#: po/placeholder.h:170 urpmi.addmedia:42
+#: po/placeholder.h:183 urpmi.addmedia:42
#, c-format
msgid ""
"%s\n"
"device `%s' do not exist\n"
msgstr ""
-#: po/placeholder.h:174 urpmi.addmedia:44
+#: po/placeholder.h:187 urpmi.addmedia:44
#, c-format
msgid ""
"%s\n"
"<relative path of hdlist> missing\n"
msgstr ""
-#: po/placeholder.h:178
+#: po/placeholder.h:191
#, c-format
msgid ""
"usage: urpmi.update [-a] <name> ...\n"
@@ -683,29 +770,29 @@ msgid ""
"unknown options '%s'\n"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:188 urpmi.update:53
+#: po/placeholder.h:201 urpmi.update:53
#, c-format
msgid ""
"the entry to update is missing\n"
"(one of %s)\n"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:193 urpmi.removemedia:46
+#: po/placeholder.h:206 urpmi.removemedia:46
#, c-format
msgid ""
"the entry to remove is missing\n"
"(one of %s)\n"
msgstr ""
-#: po/placeholder.h:197
+#: po/placeholder.h:210
#, c-format
msgid ""
"usage: urpmi.removemedia [-a] <name> ...\n"
@@ -715,23 +802,38 @@ msgid ""
"unknown options '%s'\n"
msgstr ""
-#: po/placeholder.h:204 urpmq:85
+#: po/placeholder.h:217
+msgid " -h - print this help message.\n"
+msgstr ""
+
+#: po/placeholder.h:218 urpmq:130
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+
+#: po/placeholder.h:219
+msgid " -g - print groups too with name.\n"
+msgstr ""
+
+#: po/placeholder.h:220 urpmq:84
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr ""
-#: po/placeholder.h:206 urpmq:82
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#: po/placeholder.h:221
+msgid " names or rpm files given on command line are queried.\n"
msgstr ""
-#: po/placeholder.h:207 urpmq:131
-msgid ""
-"some package have to be removed for being upgraded, this is not supported "
-"yet\n"
+#: po/placeholder.h:223
+msgid " -r - print version and release too with name.\n"
msgstr ""
-#: po/placeholder.h:208
+#: po/placeholder.h:224
+msgid " -f - print version, release and arch with name.\n"
+msgstr ""
+
+#: po/placeholder.h:225
#, c-format
msgid ""
"urpmq version %s\n"
@@ -739,77 +841,68 @@ msgid ""
"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 package do not exist.\n"
-" names or rpm files given on command line are queried.\n"
msgstr ""
-#: urpm.pm:257
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:231
+msgid " -d - extend query to package dependencies.\n"
msgstr ""
-#: urpm.pm:258
-#, c-format
-msgid "taking removable device as \"%s\""
+#: po/placeholder.h:232
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
msgstr ""
-#: urpm.pm:262
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
+#: po/placeholder.h:233
+msgid ""
+" -c - choose complete method for resolving requires closure.\n"
msgstr ""
-#: urpm.pm:266 urpm.pm:269
+#: po/placeholder.h:235 urpmq:81
#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
msgstr ""
-#: urpm.pm:1339
-#, c-format
-msgid "read synthesis file [%s]"
+#: po/placeholder.h:236
+msgid ""
+" --headers - extract headers for package listed from urpmi db to\n"
+" stdout (root only).\n"
msgstr ""
-#: urpmi:49
-#, c-format
-msgid "urpmi version %s"
+#: po/placeholder.h:243
+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 ""
-#: urpmi:98
+#: urpm.pm:1796 urpm.pm:1805
#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgid "removing %s to upgrade to %s ..."
msgstr ""
-#: urpmi:102
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr "Tylko root ma prawo instalowa� pakiety lokalne"
+#: urpm.pm:1797 urpm.pm:1806
+msgid ", $otherPackage, "
+msgstr ", $otherPackage, "
-#: urpmi:189
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Potrzebny jest jeden z nast�puj�cych pakiet�w:"
+#: urpm.pm:1797 urpm.pm:1806
+msgid "));"
+msgstr "));"
-#: urpmi:301
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+#: urpm.pm:1802
+msgid "$p->{name}-$p->{version}-$p->{release}"
+msgstr "$p->{name}-$p->{version}-$p->{release}"
+
+#: urpm.pm:1812
+msgid "$prefix/$_"
+msgstr "$prefix/$_"
+
+#: urpmi:48
+#, c-format
+msgid "urpmi version %s"
msgstr ""
#: urpmi.addmedia:30
@@ -842,9 +935,6 @@ msgstr ", $_);"
msgid "urpmq version %s"
msgstr ""
-#~ msgid "));"
-#~ msgstr "));"
-
#~ msgid "), $_);"
#~ msgstr "), $_);"
diff --git a/po/placeholder.h b/po/placeholder.h
index 2260c4cd..a3cc4703 100644
--- a/po/placeholder.h
+++ b/po/placeholder.h
@@ -26,132 +26,145 @@ N_(" --prereqs - print tag prereqs: all prereqs (multiple lines)."),
N_("usage: urpmf [options] <file>"),
N_("try urpmf --help for more options"),
N_("urpmi is not installed"),
+N_("reading synthesis file [%s]"),
N_("unable to write config file [%s]"),
-N_("unable to use name \"%s\" for unamed medium because it is already used"),
+N_("using different removable device [%s] for \"%s\""),
N_("nothing to write in list file for \"%s\""),
N_("unable to find list file for \"%s\", medium ignored"),
N_("unable to parse hdlist file of \"%s\""),
N_("nothing written in list file for \"%s\""),
-N_(""
-"removing %s to upgrade ...\n"
-" to %s since it will not upgrade correctly!"
-""),
N_("read provides file [%s]"),
-N_("trying to remove inexistant medium \"%s\""),
N_("package %s is not found."),
-N_("unable to copy source of [%s] from [%s]"),
N_("unable to write compss file [%s]"),
N_("unmounting %s"),
N_("removing %d obsolete headers in cache"),
N_("no hdlist file found for medium \"%s\""),
+N_("medium \"%s\" tries to use an already used hdlist, medium ignored"),
+N_("unable to use name \"%s\" for unnamed medium because it is already used"),
N_("unable to take medium \"%s\" into account as no list file [%s] exists"),
N_("keeping only files referenced in provides"),
N_("unable to build synthesis file for medium \"%s\""),
N_("found %d headers in cache"),
N_("unable to read provides file [%s]"),
N_("avoid selecting %s as its locales language is not already selected"),
+N_(""
+"removing %s to upgrade to %s ...\n"
+" since it will not be updated otherwise"
+""),
N_("medium \"%s\" already exists"),
-N_("write config file [%s]"),
N_("unable to write list file of \"%s\""),
-N_("retrieving [%s]"),
-N_("wget of [%s] failed"),
+N_("write config file [%s]"),
N_("no package named %s"),
N_("unable to read compss file [%s]"),
N_("unable to find hdlist file for \"%s\", medium ignored"),
N_("built hdlist synthesis file for medium \"%s\""),
N_("computing dependencies"),
+N_("retrieve of [%s] failed"),
N_("write provides file [%s]"),
N_("mounting %s"),
N_("unable to take care of medium \"%s\" as list file is already used by another medium"),
-N_("medium \"%s\" try to use an already used list, medium ignored"),
N_("reading hdlist file [%s]"),
N_("write compss file [%s]"),
N_("read depslist file [%s]"),
-N_("trying to select inexistant medium \"%s\""),
+N_("curl failed\n"),
+N_("unable to retrieve pathname for removable medium \"%s\""),
N_("malformed input: [%s]"),
-N_("medium \"%s\" try to use an already used hdlist, medium ignored"),
-N_(""
-"removing %s to upgrade ...\n"
-" to %s since it will not be updated otherwise"
-""),
+N_("there are multiple packages with the same rpm filename \"%s\""),
+N_("medium \"%s\" tries to use an already used list, medium ignored"),
N_("unable to write provides file [%s]"),
N_("unable to access hdlist file of \"%s\", medium ignored"),
-N_("unable to register rpm file"),
N_("unable to find all synthesis file, using parsehdlist server"),
+N_("unable to register rpm file"),
N_("unable to inspect list file for \"%s\", medium ignored"),
+N_("too many mount points for removable medium \"%s\""),
N_("incoherent list file for \"%s\", medium ignored"),
N_("copy of [%s] failed"),
+N_("trying to remove inexistent medium \"%s\""),
N_("unable to parse correctly [%s]"),
+N_("read synthesis file [%s]"),
N_("unable to read depslist file [%s]"),
-N_("removable medium not selected"),
N_("read compss file [%s]"),
N_("syntax error in config file at line %s"),
N_("building hdlist [%s]"),
N_("unable to read rpm file [%s] from medium \"%s\""),
N_("error registering local packages"),
+N_("taking removable device as \"%s\""),
N_("incoherent medium \"%s\" marked removable but not really"),
N_("unable to build hdlist: %s"),
-N_("invalid rpm file name [%s]"),
N_("medium \"%s\" is not selected"),
+N_("invalid rpm file name [%s]"),
+N_("unknown data associated with %s"),
N_("trying to bypass existing medium \"%s\", avoiding"),
N_("write depslist file [%s]"),
-N_("unknown data associated with %s"),
-N_("source of [%s] not found as [%s]"),
N_("unable to access list file of \"%s\", medium ignored"),
N_("avoid selecting %s as not enough files will be updated"),
-N_("wget of [%s] failed (maybe wget is missing?)"),
N_("unable to access rpm file [%s]"),
N_("unable to write depslist file [%s]"),
+N_(""
+"removing %s to upgrade to %s ...\n"
+" since it will not upgrade correctly!"
+""),
N_("unable to access medium \"%s\""),
N_("relocated %s entries in depslist"),
+N_("trying to select inexistent medium \"%s\""),
+N_("wget failed\n"),
N_("unable to parse correctly [%s] on value \"%s\""),
-N_("no rpm files found from [%s]"),
N_("The following packages contain %s: %s"),
-N_("there are multiples packages with the same rpm filename \"%s\""),
+N_("no rpm files found from [%s]"),
N_("selecting %s using obsoletes"),
N_("selecting %s by selection on files"),
+N_("curl is missing\n"),
+N_("wget is missing\n"),
N_("unable to determine medium of this hdlist file [%s]"),
-N_("Installation failed"),
-N_("Press enter when it's done..."),
N_("Cancel"),
-N_("Sorry, bad choice, try again\n"),
-N_(" (Y/n) "),
+N_(" --help - print this help message.\n"),
+N_("everything already installed"),
+N_("urpmi: unknown option \"-%s\", check usage with --help\n"),
+N_("One of the following packages is needed:"),
+N_(" --update - use only update media.\n"),
+N_(""
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
+""),
+N_(" --auto - automatically select a good package in choices.\n"),
+N_("Nn"),
+N_("Installation failed"),
+N_(" --auto-select - automatically select packages for upgrading the system.\n"),
N_("Yy"),
+N_(" --X - use X interface.\n"),
+N_("To satisfy dependencies, the following packages are going to be installed (%d MB)"),
+N_("Try installation without checking dependencies? (y/N) "),
+N_(""
+" --best-output - choose best interface according to the environment:\n"
+" X or text mode.\n"
+""),
+N_(" -p - allow search in provides to find package.\n"),
+N_(" -v - verbose mode.\n"),
+N_(" -q - quiet mode.\n"),
+N_("What is your choice? (1-%d) "),
+N_(" --wget - use wget to retrieve distant files.\n"),
N_(""
"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"
""),
-N_("everything already installed"),
-N_("To satisfy dependencies, the following packages are going to be installed (%d MB)"),
+N_("Try installation even more strongly (--force)? (y/N) "),
+N_("Ok"),
+N_(" --force - force invocation even if some packages do not exist.\n"),
+N_("Sorry, bad choice, try again\n"),
+N_(" names or rpm files (only for root) given on command line are installed.\n"),
+N_(" (Y/n) "),
+N_(" -a - select all matches on command line.\n"),
+N_(" --curl - use curl to retrieve distant files.\n"),
N_("installing %s\n"),
-N_("What is your choice? (1-%d) "),
-N_("Try installation without checking dependencies? (y/N) "),
-N_("One of the following packages is needed:"),
N_("Only superuser is allowed to install local packages"),
N_("Please insert the medium named \"%s\" on device [%s]"),
+N_("Is it OK?"),
N_("unable to get source packages, aborting"),
-N_("Try installation even more strongly (--force)? (y/N) "),
-N_("Is it ok?"),
-N_("Ok"),
-N_("Nn"),
+N_("Only superuser is allowed to install packages"),
+N_("One of the following packages is needed to install %s:"),
+N_("Press Enter when it's done..."),
N_(""
"%s\n"
"`with' missing for ftp media\n"
@@ -201,34 +214,35 @@ N_(""
"\n"
"unknown options '%s'\n"
""),
-N_("urpmq: cannot read rpm file \"%s\"\n"),
-N_("unable to get source packages, aborting"),
-N_("urpmq: unknown option \"-%s\", check usage with --help\n"),
+N_(" -h - print this help message.\n"),
N_("some package have to be removed for being upgraded, this is not supported yet\n"),
+N_(" -g - print groups too with name.\n"),
+N_("urpmq: cannot read rpm file \"%s\"\n"),
+N_(" names or rpm files given on command line are queried.\n"),
+N_(" --update - use only update media.\n"),
+N_(" -r - print version and release too with name.\n"),
+N_(" -f - print version, release and arch with name.\n"),
N_(""
"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"
+""),
+N_(" -d - extend query to package dependencies.\n"),
+N_(" --sources - give all source packages before downloading (root only).\n"),
+N_(" -c - choose complete method for resolving requires closure.\n"),
+N_(" --auto-select - automatically select packages for upgrading the system.\n"),
+N_("urpmq: unknown option \"-%s\", check usage with --help\n"),
+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 package do not exist.\n"
-" names or rpm files given on command line are queried.\n"
+""),
+N_(" -p - allow search in provides to find package.\n"),
+N_(" -v - verbose mode.\n"),
+N_("unable to get source packages, aborting"),
+N_(" -u - remove package if a better version is already installed.\n"),
+N_(""
+" --force - force invocation even if some packages do not\n"
+"exist.\n"
""),
};
diff --git a/po/pt.po b/po/pt.po
index 486378ea..7afb9e02 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,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-09 12:25GMT\n"
"Last-Translator: Jorge Costa <Jorgercosta@netc.pt>\n"
"Language-Team: Portuguese <pt@li.org>\n"
@@ -28,27 +28,27 @@ msgstr ""
"Instala��o autom�tica de pacotes...\n"
"Pediu a instala��o do pacote $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 "Est� bem assim?"
-#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:281
+#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:279
msgid "Ok"
msgstr "Aceitar"
-#: _irpm:34 po/placeholder.h:116 urpmi:252 urpmi:282
+#: _irpm:34 po/placeholder.h:119 urpmi:252 urpmi:280
msgid "Cancel"
msgstr "Cancelar"
-#: _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 "Nn"
-#: _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 "SsYy"
-#: _irpm:42 po/placeholder.h:118 urpmi:258
+#: _irpm:42 po/placeholder.h:157 urpmi:258
msgid " (Y/n) "
msgstr " (S/n) "
@@ -152,120 +152,120 @@ msgstr ""
msgid "urpmi is not installed"
msgstr "urpmi n�o est� instalado"
-#: po/placeholder.h:29 urpm.pm:283
+#: po/placeholder.h:29
+#, c-format
+msgid "reading synthesis file [%s]"
+msgstr ""
+
+#: po/placeholder.h:30 urpm.pm:298
#, c-format
msgid "unable to write config file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:31
+#: po/placeholder.h:32
#, c-format
msgid "nothing to write in list file for \"%s\""
msgstr ""
-#: 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 ""
-#: po/placeholder.h:33
+#: po/placeholder.h:34
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr ""
-#: po/placeholder.h:34
+#: po/placeholder.h:35
#, c-format
msgid "nothing written in list file for \"%s\""
msgstr ""
-#: po/placeholder.h:35 urpm.pm:1951
-#, c-format
-msgid ""
-"removing %s to upgrade ...\n"
-" to %s since it will not upgrade correctly!"
-msgstr ""
-
-#: po/placeholder.h:39 urpm.pm:839
+#: po/placeholder.h:36 urpm.pm:845
#, c-format
msgid "read provides file [%s]"
msgstr ""
-#: po/placeholder.h:40
+#: po/placeholder.h:37 urpm.pm:1549
#, c-format
-msgid "trying to remove inexistant medium \"%s\""
+msgid "package %s is not found."
msgstr ""
-#: po/placeholder.h:41 urpm.pm:1692
+#: po/placeholder.h:38 urpm.pm:876
#, c-format
-msgid "package %s is not found."
+msgid "unable to write compss file [%s]"
msgstr ""
-#: po/placeholder.h:42
+#: po/placeholder.h:39 urpm.pm:819
#, c-format
-msgid "unable to copy source of [%s] from [%s]"
+msgid "unmounting %s"
msgstr ""
-#: po/placeholder.h:43 urpm.pm:870
+#: po/placeholder.h:40
#, c-format
-msgid "unable to write compss file [%s]"
+msgid "removing %d obsolete headers in cache"
msgstr ""
-#: po/placeholder.h:44 urpm.pm:813
+#: po/placeholder.h:41 urpm.pm:925 urpm.pm:1491
#, c-format
-msgid "unmounting %s"
+msgid "no hdlist file found for medium \"%s\""
msgstr ""
-#: po/placeholder.h:45
+#: po/placeholder.h:42 urpm.pm:160
#, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
msgstr ""
-#: po/placeholder.h:46 urpm.pm:919 urpm.pm:1634
+#: po/placeholder.h:43 urpm.pm:184
#, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
msgstr ""
-#: po/placeholder.h:47 urpm.pm:176
+#: po/placeholder.h:44 urpm.pm:191
#, c-format
msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
msgstr ""
-#: po/placeholder.h:48
+#: po/placeholder.h:45
msgid "keeping only files referenced in provides"
msgstr ""
-#: po/placeholder.h:49
+#: po/placeholder.h:46
#, c-format
msgid "unable to build synthesis file for medium \"%s\""
msgstr ""
-#: po/placeholder.h:50
+#: po/placeholder.h:47
#, c-format
msgid "found %d headers in cache"
msgstr ""
-#: po/placeholder.h:51 urpm.pm:836
+#: po/placeholder.h:48 urpm.pm:842
#, c-format
msgid "unable to read provides file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:53 urpm.pm:311
+#: po/placeholder.h:50
#, c-format
-msgid "medium \"%s\" already exists"
+msgid ""
+"removing %s to upgrade to %s ...\n"
+" since it will not be updated otherwise"
msgstr ""
-#: po/placeholder.h:54 urpm.pm:295
+#: po/placeholder.h:54 urpm.pm:326
#, c-format
-msgid "write config file [%s]"
+msgid "medium \"%s\" already exists"
msgstr ""
#: po/placeholder.h:55
@@ -273,346 +273,347 @@ msgstr ""
msgid "unable to write list file of \"%s\""
msgstr ""
-#: po/placeholder.h:56 urpm.pm:1817
+#: po/placeholder.h:56 urpm.pm:310
#, c-format
-msgid "retrieving [%s]"
-msgstr ""
-
-#: po/placeholder.h:57 urpm.pm:1819
-#, c-format
-msgid "wget of [%s] failed"
+msgid "write config file [%s]"
msgstr ""
-#: po/placeholder.h:58 urpm.pm:1101
+#: po/placeholder.h:57 urpm.pm:1107
#, c-format
msgid "no package named %s"
msgstr ""
-#: po/placeholder.h:59 urpm.pm:848
+#: po/placeholder.h:58 urpm.pm:854
#, c-format
msgid "unable to read compss file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:61
+#: po/placeholder.h:60
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr ""
-#: po/placeholder.h:62
+#: po/placeholder.h:61
msgid "computing dependencies"
msgstr ""
-#: po/placeholder.h:63 urpm.pm:868
+#: po/placeholder.h:62
+#, c-format
+msgid "retrieve of [%s] failed"
+msgstr ""
+
+#: po/placeholder.h:63 urpm.pm:874
#, c-format
msgid "write provides file [%s]"
msgstr ""
-#: po/placeholder.h:64 urpm.pm:803
+#: po/placeholder.h:64 urpm.pm:809
#, fuzzy, c-format
msgid "mounting %s"
msgstr "a instalar %s\n"
-#: 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 "
"medium"
msgstr ""
-#: po/placeholder.h:66 urpm.pm:148
-#, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
-msgstr ""
-
-#: po/placeholder.h:67
+#: po/placeholder.h:66
#, c-format
msgid "reading hdlist file [%s]"
msgstr ""
-#: po/placeholder.h:68 urpm.pm:873
+#: po/placeholder.h:67 urpm.pm:879
#, c-format
msgid "write compss file [%s]"
msgstr ""
-#: po/placeholder.h:69 urpm.pm:827
+#: po/placeholder.h:68 urpm.pm:833
#, c-format
msgid "read depslist file [%s]"
msgstr ""
-#: po/placeholder.h:70
+#: po/placeholder.h:69 urpm.pm:103
+msgid "curl failed\n"
+msgstr ""
+
+#: po/placeholder.h:70 urpm.pm:281 urpm.pm:284
#, c-format
-msgid "trying to select inexistant medium \"%s\""
+msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr ""
-#: po/placeholder.h:71 urpm.pm:1812
+#: po/placeholder.h:71 urpm.pm:1668
#, c-format
msgid "malformed input: [%s]"
msgstr ""
-#: 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"
+msgid "there are multiple packages with the same rpm filename \"%s\""
msgstr ""
-#: 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 ""
-#: po/placeholder.h:77 urpm.pm:865
+#: po/placeholder.h:74 urpm.pm:871
#, c-format
msgid "unable to write provides file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:79 urpm.pm:1005
-msgid "unable to register rpm file"
+#: po/placeholder.h:76 urpm.pm:1215
+msgid "unable to find all synthesis file, using parsehdlist server"
msgstr ""
-#: po/placeholder.h:80 urpm.pm:1362
-msgid "unable to find all synthesis file, using parsehdlist server"
+#: po/placeholder.h:77 urpm.pm:1011
+msgid "unable to register rpm file"
msgstr ""
-#: po/placeholder.h:81 urpm.pm:241
+#: po/placeholder.h:78 urpm.pm:256
#, c-format
msgid "unable to inspect list file for \"%s\", medium ignored"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:83
+#: po/placeholder.h:81
#, c-format
msgid "copy of [%s] failed"
msgstr ""
-#: 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 ""
+
+#: 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 ""
-#: po/placeholder.h:85 urpm.pm:824
+#: po/placeholder.h:84 urpm.pm:1192
#, c-format
-msgid "unable to read depslist file [%s]"
+msgid "read synthesis file [%s]"
msgstr ""
-#: po/placeholder.h:86
-msgid "removable medium not selected"
+#: po/placeholder.h:85 urpm.pm:830
+#, c-format
+msgid "unable to read depslist file [%s]"
msgstr ""
-#: po/placeholder.h:87 urpm.pm:851
+#: po/placeholder.h:86 urpm.pm:857
#, c-format
msgid "read compss file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:89
+#: po/placeholder.h:88
#, c-format
msgid "building hdlist [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:91 urpm.pm:1009
+#: po/placeholder.h:90 urpm.pm:1015
msgid "error registering local packages"
msgstr ""
-#: po/placeholder.h:92 urpm.pm:1762
+#: po/placeholder.h:91 urpm.pm:273
#, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "taking removable device as \"%s\""
msgstr ""
-#: po/placeholder.h:93
+#: po/placeholder.h:92 urpm.pm:1619
#, c-format
-msgid "unable to build hdlist: %s"
+msgid "incoherent medium \"%s\" marked removable but not really"
msgstr ""
-#: po/placeholder.h:94 urpm.pm:1000
+#: po/placeholder.h:93
#, c-format
-msgid "invalid rpm file name [%s]"
+msgid "unable to build hdlist: %s"
msgstr ""
-#: po/placeholder.h:95 urpm.pm:1736 urpm.pm:1739 urpm.pm:1758
+#: po/placeholder.h:94 urpm.pm:1593 urpm.pm:1596 urpm.pm:1615
#, c-format
msgid "medium \"%s\" is not selected"
msgstr ""
-#: po/placeholder.h:96 urpm.pm:207
+#: po/placeholder.h:95 urpm.pm:1006
#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "invalid rpm file name [%s]"
msgstr ""
-#: po/placeholder.h:97 urpm.pm:863
+#: po/placeholder.h:96 urpm.pm:1175
#, c-format
-msgid "write depslist file [%s]"
+msgid "unknown data associated with %s"
msgstr ""
-#: po/placeholder.h:98 urpm.pm:1322
+#: po/placeholder.h:97 urpm.pm:222
#, c-format
-msgid "unknown data associated with %s"
+msgid "trying to bypass existing medium \"%s\", avoiding"
msgstr ""
-#: po/placeholder.h:99
+#: po/placeholder.h:98 urpm.pm:869
#, c-format
-msgid "source of [%s] not found as [%s]"
+msgid "write depslist file [%s]"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: po/placeholder.h:102
+#: po/placeholder.h:101 urpm.pm:1007
#, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
+msgid "unable to access rpm file [%s]"
msgstr ""
-#: po/placeholder.h:103 urpm.pm:1001
+#: po/placeholder.h:102 urpm.pm:866
#, c-format
-msgid "unable to access rpm file [%s]"
+msgid "unable to write depslist file [%s]"
msgstr ""
-#: po/placeholder.h:104 urpm.pm:860
+#: po/placeholder.h:103
#, c-format
-msgid "unable to write depslist file [%s]"
+msgid ""
+"removing %s to upgrade to %s ...\n"
+" since it will not upgrade correctly!"
msgstr ""
-#: po/placeholder.h:105 urpm.pm:327 urpm.pm:1773
+#: po/placeholder.h:107 urpm.pm:342 urpm.pm:1630
#, c-format
msgid "unable to access medium \"%s\""
msgstr ""
-#: po/placeholder.h:106 urpm.pm:988
+#: po/placeholder.h:108 urpm.pm:994
#, c-format
msgid "relocated %s entries in depslist"
msgstr ""
-#: 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\""
+msgid "trying to select inexistent medium \"%s\""
msgstr ""
-#: po/placeholder.h:108
+#: 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 "no rpm files found from [%s]"
+msgid "unable to parse correctly [%s] on value \"%s\""
msgstr ""
-#: po/placeholder.h:109 urpm.pm:1104
+#: po/placeholder.h:112 urpm.pm:1110
#, fuzzy, c-format
msgid "The following packages contain %s: %s"
msgstr "Um dos seguintes pacotes � necess�rio:"
-#: 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\""
+msgid "no rpm files found from [%s]"
msgstr ""
-#: po/placeholder.h:111 urpm.pm:1920
+#: po/placeholder.h:114 urpm.pm:1772
#, c-format
msgid "selecting %s using obsoletes"
msgstr ""
-#: po/placeholder.h:112 urpm.pm:2031
+#: po/placeholder.h:115 urpm.pm:1888
#, c-format
msgid "selecting %s by selection on files"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:114 urpmi:308 urpmi:315 urpmi:328 urpmi:339 urpmi:352
-msgid "Installation failed"
-msgstr "A instala��o falhou"
-
-#: po/placeholder.h:115 urpmi:279
-msgid "Press enter when it's done..."
-msgstr "Prima 'Enter' quando conclu�do..."
+#: po/placeholder.h:120
+msgid " --help - print this help message.\n"
+msgstr ""
-#: po/placeholder.h:117 urpmi:201
-msgid "Sorry, bad choice, try again\n"
-msgstr "Desculpe, op��o incorrecta, tente de novo\n"
+#: po/placeholder.h:121 urpmi:361
+msgid "everything already installed"
+msgstr "j� est� tudo instalado"
-#: po/placeholder.h:120
+#: po/placeholder.h:122 urpmi:98
#, fuzzy, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: op��o desconhecida \"-$1\", ver uso com --help\n"
+
+#: po/placeholder.h:123 urpmi:194
+msgid "One of the following packages is needed:"
+msgstr "Um dos seguintes pacotes � necess�rio:"
+
+#: po/placeholder.h:124 po/placeholder.h:222
+msgid " --update - use only update media.\n"
+msgstr ""
+
+#: po/placeholder.h:125 urpmi:299
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"
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
msgstr ""
-"urpmi vers�o %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"Este software � livre e pode ser distr�ibu�do segundo os termos da licen�a "
-"GNU.\n"
-"GPL.\n"
-"uso:\n"
-" --help - exibe esta mensagem.\n"
-" --auto - automaticamente seleccionar um bom pacote nas "
-"escolhas.\n"
-" --auto-select - aumaticamente seleccionar pacotes para actualiza��o do "
-"sistema.\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"
-" -q - quiet mode.\n"
-" -v - verbose mode.\n"
-" names or rpm files (only for root) given on command line are installed.\n"
-#: po/placeholder.h:142 urpmi:362
-msgid "everything already installed"
-msgstr "j� est� tudo instalado"
+#: po/placeholder.h:129
+msgid " --auto - automatically select a good package in choices.\n"
+msgstr ""
-#: po/placeholder.h:143 urpmi:247
+#: po/placeholder.h:131 urpmi:307 urpmi:314 urpmi:327 urpmi:338 urpmi:351
+msgid "Installation failed"
+msgstr "A instala��o falhou"
+
+#: po/placeholder.h:132 po/placeholder.h:234
+msgid ""
+" --auto-select - automatically select packages for upgrading the system.\n"
+msgstr ""
+
+#: po/placeholder.h:134
+msgid " --X - use X interface.\n"
+msgstr ""
+
+#: po/placeholder.h:135 urpmi:247
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -621,42 +622,106 @@ msgstr ""
"Por forma a resolver as depend�ncias, ser�o instalados os seguintes pacotes "
"(%d MB)"
-#: po/placeholder.h:144 urpmi:296
-#, c-format
-msgid "installing %s\n"
-msgstr "a instalar %s\n"
+#: po/placeholder.h:136 urpmi:320 urpmi:344
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Tentar instala��o sem verificar depend�ncias? (s/N) "
+
+#: po/placeholder.h:137
+msgid ""
+" --best-output - choose best interface according to the environment:\n"
+" X or text mode.\n"
+msgstr ""
-#: po/placeholder.h:145 urpmi:198
+#: 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
+msgid " -q - quiet mode.\n"
+msgstr ""
+
+#: po/placeholder.h:144 urpmi:202
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Qual � a sua escolha? (1-%d)"
-#: po/placeholder.h:146 urpmi:321 urpmi:345
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Tentar instala��o sem verificar depend�ncias? (s/N) "
+#: po/placeholder.h:145
+msgid " --wget - use wget to retrieve distant files.\n"
+msgstr ""
-#: po/placeholder.h:147 urpmi:190
-msgid "One of the following packages is needed:"
-msgstr "Um dos seguintes pacotes � necess�rio:"
+#: po/placeholder.h:146
+#, 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"
+msgstr ""
+
+#: po/placeholder.h:152 urpmi:328 urpmi:352
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Tentar instala��o ainda de forma mais insistente (--force)? (s/N) "
+
+#: po/placeholder.h:154
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
-#: po/placeholder.h:148 urpmi:149
+#: po/placeholder.h:155 urpmi:205
+msgid "Sorry, bad choice, try again\n"
+msgstr "Desculpe, op��o incorrecta, tente de novo\n"
+
+#: po/placeholder.h:156
+msgid ""
+" names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: po/placeholder.h:158
+msgid " -a - select all matches on command line.\n"
+msgstr ""
+
+#: 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 "a instalar %s\n"
+
+#: po/placeholder.h:161 urpmi:152
msgid "Only superuser is allowed to install local packages"
msgstr "Apenas o SuperUtilizador pode instalar pacotes localmente"
-#: 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 "Por favor insira o suporte de media \"%s\" no dispositivo [%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 "foi imposs�vel obter pacotes fonte, a abortar"
-#: po/placeholder.h:151 urpmi:329 urpmi:353
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Tentar instala��o ainda de forma mais insistente (--force)? (s/N) "
+#: po/placeholder.h:165 urpmi:102
+#, fuzzy
+msgid "Only superuser is allowed to install packages"
+msgstr "Apenas o SuperUtilizador pode instalar pacotes localmente"
+
+#: po/placeholder.h:166 urpmi:193
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Um dos seguintes pacotes � necess�rio:"
-#: po/placeholder.h:155 urpmi.addmedia:46
+#: po/placeholder.h:167 urpmi:277
+msgid "Press Enter when it's done..."
+msgstr "Prima 'Enter' quando conclu�do..."
+
+#: po/placeholder.h:168 urpmi.addmedia:46
#, c-format
msgid ""
"%s\n"
@@ -665,7 +730,7 @@ msgstr ""
"%s\n"
"`with' em falta para suporte ftp\n"
-#: po/placeholder.h:159
+#: po/placeholder.h:172
msgid ""
"usage: urpmi.addmedia [--update] <name> <url>\n"
"where <url> is one of\n"
@@ -677,17 +742,17 @@ msgid ""
" removable_<device>://<path>\n"
msgstr ""
-#: po/placeholder.h:168 urpmi.addmedia:57
+#: po/placeholder.h:181 urpmi.addmedia:57
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr ""
-#: po/placeholder.h:169 urpmi.addmedia:58
+#: po/placeholder.h:182 urpmi.addmedia:58
#, c-format
msgid "unable to update medium \"%s\"\n"
msgstr ""
-#: po/placeholder.h:170 urpmi.addmedia:42
+#: po/placeholder.h:183 urpmi.addmedia:42
#, c-format
msgid ""
"%s\n"
@@ -696,7 +761,7 @@ msgstr ""
"%s\n"
"dispositivo `%s' n�o existe\n"
-#: po/placeholder.h:174 urpmi.addmedia:44
+#: po/placeholder.h:187 urpmi.addmedia:44
#, c-format
msgid ""
"%s\n"
@@ -705,7 +770,7 @@ msgstr ""
"%s\n"
"<caminho relativo de hdlist> em falta\n"
-#: po/placeholder.h:178
+#: po/placeholder.h:191
#, c-format
msgid ""
"usage: urpmi.update [-a] <name> ...\n"
@@ -717,11 +782,11 @@ msgid ""
"unknown options '%s'\n"
msgstr ""
-#: 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 "nada a actualizar (use urpmi.addmedia para adicionar media)\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"
@@ -730,11 +795,11 @@ msgstr ""
"a entrada a actualizar est� em falta\n"
"(um de %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 "nada a remover (use urpmi.addmedia para adicionar media)\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"
@@ -743,7 +808,7 @@ msgstr ""
"a entrada a remover est� em falta\n"
"(um de %s)\n"
-#: po/placeholder.h:197
+#: po/placeholder.h:210
#, c-format
msgid ""
"usage: urpmi.removemedia [-a] <name> ...\n"
@@ -753,17 +818,11 @@ msgid ""
"unknown options '%s'\n"
msgstr ""
-#: po/placeholder.h:204 urpmq:85
-#, fuzzy, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: � imposs�vel ler o ficheiro rpm \"$_\"\n"
-
-#: po/placeholder.h:206 urpmq:82
-#, fuzzy, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: op��o desconhecida \"-$1\", ver uso com --help\n"
+#: po/placeholder.h:217
+msgid " -h - print this help message.\n"
+msgstr ""
-#: 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"
@@ -771,7 +830,28 @@ msgstr ""
"alguns pacotes t�m que ser removidos para serem actualizados, isto ainda n�o "
"� suportado\n"
-#: po/placeholder.h:208
+#: po/placeholder.h:219
+msgid " -g - print groups too with name.\n"
+msgstr ""
+
+#: po/placeholder.h:220 urpmq:84
+#, fuzzy, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: � imposs�vel ler o ficheiro rpm \"$_\"\n"
+
+#: po/placeholder.h:221
+msgid " names or rpm files given on command line are queried.\n"
+msgstr ""
+
+#: po/placeholder.h:223
+msgid " -r - print version and release too with name.\n"
+msgstr ""
+
+#: po/placeholder.h:224
+msgid " -f - print version, release and arch with name.\n"
+msgstr ""
+
+#: po/placeholder.h:225
#, c-format
msgid ""
"urpmq version %s\n"
@@ -779,78 +859,69 @@ msgid ""
"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 ""
+
+#: po/placeholder.h:231
+msgid " -d - extend query to package dependencies.\n"
+msgstr ""
+
+#: 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 ""
-#: urpm.pm:257
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:233
+msgid ""
+" -c - choose complete method for resolving requires closure.\n"
msgstr ""
-#: urpm.pm:258
-#, c-format
-msgid "taking removable device as \"%s\""
+#: po/placeholder.h:235 urpmq:81
+#, fuzzy, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: op��o desconhecida \"-$1\", ver uso com --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:262
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
+#: po/placeholder.h:243
+msgid ""
+" -u - remove package if a better version is already installed.\n"
msgstr ""
-#: urpm.pm:266 urpm.pm:269
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
+#: po/placeholder.h:244
+msgid ""
+" --force - force invocation even if some packages do not\n"
+"exist.\n"
msgstr ""
-#: urpm.pm:1339
+#: urpm.pm:1796 urpm.pm:1805
#, c-format
-msgid "read synthesis file [%s]"
+msgid "removing %s to upgrade to %s ..."
msgstr ""
-#: urpmi:49
-#, c-format
-msgid "urpmi version %s"
-msgstr "urpmi vers�o %s"
+#: urpm.pm:1797 urpm.pm:1806
+msgid ", $otherPackage, "
+msgstr ", $otherPackage, "
-#: urpmi:98
-#, fuzzy, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: op��o desconhecida \"-$1\", ver uso com --help\n"
+#: urpm.pm:1797 urpm.pm:1806
+msgid "));"
+msgstr "));"
-#: urpmi:102
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr "Apenas o SuperUtilizador pode instalar pacotes localmente"
+#: urpm.pm:1802
+msgid "$p->{name}-$p->{version}-$p->{release}"
+msgstr "$p->{name}-$p->{version}-$p->{release}"
-#: urpmi:189
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Um dos seguintes pacotes � necess�rio:"
+#: urpm.pm:1812
+msgid "$prefix/$_"
+msgstr "$prefix/$_"
-#: urpmi:301
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
-msgstr ""
+#: urpmi:48
+#, c-format
+msgid "urpmi version %s"
+msgstr "urpmi vers�o %s"
#: urpmi.addmedia:30
#, fuzzy
@@ -885,8 +956,59 @@ msgstr ", $_);"
msgid "urpmq version %s"
msgstr "urpmq vers�o %s"
-#~ msgid "));"
-#~ msgstr "));"
+#, fuzzy
+#~ 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 ""
+#~ "urpmi vers�o %s\n"
+#~ "Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+#~ "Este software � livre e pode ser distr�ibu�do segundo os termos da "
+#~ "licen�a GNU.\n"
+#~ "GPL.\n"
+#~ "uso:\n"
+#~ " --help - exibe esta mensagem.\n"
+#~ " --auto - automaticamente seleccionar um bom pacote nas "
+#~ "escolhas.\n"
+#~ " --auto-select - aumaticamente seleccionar pacotes para actualiza��o "
+#~ "do sistema.\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"
+#~ " -q - quiet mode.\n"
+#~ " -v - verbose mode.\n"
+#~ " names or rpm files (only for root) given on command line are "
+#~ "installed.\n"
#~ msgid "), $_);"
#~ msgstr "), $_);"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index b98fae74..ff70625e 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.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-05-07 14:41-0300\n"
"Last-Translator: Andrei Bosco Bezerra Torres <andreibt@uol.com.br>\n"
"Language-Team: Portugu�s Brasileiro <andreibt@uol.com.br>\n"
@@ -26,27 +26,27 @@ msgstr ""
"Instala��o autom�tica de pacotes...\n"
"Voc� pediu a instala��o do pacote $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 "Tudo bem?"
-#: _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 "Cancelar"
-#: _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 "Nn"
-#: _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 "SsYy"
-#: _irpm:42 po/placeholder.h:118 urpmi:258
+#: _irpm:42 po/placeholder.h:157 urpmi:258
msgid " (Y/n) "
msgstr " (S/n) "
@@ -150,120 +150,120 @@ msgstr ""
msgid "urpmi is not installed"
msgstr "urpmi n�o est� instalado"
-#: po/placeholder.h:29 urpm.pm:283
+#: po/placeholder.h:29
+#, fuzzy, c-format
+msgid "reading synthesis file [%s]"
+msgstr "incapaz de criar m�dia \"%s\"\n"
+
+#: po/placeholder.h:30 urpm.pm:298
#, c-format
msgid "unable to write config file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:31
+#: po/placeholder.h:32
#, c-format
msgid "nothing to write in list file for \"%s\""
msgstr ""
-#: 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 ""
-#: po/placeholder.h:33
+#: po/placeholder.h:34
#, fuzzy, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "incapaz de atualizar m�dia \"%s\"\n"
-#: po/placeholder.h:34
+#: po/placeholder.h:35
#, c-format
msgid "nothing written in list file for \"%s\""
msgstr ""
-#: po/placeholder.h:35 urpm.pm:1951
-#, c-format
-msgid ""
-"removing %s to upgrade ...\n"
-" to %s since it will not upgrade correctly!"
-msgstr ""
-
-#: po/placeholder.h:39 urpm.pm:839
+#: po/placeholder.h:36 urpm.pm:845
#, c-format
msgid "read provides file [%s]"
msgstr ""
-#: po/placeholder.h:40
-#, fuzzy, c-format
-msgid "trying to remove inexistant medium \"%s\""
-msgstr "incapaz de criar m�dia \"%s\"\n"
-
-#: po/placeholder.h:41 urpm.pm:1692
+#: po/placeholder.h:37 urpm.pm:1549
#, c-format
msgid "package %s is not found."
msgstr ""
-#: po/placeholder.h:42
-#, c-format
-msgid "unable to copy source of [%s] from [%s]"
-msgstr ""
-
-#: po/placeholder.h:43 urpm.pm:870
+#: po/placeholder.h:38 urpm.pm:876
#, fuzzy, c-format
msgid "unable to write compss file [%s]"
msgstr "incapaz de criar m�dia \"%s\"\n"
-#: po/placeholder.h:44 urpm.pm:813
+#: po/placeholder.h:39 urpm.pm:819
#, c-format
msgid "unmounting %s"
msgstr ""
-#: po/placeholder.h:45
+#: po/placeholder.h:40
#, c-format
msgid "removing %d obsolete headers in cache"
msgstr ""
-#: 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 ""
-#: 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 ""
+
+#: po/placeholder.h:43 urpm.pm:184
+#, c-format
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+
+#: po/placeholder.h:44 urpm.pm:191
#, c-format
msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
msgstr ""
-#: po/placeholder.h:48
+#: po/placeholder.h:45
msgid "keeping only files referenced in provides"
msgstr ""
-#: po/placeholder.h:49
+#: po/placeholder.h:46
#, fuzzy, c-format
msgid "unable to build synthesis file for medium \"%s\""
msgstr "incapaz de atualizar m�dia \"%s\"\n"
-#: po/placeholder.h:50
+#: po/placeholder.h:47
#, c-format
msgid "found %d headers in cache"
msgstr ""
-#: po/placeholder.h:51 urpm.pm:836
+#: po/placeholder.h:48 urpm.pm:842
#, fuzzy, c-format
msgid "unable to read provides file [%s]"
msgstr "incapaz de criar m�dia \"%s\"\n"
-#: 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 ""
-#: po/placeholder.h:53 urpm.pm:311
+#: po/placeholder.h:50
#, c-format
-msgid "medium \"%s\" already exists"
+msgid ""
+"removing %s to upgrade to %s ...\n"
+" since it will not be updated otherwise"
msgstr ""
-#: po/placeholder.h:54 urpm.pm:295
+#: po/placeholder.h:54 urpm.pm:326
#, c-format
-msgid "write config file [%s]"
+msgid "medium \"%s\" already exists"
msgstr ""
#: po/placeholder.h:55
@@ -271,172 +271,186 @@ msgstr ""
msgid "unable to write list file of \"%s\""
msgstr "incapaz de criar m�dia \"%s\"\n"
-#: po/placeholder.h:56 urpm.pm:1817
-#, c-format
-msgid "retrieving [%s]"
-msgstr ""
-
-#: po/placeholder.h:57 urpm.pm:1819
+#: po/placeholder.h:56 urpm.pm:310
#, c-format
-msgid "wget of [%s] failed"
+msgid "write config file [%s]"
msgstr ""
-#: po/placeholder.h:58 urpm.pm:1101
+#: po/placeholder.h:57 urpm.pm:1107
#, c-format
msgid "no package named %s"
msgstr ""
-#: po/placeholder.h:59 urpm.pm:848
+#: po/placeholder.h:58 urpm.pm:854
#, fuzzy, c-format
msgid "unable to read compss file [%s]"
msgstr "incapaz de criar m�dia \"%s\"\n"
-#: 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 ""
-#: po/placeholder.h:61
+#: po/placeholder.h:60
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr ""
-#: po/placeholder.h:62
+#: po/placeholder.h:61
msgid "computing dependencies"
msgstr ""
-#: po/placeholder.h:63 urpm.pm:868
+#: po/placeholder.h:62
+#, c-format
+msgid "retrieve of [%s] failed"
+msgstr ""
+
+#: po/placeholder.h:63 urpm.pm:874
#, c-format
msgid "write provides file [%s]"
msgstr ""
-#: po/placeholder.h:64 urpm.pm:803
+#: po/placeholder.h:64 urpm.pm:809
#, fuzzy, c-format
msgid "mounting %s"
msgstr "instalando %s\n"
-#: 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 "
"medium"
msgstr ""
-#: po/placeholder.h:66 urpm.pm:148
-#, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
-msgstr ""
-
-#: po/placeholder.h:67
+#: po/placeholder.h:66
#, c-format
msgid "reading hdlist file [%s]"
msgstr ""
-#: po/placeholder.h:68 urpm.pm:873
+#: po/placeholder.h:67 urpm.pm:879
#, c-format
msgid "write compss file [%s]"
msgstr ""
-#: po/placeholder.h:69 urpm.pm:827
+#: po/placeholder.h:68 urpm.pm:833
#, c-format
msgid "read depslist file [%s]"
msgstr ""
-#: po/placeholder.h:70
+#: 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 "trying to select inexistant medium \"%s\""
+msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "incapaz de criar m�dia \"%s\"\n"
-#: po/placeholder.h:71 urpm.pm:1812
+#: po/placeholder.h:71 urpm.pm:1668
#, c-format
msgid "malformed input: [%s]"
msgstr ""
-#: 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"
+msgid "there are multiple packages with the same rpm filename \"%s\""
msgstr ""
-#: 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 ""
-#: po/placeholder.h:77 urpm.pm:865
+#: po/placeholder.h:74 urpm.pm:871
#, fuzzy, c-format
msgid "unable to write provides file [%s]"
msgstr "incapaz de criar m�dia \"%s\"\n"
-#: 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 ""
-#: po/placeholder.h:79 urpm.pm:1005
+#: po/placeholder.h:76 urpm.pm:1215
+#, fuzzy
+msgid "unable to find all synthesis file, using parsehdlist server"
+msgstr "incapaz de atualizar m�dia \"%s\"\n"
+
+#: po/placeholder.h:77 urpm.pm:1011
#, fuzzy
msgid "unable to register rpm file"
msgstr "incapaz de criar m�dia \"%s\"\n"
-#: po/placeholder.h:80 urpm.pm:1362
-msgid "unable to find all synthesis file, using parsehdlist server"
+#: po/placeholder.h:78 urpm.pm:256
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
msgstr ""
-#: po/placeholder.h:81 urpm.pm:241
+#: po/placeholder.h:79 urpm.pm:272
#, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "too many mount points for removable medium \"%s\""
msgstr ""
-#: po/placeholder.h:82 urpm.pm:233
+#: po/placeholder.h:80 urpm.pm:248
#, c-format
msgid "incoherent list file for \"%s\", medium ignored"
msgstr ""
-#: po/placeholder.h:83
+#: po/placeholder.h:81
#, c-format
msgid "copy of [%s] failed"
msgstr ""
-#: po/placeholder.h:84 urpm.pm:907 urpm.pm:1338 urpm.pm:1616 urpm.pm:1623
+#: po/placeholder.h:82
+#, fuzzy, c-format
+msgid "trying to remove inexistent medium \"%s\""
+msgstr "incapaz de criar m�dia \"%s\"\n"
+
+#: po/placeholder.h:83 urpm.pm:913 urpm.pm:1191 urpm.pm:1473 urpm.pm:1480
#, fuzzy, c-format
msgid "unable to parse correctly [%s]"
msgstr "incapaz de atualizar m�dia \"%s\"\n"
-#: po/placeholder.h:85 urpm.pm:824
+#: po/placeholder.h:84 urpm.pm:1192
#, fuzzy, c-format
-msgid "unable to read depslist file [%s]"
+msgid "read synthesis file [%s]"
msgstr "incapaz de criar m�dia \"%s\"\n"
-#: po/placeholder.h:86
-msgid "removable medium not selected"
-msgstr ""
+#: po/placeholder.h:85 urpm.pm:830
+#, fuzzy, c-format
+msgid "unable to read depslist file [%s]"
+msgstr "incapaz de criar m�dia \"%s\"\n"
-#: po/placeholder.h:87 urpm.pm:851
+#: po/placeholder.h:86 urpm.pm:857
#, c-format
msgid "read compss file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:89
+#: po/placeholder.h:88
#, c-format
msgid "building hdlist [%s]"
msgstr ""
-#: po/placeholder.h:90 urpm.pm:1746
+#: po/placeholder.h:89 urpm.pm:1603
#, fuzzy, c-format
msgid "unable to read rpm file [%s] from medium \"%s\""
msgstr "incapaz de criar m�dia \"%s\"\n"
-#: po/placeholder.h:91 urpm.pm:1009
+#: po/placeholder.h:90 urpm.pm:1015
msgid "error registering local packages"
msgstr ""
-#: 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 ""
@@ -446,171 +460,160 @@ msgstr ""
msgid "unable to build hdlist: %s"
msgstr "incapaz de atualizar m�dia \"%s\"\n"
-#: po/placeholder.h:94 urpm.pm:1000
-#, c-format
-msgid "invalid rpm file name [%s]"
-msgstr ""
-
-#: po/placeholder.h:95 urpm.pm:1736 urpm.pm:1739 urpm.pm:1758
+#: po/placeholder.h:94 urpm.pm:1593 urpm.pm:1596 urpm.pm:1615
#, c-format
msgid "medium \"%s\" is not selected"
msgstr ""
-#: po/placeholder.h:96 urpm.pm:207
+#: po/placeholder.h:95 urpm.pm:1006
#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "invalid rpm file name [%s]"
msgstr ""
-#: po/placeholder.h:97 urpm.pm:863
+#: po/placeholder.h:96 urpm.pm:1175
#, c-format
-msgid "write depslist file [%s]"
+msgid "unknown data associated with %s"
msgstr ""
-#: po/placeholder.h:98 urpm.pm:1322
+#: po/placeholder.h:97 urpm.pm:222
#, c-format
-msgid "unknown data associated with %s"
+msgid "trying to bypass existing medium \"%s\", avoiding"
msgstr ""
-#: po/placeholder.h:99
+#: po/placeholder.h:98 urpm.pm:869
#, c-format
-msgid "source of [%s] not found as [%s]"
+msgid "write depslist file [%s]"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: po/placeholder.h:102
-#, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
-msgstr ""
-
-#: po/placeholder.h:103 urpm.pm:1001
+#: po/placeholder.h:101 urpm.pm:1007
#, fuzzy, c-format
msgid "unable to access rpm file [%s]"
msgstr "incapaz de criar m�dia \"%s\"\n"
-#: po/placeholder.h:104 urpm.pm:860
+#: po/placeholder.h:102 urpm.pm:866
#, fuzzy, c-format
msgid "unable to write depslist file [%s]"
msgstr "incapaz de criar m�dia \"%s\"\n"
-#: po/placeholder.h:105 urpm.pm:327 urpm.pm:1773
+#: po/placeholder.h:103
+#, 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
#, fuzzy, c-format
msgid "unable to access medium \"%s\""
msgstr "incapaz de atualizar m�dia \"%s\"\n"
-#: po/placeholder.h:106 urpm.pm:988
+#: po/placeholder.h:108 urpm.pm:994
#, c-format
msgid "relocated %s entries in depslist"
msgstr ""
-#: po/placeholder.h:107 urpm.pm:914 urpm.pm:1629 urpm.pm:1680
-#, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
+#: po/placeholder.h:109
+#, fuzzy, c-format
+msgid "trying to select inexistent medium \"%s\""
+msgstr "incapaz de criar m�dia \"%s\"\n"
+
+#: po/placeholder.h:110 urpm.pm:97
+msgid "wget failed\n"
msgstr ""
-#: 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]"
+msgid "unable to parse correctly [%s] on value \"%s\""
msgstr ""
-#: po/placeholder.h:109 urpm.pm:1104
+#: po/placeholder.h:112 urpm.pm:1110
#, fuzzy, c-format
msgid "The following packages contain %s: %s"
msgstr "Um dos pacotes a seguir � necess�rio:"
-#: 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\""
+msgid "no rpm files found from [%s]"
msgstr ""
-#: po/placeholder.h:111 urpm.pm:1920
+#: po/placeholder.h:114 urpm.pm:1772
#, c-format
msgid "selecting %s using obsoletes"
msgstr ""
-#: po/placeholder.h:112 urpm.pm:2031
+#: po/placeholder.h:115 urpm.pm:1888
#, c-format
msgid "selecting %s by selection on files"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:114 urpmi:308 urpmi:315 urpmi:328 urpmi:339 urpmi:352
-msgid "Installation failed"
-msgstr "Instala��o falhou"
-
-#: po/placeholder.h:115 urpmi:279
-msgid "Press enter when it's done..."
-msgstr "Aperte enter quando estiver pronto..."
+#: po/placeholder.h:120
+msgid " --help - print this help message.\n"
+msgstr ""
-#: po/placeholder.h:117 urpmi:201
-msgid "Sorry, bad choice, try again\n"
-msgstr "Desculpe, m� escolha, tente novamente\n"
+#: po/placeholder.h:121 urpmi:361
+msgid "everything already installed"
+msgstr "tudo j� instalando"
-#: po/placeholder.h:120
+#: po/placeholder.h:122 urpmi:98
#, fuzzy, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: op��o desconhecida \"-$1\", cheque a utiliza��o com --help\n"
+
+#: po/placeholder.h:123 urpmi:194
+msgid "One of the following packages is needed:"
+msgstr "Um dos pacotes a seguir � necess�rio:"
+
+#: po/placeholder.h:124 po/placeholder.h:222
+msgid " --update - use only update media.\n"
+msgstr ""
+
+#: po/placeholder.h:125 urpmi:299
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"
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
msgstr ""
-"urpmi vers�o %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"Esse � um software livre e pode ser distribu�do de acordo com os termos do "
-"GNU GPL.\n"
-"utiliza��o:\n"
-" --help - exibe esta mensagem de ajuda.\n"
-" --auto - automaticamente seleciona um bom pacote.\n"
-" --auto-select - automaticamente seleciona pacotes para atualizar o "
-"sistema.\n"
-" --force - for�a invoca��o mesmo que alguns pacotes n�o existam.\n"
-" --X - usa a interface X.\n"
-" --best-output - escolhe a melhor interface de acordo com o ambiente:\n"
-" X ou modo texto.\n"
-" -a - selectiona todas as igualdades na linha de comando.\n"
-" -m - escolhe o m�nimo de fechamento de requerimentos "
-"(padr�o).\n"
-" -M - escolhe o m�ximo de fechamento de requerimentos.\n"
-" -c - escolhe o m�todo completo para decis�o de fechamento de "
-"requerimento.\n"
-" -q - modo silencioso.\n"
-" -v - modo verboso.\n"
-
-#: po/placeholder.h:142 urpmi:362
-msgid "everything already installed"
-msgstr "tudo j� instalando"
-#: po/placeholder.h:143 urpmi:247
+#: 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 "Instala��o falhou"
+
+#: po/placeholder.h:132 po/placeholder.h:234
+msgid ""
+" --auto-select - automatically select packages for upgrading the system.\n"
+msgstr ""
+
+#: po/placeholder.h:134
+msgid " --X - use X interface.\n"
+msgstr ""
+
+#: po/placeholder.h:135 urpmi:247
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -619,42 +622,106 @@ msgstr ""
"Para satisfazer as depend�ncias, os seguintes pacotes ir�o ser instalados (%"
"d MB)"
-#: po/placeholder.h:144 urpmi:296
-#, c-format
-msgid "installing %s\n"
-msgstr "instalando %s\n"
+#: po/placeholder.h:136 urpmi:320 urpmi:344
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Tentar instalar sem checar as depend�ncias? (s/N) "
+
+#: 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
+msgid " -q - quiet mode.\n"
+msgstr ""
-#: po/placeholder.h:145 urpmi:198
+#: po/placeholder.h:144 urpmi:202
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Qual � a sua escolha? (1-%d) "
-#: po/placeholder.h:146 urpmi:321 urpmi:345
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Tentar instalar sem checar as depend�ncias? (s/N) "
+#: po/placeholder.h:145
+msgid " --wget - use wget to retrieve distant files.\n"
+msgstr ""
-#: po/placeholder.h:147 urpmi:190
-msgid "One of the following packages is needed:"
-msgstr "Um dos pacotes a seguir � necess�rio:"
+#: po/placeholder.h:146
+#, 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"
+msgstr ""
-#: po/placeholder.h:148 urpmi:149
+#: po/placeholder.h:152 urpmi:328 urpmi:352
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Tentar instalar com ainda mais for�a (--force)? (s/N) "
+
+#: po/placeholder.h:154
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+
+#: po/placeholder.h:155 urpmi:205
+msgid "Sorry, bad choice, try again\n"
+msgstr "Desculpe, m� escolha, tente novamente\n"
+
+#: po/placeholder.h:156
+msgid ""
+" names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: po/placeholder.h:158
+msgid " -a - select all matches on command line.\n"
+msgstr ""
+
+#: 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 "instalando %s\n"
+
+#: po/placeholder.h:161 urpmi:152
msgid "Only superuser is allowed to install local packages"
msgstr "Apenas um super-usu�rio tem permiss�o para instalar pacotes locais"
-#: 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 "Favor inserir a m�dia chamada \"%s\" no dispositivo [%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 "incapaz de obter a pacotes fonte, abortando"
-#: po/placeholder.h:151 urpmi:329 urpmi:353
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Tentar instalar com ainda mais for�a (--force)? (s/N) "
+#: po/placeholder.h:165 urpmi:102
+#, fuzzy
+msgid "Only superuser is allowed to install packages"
+msgstr "Apenas um super-usu�rio tem permiss�o para instalar pacotes locais"
-#: po/placeholder.h:155 urpmi.addmedia:46
+#: po/placeholder.h:166 urpmi:193
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Um dos pacotes a seguir � necess�rio:"
+
+#: po/placeholder.h:167 urpmi:277
+msgid "Press Enter when it's done..."
+msgstr "Aperte enter quando estiver pronto..."
+
+#: po/placeholder.h:168 urpmi.addmedia:46
#, c-format
msgid ""
"%s\n"
@@ -663,7 +730,7 @@ msgstr ""
"%s\n"
"`with' faltando para m�dia ftp\n"
-#: po/placeholder.h:159
+#: po/placeholder.h:172
msgid ""
"usage: urpmi.addmedia [--update] <name> <url>\n"
"where <url> is one of\n"
@@ -683,17 +750,17 @@ msgstr ""
" http://<host>/<caminho> with <nome relativo do arquivo do hdlist>\n"
" removable_<dispositivo>://<caminho>\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 "incapaz de criar m�dia \"%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 "incapaz de atualizar m�dia \"%s\"\n"
-#: po/placeholder.h:170 urpmi.addmedia:42
+#: po/placeholder.h:183 urpmi.addmedia:42
#, c-format
msgid ""
"%s\n"
@@ -702,7 +769,7 @@ msgstr ""
"%s\n"
"dispositivo `%s' n�o existe\n"
-#: po/placeholder.h:174 urpmi.addmedia:44
+#: po/placeholder.h:187 urpmi.addmedia:44
#, c-format
msgid ""
"%s\n"
@@ -711,7 +778,7 @@ msgstr ""
"%s\n"
"<caminho relativo do hdlist> faltando\n"
-#: po/placeholder.h:178
+#: po/placeholder.h:191
#, fuzzy, c-format
msgid ""
"usage: urpmi.update [-a] <name> ...\n"
@@ -730,11 +797,11 @@ msgstr ""
"\n"
"op��es desconhecidas '%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 "nada para atualizar (use urpmi.addmedia para adicionar uma m�dia)\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"
@@ -743,11 +810,11 @@ msgstr ""
"a entrada a ser atualizada est� faltando\n"
"(uma de %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 "nada para remover (use urpmi.addmedia para adicionar uma m�dia)\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"
@@ -756,7 +823,7 @@ msgstr ""
"a entrada para remover est� faltando\n"
"(um de %s)\n"
-#: po/placeholder.h:197
+#: po/placeholder.h:210
#, c-format
msgid ""
"usage: urpmi.removemedia [-a] <name> ...\n"
@@ -771,17 +838,11 @@ msgstr ""
"\n"
"op��es desconhecidas '%s'\n"
-#: po/placeholder.h:204 urpmq:85
-#, fuzzy, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: n�o posso ler arquim rpm \"$_\"\n"
-
-#: po/placeholder.h:206 urpmq:82
-#, fuzzy, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: op��o desconhecida \"-$1\", cheque a utiliza��o com --help\n"
+#: po/placeholder.h:217
+msgid " -h - print this help message.\n"
+msgstr ""
-#: 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"
@@ -789,7 +850,28 @@ msgstr ""
"alguns pacotes devem ser removidos para serem atualizados, isso ainda n�o � "
"suportado\n"
-#: po/placeholder.h:208
+#: po/placeholder.h:219
+msgid " -g - print groups too with name.\n"
+msgstr ""
+
+#: po/placeholder.h:220 urpmq:84
+#, fuzzy, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: n�o posso ler arquim rpm \"$_\"\n"
+
+#: po/placeholder.h:221
+msgid " names or rpm files given on command line are queried.\n"
+msgstr ""
+
+#: po/placeholder.h:223
+msgid " -r - print version and release too with name.\n"
+msgstr ""
+
+#: po/placeholder.h:224
+msgid " -f - print version, release and arch with name.\n"
+msgstr ""
+
+#: po/placeholder.h:225
#, c-format
msgid ""
"urpmq version %s\n"
@@ -797,79 +879,70 @@ msgid ""
"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"
+msgstr ""
+
+#: po/placeholder.h:231
+msgid " -d - extend query to package dependencies.\n"
+msgstr ""
+
+#: po/placeholder.h:232
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
+msgstr ""
+
+#: po/placeholder.h:233
+msgid ""
" -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"
+msgstr ""
+
+#: po/placeholder.h:235 urpmq:81
+#, fuzzy, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: op��o desconhecida \"-$1\", cheque a utiliza��o com --help\n"
+
+#: po/placeholder.h:236
+msgid ""
" --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 package do not exist.\n"
-" names or rpm files given on command line are queried.\n"
msgstr ""
-#: urpm.pm:257
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:243
+msgid ""
+" -u - remove package if a better version is already installed.\n"
msgstr ""
-#: urpm.pm:258
-#, c-format
-msgid "taking removable device as \"%s\""
+#: po/placeholder.h:244
+msgid ""
+" --force - force invocation even if some packages do not\n"
+"exist.\n"
msgstr ""
-#: urpm.pm:262
+#: urpm.pm:1796 urpm.pm:1805
#, c-format
-msgid "using different removable device [%s] for \"%s\""
+msgid "removing %s to upgrade to %s ..."
msgstr ""
-#: urpm.pm:266 urpm.pm:269
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "incapaz de criar m�dia \"%s\"\n"
+#: urpm.pm:1797 urpm.pm:1806
+msgid ", $otherPackage, "
+msgstr ", $otherPackage, "
-#: urpm.pm:1339
-#, fuzzy, c-format
-msgid "read synthesis file [%s]"
-msgstr "incapaz de criar m�dia \"%s\"\n"
+#: urpm.pm:1797 urpm.pm:1806
+msgid "));"
+msgstr "));"
+
+#: urpm.pm:1802
+msgid "$p->{name}-$p->{version}-$p->{release}"
+msgstr "$p->{name}-$p->{version}-$p->{release}"
-#: urpmi:49
+#: urpm.pm:1812
+msgid "$prefix/$_"
+msgstr "$prefix/$_"
+
+#: urpmi:48
#, c-format
msgid "urpmi version %s"
msgstr "urpmi vers�o %s"
-#: urpmi:98
-#, fuzzy, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: op��o desconhecida \"-$1\", cheque a utiliza��o com --help\n"
-
-#: urpmi:102
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr "Apenas um super-usu�rio tem permiss�o para instalar pacotes locais"
-
-#: urpmi:189
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Um dos pacotes a seguir � necess�rio:"
-
-#: urpmi:301
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
-msgstr ""
-
#: urpmi.addmedia:30
#, fuzzy
msgid "usage: urpmi.addmedia [--update] <name> <url>"
@@ -901,8 +974,57 @@ msgstr ", $_);"
msgid "urpmq version %s"
msgstr "urpmq vers�o %s"
-#~ msgid "));"
-#~ msgstr "));"
+#, fuzzy
+#~ 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 ""
+#~ "urpmi vers�o %s\n"
+#~ "Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+#~ "Esse � um software livre e pode ser distribu�do de acordo com os termos "
+#~ "do GNU GPL.\n"
+#~ "utiliza��o:\n"
+#~ " --help - exibe esta mensagem de ajuda.\n"
+#~ " --auto - automaticamente seleciona um bom pacote.\n"
+#~ " --auto-select - automaticamente seleciona pacotes para atualizar o "
+#~ "sistema.\n"
+#~ " --force - for�a invoca��o mesmo que alguns pacotes n�o "
+#~ "existam.\n"
+#~ " --X - usa a interface X.\n"
+#~ " --best-output - escolhe a melhor interface de acordo com o "
+#~ "ambiente:\n"
+#~ " X ou modo texto.\n"
+#~ " -a - selectiona todas as igualdades na linha de comando.\n"
+#~ " -m - escolhe o m�nimo de fechamento de requerimentos "
+#~ "(padr�o).\n"
+#~ " -M - escolhe o m�ximo de fechamento de requerimentos.\n"
+#~ " -c - escolhe o m�todo completo para decis�o de fechamento "
+#~ "de requerimento.\n"
+#~ " -q - modo silencioso.\n"
+#~ " -v - modo verboso.\n"
#~ msgid "), $_);"
#~ msgstr "), $_);"
diff --git a/po/ro.po b/po/ro.po
index 6db8978a..34ea283d 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,7 +6,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: 2000-04-29 12:05+0100\n"
"Last-Translator: Florin Grad <florin@mandrakesoft.com>\n"
"Language-Team: Romanian\n"
@@ -24,27 +24,27 @@ msgid ""
"You requested installation of package $rpm\n"
msgstr ""
-#: _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 "E ok?"
-#: _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 "Anuleaz�"
-#: _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 "Nn"
-#: _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 "DdYy"
-#: _irpm:42 po/placeholder.h:118 urpmi:258
+#: _irpm:42 po/placeholder.h:157 urpmi:258
msgid " (Y/n) "
msgstr " (D/n) "
@@ -147,120 +147,120 @@ msgstr ""
msgid "urpmi is not installed"
msgstr ""
-#: po/placeholder.h:29 urpm.pm:283
+#: po/placeholder.h:29
+#, c-format
+msgid "reading synthesis file [%s]"
+msgstr ""
+
+#: po/placeholder.h:30 urpm.pm:298
#, c-format
msgid "unable to write config file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:31
+#: po/placeholder.h:32
#, c-format
msgid "nothing to write in list file for \"%s\""
msgstr ""
-#: 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 ""
-#: po/placeholder.h:33
+#: po/placeholder.h:34
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr ""
-#: po/placeholder.h:34
+#: po/placeholder.h:35
#, c-format
msgid "nothing written in list file for \"%s\""
msgstr ""
-#: po/placeholder.h:35 urpm.pm:1951
-#, c-format
-msgid ""
-"removing %s to upgrade ...\n"
-" to %s since it will not upgrade correctly!"
-msgstr ""
-
-#: po/placeholder.h:39 urpm.pm:839
+#: po/placeholder.h:36 urpm.pm:845
#, c-format
msgid "read provides file [%s]"
msgstr ""
-#: po/placeholder.h:40
+#: po/placeholder.h:37 urpm.pm:1549
#, c-format
-msgid "trying to remove inexistant medium \"%s\""
+msgid "package %s is not found."
msgstr ""
-#: po/placeholder.h:41 urpm.pm:1692
+#: po/placeholder.h:38 urpm.pm:876
#, c-format
-msgid "package %s is not found."
+msgid "unable to write compss file [%s]"
msgstr ""
-#: po/placeholder.h:42
+#: po/placeholder.h:39 urpm.pm:819
#, c-format
-msgid "unable to copy source of [%s] from [%s]"
+msgid "unmounting %s"
msgstr ""
-#: po/placeholder.h:43 urpm.pm:870
+#: po/placeholder.h:40
#, c-format
-msgid "unable to write compss file [%s]"
+msgid "removing %d obsolete headers in cache"
msgstr ""
-#: po/placeholder.h:44 urpm.pm:813
+#: po/placeholder.h:41 urpm.pm:925 urpm.pm:1491
#, c-format
-msgid "unmounting %s"
+msgid "no hdlist file found for medium \"%s\""
msgstr ""
-#: po/placeholder.h:45
+#: po/placeholder.h:42 urpm.pm:160
#, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
msgstr ""
-#: po/placeholder.h:46 urpm.pm:919 urpm.pm:1634
+#: po/placeholder.h:43 urpm.pm:184
#, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
msgstr ""
-#: po/placeholder.h:47 urpm.pm:176
+#: po/placeholder.h:44 urpm.pm:191
#, c-format
msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
msgstr ""
-#: po/placeholder.h:48
+#: po/placeholder.h:45
msgid "keeping only files referenced in provides"
msgstr ""
-#: po/placeholder.h:49
+#: po/placeholder.h:46
#, c-format
msgid "unable to build synthesis file for medium \"%s\""
msgstr ""
-#: po/placeholder.h:50
+#: po/placeholder.h:47
#, c-format
msgid "found %d headers in cache"
msgstr ""
-#: po/placeholder.h:51 urpm.pm:836
+#: po/placeholder.h:48 urpm.pm:842
#, c-format
msgid "unable to read provides file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:53 urpm.pm:311
+#: po/placeholder.h:50
#, c-format
-msgid "medium \"%s\" already exists"
+msgid ""
+"removing %s to upgrade to %s ...\n"
+" since it will not be updated otherwise"
msgstr ""
-#: po/placeholder.h:54 urpm.pm:295
+#: po/placeholder.h:54 urpm.pm:326
#, c-format
-msgid "write config file [%s]"
+msgid "medium \"%s\" already exists"
msgstr ""
#: po/placeholder.h:55
@@ -268,293 +268,386 @@ msgstr ""
msgid "unable to write list file of \"%s\""
msgstr ""
-#: po/placeholder.h:56 urpm.pm:1817
+#: po/placeholder.h:56 urpm.pm:310
#, c-format
-msgid "retrieving [%s]"
-msgstr ""
-
-#: po/placeholder.h:57 urpm.pm:1819
-#, c-format
-msgid "wget of [%s] failed"
+msgid "write config file [%s]"
msgstr ""
-#: po/placeholder.h:58 urpm.pm:1101
+#: po/placeholder.h:57 urpm.pm:1107
#, fuzzy, c-format
msgid "no package named %s"
msgstr "nici un pachet cu numele %s\n"
-#: po/placeholder.h:59 urpm.pm:848
+#: po/placeholder.h:58 urpm.pm:854
#, c-format
msgid "unable to read compss file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:61
+#: po/placeholder.h:60
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr ""
-#: po/placeholder.h:62
+#: po/placeholder.h:61
msgid "computing dependencies"
msgstr ""
-#: po/placeholder.h:63 urpm.pm:868
+#: po/placeholder.h:62
+#, c-format
+msgid "retrieve of [%s] failed"
+msgstr ""
+
+#: po/placeholder.h:63 urpm.pm:874
#, c-format
msgid "write provides file [%s]"
msgstr ""
-#: po/placeholder.h:64 urpm.pm:803
+#: po/placeholder.h:64 urpm.pm:809
#, fuzzy, c-format
msgid "mounting %s"
msgstr "instalez %s\n"
-#: 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 "
"medium"
msgstr ""
-#: po/placeholder.h:66 urpm.pm:148
-#, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
-msgstr ""
-
-#: po/placeholder.h:67
+#: po/placeholder.h:66
#, c-format
msgid "reading hdlist file [%s]"
msgstr ""
-#: po/placeholder.h:68 urpm.pm:873
+#: po/placeholder.h:67 urpm.pm:879
#, c-format
msgid "write compss file [%s]"
msgstr ""
-#: po/placeholder.h:69 urpm.pm:827
+#: po/placeholder.h:68 urpm.pm:833
#, c-format
msgid "read depslist file [%s]"
msgstr ""
-#: po/placeholder.h:70
+#: po/placeholder.h:69 urpm.pm:103
+msgid "curl failed\n"
+msgstr ""
+
+#: po/placeholder.h:70 urpm.pm:281 urpm.pm:284
#, c-format
-msgid "trying to select inexistant medium \"%s\""
+msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr ""
-#: po/placeholder.h:71 urpm.pm:1812
+#: po/placeholder.h:71 urpm.pm:1668
#, c-format
msgid "malformed input: [%s]"
msgstr ""
-#: 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"
+msgid "there are multiple packages with the same rpm filename \"%s\""
msgstr ""
-#: 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 ""
-#: po/placeholder.h:77 urpm.pm:865
+#: po/placeholder.h:74 urpm.pm:871
#, c-format
msgid "unable to write provides file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:79 urpm.pm:1005
-msgid "unable to register rpm file"
+#: po/placeholder.h:76 urpm.pm:1215
+msgid "unable to find all synthesis file, using parsehdlist server"
msgstr ""
-#: po/placeholder.h:80 urpm.pm:1362
-msgid "unable to find all synthesis file, using parsehdlist server"
+#: po/placeholder.h:77 urpm.pm:1011
+msgid "unable to register rpm file"
msgstr ""
-#: po/placeholder.h:81 urpm.pm:241
+#: po/placeholder.h:78 urpm.pm:256
#, c-format
msgid "unable to inspect list file for \"%s\", medium ignored"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:83
+#: po/placeholder.h:81
#, c-format
msgid "copy of [%s] failed"
msgstr ""
-#: 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 ""
+
+#: 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 ""
-#: po/placeholder.h:85 urpm.pm:824
+#: po/placeholder.h:84 urpm.pm:1192
#, c-format
-msgid "unable to read depslist file [%s]"
+msgid "read synthesis file [%s]"
msgstr ""
-#: po/placeholder.h:86
-msgid "removable medium not selected"
+#: po/placeholder.h:85 urpm.pm:830
+#, c-format
+msgid "unable to read depslist file [%s]"
msgstr ""
-#: po/placeholder.h:87 urpm.pm:851
+#: po/placeholder.h:86 urpm.pm:857
#, c-format
msgid "read compss file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:89
+#: po/placeholder.h:88
#, c-format
msgid "building hdlist [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:91 urpm.pm:1009
+#: po/placeholder.h:90 urpm.pm:1015
msgid "error registering local packages"
msgstr ""
-#: po/placeholder.h:92 urpm.pm:1762
+#: po/placeholder.h:91 urpm.pm:273
#, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "taking removable device as \"%s\""
msgstr ""
-#: po/placeholder.h:93
+#: po/placeholder.h:92 urpm.pm:1619
#, c-format
-msgid "unable to build hdlist: %s"
+msgid "incoherent medium \"%s\" marked removable but not really"
msgstr ""
-#: po/placeholder.h:94 urpm.pm:1000
+#: po/placeholder.h:93
#, c-format
-msgid "invalid rpm file name [%s]"
+msgid "unable to build hdlist: %s"
msgstr ""
-#: po/placeholder.h:95 urpm.pm:1736 urpm.pm:1739 urpm.pm:1758
+#: po/placeholder.h:94 urpm.pm:1593 urpm.pm:1596 urpm.pm:1615
#, c-format
msgid "medium \"%s\" is not selected"
msgstr ""
-#: po/placeholder.h:96 urpm.pm:207
+#: po/placeholder.h:95 urpm.pm:1006
#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "invalid rpm file name [%s]"
msgstr ""
-#: po/placeholder.h:97 urpm.pm:863
+#: po/placeholder.h:96 urpm.pm:1175
#, c-format
-msgid "write depslist file [%s]"
+msgid "unknown data associated with %s"
msgstr ""
-#: po/placeholder.h:98 urpm.pm:1322
+#: po/placeholder.h:97 urpm.pm:222
#, c-format
-msgid "unknown data associated with %s"
+msgid "trying to bypass existing medium \"%s\", avoiding"
msgstr ""
-#: po/placeholder.h:99
+#: po/placeholder.h:98 urpm.pm:869
#, c-format
-msgid "source of [%s] not found as [%s]"
+msgid "write depslist file [%s]"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: po/placeholder.h:102
+#: po/placeholder.h:101 urpm.pm:1007
#, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
+msgid "unable to access rpm file [%s]"
msgstr ""
-#: po/placeholder.h:103 urpm.pm:1001
+#: po/placeholder.h:102 urpm.pm:866
#, c-format
-msgid "unable to access rpm file [%s]"
+msgid "unable to write depslist file [%s]"
msgstr ""
-#: po/placeholder.h:104 urpm.pm:860
+#: po/placeholder.h:103
#, c-format
-msgid "unable to write depslist file [%s]"
+msgid ""
+"removing %s to upgrade to %s ...\n"
+" since it will not upgrade correctly!"
msgstr ""
-#: po/placeholder.h:105 urpm.pm:327 urpm.pm:1773
+#: po/placeholder.h:107 urpm.pm:342 urpm.pm:1630
#, c-format
msgid "unable to access medium \"%s\""
msgstr ""
-#: po/placeholder.h:106 urpm.pm:988
+#: po/placeholder.h:108 urpm.pm:994
#, c-format
msgid "relocated %s entries in depslist"
msgstr ""
-#: 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\""
+msgid "trying to select inexistent medium \"%s\""
+msgstr ""
+
+#: po/placeholder.h:110 urpm.pm:97
+msgid "wget failed\n"
msgstr ""
-#: 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]"
+msgid "unable to parse correctly [%s] on value \"%s\""
msgstr ""
-#: po/placeholder.h:109 urpm.pm:1104
+#: po/placeholder.h:112 urpm.pm:1110
#, fuzzy, c-format
msgid "The following packages contain %s: %s"
msgstr "Urm�toarele pachete con�in %s: %s\n"
-#: 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\""
+msgid "no rpm files found from [%s]"
msgstr ""
-#: po/placeholder.h:111 urpm.pm:1920
+#: po/placeholder.h:114 urpm.pm:1772
#, c-format
msgid "selecting %s using obsoletes"
msgstr ""
-#: po/placeholder.h:112 urpm.pm:2031
+#: po/placeholder.h:115 urpm.pm:1888
#, c-format
msgid "selecting %s by selection on files"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:114 urpmi:308 urpmi:315 urpmi:328 urpmi:339 urpmi:352
+#: po/placeholder.h:120
+msgid " --help - print this help message.\n"
+msgstr ""
+
+#: po/placeholder.h:121 urpmi:361
+msgid "everything already installed"
+msgstr "totul e deja instalat"
+
+#: po/placeholder.h:122 urpmi:98
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr ""
+
+#: po/placeholder.h:123 urpmi:194
+msgid "One of the following packages is needed:"
+msgstr "Unul din urm�toarele pachete e necesar:"
+
+#: 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 "Instalarea a e�uat"
-#: po/placeholder.h:115 urpmi:279
-msgid "Press enter when it's done..."
-msgstr "Ap�sa�i enter c�nd e gata..."
+#: 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 "A�i ales gre�it, �ncerca�i din nou\n"
+#: po/placeholder.h:134
+msgid " --X - use X interface.\n"
+msgstr ""
-#: 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 ""
+"Pentru a satisface dependen�ele, urm�toarele pachete vor fi instalate (%d MB)"
+
+#: po/placeholder.h:136 urpmi:320 urpmi:344
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "�ncearc� instalarea f�r� verificarea dependen�elor? (d/N) "
+
+#: 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
+msgid " -q - quiet mode.\n"
+msgstr ""
+
+#: po/placeholder.h:144 urpmi:202
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "Ce alege�i? (1-%d) "
+
+#: po/placeholder.h:145
+msgid " --wget - use wget to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:146
#, c-format
msgid ""
"urpmi version %s\n"
@@ -562,80 +655,74 @@ msgid ""
"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 ""
-#: po/placeholder.h:142 urpmi:362
-msgid "everything already installed"
-msgstr "totul e deja instalat"
+#: po/placeholder.h:152 urpmi:328 urpmi:352
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "�ncearc� instalarea �nc� �i mai dur (--force)? (d/N) "
-#: po/placeholder.h:143 urpmi:247
-#, c-format
+#: po/placeholder.h:154
msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+" --force - force invocation even if some packages do not exist.\n"
msgstr ""
-"Pentru a satisface dependen�ele, urm�toarele pachete vor fi instalate (%d MB)"
-#: po/placeholder.h:144 urpmi:296
-#, c-format
-msgid "installing %s\n"
-msgstr "instalez %s\n"
+#: po/placeholder.h:155 urpmi:205
+msgid "Sorry, bad choice, try again\n"
+msgstr "A�i ales gre�it, �ncerca�i din nou\n"
-#: po/placeholder.h:145 urpmi:198
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Ce alege�i? (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 "�ncearc� instalarea f�r� verificarea dependen�elor? (d/N) "
+#: 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 "Unul din urm�toarele pachete e necesar:"
+#: 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 "instalez %s\n"
-#: po/placeholder.h:148 urpmi:149
+#: po/placeholder.h:161 urpmi:152
msgid "Only superuser is allowed to install local packages"
msgstr "Doar superutilizatorul poate instala pachetele locale"
-#: po/placeholder.h:149 urpmi:278
+#: po/placeholder.h:162 urpmi:276
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "V� rog introduce�i %s cu numele %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 ""
-#: po/placeholder.h:151 urpmi:329 urpmi:353
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "�ncearc� instalarea �nc� �i mai dur (--force)? (d/N) "
+#: po/placeholder.h:165 urpmi:102
+#, fuzzy
+msgid "Only superuser is allowed to install packages"
+msgstr "Doar superutilizatorul poate instala pachetele locale"
+
+#: po/placeholder.h:166 urpmi:193
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Unul din urm�toarele pachete e necesar:"
+
+#: po/placeholder.h:167 urpmi:277
+msgid "Press Enter when it's done..."
+msgstr "Ap�sa�i enter c�nd e gata..."
-#: po/placeholder.h:155 urpmi.addmedia:46
+#: po/placeholder.h:168 urpmi.addmedia:46
#, c-format
msgid ""
"%s\n"
"`with' missing for ftp media\n"
msgstr ""
-#: po/placeholder.h:159
+#: po/placeholder.h:172
msgid ""
"usage: urpmi.addmedia [--update] <name> <url>\n"
"where <url> is one of\n"
@@ -647,31 +734,31 @@ msgid ""
" removable_<device>://<path>\n"
msgstr ""
-#: po/placeholder.h:168 urpmi.addmedia:57
+#: po/placeholder.h:181 urpmi.addmedia:57
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr ""
-#: po/placeholder.h:169 urpmi.addmedia:58
+#: po/placeholder.h:182 urpmi.addmedia:58
#, c-format
msgid "unable to update medium \"%s\"\n"
msgstr ""
-#: po/placeholder.h:170 urpmi.addmedia:42
+#: po/placeholder.h:183 urpmi.addmedia:42
#, c-format
msgid ""
"%s\n"
"device `%s' do not exist\n"
msgstr ""
-#: po/placeholder.h:174 urpmi.addmedia:44
+#: po/placeholder.h:187 urpmi.addmedia:44
#, c-format
msgid ""
"%s\n"
"<relative path of hdlist> missing\n"
msgstr ""
-#: po/placeholder.h:178
+#: po/placeholder.h:191
#, c-format
msgid ""
"usage: urpmi.update [-a] <name> ...\n"
@@ -683,29 +770,29 @@ msgid ""
"unknown options '%s'\n"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:188 urpmi.update:53
+#: po/placeholder.h:201 urpmi.update:53
#, c-format
msgid ""
"the entry to update is missing\n"
"(one of %s)\n"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:193 urpmi.removemedia:46
+#: po/placeholder.h:206 urpmi.removemedia:46
#, c-format
msgid ""
"the entry to remove is missing\n"
"(one of %s)\n"
msgstr ""
-#: po/placeholder.h:197
+#: po/placeholder.h:210
#, c-format
msgid ""
"usage: urpmi.removemedia [-a] <name> ...\n"
@@ -715,23 +802,38 @@ msgid ""
"unknown options '%s'\n"
msgstr ""
-#: po/placeholder.h:204 urpmq:85
+#: po/placeholder.h:217
+msgid " -h - print this help message.\n"
+msgstr ""
+
+#: po/placeholder.h:218 urpmq:130
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+
+#: po/placeholder.h:219
+msgid " -g - print groups too with name.\n"
+msgstr ""
+
+#: po/placeholder.h:220 urpmq:84
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr ""
-#: po/placeholder.h:206 urpmq:82
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#: po/placeholder.h:221
+msgid " names or rpm files given on command line are queried.\n"
msgstr ""
-#: po/placeholder.h:207 urpmq:131
-msgid ""
-"some package have to be removed for being upgraded, this is not supported "
-"yet\n"
+#: po/placeholder.h:223
+msgid " -r - print version and release too with name.\n"
msgstr ""
-#: po/placeholder.h:208
+#: po/placeholder.h:224
+msgid " -f - print version, release and arch with name.\n"
+msgstr ""
+
+#: po/placeholder.h:225
#, c-format
msgid ""
"urpmq version %s\n"
@@ -739,77 +841,68 @@ msgid ""
"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 package do not exist.\n"
-" names or rpm files given on command line are queried.\n"
msgstr ""
-#: urpm.pm:257
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:231
+msgid " -d - extend query to package dependencies.\n"
msgstr ""
-#: urpm.pm:258
-#, c-format
-msgid "taking removable device as \"%s\""
+#: po/placeholder.h:232
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
msgstr ""
-#: urpm.pm:262
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
+#: po/placeholder.h:233
+msgid ""
+" -c - choose complete method for resolving requires closure.\n"
msgstr ""
-#: urpm.pm:266 urpm.pm:269
+#: po/placeholder.h:235 urpmq:81
#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
msgstr ""
-#: urpm.pm:1339
-#, c-format
-msgid "read synthesis file [%s]"
+#: po/placeholder.h:236
+msgid ""
+" --headers - extract headers for package listed from urpmi db to\n"
+" stdout (root only).\n"
msgstr ""
-#: urpmi:49
-#, c-format
-msgid "urpmi version %s"
+#: po/placeholder.h:243
+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 ""
-#: urpmi:98
+#: urpm.pm:1796 urpm.pm:1805
#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgid "removing %s to upgrade to %s ..."
msgstr ""
-#: urpmi:102
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr "Doar superutilizatorul poate instala pachetele locale"
+#: urpm.pm:1797 urpm.pm:1806
+msgid ", $otherPackage, "
+msgstr ", $otherPackage, "
-#: urpmi:189
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Unul din urm�toarele pachete e necesar:"
+#: urpm.pm:1797 urpm.pm:1806
+msgid "));"
+msgstr "));"
-#: urpmi:301
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+#: urpm.pm:1802
+msgid "$p->{name}-$p->{version}-$p->{release}"
+msgstr "$p->{name}-$p->{version}-$p->{release}"
+
+#: urpm.pm:1812
+msgid "$prefix/$_"
+msgstr "$prefix/$_"
+
+#: urpmi:48
+#, c-format
+msgid "urpmi version %s"
msgstr ""
#: urpmi.addmedia:30
@@ -842,9 +935,6 @@ msgstr ", $_);"
msgid "urpmq version %s"
msgstr ""
-#~ msgid "));"
-#~ msgstr "));"
-
#~ msgid "), $_);"
#~ msgstr "), $_);"
diff --git a/po/ru.po b/po/ru.po
index 562864f2..8276ee2e 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,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: 2000-08-01 16:24+0200\n"
"Last-Translator: Aleksey Smirnov <smi@logic.ru>\n"
"Language-Team: Russian\n"
@@ -27,27 +27,27 @@ msgstr ""
"�������������� ��������� �������...\n"
"�� ��������� ��������� ������ $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 "��� ���������?"
-#: _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 "��������"
-#: _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 "��nN"
-#: _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 "��Yy"
-#: _irpm:42 po/placeholder.h:118 urpmi:258
+#: _irpm:42 po/placeholder.h:157 urpmi:258
msgid " (Y/n) "
msgstr " (�/�) "
@@ -151,120 +151,120 @@ msgstr ""
msgid "urpmi is not installed"
msgstr "urpmi �� ����������"
-#: po/placeholder.h:29 urpm.pm:283
+#: po/placeholder.h:29
+#, fuzzy, c-format
+msgid "reading synthesis file [%s]"
+msgstr "�� ������� ������� �������� ������ \"%s\"\n"
+
+#: po/placeholder.h:30 urpm.pm:298
#, c-format
msgid "unable to write config file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:31
+#: po/placeholder.h:32
#, c-format
msgid "nothing to write in list file for \"%s\""
msgstr ""
-#: 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 ""
-#: po/placeholder.h:33
+#: po/placeholder.h:34
#, fuzzy, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "�� ������� �������� �������� ������ \"%s\"\n"
-#: po/placeholder.h:34
+#: po/placeholder.h:35
#, c-format
msgid "nothing written in list file for \"%s\""
msgstr ""
-#: po/placeholder.h:35 urpm.pm:1951
-#, c-format
-msgid ""
-"removing %s to upgrade ...\n"
-" to %s since it will not upgrade correctly!"
-msgstr ""
-
-#: po/placeholder.h:39 urpm.pm:839
+#: po/placeholder.h:36 urpm.pm:845
#, c-format
msgid "read provides file [%s]"
msgstr ""
-#: po/placeholder.h:40
-#, fuzzy, c-format
-msgid "trying to remove inexistant medium \"%s\""
-msgstr "�� ������� ������� �������� ������ \"%s\"\n"
-
-#: po/placeholder.h:41 urpm.pm:1692
+#: po/placeholder.h:37 urpm.pm:1549
#, c-format
msgid "package %s is not found."
msgstr ""
-#: po/placeholder.h:42
-#, c-format
-msgid "unable to copy source of [%s] from [%s]"
-msgstr ""
-
-#: po/placeholder.h:43 urpm.pm:870
+#: po/placeholder.h:38 urpm.pm:876
#, fuzzy, c-format
msgid "unable to write compss file [%s]"
msgstr "�� ������� ������� �������� ������ \"%s\"\n"
-#: po/placeholder.h:44 urpm.pm:813
+#: po/placeholder.h:39 urpm.pm:819
#, c-format
msgid "unmounting %s"
msgstr ""
-#: po/placeholder.h:45
+#: po/placeholder.h:40
#, c-format
msgid "removing %d obsolete headers in cache"
msgstr ""
-#: 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 ""
-#: 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 ""
+
+#: po/placeholder.h:43 urpm.pm:184
+#, c-format
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+
+#: po/placeholder.h:44 urpm.pm:191
#, c-format
msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
msgstr ""
-#: po/placeholder.h:48
+#: po/placeholder.h:45
msgid "keeping only files referenced in provides"
msgstr ""
-#: po/placeholder.h:49
+#: po/placeholder.h:46
#, fuzzy, c-format
msgid "unable to build synthesis file for medium \"%s\""
msgstr "�� ������� �������� �������� ������ \"%s\"\n"
-#: po/placeholder.h:50
+#: po/placeholder.h:47
#, c-format
msgid "found %d headers in cache"
msgstr ""
-#: po/placeholder.h:51 urpm.pm:836
+#: po/placeholder.h:48 urpm.pm:842
#, fuzzy, c-format
msgid "unable to read provides file [%s]"
msgstr "�� ������� ������� �������� ������ \"%s\"\n"
-#: 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 ""
-#: po/placeholder.h:53 urpm.pm:311
+#: po/placeholder.h:50
#, c-format
-msgid "medium \"%s\" already exists"
+msgid ""
+"removing %s to upgrade to %s ...\n"
+" since it will not be updated otherwise"
msgstr ""
-#: po/placeholder.h:54 urpm.pm:295
+#: po/placeholder.h:54 urpm.pm:326
#, c-format
-msgid "write config file [%s]"
+msgid "medium \"%s\" already exists"
msgstr ""
#: po/placeholder.h:55
@@ -272,172 +272,186 @@ msgstr ""
msgid "unable to write list file of \"%s\""
msgstr "�� ������� ������� �������� ������ \"%s\"\n"
-#: po/placeholder.h:56 urpm.pm:1817
+#: po/placeholder.h:56 urpm.pm:310
#, c-format
-msgid "retrieving [%s]"
-msgstr ""
-
-#: po/placeholder.h:57 urpm.pm:1819
-#, c-format
-msgid "wget of [%s] failed"
+msgid "write config file [%s]"
msgstr ""
-#: po/placeholder.h:58 urpm.pm:1101
+#: po/placeholder.h:57 urpm.pm:1107
#, fuzzy, c-format
msgid "no package named %s"
msgstr "������ �� ������� %s\n"
-#: po/placeholder.h:59 urpm.pm:848
+#: po/placeholder.h:58 urpm.pm:854
#, fuzzy, c-format
msgid "unable to read compss file [%s]"
msgstr "�� ������� ������� �������� ������ \"%s\"\n"
-#: 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 ""
-#: po/placeholder.h:61
+#: po/placeholder.h:60
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr ""
-#: po/placeholder.h:62
+#: po/placeholder.h:61
msgid "computing dependencies"
msgstr ""
-#: po/placeholder.h:63 urpm.pm:868
+#: po/placeholder.h:62
+#, c-format
+msgid "retrieve of [%s] failed"
+msgstr ""
+
+#: po/placeholder.h:63 urpm.pm:874
#, c-format
msgid "write provides file [%s]"
msgstr ""
-#: po/placeholder.h:64 urpm.pm:803
+#: po/placeholder.h:64 urpm.pm:809
#, fuzzy, c-format
msgid "mounting %s"
msgstr "��������� %s\n"
-#: 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 "
"medium"
msgstr ""
-#: po/placeholder.h:66 urpm.pm:148
-#, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
-msgstr ""
-
-#: po/placeholder.h:67
+#: po/placeholder.h:66
#, c-format
msgid "reading hdlist file [%s]"
msgstr ""
-#: po/placeholder.h:68 urpm.pm:873
+#: po/placeholder.h:67 urpm.pm:879
#, c-format
msgid "write compss file [%s]"
msgstr ""
-#: po/placeholder.h:69 urpm.pm:827
+#: po/placeholder.h:68 urpm.pm:833
#, c-format
msgid "read depslist file [%s]"
msgstr ""
-#: po/placeholder.h:70
+#: 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 "trying to select inexistant medium \"%s\""
+msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "�� ������� ������� �������� ������ \"%s\"\n"
-#: po/placeholder.h:71 urpm.pm:1812
+#: po/placeholder.h:71 urpm.pm:1668
#, c-format
msgid "malformed input: [%s]"
msgstr ""
-#: 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"
+msgid "there are multiple packages with the same rpm filename \"%s\""
msgstr ""
-#: 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 ""
-#: po/placeholder.h:77 urpm.pm:865
+#: po/placeholder.h:74 urpm.pm:871
#, fuzzy, c-format
msgid "unable to write provides file [%s]"
msgstr "�� ������� ������� �������� ������ \"%s\"\n"
-#: 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 ""
-#: po/placeholder.h:79 urpm.pm:1005
+#: po/placeholder.h:76 urpm.pm:1215
+#, fuzzy
+msgid "unable to find all synthesis file, using parsehdlist server"
+msgstr "�� ������� �������� �������� ������ \"%s\"\n"
+
+#: po/placeholder.h:77 urpm.pm:1011
#, fuzzy
msgid "unable to register rpm file"
msgstr "�� ������� ������� �������� ������ \"%s\"\n"
-#: po/placeholder.h:80 urpm.pm:1362
-msgid "unable to find all synthesis file, using parsehdlist server"
+#: po/placeholder.h:78 urpm.pm:256
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
msgstr ""
-#: po/placeholder.h:81 urpm.pm:241
+#: po/placeholder.h:79 urpm.pm:272
#, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "too many mount points for removable medium \"%s\""
msgstr ""
-#: po/placeholder.h:82 urpm.pm:233
+#: po/placeholder.h:80 urpm.pm:248
#, c-format
msgid "incoherent list file for \"%s\", medium ignored"
msgstr ""
-#: po/placeholder.h:83
+#: po/placeholder.h:81
#, c-format
msgid "copy of [%s] failed"
msgstr ""
-#: po/placeholder.h:84 urpm.pm:907 urpm.pm:1338 urpm.pm:1616 urpm.pm:1623
+#: po/placeholder.h:82
+#, 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
#, fuzzy, c-format
msgid "unable to parse correctly [%s]"
msgstr "�� ������� �������� �������� ������ \"%s\"\n"
-#: po/placeholder.h:85 urpm.pm:824
+#: po/placeholder.h:84 urpm.pm:1192
#, fuzzy, c-format
-msgid "unable to read depslist file [%s]"
+msgid "read synthesis file [%s]"
msgstr "�� ������� ������� �������� ������ \"%s\"\n"
-#: po/placeholder.h:86
-msgid "removable medium not selected"
-msgstr ""
+#: po/placeholder.h:85 urpm.pm:830
+#, fuzzy, c-format
+msgid "unable to read depslist file [%s]"
+msgstr "�� ������� ������� �������� ������ \"%s\"\n"
-#: po/placeholder.h:87 urpm.pm:851
+#: po/placeholder.h:86 urpm.pm:857
#, c-format
msgid "read compss file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:89
+#: po/placeholder.h:88
#, c-format
msgid "building hdlist [%s]"
msgstr ""
-#: po/placeholder.h:90 urpm.pm:1746
+#: po/placeholder.h:89 urpm.pm:1603
#, fuzzy, c-format
msgid "unable to read rpm file [%s] from medium \"%s\""
msgstr "�� ������� ������� �������� ������ \"%s\"\n"
-#: po/placeholder.h:91 urpm.pm:1009
+#: po/placeholder.h:90 urpm.pm:1015
msgid "error registering local packages"
msgstr ""
-#: 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 ""
@@ -447,174 +461,162 @@ msgstr ""
msgid "unable to build hdlist: %s"
msgstr "�� ������� �������� �������� ������ \"%s\"\n"
-#: po/placeholder.h:94 urpm.pm:1000
-#, c-format
-msgid "invalid rpm file name [%s]"
-msgstr ""
-
-#: po/placeholder.h:95 urpm.pm:1736 urpm.pm:1739 urpm.pm:1758
+#: po/placeholder.h:94 urpm.pm:1593 urpm.pm:1596 urpm.pm:1615
#, c-format
msgid "medium \"%s\" is not selected"
msgstr ""
-#: po/placeholder.h:96 urpm.pm:207
+#: po/placeholder.h:95 urpm.pm:1006
#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "invalid rpm file name [%s]"
msgstr ""
-#: po/placeholder.h:97 urpm.pm:863
+#: po/placeholder.h:96 urpm.pm:1175
#, c-format
-msgid "write depslist file [%s]"
+msgid "unknown data associated with %s"
msgstr ""
-#: po/placeholder.h:98 urpm.pm:1322
+#: po/placeholder.h:97 urpm.pm:222
#, c-format
-msgid "unknown data associated with %s"
+msgid "trying to bypass existing medium \"%s\", avoiding"
msgstr ""
-#: po/placeholder.h:99
+#: po/placeholder.h:98 urpm.pm:869
#, c-format
-msgid "source of [%s] not found as [%s]"
+msgid "write depslist file [%s]"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: po/placeholder.h:102
-#, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
-msgstr ""
-
-#: po/placeholder.h:103 urpm.pm:1001
+#: po/placeholder.h:101 urpm.pm:1007
#, fuzzy, c-format
msgid "unable to access rpm file [%s]"
msgstr "�� ������� ������� �������� ������ \"%s\"\n"
-#: po/placeholder.h:104 urpm.pm:860
+#: po/placeholder.h:102 urpm.pm:866
#, fuzzy, c-format
msgid "unable to write depslist file [%s]"
msgstr "�� ������� ������� �������� ������ \"%s\"\n"
-#: po/placeholder.h:105 urpm.pm:327 urpm.pm:1773
+#: po/placeholder.h:103
+#, 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
#, fuzzy, c-format
msgid "unable to access medium \"%s\""
msgstr "�� ������� �������� �������� ������ \"%s\"\n"
-#: po/placeholder.h:106 urpm.pm:988
+#: po/placeholder.h:108 urpm.pm:994
#, c-format
msgid "relocated %s entries in depslist"
msgstr ""
-#: po/placeholder.h:107 urpm.pm:914 urpm.pm:1629 urpm.pm:1680
-#, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
+#: po/placeholder.h:109
+#, 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:108
+#: po/placeholder.h:111 urpm.pm:920 urpm.pm:1486 urpm.pm:1537
#, c-format
-msgid "no rpm files found from [%s]"
+msgid "unable to parse correctly [%s] on value \"%s\""
msgstr ""
-#: po/placeholder.h:109 urpm.pm:1104
+#: po/placeholder.h:112 urpm.pm:1110
#, fuzzy, c-format
msgid "The following packages contain %s: %s"
msgstr "��� ������ �������� %s: %s\n"
-#: 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\""
+msgid "no rpm files found from [%s]"
msgstr ""
-#: po/placeholder.h:111 urpm.pm:1920
+#: po/placeholder.h:114 urpm.pm:1772
#, c-format
msgid "selecting %s using obsoletes"
msgstr ""
-#: po/placeholder.h:112 urpm.pm:2031
+#: po/placeholder.h:115 urpm.pm:1888
#, c-format
msgid "selecting %s by selection on files"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:114 urpmi:308 urpmi:315 urpmi:328 urpmi:339 urpmi:352
-msgid "Installation failed"
-msgstr "��������� �� ������"
-
-#: po/placeholder.h:115 urpmi:279
-msgid "Press enter when it's done..."
-msgstr "�� ���������� ������� enter..."
+#: po/placeholder.h:120
+msgid " --help - print this help message.\n"
+msgstr ""
-#: po/placeholder.h:117 urpmi:201
-msgid "Sorry, bad choice, try again\n"
-msgstr "��������, ��� ������ �����, ���������� ���\n"
+#: po/placeholder.h:121 urpmi:361
+msgid "everything already installed"
+msgstr "��� ��� �����������"
-#: po/placeholder.h:120
+#: po/placeholder.h:122 urpmi:98
#, fuzzy, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr ""
+"urpmq: ����������� �������� \"-$1\", ��������� ������������� , � ���������� "
+"--help\n"
+
+#: po/placeholder.h:123 urpmi:194
+msgid "One of the following packages is needed:"
+msgstr "����� ���� �� ��������� �������:"
+
+#: po/placeholder.h:124 po/placeholder.h:222
+msgid " --update - use only update media.\n"
+msgstr ""
+
+#: po/placeholder.h:125 urpmi:299
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"
+"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 ""
-"urpmi ������ %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"��� ��������� ����������� ����������� � ��� ����� �������������� ��� "
-"���������� ������� �������� GNU GPL.\n"
-"�������������:\n"
-" --help - ������� ��� ���������.\n"
-" --auto - ������������� ������� ������� ����� �� ���������.\n"
-" --auto-select - ������������� ������� ������ ��� ���������� �������.\n"
-" --force - ��������� ��������� �������������, ���� ���� ����� �� "
-"����������.\n"
-" --X - ������������ X ��������� (�����������).\n"
-" --best-output - ������� ��������� ��������� � ������������ �� ������ "
-"���������:\n"
-" X ��� text �����.\n"
-" -a - ������� ��� ��������� � ��������� ������.\n"
-" -m - �������� ����������� ����������� ���������� (�� "
-"���������).\n"
-" -M - �������� ������������ ����������� ����������.\n"
-" -c - �������� ������ ����� ��� ����������� ����������� "
-"����������.\n"
-" -q - ����� �����.\n"
-" -v - ��������� �����.\n"
-" ����� ��� rpm ����� (������ ��� root) ������ � ��������� ������ "
-"�����������.\n"
-
-#: po/placeholder.h:142 urpmi:362
-msgid "everything already installed"
-msgstr "��� ��� �����������"
-#: po/placeholder.h:143 urpmi:247
+#: po/placeholder.h:131 urpmi:307 urpmi:314 urpmi:327 urpmi:338 urpmi:351
+msgid "Installation failed"
+msgstr "��������� �� ������"
+
+#: po/placeholder.h:132 po/placeholder.h:234
+msgid ""
+" --auto-select - automatically select packages for upgrading the system.\n"
+msgstr ""
+
+#: po/placeholder.h:134
+msgid " --X - use X interface.\n"
+msgstr ""
+
+#: po/placeholder.h:135 urpmi:247
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -622,44 +624,110 @@ msgid ""
msgstr ""
"��� �������������� ������������ ����� ����������� ��������� ������ (%d MB)"
-#: po/placeholder.h:144 urpmi:296
-#, c-format
-msgid "installing %s\n"
-msgstr "��������� %s\n"
+#: po/placeholder.h:136 urpmi:320 urpmi:344
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "����������� ���������� ��� �������� ������������? (�/�) "
+
+#: po/placeholder.h:137
+msgid ""
+" --best-output - choose best interface according to the environment:\n"
+" X or text mode.\n"
+msgstr ""
-#: po/placeholder.h:145 urpmi:198
+#: 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
+msgid " -q - quiet mode.\n"
+msgstr ""
+
+#: po/placeholder.h:144 urpmi:202
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "��� �� ��������? (1-%d) "
-#: po/placeholder.h:146 urpmi:321 urpmi:345
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "����������� ���������� ��� �������� ������������? (�/�) "
+#: po/placeholder.h:145
+msgid " --wget - use wget to retrieve distant files.\n"
+msgstr ""
-#: po/placeholder.h:147 urpmi:190
-msgid "One of the following packages is needed:"
-msgstr "����� ���� �� ��������� �������:"
+#: po/placeholder.h:146
+#, 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"
+msgstr ""
+
+#: po/placeholder.h:152 urpmi:328 urpmi:352
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "����������� ���������� ��� ����� ���������� (--force)? (�/�) "
+
+#: po/placeholder.h:154
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+
+#: po/placeholder.h:155 urpmi:205
+msgid "Sorry, bad choice, try again\n"
+msgstr "��������, ��� ������ �����, ���������� ���\n"
+
+#: po/placeholder.h:156
+msgid ""
+" names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: po/placeholder.h:158
+msgid " -a - select all matches on command line.\n"
+msgstr ""
+
+#: 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 "��������� %s\n"
-#: po/placeholder.h:148 urpmi:149
+#: po/placeholder.h:161 urpmi:152
msgid "Only superuser is allowed to install local packages"
msgstr ""
"������ ����������������� (��������������) ����������� ������������� "
"��������� ������"
-#: 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 "�������� �������� ������ � ������ \"%s\" � ���������� [%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 "�� ������� �������� �������� (source) ������, �������"
-#: po/placeholder.h:151 urpmi:329 urpmi:353
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "����������� ���������� ��� ����� ���������� (--force)? (�/�) "
+#: po/placeholder.h:165 urpmi:102
+#, fuzzy
+msgid "Only superuser is allowed to install packages"
+msgstr ""
+"������ ����������������� (��������������) ����������� ������������� "
+"��������� ������"
+
+#: po/placeholder.h:166 urpmi:193
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "����� ���� �� ��������� �������:"
+
+#: po/placeholder.h:167 urpmi:277
+msgid "Press Enter when it's done..."
+msgstr "�� ���������� ������� enter..."
-#: po/placeholder.h:155 urpmi.addmedia:46
+#: po/placeholder.h:168 urpmi.addmedia:46
#, c-format
msgid ""
"%s\n"
@@ -668,7 +736,7 @@ msgstr ""
"%s\n"
"`with' ���������� ��� ftp media\n"
-#: po/placeholder.h:159
+#: po/placeholder.h:172
msgid ""
"usage: urpmi.addmedia [--update] <name> <url>\n"
"where <url> is one of\n"
@@ -690,17 +758,17 @@ msgstr ""
"hdlist>\n"
" removable_<device>://<����> (��� ������� ���������)\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 "�� ������� ������� �������� ������ \"%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 "�� ������� �������� �������� ������ \"%s\"\n"
-#: po/placeholder.h:170 urpmi.addmedia:42
+#: po/placeholder.h:183 urpmi.addmedia:42
#, c-format
msgid ""
"%s\n"
@@ -709,7 +777,7 @@ msgstr ""
"%s\n"
"���������� `%s' �� ����������\n"
-#: po/placeholder.h:174 urpmi.addmedia:44
+#: po/placeholder.h:187 urpmi.addmedia:44
#, c-format
msgid ""
"%s\n"
@@ -718,7 +786,7 @@ msgstr ""
"%s\n"
"<������������� ���� � hdlist> �� ������\n"
-#: po/placeholder.h:178
+#: po/placeholder.h:191
#, fuzzy, c-format
msgid ""
"usage: urpmi.update [-a] <name> ...\n"
@@ -737,13 +805,13 @@ msgstr ""
"\n"
"����������� ��������� '%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 ""
"������ ��������� (����������� urpmi.addmedia ��� ���������� ��������� "
"������)\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"
@@ -752,12 +820,12 @@ msgstr ""
"����� ��� ���������� �� ������\n"
"(���� �� %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 ""
"������ ������� (����������� urpmi.addmedia ��� ���������� ��������� ������)\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"
@@ -766,7 +834,7 @@ msgstr ""
"����� ��� �������� �� ������\n"
"(���� �� %s)\n"
-#: po/placeholder.h:197
+#: po/placeholder.h:210
#, c-format
msgid ""
"usage: urpmi.removemedia [-a] <name> ...\n"
@@ -781,19 +849,11 @@ msgstr ""
"\n"
"����������� ��������� '%s'\n"
-#: po/placeholder.h:204 urpmq:85
-#, fuzzy, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: �� ������� ��������� rpm ���� \"$_\"\n"
-
-#: po/placeholder.h:206 urpmq:82
-#, fuzzy, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#: po/placeholder.h:217
+msgid " -h - print this help message.\n"
msgstr ""
-"urpmq: ����������� �������� \"-$1\", ��������� ������������� , � ���������� "
-"--help\n"
-#: 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"
@@ -801,7 +861,28 @@ msgstr ""
"��������� ������ ������ ���� ������� ����� �� �����������, ��� ���� �� "
"��������������\n"
-#: po/placeholder.h:208
+#: po/placeholder.h:219
+msgid " -g - print groups too with name.\n"
+msgstr ""
+
+#: po/placeholder.h:220 urpmq:84
+#, fuzzy, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: �� ������� ��������� rpm ���� \"$_\"\n"
+
+#: po/placeholder.h:221
+msgid " names or rpm files given on command line are queried.\n"
+msgstr ""
+
+#: po/placeholder.h:223
+msgid " -r - print version and release too with name.\n"
+msgstr ""
+
+#: po/placeholder.h:224
+msgid " -f - print version, release and arch with name.\n"
+msgstr ""
+
+#: po/placeholder.h:225
#, c-format
msgid ""
"urpmq version %s\n"
@@ -809,83 +890,72 @@ msgid ""
"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 package do not exist.\n"
-" names or rpm files given on command line are queried.\n"
msgstr ""
-#: urpm.pm:257
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:231
+msgid " -d - extend query to package dependencies.\n"
msgstr ""
-#: urpm.pm:258
-#, c-format
-msgid "taking removable device as \"%s\""
+#: po/placeholder.h:232
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
msgstr ""
-#: urpm.pm:262
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
+#: po/placeholder.h:233
+msgid ""
+" -c - choose complete method for resolving requires closure.\n"
msgstr ""
-#: urpm.pm:266 urpm.pm:269
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "�� ������� ������� �������� ������ \"%s\"\n"
-
-#: urpm.pm:1339
+#: po/placeholder.h:235 urpmq:81
#, fuzzy, c-format
-msgid "read synthesis file [%s]"
-msgstr "�� ������� ������� �������� ������ \"%s\"\n"
-
-#: urpmi:49
-#, c-format
-msgid "urpmi version %s"
-msgstr "urpmi ������ %s"
-
-#: urpmi:98
-#, fuzzy, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
msgstr ""
"urpmq: ����������� �������� \"-$1\", ��������� ������������� , � ���������� "
"--help\n"
-#: urpmi:102
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
+#: po/placeholder.h:236
+msgid ""
+" --headers - extract headers for package listed from urpmi db to\n"
+" stdout (root only).\n"
msgstr ""
-"������ ����������������� (��������������) ����������� ������������� "
-"��������� ������"
-#: urpmi:189
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "����� ���� �� ��������� �������:"
+#: po/placeholder.h:243
+msgid ""
+" -u - remove package if a better version is already installed.\n"
+msgstr ""
-#: urpmi:301
+#: po/placeholder.h:244
msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+" --force - force invocation even if some packages do not\n"
+"exist.\n"
msgstr ""
+#: urpm.pm:1796 urpm.pm:1805
+#, c-format
+msgid "removing %s to upgrade to %s ..."
+msgstr ""
+
+#: urpm.pm:1797 urpm.pm:1806
+msgid ", $otherPackage, "
+msgstr ", $otherPackage, "
+
+#: urpm.pm:1797 urpm.pm:1806
+msgid "));"
+msgstr "));"
+
+#: urpm.pm:1802
+msgid "$p->{name}-$p->{version}-$p->{release}"
+msgstr "$p->{name}-$p->{version}-$p->{release}"
+
+#: urpm.pm:1812
+msgid "$prefix/$_"
+msgstr "$prefix/$_"
+
+#: urpmi:48
+#, c-format
+msgid "urpmi version %s"
+msgstr "urpmi ������ %s"
+
#: urpmi.addmedia:30
#, fuzzy
msgid "usage: urpmi.addmedia [--update] <name> <url>"
@@ -917,8 +987,59 @@ msgstr ", $_);"
msgid "urpmq version %s"
msgstr "urpmq ������ %s"
-#~ msgid "));"
-#~ msgstr "));"
+#, fuzzy
+#~ 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 ""
+#~ "urpmi ������ %s\n"
+#~ "Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+#~ "��� ��������� ����������� ����������� � ��� ����� �������������� ��� "
+#~ "���������� ������� �������� GNU GPL.\n"
+#~ "�������������:\n"
+#~ " --help - ������� ��� ���������.\n"
+#~ " --auto - ������������� ������� ������� ����� �� ���������.\n"
+#~ " --auto-select - ������������� ������� ������ ��� ���������� "
+#~ "�������.\n"
+#~ " --force - ��������� ��������� �������������, ���� ���� ����� "
+#~ "�� ����������.\n"
+#~ " --X - ������������ X ��������� (�����������).\n"
+#~ " --best-output - ������� ��������� ��������� � ������������ �� ������ "
+#~ "���������:\n"
+#~ " X ��� text �����.\n"
+#~ " -a - ������� ��� ��������� � ��������� ������.\n"
+#~ " -m - �������� ����������� ����������� ���������� (�� "
+#~ "���������).\n"
+#~ " -M - �������� ������������ ����������� ����������.\n"
+#~ " -c - �������� ������ ����� ��� ����������� ����������� "
+#~ "����������.\n"
+#~ " -q - ����� �����.\n"
+#~ " -v - ��������� �����.\n"
+#~ " ����� ��� rpm ����� (������ ��� root) ������ � ��������� ������ "
+#~ "�����������.\n"
#~ msgid "), $_);"
#~ msgstr "), $_);"
diff --git a/po/sk.po b/po/sk.po
index 9f62d230..db37a9d8 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,7 +8,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-08-03 13:32+0100\n"
"Last-Translator: Jan Matis <damned@hq.sk>\n"
"Language-Team: sk <i18n@hq.alert.sk>\n"
@@ -28,27 +28,27 @@ msgstr ""
"Automatick� in�tal�cia bal��kov...\n"
"�iadali ste in�tal�ciu bal��ka $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 "Je to v poriadku?"
-#: _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 "Zru�"
-#: _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 "Nn"
-#: _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 "Aa��Yy"
-#: _irpm:42 po/placeholder.h:118 urpmi:258
+#: _irpm:42 po/placeholder.h:157 urpmi:258
msgid " (Y/n) "
msgstr " (�/n) "
@@ -151,297 +151,310 @@ msgstr "sk�ste urpmf --help pre zobrazenie mo�nost�"
msgid "urpmi is not installed"
msgstr "urpmi nieje nain�talovan�"
-#: po/placeholder.h:29 urpm.pm:283
+#: po/placeholder.h:29
+#, fuzzy, c-format
+msgid "reading synthesis file [%s]"
+msgstr "��tanie depslist s�boru [%s]"
+
+#: po/placeholder.h:30 urpm.pm:298
#, c-format
msgid "unable to write config file [%s]"
msgstr "nem��em zap�sa� konfigura�n� s�bor [%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 ""
-#: po/placeholder.h:31
+#: po/placeholder.h:32
#, fuzzy, c-format
msgid "nothing to write in list file for \"%s\""
msgstr "nem��em zapisa� list s�bor pre \"%s\""
-#: po/placeholder.h:32 urpm.pm:218
+#: po/placeholder.h:33 urpm.pm:233
#, fuzzy, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr ""
"nem��em prist�pi� k s�boru so zoznamom pre \"%s\", m�dium je ignorovan�"
-#: po/placeholder.h:33
+#: po/placeholder.h:34
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "nem��em parsova� hdlist s�bor pre \"%s\""
-#: po/placeholder.h:34
+#: po/placeholder.h:35
#, fuzzy, c-format
msgid "nothing written in list file for \"%s\""
msgstr "nem��em zapisa� list s�bor pre \"%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 ""
-
-#: po/placeholder.h:39 urpm.pm:839
+#: po/placeholder.h:36 urpm.pm:845
#, c-format
msgid "read provides file [%s]"
msgstr "��tanie provides s�boru [%s]"
-#: po/placeholder.h:40
-#, c-format
-msgid "trying to remove inexistant medium \"%s\""
-msgstr "pokus o odstr�nenie neexistuj�ceho m�dia \"%s\""
-
-#: po/placeholder.h:41 urpm.pm:1692
+#: po/placeholder.h:37 urpm.pm:1549
#, c-format
msgid "package %s is not found."
msgstr "nena�iel som bal��ek %s"
-#: po/placeholder.h:42
-#, fuzzy, c-format
-msgid "unable to copy source of [%s] from [%s]"
-msgstr "nem��em pre��ta� rpm s�bor [%s] z m�dia \"%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 "nem��em zap�sa� compss s�bor \"%s\""
-#: po/placeholder.h:44 urpm.pm:813
+#: po/placeholder.h:39 urpm.pm:819
#, c-format
msgid "unmounting %s"
msgstr "odp�jam %s"
-#: po/placeholder.h:45
+#: po/placeholder.h:40
#, c-format
msgid "removing %d obsolete headers in cache"
msgstr ""
-#: 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 "hdlist s�bor na m�diu nebol n�jden� \"%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 ""
+
+#: po/placeholder.h:43 urpm.pm:184
+#, c-format
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+
+#: po/placeholder.h:44 urpm.pm:191
#, c-format
msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
msgstr ""
-#: po/placeholder.h:48
+#: po/placeholder.h:45
msgid "keeping only files referenced in provides"
msgstr ""
-#: po/placeholder.h:49
+#: po/placeholder.h:46
#, c-format
msgid "unable to build synthesis file for medium \"%s\""
msgstr "nem��em vytvori� synthesis s�bor pre m�dium \"%s\""
-#: po/placeholder.h:50
+#: po/placeholder.h:47
#, c-format
msgid "found %d headers in cache"
msgstr ""
-#: po/placeholder.h:51 urpm.pm:836
+#: po/placeholder.h:48 urpm.pm:842
#, c-format
msgid "unable to read provides file [%s]"
msgstr "nem��em pre��ta� provides s�bor [%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 ""
-#: po/placeholder.h:53 urpm.pm:311
+#: po/placeholder.h:50
#, c-format
-msgid "medium \"%s\" already exists"
-msgstr "m�dium \"%s\" u� existuje"
+msgid ""
+"removing %s to upgrade to %s ...\n"
+" since it will not be updated otherwise"
+msgstr ""
-#: po/placeholder.h:54 urpm.pm:295
+#: po/placeholder.h:54 urpm.pm:326
#, c-format
-msgid "write config file [%s]"
-msgstr "z�pis konfigura�n�ho s�boru [%s]"
+msgid "medium \"%s\" already exists"
+msgstr "m�dium \"%s\" u� existuje"
#: po/placeholder.h:55
#, c-format
msgid "unable to write list file of \"%s\""
msgstr "nem��em zapisa� list s�bor pre \"%s\""
-#: po/placeholder.h:56 urpm.pm:1817
-#, c-format
-msgid "retrieving [%s]"
-msgstr ""
-
-#: po/placeholder.h:57 urpm.pm:1819
+#: po/placeholder.h:56 urpm.pm:310
#, c-format
-msgid "wget of [%s] failed"
-msgstr "wget pre [%s] ne�spe�n�"
+msgid "write config file [%s]"
+msgstr "z�pis konfigura�n�ho s�boru [%s]"
-#: po/placeholder.h:58 urpm.pm:1101
+#: po/placeholder.h:57 urpm.pm:1107
#, c-format
msgid "no package named %s"
msgstr "�iaden bal��ek s n�zvom %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 "nem��em pre��ta� compss s�bor [%s]"
-#: po/placeholder.h:60 urpm.pm:213
+#: po/placeholder.h:59 urpm.pm:228
#, fuzzy, c-format
msgid "unable to find hdlist file for \"%s\", medium ignored"
msgstr ""
"nem��em prist�pi� k s�boru so zoznamom pre \"%s\", m�dium je ignorovan�"
-#: po/placeholder.h:61
+#: po/placeholder.h:60
#, fuzzy, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "nem��em vytvori� synthesis s�bor pre m�dium \"%s\""
-#: po/placeholder.h:62
+#: po/placeholder.h:61
msgid "computing dependencies"
msgstr "h�ad�m z�vislosti"
-#: po/placeholder.h:63 urpm.pm:868
+#: po/placeholder.h:62
+#, fuzzy, c-format
+msgid "retrieve of [%s] failed"
+msgstr "wget pre [%s] ne�spe�n�"
+
+#: po/placeholder.h:63 urpm.pm:874
#, c-format
msgid "write provides file [%s]"
msgstr "z�pis provides s�boru [%s]"
-#: po/placeholder.h:64 urpm.pm:803
+#: po/placeholder.h:64 urpm.pm:809
#, c-format
msgid "mounting %s"
msgstr "prip�jam %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 "
"medium"
msgstr ""
-#: po/placeholder.h:66 urpm.pm:148
-#, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
-msgstr ""
-
-#: po/placeholder.h:67
+#: po/placeholder.h:66
#, c-format
msgid "reading hdlist file [%s]"
msgstr "��tam hdlist s�bor [%s]"
-#: po/placeholder.h:68 urpm.pm:873
+#: po/placeholder.h:67 urpm.pm:879
#, c-format
msgid "write compss file [%s]"
msgstr "z�pis compss s�boru [%s]"
-#: po/placeholder.h:69 urpm.pm:827
+#: po/placeholder.h:68 urpm.pm:833
#, c-format
msgid "read depslist file [%s]"
msgstr "��tanie depslist s�boru [%s]"
-#: po/placeholder.h:70
-#, c-format
-msgid "trying to select inexistant medium \"%s\""
-msgstr "pokus o v�ber neexistuj�ceho m�dia \"%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 "nem��em vytvori� m�dium \"%s\"\n"
-#: po/placeholder.h:71 urpm.pm:1812
+#: po/placeholder.h:71 urpm.pm:1668
#, c-format
msgid "malformed input: [%s]"
msgstr ""
-#: 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"
+msgid "there are multiple packages with the same rpm filename \"%s\""
msgstr ""
-#: 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 ""
-#: po/placeholder.h:77 urpm.pm:865
+#: po/placeholder.h:74 urpm.pm:871
#, c-format
msgid "unable to write provides file [%s]"
msgstr "nem��em zap�sa� provides s�bor [%s]"
-#: po/placeholder.h:78 urpm.pm:191
+#: po/placeholder.h:75 urpm.pm:206
#, fuzzy, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr ""
"nem��em prist�pi� k s�boru so zoznamom pre \"%s\", m�dium je ignorovan�"
-#: po/placeholder.h:79 urpm.pm:1005
-msgid "unable to register rpm file"
-msgstr "nem��em registrova� rpm s�bor"
-
-#: 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 "nem��em vytvori� synthesis s�bor pre m�dium \"%s\""
-#: po/placeholder.h:81 urpm.pm:241
+#: po/placeholder.h:77 urpm.pm:1011
+msgid "unable to register rpm file"
+msgstr "nem��em registrova� rpm s�bor"
+
+#: po/placeholder.h:78 urpm.pm:256
#, fuzzy, c-format
msgid "unable to inspect list file for \"%s\", medium ignored"
msgstr ""
"nem��em prist�pi� k s�boru so zoznamom pre \"%s\", m�dium je ignorovan�"
-#: 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 "po�koden� s�bor zoznamu pre \"%s\", m�dium je ignorovan�"
-#: po/placeholder.h:83
+#: po/placeholder.h:81
#, c-format
msgid "copy of [%s] failed"
msgstr "kop�rovanie [%s] zl�halo"
-#: 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 "pokus o odstr�nenie neexistuj�ceho m�dia \"%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 "nem��em spr�vne pre�ita� [%s]"
-#: po/placeholder.h:85 urpm.pm:824
+#: po/placeholder.h:84 urpm.pm:1192
+#, fuzzy, c-format
+msgid "read synthesis file [%s]"
+msgstr "��tanie depslist s�boru [%s]"
+
+#: po/placeholder.h:85 urpm.pm:830
#, c-format
msgid "unable to read depslist file [%s]"
msgstr "nem��em pre��ta� depslist s�bor [%s]"
-#: po/placeholder.h:86
-msgid "removable medium not selected"
-msgstr "nebolo vybrat� vymenite�n� m�dium"
-
-#: po/placeholder.h:87 urpm.pm:851
+#: po/placeholder.h:86 urpm.pm:857
#, c-format
msgid "read compss file [%s]"
msgstr "��tanie compss s�boru [%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 "syntaktick� chyba v konfigura�nom s�bore na riadku %s"
-#: po/placeholder.h:89
+#: po/placeholder.h:88
#, c-format
msgid "building hdlist [%s]"
msgstr "vytv�ram 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 "nem��em pre��ta� rpm s�bor [%s] z m�dia \"%s\""
-#: po/placeholder.h:91 urpm.pm:1009
+#: po/placeholder.h:90 urpm.pm:1015
msgid "error registering local packages"
msgstr ""
-#: 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 ""
@@ -451,173 +464,162 @@ msgstr ""
msgid "unable to build hdlist: %s"
msgstr "nem��em vytvori� hdlist: %s"
-#: po/placeholder.h:94 urpm.pm:1000
+#: po/placeholder.h:94 urpm.pm:1593 urpm.pm:1596 urpm.pm:1615
+#, fuzzy, c-format
+msgid "medium \"%s\" is not selected"
+msgstr "nebolo vybrat� vymenite�n� m�dium"
+
+#: po/placeholder.h:95 urpm.pm:1006
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "nespr�vne meno rpm s�boru [%s]"
-#: po/placeholder.h:95 urpm.pm:1736 urpm.pm:1739 urpm.pm:1758
-#, fuzzy, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "nebolo vybrat� vymenite�n� m�dium"
+#: po/placeholder.h:96 urpm.pm:1175
+#, c-format
+msgid "unknown data associated with %s"
+msgstr ""
-#: po/placeholder.h:96 urpm.pm:207
+#: po/placeholder.h:97 urpm.pm:222
#, fuzzy, c-format
msgid "trying to bypass existing medium \"%s\", avoiding"
msgstr "pokus o v�ber neexistuj�ceho m�dia \"%s\""
-#: po/placeholder.h:97 urpm.pm:863
+#: po/placeholder.h:98 urpm.pm:869
#, c-format
msgid "write depslist file [%s]"
msgstr "z�pis depslist s�boru [%s]"
-#: po/placeholder.h:98 urpm.pm:1322
-#, c-format
-msgid "unknown data associated with %s"
-msgstr ""
-
-#: po/placeholder.h:99
-#, c-format
-msgid "source of [%s] not found as [%s]"
-msgstr "zdroj [%s] nebol n�jdeny ako [%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 ""
"nem��em prist�pi� k s�boru so zoznamom pre \"%s\", m�dium je ignorovan�"
-#: 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 ""
-#: po/placeholder.h:102
-#, fuzzy, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
-msgstr "wget pre [%s] ne�spe�n�"
-
-#: po/placeholder.h:103 urpm.pm:1001
+#: po/placeholder.h:101 urpm.pm:1007
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "nem��em prist�pi� k rpm s�boru [%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 "nem��em zap�sa� depslist s�bor [%s]"
-#: po/placeholder.h:105 urpm.pm:327 urpm.pm:1773
+#: po/placeholder.h:103
+#, 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
#, c-format
msgid "unable to access medium \"%s\""
msgstr "nem��em prist�pi� na m�dium \"%s\""
-#: po/placeholder.h:106 urpm.pm:988
+#: po/placeholder.h:108 urpm.pm:994
#, c-format
msgid "relocated %s entries in depslist"
msgstr "premiestnen�ch %s polo�iek v zozname z�vislosti"
-#: po/placeholder.h:107 urpm.pm:914 urpm.pm:1629 urpm.pm:1680
+#: po/placeholder.h:109
+#, c-format
+msgid "trying to select inexistent medium \"%s\""
+msgstr "pokus o v�ber neexistuj�ceho m�dia \"%s\""
+
+#: po/placeholder.h:110 urpm.pm:97
+#, fuzzy
+msgid "wget failed\n"
+msgstr "wget pre [%s] ne�spe�n�"
+
+#: po/placeholder.h:111 urpm.pm:920 urpm.pm:1486 urpm.pm:1537
#, fuzzy, c-format
msgid "unable to parse correctly [%s] on value \"%s\""
msgstr "nem��em spr�vne pre�ita� [%s]"
-#: po/placeholder.h:108
-#, fuzzy, c-format
-msgid "no rpm files found from [%s]"
-msgstr "nespr�vne meno rpm s�boru [%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 "Nasleduj�ce bal��ky obsahuj� %s: %s"
-#: po/placeholder.h:110 urpm.pm:1645 urpm.pm:1671
-#, c-format
-msgid "there are multiples packages with the same rpm filename \"%s\""
-msgstr ""
+#: po/placeholder.h:113
+#, fuzzy, c-format
+msgid "no rpm files found from [%s]"
+msgstr "nespr�vne meno rpm s�boru [%s]"
-#: po/placeholder.h:111 urpm.pm:1920
+#: po/placeholder.h:114 urpm.pm:1772
#, c-format
msgid "selecting %s using obsoletes"
msgstr ""
-#: po/placeholder.h:112 urpm.pm:2031
+#: po/placeholder.h:115 urpm.pm:1888
#, c-format
msgid "selecting %s by selection on files"
msgstr ""
-#: 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
#, fuzzy, c-format
msgid "unable to determine medium of this hdlist file [%s]"
msgstr "nem��em zap�sa� depslist s�bor [%s]"
-#: po/placeholder.h:114 urpmi:308 urpmi:315 urpmi:328 urpmi:339 urpmi:352
-msgid "Installation failed"
-msgstr "In�tal�cia zlyhala"
+#: po/placeholder.h:120
+msgid " --help - print this help message.\n"
+msgstr ""
-# ******************fix me***********
-#: po/placeholder.h:115 urpmi:279
-msgid "Press enter when it's done..."
-msgstr "Po ukon�en� stla�te enter..."
+#: po/placeholder.h:121 urpmi:361
+msgid "everything already installed"
+msgstr "v�etko je u� nain�talovan�"
-#: po/placeholder.h:117 urpmi:201
-msgid "Sorry, bad choice, try again\n"
-msgstr "Prep��te, zl� vo�ba, sk�ste znova\n"
+#: po/placeholder.h:122 urpmi:98
+#, fuzzy, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: nezn�ma vo�ba \"-%s\", pou��tie zist�te s --help\n"
-#: po/placeholder.h:120
-#, c-format
+#: po/placeholder.h:123 urpmi:194
+msgid "One of the following packages is needed:"
+msgstr "Jeden z nasleduj�cich bal�kov je potrebn�:"
+
+#: po/placeholder.h:124 po/placeholder.h:222
+msgid " --update - use only update media.\n"
+msgstr ""
+
+#: po/placeholder.h:125 urpmi:299
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"
+"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 ""
-"urpmi verzia %s\n"
-"Copyright (C) 1999, 2000,2001 MandrakeSoft.\n"
-"Tento program je distribuovan� pod licenciou GNU GPL.\n"
-"pou�ite:\n"
-" --help - zobraz� t�to pomoc.\n"
-" --auto - automatick� vo�ba spr�vnych bal��kov.\n"
-" --auto-select - automatick� vo�ba bal��kov na aktualiz�ciu syst�mu.\n"
-" --force - vn�� in�tal�ciu aj ak niesu dodr�an� v�etky podmienky.\n"
-" --X - pou�i X rozhranie.\n"
-" --best-output - zvo� najlep�ie rozhranie pod�a prostredia:\n"
-" X alebo text m�d.\n"
-" -a - zvo� v�etko �o s�hlasi s parametramy v pr�kazovom "
-"riadku.\n"
-" -m - zvo� minim�lne z�vislosti (�tandardn�).\n"
-" -M - zvo� maxim�lne z�vislosti.\n"
-" -c - kompletn� v�ber pod�a z�vislosti.\n"
-" -p - povo� vyh�ad�vanie v provides pre n�jdenie bal��ka.\n"
-" -q - tich� m�d.\n"
-" -v - vypisova� v�etko.\n"
-" n�zvy alebo rpm s�bory (iba ako root) zadan� v pr�kazovom riadku pre "
-"in�tal�ciu.\n"
-
-#: po/placeholder.h:142 urpmi:362
-msgid "everything already installed"
-msgstr "v�etko je u� nain�talovan�"
-#: po/placeholder.h:143 urpmi:247
+#: po/placeholder.h:131 urpmi:307 urpmi:314 urpmi:327 urpmi:338 urpmi:351
+msgid "Installation failed"
+msgstr "In�tal�cia zlyhala"
+
+#: po/placeholder.h:132 po/placeholder.h:234
+msgid ""
+" --auto-select - automatically select packages for upgrading the system.\n"
+msgstr ""
+
+#: po/placeholder.h:134
+msgid " --X - use X interface.\n"
+msgstr ""
+
+#: po/placeholder.h:135 urpmi:247
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -626,43 +628,108 @@ msgstr ""
"Kv�li zachovaniu z�vislost�, by mali by� nain�talovan� nasleduj�ce bal�ky (%"
"d MB)"
-#: po/placeholder.h:144 urpmi:296
-#, c-format
-msgid "installing %s\n"
-msgstr "in�talujem %s\n"
+#: po/placeholder.h:136 urpmi:320 urpmi:344
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Sk�si� in�tal�ciu bez kontroly z�vislost�? (�/N) "
-#: po/placeholder.h:145 urpmi:198
+#: 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
+msgid " -q - quiet mode.\n"
+msgstr ""
+
+#: po/placeholder.h:144 urpmi:202
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "V� v�ber? (1-%d) "
-#: po/placeholder.h:146 urpmi:321 urpmi:345
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Sk�si� in�tal�ciu bez kontroly z�vislost�? (�/N) "
+#: po/placeholder.h:145
+msgid " --wget - use wget to retrieve distant files.\n"
+msgstr ""
-#: po/placeholder.h:147 urpmi:190
-msgid "One of the following packages is needed:"
-msgstr "Jeden z nasleduj�cich bal�kov je potrebn�:"
+#: 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"
+msgstr "Toto je free softv�r a mus� by� redistribuovan� pod licenciou GNU GPL."
+
+#: po/placeholder.h:152 urpmi:328 urpmi:352
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Sk�si� \"tvrd�iu\" in�tal�ciu (--force)? (�/N) "
+
+#: po/placeholder.h:154
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+
+#: po/placeholder.h:155 urpmi:205
+msgid "Sorry, bad choice, try again\n"
+msgstr "Prep��te, zl� vo�ba, sk�ste znova\n"
+
+#: po/placeholder.h:156
+msgid ""
+" names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: po/placeholder.h:158
+msgid " -a - select all matches on command line.\n"
+msgstr ""
+
+#: 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 "in�talujem %s\n"
-#: po/placeholder.h:148 urpmi:149
+#: po/placeholder.h:161 urpmi:152
msgid "Only superuser is allowed to install local packages"
msgstr "In�talova� bal�ky m� dovolen� jedine root"
# **************fix me****************
-#: 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 "Pros�m vlo�te m�dium \"%s\" do zariadenia [%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 "nem��em z�ska� zdrojov� bal��ky, preru�ujem"
-#: po/placeholder.h:151 urpmi:329 urpmi:353
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Sk�si� \"tvrd�iu\" in�tal�ciu (--force)? (�/N) "
+#: po/placeholder.h:165 urpmi:102
+#, fuzzy
+msgid "Only superuser is allowed to install packages"
+msgstr "In�talova� bal�ky m� dovolen� jedine root"
+
+#: po/placeholder.h:166 urpmi:193
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Jeden z nasleduj�cich bal�kov je potrebn�:"
-#: po/placeholder.h:155 urpmi.addmedia:46
+# ******************fix me***********
+#: po/placeholder.h:167 urpmi:277
+msgid "Press Enter when it's done..."
+msgstr "Po ukon�en� stla�te enter..."
+
+#: po/placeholder.h:168 urpmi.addmedia:46
#, c-format
msgid ""
"%s\n"
@@ -671,7 +738,7 @@ msgstr ""
"%s\n"
"`with' ch�ba pre ftp\n"
-#: po/placeholder.h:159
+#: po/placeholder.h:172
msgid ""
"usage: urpmi.addmedia [--update] <name> <url>\n"
"where <url> is one of\n"
@@ -691,17 +758,17 @@ msgstr ""
" http://<hostite�>/<cesta> with <relat�vnym menom s�boru hdlist>\n"
" removable_<zariadenie>://<cesta>\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 "nem��em vytvori� m�dium \"%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 "nem��em aktualizova� m�dium \"%s\"\n"
-#: po/placeholder.h:170 urpmi.addmedia:42
+#: po/placeholder.h:183 urpmi.addmedia:42
#, c-format
msgid ""
"%s\n"
@@ -710,7 +777,7 @@ msgstr ""
"%s\n"
"zariadenie `%s' neexistuje\n"
-#: po/placeholder.h:174 urpmi.addmedia:44
+#: po/placeholder.h:187 urpmi.addmedia:44
#, c-format
msgid ""
"%s\n"
@@ -719,7 +786,7 @@ msgstr ""
"%s\n"
"ch�ba <relat�vna cesta k hdlist>\n"
-#: po/placeholder.h:178
+#: po/placeholder.h:191
#, c-format
msgid ""
"usage: urpmi.update [-a] <name> ...\n"
@@ -738,11 +805,11 @@ msgstr ""
"\n"
"nezn�me vo�by '%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 "niet ni� na aktualiz�ciu (pou�i urpmi.addmedia na pridanie m�dia)\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"
@@ -751,11 +818,11 @@ msgstr ""
"ch�ba polo�ka pre aktualiz�ciu\n"
"(jeden z %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 "niet ni� na odstr�nenie (pou�i urpmi.addmedia na pridanie m�dia)\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"
@@ -764,7 +831,7 @@ msgstr ""
"ch�ba polo�ka pre odstr�nenie\n"
"(jedna z %s)\n"
-#: po/placeholder.h:197
+#: po/placeholder.h:210
#, c-format
msgid ""
"usage: urpmi.removemedia [-a] <name> ...\n"
@@ -779,17 +846,11 @@ msgstr ""
"\n"
"nezn�me vo�by '%s'\n"
-#: po/placeholder.h:204 urpmq:85
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: nem��em pre��ta� rpm s�bor \"%s\"\n"
-
-#: po/placeholder.h:206 urpmq:82
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: nezn�ma vo�ba \"-%s\", pou��tie zist�te s --help\n"
+#: po/placeholder.h:217
+msgid " -h - print this help message.\n"
+msgstr ""
-#: 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"
@@ -797,87 +858,99 @@ msgstr ""
"niektor� bal��ky by mali by� odstr�nene pri aktualiz�cii, zatia� to nieje "
"podorovan�\n"
-#: po/placeholder.h:208
+#: po/placeholder.h:219
+msgid " -g - print groups too with name.\n"
+msgstr ""
+
+#: po/placeholder.h:220 urpmq:84
#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: nem��em pre��ta� rpm s�bor \"%s\"\n"
+
+#: po/placeholder.h:221
+msgid " names or rpm files given on command line are queried.\n"
+msgstr ""
+
+#: po/placeholder.h:223
+msgid " -r - print version and release too with name.\n"
+msgstr ""
+
+#: 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"
+msgstr "Toto je free softv�r a mus� by� redistribuovan� pod licenciou GNU GPL."
+
+#: po/placeholder.h:231
+msgid " -d - extend query to package dependencies.\n"
+msgstr ""
+
+#: po/placeholder.h:232
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
+msgstr ""
+
+#: po/placeholder.h:233
+msgid ""
" -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"
+msgstr ""
+
+#: po/placeholder.h:235 urpmq:81
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: nezn�ma vo�ba \"-%s\", pou��tie zist�te s --help\n"
+
+#: po/placeholder.h:236
+msgid ""
" --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 package do not exist.\n"
-" names or rpm files given on command line are queried.\n"
msgstr ""
-#: urpm.pm:257
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:243
+msgid ""
+" -u - remove package if a better version is already installed.\n"
msgstr ""
-#: urpm.pm:258
-#, c-format
-msgid "taking removable device as \"%s\""
+#: po/placeholder.h:244
+msgid ""
+" --force - force invocation even if some packages do not\n"
+"exist.\n"
msgstr ""
-#: urpm.pm:262
+#: urpm.pm:1796 urpm.pm:1805
#, c-format
-msgid "using different removable device [%s] for \"%s\""
+msgid "removing %s to upgrade to %s ..."
msgstr ""
-#: urpm.pm:266 urpm.pm:269
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "nem��em vytvori� m�dium \"%s\"\n"
+#: urpm.pm:1797 urpm.pm:1806
+msgid ", $otherPackage, "
+msgstr ", $otherPackage, "
-#: urpm.pm:1339
-#, fuzzy, c-format
-msgid "read synthesis file [%s]"
-msgstr "��tanie depslist s�boru [%s]"
+#: urpm.pm:1797 urpm.pm:1806
+msgid "));"
+msgstr "));"
-#: urpmi:49
+#: urpm.pm:1802
+msgid "$p->{name}-$p->{version}-$p->{release}"
+msgstr "$p->{name}-$p->{version}-$p->{release}"
+
+#: urpm.pm:1812
+msgid "$prefix/$_"
+msgstr "$prefix/$_"
+
+#: urpmi:48
#, c-format
msgid "urpmi version %s"
msgstr "urpmi verzia %s"
-#: urpmi:98
-#, fuzzy, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: nezn�ma vo�ba \"-%s\", pou��tie zist�te s --help\n"
-
-#: urpmi:102
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr "In�talova� bal�ky m� dovolen� jedine root"
-
-#: urpmi:189
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Jeden z nasleduj�cich bal�kov je potrebn�:"
-
-#: urpmi:301
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
-msgstr ""
-
#: urpmi.addmedia:30
msgid "usage: urpmi.addmedia [--update] <name> <url>"
msgstr "pou�itie: urpmi.addmedia [--update <meno> <url>"
@@ -907,3 +980,67 @@ msgstr ", $_);"
#, c-format
msgid "urpmq version %s"
msgstr "urpmq verzia %s"
+
+#, fuzzy
+#~ msgid "wget of [%s] failed (maybe wget is missing?)"
+#~ msgstr "wget pre [%s] ne�spe�n�"
+
+#, fuzzy
+#~ msgid "unable to copy source of [%s] from [%s]"
+#~ msgstr "nem��em pre��ta� rpm s�bor [%s] z m�dia \"%s\""
+
+#~ msgid "removable medium not selected"
+#~ msgstr "nebolo vybrat� vymenite�n� m�dium"
+
+#~ msgid "source of [%s] not found as [%s]"
+#~ msgstr "zdroj [%s] nebol n�jdeny ako [%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 ""
+#~ "urpmi verzia %s\n"
+#~ "Copyright (C) 1999, 2000,2001 MandrakeSoft.\n"
+#~ "Tento program je distribuovan� pod licenciou GNU GPL.\n"
+#~ "pou�ite:\n"
+#~ " --help - zobraz� t�to pomoc.\n"
+#~ " --auto - automatick� vo�ba spr�vnych bal��kov.\n"
+#~ " --auto-select - automatick� vo�ba bal��kov na aktualiz�ciu syst�mu.\n"
+#~ " --force - vn�� in�tal�ciu aj ak niesu dodr�an� v�etky "
+#~ "podmienky.\n"
+#~ " --X - pou�i X rozhranie.\n"
+#~ " --best-output - zvo� najlep�ie rozhranie pod�a prostredia:\n"
+#~ " X alebo text m�d.\n"
+#~ " -a - zvo� v�etko �o s�hlasi s parametramy v pr�kazovom "
+#~ "riadku.\n"
+#~ " -m - zvo� minim�lne z�vislosti (�tandardn�).\n"
+#~ " -M - zvo� maxim�lne z�vislosti.\n"
+#~ " -c - kompletn� v�ber pod�a z�vislosti.\n"
+#~ " -p - povo� vyh�ad�vanie v provides pre n�jdenie bal��ka.\n"
+#~ " -q - tich� m�d.\n"
+#~ " -v - vypisova� v�etko.\n"
+#~ " n�zvy alebo rpm s�bory (iba ako root) zadan� v pr�kazovom riadku pre "
+#~ "in�tal�ciu.\n"
diff --git a/po/sp.po b/po/sp.po
index 7ecd23e1..9f5e31ce 100644
--- a/po/sp.po
+++ b/po/sp.po
@@ -7,7 +7,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-09-19 07:53GMT+1\n"
"Last-Translator: Toma Jankovic <tomaja@net.yu>\n"
"Language-Team: SERBIAN <office@mandrake.co.yu>\n"
@@ -28,27 +28,27 @@ msgstr ""
"���������� ���������j� �����a...\n"
"��������� ��� ���������j� ������ $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 "�� �� �� �K ?"
-#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:281
+#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:279
msgid "Ok"
msgstr "�K"
-#: _irpm:34 po/placeholder.h:116 urpmi:252 urpmi:282
+#: _irpm:34 po/placeholder.h:119 urpmi:252 urpmi:280
msgid "Cancel"
msgstr "�������"
-#: _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 "��Nn"
-#: _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 "��DdYy"
-#: _irpm:42 po/placeholder.h:118 urpmi:258
+#: _irpm:42 po/placeholder.h:157 urpmi:258
msgid " (Y/n) "
msgstr " (�/�) "
@@ -158,177 +158,179 @@ msgstr "�������� �� urpmf --help �� ���� ������"
msgid "urpmi is not installed"
msgstr "urpmi ��j� ����������"
-#: po/placeholder.h:29 urpm.pm:283
+#: po/placeholder.h:29
+#, fuzzy, c-format
+msgid "reading synthesis file [%s]"
+msgstr "����� depslist �������� [%s]"
+
+#: po/placeholder.h:30 urpm.pm:298
#, c-format
msgid "unable to write config file [%s]"
msgstr "�� ���� �� ������� ���� � �������������� �������� [%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 ""
-"�� ���� �� �������� \"%s\" ��� �� �������� ������� ���� ��� �� ��� �������"
-#: po/placeholder.h:31
+#: po/placeholder.h:32
#, c-format
msgid "nothing to write in list file for \"%s\""
msgstr "���� ����� �� ���� � �������� ����� �� \"%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 "������ �� �������� �������� ����� �� \"%s\", ������� �� ���������"
-#: po/placeholder.h:33
+#: po/placeholder.h:34
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "�� ���� �� �������� hdlist �������� �� \"%s\""
-#: po/placeholder.h:34
+#: po/placeholder.h:35
#, c-format
msgid "nothing written in list file for \"%s\""
msgstr "���� ��� �� �� ����� � �������� ����� �� \"%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 ""
-"������� %s ���� ��������� ...\n"
-" �� %s ���� ���� ��� �� ���� �������� � �������� �� �� �������!"
-
-#: po/placeholder.h:39 urpm.pm:839
+#: po/placeholder.h:36 urpm.pm:845
#, c-format
msgid "read provides file [%s]"
msgstr "������ ��������� �������� [%s]"
-#: po/placeholder.h:40
-#, c-format
-msgid "trying to remove inexistant medium \"%s\""
-msgstr "�� ���� �� ������� ����j \"%s\""
-
-#: po/placeholder.h:41 urpm.pm:1692
+#: po/placeholder.h:37 urpm.pm:1549
#, c-format
msgid "package %s is not found."
msgstr "����� %s ���� ��������."
-#: po/placeholder.h:42
-#, c-format
-msgid "unable to copy source of [%s] from [%s]"
-msgstr "��� ���� �� ������� ����� [%s] �� [%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 "�� ���� �� ������� ���� � compss �������� [%s]"
-#: po/placeholder.h:44 urpm.pm:813
+#: po/placeholder.h:39 urpm.pm:819
#, c-format
msgid "unmounting %s"
msgstr "���������� %s"
-#: po/placeholder.h:45
+#: po/placeholder.h:40
#, c-format
msgid "removing %d obsolete headers in cache"
msgstr "������� %d obsolete h������ � ��� ��������"
-#: 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 "���� ��������� hdlist �������� �� ����� \"%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 ""
+"����� \"%s\" �������� �� ������� hdlist ���� �� ��� �������, ����� �� "
+"���������"
+
+#: po/placeholder.h:43 urpm.pm:184
+#, c-format
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"�� ���� �� �������� \"%s\" ��� �� �������� ������� ���� ��� �� ��� �������"
+
+#: po/placeholder.h:44 urpm.pm:191
#, c-format
msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
msgstr ""
"�� ���� �� ����� ����� \"%s\" � �������� ����� �� ������� �������� ����� [%"
"s] "
-#: po/placeholder.h:48
+#: po/placeholder.h:45
msgid "keeping only files referenced in provides"
msgstr "������� ���� �������� �������� ��� ��������"
-#: po/placeholder.h:49
+#: po/placeholder.h:46
#, c-format
msgid "unable to build synthesis file for medium \"%s\""
msgstr "�� ���� �� ������� �������� �������� �� ����� \"%s\""
-#: po/placeholder.h:50
+#: po/placeholder.h:47
#, c-format
msgid "found %d headers in cache"
msgstr "��������� %d ������ � ��� ��������"
-#: po/placeholder.h:51 urpm.pm:836
+#: po/placeholder.h:48 urpm.pm:842
#, c-format
msgid "unable to read provides file [%s]"
msgstr "�� ���� �� �������� provides �������� [%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 "��������� ����������� %s ����� ��� ������� ����� ���� �������"
-#: 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 ""
+"������� %s ���� ��������� ...\n"
+" �� %s ����� ��������� �� �� ������ ���������"
+
+#: po/placeholder.h:54 urpm.pm:326
#, c-format
msgid "medium \"%s\" already exists"
msgstr "����� \"%s\" ��� �������"
-#: po/placeholder.h:54 urpm.pm:295
-#, c-format
-msgid "write config file [%s]"
-msgstr "�������� � �������������� �������� [%s]"
-
#: po/placeholder.h:55
#, c-format
msgid "unable to write list file of \"%s\""
msgstr "�� ���� �� ������ �������� ����� �� \"%s\""
-#: po/placeholder.h:56 urpm.pm:1817
+#: po/placeholder.h:56 urpm.pm:310
#, c-format
-msgid "retrieving [%s]"
-msgstr "������ [%s]"
-
-#: po/placeholder.h:57 urpm.pm:1819
-#, c-format
-msgid "wget of [%s] failed"
-msgstr "wget �� [%s] �������"
+msgid "write config file [%s]"
+msgstr "�������� � �������������� �������� [%s]"
-#: po/placeholder.h:58 urpm.pm:1101
+#: po/placeholder.h:57 urpm.pm:1107
#, c-format
msgid "no package named %s"
msgstr "���� ������ �� ������ %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 "�� ���� �� �������� compss �������� [%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 "�� ���� �� �������� hdlist �������� �� \"%s\", ������� �� ���������"
-#: po/placeholder.h:61
+#: po/placeholder.h:60
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "������� hdlist �������� �������� �� ����� \"%s\""
-#: po/placeholder.h:62
+#: po/placeholder.h:61
msgid "computing dependencies"
msgstr "����������� ����������"
-#: po/placeholder.h:63 urpm.pm:868
+#: po/placeholder.h:62
+#, fuzzy, c-format
+msgid "retrieve of [%s] failed"
+msgstr "wget �� [%s] �������"
+
+#: po/placeholder.h:63 urpm.pm:874
#, c-format
msgid "write provides file [%s]"
msgstr "����� provides �������� [%s]"
-#: po/placeholder.h:64 urpm.pm:803
+#: po/placeholder.h:64 urpm.pm:809
#, c-format
msgid "mounting %s"
msgstr "�������� %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 "
@@ -337,125 +339,135 @@ msgstr ""
"�� ���� �� �������� ����� \"%s\" ����� �� �������� ����� �������� �� ������ "
"������ ������"
-#: po/placeholder.h:66 urpm.pm:148
-#, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
-msgstr ""
-"����� \"%s\" �������� �� ������� ����� ���� �� � ��������, ����� �� ���������"
-
-#: po/placeholder.h:67
+#: po/placeholder.h:66
#, c-format
msgid "reading hdlist file [%s]"
msgstr "����� hdlist �������� [%s]"
-#: po/placeholder.h:68 urpm.pm:873
+#: po/placeholder.h:67 urpm.pm:879
#, c-format
msgid "write compss file [%s]"
msgstr "�������� compss �������� [%s]"
-#: po/placeholder.h:69 urpm.pm:827
+#: po/placeholder.h:68 urpm.pm:833
#, c-format
msgid "read depslist file [%s]"
msgstr "����� depslist �������� [%s]"
-#: po/placeholder.h:70
-#, c-format
-msgid "trying to select inexistant medium \"%s\""
-msgstr "��������� �� ���������� inexistant ����� \"%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 "�� ���� �� ������� ����j \"%s\"\n"
-#: po/placeholder.h:71 urpm.pm:1812
+#: po/placeholder.h:71 urpm.pm:1668
#, c-format
msgid "malformed input: [%s]"
msgstr "�������� ����: [%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 ""
-"����� \"%s\" �������� �� ������� hdlist ���� �� ��� �������, ����� �� "
-"���������"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "������� ���� ������ �� ����� ������ 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 ""
-"������� %s ���� ��������� ...\n"
-" �� %s ����� ��������� �� �� ������ ���������"
+"����� \"%s\" �������� �� ������� ����� ���� �� � ��������, ����� �� ���������"
-#: po/placeholder.h:77 urpm.pm:865
+#: po/placeholder.h:74 urpm.pm:871
#, c-format
msgid "unable to write provides file [%s]"
msgstr "�� ���� �� ������� ���� � provides �������� [%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 "�� ���� �� ��������� hdlist �������� �� \"%s\", ����� �� ���������"
-#: po/placeholder.h:79 urpm.pm:1005
-msgid "unable to register rpm file"
-msgstr "�� ���� �� ����������� 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 "�� ���� �� �������� ��� �������� ��������, �������� parsehdlist ������"
-#: po/placeholder.h:81 urpm.pm:241
+#: po/placeholder.h:77 urpm.pm:1011
+msgid "unable to register rpm file"
+msgstr "�� ���� �� ����������� rpm ��������"
+
+#: po/placeholder.h:78 urpm.pm:256
#, c-format
msgid "unable to inspect list file for \"%s\", medium ignored"
msgstr "�� ���� �� �������� �������� ����� �� \"%s\", ����� �� ���������"
-#: 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 "������������ �������� ����� �� \"%s\", ����� �� ���������"
-#: po/placeholder.h:83
+#: po/placeholder.h:81
#, c-format
msgid "copy of [%s] failed"
msgstr "�������� [%s] ��������"
-#: 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 "�� ���� �� ������� ����j \"%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 "�� ���� �� �������� �������� [%s]"
-#: po/placeholder.h:85 urpm.pm:824
+#: po/placeholder.h:84 urpm.pm:1192
+#, fuzzy, c-format
+msgid "read synthesis file [%s]"
+msgstr "����� depslist �������� [%s]"
+
+#: po/placeholder.h:85 urpm.pm:830
#, c-format
msgid "unable to read depslist file [%s]"
msgstr "�� ���� �� �������� depslist �������� [%s]"
-#: po/placeholder.h:86
-msgid "removable medium not selected"
-msgstr "��������� ����� ���� �������"
-
-#: po/placeholder.h:87 urpm.pm:851
+#: po/placeholder.h:86 urpm.pm:857
#, c-format
msgid "read compss file [%s]"
msgstr "����� compss �������� [%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 "��������� ������ � ��������������� �������� � ������ %s"
-#: po/placeholder.h:89
+#: po/placeholder.h:88
#, c-format
msgid "building hdlist [%s]"
msgstr "������� 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 "�� ���� �� �������� rpm �������� [%s] �� ������ \"%s\""
-#: po/placeholder.h:91 urpm.pm:1009
+#: po/placeholder.h:90 urpm.pm:1015
msgid "error registering local packages"
msgstr "������ ��� ������������ �������� ������"
-#: 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 ""
@@ -466,213 +478,274 @@ msgstr ""
msgid "unable to build hdlist: %s"
msgstr "�� ���� �� ������� 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 "����� \"%s\" ���� �������"
+
+#: po/placeholder.h:95 urpm.pm:1006
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "�������� ��� rpm �������� [%s]"
-#: 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 "����� \"%s\" ���� �������"
+msgid "unknown data associated with %s"
+msgstr "��������� ������ �������� �� %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 "��������� �� ��������� ��������� ����� \"%s\", ���������"
-#: po/placeholder.h:97 urpm.pm:863
+#: po/placeholder.h:98 urpm.pm:869
#, c-format
msgid "write depslist file [%s]"
msgstr "�������� depslist �������� [%s]"
-#: po/placeholder.h:98 urpm.pm:1322
-#, c-format
-msgid "unknown data associated with %s"
-msgstr "��������� ������ �������� �� %s"
-
-#: po/placeholder.h:99
-#, c-format
-msgid "source of [%s] not found as [%s]"
-msgstr "����� [%s] ���� �������� ��� [%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 "�� ���� �� ��������� �������� ����� �� \"%s\", m���� ���������"
-#: 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 "��������� ����������� %s ����� ���� ���� ��������� ������� ��������"
-#: po/placeholder.h:102
-#, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
-msgstr "wget [%s] ������� (����� ��������� 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 "�� ���� �� ��������� 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 "�� ���� �� ������ depslist �������� [%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 ""
+"������� %s ���� ��������� ...\n"
+" �� %s ���� ���� ��� �� ���� �������� � �������� �� �� �������!"
+
+#: po/placeholder.h:107 urpm.pm:342 urpm.pm:1630
#, c-format
msgid "unable to access medium \"%s\""
msgstr "�� ���� �� ��������� ����j� \"%s\""
-#: po/placeholder.h:106 urpm.pm:988
+#: po/placeholder.h:108 urpm.pm:994
#, c-format
msgid "relocated %s entries in depslist"
msgstr "���������� %s ����� � depslist"
-#: 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 "�� ���� �� �������� �������� [%s] �� �������� \"%s\""
+msgid "trying to select inexistent medium \"%s\""
+msgstr "��������� �� ���������� inexistant ����� \"%s\""
-#: po/placeholder.h:108
+#: po/placeholder.h:110 urpm.pm:97
+#, fuzzy
+msgid "wget failed\n"
+msgstr "wget �� [%s] �������"
+
+#: po/placeholder.h:111 urpm.pm:920 urpm.pm:1486 urpm.pm:1537
#, c-format
-msgid "no rpm files found from [%s]"
-msgstr "���� rpm �������� �� [%s]"
+msgid "unable to parse correctly [%s] on value \"%s\""
+msgstr "�� ���� �� �������� �������� [%s] �� �������� \"%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 "������� ������ ������ %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 "������� ���� ������ �� ����� ������ rpm �������� \"%s\""
+msgid "no rpm files found from [%s]"
+msgstr "���� rpm �������� �� [%s]"
-#: po/placeholder.h:111 urpm.pm:1920
+#: po/placeholder.h:114 urpm.pm:1772
#, c-format
msgid "selecting %s using obsoletes"
msgstr "���������� %s ��������� obsoletes"
-#: po/placeholder.h:112 urpm.pm:2031
+#: po/placeholder.h:115 urpm.pm:1888
#, c-format
msgid "selecting %s by selection on files"
msgstr "���������� %s ������������ ��������"
-#: 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 "�� ���� �� ������� ����� �� ��� 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 - ������ ��� ������."
+
+#: po/placeholder.h:121 urpmi:361
+msgid "everything already installed"
+msgstr "��� �� ��� �����������"
+
+#: po/placeholder.h:122 urpmi:98
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: ��������� ����j� \"-%s\", ��������� �������� �� --help\n"
+
+#: po/placeholder.h:123 urpmi:194
+msgid "One of the following packages is needed:"
+msgstr "�������� �� ������� �����(�):"
+
+#: 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 "����������� ��������"
-#: po/placeholder.h:115 urpmi:279
-msgid "Press enter when it's done..."
-msgstr "���������� enter ���� �������e..."
+#: 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 "��� �����, �������� ������\n"
+#: po/placeholder.h:134
+#, fuzzy
+msgid " --X - use X interface.\n"
+msgstr " --all - ������ ��� ������."
-#: 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 "���� ���������� ����������, ������� ������ �� ���� ����������� (%d MB)"
+
+#: po/placeholder.h:136 urpmi:320 urpmi:344
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "������������ ��� ������� ���������� (�a/�e)? "
+
+#: 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 - ������ ��� ������."
+
+#: po/placeholder.h:144 urpmi:202
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "��� �� ��� ����� ? (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 ""
-"urpmi �����ja %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"��� j� ��������� ������� � ���� �� ������������� ��� �������� GNU � GPL "
-"�������.\n"
-"�������a:\n"
-" --help - ��������j� ���j ����� �� �����.\n"
-" --auto - ���������� �������j� ������ ������ � ������.\n"
-" --auto-select - ���������� �������j� ������ ������ �� ������a�� "
-"������a.\n"
-" --force - ������j� �������e ��� � ��� ���� ������ � �� �����je.\n"
-" --X - ������� X �������j�.\n"
-" --best-output - ���� ��j���� �������j� � ���������� �� �����e�a:\n"
-" X ��� ��������� ���.\n"
-" -a - �������j� ��� ������a�� � ��������j ����j�.\n"
-" -m - ���� ��������� ������e (default).\n"
-" -M - ���� ���������� ������e.\n"
-" -c - ���� ��������� ����� �� �e���a�� ������� �� ������a�e.\n"
-" -q - ���� ���.\n"
-" -v - verbose ���.\n"
-" ����� ��� rpm �������� (���� �� root ���������je)���� � ��������� ������ "
-"��je �� �����������.\n"
-
-#: po/placeholder.h:142 urpmi:362
-msgid "everything already installed"
-msgstr "��� �� ��� �����������"
+"��� �� ��������� ������� � ���� ���� �������� �������������� ��� �������� "
+"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 "�������� ����������� (--force)? (�a/�e) ?"
+
+#: po/placeholder.h:154
msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
-msgstr "���� ���������� ����������, ������� ������ �� ���� ����������� (%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 "���������� %s\n"
+#: po/placeholder.h:155 urpmi:205
+msgid "Sorry, bad choice, try again\n"
+msgstr "��� �����, �������� ������\n"
-#: po/placeholder.h:145 urpmi:198
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "��� �� ��� ����� ? (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 "������������ ��� ������� ���������� (�a/�e)? "
+#: 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 "�������� �� ������� �����(�):"
+#: 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 "���������� %s\n"
-#: po/placeholder.h:148 urpmi:149
+#: po/placeholder.h:161 urpmi:152
msgid "Only superuser is allowed to install local packages"
msgstr "���� ������������� ���� ����������� ������� �����e"
-#: 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 "������� ����j �� ������ %s � ������ %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 "����� ������ ��j� ��������,�������..."
-#: po/placeholder.h:151 urpmi:329 urpmi:353
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "�������� ����������� (--force)? (�a/�e) ?"
+#: po/placeholder.h:165 urpmi:102
+#, fuzzy
+msgid "Only superuser is allowed to install packages"
+msgstr "���� ������������� ���� ����������� ������� �����e"
+
+#: po/placeholder.h:166 urpmi:193
+#, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "����� �� �������� ������ �� �������� �� �� ����������� %s:"
-#: po/placeholder.h:155 urpmi.addmedia:46
+#: po/placeholder.h:167 urpmi:277
+msgid "Press Enter when it's done..."
+msgstr "���������� enter ���� �������e..."
+
+#: po/placeholder.h:168 urpmi.addmedia:46
#, c-format
msgid ""
"%s\n"
@@ -681,7 +754,7 @@ msgstr ""
"%s\n"
"`with' �������je �� ftp ����j\n"
-#: po/placeholder.h:159
+#: po/placeholder.h:172
msgid ""
"usage: urpmi.addmedia [--update] <name> <url>\n"
"where <url> is one of\n"
@@ -701,17 +774,17 @@ msgstr ""
" http://<host>/<���a�a> with <��������� ��� �������� �a hdlist>\n"
" removable_<������>://<���a�a>\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 "�� ���� �� ������� ����j \"%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 "�� ���� �� a������� ����j \"%s\"\n"
-#: po/placeholder.h:170 urpmi.addmedia:42
+#: po/placeholder.h:183 urpmi.addmedia:42
#, c-format
msgid ""
"%s\n"
@@ -720,7 +793,7 @@ msgstr ""
"%s\n"
"������ `%s' �� �����j�\n"
-#: po/placeholder.h:174 urpmi.addmedia:44
+#: po/placeholder.h:187 urpmi.addmedia:44
#, c-format
msgid ""
"%s\n"
@@ -729,7 +802,7 @@ msgstr ""
"%s\n"
"�������j� <��������� ���a�� hdlist>\n"
-#: po/placeholder.h:178
+#: po/placeholder.h:191
#, c-format
msgid ""
"usage: urpmi.update [-a] <name> ...\n"
@@ -749,11 +822,11 @@ msgstr ""
"\n"
"��������� ����je '%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 "���� ������ �a a�����a�e (������� urpmi.addmedia �� �����a�� ����ja)\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"
@@ -762,11 +835,11 @@ msgstr ""
"�������j� ���� �� a�����a��\n"
"(j���� �� %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 "���� ������ �a ����a�e (������� urpmi.addmedia �� �����a�� ����ja)\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"
@@ -775,7 +848,7 @@ msgstr ""
"�������j� ���� �� ����a�e\n"
"(j���� �� %s)\n"
-#: po/placeholder.h:197
+#: po/placeholder.h:210
#, c-format
msgid ""
"usage: urpmi.removemedia [-a] <name> ...\n"
@@ -790,129 +863,115 @@ msgstr ""
"\n"
"��������� ����je '%s'\n"
-#: po/placeholder.h:204 urpmq:85
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: �� ���� �� �������� rpm �������� \"%s\"\n"
-
-#: po/placeholder.h:206 urpmq:82
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: ��������� ����j� \"-%s\", ��������� �������� �� --help\n"
+#: po/placeholder.h:217
+#, fuzzy
+msgid " -h - print this help message.\n"
+msgstr " --all - ������ ��� ������."
-#: 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 ""
"���� ������ ����j� ���� �������� �� �� ���� a��������, ��� j�� ��j���������\n"
-#: po/placeholder.h:208
+#: po/placeholder.h:219
+#, fuzzy
+msgid " -g - print groups too with name.\n"
+msgstr " --group - ������ ��� �����: �����."
+
+#: po/placeholder.h:220 urpmq:84
#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: �� ���� �� �������� 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 " �������� ������ ��� ��� ����� ������)."
+
+#: 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"
-" --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 ""
-"urpmq ������ %s\n"
-"Copyright (C) 2000, 2001 MandrakeSoft.\n"
"��� �� ��������� ������� � ���� ���� �������� �������������� ��� �������� "
-"GNU � GPL �������.\n"
-"��������:\n"
-" -h - ��������� ��� ������ �� ������.\n"
-" -v - verbose ���.\n"
-" -d - ������� ������� � ���������� ������.\n"
-" -u - ������ ����� ������� �� ���� ������� ��� �����������.\n"
-" -m - ������� ������� � ���������� ������, ������ ������\n"
-" ��������� ������ ���� ���������� ��������, ������\n"
-" ������ ���� ���� ������������������.\n"
-" -M - ������� ������� � ���������� ������ � ������ ���\n"
-" ����������� ������ ���� ��� �� ������ ��� ����.\n"
-" -c - ���� �������� ������ �� �������� ��������.\n"
-" -p - ��������� ������������ � provides ���� �������� ������.\n"
-" -g - ��������� ����� �� ������.\n"
-" -r - ��������� ������� �� ������.\n"
-" --update - ������� ���� ������ �� update-��.\n"
-" --auto-select - ���������� ��������� ������ �� ��������� �������.\n"
-" --headers - �������� ������ �� ������ ��������� �� urpmi db ��\n"
-" stdout (���� �� root �����������).\n"
-" --sources - ���� ��� ������� ������ ��� download-� (���� �� root "
-"�����������).\n"
-" --force - ��������� �� �������� ��� � ��� ���� ������� �� �������.\n"
-" ����� rpm �������� ����� � ��������� ������ �� ��������.\n"
-
-#: urpm.pm:257
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+"GNU � GPL."
+
+#: po/placeholder.h:231
+#, fuzzy
+msgid " -d - extend query to package dependencies.\n"
+msgstr " �������� ������ ��� ��� ����� ������)."
+
+#: po/placeholder.h:232
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
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: ��������� ����j� \"-%s\", ��������� �������� �� --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 "�� ���� �� ������� ����j \"%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 "����� depslist �������� [%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 "urpmi �����j� %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: ��������� ����j� \"-%s\", ��������� �������� �� --help\n"
+#: urpm.pm:1797 urpm.pm:1806
+msgid ", $otherPackage, "
+msgstr ", $otherPackage, "
-#: urpmi:102
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr "���� ������������� ���� ����������� ������� �����e"
+#: urpm.pm:1797 urpm.pm:1806
+msgid "));"
+msgstr "));"
-#: urpmi:189
-#, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "����� �� �������� ������ �� �������� �� �� ����������� %s:"
+#: 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 "urpmi �����j� %s"
#: urpmi.addmedia:30
msgid "usage: urpmi.addmedia [--update] <name> <url>"
@@ -943,3 +1002,130 @@ msgstr ", $_);"
#, c-format
msgid "urpmq version %s"
msgstr "urpmq �����ja %s"
+
+#~ msgid "retrieving [%s]"
+#~ msgstr "������ [%s]"
+
+#~ msgid "wget of [%s] failed (maybe wget is missing?)"
+#~ msgstr "wget [%s] ������� (����� ��������� wget?)"
+
+#~ msgid "unable to copy source of [%s] from [%s]"
+#~ msgstr "��� ���� �� ������� ����� [%s] �� [%s]"
+
+#~ msgid "removable medium not selected"
+#~ msgstr "��������� ����� ���� �������"
+
+#~ msgid "source of [%s] not found as [%s]"
+#~ msgstr "����� [%s] ���� �������� ��� [%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 ""
+#~ "urpmi �����ja %s\n"
+#~ "Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+#~ "��� j� ��������� ������� � ���� �� ������������� ��� �������� GNU � GPL "
+#~ "�������.\n"
+#~ "�������a:\n"
+#~ " --help - ��������j� ���j ����� �� �����.\n"
+#~ " --auto - ���������� �������j� ������ ������ � ������.\n"
+#~ " --auto-select - ���������� �������j� ������ ������ �� ������a�� "
+#~ "������a.\n"
+#~ " --force - ������j� �������e ��� � ��� ���� ������ � �� "
+#~ "�����je.\n"
+#~ " --X - ������� X �������j�.\n"
+#~ " --best-output - ���� ��j���� �������j� � ���������� �� �����e�a:\n"
+#~ " X ��� ��������� ���.\n"
+#~ " -a - �������j� ��� ������a�� � ��������j ����j�.\n"
+#~ " -m - ���� ��������� ������e (default).\n"
+#~ " -M - ���� ���������� ������e.\n"
+#~ " -c - ���� ��������� ����� �� �e���a�� ������� �� "
+#~ "������a�e.\n"
+#~ " -q - ���� ���.\n"
+#~ " -v - verbose ���.\n"
+#~ " ����� ��� rpm �������� (���� �� root ���������je)���� � ��������� "
+#~ "������ ��je �� �����������.\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 ""
+#~ "urpmq ������ %s\n"
+#~ "Copyright (C) 2000, 2001 MandrakeSoft.\n"
+#~ "��� �� ��������� ������� � ���� ���� �������� �������������� ��� �������� "
+#~ "GNU � GPL �������.\n"
+#~ "��������:\n"
+#~ " -h - ��������� ��� ������ �� ������.\n"
+#~ " -v - verbose ���.\n"
+#~ " -d - ������� ������� � ���������� ������.\n"
+#~ " -u - ������ ����� ������� �� ���� ������� ��� �����������.\n"
+#~ " -m - ������� ������� � ���������� ������, ������ ������\n"
+#~ " ��������� ������ ���� ���������� ��������, ������\n"
+#~ " ������ ���� ���� ������������������.\n"
+#~ " -M - ������� ������� � ���������� ������ � ������ ���\n"
+#~ " ����������� ������ ���� ��� �� ������ ��� ����.\n"
+#~ " -c - ���� �������� ������ �� �������� ��������.\n"
+#~ " -p - ��������� ������������ � provides ���� �������� "
+#~ "������.\n"
+#~ " -g - ��������� ����� �� ������.\n"
+#~ " -r - ��������� ������� �� ������.\n"
+#~ " --update - ������� ���� ������ �� update-��.\n"
+#~ " --auto-select - ���������� ��������� ������ �� ��������� �������.\n"
+#~ " --headers - �������� ������ �� ������ ��������� �� urpmi db ��\n"
+#~ " stdout (���� �� root �����������).\n"
+#~ " --sources - ���� ��� ������� ������ ��� download-� (���� �� root "
+#~ "�����������).\n"
+#~ " --force - ��������� �� �������� ��� � ��� ���� ������� �� "
+#~ "�������.\n"
+#~ " ����� rpm �������� ����� � ��������� ������ �� ��������.\n"
diff --git a/po/sr.po b/po/sr.po
index 5ccf14e6..f3845b5d 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -7,7 +7,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-09-19 07:53GMT+1\n"
"Last-Translator: Toma Jankovic_<tomaja@net.yu>\n"
"Language-Team: SERBIAN <office@mandrake.co.yu>\n"
@@ -28,27 +28,27 @@ msgstr ""
"Automatska instalacija paketa...\n"
"Zahtevali ste instalaciju paketa $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 "Da li je OK ?"
-#: _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 "Poni�ti"
-#: _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 "NnNn"
-#: _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 "DdDdYy"
-#: _irpm:42 po/placeholder.h:118 urpmi:258
+#: _irpm:42 po/placeholder.h:157 urpmi:258
msgid " (Y/n) "
msgstr " (D/n) "
@@ -158,177 +158,179 @@ msgstr "probajte sa urpmf --help za vi�e opcija"
msgid "urpmi is not installed"
msgstr "urpmi nije instaliran"
-#: po/placeholder.h:29 urpm.pm:283
+#: po/placeholder.h:29
+#, fuzzy, c-format
+msgid "reading synthesis file [%s]"
+msgstr "�itam depslist datoteku [%s]"
+
+#: po/placeholder.h:30 urpm.pm:298
#, c-format
msgid "unable to write config file [%s]"
msgstr "ne mogu da izvr�im upis u konfiguracionu datoteku [%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 ""
-"ne mogu da koristim \"%s\" ime za bezimeni medijum zato �to se veKj koristi"
-#: po/placeholder.h:31
+#: po/placeholder.h:32
#, c-format
msgid "nothing to write in list file for \"%s\""
msgstr "nema ni�ta za upis u datoteku liste za \"%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 "nemogu da pronagjem datoteku liste za \"%s\", medijum je ignorisan"
-#: po/placeholder.h:33
+#: po/placeholder.h:34
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "ne mogu da parsiram hdlist datoteku za \"%s\""
-#: po/placeholder.h:34
+#: po/placeholder.h:35
#, c-format
msgid "nothing written in list file for \"%s\""
msgstr "nema �ta da se upi�e u datoteku liste za \"%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 ""
-"uklanjam %s radi a�uriranja ...\n"
-" na %s zbog toga �to ne mo�e direktno i ispravno da se a�urira!"
-
-#: po/placeholder.h:39 urpm.pm:839
+#: po/placeholder.h:36 urpm.pm:845
#, c-format
msgid "read provides file [%s]"
msgstr "�itanje omoguKjuje datoteku [%s]"
-#: po/placeholder.h:40
-#, c-format
-msgid "trying to remove inexistant medium \"%s\""
-msgstr "ne mogu da uklonim medij \"%s\""
-
-#: po/placeholder.h:41 urpm.pm:1692
+#: po/placeholder.h:37 urpm.pm:1549
#, c-format
msgid "package %s is not found."
msgstr "paket %s nije pronagjen."
-#: po/placeholder.h:42
-#, c-format
-msgid "unable to copy source of [%s] from [%s]"
-msgstr "nem mogu da kopiram izvor [%s] iz [%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 "ne mogu da izvr�im upis u compss datoteku [%s]"
-#: po/placeholder.h:44 urpm.pm:813
+#: po/placeholder.h:39 urpm.pm:819
#, c-format
msgid "unmounting %s"
msgstr "demontiram %s"
-#: po/placeholder.h:45
+#: po/placeholder.h:40
#, c-format
msgid "removing %d obsolete headers in cache"
msgstr "uklanjam %d obsolete hhedere u ke� memoriji"
-#: 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 "nije pronagjena hdlist datoteka za medij \"%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 ""
+"medij \"%s\" poku�ava da koristi hdlist koji se veKj koristi, medij je "
+"ignorisan"
+
+#: po/placeholder.h:43 urpm.pm:184
+#, c-format
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"ne mogu da koristim \"%s\" ime za bezimeni medijum zato �to se veKj koristi"
+
+#: po/placeholder.h:44 urpm.pm:191
#, c-format
msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
msgstr ""
"ne mogu da uzmem medij \"%s\" u ra�unicu po�to ne postoji datoteka liste [%"
"s] "
-#: po/placeholder.h:48
+#: po/placeholder.h:45
msgid "keeping only files referenced in provides"
msgstr "sa�uvaj samo datoteke ozna�ene kao dostupno"
-#: po/placeholder.h:49
+#: po/placeholder.h:46
#, c-format
msgid "unable to build synthesis file for medium \"%s\""
msgstr "ne mogu da kreiram sinteznu datoteku za medij \"%s\""
-#: po/placeholder.h:50
+#: po/placeholder.h:47
#, c-format
msgid "found %d headers in cache"
msgstr "pronagjeno %d hedera u ke� memoriji"
-#: po/placeholder.h:51 urpm.pm:836
+#: po/placeholder.h:48 urpm.pm:842
#, c-format
msgid "unable to read provides file [%s]"
msgstr "ne mogu da pro�itam provides datoteku [%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 "izbegavam selektovanje %s po�to njen lokalni jezik nije izabran"
-#: 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 ""
+"uklanjam %s radi a�uriranja ...\n"
+" na %s po�to druga�ije ne bi uspelo a�uriranje"
+
+#: po/placeholder.h:54 urpm.pm:326
#, c-format
msgid "medium \"%s\" already exists"
msgstr "medij \"%s\" veKj postoji"
-#: po/placeholder.h:54 urpm.pm:295
-#, c-format
-msgid "write config file [%s]"
-msgstr "upisujem u konfiguracionu datoteku [%s]"
-
#: po/placeholder.h:55
#, c-format
msgid "unable to write list file of \"%s\""
msgstr "ne mogu da upi�em datoteku liste za \"%s\""
-#: po/placeholder.h:56 urpm.pm:1817
+#: po/placeholder.h:56 urpm.pm:310
#, c-format
-msgid "retrieving [%s]"
-msgstr "vraKjam [%s]"
-
-#: po/placeholder.h:57 urpm.pm:1819
-#, c-format
-msgid "wget of [%s] failed"
-msgstr "wget za [%s] neuspeo"
+msgid "write config file [%s]"
+msgstr "upisujem u konfiguracionu datoteku [%s]"
-#: po/placeholder.h:58 urpm.pm:1101
+#: po/placeholder.h:57 urpm.pm:1107
#, c-format
msgid "no package named %s"
msgstr "Nema paketa sa imenom %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 "ne mogu da pro�itam compss datoteku [%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 "ne mogu da pronagjem hdlist datoteku za \"%s\", medijum je ignorisan"
-#: po/placeholder.h:61
+#: po/placeholder.h:60
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "kreiram hdlist simteznu datoteku za medij \"%s\""
-#: po/placeholder.h:62
+#: po/placeholder.h:61
msgid "computing dependencies"
msgstr "izra�unavam zavisnosti"
-#: po/placeholder.h:63 urpm.pm:868
+#: po/placeholder.h:62
+#, fuzzy, c-format
+msgid "retrieve of [%s] failed"
+msgstr "wget za [%s] neuspeo"
+
+#: po/placeholder.h:63 urpm.pm:874
#, c-format
msgid "write provides file [%s]"
msgstr "upi�i provides datoteku [%s]"
-#: po/placeholder.h:64 urpm.pm:803
+#: po/placeholder.h:64 urpm.pm:809
#, c-format
msgid "mounting %s"
msgstr "montiram %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 "
@@ -337,126 +339,136 @@ msgstr ""
"ne mogu da koristim medij \"%s\" po�to se datoteka liste kotristi od strane "
"drugog medija"
-#: po/placeholder.h:66 urpm.pm:148
-#, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
-msgstr ""
-"medij \"%s\" poku�ava da koristi listu koja je u upotrebi, medij je ignorisan"
-
-#: po/placeholder.h:67
+#: po/placeholder.h:66
#, c-format
msgid "reading hdlist file [%s]"
msgstr "�itam hdlist datoteku [%s]"
-#: po/placeholder.h:68 urpm.pm:873
+#: po/placeholder.h:67 urpm.pm:879
#, c-format
msgid "write compss file [%s]"
msgstr "upisujem compss datoteku [%s]"
-#: po/placeholder.h:69 urpm.pm:827
+#: po/placeholder.h:68 urpm.pm:833
#, c-format
msgid "read depslist file [%s]"
msgstr "�itam depslist datoteku [%s]"
-#: po/placeholder.h:70
-#, c-format
-msgid "trying to select inexistant medium \"%s\""
-msgstr "poku�avam da selektujem inexistant medij \"%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 "ne mogu da kreiram medij \"%s\"\n"
-#: po/placeholder.h:71 urpm.pm:1812
+#: po/placeholder.h:71 urpm.pm:1668
#, c-format
msgid "malformed input: [%s]"
msgstr "pogre�an unos: [%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 ""
-"medij \"%s\" poku�ava da koristi hdlist koji se veKj koristi, medij je "
-"ignorisan"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "postoji vi�e paketa sa istim imenom rpm datoteke \"%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 ""
-"uklanjam %s radi a�uriranja ...\n"
-" na %s po�to druga�ije ne bi uspelo a�uriranje"
+"medij \"%s\" poku�ava da koristi listu koja je u upotrebi, medij je ignorisan"
-#: po/placeholder.h:77 urpm.pm:865
+#: po/placeholder.h:74 urpm.pm:871
#, c-format
msgid "unable to write provides file [%s]"
msgstr "ne mogu da izvr�im upis u provides datoteku [%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 "ne mogu da pristupim hdlist datoteci za \"%s\", medij je ignorisan"
-#: po/placeholder.h:79 urpm.pm:1005
-msgid "unable to register rpm file"
-msgstr "ne mogu da registrujem rpm datoteku"
-
-#: 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 ""
"ne mogu da pronagjem sve sintezne datoteke, koristim parsehdlist server"
-#: po/placeholder.h:81 urpm.pm:241
+#: po/placeholder.h:77 urpm.pm:1011
+msgid "unable to register rpm file"
+msgstr "ne mogu da registrujem rpm datoteku"
+
+#: po/placeholder.h:78 urpm.pm:256
#, c-format
msgid "unable to inspect list file for \"%s\", medium ignored"
msgstr "ne mogu da istra�im datoteku liste za \"%s\", medij je ignorisan"
-#: 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 "nekoherentna datoteka liste za \"%s\", medij je ignorisan"
-#: po/placeholder.h:83
+#: po/placeholder.h:81
#, c-format
msgid "copy of [%s] failed"
msgstr "kopiranje [%s] neuspelo"
-#: 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 "ne mogu da uklonim medij \"%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 "ne mogu da ispravno parsiram [%s]"
-#: po/placeholder.h:85 urpm.pm:824
+#: po/placeholder.h:84 urpm.pm:1192
+#, fuzzy, c-format
+msgid "read synthesis file [%s]"
+msgstr "�itam depslist datoteku [%s]"
+
+#: po/placeholder.h:85 urpm.pm:830
#, c-format
msgid "unable to read depslist file [%s]"
msgstr "ne mogu da pro�itam depslist datoteku [%s]"
-#: po/placeholder.h:86
-msgid "removable medium not selected"
-msgstr "prenosivi medij nije izabran"
-
-#: po/placeholder.h:87 urpm.pm:851
+#: po/placeholder.h:86 urpm.pm:857
#, c-format
msgid "read compss file [%s]"
msgstr "�itam compss datoteku [%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 "sintaksna gre�ka u konfiguracionoj datoteci u liniji %s"
-#: po/placeholder.h:89
+#: po/placeholder.h:88
#, c-format
msgid "building hdlist [%s]"
msgstr "kreiram 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 "ne mogu da pro�itam rpm datoteku [%s] sa medija \"%s\""
-#: po/placeholder.h:91 urpm.pm:1009
+#: po/placeholder.h:90 urpm.pm:1015
msgid "error registering local packages"
msgstr "gre�ka pri registrovanju lokalnih paketa"
-#: 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 ""
@@ -467,216 +479,276 @@ msgstr ""
msgid "unable to build hdlist: %s"
msgstr "ne mogu da kreiram 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 "medij \"%s\" nije izabran"
+
+#: po/placeholder.h:95 urpm.pm:1006
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "pogre�no ime rpm datoteke [%s]"
-#: 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 "medij \"%s\" nije izabran"
+msgid "unknown data associated with %s"
+msgstr "nepoznati podaci dodeljeni za %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 "poku�avam da premostim postojeKji medij \"%s\", izbegavam"
-#: po/placeholder.h:97 urpm.pm:863
+#: po/placeholder.h:98 urpm.pm:869
#, c-format
msgid "write depslist file [%s]"
msgstr "upisujem depslist datoteku [%s]"
-#: po/placeholder.h:98 urpm.pm:1322
-#, c-format
-msgid "unknown data associated with %s"
-msgstr "nepoznati podaci dodeljeni za %s"
-
-#: po/placeholder.h:99
-#, c-format
-msgid "source of [%s] not found as [%s]"
-msgstr "izvor [%s] nije pronagjen kao [%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 "ne mogu da pristupim datoteci liste za \"%s\", medij ignorisan"
-#: 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 ""
"izbegavam selektovanje %s po�to neKje biti a�urirano dovoljno datoteka"
-#: po/placeholder.h:102
-#, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
-msgstr "wget [%s] neuspeo (mo�da nedostaje 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 "ne mogu da pristupim rpm datoteci [%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 "ne mogu da upi�em depslist datoteku [%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 ""
+"uklanjam %s radi a�uriranja ...\n"
+" na %s zbog toga �to ne mo�e direktno i ispravno da se a�urira!"
+
+#: po/placeholder.h:107 urpm.pm:342 urpm.pm:1630
#, c-format
msgid "unable to access medium \"%s\""
msgstr "ne mogu da pristupim mediju \"%s\""
-#: po/placeholder.h:106 urpm.pm:988
+#: po/placeholder.h:108 urpm.pm:994
#, c-format
msgid "relocated %s entries in depslist"
msgstr "preme�teni %s unosi u depslist"
-#: 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 "ne mogu da ispravno parsiram [%s] na vrednost \"%s\""
+msgid "trying to select inexistent medium \"%s\""
+msgstr "poku�avam da selektujem inexistant medij \"%s\""
-#: po/placeholder.h:108
+#: po/placeholder.h:110 urpm.pm:97
+#, fuzzy
+msgid "wget failed\n"
+msgstr "wget za [%s] neuspeo"
+
+#: po/placeholder.h:111 urpm.pm:920 urpm.pm:1486 urpm.pm:1537
#, c-format
-msgid "no rpm files found from [%s]"
-msgstr "nema rpm datoteka na [%s]"
+msgid "unable to parse correctly [%s] on value \"%s\""
+msgstr "ne mogu da ispravno parsiram [%s] na vrednost \"%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 "Slede�i paketi sadr�e %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 "postoji vi�e paketa sa istim imenom rpm datoteke \"%s\""
+msgid "no rpm files found from [%s]"
+msgstr "nema rpm datoteka na [%s]"
-#: po/placeholder.h:111 urpm.pm:1920
+#: po/placeholder.h:114 urpm.pm:1772
#, c-format
msgid "selecting %s using obsoletes"
msgstr "selektujem %s koristeKji obsoletes"
-#: po/placeholder.h:112 urpm.pm:2031
+#: po/placeholder.h:115 urpm.pm:1888
#, c-format
msgid "selecting %s by selection on files"
msgstr "selektujem %s selektovanjem datoteka"
-#: 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 "ne mogu da odredim medij za ovu hdlist datoteku [%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 - �tampa sve tagove."
+
+#: po/placeholder.h:121 urpmi:361
+msgid "everything already installed"
+msgstr "sve je ve� instalirano"
+
+#: po/placeholder.h:122 urpmi:98
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: nepoznata opcija \"-%s\", proverite upotrebu sa --help\n"
+
+#: po/placeholder.h:123 urpmi:194
+msgid "One of the following packages is needed:"
+msgstr "Potrebni su slede�i paket(i):"
+
+#: 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 "Instalaci�a neuspela"
-#: po/placeholder.h:115 urpmi:279
-msgid "Press enter when it's done..."
-msgstr "Pritisnite enter kada zavr�ite..."
+#: 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 "Lo� izbor, probajte ponovo\n"
+#: po/placeholder.h:134
+#, fuzzy
+msgid " --X - use X interface.\n"
+msgstr " --all - �tampa sve tagove."
-#: 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 ""
+"Radi zadovoljenja zavisnosti, slede�i paketi �e biti instalirani (%d MB)"
+
+#: po/placeholder.h:136 urpmi:320 urpmi:344
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Instaliacija bez provere zavisnosti (da/Ne)? "
+
+#: 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 - �tampa sve tagove."
+
+#: po/placeholder.h:144 urpmi:202
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "�ta je va� izbor ? (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 ""
-"urpmi verzija %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"Ovo je besplatan softver i mo�e se distribuirati pod uslovima GNU i GPL "
-"licenci.\n"
-"upotreba:\n"
-" --help - priakazuje ovaj ekran za pomo�.\n"
-" --auto - automatski selekcija pravog paketa u izboru.\n"
-" --auto-select - automatski selekcija pravog paketa za a�uriranje "
-"sistema.\n"
-" --force - uzrokuje pozivanje �ak i ako neki paketi i ne postoje.\n"
-" --X - koristi X interfejs.\n"
-" --best-output - bira najbolji interfejs u �avisnosti od okru�enja:\n"
-" X ili teksoalni mod.\n"
-" -a - selektuje sva poklapanja u komandnoj liniji.\n"
-" -m - bira minimalno zahteve (default).\n"
-" -M - bira maksimalne zahteve.\n"
-" -c - bira kompletan metod za re�avanje zahteva za "
-"zatvaranje.\n"
-" -q - tihi mod.\n"
-" -v - verbose mod.\n"
-" imena ili rpm datoteke (samo za root privilegije)date u komandnoj liniji "
-"koje su instalirane.\n"
-
-#: po/placeholder.h:142 urpmi:362
-msgid "everything already installed"
-msgstr "sve je ve� instalirano"
+"Ovo je besplatan softver i mo�e biti slobodno redistribuiran pod uslovima "
+"GNU i 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 "Prisilna instalacija (--force)? (da/Ne) ?"
+
+#: po/placeholder.h:154
msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+" --force - force invocation even if some packages do not exist.\n"
msgstr ""
-"Radi zadovoljenja zavisnosti, slede�i paketi �e biti instalirani (%d MB)"
-#: po/placeholder.h:144 urpmi:296
-#, c-format
-msgid "installing %s\n"
-msgstr "Instaliram %s\n"
+#: po/placeholder.h:155 urpmi:205
+msgid "Sorry, bad choice, try again\n"
+msgstr "Lo� izbor, probajte ponovo\n"
-#: po/placeholder.h:145 urpmi:198
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "�ta je va� izbor ? (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 "Instaliacija bez provere zavisnosti (da/Ne)? "
+#: 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 "Potrebni su slede�i paket(i):"
+#: 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 "Instaliram %s\n"
-#: po/placeholder.h:148 urpmi:149
+#: po/placeholder.h:161 urpmi:152
msgid "Only superuser is allowed to install local packages"
msgstr "Samo superkorisnik mo�e instalirati lokalne pakete"
-#: 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 "Ubacite medij sa imenom %s u ure�aj %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 "izvor paketa nije dostupan,izlazim..."
-#: po/placeholder.h:151 urpmi:329 urpmi:353
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Prisilna instalacija (--force)? (da/Ne) ?"
+#: po/placeholder.h:165 urpmi:102
+#, fuzzy
+msgid "Only superuser is allowed to install packages"
+msgstr "Samo superkorisnik mo�e instalirati lokalne pakete"
+
+#: po/placeholder.h:166 urpmi:193
+#, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Jedan od slede�ih paketa je potreban da bi instalirali %s:"
-#: po/placeholder.h:155 urpmi.addmedia:46
+#: po/placeholder.h:167 urpmi:277
+msgid "Press Enter when it's done..."
+msgstr "Pritisnite enter kada zavr�ite..."
+
+#: po/placeholder.h:168 urpmi.addmedia:46
#, c-format
msgid ""
"%s\n"
@@ -685,7 +757,7 @@ msgstr ""
"%s\n"
"`with' nedostaje za ftp medij\n"
-#: po/placeholder.h:159
+#: po/placeholder.h:172
msgid ""
"usage: urpmi.addmedia [--update] <name> <url>\n"
"where <url> is one of\n"
@@ -705,17 +777,17 @@ msgstr ""
" http://<host>/<putanja> with <relativno ime datoteke sa hdlist>\n"
" removable_<ure�aj>://<putanja>\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 "ne mogu da kreiram medij \"%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 "ne mogu da a�uriram medij \"%s\"\n"
-#: po/placeholder.h:170 urpmi.addmedia:42
+#: po/placeholder.h:183 urpmi.addmedia:42
#, c-format
msgid ""
"%s\n"
@@ -724,7 +796,7 @@ msgstr ""
"%s\n"
"ure�aj `%s' ne postoji\n"
-#: po/placeholder.h:174 urpmi.addmedia:44
+#: po/placeholder.h:187 urpmi.addmedia:44
#, c-format
msgid ""
"%s\n"
@@ -733,7 +805,7 @@ msgstr ""
"%s\n"
"nedostaje <relativna putanja hdlist>\n"
-#: po/placeholder.h:178
+#: po/placeholder.h:191
#, c-format
msgid ""
"usage: urpmi.update [-a] <name> ...\n"
@@ -753,12 +825,12 @@ msgstr ""
"\n"
"nepoznate opcije '%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 ""
"nema ni�ega za a�uriranje (koristi urpmi.addmedia za dodavanje medija)\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"
@@ -767,11 +839,11 @@ msgstr ""
"nedostaje unos za a�uriranje\n"
"(jedan od %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 "nema ni�ega za brisanje (koristi urpmi.addmedia za dodavanje medija)\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"
@@ -780,7 +852,7 @@ msgstr ""
"nedostaje unos za brisanje\n"
"(jedan od %s)\n"
-#: po/placeholder.h:197
+#: po/placeholder.h:210
#, c-format
msgid ""
"usage: urpmi.removemedia [-a] <name> ...\n"
@@ -795,17 +867,12 @@ msgstr ""
"\n"
"nepoznate opcije '%s'\n"
-#: po/placeholder.h:204 urpmq:85
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: ne mogu da pro�itam rpm datoteku \"%s\"\n"
-
-#: po/placeholder.h:206 urpmq:82
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: nepoznata opcija \"-%s\", proverite upotrebu sa --help\n"
+#: po/placeholder.h:217
+#, fuzzy
+msgid " -h - print this help message.\n"
+msgstr " --all - �tampa sve tagove."
-#: 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"
@@ -813,113 +880,103 @@ msgstr ""
"neki paketi moraju biti uklonjeni da bi bili a�urirani, �to jo� "
"nijepodr�ano\n"
-#: po/placeholder.h:208
+#: po/placeholder.h:219
+#, fuzzy
+msgid " -g - print groups too with name.\n"
+msgstr " --group - �tampa tag grupe: grupa."
+
+#: po/placeholder.h:220 urpmq:84
#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: ne mogu da pro�itam rpm datoteku \"%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 " komandna linija ali bez imena paketa)."
+
+#: 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"
-" --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 ""
-"urpmq vezija %s\n"
-"Copyright (C) 2000, 2001 MandrakeSoft.\n"
"Ovo je besplatan softver i mo�e biti slobodno redistribuiran pod uslovima "
-"GNU i GPL licenci.\n"
-"upotreba:\n"
-" -h - prikazuje ovu poruku na ekranu.\n"
-" -v - verbose mod.\n"
-" -d - dodatna istraga o zavisnosti paketa.\n"
-" -u - uklanja paket ukoliko je bolja verzija veKj instalirana.\n"
-" -m - dodatna istraga o zavisnosti paketa, uklanja pakete\n"
-" instalira pakete koji obezbegjuju potrebno, dodaje\n"
-" pakete koji mogu blokiratia�uriranje.\n"
-" -M - dodatna istraga o zavisnosti paketa i uklanja veKj\n"
-" instalirane pakete samo ako su noviji ili isti.\n"
-" -c - bira kopletnu metodu za re�avanje problema.\n"
-" -p - dozvoljava pretra�ivanje u provides radi nala�enja "
-"paketa.\n"
-" -g - prikazuje grupe sa imenom.\n"
-" -r - prikazije verziju sa imenom.\n"
-" --update - koristi samo medije sa update-om.\n"
-" --auto-select - automatski selektije pakete sa a�uriranje sistema.\n"
-" --headers - izbacuje hedere iz paketa prikazane iz urpmi db na\n"
-" stdout (samo za root privilegije).\n"
-" --sources - daje sve izvorne pakete pre download-a (samo za root "
-"privilegije).\n"
-" --force - primorava na postupak �ak i ako neki opakeet ne postoji.\n"
-" imena rpm datoteka datih u komandnoj liniju su potrebna.\n"
-
-#: urpm.pm:257
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+"GNU i GPL."
+
+#: po/placeholder.h:231
+#, fuzzy
+msgid " -d - extend query to package dependencies.\n"
+msgstr " komandna linija ali bez imena paketa)."
+
+#: po/placeholder.h:232
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
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: nepoznata opcija \"-%s\", proverite upotrebu sa --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 "ne mogu da kreiram medij \"%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 "�itam depslist datoteku [%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 "urpmi verzija %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: nepoznata opcija \"-%s\", proverite upotrebu sa --help\n"
+#: urpm.pm:1797 urpm.pm:1806
+msgid ", $otherPackage, "
+msgstr ", $otherPackage, "
-#: urpmi:102
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr "Samo superkorisnik mo�e instalirati lokalne pakete"
+#: urpm.pm:1797 urpm.pm:1806
+msgid "));"
+msgstr "));"
-#: urpmi:189
-#, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Jedan od slede�ih paketa je potreban da bi instalirali %s:"
+#: 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 "urpmi verzija %s"
#: urpmi.addmedia:30
msgid "usage: urpmi.addmedia [--update] <name> <url>"
@@ -950,3 +1007,131 @@ msgstr ", $_);"
#, c-format
msgid "urpmq version %s"
msgstr "urpmq verzija %s"
+
+#~ msgid "retrieving [%s]"
+#~ msgstr "vraKjam [%s]"
+
+#~ msgid "wget of [%s] failed (maybe wget is missing?)"
+#~ msgstr "wget [%s] neuspeo (mo�da nedostaje wget?)"
+
+#~ msgid "unable to copy source of [%s] from [%s]"
+#~ msgstr "nem mogu da kopiram izvor [%s] iz [%s]"
+
+#~ msgid "removable medium not selected"
+#~ msgstr "prenosivi medij nije izabran"
+
+#~ msgid "source of [%s] not found as [%s]"
+#~ msgstr "izvor [%s] nije pronagjen kao [%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 ""
+#~ "urpmi verzija %s\n"
+#~ "Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+#~ "Ovo je besplatan softver i mo�e se distribuirati pod uslovima GNU i GPL "
+#~ "licenci.\n"
+#~ "upotreba:\n"
+#~ " --help - priakazuje ovaj ekran za pomo�.\n"
+#~ " --auto - automatski selekcija pravog paketa u izboru.\n"
+#~ " --auto-select - automatski selekcija pravog paketa za a�uriranje "
+#~ "sistema.\n"
+#~ " --force - uzrokuje pozivanje �ak i ako neki paketi i ne "
+#~ "postoje.\n"
+#~ " --X - koristi X interfejs.\n"
+#~ " --best-output - bira najbolji interfejs u �avisnosti od okru�enja:\n"
+#~ " X ili teksoalni mod.\n"
+#~ " -a - selektuje sva poklapanja u komandnoj liniji.\n"
+#~ " -m - bira minimalno zahteve (default).\n"
+#~ " -M - bira maksimalne zahteve.\n"
+#~ " -c - bira kompletan metod za re�avanje zahteva za "
+#~ "zatvaranje.\n"
+#~ " -q - tihi mod.\n"
+#~ " -v - verbose mod.\n"
+#~ " imena ili rpm datoteke (samo za root privilegije)date u komandnoj "
+#~ "liniji koje su instalirane.\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 ""
+#~ "urpmq vezija %s\n"
+#~ "Copyright (C) 2000, 2001 MandrakeSoft.\n"
+#~ "Ovo je besplatan softver i mo�e biti slobodno redistribuiran pod uslovima "
+#~ "GNU i GPL licenci.\n"
+#~ "upotreba:\n"
+#~ " -h - prikazuje ovu poruku na ekranu.\n"
+#~ " -v - verbose mod.\n"
+#~ " -d - dodatna istraga o zavisnosti paketa.\n"
+#~ " -u - uklanja paket ukoliko je bolja verzija veKj "
+#~ "instalirana.\n"
+#~ " -m - dodatna istraga o zavisnosti paketa, uklanja pakete\n"
+#~ " instalira pakete koji obezbegjuju potrebno, dodaje\n"
+#~ " pakete koji mogu blokiratia�uriranje.\n"
+#~ " -M - dodatna istraga o zavisnosti paketa i uklanja veKj\n"
+#~ " instalirane pakete samo ako su noviji ili isti.\n"
+#~ " -c - bira kopletnu metodu za re�avanje problema.\n"
+#~ " -p - dozvoljava pretra�ivanje u provides radi nala�enja "
+#~ "paketa.\n"
+#~ " -g - prikazuje grupe sa imenom.\n"
+#~ " -r - prikazije verziju sa imenom.\n"
+#~ " --update - koristi samo medije sa update-om.\n"
+#~ " --auto-select - automatski selektije pakete sa a�uriranje sistema.\n"
+#~ " --headers - izbacuje hedere iz paketa prikazane iz urpmi db na\n"
+#~ " stdout (samo za root privilegije).\n"
+#~ " --sources - daje sve izvorne pakete pre download-a (samo za root "
+#~ "privilegije).\n"
+#~ " --force - primorava na postupak �ak i ako neki opakeet ne "
+#~ "postoji.\n"
+#~ " imena rpm datoteka datih u komandnoj liniju su potrebna.\n"
diff --git a/po/sv.po b/po/sv.po
index 40ee65ff..aa7bb91e 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,7 +9,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-09-14 09:18+0100\n"
"Last-Translator: Mattias Newzella <newzella@linux.nu>\n"
"Language-Team: Swedish <sv@li.org>\n"
@@ -29,27 +29,27 @@ msgstr ""
"Automatisk installation av paket...\n"
"Du beg�rde installation av paketet $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 "�r det ok?"
-#: _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 "Avbryt"
-#: _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 "Nn"
-#: _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 "JjYy"
-#: _irpm:42 po/placeholder.h:118 urpmi:258
+#: _irpm:42 po/placeholder.h:157 urpmi:258
msgid " (Y/n) "
msgstr " (J/n) "
@@ -164,175 +164,176 @@ msgstr "prova urpmf --help f�r fler flaggor"
msgid "urpmi is not installed"
msgstr "urpmi �r inte installerat"
-#: po/placeholder.h:29 urpm.pm:283
+#: po/placeholder.h:29
+#, fuzzy, c-format
+msgid "reading synthesis file [%s]"
+msgstr "l�s depslist-fil [%s]"
+
+#: po/placeholder.h:30 urpm.pm:298
#, c-format
msgid "unable to write config file [%s]"
msgstr "kan inte skriva konfigurationsfil [%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"
-msgstr "kan inte anv�nda namnet \"%s\" till media eftersom det redan anv�nds"
+msgid "using different removable device [%s] for \"%s\""
+msgstr ""
-#: po/placeholder.h:31
+#: po/placeholder.h:32
#, c-format
msgid "nothing to write in list file for \"%s\""
msgstr "inget att skriva i listfilen f�r \"%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 "kan inte hitta listfil f�r \"%s\", ignorerar media"
-#: po/placeholder.h:33
+#: po/placeholder.h:34
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "kan inte bearbeta hdlist-filen f�r \"%s\""
-#: po/placeholder.h:34
+#: po/placeholder.h:35
#, c-format
msgid "nothing written in list file for \"%s\""
msgstr "inget skrivet till listfilen om \"%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 ""
-"avl�gsnar %s f�r att uppdatera ... \n"
-" till %s eftersom den inte vill uppdatera korrekt!"
-
-#: po/placeholder.h:39 urpm.pm:839
+#: po/placeholder.h:36 urpm.pm:845
#, c-format
msgid "read provides file [%s]"
msgstr "l�s filen provides [%s]"
-#: po/placeholder.h:40
-#, c-format
-msgid "trying to remove inexistant medium \"%s\""
-msgstr "f�rs�ker ta bort icke-existerande media \"%s\""
-
-#: po/placeholder.h:41 urpm.pm:1692
+#: po/placeholder.h:37 urpm.pm:1549
#, c-format
msgid "package %s is not found."
msgstr "paketet %s kan inte hittas."
-#: po/placeholder.h:42
-#, c-format
-msgid "unable to copy source of [%s] from [%s]"
-msgstr "kan inte kopiera k�llan till [%s] fr�n [%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 "kan inte skriva filen compss [%s]"
-#: po/placeholder.h:44 urpm.pm:813
+#: po/placeholder.h:39 urpm.pm:819
#, c-format
msgid "unmounting %s"
msgstr "avmonterar %s"
-#: po/placeholder.h:45
+#: po/placeholder.h:40
#, c-format
msgid "removing %d obsolete headers in cache"
msgstr "avl�gsnar %d gamla huvuden fr�n cachen"
-#: 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 "ingen hdlist-fil funnen f�r media \"%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 ""
+"media \"%s\" f�rs�ker anv�nda en hdlist som redan anv�nds, ignorerar media"
+
+#: po/placeholder.h:43 urpm.pm:184
+#, c-format
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr "kan inte anv�nda namnet \"%s\" till media eftersom det redan anv�nds"
+
+#: po/placeholder.h:44 urpm.pm:191
#, c-format
msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
msgstr ""
"kan inte behandla media \"%s\" eftersom det inte existerar n�gon listfil [%s]"
-#: po/placeholder.h:48
+#: po/placeholder.h:45
msgid "keeping only files referenced in provides"
msgstr "beh�ller bara filer angivna i \"provides\""
-#: po/placeholder.h:49
+#: po/placeholder.h:46
#, c-format
msgid "unable to build synthesis file for medium \"%s\""
msgstr "kan inte skapa synthesis-fil f�r media \"%s\""
-#: po/placeholder.h:50
+#: po/placeholder.h:47
#, c-format
msgid "found %d headers in cache"
msgstr "hittade %d huvuden i cachen"
-#: po/placeholder.h:51 urpm.pm:836
+#: po/placeholder.h:48 urpm.pm:842
#, c-format
msgid "unable to read provides file [%s]"
msgstr "kan inte l�sa filen provides [%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 "undvik att v�lja %s eftersom dess spr�k �nnu inte �r valt"
-#: 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 ""
+"avl�gsnar %s f�r att uppdatera ... \n"
+" till %s eftersom den annars inte blir uppdaterad"
+
+#: po/placeholder.h:54 urpm.pm:326
#, c-format
msgid "medium \"%s\" already exists"
msgstr "media \"%s\" existerar redan"
-#: po/placeholder.h:54 urpm.pm:295
-#, c-format
-msgid "write config file [%s]"
-msgstr "skriv konfigurationsfil [%s]"
-
#: po/placeholder.h:55
#, c-format
msgid "unable to write list file of \"%s\""
msgstr "kan inte skriva listfilen f�r \"%s\""
-#: po/placeholder.h:56 urpm.pm:1817
-#, c-format
-msgid "retrieving [%s]"
-msgstr "tar emot [%s]"
-
-#: po/placeholder.h:57 urpm.pm:1819
+#: po/placeholder.h:56 urpm.pm:310
#, c-format
-msgid "wget of [%s] failed"
-msgstr "wget av [%s] misslyckades"
+msgid "write config file [%s]"
+msgstr "skriv konfigurationsfil [%s]"
-#: po/placeholder.h:58 urpm.pm:1101
+#: po/placeholder.h:57 urpm.pm:1107
#, c-format
msgid "no package named %s"
msgstr "inget paket med namnet %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 "kan inte l�sa filen compss [%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 "kan inte hitta hdlist-filen f�r \"%s\", ignorerar media"
-#: po/placeholder.h:61
+#: po/placeholder.h:60
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "hdlist-synthesis-fil f�r media \"%s\" byggd"
-#: po/placeholder.h:62
+#: po/placeholder.h:61
msgid "computing dependencies"
msgstr "r�knar ut beroenden"
-#: po/placeholder.h:63 urpm.pm:868
+#: po/placeholder.h:62
+#, fuzzy, c-format
+msgid "retrieve of [%s] failed"
+msgstr "wget av [%s] misslyckades"
+
+#: po/placeholder.h:63 urpm.pm:874
#, c-format
msgid "write provides file [%s]"
msgstr "skriv filen provides [%s]"
-#: po/placeholder.h:64 urpm.pm:803
+#: po/placeholder.h:64 urpm.pm:809
#, c-format
msgid "mounting %s"
msgstr "monterar %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 "
@@ -341,123 +342,134 @@ msgstr ""
"kan inte ta hand om media \"%s\" eftersom listfilen redan anv�nds av annan "
"media"
-#: po/placeholder.h:66 urpm.pm:148
-#, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
-msgstr "media \"%s\" f�rs�ker anv�nda en redan anv�nd lista, ignorerar media"
-
-#: po/placeholder.h:67
+#: po/placeholder.h:66
#, c-format
msgid "reading hdlist file [%s]"
msgstr "l�ser hdlist-filen [%s]"
-#: po/placeholder.h:68 urpm.pm:873
+#: po/placeholder.h:67 urpm.pm:879
#, c-format
msgid "write compss file [%s]"
msgstr "skriv filen compss [%s]"
-#: po/placeholder.h:69 urpm.pm:827
+#: po/placeholder.h:68 urpm.pm:833
#, c-format
msgid "read depslist file [%s]"
msgstr "l�s depslist-fil [%s]"
-#: po/placeholder.h:70
-#, c-format
-msgid "trying to select inexistant medium \"%s\""
-msgstr "f�rs�ker v�lja icke-existerande media \"%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 "kunde ej skapa media \"%s\"\n"
-#: po/placeholder.h:71 urpm.pm:1812
+#: po/placeholder.h:71 urpm.pm:1668
#, c-format
msgid "malformed input: [%s]"
msgstr "felaktig indata: [%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 ""
-"media \"%s\" f�rs�ker anv�nda en hdlist som redan anv�nds, ignorerar media"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "det finns flera paket med samma rpm-filnamn \"%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"
-msgstr ""
-"avl�gsnar %s f�r att uppdatera ... \n"
-" till %s eftersom den annars inte blir uppdaterad"
+msgid "medium \"%s\" tries to use an already used list, medium ignored"
+msgstr "media \"%s\" f�rs�ker anv�nda en redan anv�nd lista, ignorerar media"
-#: po/placeholder.h:77 urpm.pm:865
+#: po/placeholder.h:74 urpm.pm:871
#, c-format
msgid "unable to write provides file [%s]"
msgstr "kan inte skriva filen provides [%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 "kan inte l�sa hdlist-filen f�r \"%s\", ignorerar media"
-#: po/placeholder.h:79 urpm.pm:1005
-msgid "unable to register rpm file"
-msgstr "kan inte registrera rpm-fil"
-
-#: 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 "kan inte hitta alla synthesis-filer, anv�nder parsehdlist-server"
-#: po/placeholder.h:81 urpm.pm:241
+#: po/placeholder.h:77 urpm.pm:1011
+msgid "unable to register rpm file"
+msgstr "kan inte registrera rpm-fil"
+
+#: po/placeholder.h:78 urpm.pm:256
#, c-format
msgid "unable to inspect list file for \"%s\", medium ignored"
msgstr "kan inte unders�ka listfil f�r \"%s\", ignorerar media"
-#: 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 "inkonsekvent listfil f�r \"%s\", ignorerar media"
-#: po/placeholder.h:83
+#: po/placeholder.h:81
#, c-format
msgid "copy of [%s] failed"
msgstr "misslyckades med att kopiera [%s]"
-#: 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 "f�rs�ker ta bort icke-existerande media \"%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 "kan inte bearbeta korrekt [%s]"
-#: po/placeholder.h:85 urpm.pm:824
+#: po/placeholder.h:84 urpm.pm:1192
+#, fuzzy, c-format
+msgid "read synthesis file [%s]"
+msgstr "l�s depslist-fil [%s]"
+
+#: po/placeholder.h:85 urpm.pm:830
#, c-format
msgid "unable to read depslist file [%s]"
msgstr "kan inte l�sa depslist-fil [%s]"
-#: po/placeholder.h:86
-msgid "removable medium not selected"
-msgstr "flyttbar media inte vald"
-
-#: po/placeholder.h:87 urpm.pm:851
+#: po/placeholder.h:86 urpm.pm:857
#, c-format
msgid "read compss file [%s]"
msgstr "l�s filen compss [%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 "syntaxfel i konfigurationsfil p� raden %s"
-#: po/placeholder.h:89
+#: po/placeholder.h:88
#, c-format
msgid "building hdlist [%s]"
msgstr "bygger 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 "kan inte l�sa rpm-filen [%s] fr�n media \"%s\""
-#: po/placeholder.h:91 urpm.pm:1009
+#: po/placeholder.h:90 urpm.pm:1015
msgid "error registering local packages"
msgstr "fel vid registrering av lokala paket"
-#: 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 "inkonsekvent media \"%s\", felaktigt markerad som flyttbar"
@@ -467,173 +479,166 @@ msgstr "inkonsekvent media \"%s\", felaktigt markerad som flyttbar"
msgid "unable to build hdlist: %s"
msgstr "kan inte bygga 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 "media \"%s\" �r inte valt"
+
+#: po/placeholder.h:95 urpm.pm:1006
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "ogiltigt rpm-filnamn [%s]"
-#: 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 "media \"%s\" �r inte valt"
+msgid "unknown data associated with %s"
+msgstr "ok�nd data associerad med %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 "f�rs�ker undvika existerande media \"%s\""
-#: po/placeholder.h:97 urpm.pm:863
+#: po/placeholder.h:98 urpm.pm:869
#, c-format
msgid "write depslist file [%s]"
msgstr "skriv depslist-fil [%s]"
-#: po/placeholder.h:98 urpm.pm:1322
-#, c-format
-msgid "unknown data associated with %s"
-msgstr "ok�nd data associerad med %s"
-
-#: po/placeholder.h:99
-#, c-format
-msgid "source of [%s] not found as [%s]"
-msgstr "k�llan [%s] kunde inte hittas som [%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 "kan inte l�sa listfilen f�r \"%s\", ignorerar media"
-#: 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 ""
"undvik att v�lja %s eftersom inte tillr�ckligt med filer blir uppdaterade"
-#: po/placeholder.h:102
-#, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
-msgstr "wget av [%s] misslyckades (wget kanske saknas?)"
-
-#: po/placeholder.h:103 urpm.pm:1001
+#: po/placeholder.h:101 urpm.pm:1007
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "kan inte l�sa rpm-fil [%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 "kan inte skriva depslist-fil [%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 ""
+"avl�gsnar %s f�r att uppdatera ... \n"
+" till %s eftersom den inte vill uppdatera korrekt!"
+
+#: po/placeholder.h:107 urpm.pm:342 urpm.pm:1630
#, c-format
msgid "unable to access medium \"%s\""
msgstr "kan inte l�sa media \"%s\""
-#: po/placeholder.h:106 urpm.pm:988
+#: po/placeholder.h:108 urpm.pm:994
#, c-format
msgid "relocated %s entries in depslist"
msgstr "�terfann %s objekt i depslist"
-#: 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 "kunde inte bearbeta [%s] vid v�rde \"%s\""
+msgid "trying to select inexistent medium \"%s\""
+msgstr "f�rs�ker v�lja icke-existerande media \"%s\""
+
+#: po/placeholder.h:110 urpm.pm:97
+#, fuzzy
+msgid "wget failed\n"
+msgstr "wget av [%s] misslyckades"
-#: 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 "inga rpm-filer hittade p� [%s]"
+msgid "unable to parse correctly [%s] on value \"%s\""
+msgstr "kunde inte bearbeta [%s] vid v�rde \"%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 "F�ljande paket inneh�ller %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 "det finns flera paket med samma rpm-filnamn \"%s\""
+msgid "no rpm files found from [%s]"
+msgstr "inga rpm-filer hittade p� [%s]"
-#: po/placeholder.h:111 urpm.pm:1920
+#: po/placeholder.h:114 urpm.pm:1772
#, c-format
msgid "selecting %s using obsoletes"
msgstr "v�ljer %s utifr�n \"obsoletes\""
-#: po/placeholder.h:112 urpm.pm:2031
+#: po/placeholder.h:115 urpm.pm:1888
#, c-format
msgid "selecting %s by selection on files"
msgstr "v�ljer %s utifr�n valet av filer"
-#: 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 "kan inte avg�ra media f�r denna hdlist-fil [%s]"
-#: po/placeholder.h:114 urpmi:308 urpmi:315 urpmi:328 urpmi:339 urpmi:352
-msgid "Installation failed"
-msgstr "Installationen misslyckades"
-
-#: po/placeholder.h:115 urpmi:279
-msgid "Press enter when it's done..."
-msgstr "Tryck \"Enter\" n�r du �r klar..."
+#: po/placeholder.h:120
+#, fuzzy
+msgid " --help - print this help message.\n"
+msgstr " --all - skriv alla taggar."
-#: po/placeholder.h:117 urpmi:201
-msgid "Sorry, bad choice, try again\n"
-msgstr "Tyv�rr, felaktigt val, f�rs�k igen\n"
+#: po/placeholder.h:121 urpmi:361
+msgid "everything already installed"
+msgstr "allt �r redan installerat"
-#: po/placeholder.h:120
+#: po/placeholder.h:122 urpmi:98
#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: ok�nd flagga \"-%s\", anv�nd --help f�r hj�lp\n"
+
+#: po/placeholder.h:123 urpmi:194
+msgid "One of the following packages is needed:"
+msgstr "Ett av f�ljande paket �r n�dv�ndigt"
+
+#: po/placeholder.h:124 po/placeholder.h:222
+msgid " --update - use only update media.\n"
+msgstr ""
+
+#: po/placeholder.h:125 urpmi:299
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"
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
msgstr ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"Det h�r �r fri programvara och f�r distribueras enligt villkoren i GNU GPL.\n"
-"anv�ndning:\n"
-" --help - visa denna hj�lptext.\n"
-" --update - anv�nd endast uppdateringsmedia.\n"
-" --auto - v�lj automatiskt bra paket vid val.\n"
-" --auto-select - v�lj automatiskt paket f�r att uppgradera systemet.\n"
-" --force - tvinga installation �ven om n�gra paket inte finns.\n"
-" --X - anv�nd ett X-gr�nssnitt.\n"
-" --best-output - v�lj det mest l�mpliga gr�nssnittet utifr�n aktuell "
-"milj�:\n"
-" X eller textl�ge.\n"
-" -a - v�lj allt som matchar kommandoraden.\n"
-" -m - f�rs�k uppgradera s� f� paket som m�jligt (standard).\n"
-" -M - uppgradera allt som g�r.\n"
-" -c - v�lj komplett metod f�r att uppfylla beroendekrav.\n"
-" -p - till�t s�kning i \"provides\" f�r att hitta paket.\n"
-" -q - tyst l�ge.\n"
-" -v - utf�rligt l�ge.\n"
-" namn eller rpm-filnamn (bara f�r root) angivna p� kommandoraden "
-"installeras.\n"
-
-#: po/placeholder.h:142 urpmi:362
-msgid "everything already installed"
-msgstr "allt �r redan installerat"
-#: po/placeholder.h:143 urpmi:247
+#: 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 "Installationen misslyckades"
+
+#: po/placeholder.h:132 po/placeholder.h:234
+msgid ""
+" --auto-select - automatically select packages for upgrading the system.\n"
+msgstr ""
+
+#: po/placeholder.h:134
+#, fuzzy
+msgid " --X - use X interface.\n"
+msgstr " --all - skriv alla taggar."
+
+#: po/placeholder.h:135 urpmi:247
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -642,42 +647,108 @@ msgstr ""
"F�r att tillfredsst�lla beroenden kommer f�ljande paket att installeras (%d "
"MB)"
-#: po/placeholder.h:144 urpmi:296
-#, c-format
-msgid "installing %s\n"
-msgstr "installerar %s\n"
+#: po/placeholder.h:136 urpmi:320 urpmi:344
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Prova att installera utan att kontrollera behov av andra filer? (j/N) "
+
+#: 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 - skriv alla taggar."
-#: po/placeholder.h:145 urpmi:198
+#: po/placeholder.h:144 urpmi:202
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Vad �r ditt val? ( 1-%d) "
-#: po/placeholder.h:146 urpmi:321 urpmi:345
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Prova att installera utan att kontrollera behov av andra filer? (j/N) "
+#: po/placeholder.h:145
+msgid " --wget - use wget to retrieve distant files.\n"
+msgstr ""
-#: po/placeholder.h:147 urpmi:190
-msgid "One of the following packages is needed:"
-msgstr "Ett av f�ljande paket �r n�dv�ndigt"
+#: 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"
+msgstr ""
+"Det h�r �r fri programvara och f�r distribueras enligt villkoren i GNU GPL."
+
+#: po/placeholder.h:152 urpmi:328 urpmi:352
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "F�rs�ka �nnu h�rdare att installera (--force)? (j/N)"
+
+#: po/placeholder.h:154
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+
+#: po/placeholder.h:155 urpmi:205
+msgid "Sorry, bad choice, try again\n"
+msgstr "Tyv�rr, felaktigt val, f�rs�k igen\n"
+
+#: po/placeholder.h:156
+msgid ""
+" names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: po/placeholder.h:158
+msgid " -a - select all matches on command line.\n"
+msgstr ""
-#: po/placeholder.h:148 urpmi:149
+#: 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 "installerar %s\n"
+
+#: po/placeholder.h:161 urpmi:152
msgid "Only superuser is allowed to install local packages"
msgstr "Endast superanv�ndare f�r installera lokala paket"
-#: 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 "S�tt in media med namnet \"%s\" i enhet [%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 "kunde inte l�sa k�llan, avbryter"
-#: po/placeholder.h:151 urpmi:329 urpmi:353
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "F�rs�ka �nnu h�rdare att installera (--force)? (j/N)"
+#: po/placeholder.h:165 urpmi:102
+#, fuzzy
+msgid "Only superuser is allowed to install packages"
+msgstr "Endast superanv�ndare f�r installera lokala paket"
+
+#: po/placeholder.h:166 urpmi:193
+#, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Ett av f�ljande paket �r n�dv�ndigt f�r att installera %s:"
+
+#: po/placeholder.h:167 urpmi:277
+msgid "Press Enter when it's done..."
+msgstr "Tryck \"Enter\" n�r du �r klar..."
-#: po/placeholder.h:155 urpmi.addmedia:46
+#: po/placeholder.h:168 urpmi.addmedia:46
#, c-format
msgid ""
"%s\n"
@@ -686,7 +757,7 @@ msgstr ""
"%s\n"
"\"with\" saknas f�r ftp-media\n"
-#: po/placeholder.h:159
+#: po/placeholder.h:172
msgid ""
"usage: urpmi.addmedia [--update] <name> <url>\n"
"where <url> is one of\n"
@@ -706,17 +777,17 @@ msgstr ""
" http://<v�rd>/<s�kv�g> with <relativt filnamn f�r hdlist>\n"
" removable_<enhet>://<s�kv�g>\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 "kunde ej skapa media \"%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 "kunde ej uppdatera media \"%s\"\n"
-#: po/placeholder.h:170 urpmi.addmedia:42
+#: po/placeholder.h:183 urpmi.addmedia:42
#, c-format
msgid ""
"%s\n"
@@ -725,7 +796,7 @@ msgstr ""
"%s\n"
"enheten \"%s\" existerar inte\n"
-#: po/placeholder.h:174 urpmi.addmedia:44
+#: po/placeholder.h:187 urpmi.addmedia:44
#, c-format
msgid ""
"%s\n"
@@ -734,7 +805,7 @@ msgstr ""
"%s\n"
"<relativ s�kv�g till hdlist> saknas\n"
-#: po/placeholder.h:178
+#: po/placeholder.h:191
#, c-format
msgid ""
"usage: urpmi.update [-a] <name> ...\n"
@@ -754,11 +825,11 @@ msgstr ""
"\n"
"ogiltig flagga '%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 "inget att uppdatera (anv�nd urpmi.addmedia f�r att l�gga till media)\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"
@@ -767,11 +838,11 @@ msgstr ""
"objektet att uppdatera saknas\n"
"(en av %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 "inget att ta bort (anv�nd urpmi.addmedia f�r att l�gga till media)\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"
@@ -780,7 +851,7 @@ msgstr ""
"objektet att ta bort saknas\n"
"(en av %s)\n"
-#: po/placeholder.h:197
+#: po/placeholder.h:210
#, c-format
msgid ""
"usage: urpmi.removemedia [-a] <name> ...\n"
@@ -795,17 +866,12 @@ msgstr ""
"\n"
"ogiltig flagga '%s'\n"
-#: po/placeholder.h:204 urpmq:85
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: kan inte l�sa rpm-filen \"%s\"\n"
-
-#: po/placeholder.h:206 urpmq:82
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: flaggan \"-%s\" ok�nd, anv�nd --help f�r hj�lp\n"
+#: po/placeholder.h:217
+#, fuzzy
+msgid " -h - print this help message.\n"
+msgstr " --all - skriv alla taggar."
-#: 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"
@@ -813,112 +879,102 @@ msgstr ""
"vissa paket m�ste tas bort f�r att bli uppgraderade, den funktionen finns "
"inte �n\n"
-#: po/placeholder.h:208
+#: po/placeholder.h:219
+#, fuzzy
+msgid " -g - print groups too with name.\n"
+msgstr " --group - skriv taggen \"group\": grupp."
+
+#: po/placeholder.h:220 urpmq:84
#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: kan inte l�sa rpm-filen \"%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 " kommandoraden, men utan paketnamn)."
+
+#: 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"
+msgstr ""
+"Det h�r �r fri programvara och f�r distribueras enligt villkoren i GNU GPL."
+
+#: po/placeholder.h:231
+#, fuzzy
+msgid " -d - extend query to package dependencies.\n"
+msgstr " kommandoraden, men utan paketnamn)."
+
+#: po/placeholder.h:232
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
+msgstr ""
+
+#: po/placeholder.h:233
+msgid ""
" -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"
+msgstr ""
+
+#: po/placeholder.h:235 urpmq:81
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: flaggan \"-%s\" ok�nd, anv�nd --help f�r hj�lp\n"
+
+#: po/placeholder.h:236
+msgid ""
" --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 package do not exist.\n"
-" names or rpm files given on command line are queried.\n"
msgstr ""
-"urpmq version %s\n"
-"Copyright (C) 2000, 2001 MandrakeSoft.\n"
-"Det h�r �r fri programvara och f�r distribueras enligt villkoren i GNU GPL.\n"
-"anv�ndning:\n"
-" -h - visa denna hj�lptext.\n"
-" -v - utf�rligt l�ge.\n"
-" -d - ut�ka f�rfr�gan till paketberoenden.\n"
-" -u - ta bort paket om det redan finns en b�ttre version "
-"installerad.\n"
-" -m - ut�ka f�rfr�gan till paketberoenden, ta bort redan\n"
-" installerat paket som tillhandah�ller vad som �r "
-"n�dv�ndigt,\n"
-" l�gg till paket som kan blockera uppgraderingen.\n"
-" -M - ut�ka f�rfr�gan till paketberoenden, ta bort redan\n"
-" installerade paket enbart om de �r nyare eller likadana.\n"
-" -c - v�lj komplett metod f�r att uppfylla beroendekrav.\n"
-" -p - till�t s�kning i \"provides\" f�r att hitta paket.\n"
-" -g - skriv �ven grupp i namnet.\n"
-" -r - skriv �ven version och \"release\" i namnet.\n"
-" --update - anv�nd bara uppdateringsmedia.\n"
-" --auto-select - v�lj paket automatiskt f�r att uppgradera system.\n"
-" --headers - h�mta pakethuvuden, listade fr�n urpmi-databasen till\n"
-" stdout (endast root).\n"
-" --sources - ge alla k�llpaket innan nerladdning (enbart root).\n"
-" --force - tvinga installation �ven om n�gra paket inte finns.\n"
-" namn eller rpm-filer som anges p� kommandoraden bearbetas.\n"
-
-#: urpm.pm:257
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+
+#: po/placeholder.h:243
+msgid ""
+" -u - remove package if a better version is already installed.\n"
msgstr ""
-#: urpm.pm:258
-#, c-format
-msgid "taking removable device as \"%s\""
+#: po/placeholder.h:244
+msgid ""
+" --force - force invocation even if some packages do not\n"
+"exist.\n"
msgstr ""
-#: urpm.pm:262
+#: urpm.pm:1796 urpm.pm:1805
#, c-format
-msgid "using different removable device [%s] for \"%s\""
+msgid "removing %s to upgrade to %s ..."
msgstr ""
-#: urpm.pm:266 urpm.pm:269
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "kunde ej skapa media \"%s\"\n"
-
-#: urpm.pm:1339
-#, fuzzy, c-format
-msgid "read synthesis file [%s]"
-msgstr "l�s depslist-fil [%s]"
+#: urpm.pm:1797 urpm.pm:1806
+msgid ", $otherPackage, "
+msgstr ", $otherPackage, "
-#: urpmi:49
-#, c-format
-msgid "urpmi version %s"
-msgstr "urpmi version %s"
+#: urpm.pm:1797 urpm.pm:1806
+msgid "));"
+msgstr "));"
-#: urpmi:98
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: ok�nd flagga \"-%s\", anv�nd --help f�r hj�lp\n"
+#: urpm.pm:1802
+msgid "$p->{name}-$p->{version}-$p->{release}"
+msgstr "$p->{name}-$p->{version}-$p->{release}"
-#: urpmi:102
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr "Endast superanv�ndare f�r installera lokala paket"
+#: urpm.pm:1812
+msgid "$prefix/$_"
+msgstr "$prefix/$_"
-#: urpmi:189
+#: urpmi:48
#, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Ett av f�ljande paket �r n�dv�ndigt f�r att installera %s:"
-
-#: urpmi:301
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
-msgstr ""
+msgid "urpmi version %s"
+msgstr "urpmi version %s"
#: urpmi.addmedia:30
msgid "usage: urpmi.addmedia [--update] <name> <url>"
@@ -949,3 +1005,131 @@ msgstr ", $_);"
#, c-format
msgid "urpmq version %s"
msgstr "urpmq version %s"
+
+#~ msgid "retrieving [%s]"
+#~ msgstr "tar emot [%s]"
+
+#~ msgid "wget of [%s] failed (maybe wget is missing?)"
+#~ msgstr "wget av [%s] misslyckades (wget kanske saknas?)"
+
+#~ msgid "unable to copy source of [%s] from [%s]"
+#~ msgstr "kan inte kopiera k�llan till [%s] fr�n [%s]"
+
+#~ msgid "removable medium not selected"
+#~ msgstr "flyttbar media inte vald"
+
+#~ msgid "source of [%s] not found as [%s]"
+#~ msgstr "k�llan [%s] kunde inte hittas som [%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 ""
+#~ "urpmi version %s\n"
+#~ "Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+#~ "Det h�r �r fri programvara och f�r distribueras enligt villkoren i GNU "
+#~ "GPL.\n"
+#~ "anv�ndning:\n"
+#~ " --help - visa denna hj�lptext.\n"
+#~ " --update - anv�nd endast uppdateringsmedia.\n"
+#~ " --auto - v�lj automatiskt bra paket vid val.\n"
+#~ " --auto-select - v�lj automatiskt paket f�r att uppgradera systemet.\n"
+#~ " --force - tvinga installation �ven om n�gra paket inte finns.\n"
+#~ " --X - anv�nd ett X-gr�nssnitt.\n"
+#~ " --best-output - v�lj det mest l�mpliga gr�nssnittet utifr�n aktuell "
+#~ "milj�:\n"
+#~ " X eller textl�ge.\n"
+#~ " -a - v�lj allt som matchar kommandoraden.\n"
+#~ " -m - f�rs�k uppgradera s� f� paket som m�jligt "
+#~ "(standard).\n"
+#~ " -M - uppgradera allt som g�r.\n"
+#~ " -c - v�lj komplett metod f�r att uppfylla beroendekrav.\n"
+#~ " -p - till�t s�kning i \"provides\" f�r att hitta paket.\n"
+#~ " -q - tyst l�ge.\n"
+#~ " -v - utf�rligt l�ge.\n"
+#~ " namn eller rpm-filnamn (bara f�r root) angivna p� kommandoraden "
+#~ "installeras.\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 ""
+#~ "urpmq version %s\n"
+#~ "Copyright (C) 2000, 2001 MandrakeSoft.\n"
+#~ "Det h�r �r fri programvara och f�r distribueras enligt villkoren i GNU "
+#~ "GPL.\n"
+#~ "anv�ndning:\n"
+#~ " -h - visa denna hj�lptext.\n"
+#~ " -v - utf�rligt l�ge.\n"
+#~ " -d - ut�ka f�rfr�gan till paketberoenden.\n"
+#~ " -u - ta bort paket om det redan finns en b�ttre version "
+#~ "installerad.\n"
+#~ " -m - ut�ka f�rfr�gan till paketberoenden, ta bort redan\n"
+#~ " installerat paket som tillhandah�ller vad som �r "
+#~ "n�dv�ndigt,\n"
+#~ " l�gg till paket som kan blockera uppgraderingen.\n"
+#~ " -M - ut�ka f�rfr�gan till paketberoenden, ta bort redan\n"
+#~ " installerade paket enbart om de �r nyare eller "
+#~ "likadana.\n"
+#~ " -c - v�lj komplett metod f�r att uppfylla beroendekrav.\n"
+#~ " -p - till�t s�kning i \"provides\" f�r att hitta paket.\n"
+#~ " -g - skriv �ven grupp i namnet.\n"
+#~ " -r - skriv �ven version och \"release\" i namnet.\n"
+#~ " --update - anv�nd bara uppdateringsmedia.\n"
+#~ " --auto-select - v�lj paket automatiskt f�r att uppgradera system.\n"
+#~ " --headers - h�mta pakethuvuden, listade fr�n urpmi-databasen till\n"
+#~ " stdout (endast root).\n"
+#~ " --sources - ge alla k�llpaket innan nerladdning (enbart root).\n"
+#~ " --force - tvinga installation �ven om n�gra paket inte finns.\n"
+#~ " namn eller rpm-filer som anges p� kommandoraden bearbetas.\n"
diff --git a/po/tg.po b/po/tg.po
index 65875cc2..580b970e 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -6,7 +6,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-08-16 16:24GMT+7\n"
"Last-Translator: Dilshod Marupov <abdula@khujandcomptech.dyn.tj>\n"
"Language-Team: Tajik <root@khujandcomptech.dyn.tj>\n"
@@ -27,27 +27,27 @@ msgstr ""
"Коргузории автоматикии қуттиҳо...\n"
"Шумо коргузории куттии '$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 "Ин дуруст аст?"
-#: _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 "Бекор кардан"
-#: _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 "nNНн"
-#: _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 "yYҲҳ"
-#: _irpm:42 po/placeholder.h:118 urpmi:258
+#: _irpm:42 po/placeholder.h:157 urpmi:258
msgid " (Y/n) "
msgstr " (Ҳ/н)"
@@ -151,120 +151,120 @@ msgstr ""
msgid "urpmi is not installed"
msgstr "urpmi кор нагузоштааст"
-#: po/placeholder.h:29 urpm.pm:283
+#: po/placeholder.h:29
+#, fuzzy, c-format
+msgid "reading synthesis file [%s]"
+msgstr "офаридани муҳити \"%s\" номумкин\n"
+
+#: po/placeholder.h:30 urpm.pm:298
#, c-format
msgid "unable to write config file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:31
+#: po/placeholder.h:32
#, fuzzy, c-format
msgid "nothing to write in list file for \"%s\""
msgstr "офаридани муҳити \"%s\" номумкин\n"
-#: 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 ""
-#: po/placeholder.h:33
+#: po/placeholder.h:34
#, fuzzy, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "офаридани муҳити \"%s\" номумкин\n"
-#: po/placeholder.h:34
-#, c-format
+#: po/placeholder.h:35
+#, fuzzy, c-format
msgid "nothing written in list file for \"%s\""
-msgstr ""
-
-#: po/placeholder.h:35 urpm.pm:1951
-#, c-format
-msgid ""
-"removing %s to upgrade ...\n"
-" to %s since it will not upgrade correctly!"
-msgstr ""
+msgstr "офаридани муҳити \"%s\" номумкин\n"
-#: po/placeholder.h:39 urpm.pm:839
+#: po/placeholder.h:36 urpm.pm:845
#, c-format
msgid "read provides file [%s]"
msgstr ""
-#: po/placeholder.h:40
-#, fuzzy, c-format
-msgid "trying to remove inexistant medium \"%s\""
-msgstr "офаридани муҳити \"%s\" номумкин\n"
-
-#: po/placeholder.h:41 urpm.pm:1692
+#: po/placeholder.h:37 urpm.pm:1549
#, c-format
msgid "package %s is not found."
msgstr ""
-#: po/placeholder.h:42
-#, fuzzy, c-format
-msgid "unable to copy source of [%s] from [%s]"
-msgstr "офаридани муҳити \"%s\" номумкин\n"
-
-#: po/placeholder.h:43 urpm.pm:870
+#: po/placeholder.h:38 urpm.pm:876
#, fuzzy, c-format
msgid "unable to write compss file [%s]"
msgstr "офаридани муҳити \"%s\" номумкин\n"
-#: po/placeholder.h:44 urpm.pm:813
+#: po/placeholder.h:39 urpm.pm:819
#, c-format
msgid "unmounting %s"
msgstr ""
-#: po/placeholder.h:45
+#: po/placeholder.h:40
#, c-format
msgid "removing %d obsolete headers in cache"
msgstr ""
-#: po/placeholder.h:46 urpm.pm:919 urpm.pm:1634
+#: po/placeholder.h:41 urpm.pm:925 urpm.pm:1491
#, fuzzy, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "офаридани муҳити \"%s\" номумкин\n"
-#: 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 ""
+
+#: po/placeholder.h:43 urpm.pm:184
+#, c-format
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+
+#: po/placeholder.h:44 urpm.pm:191
#, c-format
msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
msgstr ""
-#: po/placeholder.h:48
+#: po/placeholder.h:45
msgid "keeping only files referenced in provides"
msgstr ""
-#: po/placeholder.h:49
+#: po/placeholder.h:46
#, fuzzy, c-format
msgid "unable to build synthesis file for medium \"%s\""
msgstr "офаридани муҳити \"%s\" номумкин\n"
-#: po/placeholder.h:50
+#: po/placeholder.h:47
#, c-format
msgid "found %d headers in cache"
msgstr ""
-#: po/placeholder.h:51 urpm.pm:836
+#: po/placeholder.h:48 urpm.pm:842
#, fuzzy, c-format
msgid "unable to read provides file [%s]"
msgstr "офаридани муҳити \"%s\" номумкин\n"
-#: 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 ""
-#: po/placeholder.h:53 urpm.pm:311
+#: po/placeholder.h:50
#, c-format
-msgid "medium \"%s\" already exists"
+msgid ""
+"removing %s to upgrade to %s ...\n"
+" since it will not be updated otherwise"
msgstr ""
-#: po/placeholder.h:54 urpm.pm:295
+#: po/placeholder.h:54 urpm.pm:326
#, c-format
-msgid "write config file [%s]"
+msgid "medium \"%s\" already exists"
msgstr ""
#: po/placeholder.h:55
@@ -272,172 +272,186 @@ msgstr ""
msgid "unable to write list file of \"%s\""
msgstr "офаридани муҳити \"%s\" номумкин\n"
-#: po/placeholder.h:56 urpm.pm:1817
-#, c-format
-msgid "retrieving [%s]"
-msgstr ""
-
-#: po/placeholder.h:57 urpm.pm:1819
+#: po/placeholder.h:56 urpm.pm:310
#, c-format
-msgid "wget of [%s] failed"
+msgid "write config file [%s]"
msgstr ""
-#: po/placeholder.h:58 urpm.pm:1101
+#: po/placeholder.h:57 urpm.pm:1107
#, c-format
msgid "no package named %s"
msgstr ""
-#: po/placeholder.h:59 urpm.pm:848
+#: po/placeholder.h:58 urpm.pm:854
#, fuzzy, c-format
msgid "unable to read compss file [%s]"
msgstr "офаридани муҳити \"%s\" номумкин\n"
-#: 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 ""
-#: po/placeholder.h:61
-#, c-format
+#: po/placeholder.h:60
+#, fuzzy, c-format
msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "офаридани муҳити \"%s\" номумкин\n"
+
+#: po/placeholder.h:61
+msgid "computing dependencies"
msgstr ""
#: po/placeholder.h:62
-msgid "computing dependencies"
+#, c-format
+msgid "retrieve of [%s] failed"
msgstr ""
-#: po/placeholder.h:63 urpm.pm:868
+#: po/placeholder.h:63 urpm.pm:874
#, c-format
msgid "write provides file [%s]"
msgstr ""
-#: po/placeholder.h:64 urpm.pm:803
+#: po/placeholder.h:64 urpm.pm:809
#, fuzzy, c-format
msgid "mounting %s"
msgstr "коргузории %s\n"
-#: 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 "
"medium"
msgstr ""
-#: po/placeholder.h:66 urpm.pm:148
-#, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
-msgstr ""
-
-#: po/placeholder.h:67
+#: po/placeholder.h:66
#, fuzzy, c-format
msgid "reading hdlist file [%s]"
msgstr "офаридани муҳити \"%s\" номумкин\n"
-#: po/placeholder.h:68 urpm.pm:873
+#: po/placeholder.h:67 urpm.pm:879
#, c-format
msgid "write compss file [%s]"
msgstr ""
-#: po/placeholder.h:69 urpm.pm:827
+#: po/placeholder.h:68 urpm.pm:833
#, c-format
msgid "read depslist file [%s]"
msgstr ""
-#: po/placeholder.h:70
+#: 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 "trying to select inexistant medium \"%s\""
+msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "офаридани муҳити \"%s\" номумкин\n"
-#: po/placeholder.h:71 urpm.pm:1812
+#: po/placeholder.h:71 urpm.pm:1668
#, c-format
msgid "malformed input: [%s]"
msgstr ""
-#: 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"
+msgid "there are multiple packages with the same rpm filename \"%s\""
msgstr ""
-#: 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 ""
-#: po/placeholder.h:77 urpm.pm:865
+#: po/placeholder.h:74 urpm.pm:871
#, fuzzy, c-format
msgid "unable to write provides file [%s]"
msgstr "офаридани муҳити \"%s\" номумкин\n"
-#: 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 ""
-#: po/placeholder.h:79 urpm.pm:1005
+#: po/placeholder.h:76 urpm.pm:1215
+#, fuzzy
+msgid "unable to find all synthesis file, using parsehdlist server"
+msgstr "офаридани муҳити \"%s\" номумкин\n"
+
+#: po/placeholder.h:77 urpm.pm:1011
#, fuzzy
msgid "unable to register rpm file"
msgstr "офаридани муҳити \"%s\" номумкин\n"
-#: po/placeholder.h:80 urpm.pm:1362
-msgid "unable to find all synthesis file, using parsehdlist server"
+#: po/placeholder.h:78 urpm.pm:256
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
msgstr ""
-#: po/placeholder.h:81 urpm.pm:241
+#: po/placeholder.h:79 urpm.pm:272
#, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "too many mount points for removable medium \"%s\""
msgstr ""
-#: po/placeholder.h:82 urpm.pm:233
+#: po/placeholder.h:80 urpm.pm:248
#, c-format
msgid "incoherent list file for \"%s\", medium ignored"
msgstr ""
-#: po/placeholder.h:83
+#: po/placeholder.h:81
#, c-format
msgid "copy of [%s] failed"
msgstr ""
-#: po/placeholder.h:84 urpm.pm:907 urpm.pm:1338 urpm.pm:1616 urpm.pm:1623
+#: po/placeholder.h:82
+#, 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
#, fuzzy, c-format
msgid "unable to parse correctly [%s]"
msgstr "нав кардани муҳити \"%s\" номумкин\n"
-#: po/placeholder.h:85 urpm.pm:824
+#: po/placeholder.h:84 urpm.pm:1192
#, fuzzy, c-format
-msgid "unable to read depslist file [%s]"
+msgid "read synthesis file [%s]"
msgstr "офаридани муҳити \"%s\" номумкин\n"
-#: po/placeholder.h:86
-msgid "removable medium not selected"
-msgstr ""
+#: po/placeholder.h:85 urpm.pm:830
+#, fuzzy, c-format
+msgid "unable to read depslist file [%s]"
+msgstr "офаридани муҳити \"%s\" номумкин\n"
-#: po/placeholder.h:87 urpm.pm:851
+#: po/placeholder.h:86 urpm.pm:857
#, c-format
msgid "read compss file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:89
-#, c-format
+#: po/placeholder.h:88
+#, fuzzy, c-format
msgid "building hdlist [%s]"
-msgstr ""
+msgstr "офаридани муҳити \"%s\" номумкин\n"
-#: po/placeholder.h:90 urpm.pm:1746
+#: po/placeholder.h:89 urpm.pm:1603
#, fuzzy, c-format
msgid "unable to read rpm file [%s] from medium \"%s\""
msgstr "офаридани муҳити \"%s\" номумкин\n"
-#: po/placeholder.h:91 urpm.pm:1009
+#: po/placeholder.h:90 urpm.pm:1015
msgid "error registering local packages"
msgstr ""
-#: 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 ""
@@ -447,172 +461,160 @@ msgstr ""
msgid "unable to build hdlist: %s"
msgstr "офаридани муҳити \"%s\" номумкин\n"
-#: po/placeholder.h:94 urpm.pm:1000
-#, c-format
-msgid "invalid rpm file name [%s]"
-msgstr ""
-
-#: po/placeholder.h:95 urpm.pm:1736 urpm.pm:1739 urpm.pm:1758
+#: po/placeholder.h:94 urpm.pm:1593 urpm.pm:1596 urpm.pm:1615
#, c-format
msgid "medium \"%s\" is not selected"
msgstr ""
-#: po/placeholder.h:96 urpm.pm:207
+#: po/placeholder.h:95 urpm.pm:1006
#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "invalid rpm file name [%s]"
msgstr ""
-#: po/placeholder.h:97 urpm.pm:863
+#: po/placeholder.h:96 urpm.pm:1175
#, c-format
-msgid "write depslist file [%s]"
+msgid "unknown data associated with %s"
msgstr ""
-#: po/placeholder.h:98 urpm.pm:1322
+#: po/placeholder.h:97 urpm.pm:222
#, c-format
-msgid "unknown data associated with %s"
+msgid "trying to bypass existing medium \"%s\", avoiding"
msgstr ""
-#: po/placeholder.h:99
+#: po/placeholder.h:98 urpm.pm:869
#, c-format
-msgid "source of [%s] not found as [%s]"
+msgid "write depslist file [%s]"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: po/placeholder.h:102
-#, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
-msgstr ""
-
-#: po/placeholder.h:103 urpm.pm:1001
+#: po/placeholder.h:101 urpm.pm:1007
#, fuzzy, c-format
msgid "unable to access rpm file [%s]"
msgstr "офаридани муҳити \"%s\" номумкин\n"
-#: po/placeholder.h:104 urpm.pm:860
+#: po/placeholder.h:102 urpm.pm:866
#, fuzzy, c-format
msgid "unable to write depslist file [%s]"
msgstr "офаридани муҳити \"%s\" номумкин\n"
-#: po/placeholder.h:105 urpm.pm:327 urpm.pm:1773
+#: po/placeholder.h:103
+#, 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
#, fuzzy, c-format
msgid "unable to access medium \"%s\""
msgstr "нав кардани муҳити \"%s\" номумкин\n"
-#: po/placeholder.h:106 urpm.pm:988
+#: po/placeholder.h:108 urpm.pm:994
#, c-format
msgid "relocated %s entries in depslist"
msgstr ""
-#: po/placeholder.h:107 urpm.pm:914 urpm.pm:1629 urpm.pm:1680
-#, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
+#: po/placeholder.h:109
+#, 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:108
+#: po/placeholder.h:111 urpm.pm:920 urpm.pm:1486 urpm.pm:1537
#, c-format
-msgid "no rpm files found from [%s]"
+msgid "unable to parse correctly [%s] on value \"%s\""
msgstr ""
-#: po/placeholder.h:109 urpm.pm:1104
+#: po/placeholder.h:112 urpm.pm:1110
#, fuzzy, c-format
msgid "The following packages contain %s: %s"
msgstr "Яке аз қуттиҳои навбатӣ даркор аст:"
-#: po/placeholder.h:110 urpm.pm:1645 urpm.pm:1671
-#, c-format
-msgid "there are multiples packages with the same rpm filename \"%s\""
-msgstr ""
+#: po/placeholder.h:113
+#, fuzzy, c-format
+msgid "no rpm files found from [%s]"
+msgstr "офаридани муҳити \"%s\" номумкин\n"
-#: po/placeholder.h:111 urpm.pm:1920
+#: po/placeholder.h:114 urpm.pm:1772
#, c-format
msgid "selecting %s using obsoletes"
msgstr ""
-#: po/placeholder.h:112 urpm.pm:2031
+#: po/placeholder.h:115 urpm.pm:1888
#, c-format
msgid "selecting %s by selection on files"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:114 urpmi:308 urpmi:315 urpmi:328 urpmi:339 urpmi:352
-msgid "Installation failed"
-msgstr "Коргузорӣ нагузашт"
-
-#: po/placeholder.h:115 urpmi:279
-msgid "Press enter when it's done..."
-msgstr "Вақте, ки ин тайёр enter-ро зер кунед..."
+#: po/placeholder.h:120
+msgid " --help - print this help message.\n"
+msgstr ""
-#: po/placeholder.h:117 urpmi:201
-msgid "Sorry, bad choice, try again\n"
-msgstr "Мебахшед, интихоби бад аз нав кӯшиш кунед\n"
+#: po/placeholder.h:121 urpmi:361
+msgid "everything already installed"
+msgstr "ҳамааш аллакай кор гузошта шуд"
-#: po/placeholder.h:120
+#: po/placeholder.h:122 urpmi:98
#, fuzzy, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: интихоби номаълум \"-$1\", истифодаро бо --help тафтиш кунед\n"
+
+#: po/placeholder.h:123 urpmi:194
+msgid "One of the following packages is needed:"
+msgstr "Яке аз қуттиҳои навбатӣ даркор аст:"
+
+#: po/placeholder.h:124 po/placeholder.h:222
+msgid " --update - use only update media.\n"
+msgstr ""
+
+#: po/placeholder.h:125 urpmi:299
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"
+"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 "Коргузорӣ нагузашт"
+
+#: po/placeholder.h:132 po/placeholder.h:234
+msgid ""
+" --auto-select - automatically select packages for upgrading the system.\n"
+msgstr ""
+
+#: po/placeholder.h:134
+msgid " --X - use X interface.\n"
msgstr ""
-"ривояти urpmi %s\n"
-"Ҳуқуқи муаллифӣ (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"Ин нармафзори озод аст ва мувофиқи шартҳои лисензияи GNU GPL паҳн\n"
-"кардан мумкин.\n"
-"истифода:\n"
-" --help - ин хабари ёриро чоп кунед.\n"
-" --auto - интихоби автоматикии қуттии хуб аз интихобот.\n"
-" --auto-select - интихоби автоматикии қуттиҳо барои афзудани систем.\n"
-" --force - шурӯъангезии маҷбурӣ, ҳатто базе қутти вуҷуд надошта "
-"бошадҳам.\n"
-" --X - X интерфейсро истифода баред.\n"
-" --best-output - интерфейси беҳтаринро мувофиқи вазъият интихоб кунед:\n"
-" X ё усули матн.\n"
-" -a - ҳамаи мувофиқатҳоро дар сатри фармон интихоб кунед.\n"
-" -m - маҳдудияти камтарини талаботҳоро интихоб кунед "
-"(пешфарз).\n"
-" -M - маҳдудияти бисёртарини талаботҳоро интихоб кунед.\n"
-" -c - методи пурраро барои ҳалли талаботҳо интихоб кунед.\n"
-" -q - усули ором.\n"
-" -v - усули муфассал.\n"
-" номҳо ё rpm файлҳои (танҳо барои root) дар сатри фармон додашуда кор "
-"гузошташуданд.\n"
-
-#: po/placeholder.h:142 urpmi:362
-msgid "everything already installed"
-msgstr "ҳамааш аллакай кор гузошта шуд"
-#: po/placeholder.h:143 urpmi:247
+#: po/placeholder.h:135 urpmi:247
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -620,43 +622,108 @@ msgid ""
msgstr ""
"Барои қаноатмандии тобеиятҳо қуттиҳои навбатӣ кор гузошта мешаванд (%d MB)"
-#: po/placeholder.h:144 urpmi:296
-#, c-format
-msgid "installing %s\n"
-msgstr "коргузории %s\n"
+#: po/placeholder.h:136 urpmi:320 urpmi:344
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Коргузориро бе тафтиши тобеиятҳо кӯшиш кунем? (Ҳ/Н) "
-#: po/placeholder.h:145 urpmi:198
+#: 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
+msgid " -q - quiet mode.\n"
+msgstr ""
+
+#: po/placeholder.h:144 urpmi:202
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Интихоби шумо чист? (1-%d) "
-#: po/placeholder.h:146 urpmi:321 urpmi:345
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Коргузориро бе тафтиши тобеиятҳо кӯшиш кунем? (Ҳ/Н) "
+#: po/placeholder.h:145
+msgid " --wget - use wget to retrieve distant files.\n"
+msgstr ""
-#: po/placeholder.h:147 urpmi:190
-msgid "One of the following packages is needed:"
-msgstr "Яке аз қуттиҳои навбатӣ даркор аст:"
+#: po/placeholder.h:146
+#, 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"
+msgstr ""
+
+#: po/placeholder.h:152 urpmi:328 urpmi:352
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Коргузориро боз устувортар (маҷбурӣ) кӯшиш кунем? (Ҳ/Н) "
+
+#: po/placeholder.h:154
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+
+#: po/placeholder.h:155 urpmi:205
+msgid "Sorry, bad choice, try again\n"
+msgstr "Мебахшед, интихоби бад аз нав кӯшиш кунед\n"
-#: po/placeholder.h:148 urpmi:149
+#: po/placeholder.h:156
+msgid ""
+" names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: po/placeholder.h:158
+msgid " -a - select all matches on command line.\n"
+msgstr ""
+
+#: 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 "коргузории %s\n"
+
+#: po/placeholder.h:161 urpmi:152
msgid "Only superuser is allowed to install local packages"
msgstr ""
"Танҳо ба фавқулкорванд кор гузоштани қуттиҳои маҳалли рухсат дода шудааст"
-#: 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 "Илтимос, муҳити бо номи \"%s\" ба дастгоҳи [%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 "қуттиҳои сарчашмавӣ гирифтан номумкин, кандашавӣ"
-#: po/placeholder.h:151 urpmi:329 urpmi:353
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Коргузориро боз устувортар (маҷбурӣ) кӯшиш кунем? (Ҳ/Н) "
+#: po/placeholder.h:165 urpmi:102
+#, fuzzy
+msgid "Only superuser is allowed to install packages"
+msgstr ""
+"Танҳо ба фавқулкорванд кор гузоштани қуттиҳои маҳалли рухсат дода шудааст"
+
+#: po/placeholder.h:166 urpmi:193
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Яке аз қуттиҳои навбатӣ даркор аст:"
-#: po/placeholder.h:155 urpmi.addmedia:46
+#: po/placeholder.h:167 urpmi:277
+msgid "Press Enter when it's done..."
+msgstr "Вақте, ки ин тайёр enter-ро зер кунед..."
+
+#: po/placeholder.h:168 urpmi.addmedia:46
#, c-format
msgid ""
"%s\n"
@@ -665,7 +732,7 @@ msgstr ""
"%s\n"
"`with' ҳозир нест барои ftp media\n"
-#: po/placeholder.h:159
+#: po/placeholder.h:172
msgid ""
"usage: urpmi.addmedia [--update] <name> <url>\n"
"where <url> is one of\n"
@@ -685,17 +752,17 @@ msgstr ""
" http://<host>/<роҳ> with <номи нисбии файли hdlist>\n"
" removable_<дастгоҳ>://<роҳ>\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 "офаридани муҳити \"%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 "нав кардани муҳити \"%s\" номумкин\n"
-#: po/placeholder.h:170 urpmi.addmedia:42
+#: po/placeholder.h:183 urpmi.addmedia:42
#, c-format
msgid ""
"%s\n"
@@ -704,7 +771,7 @@ msgstr ""
"%s\n"
"дастгоҳи `%s' вуҷуд надорад\n"
-#: po/placeholder.h:174 urpmi.addmedia:44
+#: po/placeholder.h:187 urpmi.addmedia:44
#, c-format
msgid ""
"%s\n"
@@ -713,7 +780,7 @@ msgstr ""
"%s\n"
"роҳи нисбии hdlist ҳозир нест\n"
-#: po/placeholder.h:178
+#: po/placeholder.h:191
#, fuzzy, c-format
msgid ""
"usage: urpmi.update [-a] <name> ...\n"
@@ -732,13 +799,13 @@ msgstr ""
"\n"
"интихобҳои номаълуми '%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 ""
"ба навкунӣ чизе нест (urpmi.addmedia истифода баред барои илова кардани "
"муҳит)\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"
@@ -747,13 +814,13 @@ msgstr ""
"элемент барои нав кардан ҳозир нест\n"
"(яке аз %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 ""
"ба хориҷкунӣ чизе нест (urpmi.addmedia истифода баред барои илова кардани "
"муҳит)\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"
@@ -762,7 +829,7 @@ msgstr ""
"элемент барои хориҷ кардан ҳозир нест\n"
"(яке аз %s)\n"
-#: po/placeholder.h:197
+#: po/placeholder.h:210
#, c-format
msgid ""
"usage: urpmi.removemedia [-a] <name> ...\n"
@@ -777,24 +844,39 @@ msgstr ""
"\n"
"интихобҳои номаълуми '%s'\n"
-#: po/placeholder.h:204 urpmq:85
-#, fuzzy, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: хондани файли rpm \"$_\" намешавад\n"
-
-#: po/placeholder.h:206 urpmq:82
-#, fuzzy, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: интихоби номаълум \"-$1\", истифодаро бо --help тафтиш кунед\n"
+#: po/placeholder.h:217
+msgid " -h - print this help message.\n"
+msgstr ""
-#: 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 ""
"баъзе қуттиҳо бояд хориҷ шаванд барои афзоиш, ин ҳоло дастгирӣ нашудааст\n"
-#: po/placeholder.h:208
+#: po/placeholder.h:219
+msgid " -g - print groups too with name.\n"
+msgstr ""
+
+#: po/placeholder.h:220 urpmq:84
+#, fuzzy, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: хондани файли rpm \"$_\" намешавад\n"
+
+#: po/placeholder.h:221
+msgid " names or rpm files given on command line are queried.\n"
+msgstr ""
+
+#: po/placeholder.h:223
+msgid " -r - print version and release too with name.\n"
+msgstr ""
+
+#: po/placeholder.h:224
+msgid " -f - print version, release and arch with name.\n"
+msgstr ""
+
+#: po/placeholder.h:225
#, c-format
msgid ""
"urpmq version %s\n"
@@ -802,80 +884,70 @@ msgid ""
"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"
+msgstr ""
+
+#: po/placeholder.h:231
+msgid " -d - extend query to package dependencies.\n"
+msgstr ""
+
+#: po/placeholder.h:232
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
+msgstr ""
+
+#: po/placeholder.h:233
+msgid ""
" -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"
+msgstr ""
+
+#: po/placeholder.h:235 urpmq:81
+#, fuzzy, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: интихоби номаълум \"-$1\", истифодаро бо --help тафтиш кунед\n"
+
+#: po/placeholder.h:236
+msgid ""
" --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 package do not exist.\n"
-" names or rpm files given on command line are queried.\n"
msgstr ""
-#: urpm.pm:257
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:243
+msgid ""
+" -u - remove package if a better version is already installed.\n"
msgstr ""
-#: urpm.pm:258
-#, c-format
-msgid "taking removable device as \"%s\""
+#: po/placeholder.h:244
+msgid ""
+" --force - force invocation even if some packages do not\n"
+"exist.\n"
msgstr ""
-#: urpm.pm:262
+#: urpm.pm:1796 urpm.pm:1805
#, c-format
-msgid "using different removable device [%s] for \"%s\""
+msgid "removing %s to upgrade to %s ..."
msgstr ""
-#: urpm.pm:266 urpm.pm:269
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "офаридани муҳити \"%s\" номумкин\n"
+#: urpm.pm:1797 urpm.pm:1806
+msgid ", $otherPackage, "
+msgstr ", $otherPackage, "
-#: urpm.pm:1339
-#, fuzzy, c-format
-msgid "read synthesis file [%s]"
-msgstr "офаридани муҳити \"%s\" номумкин\n"
+#: urpm.pm:1797 urpm.pm:1806
+msgid "));"
+msgstr "));"
+
+#: urpm.pm:1802
+msgid "$p->{name}-$p->{version}-$p->{release}"
+msgstr "$p->{name}-$p->{version}-$p->{release}"
+
+#: urpm.pm:1812
+msgid "$prefix/$_"
+msgstr "$prefix/$_"
-#: urpmi:49
+#: urpmi:48
#, c-format
msgid "urpmi version %s"
msgstr "urpmi ривояти %s"
-#: urpmi:98
-#, fuzzy, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: интихоби номаълум \"-$1\", истифодаро бо --help тафтиш кунед\n"
-
-#: urpmi:102
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr ""
-"Танҳо ба фавқулкорванд кор гузоштани қуттиҳои маҳалли рухсат дода шудааст"
-
-#: urpmi:189
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Яке аз қуттиҳои навбатӣ даркор аст:"
-
-#: urpmi:301
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
-msgstr ""
-
#: urpmi.addmedia:30
#, fuzzy
msgid "usage: urpmi.addmedia [--update] <name> <url>"
@@ -908,3 +980,59 @@ msgstr "), $_);"
#, c-format
msgid "urpmq version %s"
msgstr "urpmq ривояти %s"
+
+#, fuzzy
+#~ msgid "unable to copy source of [%s] from [%s]"
+#~ msgstr "офаридани муҳити \"%s\" номумкин\n"
+
+#, fuzzy
+#~ 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 ""
+#~ "ривояти urpmi %s\n"
+#~ "Ҳуқуқи муаллифӣ (C) 1999, 2000, 2001 MandrakeSoft.\n"
+#~ "Ин нармафзори озод аст ва мувофиқи шартҳои лисензияи GNU GPL паҳн\n"
+#~ "кардан мумкин.\n"
+#~ "истифода:\n"
+#~ " --help - ин хабари ёриро чоп кунед.\n"
+#~ " --auto - интихоби автоматикии қуттии хуб аз интихобот.\n"
+#~ " --auto-select - интихоби автоматикии қуттиҳо барои афзудани систем.\n"
+#~ " --force - шурӯъангезии маҷбурӣ, ҳатто базе қутти вуҷуд надошта "
+#~ "бошадҳам.\n"
+#~ " --X - X интерфейсро истифода баред.\n"
+#~ " --best-output - интерфейси беҳтаринро мувофиқи вазъият интихоб "
+#~ "кунед:\n"
+#~ " X ё усули матн.\n"
+#~ " -a - ҳамаи мувофиқатҳоро дар сатри фармон интихоб кунед.\n"
+#~ " -m - маҳдудияти камтарини талаботҳоро интихоб кунед "
+#~ "(пешфарз).\n"
+#~ " -M - маҳдудияти бисёртарини талаботҳоро интихоб кунед.\n"
+#~ " -c - методи пурраро барои ҳалли талаботҳо интихоб кунед.\n"
+#~ " -q - усули ором.\n"
+#~ " -v - усули муфассал.\n"
+#~ " номҳо ё rpm файлҳои (танҳо барои root) дар сатри фармон додашуда кор "
+#~ "гузошташуданд.\n"
diff --git a/po/th.po b/po/th.po
index dff66967..f0b1f97d 100644
--- a/po/th.po
+++ b/po/th.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-09-17 21:51GMT+7\n"
"Last-Translator: Wachara Chinsettawong <wachara@yahoo.com>\n"
"Language-Team: Thai <de@li.org>\n"
@@ -26,27 +26,27 @@ msgstr ""
"��õԴ��� Package Ẻ�ѵ��ѵ...\n"
"�س�����͡���еԴ��� Package $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 "��ŧ�����Ѻ"
-#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:281
+#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:279
msgid "Ok"
msgstr "��ŧ"
-#: _irpm:34 po/placeholder.h:116 urpmi:252 urpmi:282
+#: _irpm:34 po/placeholder.h:119 urpmi:252 urpmi:280
msgid "Cancel"
msgstr "¡��ԡ"
-#: _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 "Nn"
-#: _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 "Yy"
-#: _irpm:42 po/placeholder.h:118 urpmi:258
+#: _irpm:42 po/placeholder.h:157 urpmi:258
msgid " (Y/n) "
msgstr " (Y/n) "
@@ -151,296 +151,308 @@ msgstr "try urpmf --help �շҧ����������͡�ҡ"
msgid "urpmi is not installed"
msgstr "urpmi �������ö�Դ�����"
-#: po/placeholder.h:29 urpm.pm:283
+#: po/placeholder.h:29
+#, fuzzy, c-format
+msgid "reading synthesis file [%s]"
+msgstr "��ҹ depslist file [%s]"
+
+#: po/placeholder.h:30 urpm.pm:298
#, c-format
msgid "unable to write config file [%s]"
msgstr "�������ö��¹ config file [%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"
-msgstr "�������ö����� \"%s\" ����Ѻ�ػ�ó�������ժ�����������ѹ��١������"
+msgid "using different removable device [%s] for \"%s\""
+msgstr ""
-#: po/placeholder.h:31
+#: po/placeholder.h:32
#, c-format
msgid "nothing to write in list file for \"%s\""
msgstr "����ա����¹��¡�� file ����Ѻ\"%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 "�������ö�� list file ����Ѻ\"%s\",medium ignored"
-#: po/placeholder.h:33
+#: po/placeholder.h:34
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "�������ö parse hdlist file of \"%s\""
-#: po/placeholder.h:34
+#: po/placeholder.h:35
#, c-format
msgid "nothing written in list file for \"%s\""
msgstr "����ա����¹� list file ����Ѻ\"%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 ""
-"���ѧź %s ���� upgrade..\n"
-"����Ѻ %s ��������ѹ����Ҩ upgrade ��١��ͧ!"
-
-#: po/placeholder.h:39 urpm.pm:839
+#: po/placeholder.h:36 urpm.pm:845
#, c-format
msgid "read provides file [%s]"
msgstr "��ҹ file ����Դ [%s]"
-#: po/placeholder.h:40
-#, c-format
-msgid "trying to remove inexistant medium \"%s\""
-msgstr "���ѧ�ӡ�������͡����Ѻ�ػ�ó��������\"%s\""
-
-#: po/placeholder.h:41 urpm.pm:1692
+#: po/placeholder.h:37 urpm.pm:1549
#, c-format
msgid "package %s is not found."
msgstr "�� %s package ��辺"
-#: po/placeholder.h:42
-#, c-format
-msgid "unable to copy source of [%s] from [%s]"
-msgstr "�������ö copy source of [%s} �ҡ [%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 "�������ö��¹ compss file[%s]"
-#: po/placeholder.h:44 urpm.pm:813
+#: po/placeholder.h:39 urpm.pm:819
#, c-format
msgid "unmounting %s"
msgstr "���ѧ�ʹ�͹ %s"
-#: po/placeholder.h:45
+#: po/placeholder.h:40
#, c-format
msgid "removing %d obsolete headers in cache"
msgstr "���ѧź %d header����������� 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 "��辺 hdlist file ����Ѻ�ػ�ó�\"%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 "�ػ�ó�\"%s\"��������� hdlist������������� ,medium ignore"
+
+#: po/placeholder.h:43 urpm.pm:184
+#, c-format
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr "�������ö����� \"%s\" ����Ѻ�ػ�ó�������ժ�����������ѹ��١������"
+
+#: po/placeholder.h:44 urpm.pm:191
#, c-format
msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
msgstr "�������ö���ػ�ó� \"%s\" ���������������� list file[%s]"
-#: po/placeholder.h:48
+#: po/placeholder.h:45
msgid "keeping only files referenced in provides"
msgstr "��੾�� files referenced � provides"
-#: po/placeholder.h:49
+#: po/placeholder.h:46
#, c-format
msgid "unable to build synthesis file for medium \"%s\""
msgstr "�������ö���ҧ synthesis file ����Ѻ�ػ�ó� \"%s\""
-#: po/placeholder.h:50
+#: po/placeholder.h:47
#, c-format
msgid "found %d headers in cache"
msgstr "�� %d header � 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 "�������ö��ҹ provides file[%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 "��ա����§������͡ %s ����������ҷ�ͧ����ѧ�����١���͡"
-#: 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 ""
+"���ѧ����%s ���� upgrade...\n"
+"�� %s ��������ѹ�������ö�١��㢴����Ը����"
+
+#: po/placeholder.h:54 urpm.pm:326
#, c-format
msgid "medium \"%s\" already exists"
msgstr "�ػ�ó�\"%s\"����������"
-#: po/placeholder.h:54 urpm.pm:295
-#, c-format
-msgid "write config file [%s]"
-msgstr "��¹ config file[%s]"
-
#: po/placeholder.h:55
#, c-format
msgid "unable to write list file of \"%s\""
msgstr "�������ö��¹ list file �ͧ\"%s\""
-#: po/placeholder.h:56 urpm.pm:1817
-#, c-format
-msgid "retrieving [%s]"
-msgstr "���ѧ��ҹ������[%s]"
-
-#: po/placeholder.h:57 urpm.pm:1819
+#: po/placeholder.h:56 urpm.pm:310
#, c-format
-msgid "wget of [%s] failed"
-msgstr "wget of [%s]��������"
+msgid "write config file [%s]"
+msgstr "��¹ config file[%s]"
-#: po/placeholder.h:58 urpm.pm:1101
+#: po/placeholder.h:57 urpm.pm:1107
#, c-format
msgid "no package named %s"
msgstr "����� package ������ %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 "�������ö��ҹ compss file[%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 "�������ö�� hdlist file ����Ѻ\"%s\",medium ignored"
-#: po/placeholder.h:61
+#: po/placeholder.h:60
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "���ҧ hdlist synthesis file ����Ѻ �ػ�ó� \"%s\""
-#: po/placeholder.h:62
+#: po/placeholder.h:61
msgid "computing dependencies"
msgstr "���ѧ�ӹǹ��觷���������ѹ"
-#: po/placeholder.h:63 urpm.pm:868
+#: po/placeholder.h:62
+#, fuzzy, c-format
+msgid "retrieve of [%s] failed"
+msgstr "wget of [%s]��������"
+
+#: po/placeholder.h:63 urpm.pm:874
#, c-format
msgid "write provides file [%s]"
msgstr "��¹ provides file [%s]"
-#: po/placeholder.h:64 urpm.pm:803
+#: po/placeholder.h:64 urpm.pm:809
#, c-format
msgid "mounting %s"
msgstr "���ѧ�Դ��� %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 "
"medium"
msgstr "�������ö�����ػ�ó�\"%s\"������� list file ��١�����ػ�ó��������"
-#: po/placeholder.h:66 urpm.pm:148
-#, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
-msgstr "�ػ�ó�\"%s\"���������͡���ػ�ó���������, medium ignored"
-
-#: po/placeholder.h:67
+#: po/placeholder.h:66
#, c-format
msgid "reading hdlist file [%s]"
msgstr "���ѧ��ҹ hdlist file [%s]"
-#: po/placeholder.h:68 urpm.pm:873
+#: po/placeholder.h:67 urpm.pm:879
#, c-format
msgid "write compss file [%s]"
msgstr "��¹ compss file[%s]"
-#: po/placeholder.h:69 urpm.pm:827
+#: po/placeholder.h:68 urpm.pm:833
#, c-format
msgid "read depslist file [%s]"
msgstr "��ҹ depslist file [%s]"
-#: po/placeholder.h:70
-#, c-format
-msgid "trying to select inexistant medium \"%s\""
-msgstr "�������������͡���ػ�ó��������\"%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 "�������ö���ҧ�ػ�ó� \"%s\"\n"
-#: po/placeholder.h:71 urpm.pm:1812
+#: po/placeholder.h:71 urpm.pm:1668
#, c-format
msgid "malformed input: [%s]"
msgstr " input���١��ͧ :[%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 "�ػ�ó�\"%s\"��������� hdlist������������� ,medium ignore"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "������ package ����ժ����������͹�Ѻ \"%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"
-msgstr ""
-"���ѧ����%s ���� upgrade...\n"
-"�� %s ��������ѹ�������ö�١��㢴����Ը����"
+msgid "medium \"%s\" tries to use an already used list, medium ignored"
+msgstr "�ػ�ó�\"%s\"���������͡���ػ�ó���������, medium ignored"
-#: po/placeholder.h:77 urpm.pm:865
+#: po/placeholder.h:74 urpm.pm:871
#, c-format
msgid "unable to write provides file [%s]"
msgstr "�������ö��¹ provides file [%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 "�������ö��ҹ hdlist file \"%s\", medium ignored"
-#: po/placeholder.h:79 urpm.pm:1005
-msgid "unable to register rpm file"
-msgstr "�������öŧ����¹ rpm file"
-
-#: 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 "�������ö�� synthesis file,���ѧ�� parsehdlist server"
-#: po/placeholder.h:81 urpm.pm:241
+#: po/placeholder.h:77 urpm.pm:1011
+msgid "unable to register rpm file"
+msgstr "�������öŧ����¹ rpm file"
+
+#: po/placeholder.h:78 urpm.pm:256
#, c-format
msgid "unable to inspect list file for \"%s\", medium ignored"
msgstr "�������ö��Ǩ�ͺ list file ����Ѻ \"%s\", medium ignored"
-#: 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 "list file ���еԴ�е�� \"%s\", medium ignored"
-#: po/placeholder.h:83
+#: po/placeholder.h:81
#, c-format
msgid "copy of [%s] failed"
msgstr "��÷����� [%s] ��������"
-#: 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 "���ѧ�ӡ�������͡����Ѻ�ػ�ó��������\"%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 "�������ö����ѡ������١��ͧ [%s]"
-#: po/placeholder.h:85 urpm.pm:824
+#: po/placeholder.h:84 urpm.pm:1192
+#, fuzzy, c-format
+msgid "read synthesis file [%s]"
+msgstr "��ҹ depslist file [%s]"
+
+#: po/placeholder.h:85 urpm.pm:830
#, c-format
msgid "unable to read depslist file [%s]"
msgstr "�������ö��ҹ depslist file[%s]"
-#: po/placeholder.h:86
-msgid "removable medium not selected"
-msgstr "�ػ�ó�Ẻ�ʹ����¹�������١���͡"
-
-#: po/placeholder.h:87 urpm.pm:851
+#: po/placeholder.h:86 urpm.pm:857
#, c-format
msgid "read compss file [%s]"
msgstr "��ҹ compass file[%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 "�բ�ͼԴ��Ҵ� config file ��÷Ѵ��� %s"
-#: po/placeholder.h:89
+#: po/placeholder.h:88
#, c-format
msgid "building hdlist [%s]"
msgstr "���ҧ 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 "�������ö��ҹ rpm file [%s] �ҡ \"%s\""
-#: po/placeholder.h:91 urpm.pm:1009
+#: po/placeholder.h:90 urpm.pm:1015
msgid "error registering local packages"
msgstr "ŧ����¹ local package �բ�ͼԴ��Ҵ"
-#: 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 "�ػ�ó������������ѹ \"%s\" �١�к���Ҷʹ����¹�����ѹ�����"
@@ -450,212 +462,272 @@ msgstr "�ػ�ó������������ѹ \"%s\" �١�к���Ҷʹ����¹�����ѹ�����"
msgid "unable to build hdlist: %s"
msgstr "�������ö���ҧ 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 "�ػ�ó� \"%s\" �����١���͡"
+
+#: po/placeholder.h:95 urpm.pm:1006
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "���� rpm file���١��ͧ [%s]"
-#: 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 "�ػ�ó� \"%s\" �����١���͡"
+msgid "unknown data associated with %s"
+msgstr "�����ŷ��������ѡ��������Դ�Ѻ %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 "���ѧ����§��÷ӧҹ�ͧ�ػ�ó� \"%s\""
-#: po/placeholder.h:97 urpm.pm:863
+#: po/placeholder.h:98 urpm.pm:869
#, c-format
msgid "write depslist file [%s]"
msgstr "��¹ depslist file[%s]"
-#: po/placeholder.h:98 urpm.pm:1322
-#, c-format
-msgid "unknown data associated with %s"
-msgstr "�����ŷ��������ѡ��������Դ�Ѻ %s"
-
-#: po/placeholder.h:99
-#, c-format
-msgid "source of [%s] not found as [%s]"
-msgstr "���觷���Ңͧ [%s] ����辺�� [%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 "�������ö��ҹ list file �ͧ \"%s\", medium ignored"
-#: 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 "��ա����§������͡ %s files ������������ files �ͷ��� updated"
-#: po/placeholder.h:102
-#, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
-msgstr "wget [%s] ��������(�ҧ���Ҩ����� 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 "�������ö��ҹ rpm file [%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 "�������ö��¹ depslist file [%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 ""
+"���ѧź %s ���� upgrade..\n"
+"����Ѻ %s ��������ѹ����Ҩ upgrade ��١��ͧ!"
+
+#: po/placeholder.h:107 urpm.pm:342 urpm.pm:1630
#, c-format
msgid "unable to access medium \"%s\""
msgstr "�������ö���ػ�ó�\"%s\""
-#: po/placeholder.h:106 urpm.pm:988
+#: po/placeholder.h:108 urpm.pm:994
#, c-format
msgid "relocated %s entries in depslist"
msgstr "���� %s � depslist"
-#: 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 "�������ö parse ��١��ͧ [%s] ����Ѻ��� \"%s\""
+msgid "trying to select inexistent medium \"%s\""
+msgstr "�������������͡���ػ�ó��������\"%s\""
-#: po/placeholder.h:108
+#: po/placeholder.h:110 urpm.pm:97
+#, fuzzy
+msgid "wget failed\n"
+msgstr "wget of [%s]��������"
+
+#: po/placeholder.h:111 urpm.pm:920 urpm.pm:1486 urpm.pm:1537
#, c-format
-msgid "no rpm files found from [%s]"
-msgstr "��辺 rpm files �ҡ [%s]"
+msgid "unable to parse correctly [%s] on value \"%s\""
+msgstr "�������ö parse ��١��ͧ [%s] ����Ѻ��� \"%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 "packages ���仹���� %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 "������ package ����ժ����������͹�Ѻ \"%s\""
+msgid "no rpm files found from [%s]"
+msgstr "��辺 rpm files �ҡ [%s]"
-#: po/placeholder.h:111 urpm.pm:1920
+#: po/placeholder.h:114 urpm.pm:1772
#, c-format
msgid "selecting %s using obsoletes"
msgstr "���ѧ���͡ %s������ŷ����ԡ������"
-#: po/placeholder.h:112 urpm.pm:2031
+#: po/placeholder.h:115 urpm.pm:1888
#, c-format
msgid "selecting %s by selection on files"
msgstr "���͡%s������觷�����͡����"
-#: 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 "�������ö��˹��ػ�ó���� hdlist file ��� [%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 - ����� tag ������"
+
+#: po/placeholder.h:121 urpmi:361
+msgid "everything already installed"
+msgstr "�ء���ҧ��١�Դ������º��������"
+
+#: po/placeholder.h:122 urpmi:98
+#, fuzzy, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: ������͡������ѡ \"-%s\",��Ǩ�ͺ�����ҡ --help\n"
+
+#: po/placeholder.h:123 urpmi:194
+msgid "One of the following packages is needed:"
+msgstr "˹��� Packages ���仹���ͧ���Ѻ��õԴ��� "
+
+#: 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 "��õԴ�����������"
-#: po/placeholder.h:115 urpmi:279
-msgid "Press enter when it's done..."
-msgstr "��سҡ� enter ������������"
+#: 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 "������͡���١��ͧ �ͧ�����Ѻ\n"
+#: po/placeholder.h:134
+#, fuzzy
+msgid " --X - use X interface.\n"
+msgstr " --all - ����� 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 "���ͷ�����㢻ѭ�ҡ����ҡѹ�� packages ���仹��ж١�Դ��� (%d MB)"
+
+#: po/placeholder.h:136 urpmi:320 urpmi:344
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "��ͧ��÷��ͧ�Դ����·������ͧ��ͨ�ͺ������ҡѹ��? (y/N)"
+
+#: 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 - ����� tag ������"
+
+#: po/placeholder.h:144 urpmi:202
#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "��ͧ������͡���ä�Ѻ (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 "���������� �������öᨡ��������������͹� GNUGPL."
+
+#: po/placeholder.h:152 urpmi:328 urpmi:352
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "��ͧ��÷��ͧ�ѧ�Ѻ�Դ��� (--force)? (y/N)"
+
+#: po/placeholder.h:154
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
msgstr ""
-"urpmi ������� %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"�������������������������öᨡ����������� GNU GPL.\n"
-"�����ҹ:\n"
-" --help - ���������Ū��¹��\n"
-" --update - ��੾���ػ�ó� update\n"
-" --auto - ���͡ package �������ѵ��ѵ�\n"
-" --auto-select - ���͡ package ����Ѻ��� upgrade ���ѵ��ѵ�\n"
-" --force - �ѧ�Ѻ���ӧҹ�֧������ pacage �ҧ��Ǩ������\n"
-" --X - �� X interface.\n"
-" --best-output - ���͡��� interface ���շ���ش����ѺʶҹС�ó�:\n"
-" X ���� text.\n"
-" -a - ���͡���������ç�ѹ�� on command line.\n"
-" -m - ���͡��ҵ�ͧ��÷���ӷ���ش (default).\n"
-" -M - ���͡��ҵ�ͧ��÷���٧����ش.\n"
-" -c - ���͡�Ըշ����������㹡���Ť�ҷ���ͧ���\n"
-" -p - ͹حҵ������� provides ������ package\n"
-" -q - quiet mode.\n"
-" -v - verbose mode.\n"
-" �������� rpm files (����Ѻroot��ҹ��) ����к�� command line �ж١�Դ���\n"
-
-#: po/placeholder.h:142 urpmi:362
-msgid "everything already installed"
-msgstr "�ء���ҧ��١�Դ������º��������"
-#: po/placeholder.h:143 urpmi:247
-#, c-format
+#: po/placeholder.h:155 urpmi:205
+msgid "Sorry, bad choice, try again\n"
+msgstr "������͡���١��ͧ �ͧ�����Ѻ\n"
+
+#: po/placeholder.h:156
msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
-msgstr "���ͷ�����㢻ѭ�ҡ����ҡѹ�� packages ���仹��ж١�Դ��� (%d MB)"
+" names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: po/placeholder.h:158
+msgid " -a - select all matches on command line.\n"
+msgstr ""
-#: po/placeholder.h:144 urpmi:296
+#: 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 "���ѧ�Դ��� %s\n"
-#: po/placeholder.h:145 urpmi:198
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "��ͧ������͡���ä�Ѻ (1-%d) "
-
-#: po/placeholder.h:146 urpmi:321 urpmi:345
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "��ͧ��÷��ͧ�Դ����·������ͧ��ͨ�ͺ������ҡѹ��? (y/N)"
-
-#: po/placeholder.h:147 urpmi:190
-msgid "One of the following packages is needed:"
-msgstr "˹��� Packages ���仹���ͧ���Ѻ��õԴ��� "
-
-#: po/placeholder.h:148 urpmi:149
+#: po/placeholder.h:161 urpmi:152
msgid "Only superuser is allowed to install local packages"
msgstr "superuser ��ҹ�鹷�����Է�ԵԴ��� packages"
-#: 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 "��س�����ػ�ó����ժ��� \"%s\" � [%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 "�������ö���¡ source package,���ѧ¡��ԡ"
-#: po/placeholder.h:151 urpmi:329 urpmi:353
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "��ͧ��÷��ͧ�ѧ�Ѻ�Դ��� (--force)? (y/N)"
+#: po/placeholder.h:165 urpmi:102
+#, fuzzy
+msgid "Only superuser is allowed to install packages"
+msgstr "superuser ��ҹ�鹷�����Է�ԵԴ��� packages"
-#: po/placeholder.h:155 urpmi.addmedia:46
+#: po/placeholder.h:166 urpmi:193
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "˹��� Packages ���仹���ͧ���Ѻ��õԴ��� "
+
+#: po/placeholder.h:167 urpmi:277
+msgid "Press Enter when it's done..."
+msgstr "��سҡ� enter ������������"
+
+#: po/placeholder.h:168 urpmi.addmedia:46
#, c-format
msgid ""
"%s\n"
@@ -664,7 +736,7 @@ msgstr ""
"%s\n"
" `with' ��辺����Ѻ�ػ�ó� ftp\n"
-#: po/placeholder.h:159
+#: po/placeholder.h:172
msgid ""
"usage: urpmi.addmedia [--update] <name> <url>\n"
"where <url> is one of\n"
@@ -684,17 +756,17 @@ msgstr ""
" http://<host>/<path> with <relative filename of hdlist>\n"
" removable_<device>://<path>\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 "�������ö���ҧ�ػ�ó� \"%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 "�������ö����ػ�ó�\"%s\"\n"
-#: po/placeholder.h:170 urpmi.addmedia:42
+#: po/placeholder.h:183 urpmi.addmedia:42
#, c-format
msgid ""
"%s\n"
@@ -703,7 +775,7 @@ msgstr ""
"%s\n"
"������ػ�ó� `%s' \n"
-#: po/placeholder.h:174 urpmi.addmedia:44
+#: po/placeholder.h:187 urpmi.addmedia:44
#, c-format
msgid ""
"%s\n"
@@ -712,7 +784,7 @@ msgstr ""
"%s\n"
"��辺<���ҧ�������Ǣ�ͧ�ͧhdlist>\n"
-#: po/placeholder.h:178
+#: po/placeholder.h:191
#, c-format
msgid ""
"usage: urpmi.update [-a] <name> ...\n"
@@ -731,22 +803,22 @@ msgstr ""
"\n"
" options ������ѡ '%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 "����ա�����(use urpmi.addmedia ���������ػ�ó�)\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"
"(one of %s)\n"
msgstr "�Ҵ�����ŷ��й�� update(˹��� %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 "��������÷�������͡(�� urpmi.addmedia ���������ػ�ó�)\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"
@@ -755,7 +827,7 @@ msgstr ""
"����բ����ŷ��зӡ������͡\n"
"(˹��� %s)\n"
-#: po/placeholder.h:197
+#: po/placeholder.h:210
#, c-format
msgid ""
"usage: urpmi.removemedia [-a] <name> ...\n"
@@ -770,127 +842,113 @@ msgstr ""
"\n"
"������͡���������ѡ '%s'\n"
-#: po/placeholder.h:204 urpmq:85
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq:�������ö��ҹ rpm file \"%s\"\n"
-
-#: po/placeholder.h:206 urpmq:82
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: ������͡������ѡ \"-%s\",��Ǩ�ͺ�����ҡ --help\n"
+#: po/placeholder.h:217
+#, fuzzy
+msgid " -h - print this help message.\n"
+msgstr " --all - ����� 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 "�ҧ package �е�ͧ�ա��ź������ͷӡ�� upgrade ��觹���ѧ����ա��ʹѺʹع \n"
-#: po/placeholder.h:208
+#: po/placeholder.h:219
+#, fuzzy
+msgid " -g - print groups too with name.\n"
+msgstr " --group - ����� tag group: group."
+
+#: po/placeholder.h:220 urpmq:84
#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq:�������ö��ҹ rpm file \"%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 " command line ������ժ��� package)"
+
+#: 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 "���������� �������öᨡ��������������͹� GNUGPL."
+
+#: po/placeholder.h:231
+#, fuzzy
+msgid " -d - extend query to package dependencies.\n"
+msgstr " command line ������ժ��� package)"
+
+#: 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 ""
-"urpmq ������� %s\n"
-"Copyright (C) 2000, 2001 MandrakeSoft.\n"
-"�������������������������öᨡ����������� GNU GPL.\n"
-"�����ҹ:\n"
-" -h - ���������Ū��¹��\n"
-" -v - ���� verbose\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"
+
+#: po/placeholder.h:233
+msgid ""
" -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"
+msgstr ""
+
+#: po/placeholder.h:235 urpmq:81
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: ������͡������ѡ \"-%s\",��Ǩ�ͺ�����ҡ --help\n"
+
+#: po/placeholder.h:236
+msgid ""
" --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 package do not exist.\n"
-" names or rpm files given on command line are queried.\n"
+msgstr ""
-#: urpm.pm:257
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:243
+msgid ""
+" -u - remove package if a better version is already installed.\n"
msgstr ""
-#: urpm.pm:258
-#, c-format
-msgid "taking removable device as \"%s\""
+#: po/placeholder.h:244
+msgid ""
+" --force - force invocation even if some packages do not\n"
+"exist.\n"
msgstr ""
-#: urpm.pm:262
+#: urpm.pm:1796 urpm.pm:1805
#, c-format
-msgid "using different removable device [%s] for \"%s\""
+msgid "removing %s to upgrade to %s ..."
msgstr ""
-#: urpm.pm:266 urpm.pm:269
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "�������ö���ҧ�ػ�ó� \"%s\"\n"
+#: urpm.pm:1797 urpm.pm:1806
+msgid ", $otherPackage, "
+msgstr ", $otherPackage, "
-#: urpm.pm:1339
-#, fuzzy, c-format
-msgid "read synthesis file [%s]"
-msgstr "��ҹ depslist file [%s]"
+#: urpm.pm:1797 urpm.pm:1806
+msgid "));"
+msgstr "));"
+
+#: urpm.pm:1802
+msgid "$p->{name}-$p->{version}-$p->{release}"
+msgstr "$p->{name}-$p->{version}-$p->{release}"
-#: urpmi:49
+#: urpm.pm:1812
+msgid "$prefix/$_"
+msgstr "$prefix/$_"
+
+#: urpmi:48
#, c-format
msgid "urpmi version %s"
msgstr "urpmi ������� %s"
-#: urpmi:98
-#, fuzzy, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: ������͡������ѡ \"-%s\",��Ǩ�ͺ�����ҡ --help\n"
-
-#: urpmi:102
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr "superuser ��ҹ�鹷�����Է�ԵԴ��� packages"
-
-#: urpmi:189
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "˹��� Packages ���仹���ͧ���Ѻ��õԴ��� "
-
-#: urpmi:301
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
-msgstr ""
-
#: urpmi.addmedia:30
msgid "usage: urpmi.addmedia [--update] <name> <url>"
msgstr "�����: urpmi.addmedia [--update] <����> <url>"
@@ -920,3 +978,128 @@ msgstr ", $_);"
#, c-format
msgid "urpmq version %s"
msgstr "urpmq �������%s"
+
+#~ msgid "retrieving [%s]"
+#~ msgstr "���ѧ��ҹ������[%s]"
+
+#~ msgid "wget of [%s] failed (maybe wget is missing?)"
+#~ msgstr "wget [%s] ��������(�ҧ���Ҩ����� wget?)"
+
+#~ msgid "unable to copy source of [%s] from [%s]"
+#~ msgstr "�������ö copy source of [%s} �ҡ [%s]"
+
+#~ msgid "removable medium not selected"
+#~ msgstr "�ػ�ó�Ẻ�ʹ����¹�������١���͡"
+
+#~ msgid "source of [%s] not found as [%s]"
+#~ msgstr "���觷���Ңͧ [%s] ����辺�� [%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 ""
+#~ "urpmi ������� %s\n"
+#~ "Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+#~ "�������������������������öᨡ����������� GNU GPL.\n"
+#~ "�����ҹ:\n"
+#~ " --help - ���������Ū��¹��\n"
+#~ " --update - ��੾���ػ�ó� update\n"
+#~ " --auto - ���͡ package �������ѵ��ѵ�\n"
+#~ " --auto-select - ���͡ package ����Ѻ��� upgrade ���ѵ��ѵ�\n"
+#~ " --force - �ѧ�Ѻ���ӧҹ�֧������ pacage �ҧ��Ǩ������\n"
+#~ " --X - �� X interface.\n"
+#~ " --best-output - ���͡��� interface ���շ���ش����ѺʶҹС�ó�:\n"
+#~ " X ���� text.\n"
+#~ " -a - ���͡���������ç�ѹ�� on command line.\n"
+#~ " -m - ���͡��ҵ�ͧ��÷���ӷ���ش (default).\n"
+#~ " -M - ���͡��ҵ�ͧ��÷���٧����ش.\n"
+#~ " -c - ���͡�Ըշ����������㹡���Ť�ҷ���ͧ���\n"
+#~ " -p - ͹حҵ������� provides ������ package\n"
+#~ " -q - quiet mode.\n"
+#~ " -v - verbose mode.\n"
+#~ " �������� rpm files (����Ѻroot��ҹ��) ����к�� command line �ж١�Դ���\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 ""
+#~ "urpmq ������� %s\n"
+#~ "Copyright (C) 2000, 2001 MandrakeSoft.\n"
+#~ "�������������������������öᨡ����������� GNU GPL.\n"
+#~ "�����ҹ:\n"
+#~ " -h - ���������Ū��¹��\n"
+#~ " -v - ���� verbose\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"
diff --git a/po/tr.po b/po/tr.po
index 5c2cbcc2..2cbb4a80 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,7 +7,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-09-15 21:39+0200\n"
"Last-Translator: Nilg�n Belma Bug�ner <nilgun@fide.org>\n"
"Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -28,27 +28,27 @@ msgstr ""
"Otomatik paket kurulumu...\n"
"$rpm paketinin kurulmas�n� istemi�tiniz.\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 "Tamam m�?"
-#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:281
+#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:279
msgid "Ok"
msgstr "Tamam"
-#: _irpm:34 po/placeholder.h:116 urpmi:252 urpmi:282
+#: _irpm:34 po/placeholder.h:119 urpmi:252 urpmi:280
msgid "Cancel"
msgstr "�ptal"
-#: _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 "HhNn"
-#: _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 "EeYy"
-#: _irpm:42 po/placeholder.h:118 urpmi:258
+#: _irpm:42 po/placeholder.h:157 urpmi:258
msgid " (Y/n) "
msgstr " (E/h) "
@@ -157,174 +157,175 @@ msgstr "Ayr�nt�l� bilgi i�in 'urpmf --help' yaz�n�z"
msgid "urpmi is not installed"
msgstr "urpmi kurulu de�il"
-#: po/placeholder.h:29 urpm.pm:283
+#: po/placeholder.h:29
+#, fuzzy, c-format
+msgid "reading synthesis file [%s]"
+msgstr "ba��ml�l�klar listesi dosyas� [%s] okunuyor"
+
+#: po/placeholder.h:30 urpm.pm:298
#, c-format
msgid "unable to write config file [%s]"
msgstr "yap�land�rma dosyas�na [%s] yaz�lam�yor"
-#: 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"
-msgstr "kullan�mda oldu�undan isimsiz ortam i�in \"%s\" ismi kullan�lam�yor"
+msgid "using different removable device [%s] for \"%s\""
+msgstr ""
-#: po/placeholder.h:31
+#: po/placeholder.h:32
#, c-format
msgid "nothing to write in list file for \"%s\""
msgstr "\"%s\" i�in liste dosyas�na hi� bir �ey yaz�lmad�"
-#: 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 "\"%s\" i�in liste dosyas� bulunam�yor, ortam yoksay�l�yor"
-#: po/placeholder.h:33
+#: po/placeholder.h:34
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "\"%s\" sabit disk listesi dosyas� ayr��t�r�lam�yor"
-#: po/placeholder.h:34
+#: po/placeholder.h:35
#, c-format
msgid "nothing written in list file for \"%s\""
msgstr "\"%s\" i�in liste dosyas�na hi�bir �ey yaz�lmam��"
-#: po/placeholder.h:35 urpm.pm:1951
-#, c-format
-msgid ""
-"removing %s to upgrade ...\n"
-" to %s since it will not upgrade correctly!"
-msgstr ""
-"%s %s g�ncellemesi i�in kald�r�l�yor...\n"
-"Yoksa do�ru olarak g�ncelleme yap�lamayacak."
-
-#: po/placeholder.h:39 urpm.pm:839
+#: po/placeholder.h:36 urpm.pm:845
#, c-format
msgid "read provides file [%s]"
msgstr "sa�lananlar dosyas� [%s] okunuyor"
-#: po/placeholder.h:40
-#, c-format
-msgid "trying to remove inexistant medium \"%s\""
-msgstr "olmayan \"%s\" kald�r�lmaya �al���l�yor"
-
-#: po/placeholder.h:41 urpm.pm:1692
+#: po/placeholder.h:37 urpm.pm:1549
#, c-format
msgid "package %s is not found."
msgstr "%s paketi bulunamad�."
-#: po/placeholder.h:42
-#, c-format
-msgid "unable to copy source of [%s] from [%s]"
-msgstr "[%s] [%s] den kopyalanam�yor"
-
-#: po/placeholder.h:43 urpm.pm:870
+#: po/placeholder.h:38 urpm.pm:876
#, c-format
msgid "unable to write compss file [%s]"
msgstr "compss dosyas� [%s] yaz�lam�yor"
-#: po/placeholder.h:44 urpm.pm:813
+#: po/placeholder.h:39 urpm.pm:819
#, c-format
msgid "unmounting %s"
msgstr "%s ayr�l�yor"
-#: po/placeholder.h:45
+#: po/placeholder.h:40
#, c-format
msgid "removing %d obsolete headers in cache"
msgstr "arabellekteki %d eski ba�l�k kald�r�l�yor"
-#: 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 "\"%s\" i�in sabit disk listesi dosyas� bulunamad�"
-#: 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 ""
+"\"%s\" kullan�mda ki sabit disk listesini kullanmaya �al���yor, yoksay�ld�"
+
+#: po/placeholder.h:43 urpm.pm:184
+#, c-format
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr "kullan�mda oldu�undan isimsiz ortam i�in \"%s\" ismi kullan�lam�yor"
+
+#: po/placeholder.h:44 urpm.pm:191
#, c-format
msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
msgstr "\"%s\" liste dosyas� [%s] olmad���ndan hesap i�ine al�nam�yor"
-#: po/placeholder.h:48
+#: po/placeholder.h:45
msgid "keeping only files referenced in provides"
msgstr "sadece sa�lananlarda ki dosyalar tutuluyor"
-#: po/placeholder.h:49
+#: po/placeholder.h:46
#, c-format
msgid "unable to build synthesis file for medium \"%s\""
msgstr "\"%s\" i�in sentezleme dosyas� kurgulanam�yor"
-#: po/placeholder.h:50
+#: po/placeholder.h:47
#, c-format
msgid "found %d headers in cache"
msgstr "arabellekte %d ba�l�k bulundu"
-#: po/placeholder.h:51 urpm.pm:836
+#: po/placeholder.h:48 urpm.pm:842
#, c-format
msgid "unable to read provides file [%s]"
msgstr "sa�lananlar dosyas� [%s] okunam�yor"
-#: 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 "yerel dil se�ilmedi�inden %s se�imi �nleniyor"
-#: 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 ""
+"%s %s g�ncellemesi i�in kald�r�l�yor...\n"
+"Aksi takdirde, g�ncelleme yap�lamayacak."
+
+#: po/placeholder.h:54 urpm.pm:326
#, c-format
msgid "medium \"%s\" already exists"
msgstr "\"%s\" zaten var"
-#: po/placeholder.h:54 urpm.pm:295
-#, c-format
-msgid "write config file [%s]"
-msgstr "yap�land�rma dosyas� [%s] yaz�l�yor"
-
#: po/placeholder.h:55
#, c-format
msgid "unable to write list file of \"%s\""
msgstr "\"%s\" liste dosyas� yaz�lam�yor"
-#: po/placeholder.h:56 urpm.pm:1817
+#: po/placeholder.h:56 urpm.pm:310
#, c-format
-msgid "retrieving [%s]"
-msgstr "[%s] al�n�yor"
-
-#: po/placeholder.h:57 urpm.pm:1819
-#, c-format
-msgid "wget of [%s] failed"
-msgstr "[%s] wget yap�lamad�"
+msgid "write config file [%s]"
+msgstr "yap�land�rma dosyas� [%s] yaz�l�yor"
-#: po/placeholder.h:58 urpm.pm:1101
+#: po/placeholder.h:57 urpm.pm:1107
#, c-format
msgid "no package named %s"
msgstr "%s ad�nda bir paket yok"
-#: po/placeholder.h:59 urpm.pm:848
+#: po/placeholder.h:58 urpm.pm:854
#, c-format
msgid "unable to read compss file [%s]"
msgstr "compss dosyas� [%s] okunam�yor"
-#: 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 "\"%s\" i�in sabit disk listesi dosyas� bulunam�yor, ortam yoksay�ld�"
-#: po/placeholder.h:61
+#: po/placeholder.h:60
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "\"%s\" i�in sabit disk listesi sentezleme dosyas� kurgulan�yor"
-#: po/placeholder.h:62
+#: po/placeholder.h:61
msgid "computing dependencies"
msgstr "ba��ml�l�klar saptan�yor"
-#: po/placeholder.h:63 urpm.pm:868
+#: po/placeholder.h:62
+#, fuzzy, c-format
+msgid "retrieve of [%s] failed"
+msgstr "[%s] wget yap�lamad�"
+
+#: po/placeholder.h:63 urpm.pm:874
#, c-format
msgid "write provides file [%s]"
msgstr "sa�lananlar dosyas� [%s] yaz�l�yor"
-#: po/placeholder.h:64 urpm.pm:803
+#: po/placeholder.h:64 urpm.pm:809
#, c-format
msgid "mounting %s"
msgstr "%s ba�lan�yor"
-#: 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 "
@@ -333,123 +334,134 @@ msgstr ""
"liste dosyas� ba�ka ortam taraf�ndan kullan�ld���ndan \"%s\" ile "
"�al���lam�yor"
-#: po/placeholder.h:66 urpm.pm:148
-#, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
-msgstr "\"%s\" kullan�mda olan listeyi kullanmaya �al���yor, yoksay�ld�."
-
-#: po/placeholder.h:67
+#: po/placeholder.h:66
#, c-format
msgid "reading hdlist file [%s]"
msgstr "sabit disk listesi dosyas� [%s] okunuyor"
-#: po/placeholder.h:68 urpm.pm:873
+#: po/placeholder.h:67 urpm.pm:879
#, c-format
msgid "write compss file [%s]"
msgstr "compss dosyas� [%s] yaz�l�yor"
-#: po/placeholder.h:69 urpm.pm:827
+#: po/placeholder.h:68 urpm.pm:833
#, c-format
msgid "read depslist file [%s]"
msgstr "ba��ml�l�klar listesi dosyas� [%s] okunuyor"
-#: po/placeholder.h:70
-#, c-format
-msgid "trying to select inexistant medium \"%s\""
-msgstr "olmayan \"%s\" se�ilmeye �al���l�yor"
+#: po/placeholder.h:69 urpm.pm:103
+msgid "curl failed\n"
+msgstr ""
-#: po/placeholder.h:71 urpm.pm:1812
+#: po/placeholder.h:70 urpm.pm:281 urpm.pm:284
+#, fuzzy, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "\"%s\" olu�turulam�yor\n"
+
+#: po/placeholder.h:71 urpm.pm:1668
#, c-format
msgid "malformed input: [%s]"
msgstr "bozuk girdi: [%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 ""
-"\"%s\" kullan�mda ki sabit disk listesini kullanmaya �al���yor, yoksay�ld�"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "ayn� \"%s\" isminde �ok say�da rpm paketi var."
-#: 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"
-msgstr ""
-"%s %s g�ncellemesi i�in kald�r�l�yor...\n"
-"Aksi takdirde, g�ncelleme yap�lamayacak."
+msgid "medium \"%s\" tries to use an already used list, medium ignored"
+msgstr "\"%s\" kullan�mda olan listeyi kullanmaya �al���yor, yoksay�ld�."
-#: po/placeholder.h:77 urpm.pm:865
+#: po/placeholder.h:74 urpm.pm:871
#, c-format
msgid "unable to write provides file [%s]"
msgstr "sa�lananlar dosyas� [%s] yaz�lam�yor"
-#: 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 "\"%s\" sabit disk listesi dosyas�na eri�ilemiyor, ortam yoksay�ld�"
-#: po/placeholder.h:79 urpm.pm:1005
-msgid "unable to register rpm file"
-msgstr "rpm dosyas� sicil kayd� yap�lam�yor"
-
-#: 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 "t�m sentez dosyalar� bulunam�yor, parsehdlist sunucusu kullan�l�yor"
-#: po/placeholder.h:81 urpm.pm:241
+#: po/placeholder.h:77 urpm.pm:1011
+msgid "unable to register rpm file"
+msgstr "rpm dosyas� sicil kayd� yap�lam�yor"
+
+#: po/placeholder.h:78 urpm.pm:256
#, c-format
msgid "unable to inspect list file for \"%s\", medium ignored"
msgstr "\"%s\" i�in liste dosyas� denetlenemiyor, ortam yoksay�ld�"
-#: 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 "\"%s\" i�in liste dosyas� tutars�z, ortam yoksay�ld�"
-#: po/placeholder.h:83
+#: po/placeholder.h:81
#, c-format
msgid "copy of [%s] failed"
msgstr "[%s] kopyalamas� ba�ar�s�z"
-#: 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 "olmayan \"%s\" kald�r�lmaya �al���l�yor"
+
+#: 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 "[%s] do�ru olarak ayr��t�r�lam�yor"
-#: po/placeholder.h:85 urpm.pm:824
+#: po/placeholder.h:84 urpm.pm:1192
+#, fuzzy, c-format
+msgid "read synthesis file [%s]"
+msgstr "ba��ml�l�klar listesi dosyas� [%s] okunuyor"
+
+#: po/placeholder.h:85 urpm.pm:830
#, c-format
msgid "unable to read depslist file [%s]"
msgstr "ba��ml�l�klar listesi dosyas� [%s] okunam�yor"
-#: po/placeholder.h:86
-msgid "removable medium not selected"
-msgstr "kald�r�labilir ortam se�ilmedi"
-
-#: po/placeholder.h:87 urpm.pm:851
+#: po/placeholder.h:86 urpm.pm:857
#, c-format
msgid "read compss file [%s]"
msgstr "compss dosyas� [%s] okunuyor"
-#: 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 "yap�land�rma dosyas�n�n %s sat�r�nda s�zdizimi hatas�"
-#: po/placeholder.h:89
+#: po/placeholder.h:88
#, c-format
msgid "building hdlist [%s]"
msgstr "sabit disk listesi [%s] kurgulan�yor"
-#: 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 "rpm dosyas� [%s] \"%s\" ortam�ndan okunam�yor"
-#: po/placeholder.h:91 urpm.pm:1009
+#: po/placeholder.h:90 urpm.pm:1015
msgid "error registering local packages"
msgstr "yerel paketlerin sicil kayd� yap�l�rken hata"
-#: 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 ""
@@ -460,174 +472,165 @@ msgstr ""
msgid "unable to build hdlist: %s"
msgstr "sabit disk listesi kurgulanam�yor: %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 "\"%s\" se�ilmedi"
+
+#: po/placeholder.h:95 urpm.pm:1006
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "rpm dosya ismi [%s] ge�ersiz"
-#: 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 "\"%s\" se�ilmedi"
+msgid "unknown data associated with %s"
+msgstr "%s ile ili�kili veri bilinmiyor"
-#: 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 "varolan \"%s\" ortam� atlanmaya �al���l�rken engelleniyor"
-#: po/placeholder.h:97 urpm.pm:863
+#: po/placeholder.h:98 urpm.pm:869
#, c-format
msgid "write depslist file [%s]"
msgstr "ba��ml�l�klar listesi dosyas� [%s] yaz�l�yor"
-#: po/placeholder.h:98 urpm.pm:1322
-#, c-format
-msgid "unknown data associated with %s"
-msgstr "%s ile ili�kili veri bilinmiyor"
-
-#: po/placeholder.h:99
-#, c-format
-msgid "source of [%s] not found as [%s]"
-msgstr "[%s] kayna�� [%s] olarak bulunamad�"
-
-#: 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 "\"%s\" liste dosyas�na eri�ilemiyor, ortam yoksay�ld�"
-#: 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 "g�ncellenecek dosyalar�n yetersizli�inden %s se�imi engelleniyor"
-#: po/placeholder.h:102
-#, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
-msgstr "[%s] wget yap�lamad� (wget kurulu olmayabilir mi?)"
-
-#: po/placeholder.h:103 urpm.pm:1001
+#: po/placeholder.h:101 urpm.pm:1007
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "rpm dosyas�na [%s] eri�ilemiyor"
-#: po/placeholder.h:104 urpm.pm:860
+#: po/placeholder.h:102 urpm.pm:866
#, c-format
msgid "unable to write depslist file [%s]"
msgstr "[%s] ba��ml�l�k listesi dosyas� yaz�lam�yor"
-#: 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 ""
+"%s %s g�ncellemesi i�in kald�r�l�yor...\n"
+"Yoksa do�ru olarak g�ncelleme yap�lamayacak."
+
+#: po/placeholder.h:107 urpm.pm:342 urpm.pm:1630
#, c-format
msgid "unable to access medium \"%s\""
msgstr "\"%s\" ortam�na eri�ilemiyor"
-#: po/placeholder.h:106 urpm.pm:988
+#: po/placeholder.h:108 urpm.pm:994
#, c-format
msgid "relocated %s entries in depslist"
msgstr "ba��ml�l�klar listesinde ki %s girdileri yeniden konumlan�yor"
-#: 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 "[%s] (\"%s\" de�erinde ki) d�zg�n ayr��t�r�lam�yor"
+msgid "trying to select inexistent medium \"%s\""
+msgstr "olmayan \"%s\" se�ilmeye �al���l�yor"
-#: po/placeholder.h:108
+#: po/placeholder.h:110 urpm.pm:97
+#, fuzzy
+msgid "wget failed\n"
+msgstr "[%s] wget yap�lamad�"
+
+#: po/placeholder.h:111 urpm.pm:920 urpm.pm:1486 urpm.pm:1537
#, c-format
-msgid "no rpm files found from [%s]"
-msgstr "[%s] de rpm dosyalar� yok"
+msgid "unable to parse correctly [%s] on value \"%s\""
+msgstr "[%s] (\"%s\" de�erinde ki) d�zg�n ayr��t�r�lam�yor"
-#: po/placeholder.h:109 urpm.pm:1104
+#: po/placeholder.h:112 urpm.pm:1110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Bu paketler %s i�eriyor: %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 "ayn� \"%s\" isminde �ok say�da rpm paketi var."
+msgid "no rpm files found from [%s]"
+msgstr "[%s] de rpm dosyalar� yok"
-#: po/placeholder.h:111 urpm.pm:1920
+#: po/placeholder.h:114 urpm.pm:1772
#, c-format
msgid "selecting %s using obsoletes"
msgstr "modas� ge�enleri kullanan %s se�iliyor"
-#: po/placeholder.h:112 urpm.pm:2031
+#: po/placeholder.h:115 urpm.pm:1888
#, c-format
msgid "selecting %s by selection on files"
msgstr "dosyalarda ki se�imlere g�re %s se�iliyor"
-#: 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 "bu sabit disk listesi dosyas�n�n [%s] ortam� saptanam�yor"
-#: po/placeholder.h:114 urpmi:308 urpmi:315 urpmi:328 urpmi:339 urpmi:352
-msgid "Installation failed"
-msgstr "Kurulum ba�ar�s�z oldu"
-
-#: po/placeholder.h:115 urpmi:279
-msgid "Press enter when it's done..."
-msgstr "Bitti�i zaman enter tu�una bas�n..."
+#: po/placeholder.h:120
+#, fuzzy
+msgid " --help - print this help message.\n"
+msgstr " --all t�m etiketler g�sterilir."
-#: po/placeholder.h:117 urpmi:201
-msgid "Sorry, bad choice, try again\n"
-msgstr "Hatal� se�im, tekrar deneyin\n"
+#: po/placeholder.h:121 urpmi:361
+msgid "everything already installed"
+msgstr "her�ey zaten kurulu"
-#: po/placeholder.h:120
+#: po/placeholder.h:122 urpmi:98
#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: \"-%s\" se�ene�i bilinmiyor, ayr�nt�l� bilgi i�in --help\n"
+
+#: po/placeholder.h:123 urpmi:194
+msgid "One of the following packages is needed:"
+msgstr "A�a��daki paketlerden birine ihtiya� var:"
+
+#: po/placeholder.h:124 po/placeholder.h:222
+msgid " --update - use only update media.\n"
+msgstr ""
+
+#: po/placeholder.h:125 urpmi:299
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"
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
msgstr ""
-"urpmi s�r�m %s\n"
-"Telif Hakk�(C) 1999, 2000, 2001 MandrakeSoft.\n"
-"Bu bir serbest yaz�l�md�r. GNU GPL ko�ullar� alt�nda da��t�labilir.\n"
-"kullan�m�:\n"
-" --help - Bu yard�m iletisi g�sterilir. \n"
-" --update - sadece g�ncelleme ortam� kullan�l�r.\n"
-" --auto - Se�iminiz i�in otomatikman iyi bir paket se�er.\n"
-" --auto-select - Sisteminizi g�ncellemek i�in otomatik olarak paketleri\n"
-" se�er.\n"
-" --force - Baz� paketlerin yoklu�unda bile kurulum yap�l�r.\n"
-" --X - X aray�z� kullan�r.\n"
-" -best-output - Durumunuz i�in en iyi kurulum aray�z�n� se�er:\n"
-" X veya metin tabanl�.\n"
-" -a - Komut sat�r�nda ki t�m e�le�meleri se�er.\n"
-" -m - Gereksinimlerin en k���k birle�imi se�ilir "
-"(�ntan�ml�).\n"
-" -M - Gereksinimlerin en b�y�k birle�imi se�ilir.\n"
-" -c - �stekleri kar��layacak t�m y�ntemler kullan�l�r. \n"
-" -p - Paketi bulmak i�in sa�lananlarda aramaya izin verilir\n"
-" -q - Ayr�nt� verilmez.\n"
-" -v - Ayr�nt� verilir.\n"
-" Komut sat�r�ndan (sadece root taraf�ndan) verilen isimler veya rpm "
-"dosyalar�\n"
-" kurulur.\n"
-
-#: po/placeholder.h:142 urpmi:362
-msgid "everything already installed"
-msgstr "her�ey zaten kurulu"
-#: po/placeholder.h:143 urpmi:247
+#: 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 "Kurulum ba�ar�s�z oldu"
+
+#: po/placeholder.h:132 po/placeholder.h:234
+msgid ""
+" --auto-select - automatically select packages for upgrading the system.\n"
+msgstr ""
+
+#: po/placeholder.h:134
+#, fuzzy
+msgid " --X - use X interface.\n"
+msgstr " --all t�m etiketler g�sterilir."
+
+#: po/placeholder.h:135 urpmi:247
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -636,42 +639,108 @@ msgstr ""
"Ba��ml�l�k sorununu a�abilmek i�in, a�a��daki paketlerin de kurulmas� "
"gerekiyor (%d Mb)"
-#: po/placeholder.h:144 urpmi:296
-#, c-format
-msgid "installing %s\n"
-msgstr "%s kuruluyor\n"
+#: po/placeholder.h:136 urpmi:320 urpmi:344
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Paket ba��ml�l�klar�n� denetlemeksizin kurulum denensin mi (e/H) "
+
+#: 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 t�m etiketler g�sterilir."
-#: po/placeholder.h:145 urpmi:198
+#: po/placeholder.h:144 urpmi:202
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Se�iminiz? (1-%d)"
-#: po/placeholder.h:146 urpmi:321 urpmi:345
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Paket ba��ml�l�klar�n� denetlemeksizin kurulum denensin mi (e/H) "
+#: po/placeholder.h:145
+msgid " --wget - use wget to retrieve distant files.\n"
+msgstr ""
-#: po/placeholder.h:147 urpmi:190
-msgid "One of the following packages is needed:"
-msgstr "A�a��daki paketlerden birine ihtiya� var:"
+#: 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"
+msgstr ""
+"Bu bir serbest yaz�l�md�r ve GNU GPL Lisans� alt�nda tekrar da��t�labilir."
+
+#: po/placeholder.h:152 urpmi:328 urpmi:352
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Belki daha zorlay�c� bir se�enek gerekebilir (--force)? (e/H) "
+
+#: po/placeholder.h:154
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+
+#: po/placeholder.h:155 urpmi:205
+msgid "Sorry, bad choice, try again\n"
+msgstr "Hatal� se�im, tekrar deneyin\n"
+
+#: po/placeholder.h:156
+msgid ""
+" names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: po/placeholder.h:158
+msgid " -a - select all matches on command line.\n"
+msgstr ""
-#: po/placeholder.h:148 urpmi:149
+#: 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 "%s kuruluyor\n"
+
+#: po/placeholder.h:161 urpmi:152
msgid "Only superuser is allowed to install local packages"
msgstr "Yerel paketleri kurmak i�in sadece sistem y�neticisi yetkilidir"
-#: 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 "L�tfen \"%s\" isimli ortam� [%s] ayg�t�na yerle�tirin"
-#: 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 "Kaynak paketleri al�namad�, ��k�l�yor"
-#: po/placeholder.h:151 urpmi:329 urpmi:353
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Belki daha zorlay�c� bir se�enek gerekebilir (--force)? (e/H) "
+#: po/placeholder.h:165 urpmi:102
+#, fuzzy
+msgid "Only superuser is allowed to install packages"
+msgstr "Yerel paketleri kurmak i�in sadece sistem y�neticisi yetkilidir"
+
+#: po/placeholder.h:166 urpmi:193
+#, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "%s kurulumu i�in a�a��daki paketlerin biri gerekli:"
+
+#: po/placeholder.h:167 urpmi:277
+msgid "Press Enter when it's done..."
+msgstr "Bitti�i zaman enter tu�una bas�n..."
-#: po/placeholder.h:155 urpmi.addmedia:46
+#: po/placeholder.h:168 urpmi.addmedia:46
#, c-format
msgid ""
"%s\n"
@@ -680,7 +749,7 @@ msgstr ""
"%s\n"
"ftp i�in `with' kelimesini de kullan�n\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 +768,17 @@ msgstr ""
" http://<sunucu>/<dosyaYolu> with <hdlist'in g�reli dosyaismi>\n"
" kald�r�labilir_<ayg�t>://<dosyaYolu>\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 "\"%s\" olu�turulam�yor\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 "\"%s\" g�ncellenemiyor\n"
-#: po/placeholder.h:170 urpmi.addmedia:42
+#: po/placeholder.h:183 urpmi.addmedia:42
#, c-format
msgid ""
"%s\n"
@@ -718,7 +787,7 @@ msgstr ""
"%s\n"
"`%s' ayg�t� yok\n"
-#: po/placeholder.h:174 urpmi.addmedia:44
+#: po/placeholder.h:187 urpmi.addmedia:44
#, c-format
msgid ""
"%s\n"
@@ -727,7 +796,7 @@ msgstr ""
"%s\n"
"<hdlist'in g�reli dosyaismi> eksik\n"
-#: po/placeholder.h:178
+#: po/placeholder.h:191
#, c-format
msgid ""
"usage: urpmi.update [-a] <name> ...\n"
@@ -747,13 +816,13 @@ msgstr ""
"\n"
"'%s' se�ene�i bilinmiyor\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 ""
"G�ncellenecek bir �ey yok\n"
"(yeni ortam eklemek i�in \"urpmi.addmedia\" kullan�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"
@@ -762,13 +831,13 @@ msgstr ""
"G�ncelleme i�in girdi eksik\n"
"(bunlardan biri %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 ""
"Kald�r�lacak bir �ey yok\n"
"(yeni bir ortam eklemek i�in \"urpmi.addmedia\" kullan�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"
@@ -777,7 +846,7 @@ msgstr ""
"Silme i�in girdi eksik\n"
"(bunlardan biri %s)\n"
-#: po/placeholder.h:197
+#: po/placeholder.h:210
#, c-format
msgid ""
"usage: urpmi.removemedia [-a] <name> ...\n"
@@ -792,17 +861,12 @@ msgstr ""
"\n"
"'%s' se�ene�i bilinmiyor\n"
-#: po/placeholder.h:204 urpmq:85
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: \"%s\" isimli rpm dosyas� okunam�yor.\n"
-
-#: po/placeholder.h:206 urpmq:82
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: \"-%s\" anla��lamayan parametre, ayr�nt�l� bilgi i�in --help\n"
+#: po/placeholder.h:217
+#, fuzzy
+msgid " -h - print this help message.\n"
+msgstr " --all t�m etiketler g�sterilir."
-#: 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"
@@ -810,113 +874,102 @@ msgstr ""
"baz� paketler g�ncellendi�inden kald�r�lm�� olabilir, hen�z bu "
"desteklenmiyor\n"
-#: po/placeholder.h:208
+#: po/placeholder.h:219
+#, fuzzy
+msgid " -g - print groups too with name.\n"
+msgstr " -group grup: grup etiketini g�sterir."
+
+#: po/placeholder.h:220 urpmq:84
#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: \"%s\" isimli rpm dosyas� okunam�yor.\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 " verilmezse etiket varsay�l�r)."
+
+#: 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"
+msgstr ""
+"Bu bir serbest yaz�l�md�r ve GNU GPL Lisans� alt�nda tekrar da��t�labilir."
+
+#: po/placeholder.h:231
+#, fuzzy
+msgid " -d - extend query to package dependencies.\n"
+msgstr " verilmezse etiket varsay�l�r)."
+
+#: po/placeholder.h:232
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
+msgstr ""
+
+#: po/placeholder.h:233
+msgid ""
" -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"
+msgstr ""
+
+#: po/placeholder.h:235 urpmq:81
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: \"-%s\" anla��lamayan parametre, ayr�nt�l� bilgi i�in --help\n"
+
+#: po/placeholder.h:236
+msgid ""
" --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 package do not exist.\n"
-" names or rpm files given on command line are queried.\n"
msgstr ""
-"urpmq %s s�r�m�\n"
-"Telif Hakk� (C) 2000, 2001 MandrakeSoft.\n"
-"Bu bir serbest yaz�l�md�r ve GNU GPL ko�ullar� alt�nda da��t�labilir.\n"
-"\n"
-"kullan�m�:\n"
-" -h - bu yard�m iletisi g�sterilir.\n"
-" -v - bol ayr�nt� verilir.\n"
-" -d - sorgu paket ba��ml�l�klar�na geni�letilir.\n"
-" -u - daha yeni bir s�r�m kurulacaksa eskisini kald�r�r.\n"
-" -m - sorgu paket ba��ml�l�klar�na geni�letilir, "
-"gereksinimleri\n"
-" kar��layan kurulu paket kald�r�l�r, g�ncellemede "
-"bloklanan\n"
-" paketler eklenir.\n"
-" -M - sorgu paket ba��ml�l�klar�na geni�letilir ve sadece\n"
-" daha yeni ya da ayn� ise kurulu paket kald�r�l�r\n"
-" -c - istekleri kar��layacak t�m y�ntemler kullan�l�r.\n"
-" -p - paketi bulmak i�in sa�lananlarda aramaya izin verilir.\n"
-" -g - gruplar da isimleriyle g�sterilir.\n"
-" -r - ismiyle birlikte s�r�m� ve da��t�m� da g�sterilir.\n"
-" --update - sadece g�ncelleme ortam� kullan�l�r.\n"
-" --auto-select - sistemi g�ncelleyecek paketler otomatikman se�ilir.\n"
-" --headers - urpmi db'den std�'ya listelenen paketlerin ba�l�klar�\n"
-" ��kar�l�r (sadece root). --sources - indirme �ncesi "
-"t�m kaynak paketlerini verir (sadece root).\n"
-" --force - baz� paketler eksik olsa da paket kurulur.\n"
-" komut sat�r�ndan verilen isimler ve rpm dosyalar� sorgulan�r.\n"
-
-#: urpm.pm:257
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+
+#: po/placeholder.h:243
+msgid ""
+" -u - remove package if a better version is already installed.\n"
msgstr ""
-#: urpm.pm:258
-#, c-format
-msgid "taking removable device as \"%s\""
+#: po/placeholder.h:244
+msgid ""
+" --force - force invocation even if some packages do not\n"
+"exist.\n"
msgstr ""
-#: urpm.pm:262
+#: urpm.pm:1796 urpm.pm:1805
#, c-format
-msgid "using different removable device [%s] for \"%s\""
+msgid "removing %s to upgrade to %s ..."
msgstr ""
-#: urpm.pm:266 urpm.pm:269
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "\"%s\" olu�turulam�yor\n"
+#: urpm.pm:1797 urpm.pm:1806
+msgid ", $otherPackage, "
+msgstr ", $otherPackage, "
-#: urpm.pm:1339
-#, fuzzy, c-format
-msgid "read synthesis file [%s]"
-msgstr "ba��ml�l�klar listesi dosyas� [%s] okunuyor"
+#: urpm.pm:1797 urpm.pm:1806
+msgid "));"
+msgstr "));"
-#: urpmi:49
-#, c-format
-msgid "urpmi version %s"
-msgstr "urpmi %s. s�r�m�"
-
-#: urpmi:98
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: \"-%s\" se�ene�i bilinmiyor, ayr�nt�l� bilgi i�in --help\n"
+#: urpm.pm:1802
+msgid "$p->{name}-$p->{version}-$p->{release}"
+msgstr "$p->{name}-$p->{version}-$p->{release}"
-#: urpmi:102
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr "Yerel paketleri kurmak i�in sadece sistem y�neticisi yetkilidir"
+#: urpm.pm:1812
+msgid "$prefix/$_"
+msgstr "$prefix/$_"
-#: urpmi:189
+#: urpmi:48
#, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "%s kurulumu i�in a�a��daki paketlerin biri gerekli:"
-
-#: urpmi:301
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
-msgstr ""
+msgid "urpmi version %s"
+msgstr "urpmi %s. s�r�m�"
#: urpmi.addmedia:30
msgid "usage: urpmi.addmedia [--update] <name> <url>"
@@ -947,3 +1000,133 @@ msgstr ", $_);"
#, c-format
msgid "urpmq version %s"
msgstr "urpmq %s. s�r�m�"
+
+#~ msgid "retrieving [%s]"
+#~ msgstr "[%s] al�n�yor"
+
+#~ msgid "wget of [%s] failed (maybe wget is missing?)"
+#~ msgstr "[%s] wget yap�lamad� (wget kurulu olmayabilir mi?)"
+
+#~ msgid "unable to copy source of [%s] from [%s]"
+#~ msgstr "[%s] [%s] den kopyalanam�yor"
+
+#~ msgid "removable medium not selected"
+#~ msgstr "kald�r�labilir ortam se�ilmedi"
+
+#~ msgid "source of [%s] not found as [%s]"
+#~ msgstr "[%s] kayna�� [%s] olarak bulunamad�"
+
+#~ 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 ""
+#~ "urpmi s�r�m %s\n"
+#~ "Telif Hakk�(C) 1999, 2000, 2001 MandrakeSoft.\n"
+#~ "Bu bir serbest yaz�l�md�r. GNU GPL ko�ullar� alt�nda da��t�labilir.\n"
+#~ "kullan�m�:\n"
+#~ " --help - Bu yard�m iletisi g�sterilir. \n"
+#~ " --update - sadece g�ncelleme ortam� kullan�l�r.\n"
+#~ " --auto - Se�iminiz i�in otomatikman iyi bir paket se�er.\n"
+#~ " --auto-select - Sisteminizi g�ncellemek i�in otomatik olarak "
+#~ "paketleri\n"
+#~ " se�er.\n"
+#~ " --force - Baz� paketlerin yoklu�unda bile kurulum yap�l�r.\n"
+#~ " --X - X aray�z� kullan�r.\n"
+#~ " -best-output - Durumunuz i�in en iyi kurulum aray�z�n� se�er:\n"
+#~ " X veya metin tabanl�.\n"
+#~ " -a - Komut sat�r�nda ki t�m e�le�meleri se�er.\n"
+#~ " -m - Gereksinimlerin en k���k birle�imi se�ilir "
+#~ "(�ntan�ml�).\n"
+#~ " -M - Gereksinimlerin en b�y�k birle�imi se�ilir.\n"
+#~ " -c - �stekleri kar��layacak t�m y�ntemler kullan�l�r. \n"
+#~ " -p - Paketi bulmak i�in sa�lananlarda aramaya izin "
+#~ "verilir\n"
+#~ " -q - Ayr�nt� verilmez.\n"
+#~ " -v - Ayr�nt� verilir.\n"
+#~ " Komut sat�r�ndan (sadece root taraf�ndan) verilen isimler veya rpm "
+#~ "dosyalar�\n"
+#~ " kurulur.\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 ""
+#~ "urpmq %s s�r�m�\n"
+#~ "Telif Hakk� (C) 2000, 2001 MandrakeSoft.\n"
+#~ "Bu bir serbest yaz�l�md�r ve GNU GPL ko�ullar� alt�nda da��t�labilir.\n"
+#~ "\n"
+#~ "kullan�m�:\n"
+#~ " -h - bu yard�m iletisi g�sterilir.\n"
+#~ " -v - bol ayr�nt� verilir.\n"
+#~ " -d - sorgu paket ba��ml�l�klar�na geni�letilir.\n"
+#~ " -u - daha yeni bir s�r�m kurulacaksa eskisini kald�r�r.\n"
+#~ " -m - sorgu paket ba��ml�l�klar�na geni�letilir, "
+#~ "gereksinimleri\n"
+#~ " kar��layan kurulu paket kald�r�l�r, g�ncellemede "
+#~ "bloklanan\n"
+#~ " paketler eklenir.\n"
+#~ " -M - sorgu paket ba��ml�l�klar�na geni�letilir ve sadece\n"
+#~ " daha yeni ya da ayn� ise kurulu paket kald�r�l�r\n"
+#~ " -c - istekleri kar��layacak t�m y�ntemler kullan�l�r.\n"
+#~ " -p - paketi bulmak i�in sa�lananlarda aramaya izin "
+#~ "verilir.\n"
+#~ " -g - gruplar da isimleriyle g�sterilir.\n"
+#~ " -r - ismiyle birlikte s�r�m� ve da��t�m� da g�sterilir.\n"
+#~ " --update - sadece g�ncelleme ortam� kullan�l�r.\n"
+#~ " --auto-select - sistemi g�ncelleyecek paketler otomatikman se�ilir.\n"
+#~ " --headers - urpmi db'den std�'ya listelenen paketlerin ba�l�klar�\n"
+#~ " ��kar�l�r (sadece root). --sources - indirme "
+#~ "�ncesi t�m kaynak paketlerini verir (sadece root).\n"
+#~ " --force - baz� paketler eksik olsa da paket kurulur.\n"
+#~ " komut sat�r�ndan verilen isimler ve rpm dosyalar� sorgulan�r.\n"
diff --git a/po/uk.po b/po/uk.po
index d39b325d..bbb57800 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,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: 2000-06-16 08:10+09:00\n"
"Last-Translator: Dmytro Koval'ov <kov@tokyo.email.ne.jp>\n"
"Language-Team: Ukrainian\n"
@@ -24,27 +24,27 @@ msgid ""
"You requested installation of package $rpm\n"
msgstr ""
-#: _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 "�����?"
-#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:281
+#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:279
msgid "Ok"
msgstr "���"
-#: _irpm:34 po/placeholder.h:116 urpmi:252 urpmi:282
+#: _irpm:34 po/placeholder.h:119 urpmi:252 urpmi:280
msgid "Cancel"
msgstr "���ͦ����"
-#: _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 "��Nn"
-#: _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 "��Yy"
-#: _irpm:42 po/placeholder.h:118 urpmi:258
+#: _irpm:42 po/placeholder.h:157 urpmi:258
msgid " (Y/n) "
msgstr " (�/�) "
@@ -147,120 +147,120 @@ msgstr ""
msgid "urpmi is not installed"
msgstr ""
-#: po/placeholder.h:29 urpm.pm:283
+#: po/placeholder.h:29
+#, c-format
+msgid "reading synthesis file [%s]"
+msgstr ""
+
+#: po/placeholder.h:30 urpm.pm:298
#, c-format
msgid "unable to write config file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:31
+#: po/placeholder.h:32
#, c-format
msgid "nothing to write in list file for \"%s\""
msgstr ""
-#: 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 ""
-#: po/placeholder.h:33
+#: po/placeholder.h:34
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr ""
-#: po/placeholder.h:34
+#: po/placeholder.h:35
#, c-format
msgid "nothing written in list file for \"%s\""
msgstr ""
-#: po/placeholder.h:35 urpm.pm:1951
-#, c-format
-msgid ""
-"removing %s to upgrade ...\n"
-" to %s since it will not upgrade correctly!"
-msgstr ""
-
-#: po/placeholder.h:39 urpm.pm:839
+#: po/placeholder.h:36 urpm.pm:845
#, c-format
msgid "read provides file [%s]"
msgstr ""
-#: po/placeholder.h:40
+#: po/placeholder.h:37 urpm.pm:1549
#, c-format
-msgid "trying to remove inexistant medium \"%s\""
+msgid "package %s is not found."
msgstr ""
-#: po/placeholder.h:41 urpm.pm:1692
+#: po/placeholder.h:38 urpm.pm:876
#, c-format
-msgid "package %s is not found."
+msgid "unable to write compss file [%s]"
msgstr ""
-#: po/placeholder.h:42
+#: po/placeholder.h:39 urpm.pm:819
#, c-format
-msgid "unable to copy source of [%s] from [%s]"
+msgid "unmounting %s"
msgstr ""
-#: po/placeholder.h:43 urpm.pm:870
+#: po/placeholder.h:40
#, c-format
-msgid "unable to write compss file [%s]"
+msgid "removing %d obsolete headers in cache"
msgstr ""
-#: po/placeholder.h:44 urpm.pm:813
+#: po/placeholder.h:41 urpm.pm:925 urpm.pm:1491
#, c-format
-msgid "unmounting %s"
+msgid "no hdlist file found for medium \"%s\""
msgstr ""
-#: po/placeholder.h:45
+#: po/placeholder.h:42 urpm.pm:160
#, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
msgstr ""
-#: po/placeholder.h:46 urpm.pm:919 urpm.pm:1634
+#: po/placeholder.h:43 urpm.pm:184
#, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
msgstr ""
-#: po/placeholder.h:47 urpm.pm:176
+#: po/placeholder.h:44 urpm.pm:191
#, c-format
msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
msgstr ""
-#: po/placeholder.h:48
+#: po/placeholder.h:45
msgid "keeping only files referenced in provides"
msgstr ""
-#: po/placeholder.h:49
+#: po/placeholder.h:46
#, c-format
msgid "unable to build synthesis file for medium \"%s\""
msgstr ""
-#: po/placeholder.h:50
+#: po/placeholder.h:47
#, c-format
msgid "found %d headers in cache"
msgstr ""
-#: po/placeholder.h:51 urpm.pm:836
+#: po/placeholder.h:48 urpm.pm:842
#, c-format
msgid "unable to read provides file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:53 urpm.pm:311
+#: po/placeholder.h:50
#, c-format
-msgid "medium \"%s\" already exists"
+msgid ""
+"removing %s to upgrade to %s ...\n"
+" since it will not be updated otherwise"
msgstr ""
-#: po/placeholder.h:54 urpm.pm:295
+#: po/placeholder.h:54 urpm.pm:326
#, c-format
-msgid "write config file [%s]"
+msgid "medium \"%s\" already exists"
msgstr ""
#: po/placeholder.h:55
@@ -268,324 +268,347 @@ msgstr ""
msgid "unable to write list file of \"%s\""
msgstr ""
-#: po/placeholder.h:56 urpm.pm:1817
-#, c-format
-msgid "retrieving [%s]"
-msgstr ""
-
-#: po/placeholder.h:57 urpm.pm:1819
+#: po/placeholder.h:56 urpm.pm:310
#, c-format
-msgid "wget of [%s] failed"
+msgid "write config file [%s]"
msgstr ""
-#: po/placeholder.h:58 urpm.pm:1101
+#: po/placeholder.h:57 urpm.pm:1107
#, fuzzy, c-format
msgid "no package named %s"
msgstr "����� ������ � ������ %s\n"
-#: po/placeholder.h:59 urpm.pm:848
+#: po/placeholder.h:58 urpm.pm:854
#, c-format
msgid "unable to read compss file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:61
+#: po/placeholder.h:60
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr ""
-#: po/placeholder.h:62
+#: po/placeholder.h:61
msgid "computing dependencies"
msgstr ""
-#: po/placeholder.h:63 urpm.pm:868
+#: po/placeholder.h:62
+#, c-format
+msgid "retrieve of [%s] failed"
+msgstr ""
+
+#: po/placeholder.h:63 urpm.pm:874
#, c-format
msgid "write provides file [%s]"
msgstr ""
-#: po/placeholder.h:64 urpm.pm:803
+#: po/placeholder.h:64 urpm.pm:809
#, fuzzy, c-format
msgid "mounting %s"
msgstr "���������� %s\n"
-#: 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 "
"medium"
msgstr ""
-#: po/placeholder.h:66 urpm.pm:148
-#, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
-msgstr ""
-
-#: po/placeholder.h:67
+#: po/placeholder.h:66
#, c-format
msgid "reading hdlist file [%s]"
msgstr ""
-#: po/placeholder.h:68 urpm.pm:873
+#: po/placeholder.h:67 urpm.pm:879
#, c-format
msgid "write compss file [%s]"
msgstr ""
-#: po/placeholder.h:69 urpm.pm:827
+#: po/placeholder.h:68 urpm.pm:833
#, c-format
msgid "read depslist file [%s]"
msgstr ""
-#: po/placeholder.h:70
+#: po/placeholder.h:69 urpm.pm:103
+msgid "curl failed\n"
+msgstr ""
+
+#: po/placeholder.h:70 urpm.pm:281 urpm.pm:284
#, c-format
-msgid "trying to select inexistant medium \"%s\""
+msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr ""
-#: po/placeholder.h:71 urpm.pm:1812
+#: po/placeholder.h:71 urpm.pm:1668
#, c-format
msgid "malformed input: [%s]"
msgstr ""
-#: 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"
+msgid "there are multiple packages with the same rpm filename \"%s\""
msgstr ""
-#: 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 ""
-#: po/placeholder.h:77 urpm.pm:865
+#: po/placeholder.h:74 urpm.pm:871
#, c-format
msgid "unable to write provides file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:79 urpm.pm:1005
-msgid "unable to register rpm file"
+#: po/placeholder.h:76 urpm.pm:1215
+msgid "unable to find all synthesis file, using parsehdlist server"
msgstr ""
-#: po/placeholder.h:80 urpm.pm:1362
-msgid "unable to find all synthesis file, using parsehdlist server"
+#: po/placeholder.h:77 urpm.pm:1011
+msgid "unable to register rpm file"
msgstr ""
-#: po/placeholder.h:81 urpm.pm:241
+#: po/placeholder.h:78 urpm.pm:256
#, c-format
msgid "unable to inspect list file for \"%s\", medium ignored"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:83
+#: po/placeholder.h:81
#, c-format
msgid "copy of [%s] failed"
msgstr ""
-#: 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 ""
+
+#: 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 ""
-#: po/placeholder.h:85 urpm.pm:824
+#: po/placeholder.h:84 urpm.pm:1192
#, c-format
-msgid "unable to read depslist file [%s]"
+msgid "read synthesis file [%s]"
msgstr ""
-#: po/placeholder.h:86
-msgid "removable medium not selected"
+#: po/placeholder.h:85 urpm.pm:830
+#, c-format
+msgid "unable to read depslist file [%s]"
msgstr ""
-#: po/placeholder.h:87 urpm.pm:851
+#: po/placeholder.h:86 urpm.pm:857
#, c-format
msgid "read compss file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:89
+#: po/placeholder.h:88
#, c-format
msgid "building hdlist [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:91 urpm.pm:1009
+#: po/placeholder.h:90 urpm.pm:1015
msgid "error registering local packages"
msgstr ""
-#: po/placeholder.h:92 urpm.pm:1762
+#: po/placeholder.h:91 urpm.pm:273
#, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "taking removable device as \"%s\""
msgstr ""
-#: po/placeholder.h:93
+#: po/placeholder.h:92 urpm.pm:1619
#, c-format
-msgid "unable to build hdlist: %s"
+msgid "incoherent medium \"%s\" marked removable but not really"
msgstr ""
-#: po/placeholder.h:94 urpm.pm:1000
+#: po/placeholder.h:93
#, c-format
-msgid "invalid rpm file name [%s]"
+msgid "unable to build hdlist: %s"
msgstr ""
-#: po/placeholder.h:95 urpm.pm:1736 urpm.pm:1739 urpm.pm:1758
+#: po/placeholder.h:94 urpm.pm:1593 urpm.pm:1596 urpm.pm:1615
#, c-format
msgid "medium \"%s\" is not selected"
msgstr ""
-#: po/placeholder.h:96 urpm.pm:207
+#: po/placeholder.h:95 urpm.pm:1006
#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "invalid rpm file name [%s]"
msgstr ""
-#: po/placeholder.h:97 urpm.pm:863
+#: po/placeholder.h:96 urpm.pm:1175
#, c-format
-msgid "write depslist file [%s]"
+msgid "unknown data associated with %s"
msgstr ""
-#: po/placeholder.h:98 urpm.pm:1322
+#: po/placeholder.h:97 urpm.pm:222
#, c-format
-msgid "unknown data associated with %s"
+msgid "trying to bypass existing medium \"%s\", avoiding"
msgstr ""
-#: po/placeholder.h:99
+#: po/placeholder.h:98 urpm.pm:869
#, c-format
-msgid "source of [%s] not found as [%s]"
+msgid "write depslist file [%s]"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: po/placeholder.h:102
+#: po/placeholder.h:101 urpm.pm:1007
#, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
+msgid "unable to access rpm file [%s]"
msgstr ""
-#: po/placeholder.h:103 urpm.pm:1001
+#: po/placeholder.h:102 urpm.pm:866
#, c-format
-msgid "unable to access rpm file [%s]"
+msgid "unable to write depslist file [%s]"
msgstr ""
-#: po/placeholder.h:104 urpm.pm:860
+#: po/placeholder.h:103
#, c-format
-msgid "unable to write depslist file [%s]"
+msgid ""
+"removing %s to upgrade to %s ...\n"
+" since it will not upgrade correctly!"
msgstr ""
-#: po/placeholder.h:105 urpm.pm:327 urpm.pm:1773
+#: po/placeholder.h:107 urpm.pm:342 urpm.pm:1630
#, c-format
msgid "unable to access medium \"%s\""
msgstr ""
-#: po/placeholder.h:106 urpm.pm:988
+#: po/placeholder.h:108 urpm.pm:994
#, c-format
msgid "relocated %s entries in depslist"
msgstr ""
-#: 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\""
+msgid "trying to select inexistent medium \"%s\""
msgstr ""
-#: po/placeholder.h:108
+#: 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 "no rpm files found from [%s]"
+msgid "unable to parse correctly [%s] on value \"%s\""
msgstr ""
-#: po/placeholder.h:109 urpm.pm:1104
+#: po/placeholder.h:112 urpm.pm:1110
#, fuzzy, c-format
msgid "The following packages contain %s: %s"
msgstr " � ������ ͦ����� � ��¦ %s: %s\n"
-#: 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\""
+msgid "no rpm files found from [%s]"
msgstr ""
-#: po/placeholder.h:111 urpm.pm:1920
+#: po/placeholder.h:114 urpm.pm:1772
#, c-format
msgid "selecting %s using obsoletes"
msgstr ""
-#: po/placeholder.h:112 urpm.pm:2031
+#: po/placeholder.h:115 urpm.pm:1888
#, c-format
msgid "selecting %s by selection on files"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:114 urpmi:308 urpmi:315 urpmi:328 urpmi:339 urpmi:352
-msgid "Installation failed"
-msgstr "��������� �������"
-
-#: po/placeholder.h:115 urpmi:279
-msgid "Press enter when it's done..."
-msgstr "�����Φ�� Enter Ц��� ��˦������..."
+#: po/placeholder.h:120
+msgid " --help - print this help message.\n"
+msgstr ""
-#: po/placeholder.h:117 urpmi:201
-msgid "Sorry, bad choice, try again\n"
-msgstr "��צ���� ��¦�, ��������� �� ���\n"
+#: po/placeholder.h:121 urpmi:361
+msgid "everything already installed"
+msgstr "��� ��� �����������"
-#: po/placeholder.h:120
+#: po/placeholder.h:122 urpmi:98
#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr ""
+
+#: po/placeholder.h:123 urpmi:194
+msgid "One of the following packages is needed:"
+msgstr "���Ҧ��� ���� �� ��������� ����Ԧ�:"
+
+#: po/placeholder.h:124 po/placeholder.h:222
+msgid " --update - use only update media.\n"
+msgstr ""
+
+#: po/placeholder.h:125 urpmi:299
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"
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
msgstr ""
-#: po/placeholder.h:142 urpmi:362
-msgid "everything already installed"
-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 "��������� �������"
+
+#: po/placeholder.h:132 po/placeholder.h:234
+msgid ""
+" --auto-select - automatically select packages for upgrading the system.\n"
+msgstr ""
+
+#: po/placeholder.h:134
+msgid " --X - use X interface.\n"
+msgstr ""
-#: po/placeholder.h:143 urpmi:247
+#: po/placeholder.h:135 urpmi:247
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -594,50 +617,115 @@ msgstr ""
"������Φ ������ ������ ���������Φ ��� ����, ��� ������������ ��������Ԧ (%"
"d ��)"
-#: po/placeholder.h:144 urpmi:296
-#, c-format
-msgid "installing %s\n"
-msgstr "���������� %s\n"
+#: po/placeholder.h:136 urpmi:320 urpmi:344
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "���������� ��������� ��� ����צ��� �����������? (�/�) "
+
+#: 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:145 urpmi:198
+#: po/placeholder.h:143
+msgid " -q - quiet mode.\n"
+msgstr ""
+
+#: po/placeholder.h:144 urpmi:202
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "��� ��¦�? (1-%d) "
-#: po/placeholder.h:146 urpmi:321 urpmi:345
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "���������� ��������� ��� ����צ��� �����������? (�/�) "
+#: po/placeholder.h:145
+msgid " --wget - use wget to retrieve distant files.\n"
+msgstr ""
-#: po/placeholder.h:147 urpmi:190
-msgid "One of the following packages is needed:"
-msgstr "���Ҧ��� ���� �� ��������� ����Ԧ�:"
+#: po/placeholder.h:146
+#, 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"
+msgstr ""
+
+#: po/placeholder.h:152 urpmi:328 urpmi:352
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "���������� ��������� ��������� (--force)? (�/�) "
+
+#: po/placeholder.h:154
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+
+#: po/placeholder.h:155 urpmi:205
+msgid "Sorry, bad choice, try again\n"
+msgstr "��צ���� ��¦�, ��������� �� ���\n"
+
+#: po/placeholder.h:156
+msgid ""
+" names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: po/placeholder.h:158
+msgid " -a - select all matches on command line.\n"
+msgstr ""
+
+#: 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 "���������� %s\n"
-#: po/placeholder.h:148 urpmi:149
+#: po/placeholder.h:161 urpmi:152
msgid "Only superuser is allowed to install local packages"
msgstr ""
"������������� ������Φ ������ ��������� Ԧ���� ���������� ��ͦΦ��������"
-#: po/placeholder.h:149 urpmi:278
+#: po/placeholder.h:162 urpmi:276
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "������� ����-����� %s � ������ %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 ""
-#: po/placeholder.h:151 urpmi:329 urpmi:353
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "���������� ��������� ��������� (--force)? (�/�) "
+#: po/placeholder.h:165 urpmi:102
+#, fuzzy
+msgid "Only superuser is allowed to install packages"
+msgstr ""
+"������������� ������Φ ������ ��������� Ԧ���� ���������� ��ͦΦ��������"
+
+#: po/placeholder.h:166 urpmi:193
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "���Ҧ��� ���� �� ��������� ����Ԧ�:"
+
+#: po/placeholder.h:167 urpmi:277
+msgid "Press Enter when it's done..."
+msgstr "�����Φ�� Enter Ц��� ��˦������..."
-#: po/placeholder.h:155 urpmi.addmedia:46
+#: po/placeholder.h:168 urpmi.addmedia:46
#, c-format
msgid ""
"%s\n"
"`with' missing for ftp media\n"
msgstr ""
-#: po/placeholder.h:159
+#: po/placeholder.h:172
msgid ""
"usage: urpmi.addmedia [--update] <name> <url>\n"
"where <url> is one of\n"
@@ -649,31 +737,31 @@ msgid ""
" removable_<device>://<path>\n"
msgstr ""
-#: po/placeholder.h:168 urpmi.addmedia:57
+#: po/placeholder.h:181 urpmi.addmedia:57
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr ""
-#: po/placeholder.h:169 urpmi.addmedia:58
+#: po/placeholder.h:182 urpmi.addmedia:58
#, c-format
msgid "unable to update medium \"%s\"\n"
msgstr ""
-#: po/placeholder.h:170 urpmi.addmedia:42
+#: po/placeholder.h:183 urpmi.addmedia:42
#, c-format
msgid ""
"%s\n"
"device `%s' do not exist\n"
msgstr ""
-#: po/placeholder.h:174 urpmi.addmedia:44
+#: po/placeholder.h:187 urpmi.addmedia:44
#, c-format
msgid ""
"%s\n"
"<relative path of hdlist> missing\n"
msgstr ""
-#: po/placeholder.h:178
+#: po/placeholder.h:191
#, c-format
msgid ""
"usage: urpmi.update [-a] <name> ...\n"
@@ -685,29 +773,29 @@ msgid ""
"unknown options '%s'\n"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:188 urpmi.update:53
+#: po/placeholder.h:201 urpmi.update:53
#, c-format
msgid ""
"the entry to update is missing\n"
"(one of %s)\n"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:193 urpmi.removemedia:46
+#: po/placeholder.h:206 urpmi.removemedia:46
#, c-format
msgid ""
"the entry to remove is missing\n"
"(one of %s)\n"
msgstr ""
-#: po/placeholder.h:197
+#: po/placeholder.h:210
#, c-format
msgid ""
"usage: urpmi.removemedia [-a] <name> ...\n"
@@ -717,23 +805,38 @@ msgid ""
"unknown options '%s'\n"
msgstr ""
-#: po/placeholder.h:204 urpmq:85
+#: po/placeholder.h:217
+msgid " -h - print this help message.\n"
+msgstr ""
+
+#: po/placeholder.h:218 urpmq:130
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+
+#: po/placeholder.h:219
+msgid " -g - print groups too with name.\n"
+msgstr ""
+
+#: po/placeholder.h:220 urpmq:84
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr ""
-#: po/placeholder.h:206 urpmq:82
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#: po/placeholder.h:221
+msgid " names or rpm files given on command line are queried.\n"
msgstr ""
-#: po/placeholder.h:207 urpmq:131
-msgid ""
-"some package have to be removed for being upgraded, this is not supported "
-"yet\n"
+#: po/placeholder.h:223
+msgid " -r - print version and release too with name.\n"
msgstr ""
-#: po/placeholder.h:208
+#: po/placeholder.h:224
+msgid " -f - print version, release and arch with name.\n"
+msgstr ""
+
+#: po/placeholder.h:225
#, c-format
msgid ""
"urpmq version %s\n"
@@ -741,78 +844,68 @@ msgid ""
"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 package do not exist.\n"
-" names or rpm files given on command line are queried.\n"
msgstr ""
-#: urpm.pm:257
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:231
+msgid " -d - extend query to package dependencies.\n"
msgstr ""
-#: urpm.pm:258
-#, c-format
-msgid "taking removable device as \"%s\""
+#: po/placeholder.h:232
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
msgstr ""
-#: urpm.pm:262
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
+#: po/placeholder.h:233
+msgid ""
+" -c - choose complete method for resolving requires closure.\n"
msgstr ""
-#: urpm.pm:266 urpm.pm:269
+#: po/placeholder.h:235 urpmq:81
#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
msgstr ""
-#: urpm.pm:1339
-#, c-format
-msgid "read synthesis file [%s]"
+#: po/placeholder.h:236
+msgid ""
+" --headers - extract headers for package listed from urpmi db to\n"
+" stdout (root only).\n"
msgstr ""
-#: urpmi:49
-#, c-format
-msgid "urpmi version %s"
+#: po/placeholder.h:243
+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 ""
-#: urpmi:98
+#: urpm.pm:1796 urpm.pm:1805
#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgid "removing %s to upgrade to %s ..."
msgstr ""
-#: urpmi:102
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
+#: urpm.pm:1797 urpm.pm:1806
+msgid ", $otherPackage, "
+msgstr ", $otherPackage, "
+
+#: urpm.pm:1797 urpm.pm:1806
+msgid "));"
+msgstr "));"
+
+#: urpm.pm:1802
+msgid "$p->{name}-$p->{version}-$p->{release}"
msgstr ""
-"������������� ������Φ ������ ��������� Ԧ���� ���������� ��ͦΦ��������"
-#: urpmi:189
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "���Ҧ��� ���� �� ��������� ����Ԧ�:"
+#: urpm.pm:1812
+msgid "$prefix/$_"
+msgstr ""
-#: urpmi:301
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+#: urpmi:48
+#, c-format
+msgid "urpmi version %s"
msgstr ""
#: urpmi.addmedia:30
@@ -845,9 +938,6 @@ msgstr ", $_);"
msgid "urpmq version %s"
msgstr ""
-#~ msgid "));"
-#~ msgstr "));"
-
#~ msgid "), $_);"
#~ msgstr "), $_);"
diff --git a/po/urpmi.pot b/po/urpmi.pot
index e9a61343..c9decda3 100644
--- a/po/urpmi.pot
+++ b/po/urpmi.pot
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-11-24 14:46+0100\n"
+"POT-Creation-Date: 2001-11-27 19:52+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -24,27 +24,27 @@ msgid ""
"You requested installation of package $rpm\n"
msgstr ""
-#: _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 ""
-#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:281
+#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:279
msgid "Ok"
msgstr ""
-#: _irpm:34 po/placeholder.h:116 urpmi:252 urpmi:282
+#: _irpm:34 po/placeholder.h:119 urpmi:252 urpmi:280
msgid "Cancel"
msgstr ""
-#: _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 ""
-#: _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 ""
-#: _irpm:42 po/placeholder.h:118 urpmi:258
+#: _irpm:42 po/placeholder.h:157 urpmi:258
msgid " (Y/n) "
msgstr ""
@@ -147,120 +147,120 @@ msgstr ""
msgid "urpmi is not installed"
msgstr ""
-#: po/placeholder.h:29 urpm.pm:283
+#: po/placeholder.h:29
+#, c-format
+msgid "reading synthesis file [%s]"
+msgstr ""
+
+#: po/placeholder.h:30 urpm.pm:298
#, c-format
msgid "unable to write config file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:31
+#: po/placeholder.h:32
#, c-format
msgid "nothing to write in list file for \"%s\""
msgstr ""
-#: 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 ""
-#: po/placeholder.h:33
+#: po/placeholder.h:34
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr ""
-#: po/placeholder.h:34
+#: po/placeholder.h:35
#, c-format
msgid "nothing written in list file for \"%s\""
msgstr ""
-#: po/placeholder.h:35 urpm.pm:1951
-#, c-format
-msgid ""
-"removing %s to upgrade ...\n"
-" to %s since it will not upgrade correctly!"
-msgstr ""
-
-#: po/placeholder.h:39 urpm.pm:839
+#: po/placeholder.h:36 urpm.pm:845
#, c-format
msgid "read provides file [%s]"
msgstr ""
-#: po/placeholder.h:40
+#: po/placeholder.h:37 urpm.pm:1549
#, c-format
-msgid "trying to remove inexistant medium \"%s\""
+msgid "package %s is not found."
msgstr ""
-#: po/placeholder.h:41 urpm.pm:1692
+#: po/placeholder.h:38 urpm.pm:876
#, c-format
-msgid "package %s is not found."
+msgid "unable to write compss file [%s]"
msgstr ""
-#: po/placeholder.h:42
+#: po/placeholder.h:39 urpm.pm:819
#, c-format
-msgid "unable to copy source of [%s] from [%s]"
+msgid "unmounting %s"
msgstr ""
-#: po/placeholder.h:43 urpm.pm:870
+#: po/placeholder.h:40
#, c-format
-msgid "unable to write compss file [%s]"
+msgid "removing %d obsolete headers in cache"
msgstr ""
-#: po/placeholder.h:44 urpm.pm:813
+#: po/placeholder.h:41 urpm.pm:925 urpm.pm:1491
#, c-format
-msgid "unmounting %s"
+msgid "no hdlist file found for medium \"%s\""
msgstr ""
-#: po/placeholder.h:45
+#: po/placeholder.h:42 urpm.pm:160
#, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
msgstr ""
-#: po/placeholder.h:46 urpm.pm:919 urpm.pm:1634
+#: po/placeholder.h:43 urpm.pm:184
#, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
msgstr ""
-#: po/placeholder.h:47 urpm.pm:176
+#: po/placeholder.h:44 urpm.pm:191
#, c-format
msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
msgstr ""
-#: po/placeholder.h:48
+#: po/placeholder.h:45
msgid "keeping only files referenced in provides"
msgstr ""
-#: po/placeholder.h:49
+#: po/placeholder.h:46
#, c-format
msgid "unable to build synthesis file for medium \"%s\""
msgstr ""
-#: po/placeholder.h:50
+#: po/placeholder.h:47
#, c-format
msgid "found %d headers in cache"
msgstr ""
-#: po/placeholder.h:51 urpm.pm:836
+#: po/placeholder.h:48 urpm.pm:842
#, c-format
msgid "unable to read provides file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:53 urpm.pm:311
+#: po/placeholder.h:50
#, c-format
-msgid "medium \"%s\" already exists"
+msgid ""
+"removing %s to upgrade to %s ...\n"
+" since it will not be updated otherwise"
msgstr ""
-#: po/placeholder.h:54 urpm.pm:295
+#: po/placeholder.h:54 urpm.pm:326
#, c-format
-msgid "write config file [%s]"
+msgid "medium \"%s\" already exists"
msgstr ""
#: po/placeholder.h:55
@@ -268,293 +268,385 @@ msgstr ""
msgid "unable to write list file of \"%s\""
msgstr ""
-#: po/placeholder.h:56 urpm.pm:1817
-#, c-format
-msgid "retrieving [%s]"
-msgstr ""
-
-#: po/placeholder.h:57 urpm.pm:1819
+#: po/placeholder.h:56 urpm.pm:310
#, c-format
-msgid "wget of [%s] failed"
+msgid "write config file [%s]"
msgstr ""
-#: po/placeholder.h:58 urpm.pm:1101
+#: po/placeholder.h:57 urpm.pm:1107
#, c-format
msgid "no package named %s"
msgstr ""
-#: po/placeholder.h:59 urpm.pm:848
+#: po/placeholder.h:58 urpm.pm:854
#, c-format
msgid "unable to read compss file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:61
+#: po/placeholder.h:60
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr ""
-#: po/placeholder.h:62
+#: po/placeholder.h:61
msgid "computing dependencies"
msgstr ""
-#: po/placeholder.h:63 urpm.pm:868
+#: po/placeholder.h:62
+#, c-format
+msgid "retrieve of [%s] failed"
+msgstr ""
+
+#: po/placeholder.h:63 urpm.pm:874
#, c-format
msgid "write provides file [%s]"
msgstr ""
-#: po/placeholder.h:64 urpm.pm:803
+#: po/placeholder.h:64 urpm.pm:809
#, c-format
msgid "mounting %s"
msgstr ""
-#: 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 "
"medium"
msgstr ""
-#: po/placeholder.h:66 urpm.pm:148
-#, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
-msgstr ""
-
-#: po/placeholder.h:67
+#: po/placeholder.h:66
#, c-format
msgid "reading hdlist file [%s]"
msgstr ""
-#: po/placeholder.h:68 urpm.pm:873
+#: po/placeholder.h:67 urpm.pm:879
#, c-format
msgid "write compss file [%s]"
msgstr ""
-#: po/placeholder.h:69 urpm.pm:827
+#: po/placeholder.h:68 urpm.pm:833
#, c-format
msgid "read depslist file [%s]"
msgstr ""
-#: po/placeholder.h:70
+#: po/placeholder.h:69 urpm.pm:103
+msgid "curl failed\n"
+msgstr ""
+
+#: po/placeholder.h:70 urpm.pm:281 urpm.pm:284
#, c-format
-msgid "trying to select inexistant medium \"%s\""
+msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr ""
-#: po/placeholder.h:71 urpm.pm:1812
+#: po/placeholder.h:71 urpm.pm:1668
#, c-format
msgid "malformed input: [%s]"
msgstr ""
-#: 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"
+msgid "there are multiple packages with the same rpm filename \"%s\""
msgstr ""
-#: 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 ""
-#: po/placeholder.h:77 urpm.pm:865
+#: po/placeholder.h:74 urpm.pm:871
#, c-format
msgid "unable to write provides file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:79 urpm.pm:1005
-msgid "unable to register rpm file"
+#: po/placeholder.h:76 urpm.pm:1215
+msgid "unable to find all synthesis file, using parsehdlist server"
msgstr ""
-#: po/placeholder.h:80 urpm.pm:1362
-msgid "unable to find all synthesis file, using parsehdlist server"
+#: po/placeholder.h:77 urpm.pm:1011
+msgid "unable to register rpm file"
msgstr ""
-#: po/placeholder.h:81 urpm.pm:241
+#: po/placeholder.h:78 urpm.pm:256
#, c-format
msgid "unable to inspect list file for \"%s\", medium ignored"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:83
+#: po/placeholder.h:81
#, c-format
msgid "copy of [%s] failed"
msgstr ""
-#: 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 ""
+
+#: 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 ""
-#: po/placeholder.h:85 urpm.pm:824
+#: po/placeholder.h:84 urpm.pm:1192
#, c-format
-msgid "unable to read depslist file [%s]"
+msgid "read synthesis file [%s]"
msgstr ""
-#: po/placeholder.h:86
-msgid "removable medium not selected"
+#: po/placeholder.h:85 urpm.pm:830
+#, c-format
+msgid "unable to read depslist file [%s]"
msgstr ""
-#: po/placeholder.h:87 urpm.pm:851
+#: po/placeholder.h:86 urpm.pm:857
#, c-format
msgid "read compss file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:89
+#: po/placeholder.h:88
#, c-format
msgid "building hdlist [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:91 urpm.pm:1009
+#: po/placeholder.h:90 urpm.pm:1015
msgid "error registering local packages"
msgstr ""
-#: po/placeholder.h:92 urpm.pm:1762
+#: po/placeholder.h:91 urpm.pm:273
#, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "taking removable device as \"%s\""
msgstr ""
-#: po/placeholder.h:93
+#: po/placeholder.h:92 urpm.pm:1619
#, c-format
-msgid "unable to build hdlist: %s"
+msgid "incoherent medium \"%s\" marked removable but not really"
msgstr ""
-#: po/placeholder.h:94 urpm.pm:1000
+#: po/placeholder.h:93
#, c-format
-msgid "invalid rpm file name [%s]"
+msgid "unable to build hdlist: %s"
msgstr ""
-#: po/placeholder.h:95 urpm.pm:1736 urpm.pm:1739 urpm.pm:1758
+#: po/placeholder.h:94 urpm.pm:1593 urpm.pm:1596 urpm.pm:1615
#, c-format
msgid "medium \"%s\" is not selected"
msgstr ""
-#: po/placeholder.h:96 urpm.pm:207
+#: po/placeholder.h:95 urpm.pm:1006
#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "invalid rpm file name [%s]"
msgstr ""
-#: po/placeholder.h:97 urpm.pm:863
+#: po/placeholder.h:96 urpm.pm:1175
#, c-format
-msgid "write depslist file [%s]"
+msgid "unknown data associated with %s"
msgstr ""
-#: po/placeholder.h:98 urpm.pm:1322
+#: po/placeholder.h:97 urpm.pm:222
#, c-format
-msgid "unknown data associated with %s"
+msgid "trying to bypass existing medium \"%s\", avoiding"
msgstr ""
-#: po/placeholder.h:99
+#: po/placeholder.h:98 urpm.pm:869
#, c-format
-msgid "source of [%s] not found as [%s]"
+msgid "write depslist file [%s]"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: po/placeholder.h:102
+#: po/placeholder.h:101 urpm.pm:1007
#, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
+msgid "unable to access rpm file [%s]"
msgstr ""
-#: po/placeholder.h:103 urpm.pm:1001
+#: po/placeholder.h:102 urpm.pm:866
#, c-format
-msgid "unable to access rpm file [%s]"
+msgid "unable to write depslist file [%s]"
msgstr ""
-#: po/placeholder.h:104 urpm.pm:860
+#: po/placeholder.h:103
#, c-format
-msgid "unable to write depslist file [%s]"
+msgid ""
+"removing %s to upgrade to %s ...\n"
+" since it will not upgrade correctly!"
msgstr ""
-#: po/placeholder.h:105 urpm.pm:327 urpm.pm:1773
+#: po/placeholder.h:107 urpm.pm:342 urpm.pm:1630
#, c-format
msgid "unable to access medium \"%s\""
msgstr ""
-#: po/placeholder.h:106 urpm.pm:988
+#: po/placeholder.h:108 urpm.pm:994
#, c-format
msgid "relocated %s entries in depslist"
msgstr ""
-#: 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\""
+msgid "trying to select inexistent medium \"%s\""
msgstr ""
-#: po/placeholder.h:108
+#: 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 "no rpm files found from [%s]"
+msgid "unable to parse correctly [%s] on value \"%s\""
msgstr ""
-#: po/placeholder.h:109 urpm.pm:1104
+#: po/placeholder.h:112 urpm.pm:1110
#, c-format
msgid "The following packages contain %s: %s"
msgstr ""
-#: 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\""
+msgid "no rpm files found from [%s]"
msgstr ""
-#: po/placeholder.h:111 urpm.pm:1920
+#: po/placeholder.h:114 urpm.pm:1772
#, c-format
msgid "selecting %s using obsoletes"
msgstr ""
-#: po/placeholder.h:112 urpm.pm:2031
+#: po/placeholder.h:115 urpm.pm:1888
#, c-format
msgid "selecting %s by selection on files"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:114 urpmi:308 urpmi:315 urpmi:328 urpmi:339 urpmi:352
+#: po/placeholder.h:120
+msgid " --help - print this help message.\n"
+msgstr ""
+
+#: po/placeholder.h:121 urpmi:361
+msgid "everything already installed"
+msgstr ""
+
+#: po/placeholder.h:122 urpmi:98
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr ""
+
+#: po/placeholder.h:123 urpmi:194
+msgid "One of the following packages is needed:"
+msgstr ""
+
+#: 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 ""
-#: po/placeholder.h:115 urpmi:279
-msgid "Press enter when it's done..."
+#: 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"
+#: po/placeholder.h:134
+msgid " --X - use X interface.\n"
msgstr ""
-#: 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 ""
+
+#: po/placeholder.h:136 urpmi:320 urpmi:344
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr ""
+
+#: 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
+msgid " -q - quiet mode.\n"
+msgstr ""
+
+#: po/placeholder.h:144 urpmi:202
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr ""
+
+#: po/placeholder.h:145
+msgid " --wget - use wget to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:146
#, c-format
msgid ""
"urpmi version %s\n"
@@ -562,79 +654,73 @@ msgid ""
"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 ""
-#: po/placeholder.h:142 urpmi:362
-msgid "everything already installed"
+#: po/placeholder.h:152 urpmi:328 urpmi:352
+msgid "Try installation even more strongly (--force)? (y/N) "
msgstr ""
-#: po/placeholder.h:143 urpmi:247
-#, c-format
+#: po/placeholder.h:154
msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"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"
+#: po/placeholder.h:155 urpmi:205
+msgid "Sorry, bad choice, try again\n"
msgstr ""
-#: po/placeholder.h:145 urpmi:198
-#, c-format
-msgid "What is your choice? (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) "
+#: 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:"
+#: po/placeholder.h:159
+msgid " --curl - use curl to retrieve distant files.\n"
msgstr ""
-#: po/placeholder.h:148 urpmi:149
+#: po/placeholder.h:160 urpmi:294
+#, c-format
+msgid "installing %s\n"
+msgstr ""
+
+#: po/placeholder.h:161 urpmi:152
msgid "Only superuser is allowed to install local packages"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: po/placeholder.h:151 urpmi:329 urpmi:353
-msgid "Try installation even more strongly (--force)? (y/N) "
+#: po/placeholder.h:165 urpmi:102
+msgid "Only superuser is allowed to install packages"
msgstr ""
-#: po/placeholder.h:155 urpmi.addmedia:46
+#: po/placeholder.h:166 urpmi:193
+#, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr ""
+
+#: po/placeholder.h:167 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 ""
-#: po/placeholder.h:159
+#: po/placeholder.h:172
msgid ""
"usage: urpmi.addmedia [--update] <name> <url>\n"
"where <url> is one of\n"
@@ -646,31 +732,31 @@ msgid ""
" removable_<device>://<path>\n"
msgstr ""
-#: po/placeholder.h:168 urpmi.addmedia:57
+#: po/placeholder.h:181 urpmi.addmedia:57
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr ""
-#: po/placeholder.h:169 urpmi.addmedia:58
+#: po/placeholder.h:182 urpmi.addmedia:58
#, c-format
msgid "unable to update medium \"%s\"\n"
msgstr ""
-#: po/placeholder.h:170 urpmi.addmedia:42
+#: po/placeholder.h:183 urpmi.addmedia:42
#, c-format
msgid ""
"%s\n"
"device `%s' do not exist\n"
msgstr ""
-#: po/placeholder.h:174 urpmi.addmedia:44
+#: po/placeholder.h:187 urpmi.addmedia:44
#, c-format
msgid ""
"%s\n"
"<relative path of hdlist> missing\n"
msgstr ""
-#: po/placeholder.h:178
+#: po/placeholder.h:191
#, c-format
msgid ""
"usage: urpmi.update [-a] <name> ...\n"
@@ -682,29 +768,29 @@ msgid ""
"unknown options '%s'\n"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:188 urpmi.update:53
+#: po/placeholder.h:201 urpmi.update:53
#, c-format
msgid ""
"the entry to update is missing\n"
"(one of %s)\n"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:193 urpmi.removemedia:46
+#: po/placeholder.h:206 urpmi.removemedia:46
#, c-format
msgid ""
"the entry to remove is missing\n"
"(one of %s)\n"
msgstr ""
-#: po/placeholder.h:197
+#: po/placeholder.h:210
#, c-format
msgid ""
"usage: urpmi.removemedia [-a] <name> ...\n"
@@ -714,23 +800,38 @@ msgid ""
"unknown options '%s'\n"
msgstr ""
-#: po/placeholder.h:204 urpmq:85
+#: po/placeholder.h:217
+msgid " -h - print this help message.\n"
+msgstr ""
+
+#: po/placeholder.h:218 urpmq:130
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+
+#: po/placeholder.h:219
+msgid " -g - print groups too with name.\n"
+msgstr ""
+
+#: po/placeholder.h:220 urpmq:84
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr ""
-#: po/placeholder.h:206 urpmq:82
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#: po/placeholder.h:221
+msgid " names or rpm files given on command line are queried.\n"
msgstr ""
-#: po/placeholder.h:207 urpmq:131
-msgid ""
-"some package have to be removed for being upgraded, this is not supported "
-"yet\n"
+#: po/placeholder.h:223
+msgid " -r - print version and release too with name.\n"
msgstr ""
-#: po/placeholder.h:208
+#: po/placeholder.h:224
+msgid " -f - print version, release and arch with name.\n"
+msgstr ""
+
+#: po/placeholder.h:225
#, c-format
msgid ""
"urpmq version %s\n"
@@ -738,76 +839,68 @@ msgid ""
"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 ""
+
+#: po/placeholder.h:231
+msgid " -d - extend query to package dependencies.\n"
+msgstr ""
+
+#: 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 ""
-#: urpm.pm:257
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:233
+msgid ""
+" -c - choose complete method for resolving requires closure.\n"
msgstr ""
-#: urpm.pm:258
+#: po/placeholder.h:235 urpmq:81
#, c-format
-msgid "taking removable device as \"%s\""
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
msgstr ""
-#: urpm.pm:262
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
+#: 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
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
+#: po/placeholder.h:243
+msgid ""
+" -u - remove package if a better version is already installed.\n"
msgstr ""
-#: urpm.pm:1339
-#, c-format
-msgid "read synthesis file [%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"
+msgid "removing %s to upgrade to %s ..."
msgstr ""
-#: urpmi:98
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#: urpm.pm:1797 urpm.pm:1806
+msgid ", $otherPackage, "
msgstr ""
-#: urpmi:102
-msgid "Only superuser is allowed to install packages"
+#: urpm.pm:1797 urpm.pm:1806
+msgid "));"
msgstr ""
-#: urpmi:189
-#, c-format
-msgid "One of the following packages is needed to install %s:"
+#: urpm.pm:1802
+msgid "$p->{name}-$p->{version}-$p->{release}"
msgstr ""
-#: urpmi:301
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+#: urpm.pm:1812
+msgid "$prefix/$_"
+msgstr ""
+
+#: urpmi:48
+#, c-format
+msgid "urpmi version %s"
msgstr ""
#: urpmi.addmedia:30
diff --git a/po/uz.po b/po/uz.po
index 0770333c..64cbb572 100644
--- a/po/uz.po
+++ b/po/uz.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-02-28 11:10-5\n"
"Last-Translator: Sherzod Mamatkulov <mamatkulov@yahoo.com>\n"
"Language-Team: Uzbek <bobir_is@yahoo.com>\n"
@@ -23,27 +23,27 @@ msgid ""
"You requested installation of package $rpm\n"
msgstr ""
-#: _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 "Bo'ladimi?"
-#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:281
+#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:279
msgid "Ok"
msgstr "Bo'pti"
-#: _irpm:34 po/placeholder.h:116 urpmi:252 urpmi:282
+#: _irpm:34 po/placeholder.h:119 urpmi:252 urpmi:280
msgid "Cancel"
msgstr "Bekor qilish"
-#: _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 "JjNnYy"
-#: _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 "Hh"
-#: _irpm:42 po/placeholder.h:118 urpmi:258
+#: _irpm:42 po/placeholder.h:157 urpmi:258
msgid " (Y/n) "
msgstr " (H/y) "
@@ -146,120 +146,120 @@ msgstr ""
msgid "urpmi is not installed"
msgstr ""
-#: po/placeholder.h:29 urpm.pm:283
+#: po/placeholder.h:29
+#, c-format
+msgid "reading synthesis file [%s]"
+msgstr ""
+
+#: po/placeholder.h:30 urpm.pm:298
#, c-format
msgid "unable to write config file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:31
+#: po/placeholder.h:32
#, c-format
msgid "nothing to write in list file for \"%s\""
msgstr ""
-#: 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 ""
-#: po/placeholder.h:33
+#: po/placeholder.h:34
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr ""
-#: po/placeholder.h:34
+#: po/placeholder.h:35
#, c-format
msgid "nothing written in list file for \"%s\""
msgstr ""
-#: po/placeholder.h:35 urpm.pm:1951
-#, c-format
-msgid ""
-"removing %s to upgrade ...\n"
-" to %s since it will not upgrade correctly!"
-msgstr ""
-
-#: po/placeholder.h:39 urpm.pm:839
+#: po/placeholder.h:36 urpm.pm:845
#, c-format
msgid "read provides file [%s]"
msgstr ""
-#: po/placeholder.h:40
+#: po/placeholder.h:37 urpm.pm:1549
#, c-format
-msgid "trying to remove inexistant medium \"%s\""
+msgid "package %s is not found."
msgstr ""
-#: po/placeholder.h:41 urpm.pm:1692
+#: po/placeholder.h:38 urpm.pm:876
#, c-format
-msgid "package %s is not found."
+msgid "unable to write compss file [%s]"
msgstr ""
-#: po/placeholder.h:42
+#: po/placeholder.h:39 urpm.pm:819
#, c-format
-msgid "unable to copy source of [%s] from [%s]"
+msgid "unmounting %s"
msgstr ""
-#: po/placeholder.h:43 urpm.pm:870
+#: po/placeholder.h:40
#, c-format
-msgid "unable to write compss file [%s]"
+msgid "removing %d obsolete headers in cache"
msgstr ""
-#: po/placeholder.h:44 urpm.pm:813
+#: po/placeholder.h:41 urpm.pm:925 urpm.pm:1491
#, c-format
-msgid "unmounting %s"
+msgid "no hdlist file found for medium \"%s\""
msgstr ""
-#: po/placeholder.h:45
+#: po/placeholder.h:42 urpm.pm:160
#, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
msgstr ""
-#: po/placeholder.h:46 urpm.pm:919 urpm.pm:1634
+#: po/placeholder.h:43 urpm.pm:184
#, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
msgstr ""
-#: po/placeholder.h:47 urpm.pm:176
+#: po/placeholder.h:44 urpm.pm:191
#, c-format
msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
msgstr ""
-#: po/placeholder.h:48
+#: po/placeholder.h:45
msgid "keeping only files referenced in provides"
msgstr ""
-#: po/placeholder.h:49
+#: po/placeholder.h:46
#, c-format
msgid "unable to build synthesis file for medium \"%s\""
msgstr ""
-#: po/placeholder.h:50
+#: po/placeholder.h:47
#, c-format
msgid "found %d headers in cache"
msgstr ""
-#: po/placeholder.h:51 urpm.pm:836
+#: po/placeholder.h:48 urpm.pm:842
#, c-format
msgid "unable to read provides file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:53 urpm.pm:311
+#: po/placeholder.h:50
#, c-format
-msgid "medium \"%s\" already exists"
+msgid ""
+"removing %s to upgrade to %s ...\n"
+" since it will not be updated otherwise"
msgstr ""
-#: po/placeholder.h:54 urpm.pm:295
+#: po/placeholder.h:54 urpm.pm:326
#, c-format
-msgid "write config file [%s]"
+msgid "medium \"%s\" already exists"
msgstr ""
#: po/placeholder.h:55
@@ -267,293 +267,386 @@ msgstr ""
msgid "unable to write list file of \"%s\""
msgstr ""
-#: po/placeholder.h:56 urpm.pm:1817
+#: po/placeholder.h:56 urpm.pm:310
#, c-format
-msgid "retrieving [%s]"
-msgstr ""
-
-#: po/placeholder.h:57 urpm.pm:1819
-#, c-format
-msgid "wget of [%s] failed"
+msgid "write config file [%s]"
msgstr ""
-#: po/placeholder.h:58 urpm.pm:1101
+#: po/placeholder.h:57 urpm.pm:1107
#, fuzzy, c-format
msgid "no package named %s"
msgstr "%s nomli paket mavjud emas\n"
-#: po/placeholder.h:59 urpm.pm:848
+#: po/placeholder.h:58 urpm.pm:854
#, c-format
msgid "unable to read compss file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:61
+#: po/placeholder.h:60
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr ""
-#: po/placeholder.h:62
+#: po/placeholder.h:61
msgid "computing dependencies"
msgstr ""
-#: po/placeholder.h:63 urpm.pm:868
+#: po/placeholder.h:62
+#, c-format
+msgid "retrieve of [%s] failed"
+msgstr ""
+
+#: po/placeholder.h:63 urpm.pm:874
#, c-format
msgid "write provides file [%s]"
msgstr ""
-#: po/placeholder.h:64 urpm.pm:803
+#: po/placeholder.h:64 urpm.pm:809
#, fuzzy, c-format
msgid "mounting %s"
msgstr "%s o'rnatilmoqda\n"
-#: 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 "
"medium"
msgstr ""
-#: po/placeholder.h:66 urpm.pm:148
-#, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
-msgstr ""
-
-#: po/placeholder.h:67
+#: po/placeholder.h:66
#, c-format
msgid "reading hdlist file [%s]"
msgstr ""
-#: po/placeholder.h:68 urpm.pm:873
+#: po/placeholder.h:67 urpm.pm:879
#, c-format
msgid "write compss file [%s]"
msgstr ""
-#: po/placeholder.h:69 urpm.pm:827
+#: po/placeholder.h:68 urpm.pm:833
#, c-format
msgid "read depslist file [%s]"
msgstr ""
-#: po/placeholder.h:70
+#: po/placeholder.h:69 urpm.pm:103
+msgid "curl failed\n"
+msgstr ""
+
+#: po/placeholder.h:70 urpm.pm:281 urpm.pm:284
#, c-format
-msgid "trying to select inexistant medium \"%s\""
+msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr ""
-#: po/placeholder.h:71 urpm.pm:1812
+#: po/placeholder.h:71 urpm.pm:1668
#, c-format
msgid "malformed input: [%s]"
msgstr ""
-#: 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"
+msgid "there are multiple packages with the same rpm filename \"%s\""
msgstr ""
-#: 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 ""
-#: po/placeholder.h:77 urpm.pm:865
+#: po/placeholder.h:74 urpm.pm:871
#, c-format
msgid "unable to write provides file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:79 urpm.pm:1005
-msgid "unable to register rpm file"
+#: po/placeholder.h:76 urpm.pm:1215
+msgid "unable to find all synthesis file, using parsehdlist server"
msgstr ""
-#: po/placeholder.h:80 urpm.pm:1362
-msgid "unable to find all synthesis file, using parsehdlist server"
+#: po/placeholder.h:77 urpm.pm:1011
+msgid "unable to register rpm file"
msgstr ""
-#: po/placeholder.h:81 urpm.pm:241
+#: po/placeholder.h:78 urpm.pm:256
#, c-format
msgid "unable to inspect list file for \"%s\", medium ignored"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:83
+#: po/placeholder.h:81
#, c-format
msgid "copy of [%s] failed"
msgstr ""
-#: 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 ""
+
+#: 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 ""
-#: po/placeholder.h:85 urpm.pm:824
+#: po/placeholder.h:84 urpm.pm:1192
#, c-format
-msgid "unable to read depslist file [%s]"
+msgid "read synthesis file [%s]"
msgstr ""
-#: po/placeholder.h:86
-msgid "removable medium not selected"
+#: po/placeholder.h:85 urpm.pm:830
+#, c-format
+msgid "unable to read depslist file [%s]"
msgstr ""
-#: po/placeholder.h:87 urpm.pm:851
+#: po/placeholder.h:86 urpm.pm:857
#, c-format
msgid "read compss file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:89
+#: po/placeholder.h:88
#, c-format
msgid "building hdlist [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:91 urpm.pm:1009
+#: po/placeholder.h:90 urpm.pm:1015
msgid "error registering local packages"
msgstr ""
-#: po/placeholder.h:92 urpm.pm:1762
+#: po/placeholder.h:91 urpm.pm:273
#, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "taking removable device as \"%s\""
msgstr ""
-#: po/placeholder.h:93
+#: po/placeholder.h:92 urpm.pm:1619
#, c-format
-msgid "unable to build hdlist: %s"
+msgid "incoherent medium \"%s\" marked removable but not really"
msgstr ""
-#: po/placeholder.h:94 urpm.pm:1000
+#: po/placeholder.h:93
#, c-format
-msgid "invalid rpm file name [%s]"
+msgid "unable to build hdlist: %s"
msgstr ""
-#: po/placeholder.h:95 urpm.pm:1736 urpm.pm:1739 urpm.pm:1758
+#: po/placeholder.h:94 urpm.pm:1593 urpm.pm:1596 urpm.pm:1615
#, c-format
msgid "medium \"%s\" is not selected"
msgstr ""
-#: po/placeholder.h:96 urpm.pm:207
+#: po/placeholder.h:95 urpm.pm:1006
#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "invalid rpm file name [%s]"
msgstr ""
-#: po/placeholder.h:97 urpm.pm:863
+#: po/placeholder.h:96 urpm.pm:1175
#, c-format
-msgid "write depslist file [%s]"
+msgid "unknown data associated with %s"
msgstr ""
-#: po/placeholder.h:98 urpm.pm:1322
+#: po/placeholder.h:97 urpm.pm:222
#, c-format
-msgid "unknown data associated with %s"
+msgid "trying to bypass existing medium \"%s\", avoiding"
msgstr ""
-#: po/placeholder.h:99
+#: po/placeholder.h:98 urpm.pm:869
#, c-format
-msgid "source of [%s] not found as [%s]"
+msgid "write depslist file [%s]"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: po/placeholder.h:102
+#: po/placeholder.h:101 urpm.pm:1007
#, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
+msgid "unable to access rpm file [%s]"
msgstr ""
-#: po/placeholder.h:103 urpm.pm:1001
+#: po/placeholder.h:102 urpm.pm:866
#, c-format
-msgid "unable to access rpm file [%s]"
+msgid "unable to write depslist file [%s]"
msgstr ""
-#: po/placeholder.h:104 urpm.pm:860
+#: po/placeholder.h:103
#, c-format
-msgid "unable to write depslist file [%s]"
+msgid ""
+"removing %s to upgrade to %s ...\n"
+" since it will not upgrade correctly!"
msgstr ""
-#: po/placeholder.h:105 urpm.pm:327 urpm.pm:1773
+#: po/placeholder.h:107 urpm.pm:342 urpm.pm:1630
#, c-format
msgid "unable to access medium \"%s\""
msgstr ""
-#: po/placeholder.h:106 urpm.pm:988
+#: po/placeholder.h:108 urpm.pm:994
#, c-format
msgid "relocated %s entries in depslist"
msgstr ""
-#: 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\""
+msgid "trying to select inexistent medium \"%s\""
+msgstr ""
+
+#: po/placeholder.h:110 urpm.pm:97
+msgid "wget failed\n"
msgstr ""
-#: 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]"
+msgid "unable to parse correctly [%s] on value \"%s\""
msgstr ""
-#: po/placeholder.h:109 urpm.pm:1104
+#: po/placeholder.h:112 urpm.pm:1110
#, fuzzy, c-format
msgid "The following packages contain %s: %s"
msgstr "Quyidagi paketlarda %s bor: %s\n"
-#: 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\""
+msgid "no rpm files found from [%s]"
msgstr ""
-#: po/placeholder.h:111 urpm.pm:1920
+#: po/placeholder.h:114 urpm.pm:1772
#, c-format
msgid "selecting %s using obsoletes"
msgstr ""
-#: po/placeholder.h:112 urpm.pm:2031
+#: po/placeholder.h:115 urpm.pm:1888
#, c-format
msgid "selecting %s by selection on files"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:114 urpmi:308 urpmi:315 urpmi:328 urpmi:339 urpmi:352
+#: po/placeholder.h:120
+msgid " --help - print this help message.\n"
+msgstr ""
+
+#: po/placeholder.h:121 urpmi:361
+msgid "everything already installed"
+msgstr "hammasi allaqachon o'rnatilgan"
+
+#: po/placeholder.h:122 urpmi:98
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr ""
+
+#: po/placeholder.h:123 urpmi:194
+msgid "One of the following packages is needed:"
+msgstr "Quyidagi paketlardan biri kerak:"
+
+#: 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 "O'rnatish o'xshamadi"
-#: po/placeholder.h:115 urpmi:279
-msgid "Press enter when it's done..."
-msgstr "Tugagandan so'ng enterni bosing..."
+#: 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 "Uzr o'xshamadi, boshqasini tanlang\n"
+#: po/placeholder.h:134
+msgid " --X - use X interface.\n"
+msgstr ""
-#: 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 ""
+"Bog'liqliklarni ta'minlash uchun quyidagi paketlar ham o'rnatiladi (%d MB)"
+
+#: po/placeholder.h:136 urpmi:320 urpmi:344
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Bog'liqliklarni tekshirmasdan o'rnatib ko'raymi? (h/Y) "
+
+#: 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
+msgid " -q - quiet mode.\n"
+msgstr ""
+
+#: po/placeholder.h:144 urpmi:202
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "Nimani tanlaysiz? (1-%d) "
+
+#: po/placeholder.h:145
+msgid " --wget - use wget to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:146
#, c-format
msgid ""
"urpmi version %s\n"
@@ -561,80 +654,74 @@ msgid ""
"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 ""
-#: po/placeholder.h:142 urpmi:362
-msgid "everything already installed"
-msgstr "hammasi allaqachon o'rnatilgan"
+#: po/placeholder.h:152 urpmi:328 urpmi:352
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Kuchliroq o'rnatishga harakat qilaymi (--majburlab)? (h/Y) "
-#: po/placeholder.h:143 urpmi:247
-#, c-format
+#: po/placeholder.h:154
msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+" --force - force invocation even if some packages do not exist.\n"
msgstr ""
-"Bog'liqliklarni ta'minlash uchun quyidagi paketlar ham o'rnatiladi (%d MB)"
-#: po/placeholder.h:144 urpmi:296
-#, c-format
-msgid "installing %s\n"
-msgstr "%s o'rnatilmoqda\n"
+#: po/placeholder.h:155 urpmi:205
+msgid "Sorry, bad choice, try again\n"
+msgstr "Uzr o'xshamadi, boshqasini tanlang\n"
-#: po/placeholder.h:145 urpmi:198
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Nimani tanlaysiz? (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 "Bog'liqliklarni tekshirmasdan o'rnatib ko'raymi? (h/Y) "
+#: 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 "Quyidagi paketlardan biri kerak:"
+#: 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 "%s o'rnatilmoqda\n"
-#: po/placeholder.h:148 urpmi:149
+#: po/placeholder.h:161 urpmi:152
msgid "Only superuser is allowed to install local packages"
msgstr "Faqat administrator mahalliy paketlarni o'rnatishi mumkin"
-#: po/placeholder.h:149 urpmi:278
+#: po/placeholder.h:162 urpmi:276
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Iltimos %2$s nomli %1$s ni kiriting"
-#: 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 ""
-#: po/placeholder.h:151 urpmi:329 urpmi:353
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Kuchliroq o'rnatishga harakat qilaymi (--majburlab)? (h/Y) "
+#: po/placeholder.h:165 urpmi:102
+#, fuzzy
+msgid "Only superuser is allowed to install packages"
+msgstr "Faqat administrator mahalliy paketlarni o'rnatishi mumkin"
+
+#: po/placeholder.h:166 urpmi:193
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Quyidagi paketlardan biri kerak:"
+
+#: po/placeholder.h:167 urpmi:277
+msgid "Press Enter when it's done..."
+msgstr "Tugagandan so'ng enterni bosing..."
-#: po/placeholder.h:155 urpmi.addmedia:46
+#: po/placeholder.h:168 urpmi.addmedia:46
#, c-format
msgid ""
"%s\n"
"`with' missing for ftp media\n"
msgstr ""
-#: po/placeholder.h:159
+#: po/placeholder.h:172
msgid ""
"usage: urpmi.addmedia [--update] <name> <url>\n"
"where <url> is one of\n"
@@ -646,31 +733,31 @@ msgid ""
" removable_<device>://<path>\n"
msgstr ""
-#: po/placeholder.h:168 urpmi.addmedia:57
+#: po/placeholder.h:181 urpmi.addmedia:57
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr ""
-#: po/placeholder.h:169 urpmi.addmedia:58
+#: po/placeholder.h:182 urpmi.addmedia:58
#, c-format
msgid "unable to update medium \"%s\"\n"
msgstr ""
-#: po/placeholder.h:170 urpmi.addmedia:42
+#: po/placeholder.h:183 urpmi.addmedia:42
#, c-format
msgid ""
"%s\n"
"device `%s' do not exist\n"
msgstr ""
-#: po/placeholder.h:174 urpmi.addmedia:44
+#: po/placeholder.h:187 urpmi.addmedia:44
#, c-format
msgid ""
"%s\n"
"<relative path of hdlist> missing\n"
msgstr ""
-#: po/placeholder.h:178
+#: po/placeholder.h:191
#, c-format
msgid ""
"usage: urpmi.update [-a] <name> ...\n"
@@ -682,29 +769,29 @@ msgid ""
"unknown options '%s'\n"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:188 urpmi.update:53
+#: po/placeholder.h:201 urpmi.update:53
#, c-format
msgid ""
"the entry to update is missing\n"
"(one of %s)\n"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:193 urpmi.removemedia:46
+#: po/placeholder.h:206 urpmi.removemedia:46
#, c-format
msgid ""
"the entry to remove is missing\n"
"(one of %s)\n"
msgstr ""
-#: po/placeholder.h:197
+#: po/placeholder.h:210
#, c-format
msgid ""
"usage: urpmi.removemedia [-a] <name> ...\n"
@@ -714,23 +801,38 @@ msgid ""
"unknown options '%s'\n"
msgstr ""
-#: po/placeholder.h:204 urpmq:85
+#: po/placeholder.h:217
+msgid " -h - print this help message.\n"
+msgstr ""
+
+#: po/placeholder.h:218 urpmq:130
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+
+#: po/placeholder.h:219
+msgid " -g - print groups too with name.\n"
+msgstr ""
+
+#: po/placeholder.h:220 urpmq:84
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr ""
-#: po/placeholder.h:206 urpmq:82
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#: po/placeholder.h:221
+msgid " names or rpm files given on command line are queried.\n"
msgstr ""
-#: po/placeholder.h:207 urpmq:131
-msgid ""
-"some package have to be removed for being upgraded, this is not supported "
-"yet\n"
+#: po/placeholder.h:223
+msgid " -r - print version and release too with name.\n"
msgstr ""
-#: po/placeholder.h:208
+#: po/placeholder.h:224
+msgid " -f - print version, release and arch with name.\n"
+msgstr ""
+
+#: po/placeholder.h:225
#, c-format
msgid ""
"urpmq version %s\n"
@@ -738,77 +840,68 @@ msgid ""
"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 package do not exist.\n"
-" names or rpm files given on command line are queried.\n"
msgstr ""
-#: urpm.pm:257
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:231
+msgid " -d - extend query to package dependencies.\n"
msgstr ""
-#: urpm.pm:258
-#, c-format
-msgid "taking removable device as \"%s\""
+#: po/placeholder.h:232
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
msgstr ""
-#: urpm.pm:262
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
+#: po/placeholder.h:233
+msgid ""
+" -c - choose complete method for resolving requires closure.\n"
msgstr ""
-#: urpm.pm:266 urpm.pm:269
+#: po/placeholder.h:235 urpmq:81
#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
msgstr ""
-#: urpm.pm:1339
-#, c-format
-msgid "read synthesis file [%s]"
+#: po/placeholder.h:236
+msgid ""
+" --headers - extract headers for package listed from urpmi db to\n"
+" stdout (root only).\n"
msgstr ""
-#: urpmi:49
-#, c-format
-msgid "urpmi version %s"
+#: po/placeholder.h:243
+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 ""
-#: urpmi:98
+#: urpm.pm:1796 urpm.pm:1805
#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgid "removing %s to upgrade to %s ..."
msgstr ""
-#: urpmi:102
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr "Faqat administrator mahalliy paketlarni o'rnatishi mumkin"
+#: urpm.pm:1797 urpm.pm:1806
+msgid ", $otherPackage, "
+msgstr ", $otherPackage, "
-#: urpmi:189
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Quyidagi paketlardan biri kerak:"
+#: urpm.pm:1797 urpm.pm:1806
+msgid "));"
+msgstr "));"
-#: urpmi:301
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+#: urpm.pm:1802
+msgid "$p->{name}-$p->{version}-$p->{release}"
+msgstr "$p->{name}-$p->{version}-$p->{release}"
+
+#: urpm.pm:1812
+msgid "$prefix/$_"
+msgstr "$prefix/$_"
+
+#: urpmi:48
+#, c-format
+msgid "urpmi version %s"
msgstr ""
#: urpmi.addmedia:30
@@ -841,9 +934,6 @@ msgstr ", $_);"
msgid "urpmq version %s"
msgstr ""
-#~ msgid "));"
-#~ msgstr "));"
-
#~ msgid "), $_);"
#~ msgstr "), $_);"
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 "), $_);"
diff --git a/po/wa.po b/po/wa.po
index 42b793cf..d98312a1 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -6,7 +6,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: 1999-08-25 11:07+0200\n"
"Last-Translator: Lorint Hendschel <LorintHendschel@skynet.be>\n"
"Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
@@ -26,27 +26,27 @@ msgstr ""
"Astalaedje �tomatike des pacaedjes...\n"
"Vos avoz dmand� l' astalaedje do pacaedje $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 "Totafwait est-i comuf�t?"
-#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:281
+#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:279
msgid "Ok"
msgstr "I va"
-#: _irpm:34 po/placeholder.h:116 urpmi:252 urpmi:282
+#: _irpm:34 po/placeholder.h:119 urpmi:252 urpmi:280
msgid "Cancel"
msgstr "Rinonc�"
-#: _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 "Nn"
-#: _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 "OoAaYyWw"
-#: _irpm:42 po/placeholder.h:118 urpmi:258
+#: _irpm:42 po/placeholder.h:157 urpmi:258
msgid " (Y/n) "
msgstr " (O/n) "
@@ -151,179 +151,181 @@ msgstr "say�z urpmf --help po vey les �t�s tch�zes"
msgid "urpmi is not installed"
msgstr "urpmi n' est n�n astal�"
-#: po/placeholder.h:29 urpm.pm:283
+#: po/placeholder.h:29
+#, fuzzy, c-format
+msgid "reading synthesis file [%s]"
+msgstr "dji l� l'�fitch� depslist [%s]"
+
+#: po/placeholder.h:30 urpm.pm:298
#, c-format
msgid "unable to write config file [%s]"
msgstr "dji n'�sai scrire li fitch� d'�apontiaedje [%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 ""
-"dji n'�pout eploy� l'�no �%s� pol sopoirt sin no, ca ci no la est ddja eploy�"
-#: po/placeholder.h:31
+#: po/placeholder.h:32
#, c-format
msgid "nothing to write in list file for \"%s\""
msgstr "r�n po scrire el fitch� dj�v�ye di �%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 ""
"dji n'�sai trover li fitch� di dj�v�ye di �%s�, dji passe hute do sopoirt"
-#: po/placeholder.h:33
+#: po/placeholder.h:34
#, fuzzy, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "dji n'�sai scrire li fitch� dj�v�ye di �%s�"
-#: po/placeholder.h:34
+#: po/placeholder.h:35
#, c-format
msgid "nothing written in list file for \"%s\""
msgstr "r�n n'�a st� scrit el fitch� dj�v�ye po �%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 ""
-"dji bodje %s pol metaedje a djo�...\n"
-" vi� %s ca i n'�pout esse metou a djo� comuf�t!"
-
-#: po/placeholder.h:39 urpm.pm:839
+#: po/placeholder.h:36 urpm.pm:845
#, c-format
msgid "read provides file [%s]"
msgstr "dji l� l'�fitch� provides [%s]"
-#: po/placeholder.h:40
-#, c-format
-msgid "trying to remove inexistant medium \"%s\""
-msgstr "dji saye di bodj� l'�sopoirt �%s� ki n' egzisteye n�n"
-
-#: po/placeholder.h:41 urpm.pm:1692
+#: po/placeholder.h:37 urpm.pm:1549
#, c-format
msgid "package %s is not found."
msgstr "li pacaedje %s n' a n�n st� trov�."
-#: po/placeholder.h:42
-#, c-format
-msgid "unable to copy source of [%s] from [%s]"
-msgstr "dji n'�sai copy� l'�so�rdant di [%s] fo� di [%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 "dji n'�sai scrire li fitch� compss [%s]"
-#: po/placeholder.h:44 urpm.pm:813
+#: po/placeholder.h:39 urpm.pm:819
#, c-format
msgid "unmounting %s"
msgstr "dismontant %s"
-#: po/placeholder.h:45
+#: po/placeholder.h:40
#, c-format
msgid "removing %d obsolete headers in cache"
msgstr "dj� bodje %d v�y�s tiest�res del muchete"
-#: 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 "nou fitch� hdlist di trov� pol sopoirt �%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 ""
+"li sopoirt �%s� saye d'�eploy� on fitch� hdlist ddja eploy�, dji passe hute "
+"do sopoirt"
+
+#: po/placeholder.h:43 urpm.pm:184
+#, c-format
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"dji n'�pout eploy� l'�no �%s� pol sopoirt sin no, ca ci no la est ddja eploy�"
+
+#: po/placeholder.h:44 urpm.pm:191
#, c-format
msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
msgstr ""
-#: po/placeholder.h:48
+#: po/placeholder.h:45
#, fuzzy
msgid "keeping only files referenced in provides"
msgstr "dji w�de ki les fitch�s provides"
-#: po/placeholder.h:49
+#: po/placeholder.h:46
#, fuzzy, c-format
msgid "unable to build synthesis file for medium \"%s\""
msgstr "dji n'�sai lere li fitch� rpm [%s] fo� do sopoirt �%s�"
-#: po/placeholder.h:50
+#: po/placeholder.h:47
#, c-format
msgid "found %d headers in cache"
msgstr "%d tiest�res trov�yes el muchete"
-#: po/placeholder.h:51 urpm.pm:836
+#: po/placeholder.h:48 urpm.pm:842
#, c-format
msgid "unable to read provides file [%s]"
msgstr "dji n'�sai lere li fitch� provides [%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 ""
"dj'�evite di tchwezi %s ca si pacaedje di loc�le/lingaedje n'�a n�n co st� "
"tchwezi"
-#: 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 ""
+"dji bodje %s pol metaedje a djo�...\n"
+" vi� %s ca �trumint i n'�pout n�n esse metou a djo�"
+
+#: po/placeholder.h:54 urpm.pm:326
#, c-format
msgid "medium \"%s\" already exists"
msgstr "li sopoirt �%s� egzisteye ddja"
-#: po/placeholder.h:54 urpm.pm:295
-#, c-format
-msgid "write config file [%s]"
-msgstr "dji scri l'�fitch� d'�apontiaedje [%s]"
-
#: po/placeholder.h:55
#, c-format
msgid "unable to write list file of \"%s\""
msgstr "dji n'�sai scrire li fitch� dj�v�ye di �%s�"
-#: po/placeholder.h:56 urpm.pm:1817
-#, c-format
-msgid "retrieving [%s]"
-msgstr "dj'�aberwete [%s]"
-
-#: po/placeholder.h:57 urpm.pm:1819
+#: po/placeholder.h:56 urpm.pm:310
#, c-format
-msgid "wget of [%s] failed"
-msgstr "l'�aberwetaedje di [%s] pa wget a fwait berwete"
+msgid "write config file [%s]"
+msgstr "dji scri l'�fitch� d'�apontiaedje [%s]"
-#: po/placeholder.h:58 urpm.pm:1101
+#: po/placeholder.h:57 urpm.pm:1107
#, c-format
msgid "no package named %s"
msgstr "nou pacaedje lom� %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 "dji n'�sai lere li fitch� compss [%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 "dji n'�sai trover li fitch� hdlist di �%s�, dji passe hute do sopoirt"
-#: po/placeholder.h:61
+#: po/placeholder.h:60
#, fuzzy, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "nou fitch� hdlist di trov� pol sopoirt �%s�"
-#: po/placeholder.h:62
+#: po/placeholder.h:61
msgid "computing dependencies"
msgstr "dji carcule les aloyances"
-#: po/placeholder.h:63 urpm.pm:868
+#: po/placeholder.h:62
+#, fuzzy, c-format
+msgid "retrieve of [%s] failed"
+msgstr "l'�aberwetaedje di [%s] pa wget a fwait berwete"
+
+#: po/placeholder.h:63 urpm.pm:874
#, c-format
msgid "write provides file [%s]"
msgstr "dji scri l'�fitch� provides [%s]"
-#: po/placeholder.h:64 urpm.pm:803
+#: po/placeholder.h:64 urpm.pm:809
#, c-format
msgid "mounting %s"
msgstr "montant %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,129 +334,139 @@ msgstr ""
"dji n'�sai m'�ocuper do sopoirt �%s� ca l'�fitch� dj�v�ye est ddja eploy� pa-"
"z on �te sopoirt"
-#: po/placeholder.h:66 urpm.pm:148
-#, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
-msgstr ""
-"li sopoirt �%s� saye d'�eploy� ene dj�v�ye ddja eployeye, dji passe hute do "
-"sopoirt"
-
-#: po/placeholder.h:67
+#: po/placeholder.h:66
#, c-format
msgid "reading hdlist file [%s]"
msgstr "dji l� l'�fitch� hdlist [%s]"
-#: po/placeholder.h:68 urpm.pm:873
+#: po/placeholder.h:67 urpm.pm:879
#, c-format
msgid "write compss file [%s]"
msgstr "dji scri l'�fitch� compss [%s]"
-#: po/placeholder.h:69 urpm.pm:827
+#: po/placeholder.h:68 urpm.pm:833
#, c-format
msgid "read depslist file [%s]"
msgstr "dji l� l'�fitch� depslist [%s]"
-#: po/placeholder.h:70
-#, c-format
-msgid "trying to select inexistant medium \"%s\""
-msgstr "dji saye di tchwezi l'�sopoirt �%s� ki n' egzisteye n�n"
+#: 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 "dji n' pout radjouter l' sopoirt �%s�\n"
-#: po/placeholder.h:71 urpm.pm:1812
+#: po/placeholder.h:71 urpm.pm:1668
#, c-format
msgid "malformed input: [%s]"
msgstr ""
-#: 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 ""
-"li sopoirt �%s� saye d'�eploy� on fitch� hdlist ddja eploy�, dji passe hute "
-"do sopoirt"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "i gn a pus d' on pacaedje avou l' minme no d'�fitch� 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 ""
-"dji bodje %s pol metaedje a djo�...\n"
-" vi� %s ca �trumint i n'�pout n�n esse metou a djo�"
+"li sopoirt �%s� saye d'�eploy� ene dj�v�ye ddja eployeye, dji passe hute do "
+"sopoirt"
-#: po/placeholder.h:77 urpm.pm:865
+#: po/placeholder.h:74 urpm.pm:871
#, c-format
msgid "unable to write provides file [%s]"
msgstr "dji n'�sai scrire li fitch� provides [%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 "dji n'�sai aveur li fitch� hdlist di �%s�, dji passe hute do sopoirt"
-#: po/placeholder.h:79 urpm.pm:1005
+#: po/placeholder.h:76 urpm.pm:1215
+#, fuzzy
+msgid "unable to find all synthesis file, using parsehdlist server"
+msgstr "dji n'�sai lere li fitch� rpm [%s] fo� do sopoirt �%s�"
+
+#: po/placeholder.h:77 urpm.pm:1011
#, fuzzy
msgid "unable to register rpm file"
msgstr "dji n'�sai lere li fitch� depslist [%s]"
-#: po/placeholder.h:80 urpm.pm:1362
-msgid "unable to find all synthesis file, using parsehdlist server"
-msgstr ""
-
-#: po/placeholder.h:81 urpm.pm:241
+#: po/placeholder.h:78 urpm.pm:256
#, fuzzy, c-format
msgid "unable to inspect list file for \"%s\", medium ignored"
msgstr ""
"dji n'�sai aveur li fitch� di dj�v�ye di �%s�, dji passe hute do sopoirt"
-#: 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
#, fuzzy, c-format
msgid "incoherent list file for \"%s\", medium ignored"
msgstr ""
"dji n'�sai aveur li fitch� di dj�v�ye di �%s�, dji passe hute do sopoirt"
-#: po/placeholder.h:83
+#: po/placeholder.h:81
#, c-format
msgid "copy of [%s] failed"
msgstr "li copeye di [%s] a fwait berwete"
-#: 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 "dji saye di bodj� l'�sopoirt �%s� ki n' egzisteye n�n"
+
+#: po/placeholder.h:83 urpm.pm:913 urpm.pm:1191 urpm.pm:1473 urpm.pm:1480
#, fuzzy, c-format
msgid "unable to parse correctly [%s]"
msgstr "dji n'�sai scrire li fitch� compss [%s]"
-#: po/placeholder.h:85 urpm.pm:824
+#: po/placeholder.h:84 urpm.pm:1192
+#, fuzzy, c-format
+msgid "read synthesis file [%s]"
+msgstr "dji l� l'�fitch� depslist [%s]"
+
+#: po/placeholder.h:85 urpm.pm:830
#, c-format
msgid "unable to read depslist file [%s]"
msgstr "dji n'�sai lere li fitch� depslist [%s]"
-#: po/placeholder.h:86
-msgid "removable medium not selected"
-msgstr "bodj�ve sopoirt n�n tch�zi"
-
-#: po/placeholder.h:87 urpm.pm:851
+#: po/placeholder.h:86 urpm.pm:857
#, c-format
msgid "read compss file [%s]"
msgstr "dji l� l'�fitch� compss [%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 ""
-#: po/placeholder.h:89
+#: po/placeholder.h:88
#, c-format
msgid "building hdlist [%s]"
msgstr "dji fwai l'�fitch� 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 "dji n'�sai lere li fitch� rpm [%s] fo� do sopoirt �%s�"
-#: po/placeholder.h:91 urpm.pm:1009
+#: po/placeholder.h:90 urpm.pm:1015
msgid "error registering local packages"
msgstr ""
-#: 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 ""
@@ -464,224 +476,274 @@ msgstr ""
msgid "unable to build hdlist: %s"
msgstr "dji n'�sai f� on fitch� 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 "li sopoirt �%s� n'�a n�n st� tch�zi"
+
+#: po/placeholder.h:95 urpm.pm:1006
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "no d'�fitch� rpm n�n val�be [%s]"
-#: 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 "li sopoirt �%s� n'�a n�n st� tch�zi"
+msgid "unknown data associated with %s"
+msgstr ""
-#: 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 "dji saye di passer hute do sopoirt �%s�"
-#: po/placeholder.h:97 urpm.pm:863
+#: po/placeholder.h:98 urpm.pm:869
#, c-format
msgid "write depslist file [%s]"
msgstr "dji scri l'�fitch� depslist [%s]"
-#: po/placeholder.h:98 urpm.pm:1322
-#, c-format
-msgid "unknown data associated with %s"
-msgstr ""
-
-#: po/placeholder.h:99
-#, c-format
-msgid "source of [%s] not found as [%s]"
-msgstr "so�rdant di [%s] n�n trov� come [%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 ""
"dji n'�sai aveur li fitch� di dj�v�ye di �%s�, dji passe hute do sopoirt"
-#: 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 ""
-#: po/placeholder.h:102
-#, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
-msgstr ""
-"l'�aberwetaedje di [%s] a fwait berwete (motoit ki wget est n�n so "
-"l'��ndjole?)"
-
-#: po/placeholder.h:103 urpm.pm:1001
+#: po/placeholder.h:101 urpm.pm:1007
#, fuzzy, c-format
msgid "unable to access rpm file [%s]"
msgstr "dji n'�sai lere li fitch� depslist [%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 "dji n'�sai scrire li fitch� depslist [%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 ""
+"dji bodje %s pol metaedje a djo�...\n"
+" vi� %s ca i n'�pout esse metou a djo� comuf�t!"
+
+#: po/placeholder.h:107 urpm.pm:342 urpm.pm:1630
#, fuzzy, c-format
msgid "unable to access medium \"%s\""
msgstr "dji n' pout mete a djo� l' sopoirt �%s�\n"
-#: po/placeholder.h:106 urpm.pm:988
+#: po/placeholder.h:108 urpm.pm:994
#, c-format
msgid "relocated %s entries in depslist"
msgstr ""
-#: po/placeholder.h:107 urpm.pm:914 urpm.pm:1629 urpm.pm:1680
+#: po/placeholder.h:109
+#, c-format
+msgid "trying to select inexistent medium \"%s\""
+msgstr "dji saye di tchwezi l'�sopoirt �%s� ki n' egzisteye n�n"
+
+#: po/placeholder.h:110 urpm.pm:97
+#, fuzzy
+msgid "wget failed\n"
+msgstr "l'�aberwetaedje di [%s] pa wget a fwait berwete"
+
+#: po/placeholder.h:111 urpm.pm:920 urpm.pm:1486 urpm.pm:1537
#, fuzzy, c-format
msgid "unable to parse correctly [%s] on value \"%s\""
msgstr "dji n'�sai lere li fitch� rpm [%s] fo� do sopoirt �%s�"
-#: po/placeholder.h:108
-#, c-format
-msgid "no rpm files found from [%s]"
-msgstr "nou fitch� rpm di trov� fo� di [%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 "Les pacaedjes ki sh�v�t ont � dvins %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 "i gn a pus d' on pacaedje avou l' minme no d'�fitch� rpm �%s�"
+msgid "no rpm files found from [%s]"
+msgstr "nou fitch� rpm di trov� fo� di [%s]"
-#: po/placeholder.h:111 urpm.pm:1920
+#: po/placeholder.h:114 urpm.pm:1772
#, c-format
msgid "selecting %s using obsoletes"
msgstr ""
-#: po/placeholder.h:112 urpm.pm:2031
+#: po/placeholder.h:115 urpm.pm:1888
#, c-format
msgid "selecting %s by selection on files"
msgstr ""
-#: 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
#, fuzzy, c-format
msgid "unable to determine medium of this hdlist file [%s]"
msgstr "dji n'�sai scrire li fitch� depslist [%s]"
-#: po/placeholder.h:114 urpmi:308 urpmi:315 urpmi:328 urpmi:339 urpmi:352
+#: po/placeholder.h:120
+msgid " --help - print this help message.\n"
+msgstr ""
+
+#: po/placeholder.h:121 urpmi:361
+msgid "everything already installed"
+msgstr "tot a ddja st� astal�"
+
+#: po/placeholder.h:122 urpmi:98
+#, fuzzy, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: tch�ze �-%s� n�n cnoxhowe, louk�z cmint l'�eploy� avou --help\n"
+
+#: po/placeholder.h:123 urpmi:194
+msgid "One of the following packages is needed:"
+msgstr "I gn a mez�jhe d' onk des pacaedjes ki sh�v�t:"
+
+#: 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 "L' astal�cion a fwait berwete"
-#: po/placeholder.h:115 urpmi:279
-msgid "Press enter when it's done..."
-msgstr "Tapez so �enter� cwand c' est fwait..."
+#: 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 "M�va tch�ze, say�z co ene feye\n"
+#: po/placeholder.h:134
+msgid " --X - use X interface.\n"
+msgstr ""
-#: 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 ""
+"Po satisfy� les aloyaedjes, les pacaedjes aloy�s ki sh�v�t vont esse astal�s "
+"(%d Mo)"
+
+#: po/placeholder.h:136 urpmi:320 urpmi:344
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Say� d' astaler sin verify� les aloyaedjes? (o/N) "
+
+#: 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
+msgid " -q - quiet mode.\n"
+msgstr ""
+
+#: po/placeholder.h:144 urpmi:202
#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "K� tchwezixhoz-ve? (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 ""
-"urpmi modeye %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
"�ouci est on libe programe �t pout esse cossem� so les termes del licince "
-"GPL.\n"
-"po s'�� sierv�:\n"
-" --help - mostere ci messaedje d'�aidance.\n"
-" --update - eploy� kel sopoirt di metaedje a djo�.\n"
-" --auto - tchwezi �tomaticmint li bon pacaedje dvins les "
-"tch�zes.\n"
-" --auto-select - tchwezi �tomaticmint les pacaedjes pol metaedje a djo� "
-"do sistinme.\n"
-" --force - foirci, minme si des pacaedjes k' i gn a n' egzist�t "
-"n�n.\n"
-" --X - eploy� l' eterface X11.\n"
-" --best-output - tchwezi li meyeuse eterface sorlon l' evironmint: X ou "
-"m�de tecse.\n"
-" -a - eploy� --all-matches pol roye di comande.\n"
-" -m - tchwezi li rseraedje minimom des aloyances (pr�metou).\n"
-" -M - tchwezi li rseraedje macsimom des aloyances.\n"
-" -c - tchwezi li metode complete pol risolvaedje do rseraedje "
-"des aloyances.\n"
-" -p - f� des rcweraedjes �z�s aloyances po trover on "
-"pacaedje.\n"
-" -q - m�de taijheu.\n"
-" -v - m�de badjawe.\n"
-" les nos ou fitch�s rpm (seulmint po root) din�s el roye di comande sont "
-"astal�s.\n"
-
-#: po/placeholder.h:142 urpmi:362
-msgid "everything already installed"
-msgstr "tot a ddja st� astal�"
+"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 "Say� d' astaler co pus foirt (--force)? (o/N) "
+
+#: po/placeholder.h:154
msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+" --force - force invocation even if some packages do not exist.\n"
msgstr ""
-"Po satisfy� les aloyaedjes, les pacaedjes aloy�s ki sh�v�t vont esse astal�s "
-"(%d Mo)"
-#: po/placeholder.h:144 urpmi:296
-#, c-format
-msgid "installing %s\n"
-msgstr "dj' astale %s\n"
+#: po/placeholder.h:155 urpmi:205
+msgid "Sorry, bad choice, try again\n"
+msgstr "M�va tch�ze, say�z co ene feye\n"
-#: po/placeholder.h:145 urpmi:198
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "K� tchwezixhoz-ve? (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 "Say� d' astaler sin verify� les aloyaedjes? (o/N) "
+#: 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 "I gn a mez�jhe d' onk des pacaedjes ki sh�v�t:"
+#: 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 "dj' astale %s\n"
-#: po/placeholder.h:148 urpmi:149
+#: po/placeholder.h:161 urpmi:152
msgid "Only superuser is allowed to install local packages"
msgstr "Seulmint li super-�zeu a l' droet d' astaler des pacaedjes loc�s"
-#: 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 "S' i vs plait metoz li sopoirt lom� �%s� el �ndjin [%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 "dji n'�a savou prinde les pacaedjes so�rdants, dji lai toumer"
-#: po/placeholder.h:151 urpmi:329 urpmi:353
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Say� d' astaler co pus foirt (--force)? (o/N) "
+#: po/placeholder.h:165 urpmi:102
+#, fuzzy
+msgid "Only superuser is allowed to install packages"
+msgstr "Seulmint li super-�zeu a l' droet d' astaler des pacaedjes loc�s"
-#: po/placeholder.h:155 urpmi.addmedia:46
+#: po/placeholder.h:166 urpmi:193
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "I gn a mez�jhe d' onk des pacaedjes ki sh�v�t:"
+
+#: po/placeholder.h:167 urpmi:277
+msgid "Press Enter when it's done..."
+msgstr "Tapez so �enter� cwand c' est fwait..."
+
+#: po/placeholder.h:168 urpmi.addmedia:46
#, c-format
msgid ""
"%s\n"
@@ -690,7 +752,7 @@ msgstr ""
"%s\n"
"�with� manke pol sopoirt ftp\n"
-#: po/placeholder.h:159
+#: po/placeholder.h:172
msgid ""
"usage: urpmi.addmedia [--update] <name> <url>\n"
"where <url> is one of\n"
@@ -710,17 +772,17 @@ msgstr ""
" http://<lodjeu>/<tchimin> with <tchimin relatif pol fitch� hdlist>\n"
" removable_<�ndjin>://<tchimin>\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 "dji n' pout radjouter l' sopoirt �%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 "dji n' pout mete a djo� l' sopoirt �%s�\n"
-#: po/placeholder.h:170 urpmi.addmedia:42
+#: po/placeholder.h:183 urpmi.addmedia:42
#, c-format
msgid ""
"%s\n"
@@ -729,7 +791,7 @@ msgstr ""
"%s\n"
"l' �ndjin �%s� n' egzist�ye n�n\n"
-#: po/placeholder.h:174 urpmi.addmedia:44
+#: po/placeholder.h:187 urpmi.addmedia:44
#, c-format
msgid ""
"%s\n"
@@ -738,7 +800,7 @@ msgstr ""
"%s\n"
"i manke li tchmin relatif pol fitch� hdlist\n"
-#: po/placeholder.h:178
+#: po/placeholder.h:191
#, c-format
msgid ""
"usage: urpmi.update [-a] <name> ...\n"
@@ -757,11 +819,11 @@ msgstr ""
"\n"
"tch�zes n�n cnoxhowes �%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 "r�n a mete a djo� (eploy�z urpmi.addmedia po-z adjouter on sopoirt\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"
@@ -770,11 +832,11 @@ msgstr ""
"i gn a pont d' intr�ye a mete a djo�\n"
"(ene di %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 "r�n a disastaler (eploy�z urpmi.addmedia po-z adjouter on sopoirt\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"
@@ -783,7 +845,7 @@ msgstr ""
"i gn a pont d' intr�ye a bodj�\n"
"(ene di %s)\n"
-#: po/placeholder.h:197
+#: po/placeholder.h:210
#, c-format
msgid ""
"usage: urpmi.removemedia [-a] <name> ...\n"
@@ -798,17 +860,11 @@ msgstr ""
"\n"
"tch�zes n�n cnoxhowes �%s�\n"
-#: po/placeholder.h:204 urpmq:85
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: dji n'�sai lere li fitch� rpm �%s�\n"
-
-#: po/placeholder.h:206 urpmq:82
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: tch�ze �-%s� n�n cnoxhowe, louk�z cmint l'�eploy� avou --help\n"
+#: po/placeholder.h:217
+msgid " -h - print this help message.\n"
+msgstr ""
-#: 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"
@@ -816,87 +872,101 @@ msgstr ""
"des pacaedjes k'�i gn a ont mez�jhe d' esse bodj� fo� po poleur esse metous "
"a djo�, �oula n'�est n�n co sopoirt�\n"
-#: po/placeholder.h:208
+#: po/placeholder.h:219
+msgid " -g - print groups too with name.\n"
+msgstr ""
+
+#: po/placeholder.h:220 urpmq:84
#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: dji n'�sai lere li fitch� rpm �%s�\n"
+
+#: po/placeholder.h:221
+msgid " names or rpm files given on command line are queried.\n"
+msgstr ""
+
+#: po/placeholder.h:223
+msgid " -r - print version and release too with name.\n"
+msgstr ""
+
+#: 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"
+msgstr ""
+"�ouci est on libe programe �t pout esse cossem� so les termes del licince "
+"GPL."
+
+#: po/placeholder.h:231
+msgid " -d - extend query to package dependencies.\n"
+msgstr ""
+
+#: po/placeholder.h:232
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
+msgstr ""
+
+#: po/placeholder.h:233
+msgid ""
" -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"
+msgstr ""
+
+#: po/placeholder.h:235 urpmq:81
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: tch�ze �-%s� n�n cnoxhowe, louk�z cmint l'�eploy� avou --help\n"
+
+#: po/placeholder.h:236
+msgid ""
" --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 package do not exist.\n"
-" names or rpm files given on command line are queried.\n"
msgstr ""
-#: urpm.pm:257
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:243
+msgid ""
+" -u - remove package if a better version is already installed.\n"
msgstr ""
-#: urpm.pm:258
-#, c-format
-msgid "taking removable device as \"%s\""
+#: po/placeholder.h:244
+msgid ""
+" --force - force invocation even if some packages do not\n"
+"exist.\n"
msgstr ""
-#: urpm.pm:262
+#: urpm.pm:1796 urpm.pm:1805
#, c-format
-msgid "using different removable device [%s] for \"%s\""
+msgid "removing %s to upgrade to %s ..."
msgstr ""
-#: urpm.pm:266 urpm.pm:269
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "dji n' pout radjouter l' sopoirt �%s�\n"
+#: urpm.pm:1797 urpm.pm:1806
+msgid ", $otherPackage, "
+msgstr ", $otherPackage, "
-#: urpm.pm:1339
-#, fuzzy, c-format
-msgid "read synthesis file [%s]"
-msgstr "dji l� l'�fitch� depslist [%s]"
+#: urpm.pm:1797 urpm.pm:1806
+msgid "));"
+msgstr "));"
+
+#: urpm.pm:1802
+msgid "$p->{name}-$p->{version}-$p->{release}"
+msgstr "$p->{name}-$p->{version}-$p->{release}"
-#: urpmi:49
+#: urpm.pm:1812
+msgid "$prefix/$_"
+msgstr "$prefix/$_"
+
+#: urpmi:48
#, c-format
msgid "urpmi version %s"
msgstr "urpmi mod�ye %s"
-#: urpmi:98
-#, fuzzy, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: tch�ze �-%s� n�n cnoxhowe, louk�z cmint l'�eploy� avou --help\n"
-
-#: urpmi:102
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr "Seulmint li super-�zeu a l' droet d' astaler des pacaedjes loc�s"
-
-#: urpmi:189
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "I gn a mez�jhe d' onk des pacaedjes ki sh�v�t:"
-
-#: urpmi:301
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
-msgstr ""
-
#: urpmi.addmedia:30
msgid "usage: urpmi.addmedia [--update] <name> <url>"
msgstr "Po s'�� sierv�: urpmi.addmedia [--update] <etikete> <h�rdeye>"
@@ -927,5 +997,78 @@ msgstr ", $_);"
msgid "urpmq version %s"
msgstr "urpmq modeye %s"
+#~ msgid "retrieving [%s]"
+#~ msgstr "dj'�aberwete [%s]"
+
+#~ msgid "wget of [%s] failed (maybe wget is missing?)"
+#~ msgstr ""
+#~ "l'�aberwetaedje di [%s] a fwait berwete (motoit ki wget est n�n so "
+#~ "l'��ndjole?)"
+
+#~ msgid "unable to copy source of [%s] from [%s]"
+#~ msgstr "dji n'�sai copy� l'�so�rdant di [%s] fo� di [%s]"
+
+#~ msgid "removable medium not selected"
+#~ msgstr "bodj�ve sopoirt n�n tch�zi"
+
+#~ msgid "source of [%s] not found as [%s]"
+#~ msgstr "so�rdant di [%s] n�n trov� come [%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 ""
+#~ "urpmi modeye %s\n"
+#~ "Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+#~ "�ouci est on libe programe �t pout esse cossem� so les termes del licince "
+#~ "GPL.\n"
+#~ "po s'�� sierv�:\n"
+#~ " --help - mostere ci messaedje d'�aidance.\n"
+#~ " --update - eploy� kel sopoirt di metaedje a djo�.\n"
+#~ " --auto - tchwezi �tomaticmint li bon pacaedje dvins les "
+#~ "tch�zes.\n"
+#~ " --auto-select - tchwezi �tomaticmint les pacaedjes pol metaedje a "
+#~ "djo� do sistinme.\n"
+#~ " --force - foirci, minme si des pacaedjes k' i gn a n' egzist�t "
+#~ "n�n.\n"
+#~ " --X - eploy� l' eterface X11.\n"
+#~ " --best-output - tchwezi li meyeuse eterface sorlon l' evironmint: X "
+#~ "ou m�de tecse.\n"
+#~ " -a - eploy� --all-matches pol roye di comande.\n"
+#~ " -m - tchwezi li rseraedje minimom des aloyances "
+#~ "(pr�metou).\n"
+#~ " -M - tchwezi li rseraedje macsimom des aloyances.\n"
+#~ " -c - tchwezi li metode complete pol risolvaedje do "
+#~ "rseraedje des aloyances.\n"
+#~ " -p - f� des rcweraedjes �z�s aloyances po trover on "
+#~ "pacaedje.\n"
+#~ " -q - m�de taijheu.\n"
+#~ " -v - m�de badjawe.\n"
+#~ " les nos ou fitch�s rpm (seulmint po root) din�s el roye di comande sont "
+#~ "astal�s.\n"
+
#~ msgid "rpmtools package is too old, please upgrade it"
#~ msgstr "li pacaedje rpmtools est p�r trop v�, metoz le a djo� s'�i vs plait"
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index f9006bc3..5ab64dc7 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -9,7 +9,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-08-22 18:07+0800\n"
"Last-Translator: Jesse Kuang <kjx@mandrakesoft.com>\n"
"Language-Team: Chinese (GB) <future-cjk@mandrakesoft.com>\n"
@@ -29,27 +29,27 @@ msgstr ""
"�Զ���װ������...\n"
"��Ҫ��װ������ $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 "����������?"
-#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:281
+#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:279
msgid "Ok"
msgstr "ȷ��"
-#: _irpm:34 po/placeholder.h:116 urpmi:252 urpmi:282
+#: _irpm:34 po/placeholder.h:119 urpmi:252 urpmi:280
msgid "Cancel"
msgstr "ȡ��"
-#: _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 "nN����"
-#: _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 "yY��"
-#: _irpm:42 po/placeholder.h:118 urpmi:258
+#: _irpm:42 po/placeholder.h:157 urpmi:258
msgid " (Y/n) "
msgstr " (��(Y)/��(n)) [��] "
@@ -152,120 +152,120 @@ msgstr ""
msgid "urpmi is not installed"
msgstr "urpmiû�а�װ"
-#: po/placeholder.h:29 urpm.pm:283
+#: po/placeholder.h:29
+#, fuzzy, c-format
+msgid "reading synthesis file [%s]"
+msgstr "��ȡ compss �ļ� [%s]"
+
+#: po/placeholder.h:30 urpm.pm:298
#, c-format
msgid "unable to write config file [%s]"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:31
-#, c-format
+#: po/placeholder.h:32
+#, fuzzy, c-format
msgid "nothing to write in list file for \"%s\""
-msgstr ""
+msgstr "�޷�д�� �б��ļ�\"%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 ""
-#: po/placeholder.h:33
+#: po/placeholder.h:34
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "�޷�����hdlist�ļ� \"%s\""
-#: po/placeholder.h:34
-#, c-format
+#: po/placeholder.h:35
+#, fuzzy, c-format
msgid "nothing written in list file for \"%s\""
-msgstr ""
-
-#: po/placeholder.h:35 urpm.pm:1951
-#, c-format
-msgid ""
-"removing %s to upgrade ...\n"
-" to %s since it will not upgrade correctly!"
-msgstr ""
+msgstr "�޷�д�� �б��ļ�\"%s\""
-#: po/placeholder.h:39 urpm.pm:839
+#: po/placeholder.h:36 urpm.pm:845
#, c-format
msgid "read provides file [%s]"
msgstr ""
-#: po/placeholder.h:40
-#, c-format
-msgid "trying to remove inexistant medium \"%s\""
-msgstr "�޷�ɾ�������ڵĽ���\"%s\""
-
-#: po/placeholder.h:41 urpm.pm:1692
+#: po/placeholder.h:37 urpm.pm:1549
#, c-format
msgid "package %s is not found."
msgstr ""
-#: po/placeholder.h:42
-#, c-format
-msgid "unable to copy source of [%s] from [%s]"
-msgstr ""
-
-#: po/placeholder.h:43 urpm.pm:870
+#: po/placeholder.h:38 urpm.pm:876
#, c-format
msgid "unable to write compss file [%s]"
msgstr "�޷�д�� compss �ļ� [%s]"
-#: po/placeholder.h:44 urpm.pm:813
+#: po/placeholder.h:39 urpm.pm:819
#, c-format
msgid "unmounting %s"
msgstr ""
-#: po/placeholder.h:45
+#: po/placeholder.h:40
#, c-format
msgid "removing %d obsolete headers in cache"
msgstr ""
-#: 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 ""
-#: 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 ""
+
+#: po/placeholder.h:43 urpm.pm:184
+#, c-format
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+
+#: po/placeholder.h:44 urpm.pm:191
#, c-format
msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
msgstr ""
-#: po/placeholder.h:48
+#: po/placeholder.h:45
msgid "keeping only files referenced in provides"
msgstr ""
-#: po/placeholder.h:49
+#: po/placeholder.h:46
#, c-format
msgid "unable to build synthesis file for medium \"%s\""
msgstr "�޷�Ϊ����\"%s\"���� synthesis�ļ�"
-#: po/placeholder.h:50
+#: po/placeholder.h:47
#, c-format
msgid "found %d headers in cache"
msgstr ""
-#: po/placeholder.h:51 urpm.pm:836
+#: po/placeholder.h:48 urpm.pm:842
#, c-format
msgid "unable to read provides file [%s]"
msgstr "�޷���ȡ �ṩ��Ϣ provides �ļ� [%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 ""
-#: po/placeholder.h:53 urpm.pm:311
+#: po/placeholder.h:50
#, c-format
-msgid "medium \"%s\" already exists"
+msgid ""
+"removing %s to upgrade to %s ...\n"
+" since it will not be updated otherwise"
msgstr ""
-#: po/placeholder.h:54 urpm.pm:295
+#: po/placeholder.h:54 urpm.pm:326
#, c-format
-msgid "write config file [%s]"
+msgid "medium \"%s\" already exists"
msgstr ""
#: po/placeholder.h:55
@@ -273,171 +273,185 @@ msgstr ""
msgid "unable to write list file of \"%s\""
msgstr "�޷�д�� �б��ļ�\"%s\""
-#: po/placeholder.h:56 urpm.pm:1817
-#, c-format
-msgid "retrieving [%s]"
-msgstr ""
-
-#: po/placeholder.h:57 urpm.pm:1819
+#: po/placeholder.h:56 urpm.pm:310
#, c-format
-msgid "wget of [%s] failed"
+msgid "write config file [%s]"
msgstr ""
-#: po/placeholder.h:58 urpm.pm:1101
+#: po/placeholder.h:57 urpm.pm:1107
#, c-format
msgid "no package named %s"
msgstr "û����Ϊ %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 "�޷���ȡ compss �ļ� [%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 ""
-#: po/placeholder.h:61
-#, c-format
+#: po/placeholder.h:60
+#, fuzzy, c-format
msgid "built hdlist synthesis file for medium \"%s\""
-msgstr ""
+msgstr "�޷�Ϊ����\"%s\"���� synthesis�ļ�"
-#: po/placeholder.h:62
+#: po/placeholder.h:61
msgid "computing dependencies"
msgstr ""
-#: po/placeholder.h:63 urpm.pm:868
+#: po/placeholder.h:62
+#, fuzzy, c-format
+msgid "retrieve of [%s] failed"
+msgstr "���� [%s] ʧ��"
+
+#: po/placeholder.h:63 urpm.pm:874
#, c-format
msgid "write provides file [%s]"
msgstr ""
-#: po/placeholder.h:64 urpm.pm:803
+#: po/placeholder.h:64 urpm.pm:809
#, c-format
msgid "mounting %s"
msgstr "���ڰ�װ %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 "
"medium"
msgstr ""
-#: po/placeholder.h:66 urpm.pm:148
-#, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
-msgstr ""
-
-#: po/placeholder.h:67
-#, c-format
+#: po/placeholder.h:66
+#, fuzzy, c-format
msgid "reading hdlist file [%s]"
-msgstr ""
+msgstr "д�� depslist �ļ� [%s]"
-#: po/placeholder.h:68 urpm.pm:873
+#: po/placeholder.h:67 urpm.pm:879
#, c-format
msgid "write compss file [%s]"
msgstr ""
-#: po/placeholder.h:69 urpm.pm:827
+#: po/placeholder.h:68 urpm.pm:833
#, c-format
msgid "read depslist file [%s]"
msgstr ""
-#: po/placeholder.h:70
-#, c-format
-msgid "trying to select inexistant medium \"%s\""
-msgstr "��ͼѡ�񲻴��ڵĽ���\"%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 "�޷���������\"%s\"\n"
-#: po/placeholder.h:71 urpm.pm:1812
+#: po/placeholder.h:71 urpm.pm:1668
#, c-format
msgid "malformed input: [%s]"
msgstr ""
-#: 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"
+msgid "there are multiple packages with the same rpm filename \"%s\""
msgstr ""
-#: 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 ""
-#: po/placeholder.h:77 urpm.pm:865
+#: po/placeholder.h:74 urpm.pm:871
#, c-format
msgid "unable to write provides file [%s]"
msgstr "�޷�д�� provides �ļ� [%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 ""
-#: po/placeholder.h:79 urpm.pm:1005
+#: po/placeholder.h:76 urpm.pm:1215
+#, fuzzy
+msgid "unable to find all synthesis file, using parsehdlist server"
+msgstr "�޷�Ϊ����\"%s\"���� synthesis�ļ�"
+
+#: po/placeholder.h:77 urpm.pm:1011
msgid "unable to register rpm file"
msgstr "�޷��Ǽ� rpm �ļ�"
-#: po/placeholder.h:80 urpm.pm:1362
-msgid "unable to find all synthesis file, using parsehdlist server"
+#: po/placeholder.h:78 urpm.pm:256
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
msgstr ""
-#: po/placeholder.h:81 urpm.pm:241
+#: po/placeholder.h:79 urpm.pm:272
#, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "too many mount points for removable medium \"%s\""
msgstr ""
-#: po/placeholder.h:82 urpm.pm:233
+#: po/placeholder.h:80 urpm.pm:248
#, c-format
msgid "incoherent list file for \"%s\", medium ignored"
msgstr ""
-#: po/placeholder.h:83
+#: po/placeholder.h:81
#, c-format
msgid "copy of [%s] failed"
msgstr "���� [%s] ʧ��"
-#: 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 "�޷�ɾ�������ڵĽ���\"%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 "�޷����� [%s]"
-#: po/placeholder.h:85 urpm.pm:824
+#: po/placeholder.h:84 urpm.pm:1192
+#, fuzzy, c-format
+msgid "read synthesis file [%s]"
+msgstr "��ȡ compss �ļ� [%s]"
+
+#: po/placeholder.h:85 urpm.pm:830
#, c-format
msgid "unable to read depslist file [%s]"
msgstr "�޷���ȡdepslist �ļ� [%s]"
-#: po/placeholder.h:86
-msgid "removable medium not selected"
-msgstr ""
-
-#: po/placeholder.h:87 urpm.pm:851
+#: po/placeholder.h:86 urpm.pm:857
#, c-format
msgid "read compss file [%s]"
msgstr "��ȡ compss �ļ� [%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 ""
-#: po/placeholder.h:89
+#: po/placeholder.h:88
#, c-format
msgid "building hdlist [%s]"
msgstr "����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 "�޷��ӽ���\"%2$s\" ��ȡrpm�ļ�[%1$s]"
-#: po/placeholder.h:91 urpm.pm:1009
+#: po/placeholder.h:90 urpm.pm:1015
msgid "error registering local packages"
msgstr ""
-#: 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 ""
@@ -447,119 +461,198 @@ msgstr ""
msgid "unable to build hdlist: %s"
msgstr "�޷����� 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 ""
+
+#: po/placeholder.h:95 urpm.pm:1006
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "�Ƿ�rpm�ļ� [%s]"
-#: 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"
+msgid "unknown data associated with %s"
msgstr ""
-#: 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 ""
-#: po/placeholder.h:97 urpm.pm:863
+#: po/placeholder.h:98 urpm.pm:869
#, c-format
msgid "write depslist file [%s]"
msgstr "д�� depslist �ļ� [%s]"
-#: po/placeholder.h:98 urpm.pm:1322
-#, c-format
-msgid "unknown data associated with %s"
-msgstr ""
-
-#: po/placeholder.h:99
-#, c-format
-msgid "source of [%s] not found as [%s]"
-msgstr "[%s]Դδ���� [%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 ""
-#: 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 ""
-#: po/placeholder.h:102
-#, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
-msgstr ""
-
-#: po/placeholder.h:103 urpm.pm:1001
+#: po/placeholder.h:101 urpm.pm:1007
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "�޷�����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 "�޷�д depslist �ļ�[\"%s]"
-#: po/placeholder.h:105 urpm.pm:327 urpm.pm:1773
+#: po/placeholder.h:103
+#, 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
#, c-format
msgid "unable to access medium \"%s\""
msgstr "�޷����ʽ���\"%s\""
-#: po/placeholder.h:106 urpm.pm:988
+#: po/placeholder.h:108 urpm.pm:994
#, c-format
msgid "relocated %s entries in depslist"
msgstr "��depslist�����¶�λ %s"
-#: 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\""
+msgid "trying to select inexistent medium \"%s\""
+msgstr "��ͼѡ�񲻴��ڵĽ���\"%s\""
+
+#: po/placeholder.h:110 urpm.pm:97
+msgid "wget failed\n"
msgstr ""
-#: 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 "[%s] û�з���rpm �ļ�"
+msgid "unable to parse correctly [%s] on value \"%s\""
+msgstr ""
-#: po/placeholder.h:109 urpm.pm:1104
+#: po/placeholder.h:112 urpm.pm:1110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "�������������� %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 ""
+msgid "no rpm files found from [%s]"
+msgstr "[%s] û�з���rpm �ļ�"
-#: po/placeholder.h:111 urpm.pm:1920
+#: po/placeholder.h:114 urpm.pm:1772
#, c-format
msgid "selecting %s using obsoletes"
msgstr "ʹ�ù���ѡ�� %s"
-#: po/placeholder.h:112 urpm.pm:2031
+#: po/placeholder.h:115 urpm.pm:1888
#, c-format
msgid "selecting %s by selection on files"
msgstr "�����ļ���ѡ�� %s"
-#: 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 "�޷��ж� hdlist�ļ��Ľ��� [%s]"
-#: po/placeholder.h:114 urpmi:308 urpmi:315 urpmi:328 urpmi:339 urpmi:352
+#: po/placeholder.h:120
+msgid " --help - print this help message.\n"
+msgstr ""
+
+#: po/placeholder.h:121 urpmi:361
+msgid "everything already installed"
+msgstr "ȫ����װ���"
+
+#: po/placeholder.h:122 urpmi:98
+#, fuzzy, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: δ֪ѡ�� \"-%s\", ��--help ����÷�\n"
+
+#: po/placeholder.h:123 urpmi:194
+msgid "One of the following packages is needed:"
+msgstr "��Ҫ����������֮һ:"
+
+#: 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 "��װʧ��"
-#: po/placeholder.h:115 urpmi:279
-msgid "Press enter when it's done..."
-msgstr "׼���ú� Enter ��..."
+#: 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 "�Բ���, ѡ����Ч, ������һ��\n"
+#: po/placeholder.h:134
+msgid " --X - use X interface.\n"
+msgstr ""
-#: 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 "�ҽ����ⰲװ���������� (%d MB), �����������Ҫ��"
+
+#: po/placeholder.h:136 urpmi:320 urpmi:344
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "���Ժ�������Լ�����װ��? (��(y)/��(N)) [��] "
+
+#: 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
+msgid " -q - quiet mode.\n"
+msgstr ""
+
+#: po/placeholder.h:144 urpmi:202
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "����������ѡ��: (1-%d) "
+
+#: po/placeholder.h:145
+msgid " --wget - use wget to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:146
#, c-format
msgid ""
"urpmi version %s\n"
@@ -567,91 +660,67 @@ msgid ""
"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 ""
-"urpmi �汾 %s\n"
-"��Ȩ���� (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"��ѭ GNU GPL ����.\n"
-"�÷�:\n"
-" --help - ��ʾ������Ϣ.\n"
-" --update - ����ʹ�ø��½���.\n"
-" --auto - �Զ�ѡ��õ�������.\n"
-" --auto-select - �Զ�ѡ������������.\n"
-" --force - ������������ʱǿ��ȡ��.\n"
-" --X - ʹ�� X ���ڽ���.\n"
-" --best-output - ���ݻ���ѡ����õĽ���(���� �� �ı�).\n"
-" -a - ������ѡ������ƥ��.\n"
-" -m - ѡ������Ҫ����ɫ (ȴʡ).\n"
-" -M - ѡ�����Ҫ����ɫ.\n"
-" -c - ѡ��Ҫ����ɫ�ķֱ�.\n"
-" -p - �������� �ṩ��Ϣ ����������.\n"
-" -q - ��ģʽ.\n"
-" -v - ��ϸģʽ.\n"
-" Ҫ��װ��rpm����.\n"
-
-#: po/placeholder.h:142 urpmi:362
-msgid "everything already installed"
-msgstr "ȫ����װ���"
-#: 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 "���Ը����ҵİ�װ��ʽ��? (ʹ�� --force) (��(y)/��(N)) [��] "
+
+#: po/placeholder.h:154
msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
-msgstr "�ҽ����ⰲװ���������� (%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 "���ڰ�װ %s\n"
+#: po/placeholder.h:155 urpmi:205
+msgid "Sorry, bad choice, try again\n"
+msgstr "�Բ���, ѡ����Ч, ������һ��\n"
-#: po/placeholder.h:145 urpmi:198
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "����������ѡ��: (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 "���Ժ�������Լ�����װ��? (��(y)/��(N)) [��] "
+#: 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 "��Ҫ����������֮һ:"
+#: po/placeholder.h:159
+msgid " --curl - use curl to retrieve distant files.\n"
+msgstr ""
-#: po/placeholder.h:148 urpmi:149
+#: po/placeholder.h:160 urpmi:294
+#, c-format
+msgid "installing %s\n"
+msgstr "���ڰ�װ %s\n"
+
+#: po/placeholder.h:161 urpmi:152
msgid "Only superuser is allowed to install local packages"
msgstr "ֻ�г����û����԰�װ����������"
-#: 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 "������ǩ \"%s\" �Ľ��ʵ��豸 [%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 "�޷���ȡԴ�������� ��ֹ"
-#: po/placeholder.h:151 urpmi:329 urpmi:353
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "���Ը����ҵİ�װ��ʽ��? (ʹ�� --force) (��(y)/��(N)) [��] "
+#: po/placeholder.h:165 urpmi:102
+#, fuzzy
+msgid "Only superuser is allowed to install packages"
+msgstr "ֻ�г����û����԰�װ����������"
+
+#: po/placeholder.h:166 urpmi:193
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "��Ҫ����������֮һ:"
+
+#: po/placeholder.h:167 urpmi:277
+msgid "Press Enter when it's done..."
+msgstr "׼���ú� Enter ��..."
-#: po/placeholder.h:155 urpmi.addmedia:46
+#: po/placeholder.h:168 urpmi.addmedia:46
#, c-format
msgid ""
"%s\n"
@@ -660,7 +729,7 @@ msgstr ""
"%s\n"
"`with'�Ҳ���ftp����\n"
-#: po/placeholder.h:159
+#: po/placeholder.h:172
msgid ""
"usage: urpmi.addmedia [--update] <name> <url>\n"
"where <url> is one of\n"
@@ -678,17 +747,17 @@ msgstr ""
" http://<����>/<·��> with <hdlist���·��>\n"
" removable_<�豸>://<·��>\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 "�޷���������\"%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 "�޷���������\"%s\"\n"
-#: po/placeholder.h:170 urpmi.addmedia:42
+#: po/placeholder.h:183 urpmi.addmedia:42
#, c-format
msgid ""
"%s\n"
@@ -697,7 +766,7 @@ msgstr ""
"%s\n"
"�豸 `%s'������\n"
-#: po/placeholder.h:174 urpmi.addmedia:44
+#: po/placeholder.h:187 urpmi.addmedia:44
#, c-format
msgid ""
"%s\n"
@@ -706,7 +775,7 @@ msgstr ""
"%s\n"
"<hdlist���·��>�Ҳ���\n"
-#: po/placeholder.h:178
+#: po/placeholder.h:191
#, c-format
msgid ""
"usage: urpmi.update [-a] <name> ...\n"
@@ -725,11 +794,11 @@ msgstr ""
"\n"
"δ֪ѡ�� '%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 "û�ж�������(��urpmi.addmedia���ӽ���)\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"
@@ -738,11 +807,11 @@ msgstr ""
"�Ҳ���Ҫ��������\n"
"(%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 "û�ж���ɾ��(��urpmi.addmedia���ӽ���)\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"
@@ -751,7 +820,7 @@ msgstr ""
"�Ҳ���Ҫɾ������\n"
"(%s�е�һ��)\n"
-#: po/placeholder.h:197
+#: po/placeholder.h:210
#, c-format
msgid ""
"usage: urpmi.removemedia [-a] <name> ...\n"
@@ -766,23 +835,38 @@ msgstr ""
"\n"
"δ֪ѡ�� '%s'\n"
-#: po/placeholder.h:204 urpmq:85
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: �޷���ȡrpm�ļ� \"%s\"\n"
-
-#: po/placeholder.h:206 urpmq:82
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: δ֪ѡ�� \"-%s\", ��--help ����÷�\n"
+#: po/placeholder.h:217
+msgid " -h - print this help message.\n"
+msgstr ""
-#: 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 "��Щ������Ҫ����ɾ��������, �ݲ�֧��\n"
-#: po/placeholder.h:208
+#: po/placeholder.h:219
+msgid " -g - print groups too with name.\n"
+msgstr ""
+
+#: po/placeholder.h:220 urpmq:84
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: �޷���ȡrpm�ļ� \"%s\"\n"
+
+#: po/placeholder.h:221
+msgid " names or rpm files given on command line are queried.\n"
+msgstr ""
+
+#: po/placeholder.h:223
+msgid " -r - print version and release too with name.\n"
+msgstr ""
+
+#: po/placeholder.h:224
+msgid " -f - print version, release and arch with name.\n"
+msgstr ""
+
+#: po/placeholder.h:225
#, c-format
msgid ""
"urpmq version %s\n"
@@ -790,79 +874,70 @@ msgid ""
"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"
+msgstr ""
+
+#: po/placeholder.h:231
+msgid " -d - extend query to package dependencies.\n"
+msgstr ""
+
+#: po/placeholder.h:232
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
+msgstr ""
+
+#: po/placeholder.h:233
+msgid ""
" -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"
+msgstr ""
+
+#: po/placeholder.h:235 urpmq:81
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: δ֪ѡ�� \"-%s\", ��--help ����÷�\n"
+
+#: po/placeholder.h:236
+msgid ""
" --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 package do not exist.\n"
-" names or rpm files given on command line are queried.\n"
msgstr ""
-#: urpm.pm:257
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:243
+msgid ""
+" -u - remove package if a better version is already installed.\n"
msgstr ""
-#: urpm.pm:258
-#, c-format
-msgid "taking removable device as \"%s\""
+#: po/placeholder.h:244
+msgid ""
+" --force - force invocation even if some packages do not\n"
+"exist.\n"
msgstr ""
-#: urpm.pm:262
+#: urpm.pm:1796 urpm.pm:1805
#, c-format
-msgid "using different removable device [%s] for \"%s\""
+msgid "removing %s to upgrade to %s ..."
msgstr ""
-#: urpm.pm:266 urpm.pm:269
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "�޷���������\"%s\"\n"
+#: urpm.pm:1797 urpm.pm:1806
+msgid ", $otherPackage, "
+msgstr ", $otherPackage, "
-#: urpm.pm:1339
-#, fuzzy, c-format
-msgid "read synthesis file [%s]"
-msgstr "��ȡ compss �ļ� [%s]"
+#: urpm.pm:1797 urpm.pm:1806
+msgid "));"
+msgstr "));"
+
+#: urpm.pm:1802
+msgid "$p->{name}-$p->{version}-$p->{release}"
+msgstr "$p->{name}-$p->{version}-$p->{release}"
+
+#: urpm.pm:1812
+msgid "$prefix/$_"
+msgstr "$prefix/$_"
-#: urpmi:49
+#: urpmi:48
#, c-format
msgid "urpmi version %s"
msgstr "urpmi �汾 %s"
-#: urpmi:98
-#, fuzzy, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: δ֪ѡ�� \"-%s\", ��--help ����÷�\n"
-
-#: urpmi:102
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr "ֻ�г����û����԰�װ����������"
-
-#: urpmi:189
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "��Ҫ����������֮һ:"
-
-#: urpmi:301
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
-msgstr ""
-
#: urpmi.addmedia:30
msgid "usage: urpmi.addmedia [--update] <name> <url>"
msgstr "�÷�: urpmi.addmedia [--update] <����> <url>"
@@ -892,3 +967,53 @@ msgstr ", $_);"
#, c-format
msgid "urpmq version %s"
msgstr "urpmq �汾 %s"
+
+#~ msgid "source of [%s] not found as [%s]"
+#~ msgstr "[%s]Դδ���� [%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 ""
+#~ "urpmi �汾 %s\n"
+#~ "��Ȩ���� (C) 1999, 2000, 2001 MandrakeSoft.\n"
+#~ "��ѭ GNU GPL ����.\n"
+#~ "�÷�:\n"
+#~ " --help - ��ʾ������Ϣ.\n"
+#~ " --update - ����ʹ�ø��½���.\n"
+#~ " --auto - �Զ�ѡ��õ�������.\n"
+#~ " --auto-select - �Զ�ѡ������������.\n"
+#~ " --force - ������������ʱǿ��ȡ��.\n"
+#~ " --X - ʹ�� X ���ڽ���.\n"
+#~ " --best-output - ���ݻ���ѡ����õĽ���(���� �� �ı�).\n"
+#~ " -a - ������ѡ������ƥ��.\n"
+#~ " -m - ѡ������Ҫ����ɫ (ȴʡ).\n"
+#~ " -M - ѡ�����Ҫ����ɫ.\n"
+#~ " -c - ѡ��Ҫ����ɫ�ķֱ�.\n"
+#~ " -p - �������� �ṩ��Ϣ ����������.\n"
+#~ " -q - ��ģʽ.\n"
+#~ " -v - ��ϸģʽ.\n"
+#~ " Ҫ��װ��rpm����.\n"
diff --git a/po/zh_TW.Big5.po b/po/zh_TW.Big5.po
index fac96182..8d4c01d1 100644
--- a/po/zh_TW.Big5.po
+++ b/po/zh_TW.Big5.po
@@ -9,7 +9,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-09-18 10:33--800\n"
"Last-Translator: Joe Man <trmetal@yahoo.com.hk>\n"
"Language-Team: Chinese <zh@li.org>\n"
@@ -29,27 +29,27 @@ msgstr ""
"�۰ʦw�ˮM��...\n"
"�z�n�D�w�˪��M�� $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 "���T�ܡS"
-#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:281
+#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:279
msgid "Ok"
msgstr "�T�w"
-#: _irpm:34 po/placeholder.h:116 urpmi:252 urpmi:282
+#: _irpm:34 po/placeholder.h:119 urpmi:252 urpmi:280
msgid "Cancel"
msgstr "����"
-#: _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 "Nn(�_)"
-#: _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 "Yy(�O)"
-#: _irpm:42 po/placeholder.h:118 urpmi:258
+#: _irpm:42 po/placeholder.h:157 urpmi:258
msgid " (Y/n) "
msgstr " (Y/n) (�O/�_) "
@@ -155,297 +155,309 @@ msgstr "��J urpmf --help ��ܧ�h�ﶵ���"
msgid "urpmi is not installed"
msgstr "urpmi �����w��"
-#: po/placeholder.h:29 urpm.pm:283
+#: po/placeholder.h:29
+#, fuzzy, c-format
+msgid "reading synthesis file [%s]"
+msgstr "Ū�������M�� (depslist) [%s]"
+
+#: po/placeholder.h:30 urpm.pm:298
#, c-format
msgid "unable to write config file [%s]"
msgstr "�L�k�g�J�]�w�� [%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"
-msgstr "�L�k�ϥγo�ӦW�� \"%s\"�A�]�P�@�W�٪��C���w�s�b"
+msgid "using different removable device [%s] for \"%s\""
+msgstr ""
-#: po/placeholder.h:31
+#: po/placeholder.h:32
#, c-format
msgid "nothing to write in list file for \"%s\""
msgstr "�S����Ƽg�J \"%s\" ���M���ɮ�"
-#: 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 "�L�k��� \"%s\" ���M���ɮסA�����o�ӴC��"
-#: po/placeholder.h:33
+#: po/placeholder.h:34
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "�L�k�ѪR���Y�M�� (hdlist) \"%s\""
-#: po/placeholder.h:34
+#: po/placeholder.h:35
#, c-format
msgid "nothing written in list file for \"%s\""
msgstr "�S����Ƽg�J \"%s\" ���M���ɮ�"
-#: po/placeholder.h:35 urpm.pm:1951
-#, c-format
-msgid ""
-"removing %s to upgrade ...\n"
-" to %s since it will not upgrade correctly!"
-msgstr ""
-"�����M�� %s �H�K�i��ɯŨ� ...\n"
-" ���� %s�A�_�h���N���ॿ�T�ɯšI"
-
-#: po/placeholder.h:39 urpm.pm:839
+#: po/placeholder.h:36 urpm.pm:845
#, c-format
msgid "read provides file [%s]"
msgstr "Ū���M��P�禡�w�M�� (provides) [%s]"
-#: po/placeholder.h:40
-#, c-format
-msgid "trying to remove inexistant medium \"%s\""
-msgstr "���ϲ������s�b���C�� \"%s\""
-
-#: po/placeholder.h:41 urpm.pm:1692
+#: po/placeholder.h:37 urpm.pm:1549
#, c-format
msgid "package %s is not found."
msgstr "�䤣��M�� %s�C"
-#: po/placeholder.h:42
-#, c-format
-msgid "unable to copy source of [%s] from [%s]"
-msgstr "�L�k�q [%2$s] �ƻs�ӷ��� [%1$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 "�L�k�g�J�s�ղM�� (compss) [%s]"
-#: po/placeholder.h:44 urpm.pm:813
+#: po/placeholder.h:39 urpm.pm:819
#, c-format
msgid "unmounting %s"
msgstr "���U %s"
-#: po/placeholder.h:45
+#: po/placeholder.h:40
#, c-format
msgid "removing %d obsolete headers in cache"
msgstr "���� %d �Ӧb�֨��Ϥ��L�Ϊ����Y"
-#: 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 "�L�k���C�� \"%s\" �����Y�M�� (hdlist)"
-#: 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 "�C�� \"%s\" ���ϨϥΤ@�Ӥw�Q�ϥΪ����Y�M�� (hdlist)�A�����o�ӴC��"
+
+#: po/placeholder.h:43 urpm.pm:184
+#, c-format
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr "�L�k�ϥγo�ӦW�� \"%s\"�A�]�P�@�W�٪��C���w�s�b"
+
+#: po/placeholder.h:44 urpm.pm:191
#, c-format
msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
msgstr "���|�Ҽ{�ϥδC�� \"%s\" �]�M���ɮ� [%s] ���s�b"
-#: po/placeholder.h:48
+#: po/placeholder.h:45
msgid "keeping only files referenced in provides"
msgstr "�u�O�s�b\"�M��P�禡�w�M��\" (provides) ���������ɮ�"
-#: po/placeholder.h:49
+#: po/placeholder.h:46
#, c-format
msgid "unable to build synthesis file for medium \"%s\""
msgstr "�L�k���C�� \"%s\" �إߺ�X���Y�M�� (synthesis)"
-#: po/placeholder.h:50
+#: po/placeholder.h:47
#, c-format
msgid "found %d headers in cache"
msgstr "�b�֨��Ŷ������ %d �����Y"
-#: po/placeholder.h:51 urpm.pm:836
+#: po/placeholder.h:48 urpm.pm:842
#, c-format
msgid "unable to read provides file [%s]"
msgstr "�L�kŪ���M��P�禡�w�M�� (provides) [%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 "�S����� %s �]�������a�y���M�󤴥���w"
-#: 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 ""
+"�����M�� %s �H�K�i��ɯŨ� ...\n"
+" ���� %s�A �_�h���N���|�Q��s�I"
+
+#: po/placeholder.h:54 urpm.pm:326
#, c-format
msgid "medium \"%s\" already exists"
msgstr "�C�� \"%s\" �w�s�b"
-#: po/placeholder.h:54 urpm.pm:295
-#, c-format
-msgid "write config file [%s]"
-msgstr "�g�J�]�w�� [%s]"
-
#: po/placeholder.h:55
#, c-format
msgid "unable to write list file of \"%s\""
msgstr "�L�k�g�J�M���ɮ� \"%s\""
-#: po/placeholder.h:56 urpm.pm:1817
-#, c-format
-msgid "retrieving [%s]"
-msgstr "�^�� [%s]"
-
-#: po/placeholder.h:57 urpm.pm:1819
+#: po/placeholder.h:56 urpm.pm:310
#, c-format
-msgid "wget of [%s] failed"
-msgstr "�ϥ� wget �U�� [%s] ����"
+msgid "write config file [%s]"
+msgstr "�g�J�]�w�� [%s]"
-#: po/placeholder.h:58 urpm.pm:1101
+#: po/placeholder.h:57 urpm.pm:1107
#, c-format
msgid "no package named %s"
msgstr "�S���M��㦳�o�ӦW�� %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 "�L�kŪ���s�ղM��(compss) [%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 "�L�k��� \"%s\" �����Y�M�� (hdlist)�A�����o�ӴC��"
-#: po/placeholder.h:61
+#: po/placeholder.h:60
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "���C�� \"%s\" �إߺ�X���Y�M�� (synthesis)"
-#: po/placeholder.h:62
+#: po/placeholder.h:61
msgid "computing dependencies"
msgstr "������w�M�󪺬����M��"
-#: po/placeholder.h:63 urpm.pm:868
+#: po/placeholder.h:62
+#, fuzzy, c-format
+msgid "retrieve of [%s] failed"
+msgstr "�ϥ� wget �U�� [%s] ����"
+
+#: po/placeholder.h:63 urpm.pm:874
#, c-format
msgid "write provides file [%s]"
msgstr "�g�J�M��P�禡�w�M�� (provides) [%s]"
-#: po/placeholder.h:64 urpm.pm:803
+#: po/placeholder.h:64 urpm.pm:809
#, c-format
msgid "mounting %s"
msgstr "���� %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 "
"medium"
msgstr "�L�k�B�z�C�� \"%s\"�A�]���䥦�C�����b�ϥβM����"
-#: po/placeholder.h:66 urpm.pm:148
-#, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
-msgstr "�C�� \"%s\" ���ըϥΥ��b�ϥΤ����M��A�����o�ӴC��"
-
-#: po/placeholder.h:67
+#: po/placeholder.h:66
#, c-format
msgid "reading hdlist file [%s]"
msgstr "Ū�� hdlist �ɮ� [%s]"
-#: po/placeholder.h:68 urpm.pm:873
+#: po/placeholder.h:67 urpm.pm:879
#, c-format
msgid "write compss file [%s]"
msgstr "�g�J�s�ղM�� (compss) [%s]"
-#: po/placeholder.h:69 urpm.pm:827
+#: po/placeholder.h:68 urpm.pm:833
#, c-format
msgid "read depslist file [%s]"
msgstr "Ū�������M�� (depslist) [%s]"
-#: po/placeholder.h:70
-#, c-format
-msgid "trying to select inexistant medium \"%s\""
-msgstr "���Ͽ�ܤ��s�b���C�� \"%s\""
+#: po/placeholder.h:69 urpm.pm:103
+msgid "curl failed\n"
+msgstr ""
-#: po/placeholder.h:71 urpm.pm:1812
+#: po/placeholder.h:70 urpm.pm:281 urpm.pm:284
+#, fuzzy, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "�L�k�إߴC�� \"%s\"\n"
+
+#: po/placeholder.h:71 urpm.pm:1668
#, c-format
msgid "malformed input: [%s]"
msgstr "���X�榡����J�G[%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 "�C�� \"%s\" ���ϨϥΤ@�Ӥw�Q�ϥΪ����Y�M�� (hdlist)�A�����o�ӴC��"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "�b���̦��h�ӬۦP�W�٪��M�� \"%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"
-msgstr ""
-"�����M�� %s �H�K�i��ɯŨ� ...\n"
-" ���� %s�A �_�h���N���|�Q��s�I"
+msgid "medium \"%s\" tries to use an already used list, medium ignored"
+msgstr "�C�� \"%s\" ���ըϥΥ��b�ϥΤ����M��A�����o�ӴC��"
-#: po/placeholder.h:77 urpm.pm:865
+#: po/placeholder.h:74 urpm.pm:871
#, c-format
msgid "unable to write provides file [%s]"
msgstr "�L�k�g�J\"�M��P�禡�w�M��\" (provides) �� [%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 "�L�k�s�� \"%s\" �����Y�M�� (hdlist)�A�����o�ӴC��"
-#: po/placeholder.h:79 urpm.pm:1005
-msgid "unable to register rpm file"
-msgstr "�L�k�n�O�M����"
-
-#: 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 ""
"�L�k�M�������X���Y�M�� (synthesis)�A�ϥ����Y�M��ѪR (parsehdlist) ���A��"
-#: po/placeholder.h:81 urpm.pm:241
+#: po/placeholder.h:77 urpm.pm:1011
+msgid "unable to register rpm file"
+msgstr "�L�k�n�O�M����"
+
+#: po/placeholder.h:78 urpm.pm:256
#, c-format
msgid "unable to inspect list file for \"%s\", medium ignored"
msgstr "�L�k�ˬd \"%s\" ���M���ɡA�����o�ӴC��"
-#: 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 "���s�e�� \"%s\" ���M���ɡA�����o�ӴC��"
-#: po/placeholder.h:83
+#: po/placeholder.h:81
#, c-format
msgid "copy of [%s] failed"
msgstr "�ƻs [%s] ����"
-#: 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 "���ϲ������s�b���C�� \"%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 "�L�k���T�ѪR [%s]"
-#: po/placeholder.h:85 urpm.pm:824
+#: po/placeholder.h:84 urpm.pm:1192
+#, fuzzy, c-format
+msgid "read synthesis file [%s]"
+msgstr "Ū�������M�� (depslist) [%s]"
+
+#: po/placeholder.h:85 urpm.pm:830
#, c-format
msgid "unable to read depslist file [%s]"
msgstr "�L�kŪ�������M�� (depslist) [%s]"
-#: po/placeholder.h:86
-msgid "removable medium not selected"
-msgstr "������w�i�������C��"
-
-#: po/placeholder.h:87 urpm.pm:851
+#: po/placeholder.h:86 urpm.pm:857
#, c-format
msgid "read compss file [%s]"
msgstr "Ū���s�ղM�� (compss) [%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 "�]�w�ɤ����� %s ��y�k���~"
-#: po/placeholder.h:89
+#: po/placeholder.h:88
#, c-format
msgid "building hdlist [%s]"
msgstr "�إ����Y�M�� (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 "�L�k�q�C�� \"%2$s\" Ū���M���� [%1$s]"
-#: po/placeholder.h:91 urpm.pm:1009
+#: po/placeholder.h:90 urpm.pm:1015
msgid "error registering local packages"
msgstr "�n�O�����M��ɵo�Ϳ��~"
-#: 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 "�����D���C�� \"%s\"�A�]�������T�a�Хܦ��i�������C��"
@@ -455,213 +467,272 @@ msgstr "�����D���C�� \"%s\"�A�]�������T�a�Хܦ��i�������C��"
msgid "unable to build hdlist: %s"
msgstr "�L�k�إ����Y�M�� (hdlist)�G%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 "������w�C�� \"%s\""
+
+#: po/placeholder.h:95 urpm.pm:1006
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "���X�k���M��W�� [%s]"
-#: 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 "������w�C�� \"%s\""
+msgid "unknown data associated with %s"
+msgstr "���Ԫ���ƻP %s �������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 "���թ����{�s���C�� \"%s\"�A�����o�ӴC��"
-#: po/placeholder.h:97 urpm.pm:863
+#: po/placeholder.h:98 urpm.pm:869
#, c-format
msgid "write depslist file [%s]"
msgstr "�g�J�����M�� (depslist) [%s]"
-#: po/placeholder.h:98 urpm.pm:1322
-#, c-format
-msgid "unknown data associated with %s"
-msgstr "���Ԫ���ƻP %s �������s"
-
-#: po/placeholder.h:99
-#, c-format
-msgid "source of [%s] not found as [%s]"
-msgstr "�L�k�b�o�� [%2$s] ���ӷ��� [%1$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 "�L�k�s�� \"%s\" ���M���ɡA�����o�ӴC�� "
-#: 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 "�S����� %s �]�S�������ɮץh�i���s"
-#: po/placeholder.h:102
-#, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
-msgstr "�U�� [%s] ���� (�O�_�S���w�� wget �{���H)"
-
-#: po/placeholder.h:103 urpm.pm:1001
+#: po/placeholder.h:101 urpm.pm:1007
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "�L�k�s���M���� [%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 "�L�k�g�J�����M�� (depslist) [%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 ""
+"�����M�� %s �H�K�i��ɯŨ� ...\n"
+" ���� %s�A�_�h���N���ॿ�T�ɯšI"
+
+#: po/placeholder.h:107 urpm.pm:342 urpm.pm:1630
#, c-format
msgid "unable to access medium \"%s\""
msgstr "�L�k�s���C�� \"%s\""
-#: po/placeholder.h:106 urpm.pm:988
+#: po/placeholder.h:108 urpm.pm:994
#, c-format
msgid "relocated %s entries in depslist"
msgstr "���s�ƦC %s �������M�椺������"
-#: 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 "�L�k���T�ѪR�b�ƭ� \"%2$s\" ���� [%1$s]"
+msgid "trying to select inexistent medium \"%s\""
+msgstr "���Ͽ�ܤ��s�b���C�� \"%s\""
-#: po/placeholder.h:108
+#: po/placeholder.h:110 urpm.pm:97
+#, fuzzy
+msgid "wget failed\n"
+msgstr "�ϥ� wget �U�� [%s] ����"
+
+#: po/placeholder.h:111 urpm.pm:920 urpm.pm:1486 urpm.pm:1537
#, c-format
-msgid "no rpm files found from [%s]"
-msgstr "�b [%s] ���䤣��M����"
+msgid "unable to parse correctly [%s] on value \"%s\""
+msgstr "�L�k���T�ѪR�b�ƭ� \"%2$s\" ���� [%1$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 "�H�U�M��]�t %s�G%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 "�b���̦��h�ӬۦP�W�٪��M�� \"%s\""
+msgid "no rpm files found from [%s]"
+msgstr "�b [%s] ���䤣��M����"
-#: po/placeholder.h:111 urpm.pm:1920
+#: po/placeholder.h:114 urpm.pm:1772
#, c-format
msgid "selecting %s using obsoletes"
msgstr "��w���M��o�檩�� %s �|�ϥΨ�䥦�L�ɪ��M��"
-#: po/placeholder.h:112 urpm.pm:2031
+#: po/placeholder.h:115 urpm.pm:1888
#, c-format
msgid "selecting %s by selection on files"
msgstr "��������ɮ׮ɦ۰ʿ�w %s �M��"
-#: 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 "�L�k�T�w�o�����Y�M�� (hdlist) [%s] �������C��"
-#: 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 - ��ܥ����ﶵ�Ҵ��Ѫ���T�C"
+
+#: po/placeholder.h:121 urpmi:361
+msgid "everything already installed"
+msgstr "�������w�w��"
+
+#: po/placeholder.h:122 urpmi:98
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi�G���Ԫ��ﶵ \"-%s\"�A�п�J --help �ﶵ�\Ū�ϥΤ�k\n"
+
+#: po/placeholder.h:123 urpmi:194
+msgid "One of the following packages is needed:"
+msgstr "���n�H�U�䤤�@�ӮM��G"
+
+#: 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 "�w�˥���"
-#: po/placeholder.h:115 urpmi:279
-msgid "Press enter when it's done..."
-msgstr "������� <��J��>�D�D"
+#: 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 "�藍�_�A��ܿ��~�A�ЦA�դ@��\n"
+#: po/placeholder.h:134
+#, fuzzy
+msgid " --X - use X interface.\n"
+msgstr " --all - ��ܥ����ﶵ�Ҵ��Ѫ���T�C"
-#: 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 "���F�O����F���M��ॿ�`����A�H�U���M���ݭn�@�P�w�ˡC (%d MB)"
+
+#: po/placeholder.h:136 urpmi:320 urpmi:344
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "�L���ˬd�M�󪺥i�����O�N�i��w�ˡH(y/N)(�O/�_)"
+
+#: 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 - ��ܥ����ﶵ�Ҵ��Ѫ���T�C"
+
+#: po/placeholder.h:144 urpmi:202
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "���@�ӬO�A����ܡS (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 "�o�O�@�Ӧۥѵ{���ÿ��� GNU GPL �����ڵo�G�C"
+
+#: po/placeholder.h:152 urpmi:328 urpmi:352
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "�ϥαj��ʪ��w�ˤ覡 (--force)�H(y/N)(�O/�_)"
+
+#: po/placeholder.h:154
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
msgstr ""
-"urpmi ���� %s\n"
-"���v�Ҧ� (C) 1999, 2000, 2001 MandrakeSoft�C\n"
-"�o�O�@�Ӧۥѵ{���ÿ��� GNU GPL �����ڵo�G�C\n"
-"�Ϊk�G\n"
-" --help - ��ܳo�ӻ����C\n"
-" --update - �u���s�C���C\n"
-" --auto - �۰ʿ�ܤ@�ӦX�A���M��C\n"
-" --auto-select - �۰ʿ�ܦ����M��i��ɯųo�Өt�ΡC\n"
-" --force - �j�����w�˧Y�ϬY�Ǭ����M�󤣦s�b�C\n"
-" --X - �ϥ� X �����C\n"
-" --best-output - ���ӥثe���ҿ�̦ܳn�������G\n"
-" X �Ϊ� ��r�Ҧ��C\n"
-" -a - ��ܩҦ��ŦX���O��n�D���M��C\n"
-" -m - ��ܻP�n�D�̱���Ӧw�˼ƶq�̤�(�w�])�C\n"
-" -M - ��ܻP�n�D�̱���Ӧw�˼ƶq�̦h�C\n"
-" -c - ��ܨϥΧ����k�h�ѨM�P�n�D�̱��񪺳B�z�C\n"
-" -p - �e�\�b\"�M��P�禡�w�M��\" (provides) ���M�䦳����"
-"�M��C\n"
-" -q - �L��T��ܼҦ��C\n"
-" -v - ��ܸ�T�Ҧ��C\n"
-" �b���O�洣�Ѫ��M��²�٩ήM����W (�u�� root �b��) �|�Q�w�ˡC\n"
-
-#: po/placeholder.h:142 urpmi:362
-msgid "everything already installed"
-msgstr "�������w�w��"
-#: po/placeholder.h:143 urpmi:247
-#, c-format
+#: po/placeholder.h:155 urpmi:205
+msgid "Sorry, bad choice, try again\n"
+msgstr "�藍�_�A��ܿ��~�A�ЦA�դ@��\n"
+
+#: po/placeholder.h:156
msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
-msgstr "���F�O����F���M��ॿ�`����A�H�U���M���ݭn�@�P�w�ˡC (%d MB)"
+" names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: po/placeholder.h:158
+msgid " -a - select all matches on command line.\n"
+msgstr ""
+
+#: po/placeholder.h:159
+msgid " --curl - use curl to retrieve distant files.\n"
+msgstr ""
-#: po/placeholder.h:144 urpmi:296
+#: po/placeholder.h:160 urpmi:294
#, c-format
msgid "installing %s\n"
msgstr "���b�w�� %s\n"
-#: po/placeholder.h:145 urpmi:198
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "���@�ӬO�A����ܡS (1-%d) "
-
-#: po/placeholder.h:146 urpmi:321 urpmi:345
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "�L���ˬd�M�󪺥i�����O�N�i��w�ˡH(y/N)(�O/�_)"
-
-#: po/placeholder.h:147 urpmi:190
-msgid "One of the following packages is needed:"
-msgstr "���n�H�U�䤤�@�ӮM��G"
-
-#: po/placeholder.h:148 urpmi:149
+#: po/placeholder.h:161 urpmi:152
msgid "Only superuser is allowed to install local packages"
msgstr "�u���W�ŨϥΪ̤~���\�w�˥����M��"
-#: 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 "�бN�㦳�W�� \"%s\" ���C����J��˸m [%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 "�k���o��l�X�M��A���"
-#: po/placeholder.h:151 urpmi:329 urpmi:353
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "�ϥαj��ʪ��w�ˤ覡 (--force)�H(y/N)(�O/�_)"
+#: po/placeholder.h:165 urpmi:102
+#, fuzzy
+msgid "Only superuser is allowed to install packages"
+msgstr "�u���W�ŨϥΪ̤~���\�w�˥����M��"
-#: po/placeholder.h:155 urpmi.addmedia:46
+#: po/placeholder.h:166 urpmi:193
+#, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "���n�w�˥H�U�䤤���@�ӮM�� %s�G"
+
+#: po/placeholder.h:167 urpmi:277
+msgid "Press Enter when it's done..."
+msgstr "������� <��J��>�D�D"
+
+#: po/placeholder.h:168 urpmi.addmedia:46
#, c-format
msgid ""
"%s\n"
@@ -670,7 +741,7 @@ msgstr ""
"%s\n"
"ftp �C���� url �ʤ֤F `with' �o������r\n"
-#: po/placeholder.h:159
+#: po/placeholder.h:172
msgid ""
"usage: urpmi.addmedia [--update] <name> <url>\n"
"where <url> is one of\n"
@@ -690,17 +761,17 @@ msgstr ""
" http://<�D���W��>/<���|> with <hdlist �������ɮצW��>\n"
" removable_<�˸m>://<���|>\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 "�L�k�إߴC�� \"%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 "�L�k��s�C�� \"%s\"\n"
-#: po/placeholder.h:170 urpmi.addmedia:42
+#: po/placeholder.h:183 urpmi.addmedia:42
#, c-format
msgid ""
"%s\n"
@@ -709,7 +780,7 @@ msgstr ""
"%s\n"
"�˸m `%s' ���s�b\n"
-#: po/placeholder.h:174 urpmi.addmedia:44
+#: po/placeholder.h:187 urpmi.addmedia:44
#, c-format
msgid ""
"%s\n"
@@ -718,7 +789,7 @@ msgstr ""
"%s\n"
"�ʤ֤F <���Y�M�� (hdlist) ���������|>\n"
-#: po/placeholder.h:178
+#: po/placeholder.h:191
#, c-format
msgid ""
"usage: urpmi.update [-a] <name> ...\n"
@@ -737,11 +808,11 @@ msgstr ""
"\n"
"���Ԫ��ﶵ '%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 "�L�i��s (�ϥ� urpmi.addmedia ���O�s�W�C��)\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"
@@ -750,11 +821,11 @@ msgstr ""
"�ʤ֤F���n��s������\n"
"(%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 "�L�i���� (�ϥ� urpmi.addmedia ���O�s�W�C��)\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"
@@ -763,7 +834,7 @@ msgstr ""
"�ʤ֤F���n�R��������\n"
"(%s ���䤤�@��)\n"
-#: po/placeholder.h:197
+#: po/placeholder.h:210
#, c-format
msgid ""
"usage: urpmi.removemedia [-a] <name> ...\n"
@@ -778,125 +849,112 @@ msgstr ""
"\n"
"���Ԫ��ﶵ '%s'\n"
-#: po/placeholder.h:204 urpmq:85
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq�G�L�kŪ���M���� \"%s\"\n"
-
-#: po/placeholder.h:206 urpmq:82
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq�G���Ԫ��ﶵ \"-%s\"�A�п�J --help �ﶵ�\Ū�ϥΤ�k\n"
+#: po/placeholder.h:217
+#, fuzzy
+msgid " -h - print this help message.\n"
+msgstr " --all - ��ܥ����ﶵ�Ҵ��Ѫ���T�C"
-#: 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 "���F�i�H���Q�ɯšA�Y�ǮM�󥲶����沾���A�o�ӥ\�ऴ���䴩\n"
-#: po/placeholder.h:208
+#: po/placeholder.h:219
+#, fuzzy
+msgid " -g - print groups too with name.\n"
+msgstr " --group - ��ܮM����ݸs�աC"
+
+#: po/placeholder.h:220 urpmq:84
#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq�G�L�kŪ���M���� \"%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 " �w�]�|��ܮM����W�A�����|��ܮM��²��)�C"
+
+#: 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 "�o�O�@�Ӧۥѵ{���ÿ��� GNU GPL �����ڵo�G�C"
+
+#: po/placeholder.h:231
+#, fuzzy
+msgid " -d - extend query to package dependencies.\n"
+msgstr " �w�]�|��ܮM����W�A�����|��ܮM��²��)�C"
+
+#: 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 ""
-"urpmq ���� %s\n"
-"���v�Ҧ� (C) 1999,2000,2001 MandrakeSoft�C\n"
-"�o�O�@�Ӧۥѵ{���ÿ��� GNU GPL �����ڵo�G�C\n"
-"�Ϊk�G\n"
-" -h - ��ܳo�q�����T���C\n"
-" -v - ���榹�{���ɷ|��ܧ�h���θ�T�C\n"
-" -d - �d�ߨ䥦�����M��C\n"
-" -u - ������ܤw�w�ˤξ֦���s�����������M��C\n"
-" -m - �d�ߨ䥦�����M��A������ܤw�w�ˤΥ��T�������M��A\n"
-" �u����ܨ��ǥi��|�ަܵL�k�ɯŪ������M��C\n"
-" -M - �d�ߨ䥦�����M��A������ܤw�w�ˤξ֦��ۦP�Χ�s����������"
-"�M��C\n"
-" -c - ��ܨϥΧ����k�h�ѨM�P�n�D�̱��񪺳B�z�C\n"
-" -p - �e�\�b\"�M��P�禡�w�M��\"���M�䦳���M��C\n"
-" -g - ��ܮM����ݸs�եH�ήM��W�١C\n"
-" -r - ��ܪ����A�o���T�H�ήM��W�١C\n"
-" --update - �u���s�C���C\n"
-" --auto-select - �۰ʿ�ܬ����M��i��ɯųo�Өt�ΡC\n"
-" --headers - �q urpmi ����Ʈw����X�M�����Y�A��ܩ�\n"
-" �зǿ�X (�u�� root �b��)�C\n"
-" --sources - �U���e����ܥ����ӷ��M�� (�u�� root �b��)�C\n"
-" --force - �j�����w�˧Y�ϬY�Ǭ����M�󤣦s�b�C\n"
-"�d�ߦb���O�椺���Ѫ��M��²�٩ήM����W�C\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�G���Ԫ��ﶵ \"-%s\"�A�п�J --help �ﶵ�\Ū�ϥΤ�k\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 "�L�k�إߴC�� \"%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 "Ū�������M�� (depslist) [%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 "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�G���Ԫ��ﶵ \"-%s\"�A�п�J --help �ﶵ�\Ū�ϥΤ�k\n"
+#: urpm.pm:1797 urpm.pm:1806
+msgid ", $otherPackage, "
+msgstr ", $otherPackage, "
-#: urpmi:102
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr "�u���W�ŨϥΪ̤~���\�w�˥����M��"
+#: urpm.pm:1797 urpm.pm:1806
+msgid "));"
+msgstr "));"
-#: urpmi:189
-#, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "���n�w�˥H�U�䤤���@�ӮM�� %s�G"
+#: 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 "urpmi ���� %s"
#: urpmi.addmedia:30
msgid "usage: urpmi.addmedia [--update] <name> <url>"
@@ -927,3 +985,123 @@ msgstr ", $_);"
#, c-format
msgid "urpmq version %s"
msgstr "urpmq ���� %s"
+
+#~ msgid "retrieving [%s]"
+#~ msgstr "�^�� [%s]"
+
+#~ msgid "wget of [%s] failed (maybe wget is missing?)"
+#~ msgstr "�U�� [%s] ���� (�O�_�S���w�� wget �{���H)"
+
+#~ msgid "unable to copy source of [%s] from [%s]"
+#~ msgstr "�L�k�q [%2$s] �ƻs�ӷ��� [%1$s]"
+
+#~ msgid "removable medium not selected"
+#~ msgstr "������w�i�������C��"
+
+#~ msgid "source of [%s] not found as [%s]"
+#~ msgstr "�L�k�b�o�� [%2$s] ���ӷ��� [%1$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 ""
+#~ "urpmi ���� %s\n"
+#~ "���v�Ҧ� (C) 1999, 2000, 2001 MandrakeSoft�C\n"
+#~ "�o�O�@�Ӧۥѵ{���ÿ��� GNU GPL �����ڵo�G�C\n"
+#~ "�Ϊk�G\n"
+#~ " --help - ��ܳo�ӻ����C\n"
+#~ " --update - �u���s�C���C\n"
+#~ " --auto - �۰ʿ�ܤ@�ӦX�A���M��C\n"
+#~ " --auto-select - �۰ʿ�ܦ����M��i��ɯųo�Өt�ΡC\n"
+#~ " --force - �j�����w�˧Y�ϬY�Ǭ����M�󤣦s�b�C\n"
+#~ " --X - �ϥ� X �����C\n"
+#~ " --best-output - ���ӥثe���ҿ�̦ܳn�������G\n"
+#~ " X �Ϊ� ��r�Ҧ��C\n"
+#~ " -a - ��ܩҦ��ŦX���O��n�D���M��C\n"
+#~ " -m - ��ܻP�n�D�̱���Ӧw�˼ƶq�̤�(�w�])�C\n"
+#~ " -M - ��ܻP�n�D�̱���Ӧw�˼ƶq�̦h�C\n"
+#~ " -c - ��ܨϥΧ����k�h�ѨM�P�n�D�̱��񪺳B�z�C\n"
+#~ " -p - �e�\�b\"�M��P�禡�w�M��\" (provides) ���M�䦳��"
+#~ "���M��C\n"
+#~ " -q - �L��T��ܼҦ��C\n"
+#~ " -v - ��ܸ�T�Ҧ��C\n"
+#~ " �b���O�洣�Ѫ��M��²�٩ήM����W (�u�� root �b��) �|�Q�w�ˡC\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 ""
+#~ "urpmq ���� %s\n"
+#~ "���v�Ҧ� (C) 1999,2000,2001 MandrakeSoft�C\n"
+#~ "�o�O�@�Ӧۥѵ{���ÿ��� GNU GPL �����ڵo�G�C\n"
+#~ "�Ϊk�G\n"
+#~ " -h - ��ܳo�q�����T���C\n"
+#~ " -v - ���榹�{���ɷ|��ܧ�h���θ�T�C\n"
+#~ " -d - �d�ߨ䥦�����M��C\n"
+#~ " -u - ������ܤw�w�ˤξ֦���s�����������M��C\n"
+#~ " -m - �d�ߨ䥦�����M��A������ܤw�w�ˤΥ��T�������M��A\n"
+#~ " �u����ܨ��ǥi��|�ަܵL�k�ɯŪ������M��C\n"
+#~ " -M - �d�ߨ䥦�����M��A������ܤw�w�ˤξ֦��ۦP�Χ�s������"
+#~ "�����M��C\n"
+#~ " -c - ��ܨϥΧ����k�h�ѨM�P�n�D�̱��񪺳B�z�C\n"
+#~ " -p - �e�\�b\"�M��P�禡�w�M��\"���M�䦳���M��C\n"
+#~ " -g - ��ܮM����ݸs�եH�ήM��W�١C\n"
+#~ " -r - ��ܪ����A�o���T�H�ήM��W�١C\n"
+#~ " --update - �u���s�C���C\n"
+#~ " --auto-select - �۰ʿ�ܬ����M��i��ɯųo�Өt�ΡC\n"
+#~ " --headers - �q urpmi ����Ʈw����X�M�����Y�A��ܩ�\n"
+#~ " �зǿ�X (�u�� root �b��)�C\n"
+#~ " --sources - �U���e����ܥ����ӷ��M�� (�u�� root �b��)�C\n"
+#~ " --force - �j�����w�˧Y�ϬY�Ǭ����M�󤣦s�b�C\n"
+#~ "�d�ߦb���O�椺���Ѫ��M��²�٩ήM����W�C\n"
diff --git a/urpm.pm b/urpm.pm
index 66eacbc1..cf692c93 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -157,10 +157,10 @@ sub read_config {
my (%hdlists, %lists);
foreach (@{$urpm->{media}}) {
exists $hdlists{$_->{hdlist}} and
- $_->{ignore} = 1, $urpm->{error}(_("medium \"%s\" try to use an already used hdlist, medium ignored", $_->{name}));
+ $_->{ignore} = 1, $urpm->{error}(_("medium \"%s\" tries to use an already used hdlist, medium ignored", $_->{name}));
$hdlists{$_->{hdlist}} = undef;
exists $lists{$_->{list}} and
- $_->{ignore} = 1, $urpm->{error}(_("medium \"%s\" try to use an already used list, medium ignored", $_->{name}));
+ $_->{ignore} = 1, $urpm->{error}(_("medium \"%s\" tries to use an already used list, medium ignored", $_->{name}));
$lists{$_->{list}} = undef;
}
@@ -181,7 +181,7 @@ sub read_config {
foreach (@{$urpm->{media}}) {
$_->{name} eq $2 and $medium = $_, last;
}
- $medium and $urpm->{error}(_("unable to use name \"%s\" for unamed medium because it is already used",
+ $medium and $urpm->{error}(_("unable to use name \"%s\" for unnamed medium because it is already used",
$2)), next;
$medium = { name => $2, hdlist => "hdlist.$1", list => "list.$2" };
@@ -391,7 +391,7 @@ sub remove_media {
#- when a medium is removed, depslist and others need to be recomputed.
$urpm->{modified} = 1;
} else {
- $urpm->{error}(_("trying to remove inexistant medium \"%s\"", $_));
+ $urpm->{error}(_("trying to remove inexistent medium \"%s\"", $_));
}
}
@@ -424,7 +424,7 @@ sub select_media {
#- check if some arguments does not correspond to medium name.
foreach (keys %media) {
unless ($media{$_}) {
- $urpm->{error}(_("trying to select inexistant medium \"%s\"", $_));
+ $urpm->{error}(_("trying to select inexistent medium \"%s\"", $_));
}
}
}
@@ -1499,7 +1499,7 @@ sub get_source_packages {
if (/([^\/]*)\.rpm/) {
if (-s "$urpm->{cachedir}/rpms/$1.rpm") {
if (keys(%{$file2fullnames{$1} || {}}) > 1) {
- $urpm->{error}(_("there are multiples packages with the same rpm filename \"%s\""), $1);
+ $urpm->{error}(_("there are multiple packages with the same rpm filename \"%s\""), $1);
next;
} elsif (keys(%{$file2fullnames{$1} || {}}) == 1) {
my ($fullname) = keys(%{$file2fullnames{$1} || {}});
@@ -1525,7 +1525,7 @@ sub get_source_packages {
while (<F>) {
if (/(.*)\/([^\/]*)\.rpm$/) {
if (keys(%{$file2fullnames{$2} || {}}) > 1) {
- $urpm->{error}(_("there are multiples packages with the same rpm filename \"%s\""), $2);
+ $urpm->{error}(_("there are multiple packages with the same rpm filename \"%s\""), $2);
next;
} elsif (keys(%{$file2fullnames{$2} || {}}) == 1) {
my ($fullname) = keys(%{$file2fullnames{$2} || {}});
diff --git a/urpme b/urpme
index 50610fc4..735cd0f8 100644
--- a/urpme
+++ b/urpme
@@ -63,7 +63,7 @@ if (@toremove > @l && !$auto) {
my $sum = 0; map { $sum += $_ } `rpm -q --queryformat "%{SIZE}\n" @toremove`;
print "To satisfy dependencies, the following packages are going to be removed";
printf " (%d MB)", toMb($sum);
- print ":\n@toremove\nIs it ok? (Y/n) ";
+ print ":\n@toremove\nIs it OK? (Y/n) ";
<STDIN> =~ /n/i and exit 0;
}
system("rpm", "-e", @toremove);
diff --git a/urpmi b/urpmi
index 199c0c8d..dfcbd701 100755
--- a/urpmi
+++ b/urpmi
@@ -50,20 +50,20 @@ Copyright (C) 1999, 2000, 2001 MandrakeSoft.
This is free software and may be redistributed under the terms of the GNU GPL.
usage:
-") . _(" --help - print this help message.
-") . _(" --update - use only update media.
-") . _(" --auto - automatically select a good package in choices.
-") . _(" --auto-select - automatically select packages for upgrading the system.
-") . _(" --force - force invocation even if some package do not exist.
-") . _(" --wget - use wget to retrieve distant files.
-") . _(" --curl - use curl to retrieve distant files.
-") . _(" --X - use X interface.
-") . _(" --best-output - choose best interface according to the environment:
- X or text mode.
-") . _(" -a - select all matches on command line.
-") . _(" -p - allow search in provides to find package.
-") . _(" -q - quiet mode.
-") . _(" -v - verbose mode.
+") . _(" --help - print this help message.
+") . _(" --update - use only update media.
+") . _(" --auto - automatically select a good package in choices.
+") . _(" --auto-select - automatically select packages for upgrading the system.
+") . _(" --force - force invocation even if some packages do not exist.
+") . _(" --wget - use wget to retrieve distant files.
+") . _(" --curl - use curl to retrieve distant files.
+") . _(" --X - use X interface.
+") . _(" --best-output - choose best interface according to the environment:
+ X or text mode.
+") . _(" -a - select all matches on command line.
+") . _(" -p - allow search in provides to find package.
+") . _(" -q - quiet mode.
+") . _(" -v - verbose mode.
") . "\n" . _(" names or rpm files (only for root) given on command line are installed.
", $urpm::VERSION);
exit(0);
@@ -218,7 +218,7 @@ if ($auto_select) {
$urpm->select_packages_to_upgrade('', \%packages, \%to_remove, \%keep_files);
if (keys(%to_remove) > 0) {
- print STDERR "some package have to be removed for being upgraded, this is not supported yet\n";
+ print STDERR "some packages have to be removed for being upgraded, this is not supported yet\n";
}
}
@@ -245,7 +245,7 @@ foreach (keys %packages) {
if (!$auto) {
if ($ask_user) {
my $msg = _("To satisfy dependencies, the following packages are going to be installed (%d MB)", toMb($sum));
- my $msg2 = _("Is it ok?");
+ my $msg2 = _("Is it OK?");
if ($X) {
my $p = join "\n", @to_install;
my $ok = _("Ok");
@@ -274,7 +274,7 @@ foreach (@$local_to_removes) {
my %sources = $urpm->upload_source_packages($local_sources, $list, ($X ? '' : 'force_local'),
(!$auto || $allow_medium_change) && sub {
my $msg = _("Please insert the medium named \"%s\" on device [%s]", @_);
- my $msg2 = _("Press enter when it's done...");
+ my $msg2 = _("Press Enter when it's done...");
if ($X) {
my $ok = _("Ok");
my $cancel = _("Cancel");
diff --git a/urpmq b/urpmq
index b5f0910d..5a82f419 100755
--- a/urpmq
+++ b/urpmq
@@ -50,7 +50,8 @@ usage:
") . _(" --headers - extract headers for package listed from urpmi db to
stdout (root only).
") . _(" --sources - give all source packages before downloading (root only).
-") . _(" --force - force invocation even if some package do not exist.
+") . _(" --force - force invocation even if some packages do not
+exist.
") . "\n" . _(" names or rpm files given on command line are queried.
", $urpm::VERSION);
exit(0);