sync with code & sync translations with urpmi

1 files changed, 59 insertions, 49 deletions

diff --git a/po/tg.po b/po/tg.po
index 080d8a88..92923008 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-tg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-07 15:00+0100\n"
+"POT-Creation-Date: 2007-03-07 15:42+0100\n"
 "PO-Revision-Date: 2005-09-17 16:32+0500\n"
 "Last-Translator: Victor Ibragimov <youth_opportunities@tajikngo.org>\n"
 "Language-Team: Tajik\n"
@@ -223,7 +223,7 @@ msgstr "Навъи сарчашма:"
 #: ../Rpmdrake/edit_urpm_sources.pm:521 ../Rpmdrake/edit_urpm_sources.pm:608
 #: ../Rpmdrake/edit_urpm_sources.pm:649 ../Rpmdrake/edit_urpm_sources.pm:707
 #: ../Rpmdrake/edit_urpm_sources.pm:857 ../Rpmdrake/gui.pm:502
-#: ../Rpmdrake/init.pm:126 ../Rpmdrake/pkg.pm:525 ../Rpmdrake/pkg.pm:571
+#: ../Rpmdrake/init.pm:126 ../Rpmdrake/pkg.pm:523 ../Rpmdrake/pkg.pm:568
 #: ../rpmdrake.pm:296 ../rpmdrake.pm:609 ../rpmdrake.pm:694 ../rpmdrake.pm:767
 #, c-format
 msgid "Cancel"
@@ -235,7 +235,7 @@ msgstr "Бекор кардан"
 #: ../Rpmdrake/edit_urpm_sources.pm:700 ../Rpmdrake/edit_urpm_sources.pm:773
 #: ../Rpmdrake/edit_urpm_sources.pm:903 ../Rpmdrake/edit_urpm_sources.pm:1063
 #: ../Rpmdrake/gui.pm:502 ../Rpmdrake/gui.pm:518 ../Rpmdrake/gui.pm:523
-#: ../Rpmdrake/init.pm:126 ../Rpmdrake/pkg.pm:525 ../Rpmdrake/pkg.pm:754
+#: ../Rpmdrake/init.pm:126 ../Rpmdrake/pkg.pm:523 ../Rpmdrake/pkg.pm:760
 #: ../Rpmdrake/rpmnew.pm:172 ../rpmdrake.pm:126 ../rpmdrake.pm:236
 #: ../rpmdrake.pm:298 ../rpmdrake.pm:609
 #, c-format
@@ -839,7 +839,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/gui.pm:615 ../Rpmdrake/pkg.pm:495
+#: ../Rpmdrake/gui.pm:615 ../Rpmdrake/pkg.pm:494
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "Баъзе қуттиҳо бояд хориҷ шаванд"
@@ -1701,23 +1701,23 @@ msgstr "Шумо дар ҳақиқат сарчашмаи \"%s\"-ро хориҷ
 msgid "Fatal error"
 msgstr "Хатогии ҷиддӣ"
 
-#: ../Rpmdrake/pkg.pm:192 ../Rpmdrake/pkg.pm:510 ../Rpmdrake/pkg.pm:784
+#: ../Rpmdrake/pkg.pm:192 ../Rpmdrake/pkg.pm:509 ../Rpmdrake/pkg.pm:790
 #: ../rpmdrake.pm:323
 #, c-format
 msgid "Please wait"
 msgstr "Лутфан интизор шавед"
 
-#: ../Rpmdrake/pkg.pm:192 ../Rpmdrake/pkg.pm:510
+#: ../Rpmdrake/pkg.pm:192 ../Rpmdrake/pkg.pm:509
 #, c-format
 msgid "Package installation..."
 msgstr "Тайёркунии қуттиҳо барои коргузорӣ..."
 
