some Mandrake -> Mandrakelinux and MandrakeSoft -> Mandrakesoft fixes

30 files changed, 69 insertions, 89 deletions

diff --git a/po/bg.po b/po/bg.po
index ff8fbe5c..92dc7f34 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -533,7 +533,7 @@ msgstr ""
 #: ../control-center:92 ../control-center:99 ../control-center:1117
 #, c-format
 msgid "Mandrakelinux Control Center"
-msgstr "Мандрейк контролен център"
+msgstr "Мандрейклинукс контролен център"
 
 #: ../control-center:102 ../control-center:711
 #, c-format
@@ -1107,12 +1107,12 @@ msgstr ""
 #: ../control-center:590
 #, c-format
 msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Мандрейк контролен център  %s [на %s]"
+msgstr "Мандрейклинукс контролен център  %s [на %s]"
 
 #: ../control-center:604
 #, c-format
 msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Добре дошли в Мандрейк контролен център"
+msgstr "Добре дошли в Мандрейклинукс контролен център"
 
 #: ../control-center:757
 #, c-format
@@ -1167,7 +1167,7 @@ msgstr "Свалете допълнителни теми от www.damz.net"
 #: ../control-center:1059 ../control-center:1115
 #, c-format
 msgid "About - Mandrakelinux Control Center"
-msgstr "Относно - Мандрейк Контролен Център"
+msgstr "Относно - Мандрейклинукс Контролен Център"
 
 #: ../control-center:1069
 #, c-format
@@ -1221,12 +1221,12 @@ msgstr "Преводач:"
 #: ../control-center:1115
 #, c-format
 msgid "Mandrakelinux Control Center %s\n"
-msgstr "Мандрейк контролен център %s\n"
+msgstr "Мандрейклинукс контролен център %s\n"
 
 #: ../control-center:1119
 #, c-format
 msgid "Copyright (C) 1999-2004 Mandrakesoft SA"
-msgstr "Copyright (C) 1999-2004 Mandrakesoft SA"
+msgstr "Copyright © 1999-2004 Mandrakesoft SA"
 
 #: ../control-center:1125
 #, c-format
@@ -1236,7 +1236,7 @@ msgstr "Автори"
 #: ../control-center:1126
 #, c-format
 msgid "Mandrakelinux Contributors"
-msgstr "Хора спомогнали развитието на Мандрейк"
+msgstr "Хора спомогнали развитието на Мандрейклинукс"
 
 #: ../drakconsole:27
 #, fuzzy, c-format
@@ -1456,7 +1456,7 @@ msgstr ""
 #~ msgstr "Прескача помощника"
 
 #~ msgid "Mandrakelinux Control Center %s"
-#~ msgstr "Мандрейк контролен център %s"
+#~ msgstr "Мандрейклинукс контролен център %s"
 
 #~ msgid ""
 #~ "Mandrakelinux Control Center is Mandrake Linux's main configuration\n"
@@ -1468,8 +1468,8 @@ msgstr ""
 #~ "simplify the use of the system, notably by avoiding the use of the\n"
 #~ "evil command line."
 #~ msgstr ""
-#~ "Мандрейк Контролен Център е главния инструмент за настройка на\n"
-#~ "Мандрейк Линукс.Той позволява на системния администратор да \n"
+#~ "Мандрейклинукс Контролен Център е главния инструмент за настройка на\n"
+#~ "Мандрейклинукс.Той позволява на системния администратор да \n"
 #~ "конфигурира хардуера и услугите за всички потребители.\n"
 #~ "\n"
 #~ "\n"
@@ -1530,7 +1530,7 @@ msgstr ""
 #~ "Mandrakelinux Update helps you apply any fixes or upgrades to installed "
 #~ "packages"
 #~ msgstr ""
-#~ "Мандрейк Обновяване ви помага при обновяването на програмните пакети"
+#~ "Мандрейклинукс Обновяване ви помага при обновяването на програмните пакети"
 
 #~ msgid "MenuDrake helps you change what programs are shown on the menu"
 #~ msgstr "МенюДрейк ви помага да промените стартовото меню"
