better phrasing

1 files changed, 80 insertions, 77 deletions

diff --git a/po/tg.po b/po/tg.po
index 6c7d0312..7d7cecbc 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-08-02 22:39+0200\n"
+"POT-Creation-Date: 2007-08-03 16:14+0200\n"
 "PO-Revision-Date: 2005-09-17 16:32+0500\n"
 "Last-Translator: Victor Ibragimov <youth_opportunities@tajikngo.org>\n"
 "Language-Team: Tajik\n"
@@ -234,7 +234,7 @@ msgstr "Навъи сарчашма:"
 #: ../Rpmdrake/edit_urpm_sources.pm:540 ../Rpmdrake/edit_urpm_sources.pm:627
 #: ../Rpmdrake/edit_urpm_sources.pm:668 ../Rpmdrake/edit_urpm_sources.pm:726
 #: ../Rpmdrake/edit_urpm_sources.pm:876 ../Rpmdrake/gui.pm:459
-#: ../Rpmdrake/init.pm:139 ../Rpmdrake/pkg.pm:564 ../Rpmdrake/pkg.pm:612
+#: ../Rpmdrake/init.pm:132 ../Rpmdrake/pkg.pm:563 ../Rpmdrake/pkg.pm:611
 #: ../rpmdrake.pm:301 ../rpmdrake.pm:616 ../rpmdrake.pm:701 ../rpmdrake.pm:774
 #, c-format
 msgid "Cancel"
@@ -246,7 +246,7 @@ msgstr "Бекор кардан"
 #: ../Rpmdrake/edit_urpm_sources.pm:719 ../Rpmdrake/edit_urpm_sources.pm:792
 #: ../Rpmdrake/edit_urpm_sources.pm:922 ../Rpmdrake/edit_urpm_sources.pm:1082
 #: ../Rpmdrake/gui.pm:459 ../Rpmdrake/gui.pm:475 ../Rpmdrake/gui.pm:480
-#: ../Rpmdrake/init.pm:139 ../Rpmdrake/pkg.pm:564 ../Rpmdrake/pkg.pm:815
+#: ../Rpmdrake/init.pm:132 ../Rpmdrake/pkg.pm:563 ../Rpmdrake/pkg.pm:807
 #: ../Rpmdrake/rpmnew.pm:172 ../rpmdrake.pm:125 ../rpmdrake.pm:239
 #: ../rpmdrake.pm:304 ../rpmdrake.pm:616
 #, c-format
@@ -591,7 +591,7 @@ msgstr "Параллел..."
 msgid "Global options..."
 msgstr "Интихоботҳои глобалӣ..."
 
-#: ../Rpmdrake/edit_urpm_sources.pm:1097 ../Rpmdrake/init.pm:145
+#: ../Rpmdrake/edit_urpm_sources.pm:1097 ../Rpmdrake/init.pm:138
 #: ../gurpmi.addmedia:99
 #, c-format
 msgid ""
@@ -855,7 +855,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/gui.pm:582 ../Rpmdrake/pkg.pm:527
+#: ../Rpmdrake/gui.pm:582 ../Rpmdrake/pkg.pm:526
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "Баъзе қуттиҳо бояд хориҷ шаванд"
@@ -1534,88 +1534,88 @@ msgstr "Хидматрасони Компютери Шабакавӣ"
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: ../Rpmdrake/init.pm:46
+#: ../Rpmdrake/init.pm:39
 #, c-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Истифода: %s [ИНТИХОБҲО]..."
 
-#: ../Rpmdrake/init.pm:47
+#: ../Rpmdrake/init.pm:40
 #, c-format
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
 msgstr ""
 
-#: ../Rpmdrake/init.pm:48
+#: ../Rpmdrake/init.pm:41
 #, c-format
 msgid "  --media=medium1,..     limit to given media"
 msgstr ""
 
-#: ../Rpmdrake/init.pm:49
+#: ../Rpmdrake/init.pm:42
 #, c-format
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 
-#: ../Rpmdrake/init.pm:50
+#: ../Rpmdrake/init.pm:43
 #, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 
-#: ../Rpmdrake/init.pm:51
+#: ../Rpmdrake/init.pm:44
 #, c-format
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 
-#: ../Rpmdrake/init.pm:52
+#: ../Rpmdrake/init.pm:45
 #, c-format
 msgid "  --no-media-update      don't update media at startup"
 msgstr ""
 
