sync with code

1 files changed, 82 insertions, 77 deletions

diff --git a/po/uz@cyrillic.po b/po/uz@cyrillic.po
index 303d2ccd..dd7966c9 100644
--- a/po/uz@cyrillic.po
+++ b/po/uz@cyrillic.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: uz\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-10 13:35+0200\n"
+"POT-Creation-Date: 2009-08-17 17:47+0200\n"
 "PO-Revision-Date: 2007-09-13 16:43+0200\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <floss-uz-l10n@googlegroups.com>\n"
@@ -317,9 +317,9 @@ msgstr "Илтимос \"%s\" номли тўпламни [%s] ускунаси�
 msgid "Downloading package `%s'..."
 msgstr "\"%s\" пакети олинмоқда..."
 
-#: ../gurpmi2:360 ../urpm.pm:327 ../urpm/download.pm:821
-#: ../urpm/get_pkgs.pm:236 ../urpm/media.pm:810 ../urpm/media.pm:1271
-#: ../urpm/media.pm:1422
+#: ../gurpmi2:360 ../urpm.pm:329 ../urpm/download.pm:821
+#: ../urpm/get_pkgs.pm:236 ../urpm/media.pm:912 ../urpm/media.pm:1414
+#: ../urpm/media.pm:1565
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...олиш муваффақиятсиз тугади: %s"
@@ -411,77 +411,77 @@ msgstr "Фақат бошқарувчи пакетларни ўрнатиши м
 msgid "Running urpmi in restricted mode..."
 msgstr ""
 
-#: ../urpm.pm:112
+#: ../urpm.pm:113
 #, fuzzy, c-format
 msgid "fail to create directory %s"
 msgstr "тўпламни яратиб бўлмади: \"%s\"\n"
 
-#: ../urpm.pm:113
+#: ../urpm.pm:114
 #, c-format
 msgid "invalid owner for directory %s"
 msgstr ""
 
-#: ../urpm.pm:125
+#: ../urpm.pm:126
 #, fuzzy, c-format
 msgid "Can not download packages into %s"
 msgstr "\"%s\" пакети олинмоқда..."
 
-#: ../urpm.pm:140
+#: ../urpm.pm:141
 #, c-format
 msgid "Environment directory %s does not exist"
 msgstr ""
 
-#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#: ../urpm.pm:142 ../urpmf:248 ../urpmq:165
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpm.pm:302
+#: ../urpm.pm:304
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "rpmdb'ни очиб бўлмади"
 
-#: ../urpm.pm:316
+#: ../urpm.pm:318
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "RPM-файлининг номи (%s) нотўғри"
 
-#: ../urpm.pm:322
+#: ../urpm.pm:324
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "RPM-файли (%s) олинмоқда..."
 
-#: ../urpm.pm:324 ../urpm/get_pkgs.pm:234
+#: ../urpm.pm:326 ../urpm/get_pkgs.pm:234
 #, c-format
 msgid "...retrieving done"
 msgstr "...олиш тугади"
 
-#: ../urpm.pm:332
+#: ../urpm.pm:334
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "RPM-файлига (%s) мурожаат қилиб бўлмади"
 
-#: ../urpm.pm:337
+#: ../urpm.pm:339
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr ""
 
-#: ../urpm.pm:345
+#: ../urpm.pm:347
 #, c-format
 msgid "unable to register rpm file"
 msgstr "RPM-файлини рўйхатдан ўтказиб бўлмади"
 
-#: ../urpm.pm:347
+#: ../urpm.pm:349
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:351
+#: ../urpm.pm:353
 #, c-format
 msgid "error registering local packages"
 msgstr ""
 
-#: ../urpm.pm:439
+#: ../urpm.pm:441
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
@@ -583,7 +583,7 @@ msgstr "%s мослама файлини ўқиб бўлмади"
 msgid "medium `%s' is defined twice, aborting"
 msgstr "\"%s\" тўплами икки марта аниқланган, амал бекор қилинади"
 
-#: ../urpm/cfg.pm:251 ../urpm/media.pm:477
+#: ../urpm/cfg.pm:251 ../urpm/media.pm:537
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "мослама файлини (%s) ёзиб бўлмади"
@@ -873,7 +873,7 @@ msgstr "%s пакети олиб ташланмоқда"
 msgid "removing installed rpms (%s) from %s"
 msgstr ""
 
-#: ../urpm/install.pm:283
+#: ../urpm/install.pm:284
 #, c-format
 msgid "More information on package %s"
 msgstr "%s пакети ҳақида кўпроқ маълумот"