@@ -1904,7 +1904,7 @@ msgstr ""
 #~ msgstr "/Помощ/-"
 
 #~ msgid "The place where you can configure your Mandrakelinux Box"
-#~ msgstr "Мястото ,където можете да конфигурирате Мандрейк системата си"
+#~ msgstr "Мястото ,където можете да конфигурирате Мандрейклинукс системата си"
 
 #~ msgid "Ftp Server"
 #~ msgstr "FTP сервер"
diff --git a/po/bs.po b/po/bs.po
index 1fe1b355..9aef746a 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -36,7 +36,7 @@ msgid ""
 "Mandrake tools"
 msgstr ""
 "masivno čišćenje i rebuilding paketa, igre, port na SPARC arhitekturu, "
-"lektorisanje Mandrake alata"
+"lektorisanje Mandrakelinux alata"
 
 #: ../contributors.pl:13
 #, c-format
diff --git a/po/cs.po b/po/cs.po
index ade3ea14..ac58683c 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1243,7 +1243,7 @@ msgstr "Ovládací centrum Mandrakelinux %s\n"
 #: ../control-center:1119
 #, c-format
 msgid "Copyright (C) 1999-2004 Mandrakesoft SA"
-msgstr "Copyright ©1999-2004 MandrakeSoft SA"
+msgstr "Copyright ©1999-2004 Mandrakesoft SA"
 
 #: ../control-center:1125
 #, c-format
diff --git a/po/da.po b/po/da.po
index 7d890c88..f639cc9c 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,6 +1,6 @@
 # translation of da.po to Danish
 # Copyright (C) 2000,2003, 2004 Free Software Foundation, Inc.
-# Copyright (c) 2000 MandrakeSoft
+# Copyright (c) 2000 Mandrakesoft
 # Jacob Nordfalk <nordfalk@mobilixnet.dk> 2002
 # Martin Hansen <mah@k64.dk>, 2000.
 # Keld Simonsen <keld@dkuug.dk>, 2001-2003, 2003, 2004.
diff --git a/po/de.po b/po/de.po
index 4ce2c826..d33b0f3b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,7 +1,7 @@
 # translation of de.po to deutsch
 # translation of drakconf-de.po to german
 # german translation file of the Mandrakelinux Control-Center.
-# Copyright (C) 2000,2001,2002,2003 MandrakeSoft
+# Copyright (C) 2000,2001,2002,2003 Mandrakesoft
 # Stefan Siegel <siegel@linux-mandrake.com>, 2000,2001,2002,2003.
 # Peer Dunker <peer46@gmx.net>, 2001,2003.
 # Sebastian Deutscher <sebastian_deutscher@web.de>, 2003,2004.
@@ -1248,7 +1248,7 @@ msgstr "Mandrakelinux Kontrollzentrum %s\n"
 #: ../control-center:1119
 #, c-format
 msgid "Copyright (C) 1999-2004 Mandrakesoft SA"
-msgstr "Copyright © 1999-2004 MandrakeSoft S.A."
+msgstr "Copyright © 1999-2004 Mandrakesoft S.A."
 
 #: ../control-center:1125
 #, c-format
diff --git a/po/el.po b/po/el.po
index 5ca7bc6c..0f26f530 100644
--- a/po/el.po
+++ b/po/el.po
@@ -1,7 +1,7 @@
 # translation of drakconf-el.po to Greek
 # Greek Translation of DrakConf.
 # Copyright (C) 2000,2003 Free Software Foundation, Inc.
-# Copyright (c) 2000 MandrakeSoft
+# Copyright (c) 2000 Mandrakesoft
 # Theodore J. Soldatos <bafh@hellug.gr>, 2000
 # Additions/Corrections: Michael Menegakis <admin@www0.org>, 2002
 #  Νίκος Νύκταρης (Nick Niktaris) <niktarin@yahoo.com>, 2003
