changed MandrakeSoft -> Mandrakesoft

1 files changed, 140 insertions, 149 deletions

diff --git a/po/tg.po b/po/tg.po
index 2c3780e4..41ce12b7 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -2,7 +2,7 @@
 # translation of mdkonline-tg.po to Tajik
 # mdkonline messages translations to (Tajik)
 # Copyright (C) 2002,2004 Free Software Foundation, Inc.
-# Copyright (c) 2002 MandrakeSoft.
+# Copyright (c) 2002 Mandrakesoft.
 # 2004, infoDev, a World Bank organization
 # 2004, Khujand Computer Technologies, Inc.
 # 2004, KCT1, NGO
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-tg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-06-15 17:47+0200\n"
+"POT-Creation-Date: 2004-07-20 14:33+0200\n"
 "PO-Revision-Date: 2004-05-31 20:17+0000\n"
 "Last-Translator: Abrorova Hiromon\n"
 "Language-Team:  translations@tajikngo.org\n"
@@ -23,132 +23,132 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../mdkapplet:62
+#: ../mdkapplet:65
 msgid "No updates available for your system"
 msgstr "Барои системаи шумо навсозиҳои дастрас мавҷуд нетанд"
 
-#: ../mdkapplet:68
+#: ../mdkapplet:71
 msgid "Config problems. Launch \"configure\" again"
 msgstr "Мушкилоти танзимкунӣ. Аз нав \"танзимкунӣ\"-ро бор кунед"
 
-#: ../mdkapplet:74
+#: ../mdkapplet:77
 msgid "System is busy. Wait ..."
 msgstr "Система банд аст. Интизор шавед ..."
 
-#: ../mdkapplet:80
+#: ../mdkapplet:83
 #, perl-format
 msgid "%s packages available for update"
 msgstr "%s бастаҳо барои иловакунӣ дастрасанд"
 
-#: ../mdkapplet:86
+#: ../mdkapplet:89
 msgid "Service not available. Click on \"configuration\""
 msgstr "Хидматрасон дастрас нест. Ба \"танзимкунӣ\" ангушт занед"
 
-#: ../mdkapplet:92
+#: ../mdkapplet:95
 msgid "Network is down. Click on \"configure Network\""
 msgstr "Шабака дастрас аст. Ба \"танзимкунии Шабака\" ангушт занед"
 
-#: ../mdkapplet:98
+#: ../mdkapplet:101
 msgid "Service deactivated. Waiting for payment..."
 msgstr "Хидматрасонӣ ғайри фаъол сохта шудааст. Интизори пардохт гардед..."
 
-#: ../mdkapplet:102
+#: ../mdkapplet:105
 msgid "Launch Mandrake Update"
 msgstr "Сардиҳии Навкунии Mandrake"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:106
 msgid "Configuration"
 msgstr "Танзимкунӣ"
 
-#: ../mdkapplet:104
+#: ../mdkapplet:107
 msgid "Check Updates"
 msgstr "Тафтиши Навкуниҳо"
 
-#: ../mdkapplet:105
+#: ../mdkapplet:108
 msgid "Online WebSite"
 msgstr "WebПойгоҳи Ғайрихудмухтор"
 
-#: ../mdkapplet:106
+#: ../mdkapplet:109
 msgid "Configure Network"
 msgstr "Танзимкунии Шабака"
 
-#: ../mdkapplet:107
+#: ../mdkapplet:110
 msgid "Configure Now!"
 msgstr "Ҳозир Танзим кунед!"
 
-#: ../mdkapplet:139
+#: ../mdkapplet:142
 msgid "Mandrake Updates Applet"
 msgstr "Апплети Mandrake Навкунӣ"
 
-#: ../mdkapplet:147
+#: ../mdkapplet:150
 msgid "Actions"
 msgstr "Амалиёт"
 
-#: ../mdkapplet:149
+#: ../mdkapplet:152
 msgid "Install updates"
 msgstr "Кор гузоштани навигариҳо"
 
-#: ../mdkapplet:150
+#: ../mdkapplet:153
 msgid "Configure"
 msgstr "Ба танзим даровардан"
 
-#: ../mdkapplet:151 ../mdkapplet:163 ../mdkapplet:364
+#: ../mdkapplet:154 ../mdkapplet:166 ../mdkapplet:359
 msgid "Available"
 msgstr "Дастрас"
 
-#: ../mdkapplet:151
+#: ../mdkapplet:154
 msgid "Check updates"
 msgstr "Навкуниҳоро тафтиш кунед"
 
