sync with code

1 files changed, 77 insertions, 70 deletions

diff --git a/po/uz.po b/po/uz.po
index c9910b94..3d1c76af 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: uz\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+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"
@@ -59,7 +59,7 @@ msgstr "\"%s\" (%s/%s) paketi o'rnatilmoqda..."
 msgid "Downloading package `%s'..."
 msgstr "\"%s\" paketi olinmoqda..."
 
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
 #, c-format
 msgid "Cancel"
 msgstr "Bekor qilish"
@@ -71,22 +71,22 @@ msgstr "Bekor qilish"
 msgid "...retrieving failed: %s"
 msgstr "...olish muvaffaqiyatsiz tugadi: %s"
 
-#: ../gurpmi:45
+#: ../gurpmi:49
 #, c-format
 msgid "RPM installation"
 msgstr "RPM o'rnatish"
 
-#: ../gurpmi:59
+#: ../gurpmi:63
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Xato: %s fayli topilmadi, amal bekor qilinadi"
 
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
 #, c-format
 msgid "_Ok"
 msgstr "_Ok"
 
-#: ../gurpmi:80
+#: ../gurpmi:84
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -99,7 +99,7 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -114,7 +114,7 @@ msgstr ""
 "\n"
 "Davom etishni istaysizmi?"
 
-#: ../gurpmi:94
+#: ../gurpmi:98
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -129,26 +129,31 @@ msgstr ""
 "\n"
 "Ularni o'rnatmasdan kompyuterga saqlasa ham bo'ladi. Siz nimani istaysiz?"
 
-#: ../gurpmi:112
+#: ../gurpmi:116
 #, c-format
 msgid "_Install"
 msgstr "O'r_natish"
 
-#: ../gurpmi:113
+#: ../gurpmi:117
 #, c-format
 msgid "_Save"
 msgstr "_Saqlash"
 
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
 #, c-format
 msgid "_Cancel"
 msgstr "_Bekor qilish"
 
-#: ../gurpmi:122
+#: ../gurpmi:126
 #, c-format
 msgid "Choose location to save file"
 msgstr "Faylni qaerga saqlash joyini tanlang"
 
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "Ok"
+
 #: ../gurpmi.pm:56
 #, c-format
 msgid "Options:"
@@ -231,17 +236,17 @@ msgstr ""
 msgid "No packages specified"
 msgstr "Hech qanday paket ko'rsatilmagan"
 
-#: ../gurpmi2:42
+#: ../gurpmi2:46
 #, c-format
 msgid "Must be root"
 msgstr "root bo'lish kerak"
 
-#: ../gurpmi2:72
+#: ../gurpmi2:76
 #, c-format
 msgid "Preparing packages installation..."
 msgstr "Oʻrnatishga paketlar tayyorlanmoqda..."
 
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -250,7 +255,7 @@ msgstr ""
 "Talab qilingan ba'zi bir paketlarni o'rnatib bo'lmaydi:\n"
 "%s"
 
-#: ../gurpmi2:95
+#: ../gurpmi2:99
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -261,42 +266,37 @@ msgstr ""
 "%s\n"
 "Bunga qaramasdan o'rnatishni davom ettirishni istaysizmi?"
 
-#: ../gurpmi2:115
+#: ../gurpmi2:119
 #, c-format
 msgid "Warning"
 msgstr "Diqqat"
 
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "Ok"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
 #, c-format
 msgid " (to upgrade)"
 msgstr " (yangilash)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:170
 #, c-format
 msgid " (to install)"
 msgstr " (o'rnatish)"
 
-#: ../gurpmi2:169
+#: ../gurpmi2:173
 #, c-format
 msgid "Package choice"
 msgstr "Paket tanlovi"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:174
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Quyidagi paketlardan biri kerak:"
 
-#: ../gurpmi2:200
+#: ../gurpmi2:204
 #, c-format
 msgid "_Abort"
 msgstr "To'_xtatish"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:239
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -307,67 +307,67 @@ msgstr ""
 "%s\n"
 "O'rnatishni davom ettirishni istaysizmi?"
 
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "Diskda qo'shimcha %s joy ishlatiladi."
 
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "Diskda %s joy bo'shatiladi."
 
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
 #, fuzzy, c-format
 msgid "%s of packages will be retrieved."
 msgstr "Diskda %s joy bo'shatiladi."
 
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "%d-ta paketni o'rnatish bilan davom etishni istaysizmi?"
 
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Bog'liqliklarni ta'minlash uchun quyidagi paket ham o'rnatiladi:"
 
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Bog'liqliklarni ta'minlash uchun quyidagi paketlar ham o'rnatiladi:"
 
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Iltimos \"%s\" nomli to'plamni [%s] uskunasiga qo'ying"
 
-#: ../gurpmi2:303
+#: ../gurpmi2:307
 #, c-format
 msgid "An error occurred:"
 msgstr ""
 
-#: ../gurpmi2:315
+#: ../gurpmi2:319
 #, c-format
 msgid "_Done"
 msgstr "_Tayyor"
 
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
 #, fuzzy, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s"
 msgstr "O'rnatish muvaffaqiyatsiz tugadi:"
 