-#: ../Rpmdrake/init.pm:53
+#: ../Rpmdrake/init.pm:46
 #, c-format
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr ""
 
-#: ../Rpmdrake/init.pm:54
+#: ../Rpmdrake/init.pm:47
 #, c-format
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
 msgstr ""
 
-#: ../Rpmdrake/init.pm:55
+#: ../Rpmdrake/init.pm:48
 #, c-format
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr ""
 
-#: ../Rpmdrake/init.pm:56
+#: ../Rpmdrake/init.pm:49
 #, c-format
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr ""
 
-#: ../Rpmdrake/init.pm:57
+#: ../Rpmdrake/init.pm:50
 #, c-format
 msgid "  --root                 force to run as root"
 msgstr ""
 
-#: ../Rpmdrake/init.pm:58
+#: ../Rpmdrake/init.pm:51
 #, c-format
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr ""
 
-#: ../Rpmdrake/init.pm:59
+#: ../Rpmdrake/init.pm:52
 #, fuzzy, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --help         - чопи ин пайғоми ёрӣ.\n"
 
-#: ../Rpmdrake/init.pm:136
+#: ../Rpmdrake/init.pm:129
 #, c-format
 msgid "Running in user mode"
 msgstr "Дар ҳолати корвандӣ ба кор дароварда шуда истодааст"
 
-#: ../Rpmdrake/init.pm:137
+#: ../Rpmdrake/init.pm:130
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -1626,12 +1626,12 @@ msgstr ""
 "Дар систем шумо тағиротҳоро дароварда наметавонед, лекин\n"
 "шумо метавонед манбаи маълумотро дида бароед."
 
-#: ../Rpmdrake/init.pm:144 ../Rpmdrake/init.pm:169
+#: ../Rpmdrake/init.pm:137 ../Rpmdrake/init.pm:162
 #, c-format
 msgid "Welcome"
 msgstr "Марҳамат Намоед"
 
-#: ../Rpmdrake/init.pm:149
+#: ../Rpmdrake/init.pm:142
 #, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
@@ -1644,7 +1644,7 @@ msgstr ""
 "Ин асбоб ба шумо барои интихоби нармафзор барои хориҷ аз компютери Шумо\n"
 "ёрӣ медиҳад."
 
-#: ../Rpmdrake/init.pm:154
+#: ../Rpmdrake/init.pm:147
 #, c-format
 msgid ""
 "Welcome to %s!\n"
@@ -1657,12 +1657,12 @@ msgstr ""
 "Ин асбоб ба шумо барои интихоби навигарӣ барои коргузоштан ба компютери\n"
 "Шумо ёрӣ медиҳад."
 
-#: ../Rpmdrake/init.pm:159
+#: ../Rpmdrake/init.pm:152
 #, c-format
 msgid "Welcome to the software installation tool!"
 msgstr ""
 
-#: ../Rpmdrake/init.pm:160
+#: ../Rpmdrake/init.pm:153
 #, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
@@ -1677,17 +1677,17 @@ msgstr ""
 "ё DVD пешниҳод карда мешавад. Ин асбоб ба шумо барои интихоби нармафзор\n"
 "барои коргузоштан ба компютери Шумо ёрӣ медиҳад."
 
-#: ../Rpmdrake/init.pm:171
+#: ../Rpmdrake/init.pm:164
 #, c-format
 msgid "The software installation tool can set up media sources."
 msgstr ""
 
-#: ../Rpmdrake/init.pm:172
+#: ../Rpmdrake/init.pm:165
 #, fuzzy, c-format
 msgid "Do you want to add media sources now?"
 msgstr "Шумо дар ҳақиқат сарчашмаи \"%s\"-ро хориҷ карданӣ ҳастед?"
 
-#: ../Rpmdrake/pkg.pm:187 ../Rpmdrake/pkg.pm:527
+#: ../Rpmdrake/pkg.pm:187 ../Rpmdrake/pkg.pm:526
 #, fuzzy, c-format
 msgid "Confirmation"
 msgstr "Батанзимдарорӣ"
@@ -1748,18 +1748,18 @@ msgstr ""
 "\n"
 "Пас, %s-ро бозоғоз кунед."
 
