fixed my previous bad entries

1 files changed, 123 insertions, 129 deletions

diff --git a/perl-install/share/po/uz@Cyrl.po b/perl-install/share/po/uz@Cyrl.po
index b04d8f5d0..bf9d694d1 100644
--- a/perl-install/share/po/uz@Cyrl.po
+++ b/perl-install/share/po/uz@Cyrl.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-uz@Cyrl\n"
-"POT-Creation-Date: 2003-12-01 19:01+0100\n"
+"POT-Creation-Date: 2003-12-03 03:09+0100\n"
 "PO-Revision-Date: 2003-11-17 13:47+0100\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <uz-li@yahoogroups.com>\n"
@@ -1601,7 +1601,7 @@ msgstr "16 миллионта ранг (24 бит)"
 msgid "Allow all users"
 msgstr "Ҳамма фойдаланувчиларга рухсат"
 
-#: ../../share/advertising/08-store.pl:1
+#: ../advertising/08-store.pl:1
 #, c-format
 msgid "The official MandrakeSoft Store"
 msgstr "Расмий MandrakeSoft дўкони"
@@ -1848,6 +1848,17 @@ msgstr "Серверлар ёқилмоқда..."
 msgid "Printing test page(s)..."
 msgstr "Синов бет(лар) босиб чиқарилмоқда..."
 
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid ""
+"Transfer successful\n"
+"You may want to verify you can login to the server with:\n"
+"\n"
+"ssh -i %s %s@%s\n"
+"\n"
+"without being prompted for a password."
+msgstr ""
+
 #: ../../fsedit.pm:1
 #, c-format
 msgid "There is already a partition with mount point %s\n"
@@ -2894,7 +2905,7 @@ msgstr "Палау"
 msgid "level"
 msgstr "даража"
 
-#: ../../share/advertising/13-mdkexpert_corporate.pl:1
+#: ../advertising/13-mdkexpert_corporate.pl:1
 #, c-format
 msgid ""
 "All incidents will be followed up by a single qualified MandrakeSoft "
@@ -3266,7 +3277,7 @@ msgstr ""
 msgid "Bad package"
 msgstr "Ёмон пакет"
 
-#: ../../share/advertising/07-server.pl:1
+#: ../advertising/07-server.pl:1
 #, c-format
 msgid ""
 "Transform your computer into a powerful Linux server: Web server, mail, "
@@ -3525,7 +3536,7 @@ msgstr "Кракерларга марҳамат"
 msgid "Module options:"
 msgstr "Модулнинг параметрлари:"
 
-#: ../../share/advertising/11-mnf.pl:1
+#: ../advertising/11-mnf.pl:1
 #, c-format
 msgid "Secure your networks with the Multi Network Firewall"
 msgstr "Кўп тармоқли файервол билан тармоғингизни ҳимояланг"
@@ -4193,7 +4204,7 @@ msgstr "Сақламасдан чиқиш"
 msgid "Yemen"
 msgstr "Яман"
 
-#: ../../share/advertising/11-mnf.pl:1
+#: ../advertising/11-mnf.pl:1
 #, c-format
 msgid "This product is available on the MandrakeStore Web site."
 msgstr "Бу маҳсулот MandrakeStore веб-сайтида бор."
@@ -4919,7 +4930,7 @@ msgstr ""
 msgid "Started on boot"
 msgstr "Система юкланганда ишга туширилган"
 
-#: ../../share/advertising/12-mdkexpert.pl:1
+#: ../advertising/12-mdkexpert.pl:1
 #, c-format
 msgid ""
 "Join the MandrakeSoft support teams and the Linux Community online to share "
@@ -5953,7 +5964,7 @@ msgid ""
 "number generation."
 msgstr ""
 
-#: ../../share/advertising/07-server.pl:1
+#: ../advertising/07-server.pl:1
 #, c-format
 msgid "Turn your computer into a reliable server"
 msgstr "Компютерингизни ишончли серверга айлантиринг"
