Merge new strings

1 files changed, 217 insertions, 64 deletions

diff --git a/po/uz.po b/po/uz.po
index 3de15265..3bdbb684 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-uz\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-03 13:52+0100\n"
+"POT-Creation-Date: 2005-01-06 15:42+0100\n"
 "PO-Revision-Date: 2004-09-05 01:51+0200\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <kmashrab@uni-bremen.de>\n"
@@ -73,6 +73,217 @@ msgstr " (Ҳ/й) "
 msgid "%s: command not found\n"
 msgstr "%s: буйруқ топилмади\n"
 
+#: ../gurpmi:99
+#, c-format
+msgid "Please wait..."
+msgstr ""
+
+#: ../gurpmi:110
+#, fuzzy, c-format
+msgid "Unknown option %s"
+msgstr ""
+"\n"
+"номаълум параметрлар \"%s\"\n"
+
+#: ../gurpmi:114
+#, fuzzy, c-format
+msgid "No packages specified"
+msgstr "%s номли пакет мавжуд эмас"
+
+#: ../gurpmi:118
+#, c-format
+msgid "Must be root"
+msgstr ""
+
+#: ../gurpmi:128
+#, fuzzy, c-format
+msgid "RPM installation"
+msgstr "Пакетни ўрнатиш..."
+
+#: ../gurpmi:141
+#, c-format
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it would "
+"allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
+msgstr ""
+
+#: ../gurpmi:149
+#, c-format
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
+msgstr ""
+
+#: ../gurpmi:154
+#, fuzzy, c-format
+msgid ""
+"You are about to install the following software packages on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"Proceed?"
+msgstr ""
+"Қуйидаги боғлиқликларни ўрнатиш учун сиз root бўлишингиз керак:\n"
+"%s\n"
+
+#: ../gurpmi:164
+#, fuzzy, c-format
+msgid "_Install"
+msgstr "Ўрнатиш"
+
+#: ../gurpmi:165
+#, c-format
+msgid "_Save"
+msgstr ""
+
+#: ../gurpmi:166 ../gurpmi:229
+#, fuzzy, c-format
+msgid "_Cancel"
+msgstr "Бекор қилиш"
+
+#: ../gurpmi:170
+#, c-format
+msgid "Choose location to save file"
+msgstr ""
+
+#: ../gurpmi:220
+#, c-format
+msgid " (to upgrade)"
+msgstr ""
+
+#: ../gurpmi:221
+#, fuzzy, c-format
+msgid " (to install)"
+msgstr "%s'ни ўрнатиш учун"
+
+#: ../gurpmi:225 ../urpmi:350
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Қуйидаги пакетлардан бири керак:"
+
+#: ../gurpmi:230 ../gurpmi:246
+#, fuzzy, c-format
+msgid "_Ok"
+msgstr "Ок"
+
+#: ../gurpmi:247
+#, c-format
+msgid "_Abort"
+msgstr ""
+
+#: ../gurpmi:276
+#, fuzzy, c-format
+msgid ""
+"Some package requested cannot be installed:\n"
+"%s\n"
+"Continue?"
+msgstr ""
+"Талаб қилинган баъзи бир пакетларни ўрнатиб бўлмайди:\n"
+"%s"
+
+#: ../gurpmi:287
+#, fuzzy, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s\n"
+"Continue?"
+msgstr ""
+"Бошқаларни янгилаш учун қуйидаги пакетларни олиб ташлаш керак:\n"
+"%s"
+
+#: ../gurpmi:300
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following %d packages are going to be "
+"installed:\n"
+"%s\n"
+msgstr ""
+"Боғлиқликларни таъминлаш учун қуйидаги %d пакетлар ҳам ўрнатилади (%d Мб)"
+
+#: ../gurpmi:307
+#, c-format
+msgid "Package installation..."
+msgstr "Пакетни ўрнатиш..."
+
+#: ../gurpmi:309 ../urpmi:483 ../urpmq:302
+#, c-format
+msgid "unable to get source packages, aborting"
+msgstr ""
+
+#: ../gurpmi:323 ../urpmi:494
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Илтимос \"%s\" номли манбани [%s] ускунасига қўйинг"
+
+#: ../gurpmi:350
+#, c-format
+msgid "Downloading package `%s'..."
+msgstr "\"%s\" пакети олинмоқда..."
+
+#: ../gurpmi:365
+#, fuzzy, c-format
+msgid ""
+"The following packages have bad signatures:\n"
+"%s\n"
+"\n"
+"Do you want to continue installation ?"
+msgstr "Қуйидаги пакетларнинг имзолари нотўғри"
+
+#: ../gurpmi:372 ../gurpmi:421 ../urpmi:556 ../urpmi:672
+#, c-format
+msgid ""
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
+msgstr ""
+"Ўрнатиш муваффақиятсиз тугади, баъзи бир файллар етишмайди:\n"
+"%s\n"
+"Балки urpmi маълумот базасини янгилашингиз керак."
+
+#: ../gurpmi:379 ../urpme:111 ../urpmi:597
+#, c-format
+msgid "removing %s"
+msgstr "%s ўчирилмоқда"
+
+#: ../gurpmi:387 ../urpm.pm:2751
+#, c-format
+msgid "Preparing..."
+msgstr "Тайёрланмоқда..."
+
+#: ../gurpmi:389
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "\"%s\" (%s/%s) пакети ўрнатилмоқда..."
+
+#: ../gurpmi:407 ../urpmi:566 ../urpmi:610 ../urpmi:631 ../urpmi:651
+#, c-format
+msgid "Installation failed"
+msgstr "Ўрнатиш муваффақиятсиз тугади"
+
+#: ../gurpmi:416
+#, c-format
+msgid "_Done"
+msgstr ""
+
+#: ../gurpmi:424 ../urpmi:688
+#, c-format
+msgid "The package(s) are already installed"
+msgstr "Ҳамма нарса аллақачон ўрнатилган"
+
+#: ../gurpmi:426
+#, fuzzy, c-format
+msgid "Installation finished"
+msgstr "Ўрнатиш муваффақиятсиз тугади"
+
 #: ../rpm-find-leaves:12
 #, c-format
 msgid ""
