sync with code

1 files changed, 38 insertions, 31 deletions

diff --git a/po/uz.po b/po/uz.po
index 095a9cc5..485ae1f0 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: 2012-02-27 21:09+0100\n"
+"POT-Creation-Date: 2012-03-21 08:44+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"
@@ -245,7 +245,7 @@ msgstr ""
 msgid "Warning"
 msgstr "Diqqat"
 
-#: ../gurpmi2:155 ../urpmi:632
+#: ../gurpmi2:155 ../urpmi:642
 #, c-format
 msgid "Ok"
 msgstr "Ok"
@@ -286,13 +286,13 @@ msgstr ""
 "%s\n"
 "O'rnatishni davom ettirishni istaysizmi?"
 
-#: ../gurpmi2:276 ../urpmi:599
+#: ../gurpmi2:276 ../urpmi:609
 #, 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:277 ../urpmi:600
+#: ../gurpmi2:277 ../urpmi:610
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
@@ -319,7 +319,7 @@ msgstr "Tayyorlanmoqda..."
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "\"%s\" (%s/%s) paketi o'rnatilmoqda..."
 
-#: ../gurpmi2:343 ../urpmi:627
+#: ../gurpmi2:343 ../urpmi:637
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Iltimos \"%s\" nomli to'plamni [%s] uskunasiga qo'ying"
@@ -372,7 +372,7 @@ msgstr "O'rnatish tugadi"
 msgid "removing %s"
 msgstr "%s o'chirilmoqda"
 
-#: ../gurpmi2:427 ../urpmi:695
+#: ../gurpmi2:427 ../urpmi:705
 #, c-format
 msgid "restarting urpmi"
 msgstr "urpmi qaytadan ishga tushmoqda"
@@ -585,22 +585,22 @@ msgstr ""
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "RPM-faylini (%s) \"%s\" to'plamidan o'qib bo'lmadi"
 
-#: ../urpm/cfg.pm:81
+#: ../urpm/cfg.pm:82
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "moslama faylining %s-chi satrida xato"
 
-#: ../urpm/cfg.pm:114
+#: ../urpm/cfg.pm:115
 #, c-format
 msgid "unable to read config file [%s]"
 msgstr "%s moslama faylini o'qib bo'lmadi"
 
-#: ../urpm/cfg.pm:140
+#: ../urpm/cfg.pm:141
 #, c-format
 msgid "medium `%s' is defined twice, aborting"
 msgstr "\"%s\" to'plami ikki marta aniqlangan, amal bekor qilinadi"
 
-#: ../urpm/cfg.pm:251 ../urpm/media.pm:541
+#: ../urpm/cfg.pm:252 ../urpm/media.pm:541
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "moslama faylini (%s) yozib bo'lmadi"
@@ -781,27 +781,27 @@ msgstr "%s paketini o'rnatib bo'lmadi"
 msgid "removing bad rpm (%s) from %s"
 msgstr "to'plam olib tashlanmoqda: \"%s\""
 
-#: ../urpm/install.pm:213 ../urpm/install.pm:277
+#: ../urpm/install.pm:213 ../urpm/install.pm:278
 #, fuzzy, c-format
 msgid "removing %s failed: %s"
 msgstr "...olish muvaffaqiyatsiz tugadi: %s"
 
-#: ../urpm/install.pm:258
+#: ../urpm/install.pm:259
 #, c-format
 msgid "Removing package %s"
 msgstr "%s paketi olib tashlanmoqda"
 
-#: ../urpm/install.pm:259
+#: ../urpm/install.pm:260
 #, c-format
 msgid "removing package %s"
 msgstr "%s paketi olib tashlanmoqda"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:276
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr ""
 
-#: ../urpm/install.pm:284
+#: ../urpm/install.pm:285
 #, c-format
 msgid "More information on package %s"
 msgstr "%s paketi haqida ko'proq ma'lumot"
@@ -1010,6 +1010,11 @@ msgstr ""
 "--synthesis'dan --media, --excludemedia, --sortmedia, --update, --use-"
 "distrib yoki --parallel bilan birga foydalanib bo'lmaydi"
 