@@ -6321,23 +6332,6 @@ msgstr ""
 msgid "Domain Authentication Required"
 msgstr ""
 
-#: ../../standalone/drakTermServ:1
-#, fuzzy, c-format
-msgid ""
-"\n"
-"\n"
-" Thanks:\n"
-"\t- LTSP Project http://www.ltsp.org\n"
-"\t- Michael Brown <mbrown\\@fensystems.co.uk>\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-" Рахматнома:\n"
-"\t- LTSP лойиҳаси http://www.ltsp.org\n"
-"\t- Майкл Браун <mbrown@fensystems.co.uk>\n"
-"\n"
-
 #: ../../security/level.pm:1
 #, c-format
 msgid "Use libsafe for servers"
@@ -7214,17 +7208,6 @@ msgstr "Сент-Кристофер ва Невис"
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Андоза 3 тугмали сичқонча"
 
-#: ../../standalone/drakbackup:1
-#, c-format
-msgid ""
-"Transfer successful\n"
-"You may want to verify you can login to the server with:\n"
-"\n"
-"ssh -i %s %s\\@%s\n"
-"\n"
-"without being prompted for a password."
-msgstr ""
-
 #: ../../any.pm:1
 #, c-format
 msgid "Enable OF Boot?"
@@ -7446,7 +7429,7 @@ msgstr ""
 "Уни алмаштириш учун \"Узатиш\" тугмасини босинг.\n"
 "Принтернинг бошқа номини киритишингиз ёки уни ўтказиб юборишингиз ҳам мумкин."
 
-#: ../../share/advertising/12-mdkexpert.pl:1
+#: ../advertising/12-mdkexpert.pl:1
 #, c-format
 msgid ""
 "Find the solutions of your problems via MandrakeSoft's online support "
@@ -7759,7 +7742,7 @@ msgstr "Сенегал"
 msgid "Command line"
 msgstr "Буйруқ"
 
-#: ../../share/advertising/08-store.pl:1
+#: ../advertising/08-store.pl:1
 #, c-format
 msgid ""
 "Our full range of Linux solutions, as well as special offers on products and "
@@ -7923,7 +7906,7 @@ msgstr ""
 msgid "Photo memory card access on your HP multi-function device"
 msgstr ""
 
-#: ../../share/advertising/09-mdksecure.pl:1
+#: ../advertising/09-mdksecure.pl:1
 #, c-format
 msgid ""
 "Enhance your computer performance with the help of a selection of partners "
@@ -8407,7 +8390,7 @@ msgstr "Автоматик босқичларни мослаш"
 msgid "Barbados"
 msgstr "Барбадос"
 
-#: ../../share/advertising/02-community.pl:1
+#: ../advertising/02-community.pl:1
 #, c-format
 msgid ""
 "Want to know more and to contribute to the Open Source community? Get "
@@ -8804,7 +8787,7 @@ msgstr ""
 "%s модулини юклаш муваффақият сиз тугади.\n"
 "Бошқа параметрлар билан яна уриниб кўришни истайсизми?"
 
-#: ../../share/advertising/01-thanks.pl:1
+#: ../advertising/01-thanks.pl:1
 #, c-format
 msgid "Welcome to the Open Source world."
 msgstr "Open Source оламига марҳамат."
@@ -9954,19 +9937,6 @@ msgstr "Италянча"
 msgid "Basic"
 msgstr "Асосий"
 
-#: ../../standalone/drakTermServ:1
-#, fuzzy, c-format
-msgid ""
-"\n"
-" Copyright (C) 2002 by MandrakeSoft \n"
-"\tStew Benedict sbenedict\\@mandrakesoft.com\n"
-"\n"
-msgstr ""
-"\n"
-" Copyright (C) 2002 by MandrakeSoft \n"
-"\tStew Benedict sbenedict@mandrakesoft.com\n"
-"\n"
-
 #: ../../install_messages.pm:1
 #, c-format
 msgid "http://www.mandrakelinux.com/en/92errata.php3"