-#: ../Rpmdrake/pkg.pm:192 ../Rpmdrake/pkg.pm:510 ../Rpmdrake/pkg.pm:784
+#: ../Rpmdrake/pkg.pm:192 ../Rpmdrake/pkg.pm:509 ../Rpmdrake/pkg.pm:790
 #, c-format
 msgid "Initializing..."
 msgstr "Коргузорӣ..."
 
-#: ../Rpmdrake/pkg.pm:215 ../Rpmdrake/pkg.pm:495
+#: ../Rpmdrake/pkg.pm:215 ../Rpmdrake/pkg.pm:494
 #, fuzzy, c-format
 msgid "Confirmation"
 msgstr "Батанзимдарорӣ"
@@ -1798,17 +1798,17 @@ msgstr "Интизор шавед, рӯйхатсозии қуттиҳо..."
 msgid "Please wait, finding installed packages..."
 msgstr "Интизор шавед, ёфтани қуттиҳои дастрас..."
 
-#: ../Rpmdrake/pkg.pm:443 ../Rpmdrake/pkg.pm:731
+#: ../Rpmdrake/pkg.pm:443 ../Rpmdrake/pkg.pm:737
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Ҳамаи қуттиҳои талабшуда бомуваффақият коргузошташуданд."
 
-#: ../Rpmdrake/pkg.pm:447 ../Rpmdrake/pkg.pm:710
+#: ../Rpmdrake/pkg.pm:447 ../Rpmdrake/pkg.pm:716
 #, c-format
 msgid "Problem during installation"
 msgstr "Муаммоҳо ҳангоми коргузорӣ"
 
-#: ../Rpmdrake/pkg.pm:448 ../Rpmdrake/pkg.pm:712 ../Rpmdrake/pkg.pm:770
+#: ../Rpmdrake/pkg.pm:448 ../Rpmdrake/pkg.pm:718 ../Rpmdrake/pkg.pm:776
 #, c-format
 msgid ""
 "There was a problem during the installation:\n"
@@ -1819,17 +1819,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/pkg.pm:473
+#: ../Rpmdrake/pkg.pm:472
 #, c-format
 msgid "Unable to get source packages."
 msgstr "Қуттиҳои сарчашмавӣ гирифта нашуд."
 
-#: ../Rpmdrake/pkg.pm:474
+#: ../Rpmdrake/pkg.pm:473
 #, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Узр, қуттиҳоро бо сарчашмааш гирифта намешавад. %s"
 
-#: ../Rpmdrake/pkg.pm:475 ../Rpmdrake/pkg.pm:700
+#: ../Rpmdrake/pkg.pm:474 ../Rpmdrake/pkg.pm:706
 #, c-format
 msgid ""
 "\n"
@@ -1842,7 +1842,7 @@ msgstr ""
 "Ҳисоботи Хатогӣ(ҳо):\n"
 "%s"
 
-#: ../Rpmdrake/pkg.pm:492
+#: ../Rpmdrake/pkg.pm:491
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
@@ -1851,14 +1851,14 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../Rpmdrake/pkg.pm:497
+#: ../Rpmdrake/pkg.pm:496
 #, c-format
 msgid "Remove one package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "Калидро хориҷ намоед"
 msgstr[1] "Калидро хориҷ намоед"
 
-#: ../Rpmdrake/pkg.pm:499
+#: ../Rpmdrake/pkg.pm:498
 #, fuzzy, c-format
 msgid "The following package has to be removed for others to be upgraded:"
 msgstr ""
@@ -1868,7 +1868,7 @@ msgstr ""
 "\n"
 "Давом додан гирем?"
 
-#: ../Rpmdrake/pkg.pm:500
+#: ../Rpmdrake/pkg.pm:499
 #, fuzzy, c-format
 msgid "The following packages have to be removed for others to be upgraded:"
 msgstr ""
@@ -1876,7 +1876,7 @@ msgstr ""
 "%s\n"
 "Шумо розӣ ҳастед?"
 