-#: ../mdkapplet:151
+#: ../mdkapplet:154
 msgid "Checking ..."
 msgstr "Тафтишкунӣ ..."
 
-#: ../mdkapplet:151 ../mdkapplet:163 ../mdkapplet:364
+#: ../mdkapplet:154 ../mdkapplet:166 ../mdkapplet:359
 msgid "Not Available"
 msgstr "Дастнорас"
 
-#: ../mdkapplet:152
+#: ../mdkapplet:155
 msgid "See logs"
 msgstr "Ба номнависҳо нигаред"
 
-#: ../mdkapplet:155
+#: ../mdkapplet:158
 msgid "Status"
 msgstr "Вазъият"
 
-#: ../mdkapplet:158
+#: ../mdkapplet:161
 msgid "Network Connection: "
 msgstr "Пайвастшавии Шабакавӣ:  "
 
-#: ../mdkapplet:159
+#: ../mdkapplet:162
 msgid "Down"
 msgstr "Ба поён"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:162
 msgid "Up"
 msgstr "Ба боло"
 
-#: ../mdkapplet:162
+#: ../mdkapplet:165
 msgid "New Updates: "
 msgstr "Навкуниҳои Тоза: "
 
-#: ../mdkapplet:166
+#: ../mdkapplet:169
 msgid "Last check: "
 msgstr "Тафтиши охирон: "
 
-#: ../mdkapplet:172 ../mdkapplet:414
+#: ../mdkapplet:175 ../mdkapplet:409
 msgid "Close"
 msgstr "Пӯшидан"
 
-#: ../mdkapplet:194
+#: ../mdkapplet:197
 msgid "Launching drakconnect\n"
 msgstr "Сардиҳии drakconnect\n"
 
-#: ../mdkapplet:198
+#: ../mdkapplet:201
 msgid "Launching mdkupdate --applet\n"
 msgstr "Сардиҳии mdkupdate --апплет\n"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:206
 msgid "Mdkonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
@@ -156,33 +156,33 @@ msgstr ""
 msgid "Computing new updates...\n"
 msgstr "Ҳисобкунии навозиҳои тоза...\n"
 
-#: ../mdkapplet:221
+#: ../mdkapplet:216
 msgid "Connecting to"
 msgstr "Пайвастшавӣ ба"
 
-#: ../mdkapplet:243
+#: ../mdkapplet:238
 msgid "Checking... Updates are available\n"
 msgstr "Тафтишкунӣ... Навкуниҳо имконпазиранд\n"
 
-#: ../mdkapplet:247
+#: ../mdkapplet:242
 msgid "Unknown state"
 msgstr "Ҳолати номаълум"
 
-#: ../mdkapplet:248
+#: ../mdkapplet:243
 msgid "Online services disabled. Contact MandrakeOnline site\n"
 msgstr ""
 "Хидматрасониҳои ғайрихудмухтор хомӯш карда мешаванд. Ба пойгоҳи "
 "MandrakeOnline пайваст шавед\n"
 
-#: ../mdkapplet:249
+#: ../mdkapplet:244
 msgid "Wrong Password.\n"
 msgstr "Гузарвожаи нодуруст.\n"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:245
 msgid "Wrong Action or host or login.\n"
 msgstr "Амалиёти нодурусти ё соҳиб ё ворид.\n"
 
-#: ../mdkapplet:251
+#: ../mdkapplet:246
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
@@ -190,51 +190,51 @@ msgstr ""
 "Чизе дар гузоришҳои шабакаи шумо нодуруст аст (гардиш, фейрвол ва гузоришҳои "
 "проксии худро санҷед)\n"
 
-#: ../mdkapplet:255
+#: ../mdkapplet:250
 msgid "System is up to date\n"
 msgstr "Системаи навкуниро талаб намекунад\n"
 
-#: ../mdkapplet:343
+#: ../mdkapplet:338
 msgid "No check"
 msgstr "Бе тафтишот"
 
-#: ../mdkapplet:356
+#: ../mdkapplet:351
 msgid "Checking Network: seems disabled\n"
 msgstr "Тафтиши Шабака: эҳтимолан хомӯш карда шудааст\n"
 
-#: ../mdkapplet:359
+#: ../mdkapplet:354
 msgid "Checking config file: Not present\n"
 msgstr "Тафтиши файли config: ҳозир нест\n"
 
-#: ../mdkapplet:404
+#: ../mdkapplet:399
 msgid "Logs"
 msgstr "Воридҳо"
 