@@ -685,11 +896,6 @@ msgstr ""
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "RPM -файллари манбадан (%s) олинмоқда..."
 
-#: ../urpm.pm:2751
-#, c-format
-msgid "Preparing..."
-msgstr "Тайёрланмоқда..."
-
 #: ../urpm.pm:2789
 #, c-format
 msgid "using process %d for executing transaction"
@@ -909,11 +1115,6 @@ msgstr "Боғлиқликларни таъминлаш учун қуйидаг�
 msgid " (y/N) "
 msgstr " (ҳ/Й) "
 
-#: ../urpme:111 ../urpmi:597
-#, c-format
-msgid "removing %s"
-msgstr "%s ўчирилмоқда"
-
 #: ../urpme:115
 #, c-format
 msgid "Removing failed"
@@ -1399,11 +1600,6 @@ msgid ""
 "Use --allow-force to force operation."
 msgstr ""
 
-#: ../urpmi:350
-#, c-format
-msgid "One of the following packages is needed:"
-msgstr "Қуйидаги пакетлардан бири керак:"
-
 #: ../urpmi:353
 #, c-format
 msgid "What is your choice? (1-%d) "
@@ -1479,16 +1675,6 @@ msgstr ""
 "Қуйидаги боғлиқликларни ўрнатиш учун сиз root бўлишингиз керак:\n"
 "%s\n"
 
-#: ../urpmi:483 ../urpmq:302
-#, c-format
-msgid "unable to get source packages, aborting"
-msgstr ""
-
-#: ../urpmi:494
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Илтимос \"%s\" номли манбани [%s] ускунасига қўйинг"
-
 #: ../urpmi:495
 #, c-format
 msgid "Press Enter when ready..."
@@ -1504,22 +1690,6 @@ msgstr "Қуйидаги пакетларнинг имзолари нотўғр�
 msgid "Do you want to continue installation ?"
 msgstr "Ўрнатишни давом этишни истайсизми?"
 
-#: ../urpmi:556 ../urpmi:672
-#, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
-msgstr ""
-"Ўрнатиш муваффақиятсиз тугади, баъзи бир файллар етишмайди:\n"
-"%s\n"
-"Балки urpmi маълумот базасини янгилашингиз керак."
-
-#: ../urpmi:566 ../urpmi:610 ../urpmi:631 ../urpmi:651
-#, c-format
-msgid "Installation failed"
-msgstr "Ўрнатиш муваффақиятсиз тугади"
-
 #: ../urpmi:581
 #, c-format
 msgid "distributing %s"
@@ -1555,12 +1725,7 @@ msgstr ""
 msgid "Installation is possible"
 msgstr "Ўрнатиш мумкин"
 
-#: ../urpmi:688
-#, c-format
-msgid "The package(s) are already installed"
-msgstr "Ҳамма нарса аллақачон ўрнатилган"
-
-#: ../urpmi:702
+#: ../urpmi:703
 #, c-format
 msgid "restarting urpmi"
 msgstr "urpmi қайтадан ишга тушмоқда"
@@ -1833,10 +1998,10 @@ msgid "enabling media %s"
 msgstr "манба (%s) ўчирилмоқда"
 
 #: ../urpmq:38
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "urpmq version %s\n"
-"Copyright (C) 2000-2004 Mandrakesoft.\n"
+"Copyright (C) 2000-2005 Mandrakesoft.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -1977,12 +2142,12 @@ msgstr "--list-nodes'дан фақат --parallel билан бирга фойд
 msgid "skipping media %s: no hdlist\n"
 msgstr ""
 
-#: ../urpmq:401
+#: ../urpmq:399
 #, c-format
 msgid "No filelist found\n"
 msgstr "Файллар рўйхати топилмади\n"
 
-#: ../urpmq:411
+#: ../urpmq:409
 #, c-format
 msgid "No changelog found\n"
 msgstr "Changelog файли топилмади\n"
@@ -1993,24 +2158,12 @@ msgstr "Changelog файли топилмади\n"
 #~ msgid "Save file"
 #~ msgstr "Файлни сақлаш"
 
-#~ msgid "Install it"
-#~ msgstr "Ўрнатиш"
-
-#~ msgid "Package installation..."
-#~ msgstr "Пакетни ўрнатиш..."
-
 #~ msgid "Initializing..."
 #~ msgstr "Ишга тайёрланмоқда..."
 
 #~ msgid "do you agree ?"
 #~ msgstr "розимисиз ?"
 
-#~ msgid "Downloading package `%s'..."
-#~ msgstr "\"%s\" пакети олинмоқда..."
-
-#~ msgid "Installing package `%s' (%s/%s)..."
-#~ msgstr "\"%s\" (%s/%s) пакети ўрнатилмоқда..."
-
 #~ msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 #~ msgstr "        %s%% бажарилди, ҳажм = %s, ЕТА = %s, тезлик = %s"