diff --git a/po/eo.po b/po/eo.po
index 99149943..9fdb9e18 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -1235,7 +1235,7 @@ msgstr "Mandrakelinux-Regejo %s\n"
 #: ../control-center:1119
 #, c-format
 msgid "Copyright (C) 1999-2004 Mandrakesoft SA"
-msgstr "Kopirajto (C) 1999-2004 MandrakeSoft SA"
+msgstr "Kopirajto (C) 1999-2004 Mandrakesoft SA"
 
 #: ../control-center:1125
 #, c-format
@@ -1379,10 +1379,10 @@ msgstr "Ekran-distingivo"
 #~ msgstr "Antaŭa"
 
 #~ msgid "Mandrake Control Center"
-#~ msgstr "Mandrak-Regejo"
+#~ msgstr "Mandrakelinux-Regejo"
 
 #~ msgid "Mandrake Control Center %s [on %s]"
-#~ msgstr "Mandrejko-Regejo %s [sur %s]"
+#~ msgstr "Mandrakelinux-Regejo %s [sur %s]"
 
 #~ msgid "Welcome to the Mandrake Control Center"
 #~ msgstr "Bonvenon ĉe la Mandrak-Regejo"
diff --git a/po/es.po b/po/es.po
index ef04eb16..59987240 100644
--- a/po/es.po
+++ b/po/es.po
@@ -36,7 +36,7 @@ msgid ""
 "Mandrake tools"
 msgstr ""
 "reconstrucción y limpieza masiva de paquetes,  juegos, portado a Sparc, "
-"relectura de las herramientas Mandrake"
+"relectura de las herramientas Mandrakelinux"
 
 #: ../contributors.pl:13
 #, c-format
diff --git a/po/et.po b/po/et.po
index f22f45f5..83580295 100644
--- a/po/et.po
+++ b/po/et.po
@@ -1,6 +1,6 @@
 # Translation of drakconf.po to Estonian.
 # Copyright (C) 2000 Free Software Foundation, Inc.
-# Copyright (c) 2000 MandrakeSoft
+# Copyright (c) 2000 Mandrakesoft
 # Riho Kurg <rx@linux.ee>, 2000
 #
 msgid ""
diff --git a/po/eu.po b/po/eu.po
index 873e2e18..c6e09b77 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -2,7 +2,7 @@
 # translation of drakconf-eu.po to basque
 # translation of drakconf.po to Euskara
 # translation of drakconf-eu.po to Euskara
-# EUSKERA: Mandrake translation
+# EUSKERA: Mandrakelinux translation
 # Copyright (C) 2000,2003, 2004 Free Software Foundation, Inc.
 # Iigo Salvador Azurmendi <xalba@euskalnet.net>, 2000-2002,2003,2004.
 # Hizkuntza Politikarako Sailburuordetza <hizpol@ej-gv.es>, 2004.
@@ -36,7 +36,7 @@ msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
 "Mandrake tools"
 msgstr ""
-"paketeen berreraiketa eta garbiketa itzela, jokuak, sparc port, Mandrake "
+"paketeen berreraiketa eta garbiketa itzela, jokuak, sparc port, Mandrakelinux "
 "tresnenberrirakurketa akats bila"
 
 #: ../contributors.pl:13
diff --git a/po/fi.po b/po/fi.po
index c7c0845b..c1d8701b 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -548,7 +548,7 @@ msgstr ""
 #: ../control-center:92 ../control-center:99 ../control-center:1117
 #, c-format
 msgid "Mandrakelinux Control Center"
-msgstr "Mandraken Ohjauskeskus "
+msgstr "Mandrakelinuxin Ohjauskeskus "
 
 #: ../control-center:102 ../control-center:711
 #, c-format
@@ -1123,12 +1123,12 @@ msgstr ""
 #: ../control-center:590
 #, c-format
 msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Mandraken Ohjauskeskus %s [%s]"