-#: ../mdkapplet:420
+#: ../mdkapplet:415
 msgid "Clear"
 msgstr "Пок кардан"
 
-#: ../mdkapplet:446
+#: ../mdkapplet:441
 msgid "About.."
 msgstr "Дар бораи..."
 
-#: ../mdkapplet:447
+#: ../mdkapplet:442
 msgid "Quit"
 msgstr "Баромадан"
 
-#: ../mdkapplet:459
+#: ../mdkapplet:454
 msgid "Attempting to connect to mandrakeonline.net\n"
 msgstr "Ҳаракати пайвастшавӣ ба mandrakeonline.net\n"
 
-#: ../mdkonline:98
+#: ../mdkonline:86
 msgid "Skip Wizard"
 msgstr "Радкунии Устод"
 
-#: ../mdkonline:117
+#: ../mdkonline:100
 msgid "Welcome to MandrakeOnline"
 msgstr "Марҳамат ба MandrakeOnline"
 
-#: ../mdkonline:118
+#: ../mdkonline:101
 msgid ""
 "At this step You are supposed to have an account on MandrakeOnline.\n"
 "This assistant will help you to upload your configuration\n"
@@ -248,61 +248,61 @@ msgstr ""
 "барои шуморо хабардор доштан оид ба навигариҳои бехатарӣ\n"
 "ва афзоишҳои фоиданок ёрӣ хоҳад расонд.\n"
 
-#: ../mdkonline:119
+#: ../mdkonline:102
 msgid "Create a MandrakeOnline Account"
 msgstr "Офаридани Ҳисоби MandrakeOnline"
 
-#: ../mdkonline:121
+#: ../mdkonline:104
 msgid "I don't have a MandrakeOnline account and I want to "
 msgstr "Ман ҳисоботи MandrakeOline надорам ва доштан мехоҳам "
 
-#: ../mdkonline:121
+#: ../mdkonline:104
 msgid "Subscribe"
 msgstr "Обуна шудан"
 
-#: ../mdkonline:125 ../mdkonline:145
+#: ../mdkonline:108 ../mdkonline:128
 msgid "Login:"
 msgstr "Номи дохилӣ:"
 
-#: ../mdkonline:126 ../mdkonline:146
+#: ../mdkonline:109 ../mdkonline:129
 msgid "Password:"
 msgstr "Гузарвожа:"
 
-#: ../mdkonline:127
+#: ../mdkonline:110
 msgid "Confirm Password:"
 msgstr "Тасдиқи Гузарвожа:"
 
-#: ../mdkonline:128
+#: ../mdkonline:111
 msgid "Mail contact:"
 msgstr "Пайвасти постӣ:"
 
-#: ../mdkonline:135
+#: ../mdkonline:118
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Сиёсати Шахсии Mandrakelinux"
 
-#: ../mdkonline:141
+#: ../mdkonline:124
 msgid "Authentification"
 msgstr "Саҳеҳӣ"
 
-#: ../mdkonline:142
+#: ../mdkonline:125
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr ""
 "Ворикунанадаи MandrakeOnline-и худро, гузарвожа ва номи мошинаро ворид кунед:"
 
-#: ../mdkonline:147
+#: ../mdkonline:130
 msgid "Machine name:"
 msgstr "Номи мошина:"
 
-#: ../mdkonline:152
+#: ../mdkonline:135
 msgid "Send Configuration"
 msgstr "Фиристодани Танзимкунӣ"
 
-#: ../mdkonline:153
+#: ../mdkonline:136
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
 "\n"
-"The Wizard will now send the following information to MandrakeSoft:\n"
+"The Wizard will now send the following information to Mandrakesoft:\n"
 "1) the list of packages you have installed on your system,\n"
 "2) your hardware configuration.\n"
 "\n"
@@ -319,7 +319,7 @@ msgstr ""
 "“Барои аз хадамоти MandrakeOnline фоида гирифтан,\n"
 " ““мо ба бор кардани танзимдарории шумо наздик ҳастем.\n"
 "”“\n"
-"”“Устод маълумоти зеринро ҳозир ба MandrakeSoft мефиристад:\n"
+"”“Устод маълумоти зеринро ҳозир ба Mandrakesoft мефиристад:\n"
 "”“1) рӯйхати қуттиҳои ба системи шумо коргузошташуда,\n"
 "”“2) танзимдарории сахтафзори шумо.\n"
 "”“\n"
@@ -333,11 +333,11 @@ msgstr ""
 "”“Охирин, пости электронӣ бо номи корванди@mandrakeonline.net шумо ба““шумо "
 "таъмин карда мешавад.”"
 