-#: ../Rpmdrake/pkg.pm:250 ../Rpmdrake/pkg.pm:542 ../Rpmdrake/pkg.pm:836
+#: ../Rpmdrake/pkg.pm:250 ../Rpmdrake/pkg.pm:541 ../Rpmdrake/pkg.pm:828
 #: ../rpmdrake.pm:329
 #, c-format
 msgid "Please wait"
 msgstr "Лутфан интизор шавед"
 
-#: ../Rpmdrake/pkg.pm:250 ../Rpmdrake/pkg.pm:542
+#: ../Rpmdrake/pkg.pm:250 ../Rpmdrake/pkg.pm:541
 #, c-format
 msgid "Package installation..."
 msgstr "Тайёркунии қуттиҳо барои коргузорӣ..."
 
-#: ../Rpmdrake/pkg.pm:250 ../Rpmdrake/pkg.pm:542 ../Rpmdrake/pkg.pm:836
+#: ../Rpmdrake/pkg.pm:250 ../Rpmdrake/pkg.pm:541 ../Rpmdrake/pkg.pm:828
 #, c-format
 msgid "Initializing..."
 msgstr "Коргузорӣ..."
@@ -1789,17 +1789,17 @@ msgstr "Интизор шавед, ёфтани қуттиҳои дастрас.
 msgid "Could not create temporary directory '%s'"
 msgstr ""
 
-#: ../Rpmdrake/pkg.pm:455 ../Rpmdrake/pkg.pm:792
+#: ../Rpmdrake/pkg.pm:455 ../Rpmdrake/pkg.pm:782
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Ҳамаи қуттиҳои талабшуда бомуваффақият коргузошташуданд."
 
-#: ../Rpmdrake/pkg.pm:459 ../Rpmdrake/pkg.pm:772
+#: ../Rpmdrake/pkg.pm:459 ../Rpmdrake/pkg.pm:762
 #, c-format
 msgid "Problem during installation"
 msgstr "Муаммоҳо ҳангоми коргузорӣ"
 
-#: ../Rpmdrake/pkg.pm:460 ../Rpmdrake/pkg.pm:480 ../Rpmdrake/pkg.pm:774
+#: ../Rpmdrake/pkg.pm:460 ../Rpmdrake/pkg.pm:479 ../Rpmdrake/pkg.pm:764
 #, c-format
 msgid ""
 "There was a problem during the installation:\n"
@@ -1810,22 +1810,22 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/pkg.pm:479 ../Rpmdrake/pkg.pm:761
+#: ../Rpmdrake/pkg.pm:478 ../Rpmdrake/pkg.pm:751
 #, c-format
 msgid "Installation failed"
 msgstr "Коргузорӣ амалӣ нагардид"
 
-#: ../Rpmdrake/pkg.pm:508
+#: ../Rpmdrake/pkg.pm:507
 #, c-format
 msgid "Unable to get source packages."
 msgstr "Қуттиҳои сарчашмавӣ гирифта нашуд."
 
-#: ../Rpmdrake/pkg.pm:509
+#: ../Rpmdrake/pkg.pm:508
 #, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Узр, қуттиҳоро бо сарчашмааш гирифта намешавад. %s"
 
-#: ../Rpmdrake/pkg.pm:510 ../Rpmdrake/pkg.pm:764
+#: ../Rpmdrake/pkg.pm:509 ../Rpmdrake/pkg.pm:754
 #, c-format
 msgid ""
 "\n"
@@ -1838,21 +1838,21 @@ msgstr ""
 "Ҳисоботи Хатогӣ(ҳо):\n"
 "%s"
 
-#: ../Rpmdrake/pkg.pm:524
+#: ../Rpmdrake/pkg.pm:523
 #, fuzzy, c-format
 msgid "The following package is going to be installed:"
 msgid_plural "The following %d packages are going to be installed:"
 msgstr[0] "Яке аз қуттиҳои зерин лозим аст:"
 msgstr[1] "Яке аз қуттиҳои зерин лозим аст:"
 
-#: ../Rpmdrake/pkg.pm:529
+#: ../Rpmdrake/pkg.pm:528
 #, c-format
 msgid "Remove one package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "Калидро хориҷ намоед"
 msgstr[1] "Калидро хориҷ намоед"
 
-#: ../Rpmdrake/pkg.pm:531
+#: ../Rpmdrake/pkg.pm:530
 #, fuzzy, c-format
 msgid "The following package has to be removed for others to be upgraded:"
 msgstr ""