+msgstr "Mandrakelinuxin Ohjauskeskus %s [%s]"
 
 #: ../control-center:604
 #, c-format
 msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Tervetuloa Mandraken Ohjauskeskukseen"
+msgstr "Tervetuloa Mandrakelinuxin Ohjauskeskukseen"
 
 #: ../control-center:757
 #, c-format
@@ -1183,7 +1183,7 @@ msgstr "Hae lisää teemoja osoitteesta: www.damz.net"
 #: ../control-center:1059 ../control-center:1115
 #, c-format
 msgid "About - Mandrakelinux Control Center"
-msgstr "Tietoja - Mandraken Ohjauskeskus"
+msgstr "Tietoja - Mandrakelinuxin Ohjauskeskus"
 
 #: ../control-center:1069
 #, c-format
@@ -1237,7 +1237,7 @@ msgstr "Kääntäjä: "
 #: ../control-center:1115
 #, c-format
 msgid "Mandrakelinux Control Center %s\n"
-msgstr "Mandraken Ohjauskeskus %s\n"
+msgstr "Mandrakelinuxin Ohjauskeskus %s\n"
 
 #: ../control-center:1119
 #, c-format
diff --git a/po/ga.po b/po/ga.po
index 44fd7b47..990acff2 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -1,6 +1,6 @@
 # Irish translations for DrakConf
 # Copyright (C) 2000,2004 Free Software Foundation, Inc.
-# Copyright (c) 2000,2004 MandrakeSoft
+# Copyright (c) 2000,2004 Mandrakesoft
 # Séamus Ó Ciardhuain <seoc at iolfree.ie>, 2004
 # Proinnsis Breathnach <breatpro@dublin.ml.com>, 2000
 # Alastair McKinstry <mckinstry@computer.org>
diff --git a/po/gl.po b/po/gl.po
index 7b00839c..fa6f8393 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,6 +1,6 @@
 # Galician translation of DrakConf.
 # Copyright (C) 2000, 2001 Jesús Bravo Álvarez.
-# Copyright (C) 2000, 2001 MandrakeSoft
+# Copyright (C) 2000, 2001 Mandrakesoft
 # Jesús Bravo Álvarez <jba@pobox.com>, 2000, 2001.
 #
 msgid ""
@@ -257,9 +257,9 @@ msgid ""
 msgstr ""
 
 #: ../contributors.pl:34
-#, fuzzy, c-format
+#, c-format
 msgid "Olivier Blin"
-msgstr "Olivier Thauvin"
+msgstr "Olivier Blin"
 
 #: ../contributors.pl:34
 #, c-format
@@ -518,7 +518,7 @@ msgstr ""
 #: ../control-center:92 ../control-center:99 ../control-center:1117
 #, c-format
 msgid "Mandrakelinux Control Center"
-msgstr "Centro de control de Linux Mandrake"
+msgstr "Centro de control de Mandrakelinux"
 
 #: ../control-center:102 ../control-center:711
 #, c-format
@@ -1089,12 +1089,12 @@ msgstr ""
 #: ../control-center:590
 #, c-format
 msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Centro de control de Linux Mandrake %s [en %s]"
+msgstr "Centro de control de Mandrakelinux %s [en %s]"
 
 #: ../control-center:604
 #, c-format
 msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Benvid@ ó Centro de control de Linux Mandrake"
+msgstr "Benvid@ ó Centro de control de Mandrakelinux"
 
 #: ../control-center:757
 #, c-format
@@ -1149,7 +1149,7 @@ msgstr "Conseguir temas adicionais en www.damz.net"
 #: ../control-center:1059 ../control-center:1115
 #, c-format
 msgid "About - Mandrakelinux Control Center"
-msgstr "Acerca de - Centro de control de Linux Mandrake"
+msgstr "Acerca de - Centro de control de Mandrakelinux"
 
 #: ../control-center:1069
 #, c-format