-#: ../Rpmdrake/pkg.pm:500
+#: ../Rpmdrake/pkg.pm:499
 #, fuzzy, c-format
 msgid "Is it ok to continue?"
 msgstr ""
@@ -1884,49 +1884,59 @@ msgstr ""
 "\n"
 "Давом додан гирем?"
 
-#: ../Rpmdrake/pkg.pm:523
+#: ../Rpmdrake/pkg.pm:521
 #, c-format
 msgid "Change medium"
 msgstr "Ивази миёна"
 
-#: ../Rpmdrake/pkg.pm:524
+#: ../Rpmdrake/pkg.pm:522
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
 "Лутфан, сарчашмаи ифодашударо \"%s\" дар миён ҷо дохил намоед, аз рӯи дастгоҳ"
 "[%s]"
 
-#: ../Rpmdrake/pkg.pm:545
+#: ../Rpmdrake/pkg.pm:543
 #, c-format
 msgid "Preparing packages installation..."
 msgstr "Тайёркунии қуттиҳо барои коргузорӣ..."
 
-#: ../Rpmdrake/pkg.pm:545
+#: ../Rpmdrake/pkg.pm:543
 #, c-format
 msgid "Preparing..."
 msgstr "Тайёрӣ..."
 
-#: ../Rpmdrake/pkg.pm:548
+#: ../Rpmdrake/pkg.pm:546
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Коргузории қуттии `%s' (%s/%s)..."
 
-#: ../Rpmdrake/pkg.pm:569
+#: ../Rpmdrake/pkg.pm:567 ../Rpmdrake/pkg.pm:572
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Фаровиркунии қутии `%s' (%s/%s)..."
+msgid "Downloading package `%s'..."
+msgstr "Фаровири қуттии `%s'..."
 
-#: ../Rpmdrake/pkg.pm:589
+#: ../Rpmdrake/pkg.pm:574
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr ""
+
+#: ../Rpmdrake/pkg.pm:575
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr ""
+
+#: ../Rpmdrake/pkg.pm:595
 #, c-format
 msgid "Verifying package signatures..."
 msgstr "Тафтиши имзоҳои қуттиҳо..."
 
-#: ../Rpmdrake/pkg.pm:602 ../rpmdrake.pm:750 ../rpmdrake.pm:859
+#: ../Rpmdrake/pkg.pm:608 ../rpmdrake.pm:750 ../rpmdrake.pm:859
 #, c-format
 msgid "Warning"
 msgstr "Огоҳӣ"
 
-#: ../Rpmdrake/pkg.pm:603
+#: ../Rpmdrake/pkg.pm:609
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -1941,48 +1951,48 @@ msgstr ""
 "\n"
 "Давом додан гирем?"
 
-#: ../Rpmdrake/pkg.pm:616
+#: ../Rpmdrake/pkg.pm:622
 #, fuzzy, c-format
 msgid "installing %s from %s"
 msgstr "коргузории %s"
 
-#: ../Rpmdrake/pkg.pm:618
+#: ../Rpmdrake/pkg.pm:624
 #, c-format
 msgid "installing %s"
 msgstr "коргузории %s"
 
-#: ../Rpmdrake/pkg.pm:622
+#: ../Rpmdrake/pkg.pm:628
 #, c-format
 msgid "removing %s"
 msgstr "хориҷи қуттии %s "
 
-#: ../Rpmdrake/pkg.pm:648 ../Rpmdrake/pkg.pm:666 ../Rpmdrake/pkg.pm:759
+#: ../Rpmdrake/pkg.pm:654 ../Rpmdrake/pkg.pm:672 ../Rpmdrake/pkg.pm:765
 #: ../rpmdrake.pm:737 ../rpmdrake.pm:818 ../rpmdrake.pm:842
 #, c-format
 msgid "Error"
 msgstr "Хатогӣ"
 