+#: ../urpm/media.pm:719
+#, c-format
+msgid "Search start: %s end: %s"
+msgstr "Qidirish boshi: %s oxiri: %s"
+
 #: ../urpm/media.pm:736
 #, c-format
 msgid "skipping package %s"
@@ -1253,7 +1258,7 @@ msgstr ""
 msgid "getting mirror list from %s"
 msgstr "RPM-fayllari %s'dan o'qilmoqda"
 
-#: ../urpm/msg.pm:76 ../urpmi:495 ../urpmi:513 ../urpmi:619
+#: ../urpm/msg.pm:76 ../urpmi:495 ../urpmi:513 ../urpmi:629
 #, c-format
 msgid "Nn"
 msgstr "JjJjNn"
@@ -2405,7 +2410,7 @@ msgstr ""
 "\n"
 "Bunga qaramasdan davom etishni istaysizmi?"
 
-#: ../urpmi:497 ../urpmi:515 ../urpmi:620 ../urpmi.addmedia:136
+#: ../urpmi:497 ../urpmi:515 ../urpmi:630 ../urpmi.addmedia:136
 #, c-format
 msgid " (Y/n) "
 msgstr " (H/y) "
@@ -2468,38 +2473,43 @@ msgid_plural "The following orphan packages will be removed."
 msgstr[0] ""
 "Bog'liqliklarni ta'minlash uchun quyidagi %d-ta paket olib tashlanadi"
 
-#: ../urpmi:602
+#: ../urpmi:600
+#, c-format
+msgid "WARNING: %s option is in use. Some strange problems may happen"
+msgstr ""
+
+#: ../urpmi:612
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(sinov usuli, hech narsa o'rnatilmaydi)"
 
-#: ../urpmi:608
+#: ../urpmi:618
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "Diskda qo'shimcha %s joy ishlatiladi."
 
-#: ../urpmi:609
+#: ../urpmi:619
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "Diskda %s joy bo'shatiladi."
 
-#: ../urpmi:610
+#: ../urpmi:620
 #, fuzzy, c-format
 msgid "%s of packages will be retrieved."
 msgstr "Diskda %s joy bo'shatiladi."
 
-#: ../urpmi:611
+#: ../urpmi:621
 #, 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?"
 
-#: ../urpmi:632
+#: ../urpmi:642
 #, c-format
 msgid "Cancel"
 msgstr "Bekor qilish"
 
-#: ../urpmi:640
+#: ../urpmi:650
 #, fuzzy, c-format
 msgid "Press Enter when mounted..."
 msgstr "Tayyor bo'lganda ENTER tugmasini bosing..."
@@ -3224,13 +3234,13 @@ msgid "No changelog found\n"
 msgstr "Changelog fayli topilmadi\n"
 
 #: ../gurpmi.desktop.in.h:1
-msgid "Graphical front end to install RPM files"
-msgstr "RPM fayllarini oʻrnatish uchun grafik interfeys"
-
-#: ../gurpmi.desktop.in.h:2
 msgid "Software Installer"
 msgstr "Dastur oʻrnatuvchisi"
 
+#: ../gurpmi.desktop.in.h:2
+msgid "Graphical front end to install RPM files"
+msgstr "RPM fayllarini oʻrnatish uchun grafik interfeys"
+
 #, fuzzy
 #~ msgid "Cannot write DUDF file.\n"
 #~ msgstr "Faylini saqlab bo'lmadi"
@@ -3238,9 +3248,6 @@ msgstr "Dastur oʻrnatuvchisi"
 #~ msgid "due to already installed %s"
 #~ msgstr "%s paketi allaqachon o'rnatilganligi uchun"
 
-#~ msgid "Search start: %s end: %s"
-#~ msgstr "Qidirish boshi: %s oxiri: %s"
-
 #~ msgid "Updating media...\n"
 #~ msgstr "To'plam yangilanmoqda...\n"