-#: ../mdkonline:158 ../mdkonline:269 ../mdkonline:298
+#: ../mdkonline:141 ../mdkonline:208 ../mdkonline:234
 msgid "Finish"
 msgstr "Итмом"
 
-#: ../mdkonline:159
+#: ../mdkonline:142
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
@@ -345,7 +345,7 @@ msgstr ""
 "Ба туфайли MandrakeOnline аз ин лаҳза эътибран шумо ахбороти \n"
 "оиди бехатарӣ ва навкуниҳоро қабул хоҳед кард."
 
-#: ../mdkonline:159
+#: ../mdkonline:142
 msgid ""
 "MandrakeOnline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -354,75 +354,27 @@ msgstr ""
 "Барнома доимо ар системаи шумо иҷро мегардад ва то навкуниҳои оянда интизор "
 "мешавад.\n"
 
-#: ../mdkonline:159
+#: ../mdkonline:142
 msgid "Your upload was successful!"
 msgstr "Боркунии шумо бо муваффақият ноил гардид!"
 
-#: ../mdkonline:160
+#: ../mdkonline:143
 msgid "automated Upgrades"
 msgstr "афзоишҳои Худкоршуда"
 
-#: ../mdkonline:165
+#: ../mdkonline:148
 msgid "Country:"
 msgstr "Давлат:"
 
-#: ../mdkonline:198
-msgid "Creation"
-msgstr "Офариниш"
-
-#: ../mdkonline:198
-msgid "Login and password should be less than 12 characters\n"
-msgstr "Ворид ва гузарвожа бояд аз 12 аломат камтар дошта бошад\n"
-
-#: ../mdkonline:199
-msgid "Special characters"
-msgstr "Аломатҳои махсус"
-
-#: ../mdkonline:199
-msgid "Special characters are not allowed\n"
-msgstr "Аломатҳои махсус иҷозат дода намешаванд\n"
-
-#: ../mdkonline:200
-msgid "Empty fields"
-msgstr "Майдонҳои холӣ"
-
-#: ../mdkonline:200
-msgid "Please fill in all fields\n"
-msgstr "Марҳамат карда ҳамаи майдонҳои холиро пур кунед\n"
-
-#: ../mdkonline:201
-msgid "Email"
-msgstr "Пости электронӣ"
-
-#: ../mdkonline:201
-msgid "Email not valid\n"
-msgstr "Пости электронӣ нодуруст аст\n"
-
-#: ../mdkonline:202
-msgid "Account already exist\n"
-msgstr "Ҳисоб аллакай мавҷуд аст\n"
-
-#: ../mdkonline:202
-msgid "Change account"
-msgstr "Ҳисобро ивз кунед"
-
-#: ../mdkonline:208
-msgid "Problem connecting to server \n"
-msgstr "Муаммои пайвастшавӣ ба хидматгор \n"
-
-#: ../mdkonline:208
-msgid "Server Problem"
-msgstr "Мушкилии Хидматрасон"
-
-#: ../mdkonline:213 ../mdkonline:215 ../mdkonline:217
+#: ../mdkonline:182 ../mdkonline:184 ../mdkonline:186
 msgid "Error"
 msgstr "Хатогӣ"
 
-#: ../mdkonline:213
+#: ../mdkonline:182
 msgid "Please provide a login"
 msgstr "Марҳамат карда ба воридкунанда таъмин кунед"
 
-#: ../mdkonline:215
+#: ../mdkonline:184
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -430,33 +382,41 @@ msgstr ""
 "Гузарвожаҳо мувофиқ нестанд\n"
 " Лутфан такрор кунед\n"
 
-#: ../mdkonline:217
+#: ../mdkonline:186
 msgid "Not a valid mail address!\n"
 msgstr "Суроғаи пост ҳақиқӣ нест!\n"
 
-#: ../mdkonline:247
+#: ../mdkonline:198
+msgid "Reading configuration\n"
+msgstr "Танзимдарорӣ хонда шуда истодааст\n"
+
+#: ../mdkonline:203
 msgid "Sending configuration..."
 msgstr "Танзимкуниҳо фиристода шуда истодаанд..."
 
-#: ../mdkonline:273 ../mdkonline:349
+#: ../mdkonline:210 ../mdkonline:274
 msgid "Connection problem"
 msgstr "Муаммои пайвастагӣ"
 
-#: ../mdkonline:273 ../mdkonline:349
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
+#: ../mdkonline:210
+msgid "Problem occurs when uploading files, please try again"
 msgstr ""