@@ -10175,6 +10145,19 @@ msgid ""
 "Your choice? "
 msgstr ""
 
+#: ../../standalone/drakTermServ:1
+#, c-format
+msgid ""
+"\n"
+" Copyright (C) 2002 by MandrakeSoft \n"
+"\tStew Benedict sbenedict@mandrakesoft.com\n"
+"\n"
+msgstr ""
+"\n"
+" Copyright (C) 2002 by MandrakeSoft \n"
+"\tStew Benedict sbenedict@mandrakesoft.com\n"
+"\n"
+
 #: ../../standalone/draksplash:1
 #, c-format
 msgid "Save theme"
@@ -10300,7 +10283,7 @@ msgstr "Kensington Thinking Mouse"
 msgid "Configuration of a remote printer"
 msgstr "Масофадаги принтерни мослаш"
 
-#: ../../share/advertising/13-mdkexpert_corporate.pl:1
+#: ../advertising/13-mdkexpert_corporate.pl:1
 #, c-format
 msgid "An online platform to respond to enterprise support needs."
 msgstr ""
@@ -11006,7 +10989,7 @@ msgstr "тармоқ воситалардан фойдаланишни рухс�
 msgid "Firmware-Upload for HP LaserJet 1000"
 msgstr ""
 
-#: ../../share/advertising/03-software.pl:1
+#: ../advertising/03-software.pl:1
 #, c-format
 msgid ""
 "And, of course, push multimedia to its limits with the very latest software "
@@ -11122,7 +11105,7 @@ msgstr "Firmware керак"
 msgid "Remove List"
 msgstr "Рўйхатни олиб ташлаш"
 
-#: ../../share/advertising/05-desktop.pl:1
+#: ../advertising/05-desktop.pl:1
 #, c-format
 msgid "A customizable environment"
 msgstr ""
@@ -12693,7 +12676,7 @@ msgstr "Қоидани қўшиш"
 msgid "Chunk size %s\n"
 msgstr ""
 
-#: ../../share/advertising/02-community.pl:1
+#: ../advertising/02-community.pl:1
 #, c-format
 msgid "Build the future of Linux!"
 msgstr "Linux'нинг келажагини яратинг!"
@@ -12816,7 +12799,7 @@ msgid ""
 "in getting the display configured."
 msgstr ""
 
-#: ../../share/advertising/13-mdkexpert_corporate.pl:1
+#: ../advertising/13-mdkexpert_corporate.pl:1
 #, c-format
 msgid "MandrakeExpert Corporate"
 msgstr "Корпоратив MandrakeExpert"
@@ -13188,7 +13171,7 @@ msgstr ""
 msgid "Slovakian (QWERTZ)"
 msgstr "Словакча (qwertz)"
 
-#: ../../share/advertising/06-development.pl:1
+#: ../advertising/06-development.pl:1
 #, c-format
 msgid ""
 "To modify and to create in different languages such as Perl, Python, C and C+"
@@ -13374,7 +13357,7 @@ msgstr "DVD-ROM"
 msgid "Georgian (\"Latin\" layout)"
 msgstr "Грузинча (лотин)"
 
-#: ../../share/advertising/09-mdksecure.pl:1
+#: ../advertising/09-mdksecure.pl:1
 #, c-format
 msgid "Get the best items with Mandrake Linux Strategic partners"
 msgstr ""
@@ -13478,7 +13461,7 @@ msgstr "Системага автоматик равишда кириш"
 msgid "Domain Admin Password"
 msgstr ""
 
-#: ../../share/advertising/05-desktop.pl:1
+#: ../advertising/05-desktop.pl:1
 #, c-format
 msgid ""
 "Perfectly adapt your computer to your needs thanks to the 11 available "
