75 files changed, 1296 insertions, 1296 deletions
diff --git a/contributors.pl b/contributors.pl
index 5af61d12..aaabf5a9 100644
--- a/contributors.pl
+++ b/contributors.pl
@@ -9,7 +9,7 @@ use common;
 {
 
 	N("Packagers") => "",
-	N("Per Oyvind Karlsen") => N("massive packages rebuilding and cleaning, games, sparc port, proofreading of Mandrake tools"),
+	N("Per Oyvind Karlsen") => N("massive packages rebuilding and cleaning, games, sparc port, proofreading of Mandriva tools"),
 	N("Guillaume Rousse") => N("cowsay introduction"),
 	N("Olivier Thauvin") => N("figlet introduction, Distriblint (checking rpm in the distro)"),
 	N("Marcel Pol") => N("xfce4, updated abiword, mono"),
diff --git a/control-center b/control-center
index dff60137..538e24dd 100755
--- a/control-center
+++ b/control-center
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # $Id$
 
-# Copyright (C) 1999-2005 MandrakeSoft
+# Copyright (C) 1999-2005 Mandriva
 #                         Daouda Lo <daouda@mandrakesoft.com>
 #                         Damien Krotkine
 #                         Thierry Vignaud <tvignaud@mandrakesoft.com>
@@ -95,14 +95,14 @@ Gtk2::Rc->parse($rc) if -r $rc;
 # Splash window:   please wait ...
 my $window_splash = Gtk2::Window->new('popup');
 $window_splash->signal_connect(delete_event => \&quit_global);
-$window_splash->set_title(N("Mandrakelinux Control Center"));
+$window_splash->set_title(N("Mandriva linux Control Center"));
 $window_splash->set_position('center_always');
 $window_splash->add(gtkadd(gtkset_shadow_type(Gtk2::Frame->new, 'etched_out'),
                            gtkput(my $fixed = Gtk2::Fixed->new,
                                   gtkpack(Gtk2::VBox->new(0, 0),
                                           if_(-r "$themes_dir/$theme/splash_screen.png", gtkcreate_img("splash_screen")),
                                           gtkset_markup(Gtk2::Label->new, join('', qq(\n<span size="x-large" weight="heavy">),
-                                                                               N("Mandrakelinux Control Center"),
+                                                                               N("Mandriva linux Control Center"),
                                                                                "</span>"),
                                                        ),
                                           Gtk2::Label->new(N("Loading... Please wait") . "\n"),
@@ -416,11 +416,11 @@ my %programs =
    },
 
 
-   "Mandrakeonline" =>
+   "Mandriva Online" =>
    {
     binary => "$xbindir/mdkonline",
     embedded => 1,
-    description => N("Mandrakeonline"),
+    description => N("Mandriva Online"),
     long_description => N("Upload your configuration in order to keep you informed about security updates and useful upgrades"),
     icon => 'mdkonline-mdk',
     expert_mode => 1,
@@ -438,13 +438,13 @@ my %programs =
    },
 
 
-   "Mandrake Update" =>
+   "Mandriva Update" =>
    {
-    binary => "$sbindir/MandrakeUpdate",
+    binary => "$sbindir/MandrivaUpdate",
     embedded => 1,
     description => N("Updates"),
     long_description => N("Look at available updates and apply any fixes or upgrades to installed packages"),
-    icon => 'MandrakeUpdate',
+    icon => 'MandrivaUpdate',
     application_driven_menu => 1,
    },
 
@@ -723,12 +723,12 @@ my @tree =
                 "Install Software",
                 "Installed Software",
                 "Remove Software",
-		"Mandrake Update",
+                "Mandriva Update",
                 "Software Media Manager",
                ),
             if_($isParkRpmDrake, "Manage park"),
 	    if_($isDrakStats, "Package stats"),
-            "Mandrakeonline"
+            "Mandriva Online"
            ]
          ]),
 
@@ -747,7 +747,7 @@ my @tree =
                  N("Set up a web server"),
                ],
                [ "Installation server wizard",    "installsrv", 'wizard-mdk', N("Configure installation server"),
-                 N("Set up server for network installations of Mandrakelinux"), 1,
+                 N("Set up server for network installations of Mandriva linux"), 1,
                ],
                ),
             ),
@@ -1248,7 +1248,7 @@ $window_global->signal_connect(delete_event => \&quit_global);
 
 use POSIX qw(:sys_utsname_h :math_h :sys_wait_h :unistd_h);
 my (undef, $nodename) = POSIX::uname();
-$window_global->set_title(N("Mandrakelinux Control Center %s [on %s]", $version, $nodename));
+$window_global->set_title(N("Mandriva linux Control Center %s [on %s]", $version, $nodename));
 $window_global->set_position('center');
 
 foreach my $notebook ($banner_notebook) {
@@ -1262,7 +1262,7 @@ $notebook_global->set_scrollable(1);
 # banner :
 
 add2notebook($banner_notebook, "", Gtk2::Banner->new("/usr/share/icons/large/drakconf.png", 
-                                                     N("Welcome to the Mandrakelinux Control Center")));
+                                                     N("Welcome to the Mandriva linux Control Center")));
 
 
 my ($hand_cursor, $normal_cursor, $wait_cursor) = map { Gtk2::Gdk::Cursor->new($_) } qw(hand2 left-ptr watch);