@@ -1862,7 +1862,7 @@ msgstr ""
 "\n"
 "Давом додан гирем?"
 
-#: ../Rpmdrake/pkg.pm:532
+#: ../Rpmdrake/pkg.pm:531
 #, fuzzy, c-format
 msgid "The following packages have to be removed for others to be upgraded:"
 msgstr ""
@@ -1870,7 +1870,7 @@ msgstr ""
 "%s\n"
 "Шумо розӣ ҳастед?"
 
-#: ../Rpmdrake/pkg.pm:532
+#: ../Rpmdrake/pkg.pm:531
 #, fuzzy, c-format
 msgid "Is it ok to continue?"
 msgstr ""
@@ -1878,64 +1878,64 @@ msgstr ""
 "\n"
 "Давом додан гирем?"
 
-#: ../Rpmdrake/pkg.pm:562
+#: ../Rpmdrake/pkg.pm:561
 #, c-format
 msgid "Change medium"
 msgstr "Ивази миёна"
 
-#: ../Rpmdrake/pkg.pm:563
+#: ../Rpmdrake/pkg.pm:562
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
 "Лутфан, сарчашмаи ифодашударо \"%s\" дар миён ҷо дохил намоед, аз рӯи дастгоҳ"
 "[%s]"
 
-#: ../Rpmdrake/pkg.pm:586
+#: ../Rpmdrake/pkg.pm:585
 #, c-format
 msgid "Preparing packages installation..."
 msgstr "Тайёркунии қуттиҳо барои коргузорӣ..."
 
-#: ../Rpmdrake/pkg.pm:586
-#, c-format
-msgid "Preparing..."
-msgstr "Тайёрӣ..."
+#: ../Rpmdrake/pkg.pm:585
+#, fuzzy, c-format
+msgid "Preparing package installation transaction..."
+msgstr "Тайёркунии қуттиҳо барои коргузорӣ..."
 
-#: ../Rpmdrake/pkg.pm:589
+#: ../Rpmdrake/pkg.pm:588
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Коргузории қуттии `%s' (%s/%s)..."
 
-#: ../Rpmdrake/pkg.pm:590
+#: ../Rpmdrake/pkg.pm:589
 #, c-format
 msgid "Total: %s/%s"
 msgstr ""
 
-#: ../Rpmdrake/pkg.pm:611 ../Rpmdrake/pkg.pm:616
+#: ../Rpmdrake/pkg.pm:610 ../Rpmdrake/pkg.pm:615
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Фаровири қуттии `%s'..."
 
-#: ../Rpmdrake/pkg.pm:618
+#: ../Rpmdrake/pkg.pm:617
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../Rpmdrake/pkg.pm:619
+#: ../Rpmdrake/pkg.pm:618
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../Rpmdrake/pkg.pm:640
+#: ../Rpmdrake/pkg.pm:639
 #, c-format
 msgid "Verifying package signatures..."
 msgstr "Тафтиши имзоҳои қуттиҳо..."
 
-#: ../Rpmdrake/pkg.pm:653 ../rpmdrake.pm:757 ../rpmdrake.pm:866
+#: ../Rpmdrake/pkg.pm:652 ../rpmdrake.pm:757 ../rpmdrake.pm:866
 #, c-format
 msgid "Warning"
 msgstr "Огоҳӣ"
 
-#: ../Rpmdrake/pkg.pm:654
+#: ../Rpmdrake/pkg.pm:653
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -1950,43 +1950,43 @@ msgstr ""
 "\n"
 "Давом додан гирем?"
 
-#: ../Rpmdrake/pkg.pm:667
+#: ../Rpmdrake/pkg.pm:666
 #, fuzzy, c-format
 msgid "installing %s from %s"
 msgstr "коргузории %s"
 
-#: ../Rpmdrake/pkg.pm:669
+#: ../Rpmdrake/pkg.pm:668
 #, c-format
 msgid "installing %s"
 msgstr "коргузории %s"
 
-#: ../Rpmdrake/pkg.pm:673
+#: ../Rpmdrake/pkg.pm:672
 #, c-format
 msgid "removing %s"
 msgstr "хориҷи қуттии %s "
 