@@ -13931,7 +13914,7 @@ msgstr "Бу ўрнатишми ёки янгилашми?"
 msgid "ISDN card"
 msgstr "ISDN karta"
 
-#: ../../share/advertising/02-community.pl:1
+#: ../advertising/02-community.pl:1
 #, c-format
 msgid ""
 "To share your own knowledge and help build Linux software, join our "
@@ -13967,6 +13950,40 @@ msgid ""
 "to Mandrake Linux version \"8.1\" is not recommended."
 msgstr ""
 
+#: ../../standalone/drakfont:1
+#, c-format
+msgid ""
+"\n"
+" Copyright (C) 2001-2002 by MandrakeSoft \n"
+"     DUPONT Sebastien (original version)\n"
+"     CHAUMETTE Damien <dchaumette@mandrakesoft.com>\n"
+"\n"
+" This program is free software; you can redistribute it and/or modify\n"
+" it under the terms of the GNU General Public License as published by\n"
+" the Free Software Foundation; either version 2, or (at your option)\n"
+" any later version.\n"
+"\n"
+" This program is distributed in the hope that it will be useful,\n"
+" but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+" GNU General Public License for more details.\n"
+"\n"
+" You should have received a copy of the GNU General Public License\n"
+" along with this program; if not, write to the Free Software\n"
+" Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"\n"
+" Thanks:\n"
+"    -  pfm2afm:   \n"
+"\t by Ken Borgendale:\n"
+"\t    Convert a Windows .pfm  file to a .afm (Adobe Font Metrics)\n"
+"    -  type1inst:\n"
+"\t by James Macnicol: \n"
+"\t    type1inst generates files fonts.dir fonts.scale & Fontmap.\n"
+"    -  ttf2pt1:   \n"
+"\t  by Andrew Weeks, Frank Siegert, Thomas Henlich, Sergey Babkin  \n"
+"             Convert ttf font files to afm and pfb fonts\n"
+msgstr ""
+
 #: ../../printer/main.pm:1
 #, c-format
 msgid "Printer on remote CUPS server"
@@ -15047,7 +15064,7 @@ msgstr ", кўп амалли ускуна"
 msgid "Laos"
 msgstr "Лаос"
 
-#: ../../share/advertising/04-configuration.pl:1
+#: ../advertising/04-configuration.pl:1
 #, c-format
 msgid ""
 "Mandrake Linux 9.2 provides you with the Mandrake Control Center, a powerful "
@@ -15277,21 +15294,6 @@ msgstr "DVDRAM ускуна"
 msgid "if set to yes, report unowned files."
 msgstr ""
 
-#: ../../standalone/harddrake2:1
-#, fuzzy, c-format
-msgid ""
-"This is HardDrake, a Mandrake hardware configuration tool.\n"
-"<span foreground=\"royalblue3\">Version:</span> %s\n"
-"<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;tvignaud"
-"\\@mandrakesoft.com&gt;\n"
-"\n"
-msgstr ""
-"HardDrake - Mandrake учун асбоб-ускуналарни мословчи восита.\n"
-"<span foreground=\"royalblue3\">Версия:</span> %s\n"
-"<span foreground=\"royalblue3\">Муаллиф:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
-"\n"
-
 #: ../../install_interactive.pm:1
 #, c-format
 msgid ""
@@ -15373,11 +15375,28 @@ msgstr "Ветнам"
 msgid "/_Fields description"
 msgstr "/_Майдонлар таърифи"
 
-#: ../../share/advertising/10-security.pl:1
+#: ../advertising/10-security.pl:1
 #, c-format
 msgid "Optimize your security by using Mandrake Linux"
 msgstr "Mandrake Linux ёрдамида хавфсизликингизни яхшиланг"
 