@@ -1203,7 +1203,7 @@ msgstr "Traductor: "
 #: ../control-center:1115
 #, c-format
 msgid "Mandrakelinux Control Center %s\n"
-msgstr "Centro de control de Linux Mandrake %s\n"
+msgstr "Centro de control de Mandrakelinux %s\n"
 
 #: ../control-center:1119
 #, c-format
@@ -1216,9 +1216,9 @@ msgid "Authors"
 msgstr "Autores"
 
 #: ../control-center:1126
-#, fuzzy, c-format
+#, c-format
 msgid "Mandrakelinux Contributors"
-msgstr "Contribuidores de Linux Mandrake"
+msgstr "Contribuidores de Mandrakelinux"
 
 #: ../drakconsole:27
 #, fuzzy, c-format
@@ -1344,9 +1344,5 @@ msgstr "Usuarios e Grupos"
 msgid "Screen Resolution"
 msgstr "Resolución"
 
-#, fuzzy
-#~ msgid "mono introduction, updated abiword"
-#~ msgstr "Configuración do hardware"
-
 #~ msgid "Previous"
 #~ msgstr "Anterior"
diff --git a/po/hr.po b/po/hr.po
index ed8c55c2..b13675c7 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -1,6 +1,6 @@
 # Croatian Translation for DrakConf.
 # Copyright (C) 2000 Free Software Foundation, Inc.
-# Copyright (c) 2000 MandrakeSoft
+# Copyright (c) 2000 Mandrakesoft
 # Vladimir Vuksan <vuksan@veus.hr>, 2000
 # Vlatko Kosturjak <kost@iname.com>, 2000, 2001
 msgid ""
diff --git a/po/ja.po b/po/ja.po
index e1650c1b..c4212b5f 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,6 +1,6 @@
 # translation of drakconf-ja.po to Japanese
 # Copyright (C) 2000,2003, 2004 Free Software Foundation, Inc.
-# Copyright (C) 2000 MandrakeSoft
+# Copyright (C) 2000 Mandrakesoft
 # YAMAGATA Hiroo <hiyori13@alum.mit.edu>, 2000.
 # UTUMI Hirosi <utuhiro78@yahoo.co.jp>, 2003, 2004.
 #
diff --git a/po/ko.po b/po/ko.po
index 8685d927..9951512e 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,6 +1,6 @@
 # Korean translation of DrakConf.
 # Copyright (C) 2000 Free Software Foundation, Inc.
-# Copyright (c) 2000 MandrakeSoft
+# Copyright (c) 2000 Mandrakesoft
 # Cheolho Choi <forquake@hey.to>, 2000.
 #
 msgid ""
diff --git a/po/mk.po b/po/mk.po
index 4b7d2c51..666d102c 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -32,7 +32,7 @@ msgid ""
 "Mandrake tools"
 msgstr ""
 "масивно повторно градење и прочистување на пакетите, игри, sparc порти, "
-"крајно прегледување на Mandrake алатките"
+"крајно прегледување на Mandrakelinux алатките"
 
 #: ../contributors.pl:13
 #, c-format
diff --git a/po/nb.po b/po/nb.po
index 1010e664..2e41b570 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,5 +1,5 @@
 # translation of drakconf-nb.po to Norwegian Bokmål
-# Copyright (C) 2000 MandrakeSoft.
+# Copyright (C) 2000 Mandrakesoft.
 # Terje Bjerkelia <terje@bjerkelia.com>, 2000.
 # Andreas Bergstrøm <abergstr@halden.net>, 2001.
 # Per Øyvind Karlsen <peroyvind@sintrax.net>, 2003, 2004.
diff --git a/po/pt.po b/po/pt.po
index 651005f9..1ddd39cb 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -41,7 +41,7 @@ msgid ""
 "Mandrake tools"
 msgstr ""
 "muita reconstrução e limpeza de pacotes, jogos, versão para sparc, "