-#: ../gurpmi2:335
+#: ../gurpmi2:339
 #, fuzzy, c-format
 msgid "You may want to update your urpmi database."
 msgstr ""
@@ -375,22 +375,22 @@ msgstr ""
 "%s\n"
 "Balki urpmi ma'lumot bazasini yangilashingiz kerak."
 
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
 #, c-format
 msgid "Installation failed:"
 msgstr "O'rnatish muvaffaqiyatsiz tugadi:"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:348
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Hamma narsa allaqachon o'rnatilgan"
 
-#: ../gurpmi2:346
+#: ../gurpmi2:350
 #, c-format
 msgid "Installation finished"
 msgstr "O'rnatish tugadi"
 
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
 #, c-format
 msgid "restarting urpmi"
 msgstr "urpmi qaytadan ishga tushmoqda"
@@ -466,7 +466,7 @@ msgstr "\"%s\" paketi olinmoqda..."
 msgid "Environment directory %s does not exist"
 msgstr ""
 
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr ""
@@ -521,62 +521,62 @@ msgstr ""
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
 
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
 #, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr ""
 
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: RPM-faylini (%s) o'qib bo'lmadi\n"
 
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
 #, c-format
 msgid "unexpected expression %s"
 msgstr ""
 
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "Imzo yetishmaydi (%s)"
 
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
 #, c-format
 msgid "no expression to close"
 msgstr ""
 
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot direktoriyasi mavjud emas"
 
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "%s amalidan %s amalisiz foydalanib bo'lmaydi"
 
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "%s amalidan %s amali bilan birga foydalanib bo'lmaydi"
 
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
 
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
 #, c-format
 msgid ""
 "%s version %s\n"
@@ -592,7 +592,7 @@ msgstr ""
 "\n"
 "Foydalanish:\n"
 
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "Copyright (C) %s by %s"
@@ -639,7 +639,7 @@ msgstr "%s moslama faylini o'qib bo'lmadi"
 msgid "medium `%s' is defined twice, aborting"
 msgstr "\"%s\" to'plami ikki marta aniqlangan, amal bekor qilinadi"
 
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "moslama faylini (%s) yozib bo'lmadi"
@@ -1333,8 +1333,8 @@ msgstr ""
 
 #: ../urpm/msg.pm:170
 #, c-format
-msgid "(suggested)"
-msgstr "(taklif qilingan)"
+msgid "(recommended)"
+msgstr ""
 
 #: ../urpm/msg.pm:185
 #, c-format
@@ -1981,7 +1981,7 @@ msgstr ""
 
 #: ../urpmf:75
 #, c-format
-msgid "  --suggests     - suggests tags\n"
+msgid "  --recommends   - recommends tags\n"
 msgstr ""
 
 #: ../urpmf:76
@@ -2009,27 +2009,27 @@ msgstr "  -m             - paket qaysi to'plamda topilganini ko'rsatish\n"
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: ../urpmf:148
+#: ../urpmf:149
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr ""
 
-#: ../urpmf:193
+#: ../urpmf:194
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:286
+#: ../urpmf:287
 #, fuzzy, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "to'plam uchun hech qanday hdlist fayli topilmadi: \"%s\""
 
-#: ../urpmf:293
+#: ../urpmf:294
 #, fuzzy, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "to'plam uchun hdlist synthesis fayli yaratildi: \"%s\""
 
-#: ../urpmf:302
+#: ../urpmf:303
 #, fuzzy, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "to'plam uchun ro'yxat fayli yozilmoqda: \"%s\""
@@ -2056,7 +2056,7 @@ msgstr ""
 
 #: ../urpmi:80 ../urpmq:52
 #, c-format
-msgid "  --no-suggests  - do not auto select \"suggested\" packages.\n"
+msgid "  --no-recommends - do not auto select \"recommended\" packages.\n"
 msgstr ""
 
 #: ../urpmi:81
@@ -2145,7 +2145,7 @@ msgstr ""
 
 #: ../urpmi:105
 #, c-format
-msgid "  --allow-suggests - auto select \"suggested\" packages.\n"
+msgid "  --allow-recommends - auto select \"recommended\" packages.\n"
 msgstr ""
 
 #: ../urpmi:109
@@ -2939,7 +2939,7 @@ msgstr "  --verbose      - ortiqcha xabarlar bilan.\n"
 
 #: ../urpmq:84
 #, fuzzy, c-format
-msgid "  --suggests     - print suggests.\n"
+msgid "  --recommends   - print recommends.\n"
 msgstr "  --verbose      - ortiqcha xabarlar bilan.\n"
 
 #: ../urpmq:85
@@ -3093,6 +3093,13 @@ msgstr ""
 msgid "Authentication is required to run Mageia Package Installer"
 msgstr ""
 
+#~ msgid "(suggested)"
+#~ msgstr "(taklif qilingan)"
+
+#, fuzzy
+#~ msgid "  --suggests     - print suggests.\n"
+#~ msgstr "  --verbose      - ortiqcha xabarlar bilan.\n"
+
 #~ msgid "(%d package, %d MB)"
 #~ msgid_plural "(%d packages, %d MB)"
 #~ msgstr[0] "(%d-ta paket, %d Mb)"