+#: ../../standalone/drakTermServ:1
+#, c-format
+msgid ""
+"\n"
+"\n"
+" Thanks:\n"
+"\t- LTSP Project http://www.ltsp.org\n"
+"\t- Michael Brown <mbrown@fensystems.co.uk>\n"
+"\n"
+msgstr ""
+"\n"
+"\n"
+" Рахматнома:\n"
+"\t- LTSP лойиҳаси http://www.ltsp.org\n"
+"\t- Майкл Браун <mbrown@fensystems.co.uk>\n"
+"\n"
+
 #: ../../install_steps_gtk.pm:1 ../../interactive.pm:1 ../../ugtk2.pm:1
 #: ../../Xconfig/resolution_and_depth.pm:1 ../../diskdrake/hd_gtk.pm:1
 #: ../../interactive/gtk.pm:1 ../../standalone/drakTermServ:1
@@ -15463,7 +15482,7 @@ msgstr ""
 msgid "mkinitrd optional arguments"
 msgstr "mkinitrd учун бошқа аргументлар"
 
-#: ../../share/advertising/03-software.pl:1
+#: ../advertising/03-software.pl:1
 #, c-format
 msgid ""
 "Surf the Web with Mozilla or Konqueror, read your mail with Evolution or "
@@ -16406,7 +16425,7 @@ msgstr ""
 msgid "Can't create catalog!"
 msgstr "Каталогни яратиб бўлмади!"
 
-#: ../../share/advertising/11-mnf.pl:1
+#: ../advertising/11-mnf.pl:1
 #, c-format
 msgid ""
 "Complete your security setup with this very easy-to-use software which "
@@ -16987,7 +17006,7 @@ msgstr "Пакет ўрнатилмаган"
 msgid "American Samoa"
 msgstr "Америка Самоаси"
 
-#: ../../share/advertising/12-mdkexpert.pl:1
+#: ../advertising/12-mdkexpert.pl:1
 #, c-format
 msgid "Become a MandrakeExpert"
 msgstr "MandrakeExpert бўлинг"
@@ -17228,7 +17247,7 @@ msgstr "Ихчам"
 msgid "Detected model: %s %s"
 msgstr "Аниқланган модел: %s %s"
 
-#: ../../share/advertising/03-software.pl:1
+#: ../advertising/03-software.pl:1
 #, c-format
 msgid "MandrakeSoft has selected the best software for you"
 msgstr "MandrakeSoft сиз учун энг яхши дастурларни танлади"
@@ -17467,7 +17486,7 @@ msgid ""
 "No CD or DVD image found, please copy the installation program and rpm files."
 msgstr ""
 
-#: ../../share/advertising/04-configuration.pl:1
+#: ../advertising/04-configuration.pl:1
 #, c-format
 msgid "Mandrake's multipurpose configuration tool"
 msgstr "Mandrake'нинг кўп мақсадли мослаш воситаси"
@@ -17497,7 +17516,7 @@ msgstr "Диск"
 msgid "Enter a printer device URI"
 msgstr "Босиб чиқариш ускунасининг URI'ни киритинг"
 
-#: ../../share/advertising/01-thanks.pl:1
+#: ../advertising/01-thanks.pl:1
 #, c-format
 msgid ""
 "The success of MandrakeSoft is based upon the principle of Free Software. "
@@ -17953,7 +17972,7 @@ msgstr "Картанинг модели:"
 msgid "Thin Client"
 msgstr ""
 
-#: ../../share/advertising/01-thanks.pl:1
+#: ../advertising/01-thanks.pl:1
 #, c-format
 msgid "Thank you for choosing Mandrake Linux 9.2"
 msgstr "Mandrake Linux 9.2 системасини танлаганингиз учун рахмат!"
@@ -18088,7 +18107,7 @@ msgstr "Серверни қўшиш"
 msgid "Remote printer name"
 msgstr "Масофадаги принтернинг номи"
 
-#: ../../share/advertising/10-security.pl:1
+#: ../advertising/10-security.pl:1
 #, c-format
 msgid ""
 "MandrakeSoft has designed exclusive tools to create the most secured Linux "