-"verificação das ferramentas Mandrake"
+"verificação das ferramentas Mandrakelinux"
 
 #: ../contributors.pl:13
 #, c-format
diff --git a/po/ru.po b/po/ru.po
index 7548d22e..6e0bb54e 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,6 +1,6 @@
 # translation of drakconf-ru.po to Russian
 # Copyright (C) 2000,2003, 2004 Free Software Foundation, Inc.
-# Copyright (c) 2000 MandrakeSoft
+# Copyright (c) 2000 Mandrakesoft
 # Vladimir Choundalov <choundalovvv@point.pwp.ru>, 2001.
 # Aleksey Smirnov <smi@logic.ru>, 2000.
 # Vitaly Zubkov <habad@mksat.net>, 11/11/2001.
diff --git a/po/sc.po b/po/sc.po
index 66af9721..e754b918 100644
--- a/po/sc.po
+++ b/po/sc.po
@@ -537,7 +537,7 @@ msgstr ""
 #: ../control-center:92 ../control-center:99 ../control-center:1117
 #, c-format
 msgid "Mandrakelinux Control Center"
-msgstr "Centru de Controllu Mandrake"
+msgstr "Centru de Controllu Mandrakelinux"
 
 #: ../control-center:102 ../control-center:711
 #, c-format
@@ -1117,7 +1117,7 @@ msgstr "Mandrakelinux Control Center %s [in %s]"
 #: ../control-center:604
 #, c-format
 msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Beni beniu in su Centru de Controllu Mandrake"
+msgstr "Beni beniu in su Centru de Controllu Mandrakelinux"
 
 #: ../control-center:757
 #, c-format
diff --git a/po/sl.po b/po/sl.po
index 282b9f10..60edb287 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,7 +2,7 @@
 # translation of drakconf-sl.po to Slovenian
 # translation of drakconf-sl.po to Slovenščina
 # Copyright (C) 2000,2003, 2004 Free Software Foundation, Inc.
-# Copyright (c) 2000 MandrakeSoft
+# Copyright (c) 2000 Mandrakesoft
 # Alen Salamun <alien@alienworld.org>, 2000.
 # Gregor Pirnaver <gregor.pirnaver@email.si>, 2002,2003, 2004.
 # Gregor Pirnaver <gregor.pirnaver@siol.net>, 2003,2004.
diff --git a/po/sr.po b/po/sr.po
index 89c9770c..c8a998eb 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,6 +1,6 @@
 # translation of drakconf-sr.po to serbian
 # Copyright (C) 2000,2003, 2004 Free Software Foundation, Inc.
-# Copyright (c) 2000 MandrakeSoft
+# Copyright (c) 2000 Mandrakesoft
 # Jankovic Tomislav <tomaja@net.yu>, 2000,2002.
 # Toma Jankovic <tomaja@net.yu>, 2003.
 # Toma Jankovic <webmaster@mandrake.co.yu>, 2004.
@@ -1433,7 +1433,7 @@ msgstr "Чувари екрана"
 #~ "simplify the use of the system, notably by avoiding the use of the\n"
 #~ "evil command line."
 #~ msgstr ""
-#~ "Mandrakelinux Контролни Центар је Mandrake Linux-об главни "
+#~ "Mandrakelinux Контролни Центар је Mandrakelinux-об главни "
 #~ "конфигурациони\n"
 #~ "алат. Он омогућава администратору система да подеси хардвер\n"
 #~ "сервисе које користе сви корисници.\n"
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index 2db274e2..f67a16ad 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -1,6 +1,6 @@
 # translation of drakconf-sr.po to serbian
 # Copyright (C) 2000,2003, 2004 Free Software Foundation, Inc.
-# Copyright (c) 2000 MandrakeSoft
+# Copyright (c) 2000 Mandrakesoft
 # Jankovic Tomislav <tomaja@net.yu>, 2000,2002.
 # Toma Jankovic <tomaja@net.yu>, 2003.
 # Toma Jankovic <webmaster@mandrake.co.yu>, 2004.