-#: ../Rpmdrake/pkg.pm:708 ../Rpmdrake/pkg.pm:726 ../Rpmdrake/pkg.pm:819
+#: ../Rpmdrake/pkg.pm:698 ../Rpmdrake/pkg.pm:716 ../Rpmdrake/pkg.pm:811
 #: ../rpmdrake.pm:744 ../rpmdrake.pm:825 ../rpmdrake.pm:849
 #, c-format
 msgid "Error"
 msgstr "Хатогӣ"
 
-#: ../Rpmdrake/pkg.pm:709 ../Rpmdrake/pkg.pm:727 ../Rpmdrake/pkg.pm:740
+#: ../Rpmdrake/pkg.pm:699 ../Rpmdrake/pkg.pm:717 ../Rpmdrake/pkg.pm:730
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Коргузорӣ нагузашт"
 
-#: ../Rpmdrake/pkg.pm:710
+#: ../Rpmdrake/pkg.pm:700
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Коргузориро бе тафтиши тобеиятҳо кӯшиш кунем? (Ҳ/Н) "
 
-#: ../Rpmdrake/pkg.pm:728
+#: ../Rpmdrake/pkg.pm:718
 #, fuzzy, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "Коргузориро боз устувортар (--force) кӯшиш кунем? (Ҳ/Н)  "
 
-#: ../Rpmdrake/pkg.pm:762
+#: ../Rpmdrake/pkg.pm:752
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1999,12 +1999,12 @@ msgstr ""
 "\n"
 "Мумкин шумо хоҳиши навкунии манбаи додаҳои сарчашмаро доред."
 
-#: ../Rpmdrake/pkg.pm:773
+#: ../Rpmdrake/pkg.pm:763
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d коргузорӣ амалӣ нагардид"
 
-#: ../Rpmdrake/pkg.pm:787
+#: ../Rpmdrake/pkg.pm:777
 #, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
@@ -2017,43 +2017,43 @@ msgstr ""
 "Баъзе файлҳои танзимдарорӣ ҳамчун `.rpmnew' ё `.rpmsave' офарида шуда\n"
 "буд, акнун метавонед баъзеашонро барои амалиётҳо бозрасӣ кунед:"
 
-#: ../Rpmdrake/pkg.pm:795
+#: ../Rpmdrake/pkg.pm:787
 #, fuzzy, c-format
 msgid "Upgrade information"
 msgstr "Маълумоти оддӣ"
 
-#: ../Rpmdrake/pkg.pm:797
+#: ../Rpmdrake/pkg.pm:789
 #, c-format
 msgid "These packages come with upgrade information"
 msgstr "Ин бастаҳо бо ахбороти густаришёфта меоянд"
 
-#: ../Rpmdrake/pkg.pm:805
+#: ../Rpmdrake/pkg.pm:797
 #, fuzzy, c-format
 msgid "Upgrade information about this package"
 msgstr "Маълумоти иловагӣ барои қуттӣ..."
 
-#: ../Rpmdrake/pkg.pm:808
+#: ../Rpmdrake/pkg.pm:800
 #, fuzzy, c-format
 msgid "Upgrade information about package %s"
 msgstr "Маълумоти иловагӣ барои қуттӣ..."
 
-#: ../Rpmdrake/pkg.pm:820
+#: ../Rpmdrake/pkg.pm:812
 #, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr ""
 "Хатогии бартарафнашаванда: афсӯс, ки қуттӣ барои коргузорӣ намудан ёфт нашуд."
 
-#: ../Rpmdrake/pkg.pm:836 ../Rpmdrake/pkg.pm:853
+#: ../Rpmdrake/pkg.pm:828 ../Rpmdrake/pkg.pm:845
 #, c-format
 msgid "Please wait, removing packages..."
 msgstr "Интизор шавед, хориҷи қуттиҳо..."
 
-#: ../Rpmdrake/pkg.pm:864
+#: ../Rpmdrake/pkg.pm:856
 #, c-format
 msgid "Problem during removal"
 msgstr "Муаммо ҳангоми хориҷкунӣ"
 
-#: ../Rpmdrake/pkg.pm:865
+#: ../Rpmdrake/pkg.pm:857
 #, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
@@ -3147,6 +3147,9 @@ msgstr "Хориҷи Нармафзор"
 msgid "Software Media Manager"
 msgstr "Мудири Сарчашмаҳои Нармафзор"
 
+#~ msgid "Preparing..."
+#~ msgstr "Тайёрӣ..."
+
 #~ msgid "Message Passing"
 #~ msgstr "Гузаронидани Пайём"