@@ -18447,6 +18466,21 @@ msgstr ""
 msgid "DHCP Client"
 msgstr "DHCP клиенти"
 
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid ""
+"This is HardDrake, a Mandrake hardware configuration tool.\n"
+"<span foreground=\"royalblue3\">Version:</span> %s\n"
+"<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
+"tvignaud@mandrakesoft.com&gt;\n"
+"\n"
+msgstr ""
+"HardDrake - Mandrake учун асбоб-ускуналарни мословчи восита.\n"
+"<span foreground=\"royalblue3\">Версия:</span> %s\n"
+"<span foreground=\"royalblue3\">Муаллиф:</span> Thierry Vignaud &lt;"
+"tvignaud@mandrakesoft.com&gt;\n"
+"\n"
+
 #: ../../standalone/drakgw:1
 #, c-format
 msgid "dismiss"
@@ -18644,40 +18678,6 @@ msgstr "Принтерларни узатмаш"
 msgid "Delay before booting the default image"
 msgstr "Андоза ОСни юклашдан олдин кутиб туриш вақти"
 
-#: ../../standalone/drakfont:1
-#, c-format
-msgid ""
-"\n"
-" Copyright (C) 2001-2002 by MandrakeSoft \n"
-"     DUPONT Sebastien (original version)\n"
-"     CHAUMETTE Damien <dchaumette\\@mandrakesoft.com>\n"
-"\n"
-" This program is free software; you can redistribute it and/or modify\n"
-" it under the terms of the GNU General Public License as published by\n"
-" the Free Software Foundation; either version 2, or (at your option)\n"
-" any later version.\n"
-"\n"
-" This program is distributed in the hope that it will be useful,\n"
-" but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-" GNU General Public License for more details.\n"
-"\n"
-" You should have received a copy of the GNU General Public License\n"
-" along with this program; if not, write to the Free Software\n"
-" Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
-"\n"
-" Thanks:\n"
-"    -  pfm2afm:   \n"
-"\t by Ken Borgendale:\n"
-"\t    Convert a Windows .pfm  file to a .afm (Adobe Font Metrics)\n"
-"    -  type1inst:\n"
-"\t by James Macnicol: \n"
-"\t    type1inst generates files fonts.dir fonts.scale & Fontmap.\n"
-"    -  ttf2pt1:   \n"
-"\t  by Andrew Weeks, Frank Siegert, Thomas Henlich, Sergey Babkin  \n"
-"             Convert ttf font files to afm and pfb fonts\n"
-msgstr ""
-
 #: ../../standalone/drakbackup:1
 #, c-format
 msgid "Use Hard Disk to backup"
@@ -18748,7 +18748,7 @@ msgstr ""
 "Компакт-дискни ўрнатилган компютерда \"rpm -qpl Mandrake/RPMS/*.rpm\" "
 "буйруғи билан текшириб кўринг.\n"
 
-#: ../../share/advertising/06-development.pl:1
+#: ../advertising/06-development.pl:1
 #, c-format
 msgid "Mandrake Linux 9.2: the ultimate development platform"
 msgstr "Mandrake Linux 9.2 - дастур тузиш учун энг яхши пойдевор"
@@ -19021,9 +19021,3 @@ msgstr ""
 
 #~ msgid "when checked, owner and group won't be changed"
 #~ msgstr "белгиланса, эгаси ва гурҳ ўзгартирилмайди"
-
-#~ msgid "-adobe-utopia-regular-r-*-*-25-*-*-*-p-*-iso8859-*,*-r-*"
-#~ msgstr "-adobe-utopia-regular-r-*-*-33-*-*-*-p-*-iso8859-*,*-r-*"
-
-#~ msgid "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
-#~ msgstr "-urw-times-bold-r-normal--17-*-100-100-p-*-iso10646-1-*,*-r-*"