sync with code

1 files changed, 113 insertions, 82 deletions

diff --git a/po/uz@cyrillic.po b/po/uz@cyrillic.po
index 311a38dc..07afb439 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: 2008-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+0100\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"
@@ -96,7 +96,89 @@ msgstr "_Бекор қилиш"
 msgid "Choose location to save file"
 msgstr "Файлни қаерга сақлаш жойини танланг"
 
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi, версия %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"Бу эркин дастур ва GNU GPL шартлари асосида тарқатилиши мумкин.\n"
+"\n"
+"Фойдаланиш:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:45 ../urpmf:35 ../urpmi:74
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
+#, c-format
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - шу ёрдам хабарини кўрсатиш.\n"
+
+#: ../gurpmi.pm:47
+#, c-format
+msgid ""
+"  --auto         - non-interactive mode, assume default answers to "
+"questions.    --auto\n"
+msgstr ""
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr "  --auto-select  - тизимни янгилаш учун пакетларни авто-танлаш.\n"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, c-format
+msgid ""
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+"  --verify-rpm   - ўрнатишдан аввал пакетнинг электрон имзосини текшириш\n"
+"                   (--no-verify-rpm ушбу амалнинг тескариси, андоза бўйича "
+"пакетнинг электрон имзоси текширилади).\n"
+
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:75 ../urpmq:47
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr ""
+"  --media        - фақат кўрсатилган, вергул билан ажратилган, тўпламлардан "
+"фойдаланиш.\n"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr ""
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, c-format
+msgid ""
+"  --test         - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr "  --test         - ўрнатишни тўғри бажариш имкониятини текшириш.\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, c-format
+msgid ""
+"  --searchmedia  - use only the given media to search requested packages.\n"
+msgstr ""
+
+#: ../gurpmi.pm:98
 #, c-format
 msgid "No packages specified"
 msgstr "Ҳеч қандай пакет кўрсатилмаган"
@@ -253,6 +335,11 @@ msgstr "Ўрнатиш тугади"
 msgid "removing %s"
 msgstr "%s ўчирилмоқда"
 
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "urpmi қайтадан ишга тушмоқда"
+
 #: ../rpm-find-leaves:14
 #, c-format
 msgid ""
@@ -405,7 +492,14 @@ msgstr ""
 msgid "Copying failed"
 msgstr "Нусха кўчириш муваффақиятсиз тугади"
 
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
 #, c-format
 msgid "medium \"%s\" is not available"
 msgstr ""
@@ -866,6 +960,11 @@ msgid "adding medium \"%s\""
 msgstr "тўплам қўшилмоқда: %s"
 
 #: ../urpm/media.pm:759
+#, fuzzy, c-format
+msgid "directory %s does not exist"
+msgstr "chroot директорияси мавжуд эмас"
+
+#: ../urpm/media.pm:767
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr ""
@@ -920,7 +1019,12 @@ msgstr "...қайтадан мослаш муваффақиятсиз тугад
 msgid "reconfiguration done"
 msgstr "...қайтадан мослаш тугади"
 
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+
+#: ../urpm/media.pm:1074
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "тўпламни янгилаш ҳожати йўқ: \"%s\""
@@ -1179,13 +1283,6 @@ msgstr ""
 "\n"
 "Фойдаланиш: urpmf [параметрлар] қидириш учун ифода\n"
 
-#: ../urpm/search.pm:35 ../urpme:45 ../urpmf:35 ../urpmi:74
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
-#, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - шу ёрдам хабарини кўрсатиш.\n"
-
 #: ../urpm/search.pm:36 ../urpmf:36
 #, c-format
 msgid "  --version      - print this tool's version number.\n"
@@ -1216,13 +1313,6 @@ msgstr ""
 msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
 msgstr ""
 
-#: ../urpm/search.pm:41 ../urpmf:41 ../urpmi:75 ../urpmq:47
-#, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr ""
-"  --media        - фақат кўрсатилган, вергул билан ажратилган, тўпламлардан "
-"фойдаланиш.\n"
-
 #: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
 #, c-format
 msgid ""
@@ -1581,12 +1671,6 @@ msgstr ""
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr "  --test         - олиб ташлашни тўғри бажариш имкониятини текшириш.\n"
 
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr ""
-
 #: ../urpme:49 ../urpmi:109 ../urpmq:67
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
@@ -1677,28 +1761,6 @@ msgstr " (ҳ/Й) "
 msgid "Removal failed"
 msgstr "Ўчириш муваффақиятсиз тугади"
 
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi, версия %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"Бу эркин дастур ва GNU GPL шартлари асосида тарқатилиши мумкин.\n"
-"\n"
-"Фойдаланиш:\n"
-
-#: ../urpmi:78
-#, c-format
-msgid ""
-"  --searchmedia  - use only the given media to search requested packages.\n"
-msgstr ""
-
 #: ../urpmi:81
 #, c-format
 msgid ""
@@ -1706,12 +1768,6 @@ msgid ""
 "questions.\n"
 msgstr ""
 
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr "  --auto-select  - тизимни янгилаш учун пакетларни авто-танлаш.\n"
-
 #: ../urpmi:83
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -1814,11 +1870,6 @@ msgid ""
 "                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid "  --root         - use another root for rpm installation.\n"
-msgstr ""
-
 #: ../urpmi:112
 #, c-format
 msgid ""
@@ -1891,23 +1942,6 @@ msgid ""
 "                   next arg.\n"
 msgstr ""
 
-#: ../urpmi:132
-#, c-format
-msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-"  --verify-rpm   - ўрнатишдан аввал пакетнинг электрон имзосини текшириш\n"
-"                   (--no-verify-rpm ушбу амалнинг тескариси, андоза бўйича "
-"пакетнинг электрон имзоси текширилади).\n"
-
-#: ../urpmi:134
-#, c-format
-msgid ""
-"  --test         - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr "  --test         - ўрнатишни тўғри бажариш имкониятини текшириш.\n"
-
 #: ../urpmi:135
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
@@ -2222,12 +2256,12 @@ msgstr[0] "%d-та пакетни ўрнатиш билан давом этиш�
 msgid "Cancel"
 msgstr "Бекор қилиш"
 
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr "urpmi қайтадан ишга тушмоқда"
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "Тайёр бўлганда ENTER тугмасини босинг..."
 
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
 #. -PO: neither the ``with''.  Only what is between <brackets> can be translated.
 #: ../urpmi.addmedia:36
 #, fuzzy, c-format
@@ -2916,9 +2950,6 @@ msgstr "Changelog файли топилмади\n"
 #~ msgid "Unknown option %s"
 #~ msgstr "Номаълум параметр \"%s\""
 
-#~ msgid "Press Enter when ready..."
-#~ msgstr "Тайёр бўлганда ENTER тугмасини босинг..."
-
 #~ msgid "  -c             - clean headers cache directory.\n"
 #~ msgstr "  -c             - сарлавҳаларнинг кэш директориясини тозалаш.\n"