-#: ../Rpmdrake/pkg.pm:649 ../Rpmdrake/pkg.pm:667
+#: ../Rpmdrake/pkg.pm:655 ../Rpmdrake/pkg.pm:673
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Коргузорӣ нагузашт"
 
-#: ../Rpmdrake/pkg.pm:650
+#: ../Rpmdrake/pkg.pm:656
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Коргузориро бе тафтиши тобеиятҳо кӯшиш кунем? (Ҳ/Н) "
 
-#: ../Rpmdrake/pkg.pm:668
+#: ../Rpmdrake/pkg.pm:674
 #, fuzzy, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "Коргузориро боз устувортар (--force) кӯшиш кунем? (Ҳ/Н)  "
 
-#: ../Rpmdrake/pkg.pm:680 ../Rpmdrake/pkg.pm:697 ../Rpmdrake/pkg.pm:769
+#: ../Rpmdrake/pkg.pm:686 ../Rpmdrake/pkg.pm:703 ../Rpmdrake/pkg.pm:775
 #, c-format
 msgid "Installation failed"
 msgstr "Коргузорӣ амалӣ нагардид"
 
-#: ../Rpmdrake/pkg.pm:698
+#: ../Rpmdrake/pkg.pm:704
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1995,12 +2005,12 @@ msgstr ""
 "\n"
 "Мумкин шумо хоҳиши навкунии манбаи додаҳои сарчашмаро доред."
 
-#: ../Rpmdrake/pkg.pm:711
+#: ../Rpmdrake/pkg.pm:717
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d коргузорӣ амалӣ нагардид"
 
-#: ../Rpmdrake/pkg.pm:726
+#: ../Rpmdrake/pkg.pm:732
 #, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
@@ -2013,43 +2023,43 @@ msgstr ""
 "Баъзе файлҳои танзимдарорӣ ҳамчун `.rpmnew' ё `.rpmsave' офарида шуда\n"
 "буд, акнун метавонед баъзеашонро барои амалиётҳо бозрасӣ кунед:"
 
-#: ../Rpmdrake/pkg.pm:734
+#: ../Rpmdrake/pkg.pm:740
 #, fuzzy, c-format
 msgid "Upgrade information"
 msgstr "Маълумоти оддӣ"
 
-#: ../Rpmdrake/pkg.pm:736
+#: ../Rpmdrake/pkg.pm:742
 #, c-format
 msgid "These packages come with upgrade information"
 msgstr "Ин бастаҳо бо ахбороти густаришёфта меоянд"
 
-#: ../Rpmdrake/pkg.pm:744
+#: ../Rpmdrake/pkg.pm:750
 #, fuzzy, c-format
 msgid "Upgrade information about this package"
 msgstr "Маълумоти иловагӣ барои қуттӣ..."
 
-#: ../Rpmdrake/pkg.pm:747
+#: ../Rpmdrake/pkg.pm:753
 #, fuzzy, c-format
 msgid "Upgrade information about package %s"
 msgstr "Маълумоти иловагӣ барои қуттӣ..."
 
-#: ../Rpmdrake/pkg.pm:760
+#: ../Rpmdrake/pkg.pm:766
 #, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr ""
 "Хатогии бартарафнашаванда: афсӯс, ки қуттӣ барои коргузорӣ намудан ёфт нашуд."
 
-#: ../Rpmdrake/pkg.pm:784 ../Rpmdrake/pkg.pm:789
+#: ../Rpmdrake/pkg.pm:790 ../Rpmdrake/pkg.pm:795
 #, c-format
 msgid "Please wait, removing packages..."
 msgstr "Интизор шавед, хориҷи қуттиҳо..."
 
-#: ../Rpmdrake/pkg.pm:800
+#: ../Rpmdrake/pkg.pm:806
 #, c-format
 msgid "Problem during removal"
 msgstr "Муаммо ҳангоми хориҷкунӣ"
 
-#: ../Rpmdrake/pkg.pm:801
+#: ../Rpmdrake/pkg.pm:807
 #, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"