@@ -1018,49 +1018,49 @@ msgstr "Ўрнатиш мумкин"
 msgid "warning: md5sum for %s unavailable in MD5SUM file"
 msgstr "ДИҚҚАТ: MD5SUM файлида %s учун md5sum ҳақида маълумот мавжуд эмас"
 
-#: ../urpm/media.pm:194
+#: ../urpm/media.pm:254
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr ""
 
-#: ../urpm/media.pm:196
+#: ../urpm/media.pm:256
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 "\"%s\" учун рўйхат файлига мурожаат қилиб бўлмади, тўплам эътиборга олинмайди"
 
-#: ../urpm/media.pm:199
+#: ../urpm/media.pm:259
 #, fuzzy, c-format
 msgid "unable to access synthesis file of \"%s\", medium ignored"
 msgstr ""
 "\"%s\" учун hdlist файлига мурожаат қилиб бўлмади, тўплам эътиборга олинмайди"
 
-#: ../urpm/media.pm:225
+#: ../urpm/media.pm:285
 #, c-format
 msgid "trying to override existing medium \"%s\", skipping"
 msgstr ""
 
-#: ../urpm/media.pm:441
+#: ../urpm/media.pm:501
 #, c-format
 msgid "failed to migrate removable device, ignoring media"
 msgstr ""
 
-#: ../urpm/media.pm:479
+#: ../urpm/media.pm:539
 #, c-format
 msgid "wrote config file [%s]"
 msgstr "мослама файли (%s) ёзилди"
 
-#: ../urpm/media.pm:521
+#: ../urpm/media.pm:582
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
 
-#: ../urpm/media.pm:529
+#: ../urpm/media.pm:590
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr ""
 
-#: ../urpm/media.pm:545
+#: ../urpm/media.pm:606
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -1069,213 +1069,218 @@ msgstr ""
 "--synthesis'дан --media, --excludemedia, --sortmedia, --update, --use-"
 "distrib ёки --parallel билан бирга фойдаланиб бўлмайди"
 
-#: ../urpm/media.pm:663
+#: ../urpm/media.pm:724
 #, c-format
 msgid "skipping package %s"
 msgstr "%s пакети ташлаб ўтилмоқда"
 
-#: ../urpm/media.pm:679
+#: ../urpm/media.pm:740
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr ""
 
-#: ../urpm/media.pm:704
+#: ../urpm/media.pm:765
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "тўплам аллақачон мавжуд: \"%s\""
 
-#: ../urpm/media.pm:743
+#: ../urpm/media.pm:804
 #, c-format
 msgid "(ignored by default)"
 msgstr "(андоза бўйича эътиборга олинмади)"
 
-#: ../urpm/media.pm:749
+#: ../urpm/media.pm:810
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:816
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "тўплам қўшилмоқда: %s"
 
-#: ../urpm/media.pm:784
+#: ../urpm/media.pm:842
+#, c-format
+msgid "failed to copy media.cfg to %s (%d)"
+msgstr ""
+
+#: ../urpm/media.pm:883
 #, fuzzy, c-format
 msgid "directory %s does not exist"
 msgstr "chroot директорияси мавжуд эмас"
 
-#: ../urpm/media.pm:792
+#: ../urpm/media.pm:891
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr ""
 
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:910
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr ""
 
-#: ../urpm/media.pm:811
+#: ../urpm/media.pm:913
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr ""
 
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:931
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:880
+#: ../urpm/media.pm:982
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "media.cfg файли ёзиб олинмоқда..."
 
-#: ../urpm/media.pm:921
+#: ../urpm/media.pm:1023
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:924
+#: ../urpm/media.pm:1026
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr ""
 
-#: ../urpm/media.pm:944
+#: ../urpm/media.pm:1087
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "тўплам олиб ташланмоқда: \"%s\""
 
-#: ../urpm/media.pm:1027
+#: ../urpm/media.pm:1170
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "тўплам учун urpmi қайтадан мосланмоқда: \"%s\""
 
-#: ../urpm/media.pm:1061
+#: ../urpm/media.pm:1204
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...қайтадан мослаш муваффақиятсиз тугади"
 
-#: ../urpm/media.pm:1067
+#: ../urpm/media.pm:1210
 #, c-format
 msgid "reconfiguration done"
 msgstr "...қайтадан мослаш тугади"
 
-#: ../urpm/media.pm:1083
+#: ../urpm/media.pm:1226
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr ""
 
-#: ../urpm/media.pm:1104
+#: ../urpm/media.pm:1247
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "тўпламни янгилаш ҳожати йўқ: \"%s\""
 