@@ -1433,7 +1433,7 @@ msgstr "Čuvari ekrana"
 #~ "simplify the use of the system, notably by avoiding the use of the\n"
 #~ "evil command line."
 #~ msgstr ""
-#~ "Mandrakelinux Kontrolni Centar je Mandrake Linux-ob glavni "
+#~ "Mandrakelinux Kontrolni Centar je Mandrakelinux-ob glavni "
 #~ "konfiguracioni\n"
 #~ "alat. On omogućava administratoru sistema da podesi hardver\n"
 #~ "servise koje koriste svi korisnici.\n"
diff --git a/po/sv.po b/po/sv.po
index a33c709d..14348db4 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -3,7 +3,7 @@
 # Översättning av drakconf-sv.po till Svenska
 # translation of drakconf-sv.po to Svenska
 # Copyright (C) 2000,2002,2003, 2004 Free Software Foundation, Inc.
-# Copyright (c) 2000 MandrakeSoft
+# Copyright (c) 2000 Mandrakesoft
 # Fuad Sabanovic <manijak@swipnet.se>, 2000.
 # Mattias Dahlberg <voz@home.se>, 2001, 2002.
 # Mattias Newzella <newzella@linux.nu>, 2001, 2002,2003, 2004.
diff --git a/po/tg.po b/po/tg.po
index bdae0749..9de7c99b 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -3,7 +3,7 @@
 # translation of drakconf-tg.po to Tajik
 # DrakConf messages translation to (tg).
 # Copyright (C) 2000,2003,2004 Free Software Foundation, Inc.
-# Copyright (c) 2000 MandrakeSoft
+# Copyright (c) 2000 Mandrakesoft
 # 2004, infoDev, a World Bank organization
 # 2004, Khujand Computer Technologies, Inc.
 # 2004, KCT1, NGO
@@ -1412,22 +1412,6 @@ msgstr "Ҳалнокии Экран"
 #~ msgid "Please wait..."
 #~ msgstr "Интизор шавед..."
 
-#, fuzzy
-#~ msgid "Display Configuration"
-#~ msgstr "Танзимдарории Хидматгор"
-
-#, fuzzy
-#~ msgid "KeyBoard Configuration"
-#~ msgstr "Танзимдарории Хидматгор"
-
-#, fuzzy
-#~ msgid "Mouse Configuration"
-#~ msgstr "Танзимдарории Хидматгор"
-
-#, fuzzy
-#~ msgid "Service Configuration"
-#~ msgstr "Танзимдарории Хидматгор"
-
 #~ msgid ""
 #~ "Mandrake Control Center is Mandrake Linux's main configuration\n"
 #~ "tool. It enables the system administrator to configure the hardware\n"
diff --git a/po/uk.po b/po/uk.po
index 5c1bf38e..f2a8c8a9 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,7 +1,7 @@
 # translation of drakconf-uk.po to ukrainian
 # Ukrainian translation of drakconf.
 # Copyright (C) 2000,2003, 2004 Free Software Foundation, Inc.
-# Copyright (c) 2000 MandrakeSoft
+# Copyright (c) 2000 Mandrakesoft
 # Sergey Ribalchenko <fisher@obu.ck.ua>, 2000.
 # Michael Shigorin <mike@alt-linux.org>, 2002 (small fixes).
 # Gladky Dima <gladimdim@inbox.ru>, 2002 (fixes).
@@ -548,7 +548,7 @@ msgstr ""
 #: ../control-center:92 ../control-center:99 ../control-center:1117
 #, c-format
 msgid "Mandrakelinux Control Center"
-msgstr "Центр керування Мандрейк"
+msgstr "Центр керування Мандрейклінакс"
 
 #: ../control-center:102 ../control-center:711
 #, c-format
@@ -1123,12 +1123,12 @@ msgstr ""
 #: ../control-center:590
 #, c-format
 msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Центр керування Мандрейк %s [%s]"