@@ -1798,7 +1798,7 @@ sub more_themes() {
 }
 
 sub about_mdk_cc() {
-    my $window_about = new_dialog(N("About - Mandrakelinux Control Center"));
+    my $window_about = new_dialog(N("About - Mandriva linux Control Center"));
 
     my $tree_model = Gtk2::TreeStore->new("Glib::String", "Glib::String", "Glib::String");
     my $credits_model = Gtk2::TreeStore->new("Glib::String", "Glib::String");
@@ -1855,16 +1855,16 @@ sub about_mdk_cc() {
     $list->get_selection->set_mode('none');
 
     gtkpack_($window_about->vbox,
-             (0, gtkset_size_request(Gtk2::Banner->new('splash_screen_about', N("Mandrakelinux Control Center"), { txt_ypos => 50 }), -1, 120)),
+             (0, gtkset_size_request(Gtk2::Banner->new('splash_screen_about', N("Mandriva linux Control Center"), { txt_ypos => 50 }), -1, 120)),
              0, Gtk2::Label->new(""),
-             0, Gtk2::Label->new(N("Copyright (C) 1999-2005 Mandrakesoft SA") . "\n"),
+             0, Gtk2::Label->new(N("Copyright (C) 1999-2005 Mandriva SA") . "\n"),
              0, Gtk2::HSeparator->new,
              0, Gtk2::Label->new(""),
              1, my $n = Gtk2::Notebook->new,
              );
 
     add2notebook($n, N("Authors"), $list);
-    add2notebook($n, N("Mandrakelinux Contributors"), create_scrolled_window(gtkset_size_request($clist, 50, 50)));
+    add2notebook($n, N("Mandriva linux Contributors"), create_scrolled_window(gtkset_size_request($clist, 50, 50)));
 
     $window_about->show_all;
 }
diff --git a/po/af.po b/po/af.po
index 671f32aa..f96ec693 100644
--- a/po/af.po
+++ b/po/af.po
@@ -31,7 +31,7 @@ msgstr "Per Øyvind Karlsen"
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 
 #: ../contributors.pl:13
@@ -520,8 +520,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinux Control Center"
+msgid "Mandriva linux Control Center"
+msgstr "Mandriva linux Control Center"
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -798,8 +798,8 @@ msgstr ""
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, fuzzy, c-format
@@ -832,7 +832,7 @@ msgid ""
 "Look at available updates and apply any fixes or upgrades to installed "
 "packages"
 msgstr ""
-"Mandrakelinux Update help met die opgradering van reeds geïnstalleerde "
+"Mandriva linux Update help met die opgradering van reeds geïnstalleerde "
 "sagteware"
 
 #: ../control-center:445
@@ -1137,7 +1137,7 @@ msgstr "Menu Configuration Center"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
 msgstr ""
 
 #: ../control-center:745
@@ -1511,13 +1511,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, fuzzy, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Mandrakelinux Control Center %s"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Mandriva linux Control Center %s"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Welkom by die Mandrakelinux Control Center"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Welkom by die Mandriva linux Control Center"
 
 #: ../control-center:1419
 #, c-format
@@ -1579,8 +1579,8 @@ msgstr "Bekom nuwe temas by www.damz.net"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "Aangaande - Mandrakelinux Control Center"
+msgid "About - Mandriva linux Control Center"
+msgstr "Aangaande - Mandriva linux Control Center"
 
 #: ../control-center:1786
 #, c-format
@@ -1633,8 +1633,8 @@ msgstr "Vertaler: "
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Kopiereg (C) 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Kopiereg (C) 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1643,8 +1643,8 @@ msgstr "Skrywers"
 
 #: ../control-center:1842
 #, fuzzy, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Mandrakelinux Control Center %s"
+msgid "Mandriva linux Contributors"
+msgstr "Mandriva linux Control Center %s"
 
 #: ../drakconsole:27
 #, fuzzy, c-format
diff --git a/po/am.po b/po/am.po
index 16243a46..dad345a3 100644
--- a/po/am.po
+++ b/po/am.po
@@ -1,5 +1,5 @@
 # Latest versions of po files are at http://www.mandrakelinux.com/l10n/am.php3
-# Copyright (C) 2004 Mandrakesoft SA
+# Copyright (C) 2004 Mandriva SA
 # Alemayehu Gemeda <alemayehu@gmx.at>, 2004.
 #
 msgid ""
@@ -27,7 +27,7 @@ msgstr ""
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 
 #: ../contributors.pl:13
@@ -516,8 +516,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "የMandrakelinux ቁጥጥር ማእከል"
+msgid "Mandriva linux Control Center"
+msgstr "የMandriva linux ቁጥጥር ማእከል"
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -791,8 +791,8 @@ msgstr ""
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, c-format
@@ -1121,7 +1121,7 @@ msgstr ""
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
 msgstr ""
 
 #: ../control-center:745
@@ -1491,12 +1491,12 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
 msgstr ""
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
+msgid "Welcome to the Mandriva linux Control Center"
 msgstr ""
 
 #: ../control-center:1419
@@ -1559,7 +1559,7 @@ msgstr ""
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
+msgid "About - Mandriva linux Control Center"
 msgstr ""
 
 #: ../control-center:1786
@@ -1613,7 +1613,7 @@ msgstr ""
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
 msgstr ""
 
 #: ../control-center:1841
@@ -1623,7 +1623,7 @@ msgstr "ደራሲዎች"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
+msgid "Mandriva linux Contributors"
 msgstr ""
 
 #: ../drakconsole:27
diff --git a/po/ar.po b/po/ar.po
index bc6c0106..4650bd42 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -34,7 +34,7 @@ msgstr "Per Oyvind Karlsen"
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 "عمل على إعادة بناء ضخمة للحزم وتنقيتها، والألعاب، والنقل إلى sparc، وتحسين "
 "كتابة نصوص أدوات ماندريك"
@@ -544,7 +544,7 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
+msgid "Mandriva linux Control Center"
 msgstr "مركز تحكّم ماندريكلينكس"
 
 #: ../control-center:108 ../control-center:1440
@@ -819,8 +819,8 @@ msgstr "إعادة تهيئة واجهة شبكة"
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, c-format
@@ -1150,7 +1150,7 @@ msgstr "تهيئة خادم التثبيت"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
 msgstr "إعداد خادم لتثبيتات ماندريكلينكس الشبكيّة"
 
 #: ../control-center:745
@@ -1526,12 +1526,12 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
 msgstr "مركز تحكّم ماندريكلينكس %s [على %s]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
+msgid "Welcome to the Mandriva linux Control Center"
 msgstr "أهلاً بك في مركز تحكم ماندريكلينكس"
 
 #: ../control-center:1419
@@ -1597,7 +1597,7 @@ msgstr "احصل على السمات الإضافيّة على www.damz.net"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
+msgid "About - Mandriva linux Control Center"
 msgstr "حول - مركز تحكّم ماندريكلينكس"
 
 #: ../control-center:1786
@@ -1651,7 +1651,7 @@ msgstr "المترجم: "
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
 msgstr "حقوق النسخ 1999-2005 ماندريكسوفت ش.م."
 
 #: ../control-center:1841
@@ -1661,7 +1661,7 @@ msgstr "المؤلفون"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
+msgid "Mandriva linux Contributors"
 msgstr "مساهمو ماندريكلينكس"
 
 #: ../drakconsole:27
diff --git a/po/az.po b/po/az.po
index f150bb85..b848253e 100644
--- a/po/az.po
+++ b/po/az.po
@@ -30,7 +30,7 @@ msgstr "Per Øyvind Karlsen"
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 
 #: ../contributors.pl:13
@@ -521,8 +521,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinux İdarə Mərkəzi"
+msgid "Mandriva linux Control Center"
+msgstr "Mandriva linux İdarə Mərkəzi"
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -796,8 +796,8 @@ msgstr ""
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, fuzzy, c-format
@@ -1130,7 +1130,7 @@ msgstr "Qurulum vericisi qurğuları"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
 msgstr ""
 
 #: ../control-center:745
@@ -1507,13 +1507,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Mandrakelinux İdarə Mərkəzi %s [%s üstündə]"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Mandriva linux İdarə Mərkəzi %s [%s üstündə]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Mandrakelinux İdarə Mərkəzinə Xoş Gəldiniz"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Mandriva linux İdarə Mərkəzinə Xoş Gəldiniz"
 
 #: ../control-center:1419
 #, c-format
@@ -1575,8 +1575,8 @@ msgstr "www.damz.net ünvanından əlavə örtüklər ala bilərsiniz"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "Mandrakelinux İdarə Mərkəzi Haqqında"
+msgid "About - Mandriva linux Control Center"
+msgstr "Mandriva linux İdarə Mərkəzi Haqqında"
 
 #: ../control-center:1786
 #, c-format
@@ -1633,8 +1633,8 @@ msgstr "Tərcüməçilər:"
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Müəllif Hüququ (C) 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Müəllif Hüququ (C) 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1643,8 +1643,8 @@ msgstr "Müəlliflər"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Mandrakelinux Linuksa Yardım Edənlər"
+msgid "Mandriva linux Contributors"
+msgstr "Mandriva linux Linuksa Yardım Edənlər"
 
 #: ../drakconsole:27
 #, c-format
@@ -1777,8 +1777,8 @@ msgstr "Ekran Həllediciliyi"
 #~ msgid "Floppy"
 #~ msgstr "Floppi"
 
-#~ msgid "Mandrakelinux Control Center %s\n"
-#~ msgstr "Mandrakelinux İdarə Mərkəzi %s\n"
+#~ msgid "Mandriva linux Control Center %s\n"
+#~ msgstr "Mandriva linux İdarə Mərkəzi %s\n"
 
 #~ msgid "Zip"
 #~ msgstr "Zip"
diff --git a/po/be.po b/po/be.po
index a6c18c22..aa6d9dc7 100644
--- a/po/be.po
+++ b/po/be.po
@@ -24,7 +24,7 @@ msgstr ""
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 
 #: ../contributors.pl:13
@@ -513,7 +513,7 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
+msgid "Mandriva linux Control Center"
 msgstr ""
 
 #: ../control-center:108 ../control-center:1440
@@ -788,7 +788,7 @@ msgstr ""
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
+msgid "Mandriva Online"
 msgstr ""
 
 #: ../control-center:413
@@ -1118,7 +1118,7 @@ msgstr "Настройка IDE"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
 msgstr ""
 
 #: ../control-center:745
@@ -1488,12 +1488,12 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
 msgstr ""
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
+msgid "Welcome to the Mandriva linux Control Center"
 msgstr ""
 
 #: ../control-center:1419
@@ -1556,7 +1556,7 @@ msgstr ""
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
+msgid "About - Mandriva linux Control Center"
 msgstr ""
 
 #: ../control-center:1786
@@ -1610,7 +1610,7 @@ msgstr ""
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
 msgstr ""
 
 #: ../control-center:1841
@@ -1620,7 +1620,7 @@ msgstr "Аўтары"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
+msgid "Mandriva linux Contributors"
 msgstr ""
 
 #: ../drakconsole:27
diff --git a/po/bg.po b/po/bg.po
index b0165e38..7fbc6028 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -1,5 +1,5 @@
 # translation of drakconf-bg.po to Bulgarian
-# Copyright (C) 2000 Mandrakesoft.
+# Copyright (C) 2000 Mandriva.
 # Bozhan Boiadzhiev <bozhan@plov.omega.bg>, 2000.
 # Boyan Ivanov <boyan17@bulgaria.com>, 2001, 2003, 2004.
 #
@@ -32,10 +32,10 @@ msgstr "Пер Ойвинд Карлсен"
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 "масово компилиране и изчистване на пакетите, игри, портване на sparc, "
-"корекция на инструментите на Mandrake"
+"корекция на инструментите на Mandriva"
 
 #: ../contributors.pl:13
 #, c-format
@@ -544,8 +544,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Контролен център на Mandrakelinux"
+msgid "Mandriva linux Control Center"
+msgstr "Контролен център на Mandriva linux"
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -826,8 +826,8 @@ msgstr "Преконфигуриране на мрежов интерфейс"
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, c-format
@@ -1164,8 +1164,8 @@ msgstr "Конфигуриране на инсталационен сървър"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
-msgstr "Настройване на сървър за мрежово инсталиране на Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
+msgstr "Настройване на сървър за мрежово инсталиране на Mandriva linux"
 
 #: ../control-center:745
 #, c-format
@@ -1542,13 +1542,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Контролен център на Mandrakelinux %s [на %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Контролен център на Mandriva linux %s [на %s]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Добре дошли в контролен център на Mandrakelinux"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Добре дошли в контролен център на Mandriva linux"
 
 #: ../control-center:1419
 #, c-format
@@ -1615,8 +1615,8 @@ msgstr "Свалете допълнителни теми от www.damz.net"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "Относно - Контролен център на Mandrakelinux"
+msgid "About - Mandriva linux Control Center"
+msgstr "Относно - Контролен център на Mandriva linux"
 
 #: ../control-center:1786
 #, c-format
@@ -1673,8 +1673,8 @@ msgstr "Преводач: "
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Copyright © 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Copyright © 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1683,8 +1683,8 @@ msgstr "Автори"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Хора спомогнали развитието на Mandrakelinux"
+msgid "Mandriva linux Contributors"
+msgstr "Хора спомогнали развитието на Mandriva linux"
 
 #: ../drakconsole:27
 #, c-format
@@ -1915,8 +1915,8 @@ msgstr "Разделителна способност"
 #~ msgid "Content of the file"
 #~ msgstr "Съдържание на файла"
 
-#~ msgid "Copyright (C) 1999-2003 Mandrakesoft SA"
-#~ msgstr "Copyright (C) 2001-2002 Mandrakesoft SA"
+#~ msgid "Copyright (C) 1999-2003 Mandriva SA"
+#~ msgstr "Copyright (C) 2001-2002 Mandriva SA"
 
 #~ msgid "DHCP"
 #~ msgstr "DHCP"
@@ -2053,19 +2053,19 @@ msgstr "Разделителна способност"
 #~ msgid "Manager Connection"
 #~ msgstr "Настройка на връзките"
 
-#~ msgid "Mandrakelinux Control Center %s"
+#~ msgid "Mandriva linux Control Center %s"
 #~ msgstr "Мандрейклинукс контролен център %s"
 
-#~ msgid "Mandrakelinux Control Center %s\n"
+#~ msgid "Mandriva linux Control Center %s\n"
 #~ msgstr "Мандрейклинукс контролен център %s\n"
 
 #~ msgid ""
-#~ "Mandrakelinux Control Center is Mandrake Linux's main configuration\n"
+#~ "Mandriva linux Control Center is Mandriva Linux's main configuration\n"
 #~ "tool. It enables the system administrator to configure the hardware\n"
 #~ "and services used for all users.\n"
 #~ "\n"
 #~ "\n"
-#~ "The tools accessed through the Mandrakelinux Control Center greatly\n"
+#~ "The tools accessed through the Mandriva linux Control Center greatly\n"
 #~ "simplify the use of the system, notably by avoiding the use of the\n"
 #~ "evil command line."
 #~ msgstr ""
@@ -2229,7 +2229,7 @@ msgstr "Разделителна способност"
 #~ "файлът '%s' не бе намерен.\n"
 #~ "Опитайте да го инсталирате."
 
-#~ msgid "The place where you can configure your Mandrakelinux Box"
+#~ msgid "The place where you can configure your Mandriva linux Box"
 #~ msgstr "Мястото ,където можете да конфигурирате Мандрейклинукс системата си"
 
 #~ msgid "Time"
diff --git a/po/bn.po b/po/bn.po
index 79157a86..0c98d7e7 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -29,10 +29,10 @@ msgstr "Per Oyvind Karlsen"
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 "বৃহত্‍‌ প্যাকেজসমূহ পুনরায় নির্মান এবং পরিষ্কার,খেলাধুলা, sparc port, proofreading of "
-"Mandrake টুলসমুহ"
+"Mandriva টুলসমুহ"
 
 #: ../contributors.pl:13
 #, c-format
@@ -550,7 +550,7 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
+msgid "Mandriva linux Control Center"
 msgstr "ম্যান্ড্রেকলিনাক্স নিয়ন্ত্রন (control) সেন্টার"
 
 #: ../control-center:108 ../control-center:1440
@@ -827,7 +827,7 @@ msgstr "নেটওয়ার্ক ইন্টারফেস পুনরা�
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
+msgid "Mandriva Online"
 msgstr "ম্যান্ড্রেকঅনলাইন"
 
 #: ../control-center:413
@@ -1164,7 +1164,7 @@ msgstr "ইনস্টলেশন সার্ভার কনফিগার
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
 msgstr "ম্যানড্রেকলিনাক্‌সের নেটওয়ার্ক ইনস্টলের জন্য সার্ভার সেট আপ করুন"
 
 #: ../control-center:745
@@ -1542,12 +1542,12 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
 msgstr "ম্যান্ড্রেকলিনাক্স নিয়ন্ত্রন (control) সেন্টার %s [%s -এ]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
+msgid "Welcome to the Mandriva linux Control Center"
 msgstr "ম্যান্ড্রেকলিনাক্স নিয়ন্ত্রন (control) সেন্টারে আপনাকে স্বাগতম"
 
 #: ../control-center:1419
@@ -1614,7 +1614,7 @@ msgstr "www.damz.net -থেকে আরো থীম পেতে পারে
 # কেন্দ্র
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
+msgid "About - Mandriva linux Control Center"
 msgstr "পরিচিতি - ম্যান্ড্রেকলিনাক্স নিয়ন্ত্রন সেন্টার"
 
 #: ../control-center:1786
@@ -1677,8 +1677,8 @@ msgstr "অনুবাদক: "
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "কপিরাইট (C) ১৯৯৯-২০০৪ Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "কপিরাইট (C) ১৯৯৯-২০০৪ Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1687,7 +1687,7 @@ msgstr "লেখকবৃন্দ"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
+msgid "Mandriva linux Contributors"
 msgstr "ম্যান্ড্রেকলিনাক্স-এ অংশগ্রহণকারী"
 
 #: ../drakconsole:27
@@ -1831,5 +1831,5 @@ msgstr "পর্দার রেজ্যুলিউসন"
 #~ msgid "Zip"
 #~ msgstr "জিপ (Zip)"
 
-#~ msgid "Mandrakelinux Control Center %s\n"
+#~ msgid "Mandriva linux Control Center %s\n"
 #~ msgstr "ম্যান্ড্রেকলিনাক্স নিয়ন্ত্রন সেন্টার %s\n"
diff --git a/po/br.po b/po/br.po
index 0c102fd7..4b3de4eb 100644
--- a/po/br.po
+++ b/po/br.po
@@ -1,5 +1,5 @@
-# Mandrakelinux Control Center e brezhoneg
-# Copyright (C) 2002 Mandrakesoft
+# Mandriva linux Control Center e brezhoneg
+# Copyright (C) 2002 Mandriva
 # Thierry Vignaud <tvignaud@mandrakesoft.com>, 2002
 #
 msgid ""
@@ -28,7 +28,7 @@ msgstr "Per Oyvind Karlsen"
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 
 #: ../contributors.pl:13
@@ -517,8 +517,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Kreizenn ren Mandrakelinux"
+msgid "Mandriva linux Control Center"
+msgstr "Kreizenn ren Mandriva linux"
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -792,8 +792,8 @@ msgstr "Adgefluniañ un etrefas rouedad"
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, c-format
@@ -1122,8 +1122,8 @@ msgstr "Kefluniañ servijer ar staliadur"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
-msgstr "Kefluniañ ur servijer staliadur rouedad evit Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
+msgstr "Kefluniañ ur servijer staliadur rouedad evit Mandriva linux"
 
 #: ../control-center:745
 #, c-format
@@ -1495,13 +1495,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Kreizenn ren Mandrakelinux %s [war %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Kreizenn ren Mandriva linux %s [war %s]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Degemer e greizenn ren Mandrakelinux"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Degemer e greizenn ren Mandriva linux"
 
 #: ../control-center:1419
 #, c-format
@@ -1563,8 +1563,8 @@ msgstr ""
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "A-brepoz - Kreizenn ren Mandrakelinux"
+msgid "About - Mandriva linux Control Center"
+msgstr "A-brepoz - Kreizenn ren Mandriva linux"
 
 #: ../control-center:1786
 #, c-format
@@ -1617,8 +1617,8 @@ msgstr "Distroer :"
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Copyright (C) 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Copyright (C) 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1627,8 +1627,8 @@ msgstr "Obererour"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Mignonez Mandrakelinux"
+msgid "Mandriva linux Contributors"
+msgstr "Mignonez Mandriva linux"
 
 #: ../drakconsole:27
 #, c-format
@@ -1780,8 +1780,8 @@ msgstr "Spister ar skramm"
 #~ msgid "Manager Connection"
 #~ msgstr "Meran liammoù"
 
-#~ msgid "Mandrakelinux Control Center %s\n"
-#~ msgstr "Kreizenn ren Mandrakelinux %s \n"
+#~ msgid "Mandriva linux Control Center %s\n"
+#~ msgstr "Kreizenn ren Mandriva linux %s \n"
 
 #~ msgid "Monitor Connection"
 #~ msgstr "Evezhiañ liammoù"
diff --git a/po/bs.po b/po/bs.po
index 430d3749..6223b4d3 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -31,10 +31,10 @@ msgstr "Per Oyvind Karlsen"
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 "masivno čišćenje i rebuilding paketa, igre, port na SPARC arhitekturu, "
-"lektorisanje Mandrakelinux alata"
+"lektorisanje Mandriva linux alata"
 
 #: ../contributors.pl:13
 #, c-format
@@ -542,8 +542,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinux Kontrolni centar"
+msgid "Mandriva linux Control Center"
+msgstr "Mandriva linux Kontrolni centar"
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -822,8 +822,8 @@ msgstr "Promijenite postavke mrežnog interfejsa"
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, c-format
@@ -1160,8 +1160,8 @@ msgstr "Podesi server za instalaciju"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
-msgstr "Podesite server za mrežne instalacije Mandrakelinuxa"
+msgid "Set up server for network installations of Mandriva linux"
+msgstr "Podesite server za mrežne instalacije Mandriva linuxa"
 
 #: ../control-center:745
 #, c-format
@@ -1536,13 +1536,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Mandrakelinux kontrolni centar %s [na %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Mandriva linux kontrolni centar %s [na %s]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Dobro došli u Mandrakelinux Kontrolni centar"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Dobro došli u Mandriva linux Kontrolni centar"
 
 #: ../control-center:1419
 #, c-format
@@ -1604,8 +1604,8 @@ msgstr "Dodatne teme možete naći na www.damz.net"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "O - Mandrakelinux Kontrolnom centaru"
+msgid "About - Mandriva linux Control Center"
+msgstr "O - Mandriva linux Kontrolnom centaru"
 
 #: ../control-center:1786
 #, c-format
@@ -1658,8 +1658,8 @@ msgstr "Prevodilac: "
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Autorska prava (C) 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Autorska prava (C) 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1668,8 +1668,8 @@ msgstr "Autori"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Mandrakelinuxu su doprinijeli"
+msgid "Mandriva linux Contributors"
+msgstr "Mandriva linuxu su doprinijeli"
 
 #: ../drakconsole:27
 #, c-format
diff --git a/po/ca.po b/po/ca.po
index 4218295a..d2c6c9d5 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -31,10 +31,10 @@ msgstr "Per Øyvind Karlsen"
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 "reconstrucció i neteja massiva de paquets, jocs, port a sparc, relectura del "
-"text de les eines Mandrake"
+"text de les eines Mandriva"
 
 #: ../contributors.pl:13
 #, c-format
@@ -539,8 +539,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Centre de Control de Mandrakelinux"
+msgid "Mandriva linux Control Center"
+msgstr "Centre de Control de Mandriva linux"
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -814,8 +814,8 @@ msgstr "Reconfigura una interfície de xarxa"
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, c-format
@@ -1151,8 +1151,8 @@ msgstr "Configura el servidor d'instal·lació"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
-msgstr "Configura un servidor per instal·lacions en xarxa de Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
+msgstr "Configura un servidor per instal·lacions en xarxa de Mandriva linux"
 
 #: ../control-center:745
 #, c-format
@@ -1525,13 +1525,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Centre de control de Mandrakelinux %s [a %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Centre de control de Mandriva linux %s [a %s]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Benvingut al centre de control de Mandrakelinux"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Benvingut al centre de control de Mandriva linux"
 
 #: ../control-center:1419
 #, c-format
@@ -1596,8 +1596,8 @@ msgstr "Aconseguiu temes addicionals a www.damz.net"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "Quant a - Centre de control de Mandrakelinux"
+msgid "About - Mandriva linux Control Center"
+msgstr "Quant a - Centre de control de Mandriva linux"
 
 #: ../control-center:1786
 #, c-format
@@ -1650,8 +1650,8 @@ msgstr "Traductor: "
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Copyright © 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Copyright © 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1660,8 +1660,8 @@ msgstr "Autors"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Contribuïdors de Mandrakelinux"
+msgid "Mandriva linux Contributors"
+msgstr "Contribuïdors de Mandriva linux"
 
 #: ../drakconsole:27
 #, c-format
@@ -1818,8 +1818,8 @@ msgstr "Resolució de pantalla"
 #~ msgid "Manager Connection"
 #~ msgstr "Gestiona connexions"
 
-#~ msgid "Mandrakelinux Control Center %s\n"
-#~ msgstr "Centre de control de Mandrakelinux %s\n"
+#~ msgid "Mandriva linux Control Center %s\n"
+#~ msgstr "Centre de control de Mandriva linux %s\n"
 
 #~ msgid "Monitor Connection"
 #~ msgstr "Monitoritza connexions"
diff --git a/po/cs.po b/po/cs.po
index 1eef03cf..a7dec5d7 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -34,10 +34,10 @@ msgstr "Per Øyvind Karlsen"
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 "rozsáhlé sestavování a čištění balíčků, hry, port pro SPARC, kontrola "
-"pravopisu v nástrojích Mandrakesoft"
+"pravopisu v nástrojích Mandriva"
 
 #: ../contributors.pl:13
 #, c-format
@@ -548,8 +548,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Ovládací centrum Mandrakelinux"
+msgid "Mandriva linux Control Center"
+msgstr "Ovládací centrum Mandriva linux"
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -823,8 +823,8 @@ msgstr "Přenastavení síťového rozhraní"
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, c-format
@@ -1160,8 +1160,8 @@ msgstr "Nastavit instalační server"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
-msgstr "Nastavení serveru pro síťovou instalaci distribuce Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
+msgstr "Nastavení serveru pro síťovou instalaci distribuce Mandriva linux"
 
 #: ../control-center:745
 #, c-format
@@ -1536,13 +1536,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Ovládací centrum Mandrakelinux %s [na %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Ovládací centrum Mandriva linux %s [na %s]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Vítá vás Ovládací centrum Mandrakelinux"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Vítá vás Ovládací centrum Mandriva linux"
 
 #: ../control-center:1419
 #, c-format
@@ -1607,8 +1607,8 @@ msgstr "Načíst další témata z www.damz.net"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "O aplikaci Ovládací centrum Mandrakelinux"
+msgid "About - Mandriva linux Control Center"
+msgstr "O aplikaci Ovládací centrum Mandriva linux"
 
 #: ../control-center:1786
 #, c-format
@@ -1661,8 +1661,8 @@ msgstr "Překladatel: "
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Copyright ©1999-2005 MandrakeSoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Copyright ©1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1671,8 +1671,8 @@ msgstr "Autoři"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Přispěvatelé distribuce Mandrakelinux"
+msgid "Mandriva linux Contributors"
+msgstr "Přispěvatelé distribuce Mandriva linux"
 
 #: ../drakconsole:27
 #, c-format
diff --git a/po/cy.po b/po/cy.po
index 748aaf65..30be86cf 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -27,10 +27,10 @@ msgstr "Per Oyvind Karlsen"
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 "ailadeiladu a chlirio sylweddol,  gemau, trosiad sparc, prawf ddarllen offer "
-"Mandrake"
+"Mandriva"
 
 #: ../contributors.pl:13
 #, c-format
@@ -538,8 +538,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Canolfan Rheoli Mandrakelinux"
+msgid "Mandriva linux Control Center"
+msgstr "Canolfan Rheoli Mandriva linux"
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -815,8 +815,8 @@ msgstr "Ail-ffurfweddu rhyngwyneb rhwydwaith"
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, c-format
@@ -1150,8 +1150,8 @@ msgstr "Gosodiad Defnyddiwr Gweinydd"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
-msgstr "Gosod gweinydd ar gyfer gosodiad rhwydwaith Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
+msgstr "Gosod gweinydd ar gyfer gosodiad rhwydwaith Mandriva linux"
 
 #: ../control-center:745
 #, c-format
@@ -1527,13 +1527,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Canolfan Rheoli Mandrakelinux %s (ar %s)"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Canolfan Rheoli Mandriva linux %s (ar %s)"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Croeso i Ganolfan Rheoli Mandrakelinux"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Croeso i Ganolfan Rheoli Mandriva linux"
 
 #: ../control-center:1419
 #, c-format
@@ -1598,8 +1598,8 @@ msgstr "Estyn themâu ychwanegol o www.damz.net"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "Ynghylch - Canolfan Rheoli Mandrakelinux"
+msgid "About - Mandriva linux Control Center"
+msgstr "Ynghylch - Canolfan Rheoli Mandriva linux"
 
 #: ../control-center:1786
 #, c-format
@@ -1652,8 +1652,8 @@ msgstr "Cyfieithydd"
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Hawlfraint (C) 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Hawlfraint (C) 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1662,8 +1662,8 @@ msgstr "Awdur"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Cyfraniadau Mandrakelinux"
+msgid "Mandriva linux Contributors"
+msgstr "Cyfraniadau Mandriva linux"
 
 #: ../drakconsole:27
 #, c-format
diff --git a/po/da.po b/po/da.po
index 3f8e5bdc..f5ac4556 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 # translation of da1.po to Danish
 # translation of da.po to Danish
 # Copyright (C) 2000,2003, 2004, 2005 Free Software Foundation, Inc.
-# Copyright (c) 2000 Mandrakesoft
+# Copyright (c) 2000 Mandriva
 # Jacob Nordfalk <nordfalk@mobilixnet.dk> 2002
 # Martin Hansen <mah@k64.dk>, 2000.
 # Keld Simonsen <keld@dkuug.dk>, 2001-2003, 2003, 2004, 2005.
@@ -33,10 +33,10 @@ msgstr "Per Øyvind Karlsen"
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 "omfattende pakke-genopbygning og -oprydning, spil, sparc-port, "
-"korrekturlæsning af Mandrake-værktøjer"
+"korrekturlæsning af Mandriva-værktøjer"
 
 #: ../contributors.pl:13
 #, c-format
@@ -544,8 +544,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinux kontrolcenter"
+msgid "Mandriva linux Control Center"
+msgstr "Mandriva linux kontrolcenter"
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -819,8 +819,8 @@ msgstr "Omkonfigurér et netværksgrænsesnit"
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, c-format
@@ -1158,8 +1158,8 @@ msgstr "Konfigurér installationsserver"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
-msgstr "Opsætning af server for installation aff Mandrakelinux over netværk"
+msgid "Set up server for network installations of Mandriva linux"
+msgstr "Opsætning af server for installation aff Mandriva linux over netværk"
 
 #: ../control-center:745
 #, c-format
@@ -1536,13 +1536,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Mandrakelinux kontrolcenter %s [på %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Mandriva linux kontrolcenter %s [på %s]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Velkommen til Mandrakelinux kontrolcentret"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Velkommen til Mandriva linux kontrolcentret"
 
 #: ../control-center:1419
 #, c-format
@@ -1607,8 +1607,8 @@ msgstr "Hent yderligere temaer på www.damz.net"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "Om - Mandrakelinux kontrolcenter"
+msgid "About - Mandriva linux Control Center"
+msgstr "Om - Mandriva linux kontrolcenter"
 
 #: ../control-center:1786
 #, c-format
@@ -1661,8 +1661,8 @@ msgstr "Oversætter: Keld Simonsen <keld@dkuug.dk>"
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Copyright (C) 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Copyright (C) 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1671,8 +1671,8 @@ msgstr "Forfattere"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Bidragsydere til Mandrakelinux"
+msgid "Mandriva linux Contributors"
+msgstr "Bidragsydere til Mandriva linux"
 
 #: ../drakconsole:27
 #, c-format
diff --git a/po/de.po b/po/de.po
index 5d5064af..aa4e2e88 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,8 +1,8 @@
 # translation of drakconf-de.po to Deutsch
 # 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
+# german translation file of the Mandriva linux Control-Center.
+# Copyright (C) 2000,2001,2002,2003 Mandriva
 # 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.
@@ -40,10 +40,10 @@ msgstr "Per Oyvind Karlsen"
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 "Intensiver Packetneubau und Säuberung, Spiele, sparc port, Code Überprüfzung "
-"bei Mandraketools"
+"bei Mandrivatools"
 
 #: ../contributors.pl:13
 #, c-format
@@ -553,8 +553,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinux-Kontrollzentrum"
+msgid "Mandriva linux Control Center"
+msgstr "Mandriva linux-Kontrollzentrum"
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -838,8 +838,8 @@ msgstr "Rekonfigurieren einer Netzwerkschnittstelle"
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, c-format
@@ -1182,8 +1182,8 @@ msgstr "Installations-Server konfigurieren"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
-msgstr "Einrichten eines Servers zur Netzwerkinstallation von Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
+msgstr "Einrichten eines Servers zur Netzwerkinstallation von Mandriva linux"
 
 #: ../control-center:745
 #, c-format
@@ -1565,13 +1565,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Mandrakelinux Kontrollzentrum %s [ auf %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Mandriva linux Kontrollzentrum %s [ auf %s]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Willkommen im Mandrakelinux Kontrollzentrum"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Willkommen im Mandriva linux Kontrollzentrum"
 
 #: ../control-center:1419
 #, c-format
@@ -1637,8 +1637,8 @@ msgstr "Zusätzliche Designs von www.damz.net holen"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "Über - Mandrakelinux Kontrollzentrum"
+msgid "About - Mandriva linux Control Center"
+msgstr "Über - Mandriva linux Kontrollzentrum"
 
 #: ../control-center:1786
 #, c-format
@@ -1691,8 +1691,8 @@ msgstr "Übersetzer: "
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Copyright © 1999-2005 Mandrakesoft S.A."
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Copyright © 1999-2005 Mandriva S.A."
 
 #: ../control-center:1841
 #, c-format
@@ -1701,8 +1701,8 @@ msgstr "Autoren"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Mandrakelinux Beitragende"
+msgid "Mandriva linux Contributors"
+msgstr "Mandriva linux Beitragende"
 
 #: ../drakconsole:27
 #, c-format
diff --git a/po/drakconf.pot b/po/drakconf.pot
index 8468b874..90de03f5 100644
--- a/po/drakconf.pot
+++ b/po/drakconf.pot
@@ -28,7 +28,7 @@ msgstr ""
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 
 #: ../contributors.pl:13
@@ -517,7 +517,7 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
+msgid "Mandriva linux Control Center"
 msgstr ""
 
 #: ../control-center:108 ../control-center:1440
@@ -792,7 +792,7 @@ msgstr ""
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
+msgid "Mandriva Online"
 msgstr ""
 
 #: ../control-center:413
@@ -1122,7 +1122,7 @@ msgstr ""
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
 msgstr ""
 
 #: ../control-center:745
@@ -1492,12 +1492,12 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
 msgstr ""
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
+msgid "Welcome to the Mandriva linux Control Center"
 msgstr ""
 
 #: ../control-center:1419
@@ -1560,7 +1560,7 @@ msgstr ""
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
+msgid "About - Mandriva linux Control Center"
 msgstr ""
 
 #: ../control-center:1786
@@ -1614,7 +1614,7 @@ msgstr ""
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
 msgstr ""
 
 #: ../control-center:1841
@@ -1624,7 +1624,7 @@ msgstr ""
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
+msgid "Mandriva linux Contributors"
 msgstr ""
 
 #: ../drakconsole:27
diff --git a/po/el.po b/po/el.po
index 3835768d..e7e378e2 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 Mandriva
 # Theodore J. Soldatos <bafh@hellug.gr>, 2000
 # Additions/Corrections: Michael Menegakis <admin@www0.org>, 2002
 #  Νίκος Νύκταρης (Nick Niktaris) <niktarin@yahoo.com>, 2003
@@ -31,7 +31,7 @@ msgstr "Per Oyvind Karlsen"
 #, fuzzy, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 "μαζική ανακατασκευή πακέτων και  ξεκαθάρισμα, μεταφράσεις στα Νορβηγικά, "
 "δουλειά στο i18n (nb και nn), παιχνίδια, sparc port"
@@ -538,8 +538,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Κέντρο ελέγχου Mandrakelinux"
+msgid "Mandriva linux Control Center"
+msgstr "Κέντρο ελέγχου Mandriva linux"
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -813,8 +813,8 @@ msgstr ""
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, fuzzy, c-format
@@ -1146,7 +1146,7 @@ msgstr "Ρύθμιση εξυπηρετητή εγκατάστασης"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
 msgstr ""
 
 #: ../control-center:745
@@ -1520,13 +1520,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Κέντρο ελέγχου Mandrakelinux %s [στον %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Κέντρο ελέγχου Mandriva linux %s [στον %s]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Καλώς ήρθατε στο Κέντρο Ελέγχου του Mandrakelinux"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Καλώς ήρθατε στο Κέντρο Ελέγχου του Mandriva linux"
 
 #: ../control-center:1419
 #, c-format
@@ -1590,8 +1590,8 @@ msgstr "Βρείτε περισσότερα θέματα στο www.damz.net"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "Περί - Κέντρου ελέγχου Mandrakelinux"
+msgid "About - Mandriva linux Control Center"
+msgstr "Περί - Κέντρου ελέγχου Mandriva linux"
 
 #: ../control-center:1786
 #, c-format
@@ -1644,8 +1644,8 @@ msgstr "Μεταφραστής: "
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Copyright (C) 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Copyright (C) 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1654,8 +1654,8 @@ msgstr "Δημιουργοί"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Συνεργάτες του Mandrakelinux"
+msgid "Mandriva linux Contributors"
+msgstr "Συνεργάτες του Mandriva linux"
 
 #: ../drakconsole:27
 #, fuzzy, c-format
@@ -1809,8 +1809,8 @@ msgstr "Ανάλυση οθόνης"
 #~ msgid "Manager Connection"
 #~ msgstr "Σύνδεση Διαχειριστή"
 
-#~ msgid "Mandrakelinux Control Center %s\n"
-#~ msgstr "Κέντρο ελέγχου Mandrakelinux %s\n"
+#~ msgid "Mandriva linux Control Center %s\n"
+#~ msgstr "Κέντρο ελέγχου Mandriva linux %s\n"
 
 #~ msgid "Monitor Connection"
 #~ msgstr "Παρακολούθηση σύνδεσης."
diff --git a/po/eo.po b/po/eo.po
index 95d3d5b3..4c42471e 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -1,5 +1,5 @@
 # translation of drakconf-eo.po to Esperanto
-# Copyright (C) 2000, 2001 Mandrakesoft.
+# Copyright (C) 2000, 2001 Mandriva.
 # D. Dale Gulledge <dsplat@rochester.rr.com>, 2000.
 # Vilhelmo Lutermano <vlutermano@free.fr>, 2003.
 # Wilhelm Luttermann <vlutermano@free.fr>, 2004.
@@ -31,7 +31,7 @@ msgstr "Per Øyvind Karlsen"
 #, fuzzy, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 "masiva rekonstruo kaj purigo de pakaĵoj, traduko de norvega Bokmål (nb) "
 "traduko, i18n work (nb and nn), ludoj, sparc port"
@@ -538,8 +538,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinux-Regejo"
+msgid "Mandriva linux Control Center"
+msgstr "Mandriva linux-Regejo"
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -813,8 +813,8 @@ msgstr ""
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, fuzzy, c-format
@@ -1146,7 +1146,7 @@ msgstr "Konfiguru instal-servilon"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
 msgstr ""
 
 #: ../control-center:745
@@ -1523,13 +1523,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
 msgstr "Mandrejko-Regejo %s [sur %s]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Bonvenon ĉe la Mandrakelinux-Regejo"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Bonvenon ĉe la Mandriva linux-Regejo"
 
 #: ../control-center:1419
 #, c-format
@@ -1591,8 +1591,8 @@ msgstr "Akiru kromajn etosojn ĉe www.damz.net"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "Pri - Mandrakelinux-Regejo"
+msgid "About - Mandriva linux Control Center"
+msgstr "Pri - Mandriva linux-Regejo"
 
 #: ../control-center:1786
 #, c-format
@@ -1645,8 +1645,8 @@ msgstr "Tradukinto: "
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Kopirajto © 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Kopirajto © 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1655,8 +1655,8 @@ msgstr "Aŭtoroj"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Kontribuantoj de Mandrakelinux"
+msgid "Mandriva linux Contributors"
+msgstr "Kontribuantoj de Mandriva linux"
 
 #: ../drakconsole:27
 #, fuzzy, c-format
@@ -1805,8 +1805,8 @@ msgstr "Ekran-distingivo"
 #~ msgid "Floppy"
 #~ msgstr "Disketo"
 
-#~ msgid "Mandrakelinux Control Center %s\n"
-#~ msgstr "Mandrakelinux-Regejo %s\n"
+#~ msgid "Mandriva linux Control Center %s\n"
+#~ msgstr "Mandriva linux-Regejo %s\n"
 
 #~ msgid "Norwegian Bokmål (nb) translator and Coordinator, i18n work."
 #~ msgstr "Tradukanto kaj kunordiganto de norvega Bokmål (nb), i18n-aĵoj."
diff --git a/po/es.po b/po/es.po
index 782ea6a8..4b9255a1 100644
--- a/po/es.po
+++ b/po/es.po
@@ -37,10 +37,10 @@ msgstr "Per Øyvind Karlsen"
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 "reconstrucción y limpieza masiva de paquetes,  juegos, portado a Sparc, "
-"relectura de las herramientas Mandrakelinux"
+"relectura de las herramientas Mandriva linux"
 
 #: ../contributors.pl:13
 #, c-format
@@ -553,8 +553,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Centro de control de Mandrakelinux"
+msgid "Mandriva linux Control Center"
+msgstr "Centro de control de Mandriva linux"
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -836,8 +836,8 @@ msgstr "Reconfigurar un interfaz de red"
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, c-format
@@ -1178,8 +1178,8 @@ msgstr "Configurar servidor de instalación"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
-msgstr "Configurar servidor para instalaciones en red de Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
+msgstr "Configurar servidor para instalaciones en red de Mandriva linux"
 
 #: ../control-center:745
 #, c-format
@@ -1560,13 +1560,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Centro de control de Mandrakelinux %s [bajo %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Centro de control de Mandriva linux %s [bajo %s]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Bienvenido al Centro de Control de Mandrakelinux"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Bienvenido al Centro de Control de Mandriva linux"
 
 #: ../control-center:1419
 #, c-format
@@ -1631,8 +1631,8 @@ msgstr "Obtener temas adicionales en www.damz.net"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "Acerca - Centro de control de Mandrakelinux"
+msgid "About - Mandriva linux Control Center"
+msgstr "Acerca - Centro de control de Mandriva linux"
 
 #: ../control-center:1786
 #, c-format
@@ -1689,8 +1689,8 @@ msgstr "Traductores: "
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Copyright © 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Copyright © 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1699,8 +1699,8 @@ msgstr "Autores"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Contribuidores a Mandrakelinux"
+msgid "Mandriva linux Contributors"
+msgstr "Contribuidores a Mandriva linux"
 
 #: ../drakconsole:27
 #, c-format
diff --git a/po/et.po b/po/et.po
index ae10d1e3..7b1db4e9 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 Mandriva
 # Riho Kurg <rx@linux.ee>, 2000
 # Marek Laane <bald@starman.ee>, 2003-2005
 #
@@ -31,10 +31,10 @@ msgstr "Per Oyvind Karlsen"
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 "ulatuslik pakettide ümberehitamine ja puhastamine, mängud, portimine "
-"SPARCile, Mandrake tööriistade õigekirja kontroll"
+"SPARCile, Mandriva tööriistade õigekirja kontroll"
 
 #: ../contributors.pl:13
 #, c-format
@@ -543,8 +543,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinuxi juhtimiskeskus"
+msgid "Mandriva linux Control Center"
+msgstr "Mandriva linuxi juhtimiskeskus"
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -819,8 +819,8 @@ msgstr "Võrguliidese ümberseadistamine"
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, c-format
@@ -1155,8 +1155,8 @@ msgstr "Paigaldusserveri seadistamine"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
-msgstr "Mandrakelinuxi võrgupaigalduse serveri seadistamine"
+msgid "Set up server for network installations of Mandriva linux"
+msgstr "Mandriva linuxi võrgupaigalduse serveri seadistamine"
 
 #: ../control-center:745
 #, c-format
@@ -1531,13 +1531,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Mandrakelinuxi juhtimiskeskus %s [masin: %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Mandriva linuxi juhtimiskeskus %s [masin: %s]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Mandrakelinuxi juhtimiskeskus"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Mandriva linuxi juhtimiskeskus"
 
 #: ../control-center:1419
 #, c-format
@@ -1602,8 +1602,8 @@ msgstr "Hangi lisateemasid saidilt www.damz.net"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "Misvärk - Mandrakelinuxi juhtimiskeskus"
+msgid "About - Mandriva linux Control Center"
+msgstr "Misvärk - Mandriva linuxi juhtimiskeskus"
 
 #: ../control-center:1786
 #, c-format
@@ -1660,8 +1660,8 @@ msgstr "Tõlkijad: "
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Autoriõigus (C) 1999-2005: Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Autoriõigus (C) 1999-2005: Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1670,8 +1670,8 @@ msgstr "Autorid"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Mandrakelinuxi kaasautorid"
+msgid "Mandriva linux Contributors"
+msgstr "Mandriva linuxi kaasautorid"
 
 #: ../drakconsole:27
 #, c-format
diff --git a/po/eu.po b/po/eu.po
index 405af059..0fab931c 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -3,7 +3,7 @@
 # translation of drakconf-eu.po to basque
 # translation of drakconf.po to Euskara
 # translation of drakconf-eu.po to Euskara
-# EUSKERA: Mandrakelinux translation
+# EUSKERA: Mandriva linux translation
 # Copyright (C) 2000,2003, 2004, 2005 Free Software Foundation, Inc.
 # Iigo Salvador Azurmendi <xalba@euskalnet.net>, 2000-2002,2003,2004.
 # Hizkuntza Politikarako Sailburuordetza <hizpol@ej-gv.es>, 2004.
@@ -35,10 +35,10 @@ msgstr "Per Øyvind Karlsen"
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 "paketeen berreraiketa eta garbiketa itzela, jokuak, sparc port, "
-"Mandrakelinux tresnen berrirakurketa akats bila"
+"Mandriva linux tresnen berrirakurketa akats bila"
 
 #: ../contributors.pl:13
 #, c-format
@@ -548,8 +548,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinux Aginte Gunea"
+msgid "Mandriva linux Control Center"
+msgstr "Mandriva linux Aginte Gunea"
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -828,8 +828,8 @@ msgstr "Birkonfiguratu sareko interfaze bat"
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, c-format
@@ -1166,8 +1166,8 @@ msgstr "Instalaketa zerbitzaria konfiguratu"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
-msgstr "Ezarri Mandrakelinux-en sareko instalazioetarako zerbitzari bat"
+msgid "Set up server for network installations of Mandriva linux"
+msgstr "Ezarri Mandriva linux-en sareko instalazioetarako zerbitzari bat"
 
 #: ../control-center:745
 #, c-format
@@ -1547,13 +1547,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Mandrakelinux Aginte Gunea %s [%s (e)n]"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Mandriva linux Aginte Gunea %s [%s (e)n]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Ongi etorri Mandrakelinux Aginte Gunera"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Ongi etorri Mandriva linux Aginte Gunera"
 
 #: ../control-center:1419
 #, c-format
@@ -1618,8 +1618,8 @@ msgstr "Eskuratu gai osagarriak www.damz.net helbidean"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "Honi buruz - Mandrakelinux Aginte Gunea"
+msgid "About - Mandriva linux Control Center"
+msgstr "Honi buruz - Mandriva linux Aginte Gunea"
 
 #: ../control-center:1786
 #, c-format
@@ -1672,8 +1672,8 @@ msgstr "Itzultzailea: "
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Copyright (C) 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Copyright (C) 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1682,8 +1682,8 @@ msgstr "Egileak"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Mandrakelinux-en kolaboratzaileak"
+msgid "Mandriva linux Contributors"
+msgstr "Mandriva linux-en kolaboratzaileak"
 
 #: ../drakconsole:27
 #, c-format
diff --git a/po/fa.po b/po/fa.po
index d1270bd5..f31ff494 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -31,7 +31,7 @@ msgstr "Per Oyvind Karlsen"
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 "بازسازی و پاک‌سازی عظیم بسته‌ها، بازیها، درگاه اسپارک، بازخوانی ابزار ماندرایک"
 
@@ -540,7 +540,7 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
+msgid "Mandriva linux Control Center"
 msgstr "مرکز کنترل لینوکس ماندرایک"
 
 #: ../control-center:108 ../control-center:1440
@@ -817,7 +817,7 @@ msgstr "بازپیکربندی یک واسط شبکه"
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
+msgid "Mandriva Online"
 msgstr "ماندرایک بر اینترنت"
 
 #: ../control-center:413
@@ -1154,7 +1154,7 @@ msgstr "پیکربندی کارگزار نصب"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
 msgstr "برپاسازی کارگزار نصب‌های شبکه لینوکس ماندرایک"
 
 #: ../control-center:745
@@ -1534,12 +1534,12 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
 msgstr "مرکز کنترل لینوکس ماندرایک %s [بر %s]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
+msgid "Welcome to the Mandriva linux Control Center"
 msgstr "به مرکز کنترل لینوکس ماندرایک خوش آمدید"
 
 #: ../control-center:1419
@@ -1602,7 +1602,7 @@ msgstr "تهیه طرح‌های اضافی از www.damz.net"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
+msgid "About - Mandriva linux Control Center"
 msgstr "درباره‌ی - مرکز کنترل لینوکس ماندرایک"
 
 #: ../control-center:1786
@@ -1656,8 +1656,8 @@ msgstr "مترجم: "
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Copyright (C) 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Copyright (C) 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1666,7 +1666,7 @@ msgstr "نگارندگان"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
+msgid "Mandriva linux Contributors"
 msgstr "یاری‌دهندگان لینوکس ماندرایک"
 
 #: ../drakconsole:27
diff --git a/po/fi.po b/po/fi.po
index 9fde1da1..6ca9441d 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,7 +1,7 @@
 # drakconf-fi - Finnish Translation
 #
 # Copyright (C) 2002,2003, 2004, 2005 Free Software Foundation, Inc.
-# Copyright (C) 2002 Mandrakesoft
+# Copyright (C) 2002 Mandriva
 # Matias Griese <mahagr@utu.fi>, 2001, 2002.
 # Janne Puonti <janne.puonti@kolumbus.fi>, 2002.
 # Taisto Kuikka <69319@batman.jypoly.fi>, 2003, 2004.
@@ -35,10 +35,10 @@ msgstr "Per Oyvind Karlsen"
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 "lukuisten pakettien uudelleenkääntäminen ja siistiminen, pelit, sparc "
-"alusta, Mandrakelinux työkalujen oikoluku"
+"alusta, Mandriva linux työkalujen oikoluku"
 
 #: ../contributors.pl:13
 #, c-format
@@ -546,8 +546,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinuxin Ohjauskeskus "
+msgid "Mandriva linux Control Center"
+msgstr "Mandriva linuxin Ohjauskeskus "
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -819,8 +819,8 @@ msgstr "Uudellenaseta verkkoliityntä"
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, c-format
@@ -1148,8 +1148,8 @@ msgstr "Aseta asennuspalvelin"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
-msgstr "Aseta palvelinta Mandrakelinuxin verkkoasennukselle"
+msgid "Set up server for network installations of Mandriva linux"
+msgstr "Aseta palvelinta Mandriva linuxin verkkoasennukselle"
 
 #: ../control-center:745
 #, c-format
@@ -1522,13 +1522,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Mandrakelinuxin Ohjauskeskus %s [%s]"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Mandriva linuxin Ohjauskeskus %s [%s]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Tervetuloa Mandrakelinuxin Ohjauskeskukseen"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Tervetuloa Mandriva linuxin Ohjauskeskukseen"
 
 #: ../control-center:1419
 #, c-format
@@ -1593,8 +1593,8 @@ msgstr "Hae lisää teemoja osoitteesta: www.damz.net"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "Tietoja - Mandrakelinuxin Ohjauskeskus"
+msgid "About - Mandriva linux Control Center"
+msgstr "Tietoja - Mandriva linuxin Ohjauskeskus"
 
 #: ../control-center:1786
 #, c-format
@@ -1647,8 +1647,8 @@ msgstr "Kääntäjä: "
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Copyright (C) 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Copyright (C) 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1657,8 +1657,8 @@ msgstr "Tekijät"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Mandrakelinux avustajia"
+msgid "Mandriva linux Contributors"
+msgstr "Mandriva linux avustajia"
 
 #: ../drakconsole:27
 #, c-format
@@ -1812,8 +1812,8 @@ msgstr "Näyttötila"
 #~ msgid "Manager Connection"
 #~ msgstr "Määritä yhteydet"
 
-#~ msgid "Mandrakelinux Control Center %s\n"
-#~ msgstr "Mandrakelinuxin Ohjauskeskus %s\n"
+#~ msgid "Mandriva linux Control Center %s\n"
+#~ msgstr "Mandriva linuxin Ohjauskeskus %s\n"
 
 #~ msgid "Monitor Connection"
 #~ msgstr "Valvo yhteyksiä"
diff --git a/po/fr.po b/po/fr.po
index 2b35b3d6..bb9d0464 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -36,7 +36,7 @@ msgstr "Per Øyvind Karlsen"
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 "recompilation et nettoyage massif de paquets, jeux, port sur Sparc, "
 "relecture des outils mandrakelinux"
@@ -557,8 +557,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Centre de Contrôle Mandrakelinux"
+msgid "Mandriva linux Control Center"
+msgstr "Centre de Contrôle Mandriva linux"
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -840,8 +840,8 @@ msgstr "Reconfigurer une interface réseau"
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, c-format
@@ -1187,8 +1187,8 @@ msgstr "Configurer un serveur d'installation"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
-msgstr "Configurer un serveur pour les installations réseau de Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
+msgstr "Configurer un serveur pour les installations réseau de Mandriva linux"
 
 #: ../control-center:745
 #, c-format
@@ -1567,13 +1567,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Centre de Contrôle deMandrakelinux %s [sur %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Centre de Contrôle deMandriva linux %s [sur %s]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Bienvenue dans le Centre de Contrôle de Mandrakelinux"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Bienvenue dans le Centre de Contrôle de Mandriva linux"
 
 #: ../control-center:1419
 #, c-format
@@ -1638,8 +1638,8 @@ msgstr "Thèmes additionnels sur www.damz.net"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "À propos - Centre de Contrôle de Mandrakelinux"
+msgid "About - Mandriva linux Control Center"
+msgstr "À propos - Centre de Contrôle de Mandriva linux"
 
 #: ../control-center:1786
 #, c-format
@@ -1699,8 +1699,8 @@ msgstr "Traducteur : "
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Copyright © 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Copyright © 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1709,8 +1709,8 @@ msgstr "Auteurs"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Contributeurs de Mandrakelinux"
+msgid "Mandriva linux Contributors"
+msgstr "Contributeurs de Mandriva linux"
 
 #: ../drakconsole:27
 #, c-format
diff --git a/po/fur.po b/po/fur.po
index ef81cb5d..3534cd96 100644
--- a/po/fur.po
+++ b/po/fur.po
@@ -28,7 +28,7 @@ msgstr "Per Oyvind Karlsen"
 #, fuzzy, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 "penze netade e riorganizazion dai pachets, traduzion in norvegjês bokmål "
 "(nb), lavôr di internazionalizazion (nb e nn), zûcs, porting su sparc"
@@ -539,8 +539,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Centri di Control Mandrakelinux"
+msgid "Mandriva linux Control Center"
+msgstr "Centri di Control Mandriva linux"
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -814,8 +814,8 @@ msgstr ""
 
 #: ../control-center:412
 #, fuzzy, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakestore"
+msgid "Mandriva Online"
+msgstr "Mandrivastore"
 
 #: ../control-center:413
 #, fuzzy, c-format
@@ -1147,7 +1147,7 @@ msgstr "Configure il server di instalazion"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
 msgstr ""
 
 #: ../control-center:745
@@ -1523,13 +1523,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Centri di Control Mandrakelinux %s [su %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Centri di Control Mandriva linux %s [su %s]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Benvignût al Centri di Control Mandrakelinux"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Benvignût al Centri di Control Mandriva linux"
 
 #: ../control-center:1419
 #, c-format
@@ -1591,8 +1591,8 @@ msgstr "Scjarie altris temis di www.damz.net"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "Informazions sul Centri di Control Mandrakelinux"
+msgid "About - Mandriva linux Control Center"
+msgstr "Informazions sul Centri di Control Mandriva linux"
 
 #: ../control-center:1786
 #, c-format
@@ -1645,8 +1645,8 @@ msgstr "Tradutôr: "
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Copyright © 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Copyright © 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1655,8 +1655,8 @@ msgstr "Autôrs"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "E an contribuît a Mandrakelinux"
+msgid "Mandriva linux Contributors"
+msgstr "E an contribuît a Mandriva linux"
 
 #: ../drakconsole:27
 #, fuzzy, c-format
@@ -1789,8 +1789,8 @@ msgstr "Risoluzion dal visôr"
 #~ msgid "Floppy"
 #~ msgstr "Floppy"
 
-#~ msgid "Mandrakelinux Control Center %s\n"
-#~ msgstr "Centri di Control Mandrakelinux %s\n"
+#~ msgid "Mandriva linux Control Center %s\n"
+#~ msgstr "Centri di Control Mandriva linux %s\n"
 
 #~ msgid "Previous"
 #~ msgstr "Precedent"
diff --git a/po/ga.po b/po/ga.po
index 2696af2d..9f55ac0a 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 Mandriva
 # Séamus Ó Ciardhuain <seoc at iolfree.ie>, 2004
 # Proinnsis Breathnach <breatpro@dublin.ml.com>, 2000
 # Alastair McKinstry <mckinstry@computer.org>
@@ -32,7 +32,7 @@ msgstr "Per Oyvind Karlsen"
 #, fuzzy, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 "atógáil agus glanadh ollmhór na bpacáistí, aistriúchán Ioruaise Bokmål (nb), "
 "obair ar idirnáisiúnúchán (nb agus nn), cluichí, iompar go Sparc"
@@ -545,8 +545,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Ionad Rialaithe Mandrakelinux"
+msgid "Mandriva linux Control Center"
+msgstr "Ionad Rialaithe Mandriva linux"
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -820,8 +820,8 @@ msgstr ""
 
 #: ../control-center:412
 #, fuzzy, c-format
-msgid "Mandrakeonline"
-msgstr "Ionad Rialaithe Mandrakelinux"
+msgid "Mandriva Online"
+msgstr "Ionad Rialaithe Mandriva linux"
 
 #: ../control-center:413
 #, c-format
@@ -1150,7 +1150,7 @@ msgstr "Cumraigh freastalaí suiteála"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
 msgstr ""
 
 #: ../control-center:745
@@ -1527,13 +1527,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Ionad Rialaithe Mandrakelinux %s [ar %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Ionad Rialaithe Mandriva linux %s [ar %s]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Fáilte go Ionad Rialaithe Mandrakelinux"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Fáilte go Ionad Rialaithe Mandriva linux"
 
 #: ../control-center:1419
 #, c-format
@@ -1595,8 +1595,8 @@ msgstr "Faigh téamaí breise ó www.damz.net"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "Eolas Faoi Ionad Rialaithe Mandrakelinux"
+msgid "About - Mandriva linux Control Center"
+msgstr "Eolas Faoi Ionad Rialaithe Mandriva linux"
 
 #: ../control-center:1786
 #, c-format
@@ -1649,8 +1649,8 @@ msgstr "Aistritheoir: "
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Cóipcheart © 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Cóipcheart © 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1659,8 +1659,8 @@ msgstr "Údáir"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Cuiditheorí le Mandrakelinux"
+msgid "Mandriva linux Contributors"
+msgstr "Cuiditheorí le Mandriva linux"
 
 #: ../drakconsole:27
 #, fuzzy, c-format
@@ -1814,8 +1814,8 @@ msgstr "Taifeach an Scáileáin"
 #~ msgid "Manager Connection"
 #~ msgstr "Riaraigh Ceangal"
 
-#~ msgid "Mandrakelinux Control Center %s\n"
-#~ msgstr "Ionad Rialaithe Mandrakelinux %s\n"
+#~ msgid "Mandriva linux Control Center %s\n"
+#~ msgstr "Ionad Rialaithe Mandriva linux %s\n"
 
 #~ msgid "Monitor Connection"
 #~ msgstr "Monatóirigh Ceangal"
diff --git a/po/gl.po b/po/gl.po
index d33b92e0..0310503d 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 Mandriva
 # Jesús Bravo Álvarez <jba@pobox.com>, 2000, 2001.
 #
 msgid ""
@@ -28,7 +28,7 @@ msgstr "Por Oyvind Karlsen"
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 
 #: ../contributors.pl:13
@@ -539,8 +539,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Centro de Control de Mandrakelinux"
+msgid "Mandriva linux Control Center"
+msgstr "Centro de Control de Mandriva linux"
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -819,8 +819,8 @@ msgstr "Volver a configurar unha interface de rede"
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, c-format
@@ -1160,8 +1160,8 @@ msgstr "Configurar un servidor de instalación"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
-msgstr "Configurar un servidor para instalacións de Mandrakelinux dende rede "
+msgid "Set up server for network installations of Mandriva linux"
+msgstr "Configurar un servidor para instalacións de Mandriva linux dende rede "
 
 #: ../control-center:745
 #, c-format
@@ -1540,13 +1540,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Centro de Control de Mandrakelinux %s [en %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Centro de Control de Mandriva linux %s [en %s]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Benvid@ ó Centro de Control de Mandrakelinux"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Benvid@ ó Centro de Control de Mandriva linux"
 
 #: ../control-center:1419
 #, c-format
@@ -1611,8 +1611,8 @@ msgstr "Conseguir temas adicionais en www.damz.net"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "Acerca de - Centro de Control de Mandrakelinux"
+msgid "About - Mandriva linux Control Center"
+msgstr "Acerca de - Centro de Control de Mandriva linux"
 
 #: ../control-center:1786
 #, c-format
@@ -1665,8 +1665,8 @@ msgstr "Traductores: "
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Copyright © 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Copyright © 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1675,8 +1675,8 @@ msgstr "Autores"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Contribuidores de Mandrakelinux"
+msgid "Mandriva linux Contributors"
+msgstr "Contribuidores de Mandriva linux"
 
 #: ../drakconsole:27
 #, c-format
diff --git a/po/he.po b/po/he.po
index 1a479d53..916b313e 100644
--- a/po/he.po
+++ b/po/he.po
@@ -38,7 +38,7 @@ msgstr "Per Oyvind Karlsen"
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 "בנייה וניקוי חבילות בהיקף גדול, משחקים, היסב ל sparc, הגהה לכלים של מנדרייק"
 
@@ -545,7 +545,7 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
+msgid "Mandriva linux Control Center"
 msgstr "מרכז הבקרה של מנדרייק־לינוקס"
 
 #: ../control-center:108 ../control-center:1440
@@ -820,7 +820,7 @@ msgstr "הגדרה מחדש של ממשק הרשת"
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
+msgid "Mandriva Online"
 msgstr "מנדרייק־אונליין"
 
 #: ../control-center:413
@@ -1154,7 +1154,7 @@ msgstr "הגדרת שרת התקנה"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
 msgstr "הגדרת שרת להתקנות מהרשת של מנדרייק־לינוקס"
 
 #: ../control-center:745
@@ -1526,12 +1526,12 @@ msgstr "התצורה תשונה מ \"%s\" ל \"%s\". האם ברצונך לבצ�
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
 msgstr "מרכז הבקרה של מנדרייק־לינוקס %s על %s"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
+msgid "Welcome to the Mandriva linux Control Center"
 msgstr "ברוך בואך למרכז הבקרה של מנדרייק־לינוקס"
 
 #: ../control-center:1419
@@ -1597,7 +1597,7 @@ msgstr "השגת ערכות נושא מ־www.damz.net "
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
+msgid "About - Mandriva linux Control Center"
 msgstr "אודות מרכז הבקרה של מנדרייק־לינוקס"
 
 #: ../control-center:1786
@@ -1651,8 +1651,8 @@ msgstr "תרגום: "
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Copyright (C) 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Copyright (C) 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1661,7 +1661,7 @@ msgstr "מפתחים"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
+msgid "Mandriva linux Contributors"
 msgstr "אנשים שתורמים או עוזרים למנדרייק־לינוקס"
 
 #: ../drakconsole:27
diff --git a/po/hi.po b/po/hi.po
index a56f97fe..bfb38e75 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -30,7 +30,7 @@ msgstr "Per Oyvind Karlsen"
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 "पैकेजों की अत्याधिक पुनःसंरचना और सफ़ाई, खेलों, स्पार्क पोर्ट, मैनड्रैकलिनक्स के टूलों की प्रुफ़-"
 "रीडिंग"
@@ -538,7 +538,7 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
+msgid "Mandriva linux Control Center"
 msgstr "मैनड्रैकलिनक्स नियंत्रण केन्द्र"
 
 #: ../control-center:108 ../control-center:1440
@@ -813,7 +813,7 @@ msgstr ""
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
+msgid "Mandriva Online"
 msgstr "मैनड्रैकऑनलाइन"
 
 #: ../control-center:413
@@ -1146,7 +1146,7 @@ msgstr "संसाधन सर्वर की संरचना करन�
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
 msgstr ""
 
 #: ../control-center:745
@@ -1524,12 +1524,12 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
 msgstr "मैनड्रैकलिनक्स नियंत्रण केन्द्र %s [%s पर]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
+msgid "Welcome to the Mandriva linux Control Center"
 msgstr "मैनड्रैकलिनक्स नियंत्रण केन्द्र में स्वागत"
 
 #: ../control-center:1419
@@ -1592,7 +1592,7 @@ msgstr "अतिरिक्त प्रकरणों को www.damz.net �
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
+msgid "About - Mandriva linux Control Center"
 msgstr "मैनड्रैकलिनक्स नियंत्रण केन्द्र - के बारे में"
 
 #: ../control-center:1786
@@ -1646,7 +1646,7 @@ msgstr "अनुवादक: "
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
 msgstr "सर्वाधिकार (C) १९९९-२००४ मैनड्रैकसॉफ़ट एसऐ"
 
 #: ../control-center:1841
@@ -1656,7 +1656,7 @@ msgstr "लेखक"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
+msgid "Mandriva linux Contributors"
 msgstr "मैनड्रैकलिनक्स के योगदानकर्ता"
 
 #: ../drakconsole:27
diff --git a/po/hr.po b/po/hr.po
index f7baf545..a5651776 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -29,7 +29,7 @@ msgstr "Per Oyvind Karlsen"
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 
 #: ../contributors.pl:13
@@ -521,8 +521,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinux Kontrolni Centar"
+msgid "Mandriva linux Control Center"
+msgstr "Mandriva linux Kontrolni Centar"
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -796,8 +796,8 @@ msgstr ""
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, fuzzy, c-format
@@ -1129,7 +1129,7 @@ msgstr "Centar Menu Postavki"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
 msgstr ""
 
 #: ../control-center:745
@@ -1503,13 +1503,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, fuzzy, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Mandrakelinux Kontrolni Centar %s"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Mandriva linux Kontrolni Centar %s"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Dobro došli u Mandrakelinux Kontrolni Centar"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Dobro došli u Mandriva linux Kontrolni Centar"
 
 #: ../control-center:1419
 #, c-format
@@ -1571,8 +1571,8 @@ msgstr "Za više tema posjetite www.damz.net"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "O - Mandrakelinux Kontrolnom Centru"
+msgid "About - Mandriva linux Control Center"
+msgstr "O - Mandriva linux Kontrolnom Centru"
 
 #: ../control-center:1786
 #, c-format
@@ -1627,8 +1627,8 @@ msgstr "Prevoditelj: "
 
 #: ../control-center:1835
 #, fuzzy, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Autorska prava (C) 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Autorska prava (C) 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1637,8 +1637,8 @@ msgstr "Autori"
 
 #: ../control-center:1842
 #, fuzzy, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Mandrakelinux Kontrolni Centar %s"
+msgid "Mandriva linux Contributors"
+msgstr "Mandriva linux Kontrolni Centar %s"
 
 #: ../drakconsole:27
 #, fuzzy, c-format
diff --git a/po/hu.po b/po/hu.po
index f98751a3..87caf1fe 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -31,9 +31,9 @@ msgstr "Per Oyvind Karlsen"
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
-"csomagkészítés és javítások, játékok, SPARC-verzió, Mandrakelinux-eszközök "
+"csomagkészítés és javítások, játékok, SPARC-verzió, Mandriva linux-eszközök "
 "szövegellenőrzése"
 
 #: ../contributors.pl:13
@@ -340,7 +340,7 @@ msgstr "norvég bokmal (nb) fordító és koordinátor, lokalizációs munka"
 #: ../contributors.pl:41
 #, c-format
 msgid "\"one-man\" mdk sk-i18n team"
-msgstr "az egyszemélyes szlovák Mandrakelinux-fordítócsapat"
+msgstr "az egyszemélyes szlovák Mandriva linux-fordítócsapat"
 
 #: ../contributors.pl:42
 #, c-format
@@ -542,8 +542,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinux Vezérlőközpont"
+msgid "Mandriva linux Control Center"
+msgstr "Mandriva linux Vezérlőközpont"
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -823,8 +823,8 @@ msgstr "Egy hálózati csatoló beállításainak módosítása"
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, c-format
@@ -1166,8 +1166,8 @@ msgstr "Telepítési kiszolgáló beállítása"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
-msgstr "Kiszolgáló beállítása a Mandrakelinux hálózati telepítéséhez"
+msgid "Set up server for network installations of Mandriva linux"
+msgstr "Kiszolgáló beállítása a Mandriva linux hálózati telepítéséhez"
 
 #: ../control-center:745
 #, c-format
@@ -1541,13 +1541,13 @@ msgstr "Biztos abban, hogy váltani kíván a(z) \"%s\" profilról a(z) \"%s\" p
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Mandrakelinux Vezérlőközpont %s [rendszer: %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Mandriva linux Vezérlőközpont %s [rendszer: %s]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Üdvözöljük a Mandrakelinux Vezérlőközpontban"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Üdvözöljük a Mandriva linux Vezérlőközpontban"
 
 #: ../control-center:1419
 #, c-format
@@ -1612,8 +1612,8 @@ msgstr "További témákat a www.damz.net helyen lehet szerezni"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "Névjegy - Mandrakelinux Vezérlőközpont"
+msgid "About - Mandriva linux Control Center"
+msgstr "Névjegy - Mandriva linux Vezérlőközpont"
 
 #: ../control-center:1786
 #, c-format
@@ -1666,8 +1666,8 @@ msgstr "Fordítás: "
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Copyright (C) Mandrakesoft SA, 1999-2005"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Copyright (C) Mandriva SA, 1999-2005"
 
 #: ../control-center:1841
 #, c-format
@@ -1676,8 +1676,8 @@ msgstr "Szerzők"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Mandrakelinux - közreműködők"
+msgid "Mandriva linux Contributors"
+msgstr "Mandriva linux - közreműködők"
 
 #: ../drakconsole:27
 #, c-format
@@ -1990,31 +1990,31 @@ msgstr "Képernyőfelbontás"
 #~ msgid "Mail/SMS alert configuration"
 #~ msgstr "Email/SMS figyelmeztetés beállítása"
 
-#~ msgid "Mandrakelinux Control Center %s\n"
-#~ msgstr "Mandrakelinux Vezérlőközpont %s\n"
+#~ msgid "Mandriva linux Control Center %s\n"
+#~ msgstr "Mandriva linux Vezérlőközpont %s\n"
 
 #~ msgid ""
-#~ "Mandrakelinux Control Center is Mandrake Linux's main configuration\n"
+#~ "Mandriva linux Control Center is Mandriva Linux's main configuration\n"
 #~ "tool. It enables the system administrator to configure the hardware\n"
 #~ "and services used for all users.\n"
 #~ "\n"
 #~ "\n"
-#~ "The tools accessed through the Mandrakelinux Control Center greatly\n"
+#~ "The tools accessed through the Mandriva linux Control Center greatly\n"
 #~ "simplify the use of the system, notably by avoiding the use of the\n"
 #~ "evil command line."
 #~ msgstr ""
-#~ "A Mandrakelinux Vezérlőközpont a Mandrake Linux fő beállítóeszköze.\n"
+#~ "A Mandriva linux Vezérlőközpont a Mandriva Linux fő beállítóeszköze.\n"
 #~ "A rendszeradminisztrátor számára lehetővé teszi a felhasználók által\n"
 #~ "használt hardver és szolgáltatások beállítását.\n"
 #~ "\n"
 #~ "\n"
-#~ "A Mandrakelinux Vezérlőközpontban elérhető eszközök megkönnyítik a "
+#~ "A Mandriva linux Vezérlőközpontban elérhető eszközök megkönnyítik a "
 #~ "rendszer\n"
 #~ "használatát - főként azzal, hogy szükségtelenné teszik a parancssori\n"
 #~ "eszközök ismeretét."
 
-#~ msgid "Mandrakelinux Tools Explanations"
-#~ msgstr "Mandrakelinux eszközök - magyarázat"
+#~ msgid "Mandriva linux Tools Explanations"
+#~ msgstr "Mandriva linux eszközök - magyarázat"
 
 #~ msgid "MouseDrake helps you set up your mouse"
 #~ msgstr "Az egér beállítása (MouseDrake)"
diff --git a/po/id.po b/po/id.po
index f1d787ac..641c9e75 100644
--- a/po/id.po
+++ b/po/id.po
@@ -29,10 +29,10 @@ msgstr "Per Oyvind Karlsen"
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 "pembangun dan pembersihan paket masal, permainan, porting ke sparc, "
-"pengujian peralatan Mandrake"
+"pengujian peralatan Mandriva"
 
 #: ../contributors.pl:13
 #, c-format
@@ -542,8 +542,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Pusat Kontrol Mandrakelinux"
+msgid "Mandriva linux Control Center"
+msgstr "Pusat Kontrol Mandriva linux"
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -818,8 +818,8 @@ msgstr "Konfigurasi ulang antarmuka jaringan"
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, c-format
@@ -1157,8 +1157,8 @@ msgstr "Konfigurasikan installasi server"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
-msgstr "Setting server untuk installasi jaringan dari Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
+msgstr "Setting server untuk installasi jaringan dari Mandriva linux"
 
 #: ../control-center:745
 #, c-format
@@ -1536,13 +1536,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Sentral Kontrol Mandrakelinux %s [pada %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Sentral Kontrol Mandriva linux %s [pada %s]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Selamat Datang di Pusat Kontrol Mandrakelinux"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Selamat Datang di Pusat Kontrol Mandriva linux"
 
 #: ../control-center:1419
 #, c-format
@@ -1607,8 +1607,8 @@ msgstr "Dapatkan tema tambahan di www.damz.net"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "Keterangan - Pusat Kontrol Mandrakelinux"
+msgid "About - Mandriva linux Control Center"
+msgstr "Keterangan - Pusat Kontrol Mandriva linux"
 
 #: ../control-center:1786
 #, c-format
@@ -1661,8 +1661,8 @@ msgstr "Penerjemah: "
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Hak Cipta (C) 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Hak Cipta (C) 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1671,8 +1671,8 @@ msgstr "Penulis"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Kontributor Mandrakelinux"
+msgid "Mandriva linux Contributors"
+msgstr "Kontributor Mandriva linux"
 
 #: ../drakconsole:27
 #, c-format
@@ -1890,27 +1890,27 @@ msgstr "Resolusi Layar"
 #~ msgid "Manager Connection"
 #~ msgstr "Mengelola koneksi"
 
-#~ msgid "Mandrakelinux Control Center %s\n"
-#~ msgstr "Sentral Kontrol Mandrakelinux %s\n"
+#~ msgid "Mandriva linux Control Center %s\n"
+#~ msgstr "Sentral Kontrol Mandriva linux %s\n"
 
 #~ msgid ""
-#~ "Mandrakelinux Control Center is Mandrake Linux's main configuration\n"
+#~ "Mandriva linux Control Center is Mandriva Linux's main configuration\n"
 #~ "tool. It enables the system administrator to configure the hardware\n"
 #~ "and services used for all users.\n"
 #~ "\n"
 #~ "\n"
-#~ "The tools accessed through the Mandrakelinux Control Center greatly\n"
+#~ "The tools accessed through the Mandriva linux Control Center greatly\n"
 #~ "simplify the use of the system, notably by avoiding the use of the\n"
 #~ "evil command line."
 #~ msgstr ""
-#~ "Pusat Kontrol Mandrakelinux adalah konfigurator utama Linux Mandrake, "
+#~ "Pusat Kontrol Mandriva linux adalah konfigurator utama Linux Mandriva, "
 #~ "yang\n"
 #~ "memungkinkan sistem administrator untuk mengkonfigurasikan hardware dan "
 #~ "layanan yangg\n"
 #~ "digunakan oleh semua pengguna.\n"
 #~ "\n"
 #~ "\n"
-#~ "Alat-alat yg diakses via Pusat Kontrol Mandrakelinux mempermudah "
+#~ "Alat-alat yg diakses via Pusat Kontrol Mandriva linux mempermudah "
 #~ "penggunaan\n"
 #~ "sistem, khususnya dengan mengurangi pemakaian baris perintah."
 
diff --git a/po/is.po b/po/is.po
index ff02f26c..d4151c86 100644
--- a/po/is.po
+++ b/po/is.po
@@ -29,7 +29,7 @@ msgstr "Per Øyvind Karlsen"
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 "Mikil endurbygging pakka og hreinsun, leikir, sparc flutningur, próflestur "
 "mandrakelinux tóla"
@@ -539,8 +539,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinux Stjórnborð"
+msgid "Mandriva linux Control Center"
+msgstr "Mandriva linux Stjórnborð"
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -812,8 +812,8 @@ msgstr "Endurstilla nettengingar"
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, c-format
@@ -1147,8 +1147,8 @@ msgstr "Stilla innsetningastjóra"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
-msgstr "Setja upp miðlara fyrir netuppsetningar á Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
+msgstr "Setja upp miðlara fyrir netuppsetningar á Mandriva linux"
 
 #: ../control-center:745
 #, c-format
@@ -1525,13 +1525,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Mandrakelinux Stjórnborð %s [á %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Mandriva linux Stjórnborð %s [á %s]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Velkomin að Mandrakelinux Stjórnborði"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Velkomin að Mandriva linux Stjórnborði"
 
 #: ../control-center:1419
 #, c-format
@@ -1596,8 +1596,8 @@ msgstr "Sækja aukaleg þemu frá www.damz.net"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "Um - Mandrakelinux Stjórnborð"
+msgid "About - Mandriva linux Control Center"
+msgstr "Um - Mandriva linux Stjórnborð"
 
 #: ../control-center:1786
 #, c-format
@@ -1650,8 +1650,8 @@ msgstr "Þýðandi: "
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Höfundaréttur (C) 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Höfundaréttur (C) 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1660,8 +1660,8 @@ msgstr "Höfundar"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Mandrakelinux tilleggjendur"
+msgid "Mandriva linux Contributors"
+msgstr "Mandriva linux tilleggjendur"
 
 #: ../drakconsole:27
 #, c-format
diff --git a/po/it.po b/po/it.po
index 37d29072..81594edc 100644
--- a/po/it.po
+++ b/po/it.po
@@ -36,10 +36,10 @@ msgstr "Per Oyvind Karlsen"
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 "consistente pulizia e riorganizzazione dei pacchetti, giochi, porting su "
-"sparc, revisione degli strumenti Mandrakelinux"
+"sparc, revisione degli strumenti Mandriva linux"
 
 #: ../contributors.pl:13
 #, c-format
@@ -551,8 +551,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Centro di controllo Mandrakelinux"
+msgid "Mandriva linux Control Center"
+msgstr "Centro di controllo Mandriva linux"
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -832,8 +832,8 @@ msgstr "Riconfigura un'interfaccia di rete"
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, c-format
@@ -1172,8 +1172,8 @@ msgstr "Configura server per l'installazione"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
-msgstr "Configura un server per installazioni di rete di Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
+msgstr "Configura un server per installazioni di rete di Mandriva linux"
 
 #: ../control-center:745
 #, c-format
@@ -1552,13 +1552,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Centro di controllo Mandrakelinux %s [su %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Centro di controllo Mandriva linux %s [su %s]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Benvenuti nel Centro di controllo Mandrakelinux"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Benvenuti nel Centro di controllo Mandriva linux"
 
 #: ../control-center:1419
 #, c-format
@@ -1624,8 +1624,8 @@ msgstr "Preleva altri temi da www.damz.net"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "Informazioni sul Centro di controllo Mandrakelinux"
+msgid "About - Mandriva linux Control Center"
+msgstr "Informazioni sul Centro di controllo Mandriva linux"
 
 #: ../control-center:1786
 #, c-format
@@ -1678,8 +1678,8 @@ msgstr "Traduttore: "
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Copyright (C) 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Copyright (C) 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1688,8 +1688,8 @@ msgstr "Autori"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Hanno contribuito a Mandrakelinux"
+msgid "Mandriva linux Contributors"
+msgstr "Hanno contribuito a Mandriva linux"
 
 #: ../drakconsole:27
 #, c-format
diff --git a/po/ja.po b/po/ja.po
index f313b5af..8324e5ea 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 Mandriva
 # YAMAGATA Hiroo <hiyori13@alum.mit.edu>, 2000.
 # UTUMI Hirosi <utuhiro78@yahoo.co.jp>, 2003, 2004.
 # BANDO Yukiko <ybando@k6.dion.ne.jp>, 2005.
@@ -32,10 +32,10 @@ msgstr "Per Oyvind Karlsen"
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 
 #: ../contributors.pl:13
 #, c-format
@@ -542,8 +542,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinuxコントロールセンタ"
+msgid "Mandriva linux Control Center"
+msgstr "Mandriva linuxコントロールセンタ"
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -817,15 +817,15 @@ msgstr "ネットワーク・インターフェースを再設定"
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, c-format
 msgid ""
 "Upload your configuration in order to keep you informed about security "
 "updates and useful upgrades"
-msgstr "更新情報を提供するMandrakeonlineにシステムの設定を送信"
+msgstr "更新情報を提供するMandriva Onlineにシステムの設定を送信"
 
 #: ../control-center:423
 #, c-format
@@ -1147,8 +1147,8 @@ msgstr "インストール・サーバを設定"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
-msgstr "Mandrakelinuxをネットワークインストールするサーバを設定"
+msgid "Set up server for network installations of Mandriva linux"
+msgstr "Mandriva linuxをネットワークインストールするサーバを設定"
 
 #: ../control-center:745
 #, c-format
@@ -1525,13 +1525,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Mandrakelinuxコントロールセンタ %s [on %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Mandriva linuxコントロールセンタ %s [on %s]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Mandrakelinuxコントロールセンタへようこそ"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Mandriva linuxコントロールセンタへようこそ"
 
 #: ../control-center:1419
 #, c-format
@@ -1596,8 +1596,8 @@ msgstr "www.damz.netから追加テーマを取得"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "情報 - Mandrakelinuxコントロールセンタ"
+msgid "About - Mandriva linux Control Center"
+msgstr "情報 - Mandriva linuxコントロールセンタ"
 
 #: ../control-center:1786
 #, c-format
@@ -1650,8 +1650,8 @@ msgstr "翻訳者: "
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Copyright (C) 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Copyright (C) 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1660,8 +1660,8 @@ msgstr "作者"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Mandrakelinuxへの貢献者"
+msgid "Mandriva linux Contributors"
+msgstr "Mandriva linuxへの貢献者"
 
 #: ../drakconsole:27
 #, c-format
@@ -1794,8 +1794,8 @@ msgstr "スクリーンの解像度"
 #~ msgid "Floppy"
 #~ msgstr "フロッピー"
 
-#~ msgid "Mandrakelinux Control Center %s\n"
-#~ msgstr "Mandrakelinuxコントロールセンタ %s\n"
+#~ msgid "Mandriva linux Control Center %s\n"
+#~ msgstr "Mandriva linuxコントロールセンタ %s\n"
 
 #~ msgid "Zip"
 #~ msgstr "Zip"
diff --git a/po/ka.po b/po/ka.po
index e7f4daad..d4ee7a0a 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -31,7 +31,7 @@ msgstr "Per Oyvind Karlsen"
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 "მასიური პაკეტების შემქმნელი და გამწმინდავი, games, sparc პლატფორმაზე "
 "პორტირება, მენდრეიქის პროგრამათა მართლწერის შესწორება"
@@ -555,7 +555,7 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
+msgid "Mandriva linux Control Center"
 msgstr "მენდრეიქ-ლინუქსის საკონტროლო ცენტრი"
 
 #: ../control-center:108 ../control-center:1440
@@ -830,8 +830,8 @@ msgstr "ქსელური ინტერფეისის ხელმე�
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, c-format
@@ -1163,7 +1163,7 @@ msgstr "საინსტალაციო სერვერის კონ�
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
 msgstr ""
 
 #: ../control-center:745
@@ -1539,12 +1539,12 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
 msgstr "მანდრეიქ-ლინუქსის საკონტროლო ცენტრი %s [%s-ზე]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
+msgid "Welcome to the Mandriva linux Control Center"
 msgstr "მოგესალმებათ მენდრეიქ-ლინუქსის საკონტროლო ცენტრი"
 
 #: ../control-center:1419
@@ -1609,7 +1609,7 @@ msgstr "ჩამოტვირთეთ დამატებითი დე�
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
+msgid "About - Mandriva linux Control Center"
 msgstr "შესახებ - მანდრეიკის საკონტროლო ცენტრი"
 
 #: ../control-center:1786
@@ -1663,8 +1663,8 @@ msgstr "მთარგმნელი: "
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "საავტორო უფლებები (C) 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "საავტორო უფლებები (C) 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1673,7 +1673,7 @@ msgstr "ავტორები"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
+msgid "Mandriva linux Contributors"
 msgstr "მენდრეიქ-ლინუქსის მხარდამჭერები"
 
 #: ../drakconsole:27
diff --git a/po/ko.po b/po/ko.po
index fc5b3f16..9bb07f26 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 Mandriva
 # Cheolho Choi <forquake@hey.to>, 2000.
 #
 msgid ""
@@ -29,7 +29,7 @@ msgstr ""
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 
 #: ../contributors.pl:13
@@ -518,7 +518,7 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
+msgid "Mandriva linux Control Center"
 msgstr "맨드레이크 제어 센터"
 
 #: ../control-center:108 ../control-center:1440
@@ -793,7 +793,7 @@ msgstr ""
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
+msgid "Mandriva Online"
 msgstr "맨드레이크 온라인"
 
 #: ../control-center:413
@@ -1127,7 +1127,7 @@ msgstr "메뉴 설정 센터"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
 msgstr ""
 
 #: ../control-center:745
@@ -1499,12 +1499,12 @@ msgstr ""
 
 #: ../control-center:1239
 #, fuzzy, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
 msgstr "맨드레이크 제어 센터 %s"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
+msgid "Welcome to the Mandriva linux Control Center"
 msgstr "맨드레이크 제어 센터에 잘 오셨습니다."
 
 #: ../control-center:1419
@@ -1567,7 +1567,7 @@ msgstr "www.damz.net에서 추가 테마 찾기"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
+msgid "About - Mandriva linux Control Center"
 msgstr "이 프로그램은 - 맨드레이크 컨트롤 센터"
 
 #: ../control-center:1786
@@ -1621,8 +1621,8 @@ msgstr ""
 
 #: ../control-center:1835
 #, fuzzy, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Copyright (C) 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Copyright (C) 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1631,7 +1631,7 @@ msgstr "저자"
 
 #: ../control-center:1842
 #, fuzzy, c-format
-msgid "Mandrakelinux Contributors"
+msgid "Mandriva linux Contributors"
 msgstr "맨드레이크 제어 센터 %s"
 
 #: ../drakconsole:27
diff --git a/po/ku.po b/po/ku.po
index 81cc8fa9..cfb74dd3 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -30,7 +30,7 @@ msgstr "Per Oyvind Karlsen"
 #, fuzzy, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 "Paketên girseyî ji bo dîsaavakirin û paqijkirinê, Norwegian Bokmaal (nb) "
 "werger, i18n kar, lîstik"
@@ -532,8 +532,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Navenda Qontrola Mandrakelinux"
+msgid "Mandriva linux Control Center"
+msgstr "Navenda Qontrola Mandriva linux"
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -807,8 +807,8 @@ msgstr ""
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Tu Bi Xêr Hatî Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Tu Bi Xêr Hatî Mandriva Online"
 
 #: ../control-center:413
 #, fuzzy, c-format
@@ -1142,7 +1142,7 @@ msgstr "Pêkanîna Damezrîna server"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
 msgstr ""
 
 #: ../control-center:745
@@ -1517,13 +1517,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Navenda Qontrola Mandrakelinux %s [on %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Navenda Qontrola Mandriva linux %s [on %s]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Xêr bin li Navenda Qontrola Mandrakelinux"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Xêr bin li Navenda Qontrola Mandriva linux"
 
 #: ../control-center:1419
 #, c-format
@@ -1585,7 +1585,7 @@ msgstr "Themên zêde sêr www.damz.net ê dakişînê"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
+msgid "About - Mandriva linux Control Center"
 msgstr ""
 
 #: ../control-center:1786
@@ -1639,8 +1639,8 @@ msgstr "Werger:"
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Mafênkopî (C) 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Mafênkopî (C) 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1649,7 +1649,7 @@ msgstr "Nîvîskar"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
+msgid "Mandriva linux Contributors"
 msgstr ""
 
 #: ../drakconsole:27
@@ -1802,8 +1802,8 @@ msgstr ""
 #~ msgid "bootsplash, databases, drakwizard, various other stuffs."
 #~ msgstr "bootsplash, databases, drakwizard, wekî tistên din.."
 
-#~ msgid "Mandrake Control Center"
-#~ msgstr "Navenda Kontrola Mandrake"
+#~ msgid "Mandriva Control Center"
+#~ msgstr "Navenda Kontrola Mandriva"
 
 #~ msgid "DVD"
 #~ msgstr "DVD"
@@ -1832,8 +1832,8 @@ msgstr ""
 #~ msgid "Previous"
 #~ msgstr "Pêşî"
 
-#~ msgid "Mandrake Control Center %s [on %s]"
-#~ msgstr "Navenda Kontrola Mandrake %s [on %s]"
+#~ msgid "Mandriva Control Center %s [on %s]"
+#~ msgstr "Navenda Kontrola Mandriva %s [on %s]"
 
 #~ msgid ""
 #~ "_banner font:\n"
@@ -1842,11 +1842,11 @@ msgstr ""
 #~ "_banner font:\n"
 #~ "Sans 15"
 
-#~ msgid "Welcome to the Mandrake Control Center"
-#~ msgstr "Hûn bi xêr hatin Navenda Kontrola Mandrake "
+#~ msgid "Welcome to the Mandriva Control Center"
+#~ msgstr "Hûn bi xêr hatin Navenda Kontrola Mandriva "
 
-#~ msgid "About - Mandrake Control Center"
-#~ msgstr "Di derheqê Navenda Qontrola Mandrake de"
+#~ msgid "About - Mandriva Control Center"
+#~ msgstr "Di derheqê Navenda Qontrola Mandriva de"
 
 #~ msgid "~ * ~"
 #~ msgstr "~ * ~"
@@ -1854,8 +1854,8 @@ msgstr ""
 #~ msgid "~ @ ~"
 #~ msgstr "~ @ ~"
 
-#~ msgid "Mandrake Control Center %s\n"
-#~ msgstr "Navenda Kontrola Mandrake %s\n"
+#~ msgid "Mandriva Control Center %s\n"
+#~ msgstr "Navenda Kontrola Mandriva %s\n"
 
-#~ msgid "Mandrake Linux Contributors"
-#~ msgstr "Alîkarwanên Mandrake Lînux"
+#~ msgid "Mandriva Linux Contributors"
+#~ msgstr "Alîkarwanên Mandriva Lînux"
diff --git a/po/ky.po b/po/ky.po
index ac5a0f31..60014bc0 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -28,10 +28,10 @@ msgstr "Per Oyvind Karlsen"
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 "пакеттерди кайра куруу жана тазалоо боюнча зор иштер, оюндар,sparc порттору, "
-"Mandrake утилиттерин оңдоо"
+"Mandriva утилиттерин оңдоо"
 
 #: ../contributors.pl:13
 #, c-format
@@ -544,8 +544,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinux Башкаруу Борбору"
+msgid "Mandriva linux Control Center"
+msgstr "Mandriva linux Башкаруу Борбору"
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -825,8 +825,8 @@ msgstr "Тармак интерфейстерин кайра ырастоо"
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, c-format
@@ -1169,8 +1169,8 @@ msgstr "Орнотуу серверинин конфигурациясы"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
-msgstr "Mandrakelinux машинасын тармак боюнча орнотуу үчүн серверди ырастоо"
+msgid "Set up server for network installations of Mandriva linux"
+msgstr "Mandriva linux машинасын тармак боюнча орнотуу үчүн серверди ырастоо"
 
 #: ../control-center:745
 #, c-format
@@ -1544,13 +1544,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Mandrakelinux Башкаруу борбору %s [%s]"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Mandriva linux Башкаруу борбору %s [%s]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Mandrakelinux Башкаруу борборуна кош келиңиз"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Mandriva linux Башкаруу борборуна кош келиңиз"
 
 #: ../control-center:1419
 #, c-format
@@ -1612,8 +1612,8 @@ msgstr "www.damz.net сайтынан кошумча темаларды алуу
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "Mandrakelinux Башкаруу борбору жөнүндө"
+msgid "About - Mandriva linux Control Center"
+msgstr "Mandriva linux Башкаруу борбору жөнүндө"
 
 #: ../control-center:1786
 #, c-format
@@ -1666,8 +1666,8 @@ msgstr "Котормочу: "
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Copyright (C) 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Copyright (C) 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1676,8 +1676,8 @@ msgstr "Авторлор"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Mandrakelinux контрибьюторлору"
+msgid "Mandriva linux Contributors"
+msgstr "Mandriva linux контрибьюторлору"
 
 #: ../drakconsole:27
 #, c-format
@@ -1798,8 +1798,8 @@ msgstr "Колдонуучулар жана группалар"
 msgid "Screen Resolution"
 msgstr "Экран жөндөмдүүлүгү"
 
-#~ msgid "Copyright (C) 1999-2004 Mandrakesoft SA"
-#~ msgstr "Copyright (C) 1999-2004 Mandrakesoft SA"
+#~ msgid "Copyright (C) 1999-2004 Mandriva SA"
+#~ msgstr "Copyright (C) 1999-2004 Mandriva SA"
 
 #~ msgid "Auto Install Floppy"
 #~ msgstr "Авто-орнотуу флопписи"
@@ -1834,8 +1834,8 @@ msgstr "Экран жөндөмдүүлүгү"
 #~ msgid "Manager Connection"
 #~ msgstr "Туташууларды башкаруу"
 
-#~ msgid "Mandrakelinux Control Center %s\n"
-#~ msgstr "Mandrakelinux Башкаруу борбору %s \n"
+#~ msgid "Mandriva linux Control Center %s\n"
+#~ msgstr "Mandriva linux Башкаруу борбору %s \n"
 
 #~ msgid "Monitor Connection"
 #~ msgstr "Туташууларды байкоо"
diff --git a/po/lt.po b/po/lt.po
index e9348003..1c474eac 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -29,7 +29,7 @@ msgstr ""
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 
 #: ../contributors.pl:13
@@ -518,8 +518,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, fuzzy, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "/_Mandrakelinux Kontrolės Centras"
+msgid "Mandriva linux Control Center"
+msgstr "/_Mandriva linux Kontrolės Centras"
 
 #: ../control-center:108 ../control-center:1440
 #, fuzzy, c-format
@@ -793,8 +793,8 @@ msgstr ""
 
 #: ../control-center:412
 #, fuzzy, c-format
-msgid "Mandrakeonline"
-msgstr "Sveiki atvykę į Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Sveiki atvykę į Mandriva Online"
 
 #: ../control-center:413
 #, c-format
@@ -1123,7 +1123,7 @@ msgstr "Meniu konfigūravimo centras"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
 msgstr ""
 
 #: ../control-center:745
@@ -1493,13 +1493,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, fuzzy, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Mandrakelinux valdymo centras %s"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Mandriva linux valdymo centras %s"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Sveiki atvykę į Mandrakelinux valdymo centrą"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Sveiki atvykę į Mandriva linux valdymo centrą"
 
 #: ../control-center:1419
 #, c-format
@@ -1561,8 +1561,8 @@ msgstr ""
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "Apie - Mandrakelinux valdymo centras"
+msgid "About - Mandriva linux Control Center"
+msgstr "Apie - Mandriva linux valdymo centras"
 
 #: ../control-center:1786
 #, fuzzy, c-format
@@ -1615,8 +1615,8 @@ msgstr ""
 
 #: ../control-center:1835
 #, fuzzy, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Copyright © 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Copyright © 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1625,8 +1625,8 @@ msgstr "Autoriai"
 
 #: ../control-center:1842
 #, fuzzy, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Mandrakelinux valdymo centras %s"
+msgid "Mandriva linux Contributors"
+msgstr "Mandriva linux valdymo centras %s"
 
 #: ../drakconsole:27
 #, fuzzy, c-format
diff --git a/po/ltg.po b/po/ltg.po
index 75b00c72..f001b958 100644
--- a/po/ltg.po
+++ b/po/ltg.po
@@ -29,7 +29,7 @@ msgstr "Per Øyvind Karlsen"
 #, fuzzy, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 "lels pakešu puortaiseišonys i atteireišonys dorbs, Norwegian Bokmaal (nb) "
 "tulkuošona, i18n dorbs, spielis"
@@ -531,8 +531,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinux vadeibys centrs"
+msgid "Mandriva linux Control Center"
+msgstr "Mandriva linux vadeibys centrs"
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -806,8 +806,8 @@ msgstr ""
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, fuzzy, c-format
@@ -1140,7 +1140,7 @@ msgstr "Instaleišonys servera konfigureišona"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
 msgstr ""
 
 #: ../control-center:745
@@ -1516,13 +1516,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Mandrakelinux vadeibys centrs %s [ %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Mandriva linux vadeibys centrs %s [ %s]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Laipni lyudzam Mandrakelinux vadeibys centrā"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Laipni lyudzam Mandriva linux vadeibys centrā"
 
 #: ../control-center:1419
 #, c-format
@@ -1584,8 +1584,8 @@ msgstr "Sajimt papyldus temys nu www.damz.net"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "Par - Mandrakelinux vadeibys centru"
+msgid "About - Mandriva linux Control Center"
+msgstr "Par - Mandriva linux vadeibys centru"
 
 #: ../control-center:1786
 #, c-format
@@ -1638,8 +1638,8 @@ msgstr "Tulkuotuojs: "
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Autortīseibys (C) 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Autortīseibys (C) 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1648,8 +1648,8 @@ msgstr "Autori"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Mandrakelinux atbalsteituoji"
+msgid "Mandriva linux Contributors"
+msgstr "Mandriva linux atbalsteituoji"
 
 #: ../drakconsole:27
 #, fuzzy, c-format
@@ -1813,8 +1813,8 @@ msgstr "Ekrana izškirtspieja"
 #~ msgid "Manager Connection"
 #~ msgstr "Pīslāgumu puorvaldeišona"
 
-#~ msgid "Mandrakelinux Control Center %s\n"
-#~ msgstr "Mandrakelinux vadeibys centrs %s\n"
+#~ msgid "Mandriva linux Control Center %s\n"
+#~ msgstr "Mandriva linux vadeibys centrs %s\n"
 
 #~ msgid "Monitor Connection"
 #~ msgstr "Monitora pīslāgumi"
diff --git a/po/lv.po b/po/lv.po
index dae186c6..49d0c9ae 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -30,7 +30,7 @@ msgstr ""
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 
 #: ../contributors.pl:13
@@ -519,8 +519,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinux vadības centrs"
+msgid "Mandriva linux Control Center"
+msgstr "Mandriva linux vadības centrs"
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -794,8 +794,8 @@ msgstr ""
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, fuzzy, c-format
@@ -1128,7 +1128,7 @@ msgstr "Izvēlņu konfigurēšanas centrs"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
 msgstr ""
 
 #: ../control-center:745
@@ -1500,13 +1500,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, fuzzy, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Mandrakelinux vadības centrs %s"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Mandriva linux vadības centrs %s"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Laipni lūdzam Mandrakelinux vadības centrā"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Laipni lūdzam Mandriva linux vadības centrā"
 
 #: ../control-center:1419
 #, c-format
@@ -1568,8 +1568,8 @@ msgstr "Saņemt papildus tēmas no www.damz.net"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "Par - Mandrakelinux vadības centrs"
+msgid "About - Mandriva linux Control Center"
+msgstr "Par - Mandriva linux vadības centrs"
 
 #: ../control-center:1786
 #, c-format
@@ -1622,8 +1622,8 @@ msgstr "Tulkotājs: "
 
 #: ../control-center:1835
 #, fuzzy, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Autortiesības (C) 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Autortiesības (C) 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1632,8 +1632,8 @@ msgstr "Autori"
 
 #: ../control-center:1842
 #, fuzzy, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Mandrakelinux vadības centrs %s"
+msgid "Mandriva linux Contributors"
+msgstr "Mandriva linux vadības centrs %s"
 
 #: ../drakconsole:27
 #, fuzzy, c-format
diff --git a/po/mk.po b/po/mk.po
index 1dcefc15..8a2f24ca 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -29,10 +29,10 @@ msgstr "Per Oyvind Karlsen"
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 "масивно повторно градење и прочистување на пакетите, игри, sparc порти, "
-"крајно прегледување на Mandrakelinux алатките"
+"крајно прегледување на Mandriva linux алатките"
 
 #: ../contributors.pl:13
 #, c-format
@@ -541,8 +541,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinux Контролен центар"
+msgid "Mandriva linux Control Center"
+msgstr "Mandriva linux Контролен центар"
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -826,8 +826,8 @@ msgstr "Реконфигурирај мрежен интерфејс"
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, c-format
@@ -1169,8 +1169,8 @@ msgstr "Конфигурирај инсталационен сервер"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
-msgstr "Постави сервер за мрежна инсталација на Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
+msgstr "Постави сервер за мрежна инсталација на Mandriva linux"
 
 #: ../control-center:745
 #, c-format
@@ -1551,13 +1551,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Mandrakelinux Контролен центар %s [на %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Mandriva linux Контролен центар %s [на %s]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Добредојдовте во Контролниот центар на Mandrakelinux"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Добредојдовте во Контролниот центар на Mandriva linux"
 
 #: ../control-center:1419
 #, c-format
@@ -1619,8 +1619,8 @@ msgstr "Земете додатни теми од www.damz.net"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "За - Mandrakelinux Контролен центар"
+msgid "About - Mandriva linux Control Center"
+msgstr "За - Mandriva linux Контролен центар"
 
 #: ../control-center:1786
 #, c-format
@@ -1673,8 +1673,8 @@ msgstr "Преведувач: "
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Авторски права (C) 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Авторски права (C) 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1683,8 +1683,8 @@ msgstr "Автори"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Mandrakelinux Придонесувачи"
+msgid "Mandriva linux Contributors"
+msgstr "Mandriva linux Придонесувачи"
 
 #: ../drakconsole:27
 #, c-format
diff --git a/po/mn.po b/po/mn.po
index fc2d7f9f..6138f640 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -32,7 +32,7 @@ msgstr ""
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 
 #: ../contributors.pl:13
@@ -521,7 +521,7 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
+msgid "Mandriva linux Control Center"
 msgstr "Мандрак Хяналтын Төв"
 
 #: ../control-center:108 ../control-center:1440
@@ -799,7 +799,7 @@ msgstr ""
 
 #: ../control-center:412
 #, fuzzy, c-format
-msgid "Mandrakeonline"
+msgid "Mandriva Online"
 msgstr "Мандраке Дэлгүүр"
 
 #: ../control-center:413
@@ -1129,7 +1129,7 @@ msgstr "Цэс Тоноглол"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
 msgstr ""
 
 #: ../control-center:745
@@ -1499,12 +1499,12 @@ msgstr ""
 
 #: ../control-center:1239
 #, fuzzy, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
 msgstr "Контрол Төвд"
 
 #: ../control-center:1253
 #, fuzzy, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
+msgid "Welcome to the Mandriva linux Control Center"
 msgstr "Тавтай морил Контрол"
 
 #: ../control-center:1419
@@ -1567,7 +1567,7 @@ msgstr "Нээх"
 
 #: ../control-center:1776
 #, fuzzy, c-format
-msgid "About - Mandrakelinux Control Center"
+msgid "About - Mandriva linux Control Center"
 msgstr "Тухай Контрол"
 
 #: ../control-center:1786
@@ -1625,7 +1625,7 @@ msgstr ""
 
 #: ../control-center:1835
 #, fuzzy, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
 msgstr "Зохиогчийн эрх C"
 
 #: ../control-center:1841
@@ -1635,7 +1635,7 @@ msgstr "Зохиогчид"
 
 #: ../control-center:1842
 #, fuzzy, c-format
-msgid "Mandrakelinux Contributors"
+msgid "Mandriva linux Contributors"
 msgstr "Контрол Төвд"
 
 #: ../drakconsole:27
diff --git a/po/ms.po b/po/ms.po
index 72455007..421f988a 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -28,7 +28,7 @@ msgstr "Per Oyvind Karlsen"
 
 #: ../contributors.pl:12
 #, c-format
-msgid "massive packages rebuilding and cleaning, games, sparc port, proofreading of Mandrake tools"
+msgid "massive packages rebuilding and cleaning, games, sparc port, proofreading of Mandriva tools"
 msgstr ""
 
 #: ../contributors.pl:13
@@ -516,8 +516,8 @@ msgstr ""
 #: ../control-center:105
 #: ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Pusat Kawalan Mandrakelinux"
+msgid "Mandriva linux Control Center"
+msgstr "Pusat Kawalan Mandriva linux"
 
 #: ../control-center:108
 #: ../control-center:1440
@@ -797,8 +797,8 @@ msgstr "Konfigurasi (X) Antaramuka Grafikal"
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, fuzzy, c-format
@@ -1130,7 +1130,7 @@ msgstr "Konfigurasi pelayan HTTP"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
 msgstr ""
 
 #: ../control-center:745
@@ -1515,13 +1515,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, fuzzy, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Keterangan - Pusat Kawalan Mandrakelinux"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Keterangan - Pusat Kawalan Mandriva linux"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Selamat Datang ke Pusat Kawalan Mandrakelinux"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Selamat Datang ke Pusat Kawalan Mandriva linux"
 
 #: ../control-center:1419
 #, c-format
@@ -1584,8 +1584,8 @@ msgstr "Dapatkan tema tambahan di www.damz.net"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "Keterangan - Pusat Kawalan Mandrakelinux"
+msgid "About - Mandriva linux Control Center"
+msgstr "Keterangan - Pusat Kawalan Mandriva linux"
 
 #: ../control-center:1786
 #, c-format
@@ -1639,7 +1639,7 @@ msgstr "Penterjemah"
 
 #: ../control-center:1835
 #, fuzzy, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
 msgstr "C"
 
 #: ../control-center:1841
@@ -1649,8 +1649,8 @@ msgstr "Penulis"
 
 #: ../control-center:1842
 #, fuzzy, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "SELAMAT DATANG - Mandrakelinux %s"
+msgid "Mandriva linux Contributors"
+msgstr "SELAMAT DATANG - Mandriva linux %s"
 
 #: ../drakconsole:27
 #, c-format
diff --git a/po/mt.po b/po/mt.po
index 0a46e11f..e5459b39 100644
--- a/po/mt.po
+++ b/po/mt.po
@@ -31,10 +31,10 @@ msgstr "Per Oyvind Karlsen"
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 "Ħafna bini u tindif ta' pakketi, logħob, port għal sparc, ċekkjar ta' għodda "
-"Mandrake"
+"Mandriva"
 
 #: ../contributors.pl:13
 #, c-format
@@ -543,8 +543,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Ċentru tal-Kontroll Mandrakelinux"
+msgid "Mandriva linux Control Center"
+msgstr "Ċentru tal-Kontroll Mandriva linux"
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -818,8 +818,8 @@ msgstr ""
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, fuzzy, c-format
@@ -1151,7 +1151,7 @@ msgstr "Ikkonfigura server tal-installazzjoni"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
 msgstr ""
 
 #: ../control-center:745
@@ -1528,13 +1528,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Ċentru tal-Kontroll Mandrakelinux %s [fuq %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Ċentru tal-Kontroll Mandriva linux %s [fuq %s]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Merħba għaċ-Ċentru tal-Kontroll Mandrakelinux"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Merħba għaċ-Ċentru tal-Kontroll Mandriva linux"
 
 #: ../control-center:1419
 #, c-format
@@ -1596,8 +1596,8 @@ msgstr "Ikseb temi oħra minn www.damz.net"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "Dwar - Ċentru tal-Kontroll Mandrakelinux"
+msgid "About - Mandriva linux Control Center"
+msgstr "Dwar - Ċentru tal-Kontroll Mandriva linux"
 
 #: ../control-center:1786
 #, c-format
@@ -1650,8 +1650,8 @@ msgstr "Traduttur: "
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Copyright (C) 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Copyright (C) 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1660,8 +1660,8 @@ msgstr "Awturi"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Kontributuri ta’ Mandrakelinux"
+msgid "Mandriva linux Contributors"
+msgstr "Kontributuri ta’ Mandriva linux"
 
 #: ../drakconsole:27
 #, c-format
@@ -1794,8 +1794,8 @@ msgstr "Reżoluzzjoni tal-iskrin"
 #~ msgid "Floppy"
 #~ msgstr "Flopi"
 
-#~ msgid "Mandrakelinux Control Center %s\n"
-#~ msgstr "Ċentru tal-Kontroll Mandrakelinux %s\n"
+#~ msgid "Mandriva linux Control Center %s\n"
+#~ msgstr "Ċentru tal-Kontroll Mandriva linux %s\n"
 
 #~ msgid "Zip"
 #~ msgstr "Żip"
diff --git a/po/nb.po b/po/nb.po
index fd11a166..38cb8bd9 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,6 +1,6 @@
 # translation of nb.po to Norsk Bokmål
 # translation of drakconf-nb.po to Norwegian Bokmål
-# Copyright (C) 2000 Mandrakesoft.
+# Copyright (C) 2000 Mandriva.
 # Terje Bjerkelia <terje@bjerkelia.com>, 2000.
 # Andreas Bergstrøm <abergstr@halden.net>, 2001.
 # Per Øyvind Karlsen <peroyvind@sintrax.net>, 2003, 2004.
@@ -33,8 +33,8 @@ msgstr "Per Øyvind Karlsen"
 
 #: ../contributors.pl:12
 #, c-format
-msgid "massive packages rebuilding and cleaning, games, sparc port, proofreading of Mandrake tools"
-msgstr "massiv pakkegjenbygging, opprensning, spill, sparc-port, rettlesning av Mandrake-verktøy"
+msgid "massive packages rebuilding and cleaning, games, sparc port, proofreading of Mandriva tools"
+msgstr "massiv pakkegjenbygging, opprensning, spill, sparc-port, rettlesning av Mandriva-verktøy"
 
 #: ../contributors.pl:13
 #, c-format
@@ -521,8 +521,8 @@ msgstr "Og mange unavngitte og ukjente beta-testere og programvarefeilrapportere
 #: ../control-center:105
 #: ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinux Kontrollsenter"
+msgid "Mandriva linux Control Center"
+msgstr "Mandriva linux Kontrollsenter"
 
 #: ../control-center:108
 #: ../control-center:1440
@@ -802,8 +802,8 @@ msgstr "Sett opp et nettverksgrensesnitt på nytt"
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, c-format
@@ -1126,8 +1126,8 @@ msgstr "Innstillinger for installasjonstjener"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
-msgstr "Sett opp en tjener for nettverksinstallasjon av Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
+msgstr "Sett opp en tjener for nettverksinstallasjon av Mandriva linux"
 
 #: ../control-center:745
 #, c-format
@@ -1514,13 +1514,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Mandrakelinux Kontrollsenter %s [på %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Mandriva linux Kontrollsenter %s [på %s]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Velkommen til Mandrakelinux Kontrollsenter"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Velkommen til Mandriva linux Kontrollsenter"
 
 #: ../control-center:1419
 #, c-format
@@ -1586,8 +1586,8 @@ msgstr "Få tak i flere temaer på www.damz.net"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "Om - Mandrakelinux Kontrollsenter"
+msgid "About - Mandriva linux Control Center"
+msgstr "Om - Mandriva linux Kontrollsenter"
 
 #: ../control-center:1786
 #, c-format
@@ -1641,8 +1641,8 @@ msgstr "Oversetter: "
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Copyright (C) 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Copyright (C) 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1651,8 +1651,8 @@ msgstr "Forfattere"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Mandrakelinux-bidragsytere"
+msgid "Mandriva linux Contributors"
+msgstr "Mandriva linux-bidragsytere"
 
 #: ../drakconsole:27
 #, c-format
diff --git a/po/nl.po b/po/nl.po
index 04147834..c0ee7948 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -35,9 +35,9 @@ msgstr "Per Øyvind Karlsen"
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
-"grote schoonmaak en herbouw van pakketten, spellen, proeflezen van Mandrake-"
+"grote schoonmaak en herbouw van pakketten, spellen, proeflezen van Mandriva-"
 "hulpprogramma's, portering naar sparc architectuur"
 
 #: ../contributors.pl:13
@@ -549,8 +549,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinux Configuratiecentrum"
+msgid "Mandriva linux Control Center"
+msgstr "Mandriva linux Configuratiecentrum"
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -834,8 +834,8 @@ msgstr "Een netwerkinterface herconfigureren"
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, c-format
@@ -1179,8 +1179,8 @@ msgstr "Installatieserver configureren"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
-msgstr "Server instellen voor netwerkinstallaties van Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
+msgstr "Server instellen voor netwerkinstallaties van Mandriva linux"
 
 #: ../control-center:745
 #, c-format
@@ -1560,13 +1560,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Mandrakelinux Configuratiecentrum %s [op %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Mandriva linux Configuratiecentrum %s [op %s]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Welkom bij het Mandrakelinux Configuratiecentrum"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Welkom bij het Mandriva linux Configuratiecentrum"
 
 #: ../control-center:1419
 #, c-format
@@ -1633,8 +1633,8 @@ msgstr "Haal extra thema's van www.damz.net"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "Info - Mandrakelinux Configuratiecentrum"
+msgid "About - Mandriva linux Control Center"
+msgstr "Info - Mandriva linux Configuratiecentrum"
 
 #: ../control-center:1786
 #, c-format
@@ -1689,8 +1689,8 @@ msgstr "Vertaler: "
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Copyright © 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Copyright © 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1699,8 +1699,8 @@ msgstr "Auteurs"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Personen die hebben bijgedragen aan Mandrakelinux"
+msgid "Mandriva linux Contributors"
+msgstr "Personen die hebben bijgedragen aan Mandriva linux"
 
 #: ../drakconsole:27
 #, c-format
@@ -1854,8 +1854,8 @@ msgstr "Schermresolutie"
 #~ msgid "Manager Connection"
 #~ msgstr "Verbindingen beheren"
 
-#~ msgid "Mandrakelinux Control Center %s\n"
-#~ msgstr "Mandrakelinux Configuratiecentrum %s\n"
+#~ msgid "Mandriva linux Control Center %s\n"
+#~ msgstr "Mandriva linux Configuratiecentrum %s\n"
 
 #~ msgid "Monitor Connection"
 #~ msgstr "Verbindingen volgen"
diff --git a/po/nn.po b/po/nn.po
index 990ff831..96a0aa29 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -32,10 +32,10 @@ msgstr "Per Øyvind Karlsen"
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 "mykje pakkebygging og -opprydding, spel, sparc-port, korrekturlesing av "
-"Mandrake-verktøy"
+"Mandriva-verktøy"
 
 #: ../contributors.pl:13
 #, c-format
@@ -543,7 +543,7 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
+msgid "Mandriva linux Control Center"
 msgstr "Kontrollsenter"
 
 #: ../control-center:108 ../control-center:1440
@@ -818,8 +818,8 @@ msgstr "Set opp nettverksgresesnitt på nytt"
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, c-format
@@ -1151,8 +1151,8 @@ msgstr "Set opp installasjonstenar"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
-msgstr "Set opp ein tenar for nettverksinstallering av Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
+msgstr "Set opp ein tenar for nettverksinstallering av Mandriva linux"
 
 #: ../control-center:745
 #, c-format
@@ -1525,12 +1525,12 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
 msgstr "Kontrollsenter %s [på %s]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
+msgid "Welcome to the Mandriva linux Control Center"
 msgstr "Velkommen til kontrollsenteret"
 
 #: ../control-center:1419
@@ -1596,7 +1596,7 @@ msgstr "Få tak i fleire tema på <www.damz.net>"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
+msgid "About - Mandriva linux Control Center"
 msgstr "Om – kontrollsenter"
 
 #: ../control-center:1786
@@ -1650,8 +1650,8 @@ msgstr "Omsetjar: "
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Copyright © 1999–2004 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Copyright © 1999–2004 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1660,8 +1660,8 @@ msgstr "Forfattarar"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Mandrakelinux-bidragsytarar"
+msgid "Mandriva linux Contributors"
+msgstr "Mandriva linux-bidragsytarar"
 
 #: ../drakconsole:27
 #, c-format
diff --git a/po/pa_IN.po b/po/pa_IN.po
index 82a37d90..1b2e25bd 100644
--- a/po/pa_IN.po
+++ b/po/pa_IN.po
@@ -28,7 +28,7 @@ msgstr "Per Oyvind Karlsen"
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 "ਵੱਡੇ ਪੈਕੇਜ਼ ਮੁੜ ਬਣਾਏ ਗਏ ਅਤੇ ਸਾਫ ਕਰ ਰਿਹਾ ਹੈ, ਖੇਡਾਂ, ਸਪਾਰਕ ਪੋਰਟ, ਮੈਂਡਰਿਕ ਜੰਤਰਾਂ ਦੀ ਪਰੂਫਰੀਡਿੰਗ "
 "ਕਰ ਰਿਹਾ ਹੈ"
@@ -535,7 +535,7 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
+msgid "Mandriva linux Control Center"
 msgstr "ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਕੰਟਰੋਲ ਸੈਂਟਰ"
 
 #: ../control-center:108 ../control-center:1440
@@ -810,7 +810,7 @@ msgstr "ਨੈੱਟਵਰਕ ਇੰਟਰਫੇਸ ਮੁੜ ਸੰਰਚਿਤ
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
+msgid "Mandriva Online"
 msgstr "ਮੈਂਡਰਿਕ-ਆਨਲਾਈਨ"
 
 #: ../control-center:413
@@ -1141,7 +1141,7 @@ msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਸਰਵਰ ਸੰਰਚਿਤ ਕਰੋ"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
 msgstr "ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਦੀ ਨੈੱਟਵਰਕ ਇੰਸਟਾਲੇਸ਼ਨ ਲਈ ਸਰਵਰ ਨਿਰਧਾਰਿਤ ਕਰੋ"
 
 #: ../control-center:745
@@ -1516,12 +1516,12 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
 msgstr "ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਕੰਟਰੋਲ ਸੈਂਟਰ %s [%s ਤੇ]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
+msgid "Welcome to the Mandriva linux Control Center"
 msgstr "ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਕੰਟਰੋਲ ਸੈਂਟਰ ਵੱਲੋਂ ਜੀ ਆਇਆਂ ਨੂੰ"
 
 #: ../control-center:1419
@@ -1584,7 +1584,7 @@ msgstr "ਵਾਧੂ ਸਰੂਪ www.damz.net ਤੋਂ ਪ੍ਰਾਪਤ ਕ�
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
+msgid "About - Mandriva linux Control Center"
 msgstr "ਬਾਰੇ - ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਕੰਟਰੋਲ ਸੈਂਟਰ"
 
 #: ../control-center:1786
@@ -1638,7 +1638,7 @@ msgstr "ਅਨੁਵਾਦਕ:"
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
 msgstr "ਹੱਕ ਰਾਖਵਾਂ (C) 1999-2005 ਮੈਂਡਰਿਕ-ਸਾਫਟ SA"
 
 #: ../control-center:1841
@@ -1648,7 +1648,7 @@ msgstr "ਸੰਪਾਦਕ"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
+msgid "Mandriva linux Contributors"
 msgstr "ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਸਹਿਯੋਗੀ"
 
 #: ../drakconsole:27
diff --git a/po/pl.po b/po/pl.po
index 74c490af..53781571 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -33,10 +33,10 @@ msgstr "Per Oyvind Karlsen"
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 "przebudowanie i czyszczenie wielu pakietów, gry, port na sparca, przegląd "
-"narzędzi Mandrake"
+"narzędzi Mandriva"
 
 #: ../contributors.pl:13
 #, c-format
@@ -546,8 +546,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Centrum Sterowania Mandrakelinux"
+msgid "Mandriva linux Control Center"
+msgstr "Centrum Sterowania Mandriva linux"
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -826,8 +826,8 @@ msgstr "Konfiguracja interfejsu sieciowego"
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, c-format
@@ -1167,8 +1167,8 @@ msgstr "Skonfiguruj serwer instalacyjny"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
-msgstr "Konfiguracja serwera instalacyjnego Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
+msgstr "Konfiguracja serwera instalacyjnego Mandriva linux"
 
 #: ../control-center:745
 #, c-format
@@ -1548,13 +1548,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Centrum Sterowania Mandrakelinux %s [na %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Centrum Sterowania Mandriva linux %s [na %s]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Witaj w Centrum Sterowania Mandrakelinux"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Witaj w Centrum Sterowania Mandriva linux"
 
 #: ../control-center:1419
 #, c-format
@@ -1620,8 +1620,8 @@ msgstr "Pobieranie dodatkowych tematów z www.damz.net"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "O programie - Centrum Sterowania Mandrakelinux"
+msgid "About - Mandriva linux Control Center"
+msgstr "O programie - Centrum Sterowania Mandriva linux"
 
 #: ../control-center:1786
 #, c-format
@@ -1674,8 +1674,8 @@ msgstr "Tłumacz: "
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Copyright (C) 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Copyright (C) 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1684,8 +1684,8 @@ msgstr "Autorzy"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Współautorzy Linuksa Mandrakelinux"
+msgid "Mandriva linux Contributors"
+msgstr "Współautorzy Linuksa Mandriva linux"
 
 #: ../drakconsole:27
 #, c-format
diff --git a/po/pt.po b/po/pt.po
index 5d3877ce..c5bfb41f 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -45,10 +45,10 @@ msgstr "Per Oyvind Karlsen"
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 "reconstrução massiva e limpeza de pacotes, jogos, porta sparc, verificação "
-"das ferramentas Mandrake"
+"das ferramentas Mandriva"
 
 #: ../contributors.pl:13
 #, c-format
@@ -556,8 +556,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Centro de Controlo Mandrakelinux"
+msgid "Mandriva linux Control Center"
+msgstr "Centro de Controlo Mandriva linux"
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -831,8 +831,8 @@ msgstr "Reconfigurar um interface de rede"
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, c-format
@@ -1170,8 +1170,8 @@ msgstr "Configurar servidor de instalação"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
-msgstr "Configurar um servidor para instalações de rede Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
+msgstr "Configurar um servidor para instalações de rede Mandriva linux"
 
 #: ../control-center:745
 #, c-format
@@ -1546,13 +1546,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Centro de Controle Mandrakelinux %s [em %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Centro de Controle Mandriva linux %s [em %s]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Benvindo ao Centro de Controle Mandrakelinux"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Benvindo ao Centro de Controle Mandriva linux"
 
 #: ../control-center:1419
 #, c-format
@@ -1617,8 +1617,8 @@ msgstr "Obter temas adicionais em www.damz.net"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "Acerca - Centro de Controle Mandrakelinux"
+msgid "About - Mandriva linux Control Center"
+msgstr "Acerca - Centro de Controle Mandriva linux"
 
 #: ../control-center:1786
 #, c-format
@@ -1671,8 +1671,8 @@ msgstr "Tradutor:"
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Copyright © 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Copyright © 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1681,8 +1681,8 @@ msgstr "Autores"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Contribuidores Mandrakelinux"
+msgid "Mandriva linux Contributors"
+msgstr "Contribuidores Mandriva linux"
 
 #: ../drakconsole:27
 #, c-format
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 0df4a916..8d452124 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -40,10 +40,10 @@ msgstr "Por Oyvind Karlsen"
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 "intensa reconstrução e limpeza de pacotes, jogos, porta sparc, verificação "
-"das ferramentas Mandrake"
+"das ferramentas Mandriva"
 
 #: ../contributors.pl:13
 #, c-format
@@ -552,8 +552,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Centro de Controle Mandrakelinux"
+msgid "Mandriva linux Control Center"
+msgstr "Centro de Controle Mandriva linux"
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -830,8 +830,8 @@ msgstr "Reconfigurar a interface de rede"
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, fuzzy, c-format
@@ -1173,8 +1173,8 @@ msgstr "Configurar servidor de instalação"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
-msgstr "Configurar servidor para instalações via rede do Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
+msgstr "Configurar servidor para instalações via rede do Mandriva linux"
 
 #: ../control-center:745
 #, c-format
@@ -1553,13 +1553,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Centro de Controle Mandrakelinux %s [em %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Centro de Controle Mandriva linux %s [em %s]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Bem-vindo ao Centro de Controle Mandrakelinux"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Bem-vindo ao Centro de Controle Mandriva linux"
 
 #: ../control-center:1419
 #, c-format
@@ -1621,8 +1621,8 @@ msgstr "Obter temas adicionais em www.damz.net"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "Sobre - Centro de Controle Mandrakelinux"
+msgid "About - Mandriva linux Control Center"
+msgstr "Sobre - Centro de Controle Mandriva linux"
 
 #: ../control-center:1786
 #, c-format
@@ -1687,8 +1687,8 @@ msgstr "Tradutor: "
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Copyright © 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Copyright © 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1697,8 +1697,8 @@ msgstr "Autores"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Colaboradores do Mandrakelinux"
+msgid "Mandriva linux Contributors"
+msgstr "Colaboradores do Mandriva linux"
 
 #: ../drakconsole:27
 #, c-format
diff --git a/po/ro.po b/po/ro.po
index 9ac33f3b..62b8b5bc 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -34,10 +34,10 @@ msgstr "Per Oyvind Karlsen"
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 "regenerare şi curaţare masivă a pachetelor, jocuri, portare pe sparc, "
-"verificarea utilitarelor Mandrake"
+"verificarea utilitarelor Mandriva"
 
 #: ../contributors.pl:13
 #, c-format
@@ -546,8 +546,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Centrul de control Mandrakelinux"
+msgid "Mandriva linux Control Center"
+msgstr "Centrul de control Mandriva linux"
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -821,8 +821,8 @@ msgstr ""
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, fuzzy, c-format
@@ -1154,7 +1154,7 @@ msgstr "Configurare server de instalare"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
 msgstr ""
 
 #: ../control-center:745
@@ -1534,13 +1534,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Centrul de control Mandrakelinux %s [pe %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Centrul de control Mandriva linux %s [pe %s]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Bun venit la Centrul de control Mandrakelinux"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Bun venit la Centrul de control Mandriva linux"
 
 #: ../control-center:1419
 #, c-format
@@ -1602,8 +1602,8 @@ msgstr "Preluaţi teme suplimantare de la http://www.damz.net"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "Despre - Centrul de control Mandrakelinux"
+msgid "About - Mandriva linux Control Center"
+msgstr "Despre - Centrul de control Mandriva linux"
 
 #: ../control-center:1786
 #, c-format
@@ -1656,8 +1656,8 @@ msgstr "Traducători:"
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Copyright © 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Copyright © 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1666,8 +1666,8 @@ msgstr "Autori"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Cei care au contribuit la Mandrakelinux"
+msgid "Mandriva linux Contributors"
+msgstr "Cei care au contribuit la Mandriva linux"
 
 #: ../drakconsole:27
 #, c-format
diff --git a/po/ru.po b/po/ru.po
index f121548b..39b213df 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 # Translation of drakconf-ru.po to Russian
 # Translation of drakconf to Russian
 # Copyright (C) 2000,2003, 2004, 2005 Free Software Foundation, Inc.
-# Copyright (c) 2000 Mandrakesoft
+# Copyright (c) 2000 Mandriva
 # Vladimir Choundalov <choundalovvv@point.pwp.ru>, 2001.
 # Aleksey Smirnov <smi@logic.ru>, 2000.
 # Vitaly Zubkov <habad@mksat.net>, 11/11/2001.
@@ -38,10 +38,10 @@ msgstr "Per Oyvind Karlsen"
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 "большая работа по перестройке и очистке пакетов, игры, портирование на "
-"sparc, корректура утилит Mandrake"
+"sparc, корректура утилит Mandriva"
 
 #: ../contributors.pl:13
 #, c-format
@@ -552,8 +552,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Центр управления Mandrakelinux"
+msgid "Mandriva linux Control Center"
+msgstr "Центр управления Mandriva linux"
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -829,8 +829,8 @@ msgstr "Перенастройка сетевых интерфейсов"
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, c-format
@@ -1166,8 +1166,8 @@ msgstr "Настройка сервера инсталляции"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
-msgstr "Настройка сервера для установки Mandrakelinux по сети"
+msgid "Set up server for network installations of Mandriva linux"
+msgstr "Настройка сервера для установки Mandriva linux по сети"
 
 #: ../control-center:745
 #, c-format
@@ -1540,13 +1540,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Центр управления Mandrakelinux %s [ %s ]"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Центр управления Mandriva linux %s [ %s ]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Добро пожаловать в Центр управления Mandrakelinux"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Добро пожаловать в Центр управления Mandriva linux"
 
 #: ../control-center:1419
 #, c-format
@@ -1613,8 +1613,8 @@ msgstr "Получить дополнительные темы с www.damz.net"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "О программе - Центр управления Mandrakelinux"
+msgid "About - Mandriva linux Control Center"
+msgstr "О программе - Центр управления Mandriva linux"
 
 #: ../control-center:1786
 #, c-format
@@ -1667,8 +1667,8 @@ msgstr "Переводчик: "
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Copyright (C) 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Copyright (C) 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1677,8 +1677,8 @@ msgstr "Авторы"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Контрибьюторы Mandrakelinux"
+msgid "Mandriva linux Contributors"
+msgstr "Контрибьюторы Mandriva linux"
 
 #: ../drakconsole:27
 #, c-format
diff --git a/po/sc.po b/po/sc.po
index abaadada..ae1c5f54 100644
--- a/po/sc.po
+++ b/po/sc.po
@@ -30,10 +30,10 @@ msgstr "Per Oyvind Karlsen"
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 "arranjadura e pulidura manna de pakitus, jogus, porting a suba de sparc, "
-"ligidura e curregidura de ainas Mandrake"
+"ligidura e curregidura de ainas Mandriva"
 
 #: ../contributors.pl:13
 #, c-format
@@ -542,8 +542,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Centru de Controllu Mandrakelinux"
+msgid "Mandriva linux Control Center"
+msgstr "Centru de Controllu Mandriva linux"
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -818,8 +818,8 @@ msgstr "Torra a assetiai una interfaci de arretza"
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, c-format
@@ -1155,8 +1155,8 @@ msgstr "Assètiu server de aposentada"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
-msgstr "Assètia unu server po aposentai Mandrakelinux de arretza"
+msgid "Set up server for network installations of Mandriva linux"
+msgstr "Assètia unu server po aposentai Mandriva linux de arretza"
 
 #: ../control-center:745
 #, c-format
@@ -1532,13 +1532,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Centru de Controllu Mandrakelinux %s [in %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Centru de Controllu Mandriva linux %s [in %s]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Beni beniu in su Centru de Controllu Mandrakelinux"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Beni beniu in su Centru de Controllu Mandriva linux"
 
 #: ../control-center:1419
 #, c-format
@@ -1603,8 +1603,8 @@ msgstr "Arcantza atrus temas in www.damz.net"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "Apitzus de - Centru de Controllu Mandrakelinux"
+msgid "About - Mandriva linux Control Center"
+msgstr "Apitzus de - Centru de Controllu Mandriva linux"
 
 #: ../control-center:1786
 #, c-format
@@ -1657,8 +1657,8 @@ msgstr "Tradusidori: "
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Copyright © 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Copyright © 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1667,8 +1667,8 @@ msgstr "Autoris"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Contribuidoris Mandrakelinux"
+msgid "Mandriva linux Contributors"
+msgstr "Contribuidoris Mandriva linux"
 
 #: ../drakconsole:27
 #, c-format
diff --git a/po/sk.po b/po/sk.po
index 35a64c58..21659b80 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -27,7 +27,7 @@ msgstr "Per Oyvind Karlsen"
 
 #: ../contributors.pl:12
 #, c-format
-msgid "massive packages rebuilding and cleaning, games, sparc port, proofreading of Mandrake tools"
+msgid "massive packages rebuilding and cleaning, games, sparc port, proofreading of Mandriva tools"
 msgstr "masívne vyčistenie a znovuvytvorenie balíkov, hry, sparc port, práca v lokalizačnom tíme, nástroje"
 
 #: ../contributors.pl:13
@@ -515,8 +515,8 @@ msgstr "A mnohí nepomenovaní a neznámi beta testeri a oznamovači chýb, čo
 #: ../control-center:105
 #: ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Kontrolné centrum Mandrakelinux"
+msgid "Mandriva linux Control Center"
+msgstr "Kontrolné centrum Mandriva linux"
 
 #: ../control-center:108
 #: ../control-center:1440
@@ -796,8 +796,8 @@ msgstr "Znovunastaviť sieťové rozhranie"
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, c-format
@@ -1120,8 +1120,8 @@ msgstr "Konfigurácia inštalačného servera"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
-msgstr "Nastaviť server pre sieťové inštalácie Mandrakelinuxu"
+msgid "Set up server for network installations of Mandriva linux"
+msgstr "Nastaviť server pre sieťové inštalácie Mandriva linuxu"
 
 #: ../control-center:745
 #, c-format
@@ -1508,13 +1508,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Kontrolné centrum Mandrakelinux %s [na %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Kontrolné centrum Mandriva linux %s [na %s]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Vitajte v kontrolnom centre Mandrakelinux"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Vitajte v kontrolnom centre Mandriva linux"
 
 #: ../control-center:1419
 #, c-format
@@ -1580,8 +1580,8 @@ msgstr "Ďalšie témy nájdete na www.damz.net"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "O Kontrolnom centre Mandrakelinux"
+msgid "About - Mandriva linux Control Center"
+msgstr "O Kontrolnom centre Mandriva linux"
 
 #: ../control-center:1786
 #, c-format
@@ -1635,8 +1635,8 @@ msgstr "Prekladateľ:"
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Copyright (C) 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Copyright (C) 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1645,8 +1645,8 @@ msgstr "Autori"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Prispievatelia do projektu Mandrakelinux"
+msgid "Mandriva linux Contributors"
+msgstr "Prispievatelia do projektu Mandriva linux"
 
 #: ../drakconsole:27
 #, c-format
diff --git a/po/sl.po b/po/sl.po
index 53fe1d6f..18affca9 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, 2005 Free Software Foundation, Inc.
-# Copyright (c) 2000 Mandrakesoft
+# Copyright (c) 2000 Mandriva
 # Alen Salamun <alien@alienworld.org>, 2000.
 # Gregor Pirnaver <gregor.pirnaver@email.si>, 2002,2003, 2004.
 # Gregor Pirnaver <gregor.pirnaver@siol.net>, 2003,2004.
@@ -38,10 +38,10 @@ msgstr "Per Oyvind Karlsen"
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 "obsežna prenova in poenostavitev paketov, igre, port na platformo sparc, "
-"pregled Mandrake orodij"
+"pregled Mandriva orodij"
 
 #: ../contributors.pl:13
 #, c-format
@@ -551,8 +551,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Nadzorno središče Mandrakelinux"
+msgid "Mandriva linux Control Center"
+msgstr "Nadzorno središče Mandriva linux"
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -828,8 +828,8 @@ msgstr "Ponastavite omrežni vmesnik"
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, c-format
@@ -1167,8 +1167,8 @@ msgstr "Nastavite namestitveni strežnik"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
-msgstr "Nastavite strežnik za omrežne namestitve Mandrakelinuxa"
+msgid "Set up server for network installations of Mandriva linux"
+msgstr "Nastavite strežnik za omrežne namestitve Mandriva linuxa"
 
 #: ../control-center:745
 #, c-format
@@ -1547,13 +1547,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Nadzorno središče Mandrakelinux %s [na %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Nadzorno središče Mandriva linux %s [na %s]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Dobrodošli v Nadzornem središču Mandrakelinux"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Dobrodošli v Nadzornem središču Mandriva linux"
 
 #: ../control-center:1419
 #, c-format
@@ -1619,8 +1619,8 @@ msgstr "Dodatne teme dobite na www.damz.net"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "O - Nadzornem središču Mandrakelinux"
+msgid "About - Mandriva linux Control Center"
+msgstr "O - Nadzornem središču Mandriva linux"
 
 #: ../control-center:1786
 #, c-format
@@ -1676,8 +1676,8 @@ msgstr "Prevajalec: "
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Avtorske pravice 1999-2005 Mandrakesoft d.d."
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Avtorske pravice 1999-2005 Mandriva d.d."
 
 #: ../control-center:1841
 #, c-format
@@ -1686,8 +1686,8 @@ msgstr "Avtorji"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Sodelavci Mandrakelinux"
+msgid "Mandriva linux Contributors"
+msgstr "Sodelavci Mandriva linux"
 
 #: ../drakconsole:27
 #, c-format
diff --git a/po/sq.po b/po/sq.po
index 660b4f12..e294505e 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -29,7 +29,7 @@ msgstr "Per Oyvind Karlsen"
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 
 #: ../contributors.pl:13
@@ -518,8 +518,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Qendra Kontrolluese Mandrakelinux"
+msgid "Mandriva linux Control Center"
+msgstr "Qendra Kontrolluese Mandriva linux"
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -799,8 +799,8 @@ msgstr ""
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, fuzzy, c-format
@@ -834,7 +834,7 @@ msgid ""
 "Look at available updates and apply any fixes or upgrades to installed "
 "packages"
 msgstr ""
-"Mandrakelinux Update ju ndihmon për të aplikuar korrigjimet apo rifreskimet "
+"Mandriva linux Update ju ndihmon për të aplikuar korrigjimet apo rifreskimet "
 "e programeve të instaluar"
 
 #: ../control-center:445
@@ -1143,7 +1143,7 @@ msgstr "Qendra e Konfigurimit në Menu"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
 msgstr ""
 
 #: ../control-center:745
@@ -1517,13 +1517,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, fuzzy, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Qëndra Kontrolluese Mandrakelinux %s"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Qëndra Kontrolluese Mandriva linux %s"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Mirësevini në Qendrën Kontrolluese Mandrakelinux"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Mirësevini në Qendrën Kontrolluese Mandriva linux"
 
 #: ../control-center:1419
 #, c-format
@@ -1585,8 +1585,8 @@ msgstr "Prano tema shtesë tek www.damz.net"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "Informacione - Qendra Kontrolluese Mandrakelinux"
+msgid "About - Mandriva linux Control Center"
+msgstr "Informacione - Qendra Kontrolluese Mandriva linux"
 
 #: ../control-center:1786
 #, c-format
@@ -1639,8 +1639,8 @@ msgstr "Përktheu: "
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Copyright © 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Copyright © 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1649,8 +1649,8 @@ msgstr "Autorët"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Kontribuesit Mandrakelinux"
+msgid "Mandriva linux Contributors"
+msgstr "Kontribuesit Mandriva linux"
 
 #: ../drakconsole:27
 #, fuzzy, c-format
diff --git a/po/sr.po b/po/sr.po
index b323115e..c2eb447b 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 Mandriva
 # Jankovic Tomislav <tomaja@net.yu>, 2000,2002.
 # Toma Jankovic <tomaja@net.yu>, 2003.
 # Toma Jankovic <webmaster@mandrake.co.yu>, 2004.
@@ -32,7 +32,7 @@ msgstr "Per Oyvind Karlsen"
 #, fuzzy, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 "већи број прерађених пакета и чишћење, Norwegian Bokmaal (nb) превод, рад на "
 "i18n, игрице"
@@ -535,8 +535,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinux Контролни Центар"
+msgid "Mandriva linux Control Center"
+msgstr "Mandriva linux Контролни Центар"
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -813,8 +813,8 @@ msgstr ""
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, c-format
@@ -844,7 +844,7 @@ msgid ""
 "Look at available updates and apply any fixes or upgrades to installed "
 "packages"
 msgstr ""
-"Mandrakelinux Update вам помаже да извршите ажурирање система са новим "
+"Mandriva linux Update вам помаже да извршите ажурирање система са новим "
 "софтверским пакетима"
 
 #: ../control-center:445
@@ -1150,7 +1150,7 @@ msgstr "Подеси инсталациони сервер"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
 msgstr ""
 
 #: ../control-center:745
@@ -1529,13 +1529,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Mandrakelinux Контролни Центар %s [на %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Mandriva linux Контролни Центар %s [на %s]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Добродошли у Mandrakelinux Контролни Центар"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Добродошли у Mandriva linux Контролни Центар"
 
 #: ../control-center:1419
 #, c-format
@@ -1597,8 +1597,8 @@ msgstr "Скините нове теме са www.damz.net"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "О - Mandrakelinux Контролном Центру"
+msgid "About - Mandriva linux Control Center"
+msgstr "О - Mandriva linux Контролном Центру"
 
 #: ../control-center:1786
 #, c-format
@@ -1651,8 +1651,8 @@ msgstr "Преводилац:"
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Copyright © 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Copyright © 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1661,8 +1661,8 @@ msgstr "Аутори"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Mandrakelinux Донантори и помагачи"
+msgid "Mandriva linux Contributors"
+msgstr "Mandriva linux Донантори и помагачи"
 
 #: ../drakconsole:27
 #, fuzzy, c-format
@@ -2010,30 +2010,30 @@ msgstr "Резолуција екрана"
 #~ msgid "Manager Connection"
 #~ msgstr "Управљање конекцијама"
 
-#~ msgid "Mandrakelinux Control Center %s\n"
-#~ msgstr "Mandrakelinux Контролни Центар %s\n"
+#~ msgid "Mandriva linux Control Center %s\n"
+#~ msgstr "Mandriva linux Контролни Центар %s\n"
 
 #~ msgid ""
-#~ "Mandrakelinux Control Center is Mandrake Linux's main configuration\n"
+#~ "Mandriva linux Control Center is Mandriva Linux's main configuration\n"
 #~ "tool. It enables the system administrator to configure the hardware\n"
 #~ "and services used for all users.\n"
 #~ "\n"
 #~ "\n"
-#~ "The tools accessed through the Mandrakelinux Control Center greatly\n"
+#~ "The tools accessed through the Mandriva linux Control Center greatly\n"
 #~ "simplify the use of the system, notably by avoiding the use of the\n"
 #~ "evil command line."
 #~ msgstr ""
-#~ "Mandrakelinux Контролни Центар је Mandrakelinux-об главни конфигурациони\n"
+#~ "Mandriva linux Контролни Центар је Mandrivalinux-об главни конфигурациони\n"
 #~ "алат. Он омогућава администратору система да подеси хардвер\n"
 #~ "сервисе које користе сви корисници.\n"
 #~ "\n"
 #~ "\n"
-#~ "Алати којима се може приступити из Mandrakelinux Контролног Центра веома\n"
+#~ "Алати којима се може приступити из Mandriva linux Контролног Центра веома\n"
 #~ "поједностављују коришћење система, углавном избегавањем\n"
 #~ "коришћења командне линије."
 
-#~ msgid "Mandrakelinux Update: dummy description"
-#~ msgstr "Mandrakelinux Update: лажни опис"
+#~ msgid "Mandriva linux Update: dummy description"
+#~ msgstr "Mandriva linux Update: лажни опис"
 
 #~ msgid "Menus: dummy description"
 #~ msgstr "Менији: лажни опис"
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index c6314774..091498cc 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 Mandriva
 # Jankovic Tomislav <tomaja@net.yu>, 2000,2002.
 # Toma Jankovic <tomaja@net.yu>, 2003.
 # Toma Jankovic <webmaster@mandrake.co.yu>, 2004.
@@ -32,7 +32,7 @@ msgstr "Per Oyvind Karlsen"
 #, fuzzy, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 "veći broj prerađenih paketa i čišćenje, Norwegian Bokmaal (nb) prevod, rad "
 "na i18n, igrice"
@@ -535,8 +535,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinux Kontrolni Centar"
+msgid "Mandriva linux Control Center"
+msgstr "Mandriva linux Kontrolni Centar"
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -814,8 +814,8 @@ msgstr ""
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, c-format
@@ -845,7 +845,7 @@ msgid ""
 "Look at available updates and apply any fixes or upgrades to installed "
 "packages"
 msgstr ""
-"Mandrakelinux Update vam pomaže da izvršite ažuriranje sistema sa novim "
+"Mandriva linux Update vam pomaže da izvršite ažuriranje sistema sa novim "
 "softverskim paketima"
 
 #: ../control-center:445
@@ -1151,7 +1151,7 @@ msgstr "Podesi instalacioni server"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
 msgstr ""
 
 #: ../control-center:745
@@ -1530,13 +1530,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Mandrakelinux Kontrolni Centar %s [na %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Mandriva linux Kontrolni Centar %s [na %s]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Dobrodošli u Mandrakelinux Kontrolni Centar"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Dobrodošli u Mandriva linux Kontrolni Centar"
 
 #: ../control-center:1419
 #, c-format
@@ -1598,8 +1598,8 @@ msgstr "Skinite nove teme sa www.damz.net"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "O - Mandrakelinux Kontrolnom Centru"
+msgid "About - Mandriva linux Control Center"
+msgstr "O - Mandriva linux Kontrolnom Centru"
 
 #: ../control-center:1786
 #, c-format
@@ -1652,8 +1652,8 @@ msgstr "Prevodilac:"
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Copyright (C) 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Copyright (C) 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1662,8 +1662,8 @@ msgstr "Autori"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Mandrakelinux Donantori i pomagači"
+msgid "Mandriva linux Contributors"
+msgstr "Mandriva linux Donantori i pomagači"
 
 #: ../drakconsole:27
 #, fuzzy, c-format
@@ -2011,30 +2011,30 @@ msgstr "Rezolucija ekrana"
 #~ msgid "Manager Connection"
 #~ msgstr "Upravljanje konekcijama"
 
-#~ msgid "Mandrakelinux Control Center %s\n"
-#~ msgstr "Mandrakelinux Kontrolni Centar %s\n"
+#~ msgid "Mandriva linux Control Center %s\n"
+#~ msgstr "Mandriva linux Kontrolni Centar %s\n"
 
 #~ msgid ""
-#~ "Mandrakelinux Control Center is Mandrake Linux's main configuration\n"
+#~ "Mandriva linux Control Center is Mandriva Linux's main configuration\n"
 #~ "tool. It enables the system administrator to configure the hardware\n"
 #~ "and services used for all users.\n"
 #~ "\n"
 #~ "\n"
-#~ "The tools accessed through the Mandrakelinux Control Center greatly\n"
+#~ "The tools accessed through the Mandriva linux Control Center greatly\n"
 #~ "simplify the use of the system, notably by avoiding the use of the\n"
 #~ "evil command line."
 #~ msgstr ""
-#~ "Mandrakelinux Kontrolni Centar je Mandrakelinux-ob glavni konfiguracioni\n"
+#~ "Mandriva linux Kontrolni Centar je Mandrivalinux-ob glavni konfiguracioni\n"
 #~ "alat. On omogućava administratoru sistema da podesi hardver\n"
 #~ "servise koje koriste svi korisnici.\n"
 #~ "\n"
 #~ "\n"
-#~ "Alati kojima se može pristupiti iz Mandrakelinux Kontrolnog Centra veoma\n"
+#~ "Alati kojima se može pristupiti iz Mandriva linux Kontrolnog Centra veoma\n"
 #~ "pojednostavljuju korišćenje sistema, uglavnom izbegavanjem\n"
 #~ "korišćenja komandne linije."
 
-#~ msgid "Mandrakelinux Update: dummy description"
-#~ msgstr "Mandrakelinux Update: lažni opis"
+#~ msgid "Mandriva linux Update: dummy description"
+#~ msgstr "Mandriva linux Update: lažni opis"
 
 #~ msgid "Menus: dummy description"
 #~ msgstr "Meniji: lažni opis"
diff --git a/po/sv.po b/po/sv.po
index b0cd6470..f96a2a22 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -3,7 +3,7 @@
 # translation of drakconf-sv.po to Swedish
 # Översättning av drakconf-sv.po till Svenska
 # Copyright (C) 2000,2002,2003, 2004, 2005 Free Software Foundation, Inc.
-# Copyright (c) 2000-2005 Mandrakesoft
+# Copyright (c) 2000-2005 Mandriva
 # Lars Westergren <lars.westergren@home.se> 2004, 2005
 # Fuad Sabanovic <manijak@swipnet.se>, 2000.
 # Mattias Dahlberg <voz@home.se>, 2001, 2002.
@@ -39,10 +39,10 @@ msgstr "Per Oyvind Karlsen"
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 "en mängd ombyggda och rensade paket, spel, sparc portning, kontrolläsning av "
-"Mandrakeverktyg"
+"Mandrivaverktyg"
 
 #: ../contributors.pl:13
 #, c-format
@@ -549,8 +549,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakes kontrollcentral"
+msgid "Mandriva linux Control Center"
+msgstr "Mandrivas kontrollcentral"
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -826,8 +826,8 @@ msgstr "Konfigurera om nätverksgränssnitt"
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, c-format
@@ -1162,8 +1162,8 @@ msgstr "Anpassa installationsserver"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
-msgstr "Konfigurera en server för nätverksinstallationer av Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
+msgstr "Konfigurera en server för nätverksinstallationer av Mandriva linux"
 
 #: ../control-center:745
 #, c-format
@@ -1540,13 +1540,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Mandrakes kontrollcentral %s [på %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Mandrivas kontrollcentral %s [på %s]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Välkommen till Mandrakes kontrollcentral"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Välkommen till Mandrivas kontrollcentral"
 
 #: ../control-center:1419
 #, c-format
@@ -1611,8 +1611,8 @@ msgstr "Fler teman finns på www.damz.net"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "Om - Mandrakes kontrollcentral"
+msgid "About - Mandriva linux Control Center"
+msgstr "Om - Mandrivas kontrollcentral"
 
 #: ../control-center:1786
 #, c-format
@@ -1665,8 +1665,8 @@ msgstr "Översättare: "
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Copyright © 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Copyright © 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1675,8 +1675,8 @@ msgstr "Upphovsmän"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Bidragsgivare till Mandrakelinux"
+msgid "Mandriva linux Contributors"
+msgstr "Bidragsgivare till Mandriva linux"
 
 #: ../drakconsole:27
 #, c-format
diff --git a/po/ta.po b/po/ta.po
index bf891a61..19bfee2d 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -27,7 +27,7 @@ msgstr "பெர் ஆய்விண்ட் கார்ல்சன்"
 #, fuzzy, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 "அதிக அளவில் பொதிகள் மறுவுருவாக்கம் மற்றும் சரிபடுத்துதல், நார்விய பொக்மால் (nb) "
 "மொழிபெயர்ப்பு, i18n  பணி ( nb மற்றும் nn), விளையாட்டு மென்பொருட்கள், sparc port"
@@ -534,7 +534,7 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
+msgid "Mandriva linux Control Center"
 msgstr "மாண்ட்ரேக் கட்டுப்பாடு மையம்"
 
 #: ../control-center:108 ../control-center:1440
@@ -809,7 +809,7 @@ msgstr ""
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
+msgid "Mandriva Online"
 msgstr "மாண்ட்ேரக்இணைய"
 
 #: ../control-center:413
@@ -1142,7 +1142,7 @@ msgstr "நிறுவல் சேவையகத்தை வடிவமை"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
 msgstr ""
 
 #: ../control-center:745
@@ -1520,12 +1520,12 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
 msgstr "மாண்ட்ரேக் கட்டுப்பாடு மையம் %s [on %s]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
+msgid "Welcome to the Mandriva linux Control Center"
 msgstr "மாண்ட்ரேக் கட்டுப்பாடு மையத்திற்கு வருக"
 
 #: ../control-center:1419
@@ -1588,7 +1588,7 @@ msgstr "மேலும் சில உருகருக்கள் பெற
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
+msgid "About - Mandriva linux Control Center"
 msgstr "மாண்ட்ரேக் கட்டுப்பாடு மையம் - பற்றி"
 
 #: ../control-center:1786
@@ -1642,7 +1642,7 @@ msgstr "மொழிபெயர்த்தவர்"
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
 msgstr "உரிமை (C) 1999-2005 மாண்டரேக்சாப்ட் நிறுவனம்"
 
 #: ../control-center:1841
@@ -1652,7 +1652,7 @@ msgstr "ஆசிரியர்கள்"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
+msgid "Mandriva linux Contributors"
 msgstr "மாண்ரேக் லினக்ஸ் பங்களிப்பாளர்கள்"
 
 #: ../drakconsole:27
@@ -1815,7 +1815,7 @@ msgstr "திரைப் பரிமாணங்கள்"
 #~ msgid "Manager Connection"
 #~ msgstr "இணைப்புகளை மேலான்மைசெய்"
 
-#~ msgid "Mandrakelinux Control Center %s\n"
+#~ msgid "Mandriva linux Control Center %s\n"
 #~ msgstr "மாண்ட்ரேக் கட்டுப்பாடு மையம் %s\n"
 
 #~ msgid "Monitor Connection"
diff --git a/po/tg.po b/po/tg.po
index 72df4dc2..5827450c 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -1,7 +1,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 Mandriva
 # 2004, infoDev, a World Bank organization
 # 2004, Khujand Computer Technologies, Inc.
 # 2004, KCT1, NGO
@@ -35,10 +35,10 @@ msgstr "Per Oyvind Karlsen"
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 "бозсозӣ ва поккунии умумии бастаҳо, бозиҳо, даргоҳи sparc, хондани асбобҳои "
-"Mandrake"
+"Mandriva"
 
 #: ../contributors.pl:13
 #, c-format
@@ -547,8 +547,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Маркази Идоракунии Mandrakelinux"
+msgid "Mandriva linux Control Center"
+msgstr "Маркази Идоракунии Mandriva linux"
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -823,8 +823,8 @@ msgstr ""
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, fuzzy, c-format
@@ -859,7 +859,7 @@ msgid ""
 "Look at available updates and apply any fixes or upgrades to installed "
 "packages"
 msgstr ""
-"Mandrake Update барои истифодаи тамоми устувориҳо ё афзоишҳо ба қуттиҳои "
+"Mandriva Update барои истифодаи тамоми устувориҳо ё афзоишҳо ба қуттиҳои "
 "коргузошта шуда ёрӣ медиҳад"
 
 #: ../control-center:445
@@ -1163,7 +1163,7 @@ msgstr "Танзими хидматрасони коргузорӣ"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
 msgstr ""
 
 #: ../control-center:745
@@ -1542,13 +1542,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Маркази Идоракунии Mandrakelinux %s [дар %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Маркази Идоракунии Mandriva linux %s [дар %s]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Марҳамат ба Маркази Идоракунии Mandrakelinux"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Марҳамат ба Маркази Идоракунии Mandriva linux"
 
 #: ../control-center:1419
 #, c-format
@@ -1610,8 +1610,8 @@ msgstr "Мавзӯъҳои иловагӣ гиред, дар www.damz.net"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "Дар бораи - Маркази Идоракунии Mandrakelinux"
+msgid "About - Mandriva linux Control Center"
+msgstr "Дар бораи - Маркази Идоракунии Mandriva linux"
 
 #: ../control-center:1786
 #, c-format
@@ -1664,8 +1664,8 @@ msgstr "Тарҷумон: "
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Ҳуқуқи муаллифӣ (C) 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Ҳуқуқи муаллифӣ (C) 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1674,8 +1674,8 @@ msgstr "Муаллифҳо"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Ҳамкорони Mandrakelinux"
+msgid "Mandriva linux Contributors"
+msgstr "Ҳамкорони Mandriva linux"
 
 #: ../drakconsole:27
 #, c-format
@@ -1845,8 +1845,8 @@ msgstr "Ҳалнокии Экран"
 #~ msgid "/Help/_About..."
 #~ msgstr "/Ёрӣ/_Дар бораи..."
 
-#~ msgid "/Mandrake_Campus"
-#~ msgstr "/Mandrake_Campus"
+#~ msgid "/Mandriva_Campus"
+#~ msgstr "/Mandriva_Campus"
 
 #~ msgid "/Options"
 #~ msgstr "/Интихобҳо"
@@ -1990,26 +1990,26 @@ msgstr "Ҳалнокии Экран"
 #~ msgstr "Идоракуни Пайвастшавӣ"
 
 #~ msgid ""
-#~ "Mandrake Control Center is Mandrake Linux's main configuration\n"
+#~ "Mandriva Control Center is Mandrake Linux's main configuration\n"
 #~ "tool. It enables the system administrator to configure the hardware\n"
 #~ "and services used for all users.\n"
 #~ "\n"
 #~ "\n"
-#~ "The tools accessed through the Mandrake Control Center greatly\n"
+#~ "The tools accessed through the Mandriva Control Center greatly\n"
 #~ "simplify the use of the system, notably by avoiding the use of the\n"
 #~ "evil command line."
 #~ msgstr ""
-#~ "Маркази Идоракунии Mandrake асбоби асосии танзимдарории Mandrake Linux\n"
+#~ "Маркази Идоракунии Mandriva асбоби асосии танзимдарории Mandrake Linux\n"
 #~ "мебошад. Ин идоракунандаи системро барои танзим кардани сахтафзор ва\n"
 #~ "хадамот, ки бо ҳамаи корвандон истифода бурда мешавад дар мегиронад.\n"
 #~ "\n"
 #~ "\n"
-#~ "Асбобҳои аз Маркази Идоракунии Mandrake даромада, истифодабарии\n"
+#~ "Асбобҳои аз Маркази Идоракунии Mandriva даромада, истифодабарии\n"
 #~ "системро хеле осон мегардонад, хусусан бо дуркашӣ аз истифодабарии\n"
 #~ "сатри фармони бад."
 
-#~ msgid "Mandrakelinux Control Center %s\n"
-#~ msgstr "Маркази Идоракунии Mandrakelinux %s\n"
+#~ msgid "Mandriva linux Control Center %s\n"
+#~ msgstr "Маркази Идоракунии Mandriva linux %s\n"
 
 #~ msgid "Monitor Connection"
 #~ msgstr "Дидабонӣ аз болои Пайвастшавӣ"
@@ -2142,8 +2142,8 @@ msgstr "Ҳалнокии Экран"
 #~ msgstr ""
 #~ "Устози Web барои ба танзимдарории Хидматгори Веб ба шабакаатон ёрӣ медиҳад"
 
-#~ msgid "The place where you can configure your Mandrake Box"
-#~ msgstr "Ҷое, ки шумо метавонед Mandrake Box-ро ба танзим дароред"
+#~ msgid "The place where you can configure your Mandriva Box"
+#~ msgstr "Ҷое, ки шумо метавонед Mandriva Box-ро ба танзим дароред"
 
 #~ msgid "Time Zone"
 #~ msgstr "Соати Минтақа"
diff --git a/po/th.po b/po/th.po
index c86fe89e..f6421075 100644
--- a/po/th.po
+++ b/po/th.po
@@ -30,7 +30,7 @@ msgstr ""
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 
 #: ../contributors.pl:13
@@ -519,8 +519,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinux ฐานควบคุม"
+msgid "Mandriva linux Control Center"
+msgstr "Mandriva linux ฐานควบคุม"
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -794,8 +794,8 @@ msgstr ""
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, c-format
@@ -824,7 +824,7 @@ msgstr ""
 msgid ""
 "Look at available updates and apply any fixes or upgrades to installed "
 "packages"
-msgstr "Mandrakelinux Update ช่วยคุณติดตั้งตัวแก้ไขหรือตัวอัพเดทของแพ็คเกจที่ติดตั้งแล้ว"
+msgstr "Mandriva linux Update ช่วยคุณติดตั้งตัวแก้ไขหรือตัวอัพเดทของแพ็คเกจที่ติดตั้งแล้ว"
 
 #: ../control-center:445
 #, c-format
@@ -1127,7 +1127,7 @@ msgstr "ศูนย์การปรับแต่งเมนู"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
 msgstr ""
 
 #: ../control-center:745
@@ -1499,13 +1499,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, fuzzy, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Mandrakelinux Control Center %s"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Mandriva linux Control Center %s"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "ยินดีต้อนรับสู่ Mandrakelinux Control Center"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "ยินดีต้อนรับสู่ Mandriva linux Control Center"
 
 #: ../control-center:1419
 #, c-format
@@ -1567,8 +1567,8 @@ msgstr "อ่านธีมใหม่เพิ่มเติมจาก ww
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "เกี่ยวกับ - Mandrakelinux Control Center"
+msgid "About - Mandriva linux Control Center"
+msgstr "เกี่ยวกับ - Mandriva linux Control Center"
 
 #: ../control-center:1786
 #, c-format
@@ -1621,8 +1621,8 @@ msgstr "ผู้แปล:"
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "สงวนลิขสิทธิ์ (C) 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "สงวนลิขสิทธิ์ (C) 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1631,8 +1631,8 @@ msgstr "ผู้แต่ง"
 
 #: ../control-center:1842
 #, fuzzy, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Mandrakelinux Control Center %s"
+msgid "Mandriva linux Contributors"
+msgstr "Mandriva linux Control Center %s"
 
 #: ../drakconsole:27
 #, fuzzy, c-format
@@ -1844,25 +1844,25 @@ msgstr "ความละเอียดของจอ"
 #~ msgid "KeyboardDrake helps you to set your keyboard layout"
 #~ msgstr "KeyboardDrake ช่วยคุณตั้งเลย์เอ้าท์ของคีย์บอร์ด"
 
-#~ msgid "Mandrakelinux Control Center %s\n"
-#~ msgstr "Mandrakelinux Control Center %s\n"
+#~ msgid "Mandriva linux Control Center %s\n"
+#~ msgstr "Mandriva linux Control Center %s\n"
 
 #~ msgid ""
-#~ "Mandrakelinux Control Center is Mandrake Linux's main configuration\n"
+#~ "Mandriva linux Control Center is Mandriva Linux's main configuration\n"
 #~ "tool. It enables the system administrator to configure the hardware\n"
 #~ "and services used for all users.\n"
 #~ "\n"
 #~ "\n"
-#~ "The tools accessed through the Mandrakelinux Control Center greatly\n"
+#~ "The tools accessed through the Mandriva linux Control Center greatly\n"
 #~ "simplify the use of the system, notably by avoiding the use of the\n"
 #~ "evil command line."
 #~ msgstr ""
-#~ "Mandrakelinux Control Center คือเครื่องมือหลักสำหรับการปรับแต่ง Mandrake Linux\n"
+#~ "Mandriva linux Control Center คือเครื่องมือหลักสำหรับการปรับแต่ง Mandriva Linux\n"
 #~ "ในนี้ ผู้ดูแลระบบจะสามารถปรับแต่งฮาร์ดแวร์\n"
 #~ "และบริการต่างๆ สำหรับผู้ใช้ทั้งหมด\n"
 #~ "\n"
 #~ "\n"
-#~ "เครื่องมือที่ใช้ผ่าน Mandrakelinux Control Center ได้ถูก\n"
+#~ "เครื่องมือที่ใช้ผ่าน Mandriva linux Control Center ได้ถูก\n"
 #~ "ทำให้ง่ายต่อการใช้ระบบ เห็นได้ชัดเจนจากการไม่จำเป็นต้อง \n"
 #~ "ใช้คำสั่งแบบคอมมานด์ไลน์"
 
diff --git a/po/tl.po b/po/tl.po
index a548e903..0de50b6f 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -29,10 +29,10 @@ msgstr "Per Oyvind Karlsen"
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 "mabigatang muling pagbuo at paglinis ng mga package, laro, sparc port, "
-"masinsinang pagbasa ng mga kagamitang Mandrake"
+"masinsinang pagbasa ng mga kagamitang Mandriva"
 
 #: ../contributors.pl:13
 #, c-format
@@ -543,8 +543,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Sentro ng Kontrol ng Mandrakelinux"
+msgid "Mandriva linux Control Center"
+msgstr "Sentro ng Kontrol ng Mandriva linux"
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -818,8 +818,8 @@ msgstr ""
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, fuzzy, c-format
@@ -1152,7 +1152,7 @@ msgstr "I-configure ang pang-install na server"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
 msgstr ""
 
 #: ../control-center:745
@@ -1529,13 +1529,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Sentro ng Kontrol ng Mandrakelinux %s [sa %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Sentro ng Kontrol ng Mandriva linux %s [sa %s]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Maligayang pagdating sa Sentro ng Kontrol ng Mandrakelinux"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Maligayang pagdating sa Sentro ng Kontrol ng Mandriva linux"
 
 #: ../control-center:1419
 #, c-format
@@ -1597,8 +1597,8 @@ msgstr "Kumuha ng mga karagdagang theme sa www.damz.net"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "Tungkol sa - Sentro ng Kontrol ng Mandrakelinux"
+msgid "About - Mandriva linux Control Center"
+msgstr "Tungkol sa - Sentro ng Kontrol ng Mandriva linux"
 
 #: ../control-center:1786
 #, c-format
@@ -1651,8 +1651,8 @@ msgstr "Tagapagsalin: "
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Copyright (C) 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Copyright (C) 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1661,8 +1661,8 @@ msgstr "Mga may-akda"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Mga Tagaambag sa Mandrakelinux"
+msgid "Mandriva linux Contributors"
+msgstr "Mga Tagaambag sa Mandriva linux"
 
 #: ../drakconsole:27
 #, c-format
diff --git a/po/tr.po b/po/tr.po
index 7b0792e7..339ccdae 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -35,7 +35,7 @@ msgstr "Per Oyvind Karlsen"
 #, fuzzy, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 "Büyük paketlerin yeniden derlenmesi ve temizlenmesi, Norveççe-Bokmål(nb) "
 "çevirisi i18n çalışmaları (nb ve nn) oyunlar,sparc ve port"
@@ -542,8 +542,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinux Denetim Merkezi"
+msgid "Mandriva linux Control Center"
+msgstr "Mandriva linux Denetim Merkezi"
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -817,8 +817,8 @@ msgstr ""
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, fuzzy, c-format
@@ -827,7 +827,7 @@ msgid ""
 "updates and useful upgrades"
 msgstr ""
 "Bu asistan size yapılandırmanızı yollarken yardımcı olacaktır.\n"
-"(paketler, donanım bilgisi) Bu bilgilerle Mandrakesoftta bir veri tabanı\n"
+"(paketler, donanım bilgisi) Bu bilgilerle Mandrivata bir veri tabanı\n"
 "oluşturulacak ve sisteminiz hakkında güvenlik yamaları ve güncellemelerden\n"
 "her an haberdar olacaksınız.\n"
 
@@ -1151,7 +1151,7 @@ msgstr "Kurulum sunucusunu yapılandır"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
 msgstr ""
 
 #: ../control-center:745
@@ -1528,13 +1528,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Mandrakelinux Denetim Merkezi %s [%s]"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Mandriva linux Denetim Merkezi %s [%s]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Mandrakelinux Denetim Merkezine Hoşgeldiniz"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Mandriva linux Denetim Merkezine Hoşgeldiniz"
 
 #: ../control-center:1419
 #, c-format
@@ -1596,8 +1596,8 @@ msgstr "Ek temaları www.damz.net'ten alabilirsiniz"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "Hakkında - Mandrakelinux Denetim Merkezi"
+msgid "About - Mandriva linux Control Center"
+msgstr "Hakkında - Mandriva linux Denetim Merkezi"
 
 #: ../control-center:1786
 #, c-format
@@ -1650,8 +1650,8 @@ msgstr "Çevirmen: "
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Tel'if Hakkı (C) 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Tel'if Hakkı (C) 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1660,8 +1660,8 @@ msgstr "Yazarlar"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Mandrakelinux'a Yardım Edenler"
+msgid "Mandriva linux Contributors"
+msgstr "Mandriva linux'a Yardım Edenler"
 
 #: ../drakconsole:27
 #, c-format
diff --git a/po/uk.po b/po/uk.po
index 060ef5b9..489001e4 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -2,7 +2,7 @@
 # Ukrainian translation of drakconf.
 # $Id$
 # Copyright (C) 2000,2003, 2004, 2005 Free Software Foundation, Inc.
-# Copyright (c) 2000 Mandrakesoft
+# Copyright (c) 2000 Mandriva
 # Sergey Ribalchenko <fisher@obu.ck.ua>, 2000.
 # Michael Shigorin <mike@alt-linux.org>, 2002 (small fixes).
 # Gladky Dima <gladimdim@inbox.ru>, 2002 (fixes).
@@ -37,10 +37,10 @@ msgstr "Per Oyvind Karlsen"
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 "перебудовано і почищено багато пакунків, ігри, переведення на процесори "
-"sparc, вичитування Mandrake tools"
+"sparc, вичитування Mandriva tools"
 
 #: ../contributors.pl:13
 #, c-format
@@ -551,7 +551,7 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
+msgid "Mandriva linux Control Center"
 msgstr "Центр керування Мандрейклінакс"
 
 #: ../control-center:108 ../control-center:1440
@@ -824,8 +824,8 @@ msgstr "Переналаштувати мережевий інтерфейс"
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, c-format
@@ -1153,7 +1153,7 @@ msgstr "Налаштувати сервер встановлення"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
 msgstr "Встановити сервер для встановлення Мандрейклінакса з мережі"
 
 #: ../control-center:745
@@ -1527,12 +1527,12 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
 msgstr "Центр керування Мандрейклінакс %s [%s]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
+msgid "Welcome to the Mandriva linux Control Center"
 msgstr "Ласкаво просимо до Центру керування Мандрейклінакс"
 
 #: ../control-center:1419
@@ -1600,7 +1600,7 @@ msgstr "Взяти додаткові теми з www.damz.net"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
+msgid "About - Mandriva linux Control Center"
 msgstr "Про Центр керування Мандрейклінакс"
 
 #: ../control-center:1786
@@ -1654,8 +1654,8 @@ msgstr "Перекладач:"
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Права на розповсюдження застережені (c) 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Права на розповсюдження застережені (c) 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1664,7 +1664,7 @@ msgstr "Автори"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
+msgid "Mandriva linux Contributors"
 msgstr "Ті, що підтримують Мандрейклінакс"
 
 #: ../drakconsole:27
diff --git a/po/uz.po b/po/uz.po
index b832da00..f37b966a 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 Mandriva.
 # Mashrab Kuvatov <kmashrab@uni-bremen.de>, 2003, 2004.
 #
 msgid ""
@@ -30,7 +30,7 @@ msgstr "Пер Ойвинд Карлсн (Per Oyvind Karlsen)"
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 
 #: ../contributors.pl:13
@@ -521,8 +521,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinux бошқарув маркази"
+msgid "Mandriva linux Control Center"
+msgstr "Mandriva linux бошқарув маркази"
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -796,8 +796,8 @@ msgstr ""
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, c-format
@@ -1126,7 +1126,7 @@ msgstr "Ўрнатиш серверини мослаш"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
 msgstr ""
 
 #: ../control-center:745
@@ -1501,13 +1501,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Mandrakelinux бошқарув маркази %s [%s]"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Mandriva linux бошқарув маркази %s [%s]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Mandrakelinux бошқарув марказига марҳамат"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Mandriva linux бошқарув марказига марҳамат"
 
 #: ../control-center:1419
 #, c-format
@@ -1569,8 +1569,8 @@ msgstr "www.damz.net сайтидан қўшимча мавзуларни оли
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "Mandrakelinux бошқарув маркази ҳақида"
+msgid "About - Mandriva linux Control Center"
+msgstr "Mandriva linux бошқарув маркази ҳақида"
 
 #: ../control-center:1786
 #, c-format
@@ -1623,8 +1623,8 @@ msgstr "Таржимон: "
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Copyright © 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Copyright © 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1633,7 +1633,7 @@ msgstr "  Муаллифлар  "
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
+msgid "Mandriva linux Contributors"
 msgstr "  Ҳисса қўшувчилар  "
 
 #: ../drakconsole:27
diff --git a/po/uz@Latn.po b/po/uz@Latn.po
index 6bae556c..14f15759 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 Mandriva.
 # Mashrab Kuvatov <kmashrab@uni-bremen.de>, 2003, 2004.
 #
 msgid ""
@@ -30,7 +30,7 @@ msgstr "Per Oyvind Karlsn (Per Oyvind Karlsen)"
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 
 #: ../contributors.pl:13
@@ -521,8 +521,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinux boshqaruv markazi"
+msgid "Mandriva linux Control Center"
+msgstr "Mandriva linux boshqaruv markazi"
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -796,8 +796,8 @@ msgstr ""
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, c-format
@@ -1126,7 +1126,7 @@ msgstr "O'rnatish serverini moslash"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
 msgstr ""
 
 #: ../control-center:745
@@ -1501,13 +1501,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Mandrakelinux boshqaruv markazi %s [%s]"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Mandriva linux boshqaruv markazi %s [%s]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Mandrakelinux boshqaruv markaziga marhamat"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Mandriva linux boshqaruv markaziga marhamat"
 
 #: ../control-center:1419
 #, c-format
@@ -1569,8 +1569,8 @@ msgstr "www.damz.net saytidan qo'shimcha mavzularni olish"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "Mandrakelinux boshqaruv markazi haqida"
+msgid "About - Mandriva linux Control Center"
+msgstr "Mandriva linux boshqaruv markazi haqida"
 
 #: ../control-center:1786
 #, c-format
@@ -1623,8 +1623,8 @@ msgstr "Tarjimon: "
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Copyright © 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Copyright © 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1633,7 +1633,7 @@ msgstr "  Mualliflar  "
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
+msgid "Mandriva linux Contributors"
 msgstr "  Hissa qo'shuvchilar  "
 
 #: ../drakconsole:27
diff --git a/po/vi.po b/po/vi.po
index 3357c050..ddb68975 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -27,10 +27,10 @@ msgstr "Per Oyvind Karlsen"
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 "viết lại và sửa lỗi nhiều gói phần mềm, trò chơi, sparc port, proofreading "
-"cho các công cụ của  Mandrakelinux"
+"cho các công cụ của  Mandriva linux"
 
 #: ../contributors.pl:13
 #, c-format
@@ -536,8 +536,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Trung Tâm Điều Khiển Mandrakelinux"
+msgid "Mandriva linux Control Center"
+msgstr "Trung Tâm Điều Khiển Mandriva linux"
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -811,8 +811,8 @@ msgstr "Cấu hình lại giao diện mạng"
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, c-format
@@ -1150,8 +1150,8 @@ msgstr "Cấu hình máy chủ cài đặt"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
-msgstr "Thiết lập máy chủ để cài đặt Mandrakelinux qua mạng"
+msgid "Set up server for network installations of Mandriva linux"
+msgstr "Thiết lập máy chủ để cài đặt Mandriva linux qua mạng"
 
 #: ../control-center:745
 #, c-format
@@ -1527,13 +1527,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Trung Tâm Điều Khiển Mandrakelinux %s [trên %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Trung Tâm Điều Khiển Mandriva linux %s [trên %s]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Chào Mừng Trung Tâm Điều Khiển Mandrakelinux"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Chào Mừng Trung Tâm Điều Khiển Mandriva linux"
 
 #: ../control-center:1419
 #, c-format
@@ -1598,8 +1598,8 @@ msgstr "Lấy thêm theme tại www.damz.net"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "Giới thiệu - Trung Tâm Điều Khiển Mandrakelinux"
+msgid "About - Mandriva linux Control Center"
+msgstr "Giới thiệu - Trung Tâm Điều Khiển Mandriva linux"
 
 #: ../control-center:1786
 #, c-format
@@ -1656,8 +1656,8 @@ msgstr "Dịch sang tiếng Việt:"
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Bản quyền (C) 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Bản quyền (C) 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1666,8 +1666,8 @@ msgstr "Tác giả"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Người Đóng Góp Cho Mandrakelinux"
+msgid "Mandriva linux Contributors"
+msgstr "Người Đóng Góp Cho Mandriva linux"
 
 #: ../drakconsole:27
 #, c-format
diff --git a/po/wa.po b/po/wa.po
index 35615f95..98af19a9 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 Mandriva
 # Pablo Saratxaga <pablo@mandrakesoft.com>, 2000,2003,2004.
 # Lorint Hendschel <LorintHendschel@skynet.be>, 2002.
 # Pablo Saratxaga <pablo@walon.org>, 2004, 2005.
@@ -31,10 +31,10 @@ msgstr "Per Øyvind Karlsen"
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
+"Mandriva tools"
 msgstr ""
 "bråmint des rpacaedjaedjes eyet netiaedjes, djeus, poirtaedje sparc, "
-"verifiaedje des usteyes Mandrakelinux"
+"verifiaedje des usteyes Mandriva linux"
 
 #: ../contributors.pl:13
 #, c-format
@@ -548,8 +548,8 @@ msgstr ""
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Cinte di contrôle di Mandrakelinux"
+msgid "Mandriva linux Control Center"
+msgstr "Cinte di contrôle di Mandriva linux"
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -839,8 +839,8 @@ msgstr "Rapontyî ene eterface rantoele"
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, c-format
@@ -1188,9 +1188,9 @@ msgstr "Apontyî on sierveu d' astalaedje"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
+msgid "Set up server for network installations of Mandriva linux"
 msgstr ""
-"Apontyî on sierveu po fé des astalaedjes di Mandrakelinux viè l' rantoele"
+"Apontyî on sierveu po fé des astalaedjes di Mandriva linux viè l' rantoele"
 
 #: ../control-center:745
 #, c-format
@@ -1570,13 +1570,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Cinte di contrôle di Mandrakelinux %s [so %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Cinte di contrôle di Mandriva linux %s [so %s]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "Wilicome å cinte di contrôle di Mandrakelinux"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "Wilicome å cinte di contrôle di Mandriva linux"
 
 #: ../control-center:1419
 #, c-format
@@ -1641,8 +1641,8 @@ msgstr "Aberweter des noveas tinmes di www.damz.net"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "Åd fwait - Cinte di contrôle di Mandrakelinux"
+msgid "About - Mandriva linux Control Center"
+msgstr "Åd fwait - Cinte di contrôle di Mandriva linux"
 
 #: ../control-center:1786
 #, c-format
@@ -1695,8 +1695,8 @@ msgstr "Ratourneu: "
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Copyright © 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Copyright © 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1705,8 +1705,8 @@ msgstr "Oteurs"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Contribouweus a Mandrakelinux"
+msgid "Mandriva linux Contributors"
+msgstr "Contribouweus a Mandriva linux"
 
 #: ../drakconsole:27
 #, c-format
@@ -1887,8 +1887,8 @@ msgstr "Finté del waitroûle"
 #~ msgid "Manager Connection"
 #~ msgstr "Manaedjî les raloyaedjes"
 
-#~ msgid "Mandrakelinux Control Center %s\n"
-#~ msgstr "Cinte di contrôle di Mandrakelinux %s\n"
+#~ msgid "Mandriva linux Control Center %s\n"
+#~ msgstr "Cinte di contrôle di Mandriva linux %s\n"
 
 #~ msgid "Monitor Connection"
 #~ msgstr "Corwaitî les raloyaedjes"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 715f3b45..96cbba2a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -11,7 +11,7 @@ msgstr ""
 "POT-Creation-Date: 2005-03-02 13:49+0100\n"
 "PO-Revision-Date: 2005-02-03 23:06+0800\n"
 "Last-Translator: Shiyu Tang <shiyutang@netscape.net>\n"
-"Language-Team: Mandrakelinux i18n Team <cooker-i18n@linux-mandrake.com>\n"
+"Language-Team: Mandriva linux i18n Team <cooker-i18n@linux-mandrake.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,8 +30,8 @@ msgstr "Per Oyvind Karlsen"
 #, c-format
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
-"Mandrake tools"
-msgstr "繁杂的软件包重建和清理，游戏，sparc 移植，Mandrakelinux 工具审阅"
+"Mandriva tools"
+msgstr "繁杂的软件包重建和清理，游戏，sparc 移植，Mandriva linux 工具审阅"
 
 #: ../contributors.pl:13
 #, c-format
@@ -531,8 +531,8 @@ msgstr "以及许多不知名的 beta 测试者和 bug 报告者，帮助了这�
 
 #: ../control-center:98 ../control-center:105 ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinux 控制中心"
+msgid "Mandriva linux Control Center"
+msgstr "Mandriva linux 控制中心"
 
 #: ../control-center:108 ../control-center:1440
 #, c-format
@@ -806,8 +806,8 @@ msgstr "重新配置网络连接"
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, c-format
@@ -1136,8 +1136,8 @@ msgstr "配置安装服务器"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
-msgstr "设置 Mandrakelinux 的网络安装服务器"
+msgid "Set up server for network installations of Mandriva linux"
+msgstr "设置 Mandriva linux 的网络安装服务器"
 
 #: ../control-center:745
 #, c-format
@@ -1511,13 +1511,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Mandrakelinux 控制中心 %s [位于 %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Mandriva linux 控制中心 %s [位于 %s]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "欢迎使用 Mandrakelinux 控制中心"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "欢迎使用 Mandriva linux 控制中心"
 
 #: ../control-center:1419
 #, c-format
@@ -1579,8 +1579,8 @@ msgstr "在 www.damz.net 里获得额外主题"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "关于 - Mandrakelinux 控制中心"
+msgid "About - Mandriva linux Control Center"
+msgstr "关于 - Mandriva linux 控制中心"
 
 #: ../control-center:1786
 #, c-format
@@ -1633,8 +1633,8 @@ msgstr "翻译者："
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "Mandrakesoft SA 版权所有 (C) 1999-2005"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "Mandriva SA 版权所有 (C) 1999-2005"
 
 #: ../control-center:1841
 #, c-format
@@ -1643,8 +1643,8 @@ msgstr "作者"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Mandrakelinux 贡献者"
+msgid "Mandriva linux Contributors"
+msgstr "Mandriva linux 贡献者"
 
 #: ../drakconsole:27
 #, c-format
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 7a7021e5..8c5fbb88 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -35,8 +35,8 @@ msgstr "Per Oyvind Karlsen"
 
 #: ../contributors.pl:12
 #, c-format
-msgid "massive packages rebuilding and cleaning, games, sparc port, proofreading of Mandrake tools"
-msgstr "大量的套件重建與清理、遊戲、sparc 移植、校對 Mandrake 工具"
+msgid "massive packages rebuilding and cleaning, games, sparc port, proofreading of Mandriva tools"
+msgstr "大量的套件重建與清理、遊戲、sparc 移植、校對 Mandriva 工具"
 
 #: ../contributors.pl:13
 #, c-format
@@ -523,8 +523,8 @@ msgstr "與許多的無名與未知的 beta 測試者與臭蟲回報者，他們
 #: ../control-center:105
 #: ../control-center:1833
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinux 控制中心"
+msgid "Mandriva linux Control Center"
+msgstr "Mandriva linux 控制中心"
 
 #: ../control-center:108
 #: ../control-center:1440
@@ -804,8 +804,8 @@ msgstr "重新設定網路介面"
 
 #: ../control-center:412
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../control-center:413
 #, c-format
@@ -1128,8 +1128,8 @@ msgstr "設定安裝伺服器"
 
 #: ../control-center:739
 #, c-format
-msgid "Set up server for network installations of Mandrakelinux"
-msgstr "建立 Mandrakelinux 網路安裝伺服器"
+msgid "Set up server for network installations of Mandriva linux"
+msgstr "建立 Mandriva linux 網路安裝伺服器"
 
 #: ../control-center:745
 #, c-format
@@ -1516,13 +1516,13 @@ msgstr ""
 
 #: ../control-center:1239
 #, c-format
-msgid "Mandrakelinux Control Center %s [on %s]"
-msgstr "Mandrakelinux 控制中心 %s [on %s]"
+msgid "Mandriva linux Control Center %s [on %s]"
+msgstr "Mandriva linux 控制中心 %s [on %s]"
 
 #: ../control-center:1253
 #, c-format
-msgid "Welcome to the Mandrakelinux Control Center"
-msgstr "歡迎來到 Mandrakelinux 控制中心"
+msgid "Welcome to the Mandriva linux Control Center"
+msgstr "歡迎來到 Mandriva linux 控制中心"
 
 #: ../control-center:1419
 #, c-format
@@ -1588,8 +1588,8 @@ msgstr "由 www.damz.net 下載更多佈景主題"
 
 #: ../control-center:1776
 #, c-format
-msgid "About - Mandrakelinux Control Center"
-msgstr "關於 - Mandrakelinux 控制中心"
+msgid "About - Mandriva linux Control Center"
+msgstr "關於 - Mandriva linux 控制中心"
 
 #: ../control-center:1786
 #, c-format
@@ -1643,8 +1643,8 @@ msgstr "翻譯者："
 
 #: ../control-center:1835
 #, c-format
-msgid "Copyright (C) 1999-2005 Mandrakesoft SA"
-msgstr "版權所有 (C) 1999-2005 Mandrakesoft SA"
+msgid "Copyright (C) 1999-2005 Mandriva SA"
+msgstr "版權所有 (C) 1999-2005 Mandriva SA"
 
 #: ../control-center:1841
 #, c-format
@@ -1653,8 +1653,8 @@ msgstr "作者"
 
 #: ../control-center:1842
 #, c-format
-msgid "Mandrakelinux Contributors"
-msgstr "Mandrakelinux 貢獻者"
+msgid "Mandriva linux Contributors"
+msgstr "Mandriva linux 貢獻者"
 
 #: ../drakconsole:27
 #, c-format