-"Пайвастшавӣ бо MandrakeOnline нашуда истодаст, марҳамат карда дертар бори "
-"дигар кӯшиш кунед"
 
-#: ../mdkonline:315
+#: ../mdkonline:251
 msgid "Quitting Wizard\n"
 msgstr "Баромад аз Устод\n"
 
-#: ../mdkonline:361
+#: ../mdkonline:274
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
+msgstr ""
+"Пайвастшавӣ бо MandrakeOnline нашуда истодаст, марҳамат карда дертар бори "
+"дигар кӯшиш кунед"
+
+#: ../mdkonline:286
 msgid "Wrong password"
 msgstr "Гузарвожаи нодуруст"
 
-#: ../mdkonline:361
+#: ../mdkonline:286
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -474,46 +434,77 @@ msgstr ""
 " Таваҷӯҳ фармоед, ки шумо инчунин номи Мошинаро низ бояд ворид кунед \n"
 " (танҳо аломатҳои ҳарфӣ иҷозат дода мешаванд)"
 
-#: ../mdkonline:368
-msgid "Reading configuration\n"
-msgstr "Танзимдарорӣ хонда шуда истодааст\n"
-
-#: ../mdkupdate:58
+#: ../mdkupdate:53
 #, perl-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s MandrakeSoft.\n"
+"Copyright (C) %s Mandrakesoft.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate нусхаи %s\n"
-"Copyright (C) %s MandrakeSoft.\n"
+"Copyright (C) %s Mandrakesoft.\n"
 "Ин нармафзори озод мебошад ва дар зери шартҳои GNU GPL аз нав паҳн карда "
 "мешавад.\n"
 "\n"
 "истифода:\n"
 
-#: ../mdkupdate:63
+#: ../mdkupdate:58
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - чопи ин пайғоми ёрӣ.\n"
 
-#: ../mdkupdate:64
+#: ../mdkupdate:59
 msgid "  --auto         - Mdkupdate launched automatically.\n"
 msgstr "  --auto         - Mdkupdate ба таври худкор сар дода мешавад.\n"
 
-#: ../mdkupdate:65
+#: ../mdkupdate:60
 msgid "  --applet       - launch MandrakeUpdate.\n"
 msgstr "  --applet       - сардиҳии MandrakeНавкунӣ.\n"
 
-#: ../mdkupdate:66
+#: ../mdkupdate:61
 msgid "  --update       - Update keys\n"
 msgstr "  --update       - Навкунии калидҳо\n"
 
-#: ../mdkupdate:276
-msgid "Unable to update packages from mdkupdate medium.\n"
-msgstr "Нав кардани қуттиҳо аз муҳити mdkupdate номумкин.\n"
+#~ msgid "Creation"
+#~ msgstr "Офариниш"
+
+#~ msgid "Login and password should be less than 12 characters\n"
+#~ msgstr "Ворид ва гузарвожа бояд аз 12 аломат камтар дошта бошад\n"
+
+#~ msgid "Special characters"
+#~ msgstr "Аломатҳои махсус"
+
+#~ msgid "Special characters are not allowed\n"
+#~ msgstr "Аломатҳои махсус иҷозат дода намешаванд\n"
+
+#~ msgid "Empty fields"
+#~ msgstr "Майдонҳои холӣ"
+
+#~ msgid "Please fill in all fields\n"
+#~ msgstr "Марҳамат карда ҳамаи майдонҳои холиро пур кунед\n"
+
+#~ msgid "Email"
+#~ msgstr "Пости электронӣ"
+
+#~ msgid "Email not valid\n"
+#~ msgstr "Пости электронӣ нодуруст аст\n"
+
+#~ msgid "Account already exist\n"
+#~ msgstr "Ҳисоб аллакай мавҷуд аст\n"
+
+#~ msgid "Change account"
+#~ msgstr "Ҳисобро ивз кунед"
+
+#~ msgid "Problem connecting to server \n"
+#~ msgstr "Муаммои пайвастшавӣ ба хидматгор \n"
+
+#~ msgid "Server Problem"
+#~ msgstr "Мушкилии Хидматрасон"
+
+#~ msgid "Unable to update packages from mdkupdate medium.\n"
+#~ msgstr "Нав кардани қуттиҳо аз муҳити mdkupdate номумкин.\n"
 
 #~ msgid "Response from MandrakeOnline server\n"
 #~ msgstr "Ӯҳдадорӣ аз хидматрасони MandrakeOnline\n"