+msgstr "Центр керування Мандрейклінакс %s [%s]"
 
 #: ../control-center:604
 #, c-format
 msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Ласкаво просимо до Центру керування Мандрейк"
+msgstr "Ласкаво просимо до Центру керування Мандрейклінакс"
 
 #: ../control-center:757
 #, c-format
@@ -1185,7 +1185,7 @@ msgstr "Взяти додаткові теми з www.damz.net"
 #: ../control-center:1059 ../control-center:1115
 #, c-format
 msgid "About - Mandrakelinux Control Center"
-msgstr "Про Центр керування Мандрейк"
+msgstr "Про Центр керування Мандрейклінакс"
 
 #: ../control-center:1069
 #, c-format
@@ -1239,7 +1239,7 @@ msgstr "Перекладач:"
 #: ../control-center:1115
 #, c-format
 msgid "Mandrakelinux Control Center %s\n"
-msgstr "Центр керування Мандрейк %s\n"
+msgstr "Центр керування Мандрейклінакс %s\n"
 
 #: ../control-center:1119
 #, c-format
@@ -1254,7 +1254,7 @@ msgstr "Автори"
 #: ../control-center:1126
 #, c-format
 msgid "Mandrakelinux Contributors"
-msgstr "Ті, що підтримують Лінакс Мандрейк"
+msgstr "Ті, що підтримують Мандрейклінакс"
 
 #: ../drakconsole:27
 #, fuzzy, c-format
@@ -1441,7 +1441,7 @@ msgstr "Роздільна здатність екрану"
 #~ "evil command line."
 #~ msgstr ""
 #~ "Центр керування Mandrakelinux є основним конфігураційним інструментом\n"
-#~ "Лінакс Мандрейк. Він дає можливість системному адміністратору\n"
+#~ "Мандрейклінакс. Він дає можливість системному адміністратору\n"
 #~ "налаштовувати обладнання і сервіси для використання всіма користувачами.\n"
 #~ "\n"
 #~ "\n"
diff --git a/po/uz.po b/po/uz.po
index 1eb9cba9..df89db3a 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -1,6 +1,6 @@
 # translation of drakconf-uz.po to Uzbek
 # Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-# Copyright (C) 2003 MandrakeSoft.
+# Copyright (C) 2003 Mandrakesoft.
 # Mashrab Kuvatov <kmashrab@uni-bremen.de>, 2003, 2004.
 #
 msgid ""
diff --git a/po/uz@Latn.po b/po/uz@Latn.po
index ce0b9a1f..4821d7df 100644
--- a/po/uz@Latn.po
+++ b/po/uz@Latn.po
@@ -1,6 +1,6 @@
 # translation of drakconf-uz.po to Uzbek
 # Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-# Copyright (C) 2003 MandrakeSoft.
+# Copyright (C) 2003 Mandrakesoft.
 # Mashrab Kuvatov <kmashrab@uni-bremen.de>, 2003, 2004.
 #
 msgid ""
diff --git a/po/wa.po b/po/wa.po
index f52b7135..8731bf25 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -1,6 +1,6 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2000 Free Software Foundation, Inc.
-# Copyright (c) 2000 MandrakeSoft
+# Copyright (c) 2000 Mandrakesoft
 # Pablo Saratxaga <pablo@mandrakesoft.com>, 2000,2003,2004.
 # Lorint Hendschel <LorintHendschel@skynet.be>, 2002.
 # Pablo Saratxaga <pablo@walon.org>, 2004.
@@ -1244,7 +1244,7 @@ msgstr "Cinte di contrôle di Mandrakelinux %s\n"
 #: ../control-center:1119
 #, c-format
 msgid "Copyright (C) 1999-2004 Mandrakesoft SA"
-msgstr "Copyright © 1999-2004 MandrakeSoft SA"
+msgstr "Copyright © 1999-2004 Mandrakesoft SA"
 
 #: ../control-center:1125
 #, c-format