-#: ../urpm/media.pm:1115
+#: ../urpm/media.pm:1258
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "synthesis файли (%s) текширилмоқда"
 
-#: ../urpm/media.pm:1135
+#: ../urpm/media.pm:1278
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "тўпламининг synthesis файлини ўқишда муаммо рўй берди: \"%s\""
 
-#: ../urpm/media.pm:1148 ../urpm/media.pm:1243
+#: ../urpm/media.pm:1291 ../urpm/media.pm:1386
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr ""
 
-#: ../urpm/media.pm:1150 ../urpm/media.pm:1220 ../urpm/media.pm:1473
+#: ../urpm/media.pm:1293 ../urpm/media.pm:1363 ../urpm/media.pm:1616
 #, c-format
 msgid "...copying failed"
 msgstr "...нусха кўчириш муваффақиятсиз тугади"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1359
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr ""
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1247
+#: ../urpm/media.pm:1361 ../urpm/media.pm:1390
 #, c-format
 msgid "...copying done"
 msgstr "...нусха кўчириш бажарилди"
 
-#: ../urpm/media.pm:1249
+#: ../urpm/media.pm:1392
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
 "'%s' файлидан нусха кўчириш муваффақиятсиз тугади (унинг ҳажми жуда кичик)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1440
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "олинган hdlist (ёки synthesis) файли учун md5sum сони ҳисобланмоқда..."
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1736
+#: ../urpm/media.pm:1442 ../urpm/media.pm:1882
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "%s'дан нусха кўчириш муваффақиятсиз тугади (md5sum нотўғри)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1457
 #, fuzzy, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "hdlist файли (%s) текширилмоқда"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1467
 #, fuzzy, c-format
 msgid "comparing %s and %s"
 msgstr "%s ва %s тозаланмоқда"
 
-#: ../urpm/media.pm:1354
+#: ../urpm/media.pm:1497
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "тўпламнинг hdlist файли %s хато: %s"
 
-#: ../urpm/media.pm:1380
+#: ../urpm/media.pm:1523
 #, fuzzy, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "'%s' учун pubkey файли текширилмоқда..."
 
-#: ../urpm/media.pm:1420
+#: ../urpm/media.pm:1563
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "RPM-файлининг номи (%s) нотўғри"
 
-#: ../urpm/media.pm:1423
+#: ../urpm/media.pm:1566
 #, fuzzy, c-format
 msgid "no metadata found for medium \"%s\""
 msgstr "тўплам учун ҳеч қандай hdlist файли топилмади: \"%s\""
 
-#: ../urpm/media.pm:1455
+#: ../urpm/media.pm:1598
 #, fuzzy, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "'%s' учун hdlist (ёки synthesis) файли ёзиб олинмоқда..."
 
-#: ../urpm/media.pm:1521
+#: ../urpm/media.pm:1664
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "'%s' учун pubkey файли текширилмоқда..."
 
-#: ../urpm/media.pm:1533
+#: ../urpm/media.pm:1676
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:1537
+#: ../urpm/media.pm:1680
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "'%s' учун pubkey файлини импорт қилиб бўлмади"
 
-#: ../urpm/media.pm:1578
+#: ../urpm/media.pm:1721
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "тўплам учун ҳеч қандай hdlist файли топилмади: \"%s\""
 
-#: ../urpm/media.pm:1611
+#: ../urpm/media.pm:1754
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "тўплам янгиланди: \"%s\""
 
-#: ../urpm/media.pm:1730
+#: ../urpm/media.pm:1876
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -3057,29 +3062,29 @@ msgstr "--list-nodes'дан фақат --parallel билан бирга фойд
 msgid "use -l to list files"
 msgstr ""
 
-#: ../urpmq:404
+#: ../urpmq:405
 #, c-format
 msgid "no xml info for medium \"%s\", only partial result for package %s"
 msgstr ""
 
-#: ../urpmq:405
+#: ../urpmq:406
 #, c-format
 msgid "no xml info for medium \"%s\", only partial result for packages %s"
 msgstr ""
 
-#: ../urpmq:408
+#: ../urpmq:409
 #, c-format
 msgid ""
 "no xml info for medium \"%s\", unable to return any result for package %s"
 msgstr ""
 
-#: ../urpmq:409
+#: ../urpmq:410
 #, c-format
 msgid ""
 "no xml info for medium \"%s\", unable to return any result for packages %s"
 msgstr ""
 
-#: ../urpmq:476
+#: ../urpmq:477
 #, c-format
 msgid "No changelog found\n"
 msgstr "Changelog файли топилмади\n"