75 files changed, 2760 insertions, 2457 deletions
diff --git a/NEWS b/NEWS
index 71e26505..c4a4dc68 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- enable to alter branding
+
 Version 10.18.7 - 28 May 2008, Thierry Vignaud
 
 - do open bug in running firefox drakbug (#31109)
diff --git a/control-center b/control-center
index e37b9e33..b2a505b4 100755
--- a/control-center
+++ b/control-center
@@ -53,6 +53,10 @@ my $min_height = $rootwin_height == 480 ? 420 : 500;
 
 require_root_capability() if !$::testing; # just to get root capabilities
 
+my $branding = N("Mandriva Linux");
+my $product_id = common::parse_LDAP_namespace_structure(cat_('/etc/product.id'));
+# allow OEM branding:
+$branding = translate($product_id->{distribution});
 
 #-------------------------------------------------------------
 # read configuration, set themes, ...
@@ -90,14 +94,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("Mandriva Linux Control Center"));
+$window_splash->set_title(N("%s Control Center", $branding));
 $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("Mandriva Linux Control Center"),
+                                                                               N("%s Control Center", $branding),
                                                                                "</span>"),
                                                        ),
                                           Gtk2::Label->new(N("Loading... Please wait") . "\n"),
@@ -193,7 +197,7 @@ my @tree = (
                           N("Set up a web server"), 'Apache.pm',
                       ],
                         [ "Installation server wizard",    "installsrv", 'wizard-mdk', N("Configure installation server"),
-                          N("Set up server for network installations of Mandriva Linux"), 'Installsrv.pm', 1,
+                          N("Set up server for network installations of %s", $branding), 'Installsrv.pm', 1,
                       ],
                     ),
                  ),
@@ -722,7 +726,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("Mandriva Linux Control Center %s [on %s]", $version, $nodename));
+$window_global->set_title(N("%s Control Center %s [on %s]", $branding, $version, $nodename));
 $window_global->set_position('center');
 
 foreach my $notebook ($banner_notebook) {
@@ -736,7 +740,7 @@ $notebook_global->set_scrollable(1);
 # banner :
 
 add2notebook($banner_notebook, "", Gtk2::Banner->new("/usr/share/icons/large/drakconf.png", 
-                                                     N("Welcome to the Mandriva Linux Control Center")));
+                                                     N("Welcome to the %s Control Center", $branding)));
 
 
 my ($_hand_cursor, $wait_cursor) = map { Gtk2::Gdk::Cursor->new($_) } qw(hand2 watch);
@@ -1284,7 +1288,7 @@ sub more_themes() {
 }
 
 sub about_mdk_cc() {
-    my $window_about = new_dialog(N("About - Mandriva Linux Control Center"));
+    my $window_about = new_dialog(N("About - %s Control Center", $branding));
 
     my $tree_model = Gtk2::TreeStore->new("Glib::String", "Glib::String", "Glib::String");
     my $credits = Gtk2::TextView->new;
@@ -1355,9 +1359,9 @@ sub about_mdk_cc() {
 
     gtkpack_($window_about->vbox,
              (0, gtkset_size_request(Gtk2::Banner->new('splash_screen_about',
-                                                       #-PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-                                                       N("Mandriva Linux %s (%s) Control Center",
-                                                         @$release{qw(version product)}),
+                                                       #-PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+                                                       N("%s %s (%s) Control Center",
+                                                         $branding, @$release{qw(version product)}),
                                                        { txt_ypos => 50 }), -1, 120)),
              0, Gtk2::Label->new(""),
              0, Gtk2::Label->new(
diff --git a/po/af.po b/po/af.po
index bf1839a9..79bb3d11 100644
--- a/po/af.po
+++ b/po/af.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakconf-af\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2003-08-27 10:51+0200\n"
 "Last-Translator: Dirk van der Walt <mandrake@webmail.co.za>\n"
 "Language-Team: Afrikaans <C@li.org>\n"
@@ -519,12 +519,17 @@ msgid ""
 "sure it all worked right."
 msgstr ""
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Mandriva Online"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Mandriva Linux Control Center"
+msgid "%s Control Center"
+msgstr "%s Control Center"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Laai tans.... Net 'n oomblik"
@@ -808,9 +813,7 @@ msgstr ""
 msgid ""
 "Look at available updates and apply any fixes or upgrades to installed "
 "packages"
-msgstr ""
-"Mandriva Linux Update help met die opgradering van reeds geïnstalleerde "
-"sagteware"
+msgstr "%s Update help met die opgradering van reeds geïnstalleerde sagteware"
 
 #: ../control-center:456
 #, c-format
@@ -1135,12 +1138,12 @@ msgstr "Besig met die opstelling....."
 msgid "Configure installation server"
 msgstr "Menu Configuration Center"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
+msgid "Set up server for network installations of %s"
 msgstr ""
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, fuzzy, c-format
 msgid "Network Services"
 msgstr "netwerk koppelvlakke"
@@ -1536,17 +1539,17 @@ msgstr "/_Aangaande..."
 msgid "Cancel"
 msgstr "Kanselleer"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, fuzzy, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Mandriva Linux Control Center %s"
+msgid "%s Control Center %s [on %s]"
+msgstr "%s Control Center %s"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "Welkom by die Mandriva Linux Control Center"
+msgid "Welcome to the %s Control Center"
+msgstr "Welkom by die %s Control Center"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Fout"
@@ -1614,12 +1617,12 @@ msgstr "Addisionele temas"
 msgid "Get additional themes on www.damz.net"
 msgstr "Bekom nuwe temas by www.damz.net"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "Aangaande - Mandriva Linux Control Center"
+msgid "About - %s Control Center"
+msgstr "Aangaande - %s Control Center"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Skrywers: "
@@ -1664,11 +1667,11 @@ msgstr "<schalkc@ntaba.co.za>"
 msgid "Translator: "
 msgstr "Vertaler: "
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, fuzzy, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Mandriva Linux Control Center"
+msgid "%s %s (%s) Control Center"
+msgstr "%s Control Center"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
@@ -1989,9 +1992,6 @@ msgstr "Skermresolusie"
 #~ msgid "Country / Region"
 #~ msgstr "Land / Omgewing"
 
-#~ msgid "Mandriva Online"
-#~ msgstr "Mandriva Online"
-
 #, fuzzy
 #~ msgid "Control and configure network connections"
 #~ msgstr "Modemkonfigurasie"
diff --git a/po/am.po b/po/am.po
index c810beec..1cbcfb8c 100644
--- a/po/am.po
+++ b/po/am.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakconf\n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2004-04-19 13:59+0200\n"
 "Last-Translator: Alemayehu Gemeda <alemayehu@gmx.at>\n"
 "Language-Team: Amharic <LL@li.org>\n"
@@ -514,12 +514,17 @@ msgid ""
 "sure it all worked right."
 msgstr ""
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Mandriva Online"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "የMandriva Linux ቁጥጥር ማእከል"
+msgid "%s Control Center"
+msgstr "የ%s ቁጥጥር ማእከል"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "በመጫን ላይ...እባክዎ ይተብቁ"
@@ -1111,12 +1116,12 @@ msgstr ""
 msgid "Configure installation server"
 msgstr ""
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
+msgid "Set up server for network installations of %s"
 msgstr ""
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, fuzzy, c-format
 msgid "Network Services"
 msgstr "የመረብ መሳሪያ"
@@ -1508,17 +1513,17 @@ msgstr "/ስለ... (_A)"
 msgid "Cancel"
 msgstr "ተወው"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
+msgid "%s Control Center %s [on %s]"
 msgstr ""
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
+msgid "Welcome to the %s Control Center"
 msgstr ""
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "ስህተት"
@@ -1586,12 +1591,12 @@ msgstr ""
 msgid "Get additional themes on www.damz.net"
 msgstr ""
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
+msgid "About - %s Control Center"
 msgstr ""
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "ደራሲዎች፦"
@@ -1636,11 +1641,11 @@ msgstr "alemayehu@gmx.at"
 msgid "Translator: "
 msgstr ""
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, fuzzy, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "የMandriva Linux ቁጥጥር ማእከል"
+msgid "%s %s (%s) Control Center"
+msgstr "የ%s ቁጥጥር ማእከል"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
@@ -1933,9 +1938,6 @@ msgstr ""
 #~ msgid "Country / Region"
 #~ msgstr "ሀገር / አካባቢ"
 
-#~ msgid "Mandriva Online"
-#~ msgstr "Mandriva Online"
-
 #~ msgid "Updates"
 #~ msgstr "አሻሻዎች"
 
diff --git a/po/ar.po b/po/ar.po
index 8b4bfdcb..f10855a9 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakconf\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2005-03-10 01:32+0300\n"
 "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
 "Language-Team: Arabic <support@arabeyes.org>\n"
@@ -542,12 +542,17 @@ msgstr ""
 "و العديد من مختبري بيتا و مقرّري الخلل الغير معروفين و الذين ساعدوا في التحقق "
 "من أن كلّ شيء عمل جيداً."
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Mandriva Online"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
+msgid "%s Control Center"
 msgstr "مركز تحكّم ماندريبا لينكس"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "التحميل.... الرجاء الانتظار"
@@ -1140,12 +1145,12 @@ msgstr "تهيئة خادم الوب"
 msgid "Configure installation server"
 msgstr "تهيئة خادم التثبيت"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
+msgid "Set up server for network installations of %s"
 msgstr "إعداد خادم لتثبيتات ماندريبا لينكس الشبكيّة"
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "خدمات الشبكة"
@@ -1539,17 +1544,17 @@ msgstr "/_حول..."
 msgid "Cancel"
 msgstr "إلغاء"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
+msgid "%s Control Center %s [on %s]"
 msgstr "مركز تحكّم ماندريبا لينكس %s [على %s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
+msgid "Welcome to the %s Control Center"
 msgstr "أهلاً بك في مركز تحكم ماندريبا لينكس"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "خطأ"
@@ -1620,12 +1625,12 @@ msgstr "سمات إضافية "
 msgid "Get additional themes on www.damz.net"
 msgstr "احصل على السمات الإضافيّة على www.damz.net"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
+msgid "About - %s Control Center"
 msgstr "حول - مركز تحكّم ماندريبا لينكس"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "المؤلفون: "
@@ -1670,10 +1675,10 @@ msgstr "okhayat@yahoo.com"
 msgid "Translator: "
 msgstr "المترجم: "
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, fuzzy, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
+msgid "%s %s (%s) Control Center"
 msgstr "مركز تحكّم ماندريبا لينكس"
 
 #. -PO: here %s is eg: "1999-2008"
@@ -1980,9 +1985,6 @@ msgstr "استبانة الشاشة"
 #~ msgid "Country / Region"
 #~ msgstr "الدولة / الإقليم"
 
-#~ msgid "Mandriva Online"
-#~ msgstr "Mandriva Online"
-
 #~ msgid "Updates"
 #~ msgstr "التحديثات"
 
diff --git a/po/az.po b/po/az.po
index 46fadd67..d18c9edd 100644
--- a/po/az.po
+++ b/po/az.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakconf-az\n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2004-09-12 20:40+0300\n"
 "Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
 "Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n"
@@ -520,12 +520,17 @@ msgid ""
 "sure it all worked right."
 msgstr ""
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Mandriva Online"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Mandriva Linux İdarə Mərkəzi"
+msgid "%s Control Center"
+msgstr "%s İdarə Mərkəzi"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Yüklənir... Xahiş edirik, gözləyin"
@@ -1125,12 +1130,12 @@ msgstr "Veb vericisini quraşdır"
 msgid "Configure installation server"
 msgstr "Qurulum vericisi qurğuları"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
+msgid "Set up server for network installations of %s"
 msgstr ""
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, fuzzy, c-format
 msgid "Network Services"
 msgstr "Şəbəkə ara üzləri"
@@ -1524,17 +1529,17 @@ msgstr "/_Haqqında..."
 msgid "Cancel"
 msgstr "Ləğv Et"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Mandriva Linux İdarə Mərkəzi %s [%s üstündə]"
+msgid "%s Control Center %s [on %s]"
+msgstr "%s İdarə Mərkəzi %s [%s üstündə]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "Mandriva Linux İdarə Mərkəzinə Xoş Gəldiniz"
+msgid "Welcome to the %s Control Center"
+msgstr "%s İdarə Mərkəzinə Xoş Gəldiniz"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Xəta"
@@ -1602,12 +1607,12 @@ msgstr "Əlavə örtüklər"
 msgid "Get additional themes on www.damz.net"
 msgstr "www.damz.net ünvanından əlavə örtüklər ala bilərsiniz"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "Mandriva Linux İdarə Mərkəzi Haqqında"
+msgid "About - %s Control Center"
+msgstr "%s İdarə Mərkəzi Haqqında"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Müəlliflər:"
@@ -1656,11 +1661,11 @@ msgstr ""
 msgid "Translator: "
 msgstr "Tərcüməçilər:"
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, fuzzy, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Mandriva Linux İdarə Mərkəzi"
+msgid "%s %s (%s) Control Center"
+msgstr "%s İdarə Mərkəzi"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
@@ -1964,9 +1969,6 @@ msgstr "Ekran Həllediciliyi"
 #~ msgid "Country / Region"
 #~ msgstr "Ölkə / Bölgə"
 
-#~ msgid "Mandriva Online"
-#~ msgstr "Mandriva Online"
-
 #~ msgid "Updates"
 #~ msgstr "Yeniləmələr"
 
@@ -2087,8 +2089,8 @@ msgstr "Ekran Həllediciliyi"
 #~ msgid "Floppy"
 #~ msgstr "Floppi"
 
-#~ msgid "Mandriva Linux Control Center %s\n"
-#~ msgstr "Mandriva Linux İdarə Mərkəzi %s\n"
+#~ msgid "%s Control Center %s\n"
+#~ msgstr "%s İdarə Mərkəzi %s\n"
 
 #~ msgid "Zip"
 #~ msgstr "Zip"
diff --git a/po/be.po b/po/be.po
index 5ffeffef..9806451a 100644
--- a/po/be.po
+++ b/po/be.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakconf 0.96\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2000-08-19 08:45+0200\n"
 "Last-Translator: Alexander Bokovoy <ab@avilink.net>\n"
 "Language-Team: be <be@li.org>\n"
@@ -511,12 +511,17 @@ msgid ""
 "sure it all worked right."
 msgstr ""
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, c-format
+msgid "Mandriva Linux"
+msgstr ""
+
+#: ../control-center:101 ../control-center:108
 #, fuzzy, c-format
-msgid "Mandriva Linux Control Center"
+msgid "%s Control Center"
 msgstr "Цэнтар кіраваньня"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr ""
@@ -1108,12 +1113,12 @@ msgstr "Настройка IDE"
 msgid "Configure installation server"
 msgstr "Настройка IDE"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
+msgid "Set up server for network installations of %s"
 msgstr ""
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, fuzzy, c-format
 msgid "Network Services"
 msgstr "Сеткавыя інтэрфэйсы"
@@ -1505,17 +1510,17 @@ msgstr "/_Пра..."
 msgid "Cancel"
 msgstr "Адмена"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
+msgid "%s Control Center %s [on %s]"
 msgstr ""
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
+msgid "Welcome to the %s Control Center"
 msgstr ""
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Памылка"
@@ -1583,12 +1588,12 @@ msgstr ""
 msgid "Get additional themes on www.damz.net"
 msgstr ""
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
+msgid "About - %s Control Center"
 msgstr ""
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Аўтары: "
@@ -1633,10 +1638,10 @@ msgstr "greendeath@mail.ru"
 msgid "Translator: "
 msgstr ""
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, fuzzy, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
+msgid "%s %s (%s) Control Center"
 msgstr "Цэнтар кіраваньня"
 
 #. -PO: here %s is eg: "1999-2008"
diff --git a/po/bg.po b/po/bg.po
index 2807f58a..529fae2f 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakconf-bg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2005-04-08 11:50+0200\n"
 "Last-Translator: Hristo Simeonov Hristov <icobgr@abv.bg>\n"
 "Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
@@ -543,12 +543,17 @@ msgstr ""
 "И много безименни и незнайни бета тестери и изпращачи на доклади за грешки, "
 "които помагат да сме сигурни, че всичко работи както трябва."
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Mandriva Online"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Контролен център на Mandriva Linux"
+msgid "%s Control Center"
+msgstr "Контролен център на %s"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Зареждане... Моля почакайте"
@@ -1157,12 +1162,12 @@ msgstr "Настройване на уеб сървър"
 msgid "Configure installation server"
 msgstr "Конфигуриране на инсталационен сървър"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
-msgstr "Настройване на сървър за мрежово инсталиране на Mandriva Linux"
+msgid "Set up server for network installations of %s"
+msgstr "Настройване на сървър за мрежово инсталиране на %s"
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "Мрежови услуги"
@@ -1559,17 +1564,17 @@ msgstr "/_Относно..."
 msgid "Cancel"
 msgstr "Отказ"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Контролен център на Mandriva Linux %s [на %s]"
+msgid "%s Control Center %s [on %s]"
+msgstr "Контролен център на %s %s [на %s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "Добре дошли в контролен център на Mandriva Linux"
+msgid "Welcome to the %s Control Center"
+msgstr "Добре дошли в контролен център на %s"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Грешка"
@@ -1642,12 +1647,12 @@ msgstr "Допълнителни теми"
 msgid "Get additional themes on www.damz.net"
 msgstr "Свалете допълнителни теми от www.damz.net"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "Относно - Контролен център на Mandriva Linux"
+msgid "About - %s Control Center"
+msgstr "Относно - Контролен център на %s"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Автори:"
@@ -1696,11 +1701,11 @@ msgstr ""
 msgid "Translator: "
 msgstr "Преводач: "
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, fuzzy, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Контролен център на Mandriva Linux"
+msgid "%s %s (%s) Control Center"
+msgstr "Контролен център на %s"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
@@ -2006,9 +2011,6 @@ msgstr "Разделителна способност"
 #~ msgid "Country / Region"
 #~ msgstr "Страна / регион"
 
-#~ msgid "Mandriva Online"
-#~ msgstr "Mandriva Online"
-
 #~ msgid "Updates"
 #~ msgstr "Обновяване"
 
@@ -2364,19 +2366,19 @@ msgstr "Разделителна способност"
 #~ msgid "Manager Connection"
 #~ msgstr "Настройка на връзките"
 
-#~ msgid "Mandriva Linux Control Center %s"
+#~ msgid "%s Control Center %s"
 #~ msgstr "Мандрейклинукс контролен център %s"
 
-#~ msgid "Mandriva Linux Control Center %s\n"
+#~ msgid "%s Control Center %s\n"
 #~ msgstr "Мандрейклинукс контролен център %s\n"
 
 #~ msgid ""
-#~ "Mandriva Linux Control Center is Mandriva Linux's main configuration\n"
+#~ "%s 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 Mandriva Linux Control Center greatly\n"
+#~ "The tools accessed through the %s Control Center greatly\n"
 #~ "simplify the use of the system, notably by avoiding the use of the\n"
 #~ "evil command line."
 #~ msgstr ""
@@ -2531,7 +2533,7 @@ msgstr "Разделителна способност"
 #~ "файлът '%s' не бе намерен.\n"
 #~ "Опитайте да го инсталирате."
 
-#~ msgid "The place where you can configure your Mandriva Linux Box"
+#~ msgid "The place where you can configure your %s Box"
 #~ msgstr "Мястото ,където можете да конфигурирате Мандрейклинукс системата си"
 
 #~ msgid "Time"
diff --git a/po/bn.po b/po/bn.po
index cdf31d6e..b772a1ce 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Drakconf VERSION\n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2005-03-05 23:20+0600\n"
 "Last-Translator: Jamil Ahmed <jamil@bengalinux.org>\n"
 "Language-Team: Bangla <mdk-translation@bengalinux.org>\n"
@@ -549,12 +549,17 @@ msgstr ""
 "এবং অনেক অজানা এবং অচেনা বিটা-টেস্টার এবং বাগ-রিপোর্টার যাদের সাহায্যে এই কাজ "
 "সঠিকভাবে সম্পন্ন হয়েছে। "
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "ম্যান্ড্রিব অনলাইন"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
+msgid "%s Control Center"
 msgstr "ম্যান্ড্রিব লিনাক্স নিয়ন্ত্রন (control) সেন্টার"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "লোড করা হচ্ছে... দয়া করে অপেক্ষা করুন"
@@ -1155,12 +1160,12 @@ msgstr "ওয়েব সার্ভার সেট আপ করুন"
 msgid "Configure installation server"
 msgstr "ইনস্টলেশন সার্ভার কনফিগার করুন"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
+msgid "Set up server for network installations of %s"
 msgstr "ম্যান্ড্রিব লিনাক্‌সের নেটওয়ার্ক ইনস্টলের জন্য সার্ভার সেট আপ করুন"
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "নেটওয়ার্ক সার্ভিস সমুহ"
@@ -1555,17 +1560,17 @@ msgstr "/_পরিচিতি..."
 msgid "Cancel"
 msgstr "বাতিল"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
+msgid "%s Control Center %s [on %s]"
 msgstr "ম্যান্ড্রিব লিনাক্স নিয়ন্ত্রন (control) সেন্টার %s [%s -এ]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
+msgid "Welcome to the %s Control Center"
 msgstr "ম্যান্ড্রিব লিনাক্স নিয়ন্ত্রন (control) সেন্টারে আপনাকে স্বাগতম"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "ত্রুটি"
@@ -1637,12 +1642,12 @@ msgid "Get additional themes on www.damz.net"
 msgstr "www.damz.net -থেকে আরো থীম পেতে পারেন"
 
 # কেন্দ্র
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
+msgid "About - %s Control Center"
 msgstr "পরিচিতি - ম্যান্ড্রিব লিনাক্স নিয়ন্ত্রন সেন্টার"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "লেখকবৃন্দ: "
@@ -1695,10 +1700,10 @@ msgstr ""
 msgid "Translator: "
 msgstr "অনুবাদক: "
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, fuzzy, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
+msgid "%s %s (%s) Control Center"
 msgstr "ম্যান্ড্রিব লিনাক্স নিয়ন্ত্রন (control) সেন্টার"
 
 #. -PO: here %s is eg: "1999-2008"
@@ -2015,9 +2020,6 @@ msgstr "পর্দার রেজ্যুলিউসন"
 #~ msgid "Country / Region"
 #~ msgstr "দেশ / স্থান"
 
-#~ msgid "Mandriva Online"
-#~ msgstr "ম্যান্ড্রিব অনলাইন"
-
 #~ msgid "Updates"
 #~ msgstr "আপডেট"
 
@@ -2161,5 +2163,5 @@ msgstr "পর্দার রেজ্যুলিউসন"
 #~ msgid "Zip"
 #~ msgstr "জিপ (Zip)"
 
-#~ msgid "Mandriva Linux Control Center %s\n"
+#~ msgid "%s Control Center %s\n"
 #~ msgstr "ম্যান্ড্রিব লিনাক্স নিয়ন্ত্রন সেন্টার %s\n"
diff --git a/po/br.po b/po/br.po
index 359ad8a4..03fb8e5b 100644
--- a/po/br.po
+++ b/po/br.po
@@ -1,4 +1,4 @@
-# Mandriva Linux Control Center e brezhoneg
+# %s Control Center e brezhoneg
 # Copyright (C) 2002 Mandriva
 # Thierry Vignaud <tvignaud@mandrakesoft.com>, 2002
 #
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakconf 0.96\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2008-03-07 16:43+0100\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: Brezhoneg <LL@li.org>\n"
@@ -516,12 +516,17 @@ msgid ""
 "sure it all worked right."
 msgstr ""
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Mandriva Online"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Kreizenn ren Mandriva Linux"
+msgid "%s Control Center"
+msgstr "Kreizenn ren %s"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "O kargañ... Gortozit mar plij"
@@ -1114,12 +1119,12 @@ msgstr "Kefluniañ ur servijer web"
 msgid "Configure installation server"
 msgstr "Kefluniañ servijer ar staliadur"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
-msgstr "Kefluniañ ur servijer staliadur rouedad evit Mandriva Linux"
+msgid "Set up server for network installations of %s"
+msgstr "Kefluniañ ur servijer staliadur rouedad evit %s"
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "Servijoù Rouedad"
@@ -1511,17 +1516,17 @@ msgstr "/_A-brepoz..."
 msgid "Cancel"
 msgstr "Nullañ"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Kreizenn ren Mandriva Linux %s [war %s]"
+msgid "%s Control Center %s [on %s]"
+msgstr "Kreizenn ren %s %s [war %s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "Degemer e kreizenn ren Mandriva Linux"
+msgid "Welcome to the %s Control Center"
+msgstr "Degemer e kreizenn ren %s"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Fazi"
@@ -1589,12 +1594,12 @@ msgstr "Gizioù ouzhpenn"
 msgid "Get additional themes on www.damz.net"
 msgstr "Tapout gizioù ouzhpenn war www.damz.net"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "A-brepoz - Kreizenn ren Mandriva Linux"
+msgid "About - %s Control Center"
+msgstr "A-brepoz - Kreizenn ren %s"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Obererour: "
@@ -1639,11 +1644,11 @@ msgstr "<tvignaud@mandrakesoft.com>"
 msgid "Translator: "
 msgstr "Distroer :"
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Kreizenn ren %s (%s) Mandriva Linux"
+msgid "%s %s (%s) Control Center"
+msgstr "Kreizenn ren %s (%s) %s"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
@@ -1955,9 +1960,6 @@ msgstr "Spister ar skramm"
 #~ msgid "Country / Region"
 #~ msgstr "Bro / Rannvro"
 
-#~ msgid "Mandriva Online"
-#~ msgstr "Mandriva Online"
-
 #~ msgid "Updates"
 #~ msgstr "Bremañaat"
 
@@ -2105,8 +2107,8 @@ msgstr "Spister ar skramm"
 #~ msgid "Manager Connection"
 #~ msgstr "Meran liammoù"
 
-#~ msgid "Mandriva Linux Control Center %s\n"
-#~ msgstr "Kreizenn ren Mandriva Linux %s \n"
+#~ msgid "%s Control Center %s\n"
+#~ msgstr "Kreizenn ren %s %s \n"
 
 #~ msgid "Monitor Connection"
 #~ msgstr "Evezhiañ liammoù"
diff --git a/po/bs.po b/po/bs.po
index 92572d62..25edb4ff 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakconf-bs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2006-09-09 13:00+0200\n"
 "Last-Translator: Vedran Ljubovic <vljubovic@smartnet.ba>\n"
 "Language-Team: Bosnian <lokal@linux.org.ba>\n"
@@ -543,12 +543,17 @@ msgstr ""
 "I mnogi bezimeni i nepoznati beta testeri i prijavljivači bugova koji su "
 "pomogli da sve radi kako treba."
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Mandriva Online"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
+msgid "%s Control Center"
 msgstr "Mandriva Kontrolni centar"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Učitavam... Molim sačekajte."
@@ -1154,12 +1159,12 @@ msgstr "Podesite web server"
 msgid "Configure installation server"
 msgstr "Podesi server za instalaciju"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
-msgstr "Podesite server za mrežne instalacije Mandriva Linuxa"
+msgid "Set up server for network installations of %s"
+msgstr "Podesite server za mrežne instalacije %sa"
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "Mrežni servisi"
@@ -1554,17 +1559,17 @@ msgstr "/O p_rogramu..."
 msgid "Cancel"
 msgstr "Odustani"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Mandriva Linux kontrolni centar %s [na %s]"
+msgid "%s Control Center %s [on %s]"
+msgstr "%s kontrolni centar %s [na %s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "Dobro došli u Mandriva Linux Kontrolni centar"
+msgid "Welcome to the %s Control Center"
+msgstr "Dobro došli u %s Kontrolni centar"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Greška"
@@ -1635,12 +1640,12 @@ msgstr "Dodatne teme"
 msgid "Get additional themes on www.damz.net"
 msgstr "Dodatne teme možete naći na www.damz.net"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "O - Mandriva Linux Kontrolnom centru"
+msgid "About - %s Control Center"
+msgstr "O - %s Kontrolnom centru"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Autori: "
@@ -1685,10 +1690,10 @@ msgstr "<vljubovic@smartnet.ba>"
 msgid "Translator: "
 msgstr "Prevodilac: "
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, fuzzy, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
+msgid "%s %s (%s) Control Center"
 msgstr "Mandriva Kontrolni centar"
 
 #. -PO: here %s is eg: "1999-2008"
@@ -2001,9 +2006,6 @@ msgstr "Rezolucija ekrana"
 #~ msgid "Country / Region"
 #~ msgstr "Država / Oblast"
 
-#~ msgid "Mandriva Online"
-#~ msgstr "Mandriva Online"
-
 #~ msgid "Updates"
 #~ msgstr "Ažuriranje sistema"
 
diff --git a/po/ca.po b/po/ca.po
index 54306cf9..909f36a2 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakconf-ca\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2005-10-23 03:46+0000\n"
 "Last-Translator: Ticià Sala <tsala@pie.xtec.es>\n"
 "Language-Team:  <ca@li.org>\n"
@@ -543,12 +543,17 @@ msgstr ""
 "I els provadors i informadors d'errors sense nom que han ajudat a fer que "
 "tot funcioni correctament. "
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Mandriva Online"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Centre de Control de Mandriva Linux"
+msgid "%s Control Center"
+msgstr "Centre de Control de %s"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "S'està carregant... Si us plau, espereu"
@@ -1158,12 +1163,12 @@ msgstr "Configura un servidor web"
 msgid "Configure installation server"
 msgstr "Configura el servidor d'instal·lació"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
-msgstr "Configura un servidor per instal·lacions en xarxa de Mandriva Linux"
+msgid "Set up server for network installations of %s"
+msgstr "Configura un servidor per instal·lacions en xarxa de %s"
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "Serveis de xarxa"
@@ -1562,17 +1567,17 @@ msgstr "/_Quant a..."
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Centre de control de Mandriva Linux %s [a %s]"
+msgid "%s Control Center %s [on %s]"
+msgstr "Centre de control de %s %s [a %s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "Benvingut al centre de control de Mandriva Linux"
+msgid "Welcome to the %s Control Center"
+msgstr "Benvingut al centre de control de %s"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Error"
@@ -1643,12 +1648,12 @@ msgstr "Temes addicionals"
 msgid "Get additional themes on www.damz.net"
 msgstr "Aconseguiu temes addicionals a www.damz.net"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "Quant a - Centre de control de Mandriva Linux"
+msgid "About - %s Control Center"
+msgstr "Quant a - Centre de control de %s"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Autors: "
@@ -1693,11 +1698,11 @@ msgstr "<linux@softcatala.org>,astals11@terra.es"
 msgid "Translator: "
 msgstr "Traductor: "
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, fuzzy, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Centre de Control de Mandriva Linux"
+msgid "%s %s (%s) Control Center"
+msgstr "Centre de Control de %s"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
@@ -2003,9 +2008,6 @@ msgstr "Resolució de pantalla"
 #~ msgid "Country / Region"
 #~ msgstr "País / Regió"
 
-#~ msgid "Mandriva Online"
-#~ msgstr "Mandriva Online"
-
 #~ msgid "Updates"
 #~ msgstr "Actualitzacions"
 
diff --git a/po/cs.po b/po/cs.po
index b2ffa061..425d3ca3 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: cs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2008-03-20 21:02+0100\n"
 "Last-Translator: Michal Bukovjan <bukm@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -549,12 +549,17 @@ msgstr ""
 "A mnoho dalších neznámých a nejmenovaných beta testerů a těch, kteří hlásili "
 "chyby, kteří dohlíželi na to, že vše bude fungovat v pořádku."
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Přispěvatelé distribuce Mandriva Linux"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Ovládací centrum Mandriva Linuxu"
+msgid "%s Control Center"
+msgstr "Ovládací centrum %su"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Nahrávám... Čekejte prosím"
@@ -1154,12 +1159,12 @@ msgstr "Nastavit webový server"
 msgid "Configure installation server"
 msgstr "Upravit nastavení instalačního serveru"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
-msgstr "Nastavit server pro síťovou instalaci Mandriva Linuxu"
+msgid "Set up server for network installations of %s"
+msgstr "Nastavit server pro síťovou instalaci %su"
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "Síťové služby"
@@ -1555,17 +1560,17 @@ msgstr "/O _aplikaci..."
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Ovládací centrum Mandriva Linuxu %s [na %s]"
+msgid "%s Control Center %s [on %s]"
+msgstr "Ovládací centrum %su %s [na %s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "Vítá vás Ovládací centrum Mandriva Linuxu"
+msgid "Welcome to the %s Control Center"
+msgstr "Vítá vás Ovládací centrum %su"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Chyba"
@@ -1636,12 +1641,12 @@ msgstr "Doplňková témata vzhledu"
 msgid "Get additional themes on www.damz.net"
 msgstr "Získat další témata vzhledu z www.damz.net"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "O aplikaci Ovládací centrum Mandriva Linuxu"
+msgid "About - %s Control Center"
+msgstr "O aplikaci Ovládací centrum %su"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Autoři: "
@@ -1692,11 +1697,11 @@ msgstr ""
 msgid "Translator: "
 msgstr "Překladatel: "
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Ovládací centrum Mandriva Linuxu %s (%s)"
+msgid "%s %s (%s) Control Center"
+msgstr "Ovládací centrum %su %s (%s)"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
diff --git a/po/cy.po b/po/cy.po
index 4c8254db..f0f3835d 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakconf-cy\n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2008-03-11 22:37+0100\n"
 "Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
 "Language-Team: Cymraeg/Welsh <cy@li.org>\n"
@@ -537,12 +537,17 @@ msgstr ""
 "A llawer o brofwyr beta ac adroddwyr gwallau dienw ac anhysbys sydd wedi "
 "cynorthwyo i'w wneud yn siŵr ei fod yn gweithio'n iawn."
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Cyfraniadau Mandriva Linux"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Canolfan Rheoli Mandriva Linux"
+msgid "%s Control Center"
+msgstr "Canolfan Rheoli %s"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Arhoswch...Llwytho"
@@ -1140,12 +1145,12 @@ msgstr "Gosod gweinydd gwe"
 msgid "Configure installation server"
 msgstr "Gosodiad Defnyddiwr Gweinydd"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
-msgstr "Gosod gweinydd ar gyfer gosodiad rhwydwaith Mandriva Linux"
+msgid "Set up server for network installations of %s"
+msgstr "Gosod gweinydd ar gyfer gosodiad rhwydwaith %s"
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "Gwasanaethau Rhwydweithiau"
@@ -1539,17 +1544,17 @@ msgstr "/_Ynghylch..."
 msgid "Cancel"
 msgstr "Diddymu"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Canolfan Rheoli Mandriva Linux %s (ar %s)"
+msgid "%s Control Center %s [on %s]"
+msgstr "Canolfan Rheoli %s %s (ar %s)"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "Croeso i Ganolfan Rheoli Mandriva Linux"
+msgid "Welcome to the %s Control Center"
+msgstr "Croeso i Ganolfan Rheoli %s"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Gwall"
@@ -1620,12 +1625,12 @@ msgstr "Themâu ychwanegol"
 msgid "Get additional themes on www.damz.net"
 msgstr "Estyn themâu ychwanegol o www.damz.net"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "Ynghylch - Canolfan Rheoli Mandriva Linux"
+msgid "About - %s Control Center"
+msgstr "Ynghylch - Canolfan Rheoli %s"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Awdur: "
@@ -1670,11 +1675,11 @@ msgstr "<post@meddal.com>"
 msgid "Translator: "
 msgstr "Cyfieithydd"
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Canolfan Rheoli Mandriva Linux %s (%s)"
+msgid "%s %s (%s) Control Center"
+msgstr "Canolfan Rheoli %s %s (%s)"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
diff --git a/po/da.po b/po/da.po
index 02bf2236..7f320be1 100644
--- a/po/da.po
+++ b/po/da.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: da\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2008-03-20 14:23+0100\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: dansk <dansk@dansk-gruppen.dk>\n"
@@ -547,12 +547,17 @@ msgstr ""
 "Og mange unævnte og ukendte beta-testere og fejlrapportører som hjalp med at "
 "sikre at alt virkede. "
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Bidragsydere til Mandriva Linux"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Mandriva Linux kontrolcenter"
+msgid "%s Control Center"
+msgstr "%s kontrolcenter"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Indlæser..., vent venligst"
@@ -570,7 +575,8 @@ msgstr "Identifikation"
 
 #: ../control-center:153
 #, c-format
-msgid "Select the authentication method (local, NIS, LDAP, Windows Domain, ...)"
+msgid ""
+"Select the authentication method (local, NIS, LDAP, Windows Domain, ...)"
 msgstr "Vælg bekræftelsesmetoden (lokal, NIS, LDAP, Windows Domain, ...)"
 
 #: ../control-center:162
@@ -692,13 +698,16 @@ msgstr "Opsætning af personlig brandmur"
 
 #: ../control-center:295
 #, c-format
-msgid "Set up a personal firewall in order to protect the computer and the network"
-msgstr "Opsætning af en personlig brandmur til beskyttelse af maskinen og netværket"
+msgid ""
+"Set up a personal firewall in order to protect the computer and the network"
+msgstr ""
+"Opsætning af en personlig brandmur til beskyttelse af maskinen og netværket"
 
 #: ../control-center:304 ../control-center:305
 #, c-format
 msgid "Manage, add and remove fonts. Import Windows(TM) fonts"
-msgstr "Administér, tilføj og fjern skrifttyper. Importér Windows (TM)-skrifttyper"
+msgstr ""
+"Administér, tilføj og fjern skrifttyper. Importér Windows (TM)-skrifttyper"
 
 #: ../control-center:314 ../control-center:315
 #, c-format
@@ -1135,7 +1144,8 @@ msgstr "Administrér Samba-fildeling"
 #: ../control-center:806
 #, c-format
 msgid "Manage, create special share, create public/user share"
-msgstr "Administrér og opret special-fildeling, opret offentlig/bruger-fildeling"
+msgstr ""
+"Administrér og opret special-fildeling, opret offentlig/bruger-fildeling"
 
 #: ../control-center:808
 #, c-format
@@ -1152,12 +1162,12 @@ msgstr "Opsætning af en web-server"
 msgid "Configure installation server"
 msgstr "Konfigurér installationsserver"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
-msgstr "Opsætning af server for installation aff Mandriva Linux over netværk"
+msgid "Set up server for network installations of %s"
+msgstr "Opsætning af server for installation aff %s over netværk"
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "Netværkstjenester"
@@ -1199,8 +1209,10 @@ msgstr "Konfigurér tid"
 
 #: ../control-center:837
 #, c-format
-msgid "Set the time of the server to be synchronized with an external time server"
-msgstr "Sæt tiden for serveren til at blive synkroniseret med en ekstern tids-server"
+msgid ""
+"Set the time of the server to be synchronized with an external time server"
+msgstr ""
+"Sæt tiden for serveren til at blive synkroniseret med en ekstern tids-server"
 
 #: ../control-center:839 ../control-center:840
 #, c-format
@@ -1292,7 +1304,8 @@ msgstr "Administration via nettet"
 #: ../control-center:918
 #, c-format
 msgid "Click here if you want to configure a remote box via Web interface"
-msgstr "Klik her hvis du nsker at konfigurere en ekstern maskine via web-grnseflade"
+msgstr ""
+"Klik her hvis du nsker at konfigurere en ekstern maskine via web-grnseflade"
 
 #: ../control-center:931
 #, c-format
@@ -1552,17 +1565,17 @@ msgstr "/_Om..."
 msgid "Cancel"
 msgstr "Annullér"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Mandriva Linux kontrolcenter %s [på %s]"
+msgid "%s Control Center %s [on %s]"
+msgstr "%s kontrolcenter %s [på %s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "Velkommen til Mandriva Linux kontrolcentret"
+msgid "Welcome to the %s Control Center"
+msgstr "Velkommen til %s kontrolcentret"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Fejl"
@@ -1633,12 +1646,12 @@ msgstr "Yderligere temaer"
 msgid "Get additional themes on www.damz.net"
 msgstr "Hent yderligere temaer på www.damz.net"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "Om - Mandriva Linux kontrolcenter"
+msgid "About - %s Control Center"
+msgstr "Om - %s kontrolcenter"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Forfattere: "
@@ -1683,11 +1696,11 @@ msgstr "<keld@dkuug.dk>"
 msgid "Translator: "
 msgstr "Oversætter: Keld Simonsen <keld@dkuug.dk>"
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Mandriva Linux %s (%s) kontrolcenter"
+msgid "%s %s (%s) Control Center"
+msgstr "%s %s (%s) kontrolcenter"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
@@ -1932,4 +1945,3 @@ msgstr "Skærm"
 #: ../data/XFDrake-Resolution.desktop.in.h:1
 msgid "Screen Resolution"
 msgstr "Skærmopløsning"
-
diff --git a/po/de.po b/po/de.po
index 0fa79651..2fb37f53 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,6 +1,6 @@
 # translation of de.po to deutsch
 # translation of de.po to
-# german translation file of the Mandriva Linux Control-Center.
+# german translation file of the %s Control-Center.
 # Copyright (C) 2000,2001,2002,2003 Mandriva
 #
 # Stefan Siegel <siegel@linux-mandrake.com>, 2000,2001,2002,2003.
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakconf\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2008-03-27 14:44+0100\n"
 "Last-Translator: Nicolas Bauer <rastafarii@mandrivauser.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
@@ -43,8 +43,8 @@ msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
 "Mandriva tools"
 msgstr ""
-"Intensiver Paketneubau und Säuberung, Spiele, Sparc Portierung, Code Überprüfung "
-"bei Mandrivatools"
+"Intensiver Paketneubau und Säuberung, Spiele, Sparc Portierung, Code "
+"Überprüfung bei Mandrivatools"
 
 #: ../contributors.pl:13
 #, c-format
@@ -239,9 +239,9 @@ msgid ""
 "sk-i18n, contributed several packages, openldap testing and integration, "
 "bind-sdb-ldap, several years of using cooker and bug hunting, etc..."
 msgstr ""
-"sk-i18n, Bereitstellen verschiedener Pakete, openldap Test und "
-"Integration, bind-sdb-ldap, einige Jahre an Erfahrung in der Benutzung von "
-"Cooker und Fehlersuche, etc..."
+"sk-i18n, Bereitstellen verschiedener Pakete, openldap Test und Integration, "
+"bind-sdb-ldap, einige Jahre an Erfahrung in der Benutzung von Cooker und "
+"Fehlersuche, etc..."
 
 #: ../contributors.pl:30
 #, c-format
@@ -552,12 +552,17 @@ msgstr ""
 "Und viele ungenannte und unbekannte Beta-Tester und Fehlermelder, die halfen "
 "sicherzustellen, dass alles gut arbeitet."
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Mandriva Linux Beitragende"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Mandriva Linux-Kontrollzentrum"
+msgid "%s Control Center"
+msgstr "%s-Kontrollzentrum"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Bitte warten, ich lade ..."
@@ -593,8 +598,7 @@ msgstr "Auto-Installationsdiskette erstellen"
 #: ../control-center:172
 #, c-format
 msgid "Set up autologin to automatically log in"
-msgstr ""
-"Autologin einrichten zur automatischen Anmeldung"
+msgstr "Autologin einrichten zur automatischen Anmeldung"
 
 #: ../control-center:173
 #, c-format
@@ -763,8 +767,7 @@ msgstr "Softwareverwaltung"
 #: ../control-center:366
 #, c-format
 msgid "Advanced setup for network interfaces and firewall"
-msgstr ""
-"Erweiterte Einstellungen für Netzwerkschnittstellen und Firewall"
+msgstr "Erweiterte Einstellungen für Netzwerkschnittstellen und Firewall"
 
 #: ../control-center:367
 #, c-format
@@ -816,7 +819,8 @@ msgstr "Rekonfigurieren einer Netzwerkschnittstelle"
 #, c-format
 msgid "Upload your configuration to get information on upgrades"
 msgstr ""
-"Laden Sie Ihre Konfiguration hoch damit Sie über Aktualisierungen informiert werden"
+"Laden Sie Ihre Konfiguration hoch damit Sie über Aktualisierungen informiert "
+"werden"
 
 #: ../control-center:426
 #, c-format
@@ -1000,7 +1004,8 @@ msgstr "Kabellose Verbindung"
 #: ../control-center:618
 #, c-format
 msgid "Access Windows (SMB) shared drives and directories"
-msgstr "Zugang zu gemeinsam genutzen Windows-Laufwerken und Verzeichnissen (SMB)"
+msgstr ""
+"Zugang zu gemeinsam genutzen Windows-Laufwerken und Verzeichnissen (SMB)"
 
 #: ../control-center:619
 #, c-format
@@ -1010,7 +1015,9 @@ msgstr "Einstellungen für SAMBA (Windows Netzwerkordner)"
 #: ../control-center:628
 #, c-format
 msgid "Share drives and directories with Windows (SMB) systems"
-msgstr "Gemeinsame Nutzung von Laufwerken und Verzeichnissen mit Windows-Sytemen (SMB)"
+msgstr ""
+"Gemeinsame Nutzung von Laufwerken und Verzeichnissen mit Windows-Sytemen "
+"(SMB)"
 
 #: ../control-center:629
 #, c-format
@@ -1025,9 +1032,7 @@ msgstr "Scanner einrichten"
 #: ../control-center:648
 #, c-format
 msgid "Set up security level and audit"
-msgstr ""
-"Setzen der Sicherheitsstufe und der "
-"Sicherheitsüberprüfung"
+msgstr "Setzen der Sicherheitsstufe und der Sicherheitsüberprüfung"
 
 #: ../control-center:649
 #, c-format
@@ -1059,8 +1064,7 @@ msgstr "Paketquellen verwalten"
 #: ../control-center:679
 #, c-format
 msgid "Select from where software packages are downloaded "
-msgstr ""
-"Auswählen von wo Softwarepakete heruntergeladen werden"
+msgstr "Auswählen von wo Softwarepakete heruntergeladen werden"
 
 #. -PO: here power means electrical power
 #. -PO: UPS==Uninterruptible power supply
@@ -1176,12 +1180,12 @@ msgstr "Einrichten eines Webservers"
 msgid "Configure installation server"
 msgstr "Installations-Server konfigurieren"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
-msgstr "Einrichten eines Servers zur Netzwerkinstallation von Mandriva Linux"
+msgid "Set up server for network installations of %s"
+msgstr "Einrichten eines Servers zur Netzwerkinstallation von %s"
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "Netzwerkschnittstellen"
@@ -1581,17 +1585,17 @@ msgstr "/_Über ..."
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Mandriva Linux Kontrollzentrum %s [ auf %s]"
+msgid "%s Control Center %s [on %s]"
+msgstr "%s Kontrollzentrum %s [ auf %s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "Willkommen im Mandriva Linux Kontrollzentrum"
+msgid "Welcome to the %s Control Center"
+msgstr "Willkommen im %s Kontrollzentrum"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Fehler"
@@ -1663,12 +1667,12 @@ msgstr "Zusätzliche Designs"
 msgid "Get additional themes on www.damz.net"
 msgstr "Zusätzliche Designs von www.damz.net holen"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "Über - Mandriva Linux Kontrollzentrum"
+msgid "About - %s Control Center"
+msgstr "Über - %s Kontrollzentrum"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Autoren: "
@@ -1713,11 +1717,11 @@ msgstr "rastafarii@mandrivauser.de"
 msgid "Translator: "
 msgstr "Übersetzer: "
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Mandriva Linux %s (%s) Kontrollzentrum"
+msgid "%s %s (%s) Control Center"
+msgstr "%s %s (%s) Kontrollzentrum"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
diff --git a/po/drakconf.pot b/po/drakconf.pot
index 87bf3a0b..a3177092 100644
--- a/po/drakconf.pot
+++ b/po/drakconf.pot
@@ -6,13 +6,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8-bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #: ../contributors.pl:11
 #, c-format
@@ -515,12 +516,17 @@ msgid ""
 "sure it all worked right."
 msgstr ""
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
 #, c-format
-msgid "Mandriva Linux Control Center"
+msgid "Mandriva Linux"
 msgstr ""
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:101 ../control-center:108
+#, c-format
+msgid "%s Control Center"
+msgstr ""
+
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr ""
@@ -1112,12 +1118,12 @@ msgstr ""
 msgid "Configure installation server"
 msgstr ""
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
+msgid "Set up server for network installations of %s"
 msgstr ""
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr ""
@@ -1509,17 +1515,17 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
+msgid "%s Control Center %s [on %s]"
 msgstr ""
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
+msgid "Welcome to the %s Control Center"
 msgstr ""
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr ""
@@ -1587,12 +1593,12 @@ msgstr ""
 msgid "Get additional themes on www.damz.net"
 msgstr ""
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
+msgid "About - %s Control Center"
 msgstr ""
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr ""
@@ -1637,10 +1643,10 @@ msgstr ""
 msgid "Translator: "
 msgstr ""
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
+msgid "%s %s (%s) Control Center"
 msgstr ""
 
 #. -PO: here %s is eg: "1999-2008"
diff --git a/po/el.po b/po/el.po
index 5921e763..8dfdbfb4 100644
--- a/po/el.po
+++ b/po/el.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakconf-el\n"
-"POT-Creation-Date: 2007-03-07 20:14+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2008-05-23 02:05+0200\n"
 "Last-Translator: nikos papadopoulos <231036448@freemail.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -26,16 +26,19 @@ msgstr ""
 msgid "Packagers"
 msgstr "Δημιουργοί πακέτων"
 
-#: ../contributors.pl:12
-#: ../contributors.pl:40
+#: ../contributors.pl:12 ../contributors.pl:40
 #, c-format
 msgid "Per Oyvind Karlsen"
 msgstr "Per Oyvind Karlsen"
 
 #: ../contributors.pl:12
 #, c-format
-msgid "massive packages rebuilding and cleaning, games, sparc port, proofreading of Mandriva tools"
-msgstr "μαζικό ξαναχτίσιμο και καθάρισμα πακέτων , παιχνίδια, sparc port, έλεγχος και διόρθωση σφαλμάτων στα εργαλεία της Mandriva"
+msgid ""
+"massive packages rebuilding and cleaning, games, sparc port, proofreading of "
+"Mandriva tools"
+msgstr ""
+"μαζικό ξαναχτίσιμο και καθάρισμα πακέτων , παιχνίδια, sparc port, έλεγχος "
+"και διόρθωση σφαλμάτων στα εργαλεία της Mandriva"
 
 #: ../contributors.pl:13
 #, c-format
@@ -74,19 +77,26 @@ msgstr "Ben Reser"
 
 #: ../contributors.pl:16
 #, c-format
-msgid "updated nc with debian patches, fixed some perl packages, dnotify startup script, urpmc, hddtemp, wipe, etc..."
-msgstr "ενημέρωση του nc με βελτιώσεις κώδικα (patches) στο debian, διόρθωση μερικών πακέτων perl, σενάριο εκκίνησης dnotify, urpmc, hddtemp, wipe, κλπ..."
+msgid ""
+"updated nc with debian patches, fixed some perl packages, dnotify startup "
+"script, urpmc, hddtemp, wipe, etc..."
+msgstr ""
+"ενημέρωση του nc με βελτιώσεις κώδικα (patches) στο debian, διόρθωση μερικών "
+"πακέτων perl, σενάριο εκκίνησης dnotify, urpmc, hddtemp, wipe, κλπ..."
 
-#: ../contributors.pl:17
-#: ../contributors.pl:42
+#: ../contributors.pl:17 ../contributors.pl:42
 #, c-format
 msgid "Thomas Backlund"
 msgstr "Thomas Backlund"
 
 #: ../contributors.pl:17
 #, c-format
-msgid "\"deep and broad\" kernel work (many new patches before integration in official kernel)"
-msgstr "\"πολλή\"  δουλειά στον πυρήνα  (πολλές βελτιώσεις κώδικα (patches) πριν την ενσωμάτωση στον επίσημο πυρήνα)"
+msgid ""
+"\"deep and broad\" kernel work (many new patches before integration in "
+"official kernel)"
+msgstr ""
+"\"πολλή\"  δουλειά στον πυρήνα  (πολλές βελτιώσεις κώδικα (patches) πριν την "
+"ενσωμάτωση στον επίσημο πυρήνα)"
 
 #: ../contributors.pl:18
 #, c-format
@@ -96,7 +106,9 @@ msgstr "Svetoslav Slavtchev"
 #: ../contributors.pl:18
 #, c-format
 msgid "kernel work (audio- and video-related patches)"
-msgstr "δουλειά πάνω στον πυρήνα (kernel) (βελτιώσεις κώδικα (patches) που σχετίζονται με τον ήχο και το βίντεο)"
+msgstr ""
+"δουλειά πάνω στον πυρήνα (kernel) (βελτιώσεις κώδικα (patches) που "
+"σχετίζονται με τον ήχο και το βίντεο)"
 
 #: ../contributors.pl:19
 #, c-format
@@ -106,7 +118,9 @@ msgstr "Danny Tholen"
 #: ../contributors.pl:19
 #, c-format
 msgid "patches to some packages, kfiresaver, xwine. ppc kernel-benh."
-msgstr "βελτιώσεις κώδικα (patches) σε κάποια πακέτα, kfiresaver, xwine. ppc kernel-benh."
+msgstr ""
+"βελτιώσεις κώδικα (patches) σε κάποια πακέτα, kfiresaver, xwine. ppc kernel-"
+"benh."
 
 #: ../contributors.pl:20
 #, c-format
@@ -115,8 +129,14 @@ msgstr "Buchan Milne"
 
 #: ../contributors.pl:20
 #, c-format
-msgid "Samba 3.0 (prerelease) that co-exists with Samba 2.2.x, Samba-2.2.x, GIS software (grass, mapserver), cursor_themes collection, misc server-side contributions"
-msgstr "Samba 3.0 (πρώιμη έκδοση)  που συνυπάρχει με το Samba 2.2.x, Samba-2.2.x, λογισμικό GIS  (grass, mapserver), συλλογή cursor_themes (θέματα δείκτη ποντικιού), διάφορες συνεισφορές στην πλευρά του εξυπηρετητή"
+msgid ""
+"Samba 3.0 (prerelease) that co-exists with Samba 2.2.x, Samba-2.2.x, GIS "
+"software (grass, mapserver), cursor_themes collection, misc server-side "
+"contributions"
+msgstr ""
+"Samba 3.0 (πρώιμη έκδοση)  που συνυπάρχει με το Samba 2.2.x, Samba-2.2.x, "
+"λογισμικό GIS  (grass, mapserver), συλλογή cursor_themes (θέματα δείκτη "
+"ποντικιού), διάφορες συνεισφορές στην πλευρά του εξυπηρετητή"
 
 #: ../contributors.pl:21
 #, c-format
@@ -125,8 +145,12 @@ msgstr "Goetz Waschk"
 
 #: ../contributors.pl:21
 #, c-format
-msgid "xine, totem, gstreamer, mplayer, vlc, vcdimager, xmms and plugins gnome-python, rox desktop"
-msgstr "xine, totem, gstreamer, mplayer, vlc, vcdimager, xmms και πρόσθετα (plugins) gnome-python, rox desktop"
+msgid ""
+"xine, totem, gstreamer, mplayer, vlc, vcdimager, xmms and plugins gnome-"
+"python, rox desktop"
+msgstr ""
+"xine, totem, gstreamer, mplayer, vlc, vcdimager, xmms και πρόσθετα (plugins) "
+"gnome-python, rox desktop"
 
 #: ../contributors.pl:22
 #, c-format
@@ -135,8 +159,12 @@ msgstr "Austin Acton"
 
 #: ../contributors.pl:22
 #, c-format
-msgid "audio/video/MIDI apps, scientific apps, audio/video production howtos, bluetooth, pyqt & related"
-msgstr "εφαρμογές ήχου/βίντεο/MIDI, επιστημονικές εφαρμογές, howtos (οδηγίες) παραγωγής ήχου/βίντεο, bluetooth, pyqt και τα σχετικά"
+msgid ""
+"audio/video/MIDI apps, scientific apps, audio/video production howtos, "
+"bluetooth, pyqt & related"
+msgstr ""
+"εφαρμογές ήχου/βίντεο/MIDI, επιστημονικές εφαρμογές, howtos (οδηγίες) "
+"παραγωγής ήχου/βίντεο, bluetooth, pyqt και τα σχετικά"
 
 #: ../contributors.pl:23
 #, c-format
@@ -166,7 +194,9 @@ msgstr "Oden Eriksson"
 #: ../contributors.pl:25
 #, c-format
 msgid "most web-based packages and many security-related packages"
-msgstr "τα περισσότερα πακέτα που βασίζονται στο διαδίκτυο και πολλά πακέτα σχετικά με ασφάλεια"
+msgstr ""
+"τα περισσότερα πακέτα που βασίζονται στο διαδίκτυο και πολλά πακέτα σχετικά "
+"με ασφάλεια"
 
 #: ../contributors.pl:26
 #, c-format
@@ -198,16 +228,20 @@ msgstr "Andi Payn"
 msgid "many extra gnome applets and python modules"
 msgstr "πολλές επιπλέον εφαρμογές gnome και αρθρώματα (modules) python"
 
-#: ../contributors.pl:29
-#: ../contributors.pl:41
+#: ../contributors.pl:29 ../contributors.pl:41
 #, c-format
 msgid "Tibor Pittich"
 msgstr "Tibor Pittich"
 
 #: ../contributors.pl:29
 #, c-format
-msgid "sk-i18n, contributed several packages, openldap testing and integration, bind-sdb-ldap, several years of using cooker and bug hunting, etc..."
-msgstr "sk-i18n, συνεισφορά πολλών πακέτων, έλεγχος και ενσωμάτωση του openldap, bind-sdb-ldap, αρκετά χρόνια χρήσης της έκδοσης cooker και ξετρύπωμα δυσλειτουργιών, κλπ..."
+msgid ""
+"sk-i18n, contributed several packages, openldap testing and integration, "
+"bind-sdb-ldap, several years of using cooker and bug hunting, etc..."
+msgstr ""
+"sk-i18n, συνεισφορά πολλών πακέτων, έλεγχος και ενσωμάτωση του openldap, "
+"bind-sdb-ldap, αρκετά χρόνια χρήσης της έκδοσης cooker και ξετρύπωμα "
+"δυσλειτουργιών, κλπ..."
 
 #: ../contributors.pl:30
 #, c-format
@@ -217,7 +251,8 @@ msgstr "Pascal Terjan"
 #: ../contributors.pl:30
 #, c-format
 msgid "some ruby stuff, php-pear packages, various other stuff."
-msgstr "κάποια δουλειά πάνω στη ruby, πακέτα php-pear, και διάφορα άλλα πράγματα."
+msgstr ""
+"κάποια δουλειά πάνω στη ruby, πακέτα php-pear, και διάφορα άλλα πράγματα."
 
 #: ../contributors.pl:31
 #, c-format
@@ -246,8 +281,12 @@ msgstr "Brook Humphrey"
 
 #: ../contributors.pl:33
 #, c-format
-msgid "testing and bug reports, Dovecot, bibletime, sword, help with pure-ftpd, spamassassin, maildrop, clamav."
-msgstr "έλεγχος και αναφορές δυσλειτουργιών, Dovecot, bibletime, sword, βοήθεια πάνω στο pure-ftpd, spamassassin, maildrop, clamav."
+msgid ""
+"testing and bug reports, Dovecot, bibletime, sword, help with pure-ftpd, "
+"spamassassin, maildrop, clamav."
+msgstr ""
+"έλεγχος και αναφορές δυσλειτουργιών, Dovecot, bibletime, sword, βοήθεια πάνω "
+"στο pure-ftpd, spamassassin, maildrop, clamav."
 
 #: ../contributors.pl:34
 #, c-format
@@ -256,8 +295,14 @@ msgstr "Olivier Blin"
 
 #: ../contributors.pl:34
 #, c-format
-msgid "http proxy support in installer, kernel 2.6 support in sndconfig, samba3 support in LinNeighborhood, fixes and enhancements in urpmi, bootsplash and drakxtools"
-msgstr "υποστήριξη http proxy στο πρόγραμμα εγκατάστασης, υποστήριξη του kernel 2.6 στο sndconfig, υποστήριξη του samba3 στο LinNeighborhood, διορθώσεις και βελτιώσεις στο urpmi, bootsplash και drakxtools"
+msgid ""
+"http proxy support in installer, kernel 2.6 support in sndconfig, samba3 "
+"support in LinNeighborhood, fixes and enhancements in urpmi, bootsplash and "
+"drakxtools"
+msgstr ""
+"υποστήριξη http proxy στο πρόγραμμα εγκατάστασης, υποστήριξη του kernel 2.6 "
+"στο sndconfig, υποστήριξη του samba3 στο LinNeighborhood, διορθώσεις και "
+"βελτιώσεις στο urpmi, bootsplash και drakxtools"
 
 #: ../contributors.pl:35
 #, c-format
@@ -302,7 +347,8 @@ msgstr "Μεταφραστές"
 #: ../contributors.pl:40
 #, c-format
 msgid "Norwegian Bokmal (nb) translator and coordinator, i18n work"
-msgstr "Συντονιστής και μεταφραστής για τα Bokmal Νορβηγικά (nb), συμμετοχή στο i18n "
+msgstr ""
+"Συντονιστής και μεταφραστής για τα Bokmal Νορβηγικά (nb), συμμετοχή στο i18n "
 
 #: ../contributors.pl:41
 #, c-format
@@ -359,27 +405,22 @@ msgstr "Εσθονός μεταφραστής"
 msgid "Andrea Celli"
 msgstr "Andrea Celli"
 
-#: ../contributors.pl:47
-#: ../contributors.pl:48
-#: ../contributors.pl:49
+#: ../contributors.pl:47 ../contributors.pl:48 ../contributors.pl:49
 #, c-format
 msgid "Italian Translator"
 msgstr "Ιταλός μεταφραστής"
 
-#: ../contributors.pl:48
-#: ../contributors.pl:64
+#: ../contributors.pl:48 ../contributors.pl:64
 #, c-format
 msgid "Simone Riccio"
 msgstr "Simone Riccio"
 
-#: ../contributors.pl:49
-#: ../contributors.pl:65
+#: ../contributors.pl:49 ../contributors.pl:65
 #, c-format
 msgid "Daniele Pighin"
 msgstr "Daniele Pighin"
 
-#: ../contributors.pl:50
-#: ../contributors.pl:68
+#: ../contributors.pl:50 ../contributors.pl:68
 #, c-format
 msgid "Vedran Ljubovic"
 msgstr "Vedran Ljubovic"
@@ -402,22 +443,17 @@ msgstr "Benoit Audouard"
 #: ../contributors.pl:52
 #, c-format
 msgid "testing and bug reporting, integration of eagle-usb driver"
-msgstr "έλεγχος και αναφορά δυσλειτουργιών, ενσωμάτωση του οδηγού συσκευής eagle-usb"
+msgstr ""
+"έλεγχος και αναφορά δυσλειτουργιών, ενσωμάτωση του οδηγού συσκευής eagle-usb"
 
 #: ../contributors.pl:53
 #, c-format
 msgid "Bernhard Gruen"
 msgstr "Bernhard Gruen"
 
-#: ../contributors.pl:53
-#: ../contributors.pl:54
-#: ../contributors.pl:55
-#: ../contributors.pl:56
-#: ../contributors.pl:57
-#: ../contributors.pl:58
-#: ../contributors.pl:59
-#: ../contributors.pl:60
-#: ../contributors.pl:61
+#: ../contributors.pl:53 ../contributors.pl:54 ../contributors.pl:55
+#: ../contributors.pl:56 ../contributors.pl:57 ../contributors.pl:58
+#: ../contributors.pl:59 ../contributors.pl:60 ../contributors.pl:61
 #: ../contributors.pl:62
 #, c-format
 msgid "testing and bug reporting"
@@ -478,12 +514,8 @@ msgstr "Raphael Gertz"
 msgid "testing, bug report, Nvidia package try"
 msgstr "έλεγχος, αναφορά δυσλειτουργιών, έλεγχος πακέτων για Nvidia"
 
-#: ../contributors.pl:64
-#: ../contributors.pl:65
-#: ../contributors.pl:66
-#: ../contributors.pl:67
-#: ../contributors.pl:68
-#: ../contributors.pl:69
+#: ../contributors.pl:64 ../contributors.pl:65 ../contributors.pl:66
+#: ../contributors.pl:67 ../contributors.pl:68 ../contributors.pl:69
 #, c-format
 msgid "testing, bug reporting"
 msgstr "έλεγχος, αναφορά δυσλειτουργιών"
@@ -515,39 +547,45 @@ msgstr "MD, έλεγχος, αναφορά δυσλειτουργιών"
 
 #: ../contributors.pl:71
 #, c-format
-msgid "And many unnamed and unknown beta testers and bug reporters that helped make sure it all worked right."
-msgstr "Και πολλοί ανώνυμοι και άγνωστοι δοκιμαστές που ανέφεραν δυσλειτουργίες και βοήθησαν ώστε όλα να λειτουργούν σωστά."
+msgid ""
+"And many unnamed and unknown beta testers and bug reporters that helped make "
+"sure it all worked right."
+msgstr ""
+"Και πολλοί ανώνυμοι και άγνωστοι δοκιμαστές που ανέφεραν δυσλειτουργίες και "
+"βοήθησαν ώστε όλα να λειτουργούν σωστά."
 
-#: ../control-center:97
-#: ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Συνεργάτες του Mandriva Linux"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Κέντρο Ελέγχου Mandriva Linux"
+msgid "%s Control Center"
+msgstr "Κέντρο Ελέγχου %s"
 
-#: ../control-center:107
-#: ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Φόρτωση... Παρακαλώ περιμένετε"
 
-#: ../control-center:140
-#: ../control-center:141
+#: ../control-center:140 ../control-center:141
 #, c-format
 msgid "Configure 3D Desktop effects"
 msgstr "Ρύθμισε τα εφέ τρισδιάστατης επιφάνειας εργασίας"
 
 #. -PO: this message is already translated in drakx domain from which MCC will searchs it:
-#: ../control-center:152
-#: ../control-center:850
-#: ../control-center:853
+#: ../control-center:152 ../control-center:850 ../control-center:853
 #, c-format
 msgid "Authentication"
 msgstr "Πιστοποίηση"
 
 #: ../control-center:153
 #, c-format
-msgid "Select the authentication method (local, NIS, LDAP, Windows Domain, ...)"
-msgstr "Επέλεξε την μέθοδο πιστοποίησης (local, NIS, LDAP, Windows Domain, ...)"
+msgid ""
+"Select the authentication method (local, NIS, LDAP, Windows Domain, ...)"
+msgstr ""
+"Επέλεξε την μέθοδο πιστοποίησης (local, NIS, LDAP, Windows Domain, ...)"
 
 #: ../control-center:162
 #, c-format
@@ -567,7 +605,9 @@ msgstr "Ενεργοποίησε την «αυτόματη σύνδεση» χρ
 #: ../control-center:173
 #, c-format
 msgid "Enable autologin and select the user to automatically log in"
-msgstr "Ενεργοποίησε την «αυτόματη σύνδεση» και επέλεξε τον χρήστη που θα συνδέεται αυτόματα"
+msgstr ""
+"Ενεργοποίησε την «αυτόματη σύνδεση» και επέλεξε τον χρήστη που θα συνδέεται "
+"αυτόματα"
 
 #: ../control-center:182
 #, c-format
@@ -616,14 +656,12 @@ msgstr "Δισκέτα Εκκίνησης"
 msgid "Generate a standalone boot floppy"
 msgstr "Δημιούργησε μία αυτόνομη δισκέτα εκκίνησης"
 
-#: ../control-center:223
-#: ../control-center:224
+#: ../control-center:223 ../control-center:224
 #, c-format
 msgid "Share the Internet connection with other local machines"
 msgstr "Μοιράσου τη σύνδεση διαδικτύου με άλλους τοπικούς υπολογιστές"
 
-#: ../control-center:233
-#: ../control-center:234
+#: ../control-center:233 ../control-center:234
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Ρύθμισε μία καινούρια σύνδεση δικτύου (LAN, ISDN, ADSL, ...)"
@@ -638,14 +676,12 @@ msgstr "Πρόσβαση στο Διαδίκτυο"
 msgid "Alter miscellaneous internet settings"
 msgstr "Άλλαξε διάφορες ρυθμίσεις σχετικές με το διαδίκτυο"
 
-#: ../control-center:253
-#: ../control-center:254
+#: ../control-center:253 ../control-center:254
 #, c-format
 msgid "Open a console as administrator"
 msgstr "Άνοιγμα της κονσόλας υπερχρήστη"
 
-#: ../control-center:264
-#: ../control-center:265
+#: ../control-center:264 ../control-center:265
 #, c-format
 msgid "Manage date and time"
 msgstr "Διαχείριση της ώρας και της ημερομηνίας"
@@ -658,10 +694,10 @@ msgstr "Ρύθμισε τον διαχειριστή σύνδεσης των χ�
 #: ../control-center:275
 #, c-format
 msgid "Choose the display manager that enables to select which user to log in"
-msgstr "Επέλεξε το διαχειριστή προβολής, που εμφανίζεται κατά τη σύνδεση του χρήστη"
+msgstr ""
+"Επέλεξε το διαχειριστή προβολής, που εμφανίζεται κατά τη σύνδεση του χρήστη"
 
-#: ../control-center:284
-#: ../control-center:285
+#: ../control-center:284 ../control-center:285
 #, c-format
 msgid "Configure a fax server"
 msgstr "Ρύθμιση ενός εξυπηρετητή fax"
@@ -673,19 +709,20 @@ msgstr "Ρύθμισε το προσωπικό τοίχος προστασίας
 
 #: ../control-center:295
 #, c-format
-msgid "Set up a personal firewall in order to protect the computer and the network"
-msgstr "Ρύθμισε ένα προσωπικό τοίχος προστασίας ώστε να προστατέψεις τον υπολογιστή και το δίκτυο"
+msgid ""
+"Set up a personal firewall in order to protect the computer and the network"
+msgstr ""
+"Ρύθμισε ένα προσωπικό τοίχος προστασίας ώστε να προστατέψεις τον υπολογιστή "
+"και το δίκτυο"
 
-#: ../control-center:304
-#: ../control-center:305
+#: ../control-center:304 ../control-center:305
 #, c-format
 msgid "Manage, add and remove fonts. Import Windows(TM) fonts"
 msgstr ""
 "Διαχειρίσου τις γραμματοσειρές.\n"
 "Εγκατέστησε γραμματοσειρές Microsoft Windows(TM)"
 
-#: ../control-center:314
-#: ../control-center:315
+#: ../control-center:314 ../control-center:315
 #, c-format
 msgid "Set up the graphical server"
 msgstr "Ρύθμισε τον εξυπηρετητή γραφικών"
@@ -700,14 +737,12 @@ msgstr "Διαχειρίσου τις κατατμήσεις των σκληρώ
 msgid "Create, delete and resize hard disk partitions"
 msgstr "Διαχειρίσου τις κατατμήσεις των σκληρών δίσκων"
 
-#: ../control-center:334
-#: ../control-center:335
+#: ../control-center:334 ../control-center:335
 #, c-format
 msgid "Browse and configure hardware"
 msgstr "Δες και ρύθμισε τις συσκευές του υπολογιστή"
 
-#: ../control-center:345
-#: ../control-center:346
+#: ../control-center:345 ../control-center:346
 #, c-format
 msgid "Sound Configuration"
 msgstr "Ρύθμιση του Ήχου"
@@ -735,15 +770,17 @@ msgstr "Εγκατάσταση, απεγκατάσταση λογισμικού"
 #: ../control-center:366
 #, c-format
 msgid "Advanced setup for network interfaces and firewall"
-msgstr "Προχωρημένες ρυθμίσεις για τις συνδέσεις δικτύου και το τοίχος προστασίας"
+msgstr ""
+"Προχωρημένες ρυθμίσεις για τις συνδέσεις δικτύου και το τοίχος προστασίας"
 
 #: ../control-center:367
 #, c-format
 msgid "Set up network interfaces failover and firewall replication"
-msgstr "Στίσε τη «έκτακτη ασφαλιστική μεταπήδηση των λειτουργιών» (failover) των συνδέσεων δικτύου και την αντίκρουση (replication) του τοίχους προστασίας"
+msgstr ""
+"Στίσε τη «έκτακτη ασφαλιστική μεταπήδηση των λειτουργιών» (failover) των "
+"συνδέσεων δικτύου και την αντίκρουση (replication) του τοίχους προστασίας"
 
-#: ../control-center:376
-#: ../control-center:377
+#: ../control-center:376 ../control-center:377
 #, c-format
 msgid "Set up the keyboard layout"
 msgstr "Όρισε τη διάταξη πληκτρολογίου"
@@ -768,8 +805,7 @@ msgstr "Διαχειρίσου την τοπικοποίηση του συστή
 msgid "Select the language and the country or region of the system"
 msgstr "Επέλεξε γλώσσα και χώρα ή επαρχία για τον υπολογιστή"
 
-#: ../control-center:405
-#: ../control-center:406
+#: ../control-center:405 ../control-center:406
 #, c-format
 msgid "View and search system logs"
 msgstr "Δες και αναζήτησε καταγραφές του συστήματος"
@@ -787,12 +823,18 @@ msgstr "Επαναρύθμισε μία σύνδεση δικτύου"
 #: ../control-center:425
 #, c-format
 msgid "Upload your configuration to get information on upgrades"
-msgstr "Αποστολή της σύνθεσης του υπολογιστή, ώστε να σε πληροφορούμε για τις αναβαθμίσεις"
+msgstr ""
+"Αποστολή της σύνθεσης του υπολογιστή, ώστε να σε πληροφορούμε για τις "
+"αναβαθμίσεις"
 
 #: ../control-center:426
 #, c-format
-msgid "Upload your configuration in order to keep you informed about security and useful upgrades"
-msgstr "Αποστολή της σύνθεσης του υπολογιστή, ώστε να σε πληροφορούμε για τις ενημερώσεις ασφαλείας, όπως και για χρήσιμες αναβαθμίσεις"
+msgid ""
+"Upload your configuration in order to keep you informed about security and "
+"useful upgrades"
+msgstr ""
+"Αποστολή της σύνθεσης του υπολογιστή, ώστε να σε πληροφορούμε για τις "
+"ενημερώσεις ασφαλείας, όπως και για χρήσιμες αναβαθμίσεις"
 
 # ???
 #: ../control-center:435
@@ -803,7 +845,8 @@ msgstr "Διαχείριση ομάδας υπολογιστών"
 #: ../control-center:436
 #, c-format
 msgid "Manage installed software packages on a group of computers"
-msgstr "Διαχειρίσου τα εγκατεστημένα πακέτα λογισμικού σε μια ομάδα από υπολογιστές"
+msgstr ""
+"Διαχειρίσου τα εγκατεστημένα πακέτα λογισμικού σε μια ομάδα από υπολογιστές"
 
 #: ../control-center:445
 #, c-format
@@ -812,8 +855,12 @@ msgstr "Ενημέρωση του συστήματος"
 
 #: ../control-center:446
 #, c-format
-msgid "Look at available updates and apply any fixes or upgrades to installed packages"
-msgstr "Προβολή των διαθέσιμων ενημερώσεων και εφαρμογή διορθώσεων ή αναβαθμίσεων στα εγκαταστημένα πακέτα"
+msgid ""
+"Look at available updates and apply any fixes or upgrades to installed "
+"packages"
+msgstr ""
+"Προβολή των διαθέσιμων ενημερώσεων και εφαρμογή διορθώσεων ή αναβαθμίσεων "
+"στα εγκαταστημένα πακέτα"
 
 #: ../control-center:456
 #, c-format
@@ -825,8 +872,7 @@ msgstr "Μορφή του Μενού"
 msgid "Menu Style Configuration"
 msgstr "Ρύθμιση της Μορφής του Μενού"
 
-#: ../control-center:466
-#: ../control-center:467
+#: ../control-center:466 ../control-center:467
 #, c-format
 msgid "Import Windows(TM) documents and settings"
 msgstr "Εισήγαγε αρχεία και ρυθμίσεις από τα Microsoft Windows(TM)"
@@ -841,14 +887,12 @@ msgstr "Παρακολούθηση των συνδέσεων"
 msgid "Monitor the network connections"
 msgstr "Παρακολούθηση των συνδέσεων δικτύου"
 
-#: ../control-center:486
-#: ../control-center:487
+#: ../control-center:486 ../control-center:487
 #, c-format
 msgid "Set up the pointer device (mouse, touchpad)"
 msgstr "Ρύθμισε τη συσκευή «δείκτης» (ποντίκι, δείκτης αφής)"
 
-#: ../control-center:505
-#: ../control-center:506
+#: ../control-center:505 ../control-center:506
 #, c-format
 msgid "Parental Controls"
 msgstr "Γονικός Έλεγχος"
@@ -858,8 +902,7 @@ msgstr "Γονικός Έλεγχος"
 msgid "Network Center"
 msgstr "Κέντρο Δικτύου"
 
-#: ../control-center:497
-#: ../control-center:974
+#: ../control-center:497 ../control-center:974
 #, c-format
 msgid "Manage your network devices"
 msgstr "Διαχείριση των συσκευών δικτύου"
@@ -914,8 +957,7 @@ msgstr "Κοινή χρήση των κατατμήσεων των σκληρώ�
 msgid "Set up sharing of your hard disk partitions"
 msgstr "Όρισε την κοινή χρήση των κατατμήσεων των σκληρών δίσκων"
 
-#: ../control-center:557
-#: ../control-center:559
+#: ../control-center:557 ../control-center:559
 #, c-format
 msgid "Set up the printer(s), the print job queues, ..."
 msgstr "Ρύθμισε τον εκτυπωτή, την λίστα εργασιών εκτύπωσης, ..."
@@ -928,7 +970,8 @@ msgstr "Προγραμματισμένες Εργασίες"
 #: ../control-center:569
 #, c-format
 msgid "Schedule programs to run periodically or at given times"
-msgstr "Προγραμμάτισε προγράμματα να τρέχουν περιοδικά, ή σε συγκεκριμένες στιγμές"
+msgstr ""
+"Προγραμμάτισε προγράμματα να τρέχουν περιοδικά, ή σε συγκεκριμένες στιγμές"
 
 #: ../control-center:578
 #, c-format
@@ -939,7 +982,9 @@ msgstr "Proxy (Διαμεσολαβητής)"
 #: ../control-center:579
 #, c-format
 msgid "Set up a proxy server for files and web browsing"
-msgstr "Ρύθμιση του εξυπηρετητή διαμεσολάβησης (proxy) για «σερφάρισμα» διαδικτύου και αρχείων"
+msgstr ""
+"Ρύθμιση του εξυπηρετητή διαμεσολάβησης (proxy) για «σερφάρισμα» διαδικτύου "
+"και αρχείων"
 
 #: ../control-center:587
 #, c-format
@@ -949,7 +994,8 @@ msgstr "Απομακρυσμένος Έλεγχος (Λίνουξ/Unix, Microsof
 #: ../control-center:588
 #, c-format
 msgid "Remote Control of another machine (Linux/Unix, Windows)"
-msgstr "Απομακρυσμένος Έλεγχος ενός άλλου μηχανήματος (Linux/Unix, Microsoft Windows)"
+msgstr ""
+"Απομακρυσμένος Έλεγχος ενός άλλου μηχανήματος (Linux/Unix, Microsoft Windows)"
 
 #: ../control-center:597
 #, c-format
@@ -961,8 +1007,7 @@ msgstr "Διέγραψε μία σύνδεση"
 msgid "Delete a network interface"
 msgstr "Διέγραψε μια σύνδεση δικτύου"
 
-#: ../control-center:608
-#: ../control-center:609
+#: ../control-center:608 ../control-center:609
 #, c-format
 msgid "Wireless connection"
 msgstr "Ασύρματη σύνδεση"
@@ -970,12 +1015,14 @@ msgstr "Ασύρματη σύνδεση"
 #: ../control-center:618
 #, c-format
 msgid "Access Windows (SMB) shared drives and directories"
-msgstr "Πρόσβαση στους κοινούς δίσκους και καταλόγους των Microsoft Windows (SMB)"
+msgstr ""
+"Πρόσβαση στους κοινούς δίσκους και καταλόγους των Microsoft Windows (SMB)"
 
 #: ../control-center:619
 #, c-format
 msgid "Configuration of Windows (Samba) shared drives and directories"
-msgstr "Ρύθμιση των κοινών με τα Microsoft Windows(TM) (Samba) δίσκων και καταλόγων"
+msgstr ""
+"Ρύθμιση των κοινών με τα Microsoft Windows(TM) (Samba) δίσκων και καταλόγων"
 
 #: ../control-center:628
 #, c-format
@@ -987,8 +1034,7 @@ msgstr "Κοινή χρήση δίσκων και καταλόγων με συσ
 msgid "Manage configuration of Samba"
 msgstr "Διαχειρίσου τη ρύθμιση του Samba"
 
-#: ../control-center:638
-#: ../control-center:639
+#: ../control-center:638 ../control-center:639
 #, c-format
 msgid "Set up scanner"
 msgstr "Ρύθμισε τον σαρωτή"
@@ -996,12 +1042,15 @@ msgstr "Ρύθμισε τον σαρωτή"
 #: ../control-center:648
 #, c-format
 msgid "Set up security level and audit"
-msgstr "Όρισε το επίπεδο ασφαλείας του συστήματος και τον έλεγχο ασφαλείας (audit)"
+msgstr ""
+"Όρισε το επίπεδο ασφαλείας του συστήματος και τον έλεγχο ασφαλείας (audit)"
 
 #: ../control-center:649
 #, c-format
 msgid "Set the system security level and the periodic security audit"
-msgstr "Όρισε το επίπεδο ασφαλείας του συστήματος, και τους περιοδικούς audit ασφαλείας"
+msgstr ""
+"Όρισε το επίπεδο ασφαλείας του συστήματος, και τους περιοδικούς audit "
+"ασφαλείας"
 
 #: ../control-center:658
 #, c-format
@@ -1013,8 +1062,7 @@ msgstr "Συντόνισε τις άδειες του συστήματος"
 msgid "Fine tune the security permissions of the system"
 msgstr "Λεπτομερής συντονισμός των αδειών ασφαλείας του συστήματος"
 
-#: ../control-center:668
-#: ../control-center:669
+#: ../control-center:668 ../control-center:669
 #, c-format
 msgid "Manage system services by enabling or disabling them"
 msgstr "Ενεργοποίησε ή απενεργοποίησε τις υπηρεσίες του συστήματος"
@@ -1031,8 +1079,7 @@ msgstr "Επέλεξε από που θα λαμβάνονται τα πακέτ
 
 #. -PO: here power means electrical power
 #. -PO: UPS==Uninterruptible power supply
-#: ../control-center:691
-#: ../control-center:694
+#: ../control-center:691 ../control-center:694
 #, c-format
 msgid "Set up a UPS for power monitoring"
 msgstr "Ρύθμισε ένα UPS, για τον έλεγχο του ρεύματος"
@@ -1057,8 +1104,7 @@ msgstr "Εικονικοποίηση"
 msgid "Virtual machines management"
 msgstr "Διαχείριση εικονικών συστημάτων"
 
-#: ../control-center:725
-#: ../control-center:726
+#: ../control-center:725 ../control-center:726
 #, c-format
 msgid "Configure VPN connection to secure network access"
 msgstr "Ρύθμισε τις συνδέσεις VPN, για την ασφαλή πρόσβαση δικτύου"
@@ -1073,15 +1119,12 @@ msgstr "Πρόσβαση στους κοινούς δίσκους και κατ�
 msgid "Set WebDAV mount points"
 msgstr "Ορισμός σημείων προσάρτησης WebDAV"
 
-#: ../control-center:767
-#: ../control-center:771
+#: ../control-center:767 ../control-center:771
 #, c-format
 msgid "Software Management"
 msgstr "Λογισμικό"
 
-#: ../control-center:781
-#: ../control-center:962
-#: ../control-center:996
+#: ../control-center:781 ../control-center:962 ../control-center:996
 #: ../control-center:1148
 #, c-format
 msgid "Others"
@@ -1092,8 +1135,7 @@ msgstr "Άλλα"
 msgid "Server wizards"
 msgstr "Οδηγοί ρυθμίσεων εξυπηρετητή"
 
-#: ../control-center:793
-#: ../control-center:796
+#: ../control-center:793 ../control-center:796
 #, c-format
 msgid "Sharing"
 msgstr "Κοινή χρήση"
@@ -1115,8 +1157,12 @@ msgstr "Ρύθμιση Samba"
 
 #: ../control-center:803
 #, c-format
-msgid "Set up a file and print server for workstations running Linux and non-Linux systems"
-msgstr "Ρύθμισε ένα εξυπηρετητή αρχείων και εκτυπώσεων, για σύνδεση με υπολογιστές που τρέχουν σε συστήματα Linux και μη-Linux"
+msgid ""
+"Set up a file and print server for workstations running Linux and non-Linux "
+"systems"
+msgstr ""
+"Ρύθμισε ένα εξυπηρετητή αρχείων και εκτυπώσεων, για σύνδεση με υπολογιστές "
+"που τρέχουν σε συστήματα Linux και μη-Linux"
 
 #: ../control-center:805
 #, c-format
@@ -1126,7 +1172,9 @@ msgstr "Διαχειρίσου τις κοινές χρήσεις Samba"
 #: ../control-center:806
 #, c-format
 msgid "Manage, create special share, create public/user share"
-msgstr "Διαχειρίσου, δημιούργησε ειδικές «κοινές χρήσεις», δημιούργησε δημόσιες/«ανά χρήστη» «κοινές χρήσεις»"
+msgstr ""
+"Διαχειρίσου, δημιούργησε ειδικές «κοινές χρήσεις», δημιούργησε δημόσιες/«ανά "
+"χρήστη» «κοινές χρήσεις»"
 
 #: ../control-center:808
 #, c-format
@@ -1144,13 +1192,12 @@ msgstr "Ρύθμιση εξυπηρετητή διαδικτύου (server)"
 msgid "Configure installation server"
 msgstr "Ρύθμιση εξυπηρετητή εγκατάστασης"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
-msgstr "Ρύθμιση εξυπηρετητή για δικτυακές εγκαταστάσεις του Mandriva Linux"
+msgid "Set up server for network installations of %s"
+msgstr "Ρύθμιση εξυπηρετητή για δικτυακές εγκαταστάσεις του %s"
 
-#: ../control-center:821
-#: ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "Υπηρεσίες Δικτύου"
@@ -1183,7 +1230,9 @@ msgstr "Ρύθμιση διαμεσολαβητή"
 #: ../control-center:834
 #, c-format
 msgid "Configure a web caching proxy server"
-msgstr "Ρύθμισε ένα «διαμεσολαβητή εξυπηρετητή» διαδικτυακής μικροαποθήκευσης (web caching proxy server)"
+msgstr ""
+"Ρύθμισε ένα «διαμεσολαβητή εξυπηρετητή» διαδικτυακής μικροαποθήκευσης (web "
+"caching proxy server)"
 
 #: ../control-center:836
 #, c-format
@@ -1192,11 +1241,13 @@ msgstr "Ρύθμιση ώρας"
 
 #: ../control-center:837
 #, c-format
-msgid "Set the time of the server to be synchronized with an external time server"
-msgstr "Όρισε η ώρα του εξυπηρετητή να συγχρονίζεται με ένα εξωτερικό εξυπηρετητή ώρας"
+msgid ""
+"Set the time of the server to be synchronized with an external time server"
+msgstr ""
+"Όρισε η ώρα του εξυπηρετητή να συγχρονίζεται με ένα εξωτερικό εξυπηρετητή "
+"ώρας"
 
-#: ../control-center:839
-#: ../control-center:840
+#: ../control-center:839 ../control-center:840
 #, c-format
 msgid "OpenSSH daemon configuration"
 msgstr "Ρυθμίσεις του δαίμονα OpenSSH"
@@ -1221,8 +1272,7 @@ msgstr "Ρύθμιση LDAP"
 msgid "Configure the LDAP directory services"
 msgstr "Ρύθμιση των υπηρεσιών καταλόγου LDAP"
 
-#: ../control-center:871
-#: ../control-center:874
+#: ../control-center:871 ../control-center:874
 #, c-format
 msgid "Groupware"
 msgstr "Groupware"
@@ -1257,8 +1307,7 @@ msgstr "Ρύθμιση ταχυδρομείου"
 msgid "Configure the Internet Mail services"
 msgstr "Ρύθμιση των υπηρεσιών Ταχυδρομείου του Διαδικτύου"
 
-#: ../control-center:895
-#: ../control-center:898
+#: ../control-center:895 ../control-center:898
 #, c-format
 msgid "Online Administration"
 msgstr "Διαχείριση μέσω Δικτύου"
@@ -1276,7 +1325,9 @@ msgstr "Ρύθμιση του τοπικού συστήματος, μέσω πε
 #: ../control-center:915
 #, c-format
 msgid "You don't seem to have webmin intalled. Local config is disabled"
-msgstr "Φαίνεται πως δεν έχεις εγκαταστημένο το webmin. Το τοπικό config είναι απενεργοποιημένο"
+msgstr ""
+"Φαίνεται πως δεν έχεις εγκαταστημένο το webmin. Το τοπικό config είναι "
+"απενεργοποιημένο"
 
 #: ../control-center:917
 #, c-format
@@ -1286,7 +1337,9 @@ msgstr "Απομακρυσμένη Διαχείριση"
 #: ../control-center:918
 #, c-format
 msgid "Click here if you want to configure a remote box via Web interface"
-msgstr "Κάνε κλικ εδώ αν θέλεις να ρυθμίσεις ένα απομακρυσμένο υπολογιστή, μέσω περιβάλλοντος χρήσης διαδικτύου"
+msgstr ""
+"Κάνε κλικ εδώ αν θέλεις να ρυθμίσεις ένα απομακρυσμένο υπολογιστή, μέσω "
+"περιβάλλοντος χρήσης διαδικτύου"
 
 #: ../control-center:931
 #, c-format
@@ -1313,8 +1366,7 @@ msgstr "Ρύθμιση του ποντικιού και του πληκτρολ�
 msgid "Configure printing and scanning"
 msgstr "Ρύθμιση των εκτυπώσεων και των σαρώσεων"
 
-#: ../control-center:971
-#: ../drakxconf:28
+#: ../control-center:971 ../drakxconf:28
 #, c-format
 msgid "Network & Internet"
 msgstr "Δίκτυο και Διαδίκτυο"
@@ -1364,8 +1416,7 @@ msgstr "Ρύθμισε τις κοινές χρήσεις NFS"
 msgid "Configure WebDAV shares"
 msgstr "Ρύθμισε τις κοινές χρήσεις WebDAV"
 
-#: ../control-center:1065
-#: ../control-center:1068
+#: ../control-center:1065 ../control-center:1068
 #, c-format
 msgid "Local disks"
 msgstr "Τοπικοί δίσκοι"
@@ -1420,8 +1471,7 @@ msgstr "Μονάδα Ζip"
 msgid "Set where your ZIP drive is mounted"
 msgstr "Όρισε που προσαρτάται η συσκευή ZIP"
 
-#: ../control-center:1115
-#: ../control-center:1118
+#: ../control-center:1115 ../control-center:1118
 #, c-format
 msgid "Security"
 msgstr "Ασφάλεια"
@@ -1446,9 +1496,7 @@ msgstr "Εμφάνιση και αίσθηση της εκκίνησης"
 msgid "Additional wizards"
 msgstr "Επιπρόσθετοι οδηγοί ρυθμίσεων"
 
-#: ../control-center:1211
-#: ../control-center:1212
-#: ../control-center:1213
+#: ../control-center:1211 ../control-center:1212 ../control-center:1213
 #: ../control-center:1226
 #, c-format
 msgid "/_Options"
@@ -1469,9 +1517,7 @@ msgstr "/_Ενσωματωμένη Λειτουργία"
 msgid "/Expert mode in _wizards"
 msgstr "/Λειτουργία ειδικών στους οδηγούς"
 
-#: ../control-center:1223
-#: ../control-center:1224
-#: ../control-center:1225
+#: ../control-center:1223 ../control-center:1224 ../control-center:1225
 #, c-format
 msgid "/_File"
 msgstr "/_Αρχείο"
@@ -1491,9 +1537,7 @@ msgstr "<control>Q"
 msgid "Quit"
 msgstr "Έξοδος"
 
-#: ../control-center:1246
-#: ../control-center:1249
-#: ../control-center:1262
+#: ../control-center:1246 ../control-center:1249 ../control-center:1262
 #, c-format
 msgid "/_Themes"
 msgstr "/_Θέματα"
@@ -1512,20 +1556,14 @@ msgstr ""
 msgid "/_More themes"
 msgstr "/_Περισσότερα θέματα"
 
-#: ../control-center:1264
-#: ../control-center:1265
-#: ../control-center:1266
-#: ../control-center:1267
-#: ../control-center:1268
-#: ../control-center:1269
+#: ../control-center:1264 ../control-center:1265 ../control-center:1266
+#: ../control-center:1267 ../control-center:1268 ../control-center:1269
 #: ../control-center:1272
 #, c-format
 msgid "/_Help"
 msgstr "/_Βοήθεια"
 
-#: ../control-center:1265
-#: ../control-center:1266
-#: ../control-center:1267
+#: ../control-center:1265 ../control-center:1266 ../control-center:1267
 #: ../control-center:1268
 #, c-format
 msgid "Help"
@@ -1561,18 +1599,17 @@ msgstr "/_Σχετικά με..."
 msgid "Cancel"
 msgstr "Ακύρωση"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Κέντρο Ελέγχου Mandriva Linux %s [στον %s]"
+msgid "%s Control Center %s [on %s]"
+msgstr "Κέντρο Ελέγχου %s %s [στον %s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "Καλώς ήρθατε στο Κέντρο Ελέγχου του Mandriva Linux"
+msgid "Welcome to the %s Control Center"
+msgstr "Καλώς ήρθατε στο Κέντρο Ελέγχου του %s"
 
-#: ../control-center:1531
-#: ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Σφάλμα"
@@ -1606,7 +1643,9 @@ msgstr "αδυναμία διακλάδωση: %s"
 #: ../control-center:1767
 #, c-format
 msgid "cannot fork and exec \"%s\" since it is not executable"
-msgstr "Δεν μπορώ να κάνω διακλάδωση και εκτέλεση του \"%s\"  μια που δεν είναι εκτελέσιμο"
+msgstr ""
+"Δεν μπορώ να κάνω διακλάδωση και εκτέλεση του \"%s\"  μια που δεν είναι "
+"εκτελέσιμο"
 
 #: ../control-center:1890
 #, c-format
@@ -1618,8 +1657,7 @@ msgstr "Αυτό το πρόγραμμα δεν τερματίστηκε καν�
 msgid "Warning"
 msgstr "Προσοχή"
 
-#: ../control-center:1909
-#: ../drakconsole:31
+#: ../control-center:1909 ../drakconsole:31
 #, c-format
 msgid "Close"
 msgstr "Κλείσιμο"
@@ -1644,12 +1682,12 @@ msgstr "Περισσότερα θέματα"
 msgid "Get additional themes on www.damz.net"
 msgstr "Βρείτε περισσότερα θέματα στο www.damz.net"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "Περί - Κέντρου Ελέγχου Mandriva Linux"
+msgid "About - %s Control Center"
+msgstr "Περί - Κέντρου Ελέγχου %s"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Δημιουργοί: "
@@ -1694,11 +1732,11 @@ msgstr "231036448«παπάκι»freemail-τελεία-gr"
 msgid "Translator: "
 msgstr "Μεταφραστής: "
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Κέντρο Ελέγχου Mandriva Linux %s (%s)"
+msgid "%s %s (%s) Control Center"
+msgstr "Κέντρο Ελέγχου %s %s (%s)"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
@@ -1786,8 +1824,7 @@ msgstr "Κέντρο Ελέγχου"
 msgid "Choose the tool you want to use"
 msgstr "Επιλέξτε το εργαλείο που θέλετε να χρησιμοποιήσετε"
 
-#: ../menus_launcher.pl:19
-#: ../menus_launcher.pl:41
+#: ../menus_launcher.pl:19 ../menus_launcher.pl:41
 #, c-format
 msgid "Menu Configuration Center"
 msgstr "Κέντρο Ρυθμίσεων Μενού"
@@ -1797,9 +1834,7 @@ msgstr "Κέντρο Ρυθμίσεων Μενού"
 msgid "System menu"
 msgstr "Μενού συστήματος"
 
-#: ../menus_launcher.pl:29
-#: ../menus_launcher.pl:36
-#: ../print_launcher.pl:31
+#: ../menus_launcher.pl:29 ../menus_launcher.pl:36 ../print_launcher.pl:31
 #, c-format
 msgid "Configure..."
 msgstr "Ρύθμιση..."
@@ -1820,8 +1855,7 @@ msgstr ""
 "\n"
 "Επιλέξτε το μενού που θέλετε να ρυθμίσετε"
 
-#: ../print_launcher.pl:14
-#: ../print_launcher.pl:21
+#: ../print_launcher.pl:14 ../print_launcher.pl:21
 #, c-format
 msgid "Printing configuration"
 msgstr "Ρυθμίσεις εκτύπωσης"
@@ -1947,4 +1981,3 @@ msgstr "Οθόνη"
 #: ../data/XFDrake-Resolution.desktop.in.h:1
 msgid "Screen Resolution"
 msgstr "Ανάλυση οθόνης"
-
diff --git a/po/eo.po b/po/eo.po
index 3bad718f..6fb34849 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: eo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2007-12-12 05:06+0100\n"
 "Last-Translator: Vilhelmo Lutermano <vlutermano@free.fr>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
@@ -542,12 +542,17 @@ msgstr ""
 "Kaj multaj nenomitaj kaj nekonataj beta-testantoj kaj cim-raportintoj kiuj "
 "helpis certigi ke ĉio bone funkcias."
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Kontribuantoj de Mandriva Linux"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Mandriva Linux-Regejo"
+msgid "%s Control Center"
+msgstr "%s-Regejo"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Ŝarganta... Bonvole atendu"
@@ -1151,12 +1156,12 @@ msgstr "Agordi ttt-servilon"
 msgid "Configure installation server"
 msgstr "Konfiguru instal-servilon"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
-msgstr "Agordi servilon por retaj instaladoj de Mandriva Linux"
+msgid "Set up server for network installations of %s"
+msgstr "Agordi servilon por retaj instaladoj de %s"
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "Retaj servoj"
@@ -1552,17 +1557,17 @@ msgstr "/_Pri..."
 msgid "Cancel"
 msgstr "Nuligu"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
+msgid "%s Control Center %s [on %s]"
 msgstr "Mandrejko-Regejo %s [sur %s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "Bonvenon ĉe la Mandriva Linux-Regejo"
+msgid "Welcome to the %s Control Center"
+msgstr "Bonvenon ĉe la %s-Regejo"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Eraro"
@@ -1633,12 +1638,12 @@ msgstr "Aldonaj etosoj"
 msgid "Get additional themes on www.damz.net"
 msgstr "Akiru kromajn etosojn ĉe www.damz.net"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "Pri - Mandriva Linux-Regejo"
+msgid "About - %s Control Center"
+msgstr "Pri - %s-Regejo"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Aŭtoroj: "
@@ -1683,11 +1688,11 @@ msgstr "~ @ ~"
 msgid "Translator: "
 msgstr "Tradukinto: "
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Regejo de Mandriva Linux %s (%s)"
+msgid "%s %s (%s) Control Center"
+msgstr "Regejo de %s %s (%s)"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
diff --git a/po/es.po b/po/es.po
index d0fc5d34..e875ef24 100644
--- a/po/es.po
+++ b/po/es.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2008-03-28 14:23-0300\n"
 "Last-Translator: Fabián Mandelbaum <fmandelbaum@gmail.com>\n"
 "Language-Team: Español <es@li.org>\n"
@@ -39,7 +39,7 @@ msgid ""
 "Mandriva tools"
 msgstr ""
 "reconstrucción y limpieza masiva de paquetes,  juegos, portado a Sparc, "
-"relectura de las herramientas Mandriva Linux"
+"relectura de las herramientas %s"
 
 #: ../contributors.pl:13
 #, c-format
@@ -550,12 +550,17 @@ msgstr ""
 "Y muchos probadores de beta y reportes de bugs desconocidos que ayudaron a "
 "estar seguros que todo funcionaba bien."
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Contribuidores a Mandriva Linux"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Centro de control de Mandriva Linux"
+msgid "%s Control Center"
+msgstr "Centro de control de %s"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Cargando... Por favor, espere"
@@ -1165,12 +1170,12 @@ msgstr "Configurar un servidor web"
 msgid "Configure installation server"
 msgstr "Configurar servidor de instalación"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
-msgstr "Configurar servidor para instalaciones en red de Mandriva Linux"
+msgid "Set up server for network installations of %s"
+msgstr "Configurar servidor para instalaciones en red de %s"
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "Servicios de red"
@@ -1569,17 +1574,17 @@ msgstr "/_Acerca de..."
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Centro de control de Mandriva Linux %s [bajo %s]"
+msgid "%s Control Center %s [on %s]"
+msgstr "Centro de control de %s %s [bajo %s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "Bienvenido al Centro de Control de Mandriva Linux"
+msgid "Welcome to the %s Control Center"
+msgstr "Bienvenido al Centro de Control de %s"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Error"
@@ -1650,12 +1655,12 @@ msgstr "Temas adicionales"
 msgid "Get additional themes on www.damz.net"
 msgstr "Obtener temas adicionales en www.damz.net"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "Acerca - Centro de control de Mandriva Linux"
+msgid "About - %s Control Center"
+msgstr "Acerca - Centro de control de %s"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Autores: "
@@ -1704,11 +1709,11 @@ msgstr ""
 msgid "Translator: "
 msgstr "Traductores: "
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Centro de control de Mandriva Linux %s (%s)"
+msgid "%s %s (%s) Control Center"
+msgstr "Centro de control de %s %s (%s)"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
diff --git a/po/et.po b/po/et.po
index ca8fe967..40b88918 100644
--- a/po/et.po
+++ b/po/et.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakconf\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2008-03-11 20:11+0200\n"
 "Last-Translator: Marek Laane <bald@starman.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -542,12 +542,17 @@ msgstr ""
 "Ja arvukad nimetud ning tundmatud beetatestijad ja vigadest teadaandjad, kes "
 "aitasid tagada kõige veatu töötamise."
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Mandriva Linuxi kaasautorid"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Mandriva Linuxi juhtimiskeskus"
+msgid "%s Control Center"
+msgstr "%si juhtimiskeskus"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Oodake palun... Laetakse moodulit"
@@ -1147,12 +1152,12 @@ msgstr "Veebiserveri seadistamine"
 msgid "Configure installation server"
 msgstr "Paigaldusserveri seadistamine"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
-msgstr "Mandriva Linuxi võrgupaigalduse serveri seadistamine"
+msgid "Set up server for network installations of %s"
+msgstr "%si võrgupaigalduse serveri seadistamine"
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "Võrguteenused"
@@ -1547,17 +1552,17 @@ msgstr "/_Info..."
 msgid "Cancel"
 msgstr "Loobu"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Mandriva Linuxi juhtimiskeskus %s [masin: %s]"
+msgid "%s Control Center %s [on %s]"
+msgstr "%si juhtimiskeskus %s [masin: %s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "Mandriva Linuxi juhtimiskeskus"
+msgid "Welcome to the %s Control Center"
+msgstr "%si juhtimiskeskus"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Viga"
@@ -1628,12 +1633,12 @@ msgstr "Lisateemad"
 msgid "Get additional themes on www.damz.net"
 msgstr "Hangi lisateemasid saidilt www.damz.net"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "Misvärk - Mandriva Linuxi juhtimiskeskus"
+msgid "About - %s Control Center"
+msgstr "Misvärk - %si juhtimiskeskus"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Autorid: "
@@ -1682,11 +1687,11 @@ msgstr ""
 msgid "Translator: "
 msgstr "Tõlkijad: "
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Mandriva Linux %s (%s) juhtimiskeskus"
+msgid "%s %s (%s) Control Center"
+msgstr "%s %s (%s) juhtimiskeskus"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
diff --git a/po/eu.po b/po/eu.po
index e272db34..cf183877 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -1,5 +1,5 @@
 # translation of drakconf.po to Euskara
-# EUSKERA: Mandriva Linux translation
+# EUSKERA: %s translation
 # Copyright (C) 2000,2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 #
 # Iigo Salvador Azurmendi <xalba@euskalnet.net>, 2000-2002,2003,2004.
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakconf\n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2008-03-11 21:01+0100\n"
 "Last-Translator: Iñigo Salvador Azurmendi <xalba@euskalnet.net>\n"
 "Language-Team: Euskara <eu@li.org>\n"
@@ -543,12 +543,17 @@ msgstr ""
 "Eta aipatu gabeko hainbat beta proba-egile eta akatsen berri-emaile dena "
 "zuzen dabilela ziurtatzen lagundu dutenak."
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Mandriva Linux-en kolaboratzaileak"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Mandriva Linux Aginte Gunea"
+msgid "%s Control Center"
+msgstr "%s Aginte Gunea"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Zamatzen... Itxoin mesedez"
@@ -1154,12 +1159,12 @@ msgstr "Ezarri web zerbitzari bat"
 msgid "Configure installation server"
 msgstr "Instalaketa zerbitzaria konfiguratu"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
-msgstr "Ezarri Mandriva Linux-en sareko instalazioetarako zerbitzari bat"
+msgid "Set up server for network installations of %s"
+msgstr "Ezarri %s-en sareko instalazioetarako zerbitzari bat"
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "Sare Zerbitzuak"
@@ -1557,17 +1562,17 @@ msgstr "/_Honi buruz..."
 msgid "Cancel"
 msgstr "Utzi"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Mandriva Linux Aginte Gunea %s [%s (e)n]"
+msgid "%s Control Center %s [on %s]"
+msgstr "%s Aginte Gunea %s [%s (e)n]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "Ongi etorri Mandriva Linux Aginte Gunera"
+msgid "Welcome to the %s Control Center"
+msgstr "Ongi etorri %s Aginte Gunera"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Akatsa"
@@ -1638,12 +1643,12 @@ msgstr "Gai osagarriak"
 msgid "Get additional themes on www.damz.net"
 msgstr "Eskuratu gai osagarriak www.damz.net helbidean"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "Honi buruz - Mandriva Linux Aginte Gunea"
+msgid "About - %s Control Center"
+msgstr "Honi buruz - %s Aginte Gunea"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Egileak: "
@@ -1688,11 +1693,11 @@ msgstr "xalba@euskalnet.net"
 msgid "Translator: "
 msgstr "Itzultzailea: "
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Mandriva Linux %s (%s) Aginte Gunea"
+msgid "%s %s (%s) Control Center"
+msgstr "%s %s (%s) Aginte Gunea"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
diff --git a/po/fa.po b/po/fa.po
index 533752a4..808a66f2 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakconf-fa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2005-02-25 19:36+0100\n"
 "Last-Translator: Abbas Izad <abbasizad@hotmail.com>\n"
 "Language-Team: Persian\n"
@@ -539,12 +539,17 @@ msgstr ""
 "و بسیاری از آزمایش کنندگان بتا و گزارشگرهای اشکال بی‌نامی که به اطمینان بخشی "
 "در درست کار کردن همه‌ی این برنامه‌ها با یکدیگر به ما کمک کردند. "
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "ماندریبا بر اینترنت"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
+msgid "%s Control Center"
 msgstr "مرکز کنترل لینوکس ماندریبا "
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "در حال بارگذاری... لطفاً صبر کنید"
@@ -1147,12 +1152,12 @@ msgstr "برپاسازی یک کارگزار وب"
 msgid "Configure installation server"
 msgstr "پیکربندی کارگزار نصب"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
+msgid "Set up server for network installations of %s"
 msgstr "برپاسازی کارگزار نصب‌های شبکه لینوکس ماندریبا "
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "سرویس‌های شبکه"
@@ -1549,17 +1554,17 @@ msgstr "/_درباره‌ی..."
 msgid "Cancel"
 msgstr "لغو"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
+msgid "%s Control Center %s [on %s]"
 msgstr "مرکز کنترل لینوکس ماندریبا %s [بر %s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
+msgid "Welcome to the %s Control Center"
 msgstr "به مرکز کنترل لینوکس ماندریبا خوش آمدید"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "خطا"
@@ -1627,12 +1632,12 @@ msgstr "طرح‌های اضافی"
 msgid "Get additional themes on www.damz.net"
 msgstr "تهیه طرح‌های اضافی از www.damz.net"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
+msgid "About - %s Control Center"
 msgstr "درباره‌ی - مرکز کنترل لینوکس ماندریبا "
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "نگارندگان:"
@@ -1677,10 +1682,10 @@ msgstr "~ @ ~"
 msgid "Translator: "
 msgstr "مترجم: "
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, fuzzy, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
+msgid "%s %s (%s) Control Center"
 msgstr "مرکز کنترل لینوکس ماندریبا "
 
 #. -PO: here %s is eg: "1999-2008"
@@ -1988,9 +1993,6 @@ msgstr "تفکیک‌پذیری صفحه"
 #~ msgid "Country / Region"
 #~ msgstr "کشور / منطقه"
 
-#~ msgid "Mandriva Online"
-#~ msgstr "ماندریبا بر اینترنت"
-
 #~ msgid "Updates"
 #~ msgstr "بروزسازی‌ها"
 
diff --git a/po/fi.po b/po/fi.po
index 4de03b47..366c6b57 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakconf\n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2008-03-28 12:06+0200\n"
 "Last-Translator: Anssi Hannula <anssi@mandriva.org>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -40,7 +40,7 @@ msgid ""
 "Mandriva tools"
 msgstr ""
 "lukuisten pakettien uudelleenkääntäminen ja siistiminen, pelit, sparc "
-"alusta, Mandriva Linux työkalujen oikoluku"
+"alusta, %s työkalujen oikoluku"
 
 #: ../contributors.pl:13
 #, c-format
@@ -306,7 +306,8 @@ msgstr "Emmanuel Blindauer"
 #: ../contributors.pl:35
 #, c-format
 msgid "lm_sensors for 2.6 kernel, testing, some contrib packages."
-msgstr "lm_sensors  2.6 sarajn ytimelle, testausta, joitakin contrib paketteja."
+msgstr ""
+"lm_sensors  2.6 sarajn ytimelle, testausta, joitakin contrib paketteja."
 
 #: ../contributors.pl:36
 #, c-format
@@ -546,12 +547,17 @@ msgstr ""
 "Ja monet nimeämättömät ja tuntemattomat betatestaajat ja virheiden "
 "ilmoittajat jotka auttoivat varmistamaan sen toimivan oikein."
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Mandriva Linux avustajia"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Mandriva Linuxin Ohjauskeskus "
+msgid "%s Control Center"
+msgstr "%sin Ohjauskeskus "
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Ladataan... Odota hetki"
@@ -569,8 +575,10 @@ msgstr "Tunnistustapa"
 
 #: ../control-center:153
 #, c-format
-msgid "Select the authentication method (local, NIS, LDAP, Windows Domain, ...)"
-msgstr "Valitse tunnistustapa (paikallinen, NIS, LDAP, Windows Verkkoalue, ...)"
+msgid ""
+"Select the authentication method (local, NIS, LDAP, Windows Domain, ...)"
+msgstr ""
+"Valitse tunnistustapa (paikallinen, NIS, LDAP, Windows Verkkoalue, ...)"
 
 #: ../control-center:162
 #, c-format
@@ -590,7 +598,8 @@ msgstr "Aseta automaattikirjautuminen"
 #: ../control-center:173
 #, c-format
 msgid "Enable autologin and select the user to automatically log in"
-msgstr "Ota automaattikirjautuminen käyttöön ja valitse käyttäjä joka käytetään"
+msgstr ""
+"Ota automaattikirjautuminen käyttöön ja valitse käyttäjä joka käytetään"
 
 #: ../control-center:182
 #, c-format
@@ -689,8 +698,10 @@ msgstr "Aseta henkilökohtainen palomuuri"
 
 #: ../control-center:295
 #, c-format
-msgid "Set up a personal firewall in order to protect the computer and the network"
-msgstr "Asetä henkilökohtainen palomuuri suojaaksesi tietokonetta ja lähiverkkoa."
+msgid ""
+"Set up a personal firewall in order to protect the computer and the network"
+msgstr ""
+"Asetä henkilökohtainen palomuuri suojaaksesi tietokonetta ja lähiverkkoa."
 
 #: ../control-center:304 ../control-center:305
 #, c-format
@@ -938,7 +949,8 @@ msgstr "Ajoitetut tehtävät"
 #: ../control-center:569
 #, c-format
 msgid "Schedule programs to run periodically or at given times"
-msgstr "Määritä ohjelmia joka suoritetaan määräaikaisesti tai märrittyihin aikoihin"
+msgstr ""
+"Määritä ohjelmia joka suoritetaan määräaikaisesti tai märrittyihin aikoihin"
 
 #: ../control-center:578
 #, c-format
@@ -1008,7 +1020,8 @@ msgstr "Aseta turvallisuusaste ja -tarkistus"
 #: ../control-center:649
 #, c-format
 msgid "Set the system security level and the periodic security audit"
-msgstr "Aseta järjestelmän turvallisuusaste ja määräaikainen turvallisuustarkistus"
+msgstr ""
+"Aseta järjestelmän turvallisuusaste ja määräaikainen turvallisuustarkistus"
 
 #: ../control-center:658
 #, c-format
@@ -1147,12 +1160,12 @@ msgstr "Aseta webbipalvelinta"
 msgid "Configure installation server"
 msgstr "Aseta asennuspalvelin"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
-msgstr "Aseta palvelinta Mandriva Linuxin verkkoasennukselle"
+msgid "Set up server for network installations of %s"
+msgstr "Aseta palvelinta %sin verkkoasennukselle"
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "Verkkopalvelut"
@@ -1194,7 +1207,8 @@ msgstr "Aseta aika"
 
 #: ../control-center:837
 #, c-format
-msgid "Set the time of the server to be synchronized with an external time server"
+msgid ""
+"Set the time of the server to be synchronized with an external time server"
 msgstr "Aseta palvelimen aika synkronoitavaksi ulkoisen aikapalvelimen kanssa"
 
 #: ../control-center:839 ../control-center:840
@@ -1275,7 +1289,8 @@ msgstr "Aseta paikalliskone webbiselaimen kautta"
 #: ../control-center:915
 #, c-format
 msgid "You don't seem to have webmin intalled. Local config is disabled"
-msgstr "Sinulla ei ole webmin asennettuna. Paikallinen asetus on poistettu käytöstä"
+msgstr ""
+"Sinulla ei ole webmin asennettuna. Paikallinen asetus on poistettu käytöstä"
 
 #: ../control-center:917
 #, c-format
@@ -1545,17 +1560,17 @@ msgstr "/_Tietoja..."
 msgid "Cancel"
 msgstr "Peruuta"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Mandriva Linuxin Ohjauskeskus %s [%s]"
+msgid "%s Control Center %s [on %s]"
+msgstr "%sin Ohjauskeskus %s [%s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "Tervetuloa Mandriva Linuxin Ohjauskeskukseen"
+msgid "Welcome to the %s Control Center"
+msgstr "Tervetuloa %sin Ohjauskeskukseen"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Virhe"
@@ -1626,12 +1641,12 @@ msgstr "Ylimääräisiä teemoja"
 msgid "Get additional themes on www.damz.net"
 msgstr "Hae lisää teemoja osoitteesta: www.damz.net"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "Tietoja - Mandriva Linuxin Ohjauskeskus"
+msgid "About - %s Control Center"
+msgstr "Tietoja - %sin Ohjauskeskus"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Tekijät: "
@@ -1676,11 +1691,11 @@ msgstr "<tmb@mandrake.org>"
 msgid "Translator: "
 msgstr "Kääntäjä: "
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Mandriva Linux %s (%s) - Ohjauskeskus"
+msgid "%s %s (%s) Control Center"
+msgstr "%s %s (%s) - Ohjauskeskus"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
@@ -1925,4 +1940,3 @@ msgstr "Näyttö"
 #: ../data/XFDrake-Resolution.desktop.in.h:1
 msgid "Screen Resolution"
 msgstr "Näyttötila"
-
diff --git a/po/fr.po b/po/fr.po
index d75b2eb5..96566c12 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakconf-fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2008-03-09 11:56+0100\n"
 "Last-Translator: Christophe Berthelé <cpjc@free.fr>\n"
 "Language-Team: French <cooker-i18n@mandrivalinux.org>\n"
@@ -561,12 +561,17 @@ msgstr ""
 "Ainsi que de nombreux testeurs et rapporteurs de bogues qui ont aidé à "
 "vérifier que tout fonctionne correctement."
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Contributeurs de Mandriva Linux"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Centre de Contrôle Mandriva Linux"
+msgid "%s Control Center"
+msgstr "Centre de Contrôle %s"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Chargement... Veuillez patienter"
@@ -1186,13 +1191,12 @@ msgstr "Mettre en place un serveur web"
 msgid "Configure installation server"
 msgstr "Configurer un serveur d'installation"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
-msgstr ""
-"Mettre en place un serveur pour les installations réseau de Mandriva Linux"
+msgid "Set up server for network installations of %s"
+msgstr "Mettre en place un serveur pour les installations réseau de %s"
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "Services réseau"
@@ -1590,17 +1594,17 @@ msgstr "/A _propos..."
 msgid "Cancel"
 msgstr "Annuler"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Centre de Contrôle de Mandriva Linux %s [sur %s]"
+msgid "%s Control Center %s [on %s]"
+msgstr "Centre de Contrôle de %s %s [sur %s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "Bienvenue dans le Centre de Contrôle de Mandriva Linux"
+msgid "Welcome to the %s Control Center"
+msgstr "Bienvenue dans le Centre de Contrôle de %s"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Erreur"
@@ -1671,12 +1675,12 @@ msgstr "Thèmes supplémentaires"
 msgid "Get additional themes on www.damz.net"
 msgstr "Thèmes additionnels sur www.damz.net"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "À propos - Centre de Contrôle de Mandriva Linux"
+msgid "About - %s Control Center"
+msgstr "À propos - Centre de Contrôle de %s"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Auteurs : "
@@ -1732,11 +1736,11 @@ msgstr ""
 msgid "Translator: "
 msgstr "Traducteur : "
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Centre de Contrôle %s (%s) Mandriva Linux"
+msgid "%s %s (%s) Control Center"
+msgstr "Centre de Contrôle %s (%s) %s"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
diff --git a/po/fur.po b/po/fur.po
index b20f4a27..683e9487 100644
--- a/po/fur.po
+++ b/po/fur.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakconf\n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2004-06-07 23:04+0200\n"
 "Last-Translator: Andrea Gracco <graccoandrea@tin.it>\n"
 "Language-Team: furlan <gft@freelists.org>\n"
@@ -538,12 +538,17 @@ msgstr ""
 "E une vore di beta tester e segnaladôrs di bug cence non che an permitût che "
 "dut chest al funzionedi par bon"
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Mandrivastore"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Centri di Control Mandriva Linux"
+msgid "%s Control Center"
+msgstr "Centri di Control %s"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Cjariament in vore... Par plasè, spiete"
@@ -1141,12 +1146,12 @@ msgstr "Configure web"
 msgid "Configure installation server"
 msgstr "Configure il server di instalazion"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
+msgid "Set up server for network installations of %s"
 msgstr ""
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, fuzzy, c-format
 msgid "Network Services"
 msgstr "Periferiche di rêt"
@@ -1540,17 +1545,17 @@ msgstr "/_Informazions su..."
 msgid "Cancel"
 msgstr "Scancele"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Centri di Control Mandriva Linux %s [su %s]"
+msgid "%s Control Center %s [on %s]"
+msgstr "Centri di Control %s %s [su %s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "Benvignût al Centri di Control Mandriva Linux"
+msgid "Welcome to the %s Control Center"
+msgstr "Benvignût al Centri di Control %s"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Fal"
@@ -1618,12 +1623,12 @@ msgstr "Temis adizionâi"
 msgid "Get additional themes on www.damz.net"
 msgstr "Scjarie altris temis di www.damz.net"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "Informazions sul Centri di Control Mandriva Linux"
+msgid "About - %s Control Center"
+msgstr "Informazions sul Centri di Control %s"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Autôrs: "
@@ -1668,11 +1673,11 @@ msgstr "graccoandrea@tin.it"
 msgid "Translator: "
 msgstr "Tradutôr: "
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, fuzzy, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Centri di Control Mandriva Linux"
+msgid "%s %s (%s) Control Center"
+msgstr "Centri di Control %s"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
@@ -1977,10 +1982,6 @@ msgstr "Risoluzion dal visôr"
 #~ msgid "Country / Region"
 #~ msgstr "Nazion / Regjon"
 
-#, fuzzy
-#~ msgid "Mandriva Online"
-#~ msgstr "Mandrivastore"
-
 #~ msgid "Updates"
 #~ msgstr "Atualizazions"
 
@@ -2101,8 +2102,8 @@ msgstr "Risoluzion dal visôr"
 #~ msgid "Floppy"
 #~ msgstr "Floppy"
 
-#~ msgid "Mandriva Linux Control Center %s\n"
-#~ msgstr "Centri di Control Mandriva Linux %s\n"
+#~ msgid "%s Control Center %s\n"
+#~ msgstr "Centri di Control %s %s\n"
 
 #~ msgid "Previous"
 #~ msgstr "Precedent"
diff --git a/po/ga.po b/po/ga.po
index 44615bd4..102d9eee 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakconf\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2004-03-30 20:06+0100\n"
 "Last-Translator: Séamus Ó Ciardhuáin <seoc at iolfree.ie>\n"
 "Language-Team: Irish <ga@li.org>\n"
@@ -543,12 +543,17 @@ msgstr ""
 "Agus neart béite-thástálaithe neamhainmnithe nó anaithnid agus tuairisceoirí "
 "fabhtanna a chabhraigh chun go n-oibreodh gach rud i gceart."
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Ionad Rialaithe %s"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Ionad Rialaithe Mandriva Linux"
+msgid "%s Control Center"
+msgstr "Ionad Rialaithe %s"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Ag luchtú, fan tamall le do thoil..."
@@ -1140,12 +1145,12 @@ msgstr "Cumraigh Líon na Cruinne Móire"
 msgid "Configure installation server"
 msgstr "Cumraigh freastalaí suiteála"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
+msgid "Set up server for network installations of %s"
 msgstr ""
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, fuzzy, c-format
 msgid "Network Services"
 msgstr "Comhéadain Ghréasáin"
@@ -1539,17 +1544,17 @@ msgstr "/_Eolas..."
 msgid "Cancel"
 msgstr "Cealaigh"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Ionad Rialaithe Mandriva Linux %s [ar %s]"
+msgid "%s Control Center %s [on %s]"
+msgstr "Ionad Rialaithe %s %s [ar %s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "Fáilte go Ionad Rialaithe Mandriva Linux"
+msgid "Welcome to the %s Control Center"
+msgstr "Fáilte go Ionad Rialaithe %s"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Earráid"
@@ -1617,12 +1622,12 @@ msgstr "Téamaí breise"
 msgid "Get additional themes on www.damz.net"
 msgstr "Faigh téamaí breise ó www.damz.net"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "Eolas Faoi Ionad Rialaithe Mandriva Linux"
+msgid "About - %s Control Center"
+msgstr "Eolas Faoi Ionad Rialaithe %s"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Údáir: "
@@ -1667,11 +1672,11 @@ msgstr "~ @ ~"
 msgid "Translator: "
 msgstr "Aistritheoir: "
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, fuzzy, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Ionad Rialaithe Mandriva Linux"
+msgid "%s %s (%s) Control Center"
+msgstr "Ionad Rialaithe %s"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
@@ -1975,10 +1980,6 @@ msgstr "Taifeach an Scáileáin"
 #~ msgid "Country / Region"
 #~ msgstr "Tír"
 
-#, fuzzy
-#~ msgid "Mandriva Online"
-#~ msgstr "Ionad Rialaithe Mandriva Linux"
-
 #~ msgid "Updates"
 #~ msgstr "Leasuithe"
 
@@ -2120,8 +2121,8 @@ msgstr "Taifeach an Scáileáin"
 #~ msgid "Manager Connection"
 #~ msgstr "Riaraigh Ceangal"
 
-#~ msgid "Mandriva Linux Control Center %s\n"
-#~ msgstr "Ionad Rialaithe Mandriva Linux %s\n"
+#~ msgid "%s Control Center %s\n"
+#~ msgstr "Ionad Rialaithe %s %s\n"
 
 #~ msgid "Monitor Connection"
 #~ msgstr "Monatóirigh Ceangal"
diff --git a/po/gl.po b/po/gl.po
index b6e2074f..f9a0f8a7 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakconf-gl\n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2008-04-11 13:16+0100\n"
 "Last-Translator: Leandro Regueiro <leandro DOT regueiro AT gmail DOT com>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
@@ -25,16 +25,19 @@ msgstr ""
 msgid "Packagers"
 msgstr "Empaquetadores"
 
-#: ../contributors.pl:12
-#: ../contributors.pl:40
+#: ../contributors.pl:12 ../contributors.pl:40
 #, c-format
 msgid "Per Oyvind Karlsen"
 msgstr "Per Øyvind Karlsen"
 
 #: ../contributors.pl:12
 #, c-format
-msgid "massive packages rebuilding and cleaning, games, sparc port, proofreading of Mandriva tools"
-msgstr "reconstrucción e limpeza masiva de paquetes, xogos, port a sparc, corrección das ferramentas de Mandriva"
+msgid ""
+"massive packages rebuilding and cleaning, games, sparc port, proofreading of "
+"Mandriva tools"
+msgstr ""
+"reconstrucción e limpeza masiva de paquetes, xogos, port a sparc, corrección "
+"das ferramentas de Mandriva"
 
 #: ../contributors.pl:13
 #, c-format
@@ -73,19 +76,26 @@ msgstr "Ben Reser"
 
 #: ../contributors.pl:16
 #, c-format
-msgid "updated nc with debian patches, fixed some perl packages, dnotify startup script, urpmc, hddtemp, wipe, etc..."
-msgstr "actualizou nc con parches de debian, corrixiu algúns paquetes perl, script de inicio de dnotify, urpmc, hddtemp, wipe, etc..."
+msgid ""
+"updated nc with debian patches, fixed some perl packages, dnotify startup "
+"script, urpmc, hddtemp, wipe, etc..."
+msgstr ""
+"actualizou nc con parches de debian, corrixiu algúns paquetes perl, script "
+"de inicio de dnotify, urpmc, hddtemp, wipe, etc..."
 
-#: ../contributors.pl:17
-#: ../contributors.pl:42
+#: ../contributors.pl:17 ../contributors.pl:42
 #, c-format
 msgid "Thomas Backlund"
 msgstr "Thomas Backlund"
 
 #: ../contributors.pl:17
 #, c-format
-msgid "\"deep and broad\" kernel work (many new patches before integration in official kernel)"
-msgstr "\"amplo e intenso\" traballo no kernel (varios parches novos antes de integralos no kernel oficial)"
+msgid ""
+"\"deep and broad\" kernel work (many new patches before integration in "
+"official kernel)"
+msgstr ""
+"\"amplo e intenso\" traballo no kernel (varios parches novos antes de "
+"integralos no kernel oficial)"
 
 #: ../contributors.pl:18
 #, c-format
@@ -114,8 +124,14 @@ msgstr "Buchan Milne"
 
 #: ../contributors.pl:20
 #, c-format
-msgid "Samba 3.0 (prerelease) that co-exists with Samba 2.2.x, Samba-2.2.x, GIS software (grass, mapserver), cursor_themes collection, misc server-side contributions"
-msgstr "Samba 3.0 (versión previa) que coexiste con Samba 2.2.x, Samba-2.2.x, software GIS (grass, mapserver), colección cursor_themes, varias contribucións á parte de servidor"
+msgid ""
+"Samba 3.0 (prerelease) that co-exists with Samba 2.2.x, Samba-2.2.x, GIS "
+"software (grass, mapserver), cursor_themes collection, misc server-side "
+"contributions"
+msgstr ""
+"Samba 3.0 (versión previa) que coexiste con Samba 2.2.x, Samba-2.2.x, "
+"software GIS (grass, mapserver), colección cursor_themes, varias "
+"contribucións á parte de servidor"
 
 #: ../contributors.pl:21
 #, c-format
@@ -124,8 +140,12 @@ msgstr "Goetz Waschk"
 
 #: ../contributors.pl:21
 #, c-format
-msgid "xine, totem, gstreamer, mplayer, vlc, vcdimager, xmms and plugins gnome-python, rox desktop"
-msgstr "xine, totem, gstreamer, mplayer, vlc, vcdimager, xmms e os plugins gnome-python, o escritorio rox"
+msgid ""
+"xine, totem, gstreamer, mplayer, vlc, vcdimager, xmms and plugins gnome-"
+"python, rox desktop"
+msgstr ""
+"xine, totem, gstreamer, mplayer, vlc, vcdimager, xmms e os plugins gnome-"
+"python, o escritorio rox"
 
 #: ../contributors.pl:22
 #, c-format
@@ -134,8 +154,12 @@ msgstr "Austin Acton"
 
 #: ../contributors.pl:22
 #, c-format
-msgid "audio/video/MIDI apps, scientific apps, audio/video production howtos, bluetooth, pyqt & related"
-msgstr "aplicacións de audio/video/MIDI, aplicacións científicas, howtos de producción de audio/vídeo, bluetooth, pyqt & relacionados"
+msgid ""
+"audio/video/MIDI apps, scientific apps, audio/video production howtos, "
+"bluetooth, pyqt & related"
+msgstr ""
+"aplicacións de audio/video/MIDI, aplicacións científicas, howtos de "
+"producción de audio/vídeo, bluetooth, pyqt & relacionados"
 
 #: ../contributors.pl:23
 #, c-format
@@ -165,7 +189,9 @@ msgstr "Oden Eriksson"
 #: ../contributors.pl:25
 #, c-format
 msgid "most web-based packages and many security-related packages"
-msgstr "a maioría dos paquetes baseados en web e moitos dos paquetes relacionados ca seguridade"
+msgstr ""
+"a maioría dos paquetes baseados en web e moitos dos paquetes relacionados ca "
+"seguridade"
 
 #: ../contributors.pl:26
 #, c-format
@@ -197,16 +223,19 @@ msgstr "Andi Payn"
 msgid "many extra gnome applets and python modules"
 msgstr "varias applets extra de gnome e módulos de python"
 
-#: ../contributors.pl:29
-#: ../contributors.pl:41
+#: ../contributors.pl:29 ../contributors.pl:41
 #, c-format
 msgid "Tibor Pittich"
 msgstr "Tibor Pittich"
 
 #: ../contributors.pl:29
 #, c-format
-msgid "sk-i18n, contributed several packages, openldap testing and integration, bind-sdb-ldap, several years of using cooker and bug hunting, etc..."
-msgstr "sk-i18n, contribuiu con varios paquetes, comprobación e integración de openldap, bind-sdb-ldap, varios anos usando cooker e buscando erros, etc..."
+msgid ""
+"sk-i18n, contributed several packages, openldap testing and integration, "
+"bind-sdb-ldap, several years of using cooker and bug hunting, etc..."
+msgstr ""
+"sk-i18n, contribuiu con varios paquetes, comprobación e integración de "
+"openldap, bind-sdb-ldap, varios anos usando cooker e buscando erros, etc..."
 
 #: ../contributors.pl:30
 #, c-format
@@ -245,8 +274,12 @@ msgstr "Brook Humphrey"
 
 #: ../contributors.pl:33
 #, c-format
-msgid "testing and bug reports, Dovecot, bibletime, sword, help with pure-ftpd, spamassassin, maildrop, clamav."
-msgstr "comprobación e comunicación de erros, Dovecot, bibletime, sword, axuda con pure-ftpd, spamassassin, maildrop, clamav."
+msgid ""
+"testing and bug reports, Dovecot, bibletime, sword, help with pure-ftpd, "
+"spamassassin, maildrop, clamav."
+msgstr ""
+"comprobación e comunicación de erros, Dovecot, bibletime, sword, axuda con "
+"pure-ftpd, spamassassin, maildrop, clamav."
 
 #: ../contributors.pl:34
 #, c-format
@@ -255,8 +288,14 @@ msgstr "Olivier Blin"
 
 #: ../contributors.pl:34
 #, c-format
-msgid "http proxy support in installer, kernel 2.6 support in sndconfig, samba3 support in LinNeighborhood, fixes and enhancements in urpmi, bootsplash and drakxtools"
-msgstr "soporte para proxy http no instalador, soporte para kernels 2.6 en sndconfig, soporte para samba3 en LinNeighborhood, correccións e melloras en urpmi, bootsplash e drakxtools"
+msgid ""
+"http proxy support in installer, kernel 2.6 support in sndconfig, samba3 "
+"support in LinNeighborhood, fixes and enhancements in urpmi, bootsplash and "
+"drakxtools"
+msgstr ""
+"soporte para proxy http no instalador, soporte para kernels 2.6 en "
+"sndconfig, soporte para samba3 en LinNeighborhood, correccións e melloras en "
+"urpmi, bootsplash e drakxtools"
 
 #: ../contributors.pl:35
 #, c-format
@@ -301,7 +340,8 @@ msgstr "Tradutores"
 #: ../contributors.pl:40
 #, c-format
 msgid "Norwegian Bokmal (nb) translator and coordinator, i18n work"
-msgstr "Tradutor e coordinador da tradución ó Bokmal Noruegués (nb), traballo na i18n"
+msgstr ""
+"Tradutor e coordinador da tradución ó Bokmal Noruegués (nb), traballo na i18n"
 
 #: ../contributors.pl:41
 #, c-format
@@ -358,27 +398,22 @@ msgstr "Tradutor ó Estonio"
 msgid "Andrea Celli"
 msgstr "Andrea Celli"
 
-#: ../contributors.pl:47
-#: ../contributors.pl:48
-#: ../contributors.pl:49
+#: ../contributors.pl:47 ../contributors.pl:48 ../contributors.pl:49
 #, c-format
 msgid "Italian Translator"
 msgstr "Tradutor ó Italiano"
 
-#: ../contributors.pl:48
-#: ../contributors.pl:64
+#: ../contributors.pl:48 ../contributors.pl:64
 #, c-format
 msgid "Simone Riccio"
 msgstr "Simone Riccio"
 
-#: ../contributors.pl:49
-#: ../contributors.pl:65
+#: ../contributors.pl:49 ../contributors.pl:65
 #, c-format
 msgid "Daniele Pighin"
 msgstr "Daniele Pighin"
 
-#: ../contributors.pl:50
-#: ../contributors.pl:68
+#: ../contributors.pl:50 ../contributors.pl:68
 #, c-format
 msgid "Vedran Ljubovic"
 msgstr "Vedran Ljubovic"
@@ -408,15 +443,9 @@ msgstr "comprobación e comunicación de erros, integración do driver eagle-usb
 msgid "Bernhard Gruen"
 msgstr "Bernhard Gruen"
 
-#: ../contributors.pl:53
-#: ../contributors.pl:54
-#: ../contributors.pl:55
-#: ../contributors.pl:56
-#: ../contributors.pl:57
-#: ../contributors.pl:58
-#: ../contributors.pl:59
-#: ../contributors.pl:60
-#: ../contributors.pl:61
+#: ../contributors.pl:53 ../contributors.pl:54 ../contributors.pl:55
+#: ../contributors.pl:56 ../contributors.pl:57 ../contributors.pl:58
+#: ../contributors.pl:59 ../contributors.pl:60 ../contributors.pl:61
 #: ../contributors.pl:62
 #, c-format
 msgid "testing and bug reporting"
@@ -477,12 +506,8 @@ msgstr "Raphael Gertz"
 msgid "testing, bug report, Nvidia package try"
 msgstr "comprobación, comunicación de erros, intento do paquete Nvidia"
 
-#: ../contributors.pl:64
-#: ../contributors.pl:65
-#: ../contributors.pl:66
-#: ../contributors.pl:67
-#: ../contributors.pl:68
-#: ../contributors.pl:69
+#: ../contributors.pl:64 ../contributors.pl:65 ../contributors.pl:66
+#: ../contributors.pl:67 ../contributors.pl:68 ../contributors.pl:69
 #, c-format
 msgid "testing, bug reporting"
 msgstr "comprobación, comunicación de erros"
@@ -514,39 +539,45 @@ msgstr "MD, comprobación, comunicación de erros"
 
 #: ../contributors.pl:71
 #, c-format
-msgid "And many unnamed and unknown beta testers and bug reporters that helped make sure it all worked right."
-msgstr "E moitos comprobadores beta e comunicadores de erros sen nome e descoñecidos que axudaron a asegurar que todo funciona correctamente."
+msgid ""
+"And many unnamed and unknown beta testers and bug reporters that helped make "
+"sure it all worked right."
+msgstr ""
+"E moitos comprobadores beta e comunicadores de erros sen nome e descoñecidos "
+"que axudaron a asegurar que todo funciona correctamente."
+
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Mandriva Online"
 
-#: ../control-center:97
-#: ../control-center:104
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Centro de Control de Mandriva Linux"
+msgid "%s Control Center"
+msgstr "Centro de Control de %s"
 
-#: ../control-center:107
-#: ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Cargando... Agarde un cacho"
 
-#: ../control-center:140
-#: ../control-center:141
+#: ../control-center:140 ../control-center:141
 #, c-format
 msgid "Configure 3D Desktop effects"
 msgstr "Configurar os efectos 3D do Escritorio"
 
 #. -PO: this message is already translated in drakx domain from which MCC will searchs it:
-#: ../control-center:152
-#: ../control-center:850
-#: ../control-center:853
+#: ../control-center:152 ../control-center:850 ../control-center:853
 #, c-format
 msgid "Authentication"
 msgstr "Autenticación"
 
 #: ../control-center:153
 #, c-format
-msgid "Select the authentication method (local, NIS, LDAP, Windows Domain, ...)"
-msgstr "Seleccione o método de autenticación (local, NIS, LDAP, Dominio Windows, ...)"
+msgid ""
+"Select the authentication method (local, NIS, LDAP, Windows Domain, ...)"
+msgstr ""
+"Seleccione o método de autenticación (local, NIS, LDAP, Dominio Windows, ...)"
 
 #: ../control-center:162
 #, c-format
@@ -566,7 +597,9 @@ msgstr "Configura o login automático para entrar automáticamente no sistema"
 #: ../control-center:173
 #, c-format
 msgid "Enable autologin and select the user to automatically log in"
-msgstr "Habilita o login automático e selecciona o usuario que entrará automáticamente"
+msgstr ""
+"Habilita o login automático e selecciona o usuario que entrará "
+"automáticamente"
 
 #: ../control-center:182
 #, c-format
@@ -613,14 +646,12 @@ msgstr "Disquete de arrinque"
 msgid "Generate a standalone boot floppy"
 msgstr "Xerar un disquete de arrinque independente"
 
-#: ../control-center:223
-#: ../control-center:224
+#: ../control-center:223 ../control-center:224
 #, c-format
 msgid "Share the Internet connection with other local machines"
 msgstr "Compartir a conexión á Internet con outras máquinas locais"
 
-#: ../control-center:233
-#: ../control-center:234
+#: ../control-center:233 ../control-center:234
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Configurar unha nova interface de rede (LAN, RDSI, ADSL, ...)"
@@ -635,14 +666,12 @@ msgstr "Acceso á Internet"
 msgid "Alter miscellaneous internet settings"
 msgstr "Modificar as diversas opcións da Internet"
 
-#: ../control-center:253
-#: ../control-center:254
+#: ../control-center:253 ../control-center:254
 #, c-format
 msgid "Open a console as administrator"
 msgstr "Abrir unha consola coma administrador"
 
-#: ../control-center:264
-#: ../control-center:265
+#: ../control-center:264 ../control-center:265
 #, c-format
 msgid "Manage date and time"
 msgstr "Xestiona a data e a hora"
@@ -655,10 +684,11 @@ msgstr "Configura o xestor de entrada"
 #: ../control-center:275
 #, c-format
 msgid "Choose the display manager that enables to select which user to log in"
-msgstr "Escoller o xestor de entrada que permite seleccionar que usuario entra no sistema"
+msgstr ""
+"Escoller o xestor de entrada que permite seleccionar que usuario entra no "
+"sistema"
 
-#: ../control-center:284
-#: ../control-center:285
+#: ../control-center:284 ../control-center:285
 #, c-format
 msgid "Configure a fax server"
 msgstr "Configurar un servidor de fax"
@@ -670,17 +700,16 @@ msgstr "Configure o seu cortalumes persoal"
 
 #: ../control-center:295
 #, c-format
-msgid "Set up a personal firewall in order to protect the computer and the network"
+msgid ""
+"Set up a personal firewall in order to protect the computer and the network"
 msgstr "Configure un cortalumes persoal para protexer o ordenador e a rede"
 
-#: ../control-center:304
-#: ../control-center:305
+#: ../control-center:304 ../control-center:305
 #, c-format
 msgid "Manage, add and remove fonts. Import Windows(TM) fonts"
 msgstr "Administrar, engadir e eliminar fontes. Importar fontes de Windows(TM)"
 
-#: ../control-center:314
-#: ../control-center:315
+#: ../control-center:314 ../control-center:315
 #, c-format
 msgid "Set up the graphical server"
 msgstr "Configurar o servidor gráfico"
@@ -695,14 +724,12 @@ msgstr "Administrar as particións do disco"
 msgid "Create, delete and resize hard disk partitions"
 msgstr "Cree, elimine e redimensione as particións do disco duro"
 
-#: ../control-center:334
-#: ../control-center:335
+#: ../control-center:334 ../control-center:335
 #, c-format
 msgid "Browse and configure hardware"
 msgstr "Examinar e configurar o hardware"
 
-#: ../control-center:345
-#: ../control-center:346
+#: ../control-center:345 ../control-center:346
 #, c-format
 msgid "Sound Configuration"
 msgstr "Configuración do Son"
@@ -735,10 +762,10 @@ msgstr "Configuración avanzada das interfaces de rede e cortalumes"
 #: ../control-center:367
 #, c-format
 msgid "Set up network interfaces failover and firewall replication"
-msgstr "Configurar o respaldo de interfaces de rede e a replicación de cortalumes"
+msgstr ""
+"Configurar o respaldo de interfaces de rede e a replicación de cortalumes"
 
-#: ../control-center:376
-#: ../control-center:377
+#: ../control-center:376 ../control-center:377
 #, c-format
 msgid "Set up the keyboard layout"
 msgstr "Configurar a disposición do teclado"
@@ -763,8 +790,7 @@ msgstr "Xestionar a localización do seu sistema"
 msgid "Select the language and the country or region of the system"
 msgstr "Seleccione a lingua e o país ou rexión do sistema"
 
-#: ../control-center:405
-#: ../control-center:406
+#: ../control-center:405 ../control-center:406
 #, c-format
 msgid "View and search system logs"
 msgstr "Ver e buscar os rexistros (logs) do sistema"
@@ -782,12 +808,17 @@ msgstr "Volver configurar unha interface de rede"
 #: ../control-center:425
 #, c-format
 msgid "Upload your configuration to get information on upgrades"
-msgstr "Suba a súa configuración para manterse informado acerca de actualización"
+msgstr ""
+"Suba a súa configuración para manterse informado acerca de actualización"
 
 #: ../control-center:426
 #, c-format
-msgid "Upload your configuration in order to keep you informed about security and useful upgrades"
-msgstr "Suba a súa configuración para manterse informado acerca de actualizacións de seguridade e outras actualizacións útiles"
+msgid ""
+"Upload your configuration in order to keep you informed about security and "
+"useful upgrades"
+msgstr ""
+"Suba a súa configuración para manterse informado acerca de actualizacións de "
+"seguridade e outras actualizacións útiles"
 
 #: ../control-center:435
 #, c-format
@@ -806,8 +837,12 @@ msgstr "Actualizar o seu sistema"
 
 #: ../control-center:446
 #, c-format
-msgid "Look at available updates and apply any fixes or upgrades to installed packages"
-msgstr "Buscar as actualizacións dispoñibles e aplicar calquera corrección ou actualización para os paquetes instalados"
+msgid ""
+"Look at available updates and apply any fixes or upgrades to installed "
+"packages"
+msgstr ""
+"Buscar as actualizacións dispoñibles e aplicar calquera corrección ou "
+"actualización para os paquetes instalados"
 
 #: ../control-center:456
 #, c-format
@@ -819,8 +854,7 @@ msgstr "Estilo do Menú"
 msgid "Menu Style Configuration"
 msgstr "Configuración do Estilo do Menú"
 
-#: ../control-center:466
-#: ../control-center:467
+#: ../control-center:466 ../control-center:467
 #, c-format
 msgid "Import Windows(TM) documents and settings"
 msgstr "Importar o documents and settings de Windows(TM)"
@@ -835,14 +869,12 @@ msgstr "Monitoriza-las conexións"
 msgid "Monitor the network connections"
 msgstr "Monitorizar as conexións de rede"
 
-#: ../control-center:486
-#: ../control-center:487
+#: ../control-center:486 ../control-center:487
 #, c-format
 msgid "Set up the pointer device (mouse, touchpad)"
 msgstr "Configurar o dispositivo de punteiro (rato, touchpad)"
 
-#: ../control-center:505
-#: ../control-center:506
+#: ../control-center:505 ../control-center:506
 #, c-format
 msgid "Parental Controls"
 msgstr "Controis Parentais"
@@ -852,8 +884,7 @@ msgstr "Controis Parentais"
 msgid "Network Center"
 msgstr "Centro de Rede"
 
-#: ../control-center:497
-#: ../control-center:974
+#: ../control-center:497 ../control-center:974
 #, c-format
 msgid "Manage your network devices"
 msgstr "Xestione os seus dispositivos de rede"
@@ -908,8 +939,7 @@ msgstr "Comparta as particións do seu disco duro"
 msgid "Set up sharing of your hard disk partitions"
 msgstr "Configure a compartición das particións do seu disco duro"
 
-#: ../control-center:557
-#: ../control-center:559
+#: ../control-center:557 ../control-center:559
 #, c-format
 msgid "Set up the printer(s), the print job queues, ..."
 msgstr "Configure as impresoras, as colas de traballos de impresión, ..."
@@ -954,8 +984,7 @@ msgstr "Eliminar unha conexión"
 msgid "Delete a network interface"
 msgstr "Eliminar unha interface de rede"
 
-#: ../control-center:608
-#: ../control-center:609
+#: ../control-center:608 ../control-center:609
 #, c-format
 msgid "Wireless connection"
 msgstr "Conexión Wireless"
@@ -980,8 +1009,7 @@ msgstr "Compartir unidades e directorios con sistemas Windows (SMB)"
 msgid "Manage configuration of Samba"
 msgstr "Administrar a configuración de Samba"
 
-#: ../control-center:638
-#: ../control-center:639
+#: ../control-center:638 ../control-center:639
 #, c-format
 msgid "Set up scanner"
 msgstr "Configurar un escáner"
@@ -994,7 +1022,9 @@ msgstr "Configurar o nivel de seguridade e de auditoría de seguridade"
 #: ../control-center:649
 #, c-format
 msgid "Set the system security level and the periodic security audit"
-msgstr "Configurar o nivel de seguridade do sistema e a auditoría periódica de seguridade"
+msgstr ""
+"Configurar o nivel de seguridade do sistema e a auditoría periódica de "
+"seguridade"
 
 #: ../control-center:658
 #, c-format
@@ -1006,8 +1036,7 @@ msgstr "Axustar os permisos do sistema"
 msgid "Fine tune the security permissions of the system"
 msgstr "Axustar os permisos de seguridade do sistema"
 
-#: ../control-center:668
-#: ../control-center:669
+#: ../control-center:668 ../control-center:669
 #, c-format
 msgid "Manage system services by enabling or disabling them"
 msgstr "Xestionar os servizos do sistema activándoos ou desactivándoos"
@@ -1024,8 +1053,7 @@ msgstr "Seleccione dende onde se descargan os paquetes de software"
 
 #. -PO: here power means electrical power
 #. -PO: UPS==Uninterruptible power supply
-#: ../control-center:691
-#: ../control-center:694
+#: ../control-center:691 ../control-center:694
 #, c-format
 msgid "Set up a UPS for power monitoring"
 msgstr "Configurar un SAI para a monitorización da enerxía"
@@ -1050,8 +1078,7 @@ msgstr "Virtualización"
 msgid "Virtual machines management"
 msgstr "Xestión de máquinas virtuais"
 
-#: ../control-center:725
-#: ../control-center:726
+#: ../control-center:725 ../control-center:726
 #, c-format
 msgid "Configure VPN connection to secure network access"
 msgstr "Configurar unha conexión VPN para acceder a unha rede segura"
@@ -1066,15 +1093,12 @@ msgstr "Acceder a unidades e directorios compartidos por WebDAV"
 msgid "Set WebDAV mount points"
 msgstr "Configurar os puntos de montaxe WebDAV"
 
-#: ../control-center:767
-#: ../control-center:771
+#: ../control-center:767 ../control-center:771
 #, c-format
 msgid "Software Management"
 msgstr "Xestión do Software"
 
-#: ../control-center:781
-#: ../control-center:962
-#: ../control-center:996
+#: ../control-center:781 ../control-center:962 ../control-center:996
 #: ../control-center:1148
 #, c-format
 msgid "Others"
@@ -1085,8 +1109,7 @@ msgstr "Outros"
 msgid "Server wizards"
 msgstr "Asistentes de servidor"
 
-#: ../control-center:793
-#: ../control-center:796
+#: ../control-center:793 ../control-center:796
 #, c-format
 msgid "Sharing"
 msgstr "Compartimento"
@@ -1108,8 +1131,12 @@ msgstr "Configurar Samba"
 
 #: ../control-center:803
 #, c-format
-msgid "Set up a file and print server for workstations running Linux and non-Linux systems"
-msgstr "Configurar un servidor de impresión e ficheiros para estacións de traballo con sistemas GNU/Linux e diferentes de GNU/Linux"
+msgid ""
+"Set up a file and print server for workstations running Linux and non-Linux "
+"systems"
+msgstr ""
+"Configurar un servidor de impresión e ficheiros para estacións de traballo "
+"con sistemas GNU/Linux e diferentes de GNU/Linux"
 
 #: ../control-center:805
 #, c-format
@@ -1119,7 +1146,8 @@ msgstr "Administrar recurso Samba"
 #: ../control-center:806
 #, c-format
 msgid "Manage, create special share, create public/user share"
-msgstr "Administrar, crear un recurso especial, crear un recurso público/de usuario"
+msgstr ""
+"Administrar, crear un recurso especial, crear un recurso público/de usuario"
 
 #: ../control-center:808
 #, c-format
@@ -1136,13 +1164,12 @@ msgstr "Configurar un servidor web"
 msgid "Configure installation server"
 msgstr "Configurar un servidor de instalación"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
-msgstr "Configurar un servidor para instalacións de Mandriva Linux dende rede "
+msgid "Set up server for network installations of %s"
+msgstr "Configurar un servidor para instalacións de %s dende rede "
 
-#: ../control-center:821
-#: ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "Servizos de Rede"
@@ -1184,11 +1211,13 @@ msgstr "Configura-la hora"
 
 #: ../control-center:837
 #, c-format
-msgid "Set the time of the server to be synchronized with an external time server"
-msgstr "Establecer se a hora do sistema debe sincronizarse cun servidor de tempo externo"
+msgid ""
+"Set the time of the server to be synchronized with an external time server"
+msgstr ""
+"Establecer se a hora do sistema debe sincronizarse cun servidor de tempo "
+"externo"
 
-#: ../control-center:839
-#: ../control-center:840
+#: ../control-center:839 ../control-center:840
 #, c-format
 msgid "OpenSSH daemon configuration"
 msgstr "Configuración do daemon OpenSSH"
@@ -1213,8 +1242,7 @@ msgstr "Configurar LDAP"
 msgid "Configure the LDAP directory services"
 msgstr "Configure os servizos do directorio LDAP"
 
-#: ../control-center:871
-#: ../control-center:874
+#: ../control-center:871 ../control-center:874
 #, c-format
 msgid "Groupware"
 msgstr "Groupware"
@@ -1249,8 +1277,7 @@ msgstr "Configura-lo correo"
 msgid "Configure the Internet Mail services"
 msgstr "Configure os servizos de Correo de Internet"
 
-#: ../control-center:895
-#: ../control-center:898
+#: ../control-center:895 ../control-center:898
 #, c-format
 msgid "Online Administration"
 msgstr "Administración en liña"
@@ -1268,7 +1295,9 @@ msgstr "Configure a máquina local usando unha interface web"
 #: ../control-center:915
 #, c-format
 msgid "You don't seem to have webmin intalled. Local config is disabled"
-msgstr "Semella ser que non ten webmin instalado. A configuración local está deshabilitada"
+msgstr ""
+"Semella ser que non ten webmin instalado. A configuración local está "
+"deshabilitada"
 
 #: ../control-center:917
 #, c-format
@@ -1278,7 +1307,9 @@ msgstr "Administración remota"
 #: ../control-center:918
 #, c-format
 msgid "Click here if you want to configure a remote box via Web interface"
-msgstr "Prema aquí se desexa configurar unha máquina remota a través dunha interface Web"
+msgstr ""
+"Prema aquí se desexa configurar unha máquina remota a través dunha interface "
+"Web"
 
 #: ../control-center:931
 #, c-format
@@ -1305,8 +1336,7 @@ msgstr "Configure o rato e mailo teclado"
 msgid "Configure printing and scanning"
 msgstr "Configurar a impresión e a dixitalización"
 
-#: ../control-center:971
-#: ../drakxconf:28
+#: ../control-center:971 ../drakxconf:28
 #, c-format
 msgid "Network & Internet"
 msgstr "Rede e Internet"
@@ -1356,8 +1386,7 @@ msgstr "Configurar recursos NFS"
 msgid "Configure WebDAV shares"
 msgstr "Configurar recursos WebDAV"
 
-#: ../control-center:1065
-#: ../control-center:1068
+#: ../control-center:1065 ../control-center:1068
 #, c-format
 msgid "Local disks"
 msgstr "Disco locais"
@@ -1412,8 +1441,7 @@ msgstr "Unidade ZIP"
 msgid "Set where your ZIP drive is mounted"
 msgstr "Configure onde se monta a súa unidade ZIP"
 
-#: ../control-center:1115
-#: ../control-center:1118
+#: ../control-center:1115 ../control-center:1118
 #, c-format
 msgid "Security"
 msgstr "Seguridade"
@@ -1438,9 +1466,7 @@ msgstr "Aparencia do arrinque"
 msgid "Additional wizards"
 msgstr "Asistentes adicionais"
 
-#: ../control-center:1211
-#: ../control-center:1212
-#: ../control-center:1213
+#: ../control-center:1211 ../control-center:1212 ../control-center:1213
 #: ../control-center:1226
 #, c-format
 msgid "/_Options"
@@ -1461,9 +1487,7 @@ msgstr "/Modo _Embebido"
 msgid "/Expert mode in _wizards"
 msgstr "/_Modo experto nos asistentes"
 
-#: ../control-center:1223
-#: ../control-center:1224
-#: ../control-center:1225
+#: ../control-center:1223 ../control-center:1224 ../control-center:1225
 #, c-format
 msgid "/_File"
 msgstr "/_Ficheiro"
@@ -1483,9 +1507,7 @@ msgstr "<control>Q"
 msgid "Quit"
 msgstr "Saír"
 
-#: ../control-center:1246
-#: ../control-center:1249
-#: ../control-center:1262
+#: ../control-center:1246 ../control-center:1249 ../control-center:1262
 #, c-format
 msgid "/_Themes"
 msgstr "/_Temas"
@@ -1504,20 +1526,14 @@ msgstr ""
 msgid "/_More themes"
 msgstr "/_Máis temas"
 
-#: ../control-center:1264
-#: ../control-center:1265
-#: ../control-center:1266
-#: ../control-center:1267
-#: ../control-center:1268
-#: ../control-center:1269
+#: ../control-center:1264 ../control-center:1265 ../control-center:1266
+#: ../control-center:1267 ../control-center:1268 ../control-center:1269
 #: ../control-center:1272
 #, c-format
 msgid "/_Help"
 msgstr "/A_xuda"
 
-#: ../control-center:1265
-#: ../control-center:1266
-#: ../control-center:1267
+#: ../control-center:1265 ../control-center:1266 ../control-center:1267
 #: ../control-center:1268
 #, c-format
 msgid "Help"
@@ -1553,18 +1569,17 @@ msgstr "/_Acerca de..."
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Centro de Control de Mandriva Linux %s [en %s]"
+msgid "%s Control Center %s [on %s]"
+msgstr "Centro de Control de %s %s [en %s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "Benvid@ ó Centro de Control de Mandriva Linux"
+msgid "Welcome to the %s Control Center"
+msgstr "Benvid@ ó Centro de Control de %s"
 
-#: ../control-center:1531
-#: ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Erro"
@@ -1610,8 +1625,7 @@ msgstr "Este programa rematou de forma anormal"
 msgid "Warning"
 msgstr "Advertencia"
 
-#: ../control-center:1909
-#: ../drakconsole:31
+#: ../control-center:1909 ../drakconsole:31
 #, c-format
 msgid "Close"
 msgstr "Pechar"
@@ -1636,12 +1650,12 @@ msgstr "Temas adicionais"
 msgid "Get additional themes on www.damz.net"
 msgstr "Conseguir temas adicionais en www.damz.net"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "Acerca de - Centro de Control de Mandriva Linux"
+msgid "About - %s Control Center"
+msgstr "Acerca de - Centro de Control de %s"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Autores: "
@@ -1686,11 +1700,11 @@ msgstr "leandro.regueiro@gmail.com, jba@pobox.com"
 msgid "Translator: "
 msgstr "Tradutores: "
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Centro de Control de Mandriva Linux %s (%s)"
+msgid "%s %s (%s) Control Center"
+msgstr "Centro de Control de %s %s (%s)"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
@@ -1778,8 +1792,7 @@ msgstr "Centro de control"
 msgid "Choose the tool you want to use"
 msgstr "Escolla a ferramenta que desexe usar"
 
-#: ../menus_launcher.pl:19
-#: ../menus_launcher.pl:41
+#: ../menus_launcher.pl:19 ../menus_launcher.pl:41
 #, c-format
 msgid "Menu Configuration Center"
 msgstr "Centro de Configuración dos Menús"
@@ -1789,9 +1802,7 @@ msgstr "Centro de Configuración dos Menús"
 msgid "System menu"
 msgstr "Menú do sistema"
 
-#: ../menus_launcher.pl:29
-#: ../menus_launcher.pl:36
-#: ../print_launcher.pl:31
+#: ../menus_launcher.pl:29 ../menus_launcher.pl:36 ../print_launcher.pl:31
 #, c-format
 msgid "Configure..."
 msgstr "Configurar..."
@@ -1812,8 +1823,7 @@ msgstr ""
 "\n"
 "Escolla o menú que desexa configurar"
 
-#: ../print_launcher.pl:14
-#: ../print_launcher.pl:21
+#: ../print_launcher.pl:14 ../print_launcher.pl:21
 #, c-format
 msgid "Printing configuration"
 msgstr "Configuración da impresión"
@@ -1942,18 +1952,25 @@ msgstr "Resolución da Pantalla"
 
 #~ msgid "/_Upload the hardware list"
 #~ msgstr "/_Subir a lista de hardware"
+
 #~ msgid "<control>U"
 #~ msgstr "<control>U"
+
 #~ msgid "Upload the hardware list"
 #~ msgstr "Subir a lista de hardware"
+
 #~ msgid "Account:"
 #~ msgstr "Conta:"
+
 #~ msgid "Password:"
 #~ msgstr "Contrasinal:"
+
 #~ msgid "Hostname:"
 #~ msgstr "Nome de máquina:"
+
 #~ msgid "Please wait"
 #~ msgstr "Agarde"
+
 #~ msgid "Uploading in progress"
 #~ msgstr "Subindo"
 
@@ -1964,90 +1981,121 @@ msgstr "Resolución da Pantalla"
 #, fuzzy
 #~ msgid "Use NFS shares"
 #~ msgstr "Administrar os recursos NFS"
+
 #~ msgid "Manage Samba configuration"
 #~ msgstr "Administrar a configuración de Samba"
 
 #, fuzzy
 #~ msgid "Use WebDAV shares"
 #~ msgstr "Configurar o servidor web"
+
 #~ msgid "CD-ROM"
 #~ msgstr "CD-ROM"
+
 #~ msgid "Boot theme"
 #~ msgstr "Tema do arrinque"
+
 #~ msgid "Console"
 #~ msgstr "Consola"
+
 #~ msgid "Adjust the date and the time"
 #~ msgstr "Configurar a data e a hora"
+
 #~ msgid "Fax"
 #~ msgstr "Fax"
+
 #~ msgid "Software Media Manager"
 #~ msgstr "Xestor de Soportes de Software"
+
 #~ msgid "Invictus Firewall"
 #~ msgstr "Cortalumes Invictus"
+
 #~ msgid "Language"
 #~ msgstr "Lingua"
+
 #~ msgid "Country / Region"
 #~ msgstr "País / Rexión"
-#~ msgid "Mandriva Online"
-#~ msgstr "Mandriva Online"
+
 #~ msgid "Updates"
 #~ msgstr "Actualizacións"
 
 #, fuzzy
 #~ msgid "Control and configure network connections"
 #~ msgstr "Monitorizar as conexións de rede"
+
 #~ msgid "Network Profiles"
 #~ msgstr "Perfís de Rede"
+
 #~ msgid "Local disk sharing"
 #~ msgstr "Compartición do disco local"
+
 #~ msgid "Enable or disable the system services"
 #~ msgstr "Activar ou desactivar os servizos do sistema"
+
 #~ msgid "Media Manager"
 #~ msgstr "Xestor de Soportes"
+
 #~ msgid "UPS"
 #~ msgstr "SAI"
+
 #~ msgid "VPN configuration"
 #~ msgstr "Configuración de VPN"
 
 #, fuzzy
 #~ msgid "Configure Software management"
 #~ msgstr "Xestión do Software"
+
 #~ msgid "Install"
 #~ msgstr "Instalar"
+
 #~ msgid "Look at installable software and install software packages"
 #~ msgstr "Mirar o software instalable e instalar paquetes de software"
+
 #~ msgid "Remove"
 #~ msgstr "Eliminar"
+
 #~ msgid "Look at installed software and uninstall software packages"
 #~ msgstr "Mirar o software instalado e desinstalar paquetes de software"
+
 #~ msgid "Screen resolution"
 #~ msgstr "Resolución"
+
 #~ msgid "Change the screen resolution"
 #~ msgstr "Cambia-la resolución da pantalla"
+
 #~ msgid "TV card"
 #~ msgstr "Tarxeta de TV"
+
 #~ msgid "Set up TV card"
 #~ msgstr "Configurar unha tarxeta de TV"
+
 #~ msgid "/_Expert mode"
 #~ msgstr "/Modo e_xperto"
+
 #~ msgid "Set Samba mount points"
 #~ msgstr "Configurar os puntos de montaxe Samba"
+
 #~ msgid "Samba printing configuration"
 #~ msgstr "Configuración de impresión de Samba"
+
 #~ msgid "Enable or disable printers in your Samba server configuration"
 #~ msgstr ""
 #~ "Habilitar ou deshabilitar as impresoras na configuración do seu servidor "
 #~ "Samba"
+
 #~ msgid "(original C version)"
 #~ msgstr "(versión en C orixinal)"
+
 #~ msgid "(design)"
 #~ msgstr "(deseño)"
+
 #~ msgid ""
 #~ "Select the application menu layout and change which programs are shown on "
 #~ "the menu"
 #~ msgstr ""
 #~ "Seleccione a disposición do menú de aplicacións e cambie os programas que "
 #~ "se amosan no menú"
+
 #~ msgid ""
 #~ "We are about to switch from the \"%s\" profile to the \"%s\" profile.\n"
 #~ "\n"
@@ -2056,4 +2104,3 @@ msgstr "Resolución da Pantalla"
 #~ "Está a piques de cambiar dende o perfil \"%s\" ó perfil \"%s\".\n"
 #~ "\n"
 #~ "Está seguro de que desexa cambiar de perfil?"
-
diff --git a/po/he.po b/po/he.po
index eb98e54e..5d71baae 100644
--- a/po/he.po
+++ b/po/he.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: control-center\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2008-03-11 23:45+0200\n"
 "Last-Translator: Dotan Kamber <kamberd@yahoo.com>\n"
 "Language-Team: Hebrew\n"
@@ -542,12 +542,17 @@ msgstr ""
 "ועוד בודקי איכות ומדווחי תקלות אלמוניים ולא ידועים שעזרו לנו לעשות את הדבר "
 "הנכון. "
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "אנשים שתורמים או עוזרים למנדריבה לינוקס"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
+msgid "%s Control Center"
 msgstr "מרכז הבקרה של מנדריבה לינוקס"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "טוען... נא להמתין"
@@ -1141,12 +1146,12 @@ msgstr "הגדרת שרת אינטרנט"
 msgid "Configure installation server"
 msgstr "הגדרת שרת התקנה"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
+msgid "Set up server for network installations of %s"
 msgstr "הגדרת שרת להתקנות מהרשת של מנדריבה לינוקס"
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "שרותי רשת"
@@ -1540,17 +1545,17 @@ msgstr "/_אודות ..."
 msgid "Cancel"
 msgstr "ביטול"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
+msgid "%s Control Center %s [on %s]"
 msgstr "מרכז הבקרה של מנדריבה לינוקס %s על %s"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
+msgid "Welcome to the %s Control Center"
 msgstr "ברוך בואך למרכז הבקרה של מנדריבה לינוקס"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "שגיאה"
@@ -1621,12 +1626,12 @@ msgstr "ערכות נושא נוספות"
 msgid "Get additional themes on www.damz.net"
 msgstr "השגת ערכות נושא מ־www.damz.net "
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
+msgid "About - %s Control Center"
 msgstr "אודות מרכז הבקרה של מנדריבה לינוקס"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "מפתחים:"
@@ -1671,10 +1676,10 @@ msgstr "<dovix2003@yahoo.com>"
 msgid "Translator: "
 msgstr "תרגום: "
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
+msgid "%s %s (%s) Control Center"
 msgstr "מרכז הבקרה של מנדריבה לינוקס %s (%s)"
 
 #. -PO: here %s is eg: "1999-2008"
diff --git a/po/hi.po b/po/hi.po
index af775c7f..7a142873 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakconf-hi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2005-08-28 21:36+0530\n"
 "Last-Translator: धनञ्जय शर्मा (Dhananjaya Sharma)\n"
 "Language-Team: Hindi, India\n"
@@ -538,12 +538,17 @@ msgstr ""
 "और अनेकों बेनाम तथा अज्ञात बीटा परीक्षणकर्ता व दोष रिपोर्ट करने वाले जिन्होंने मैनड्रिव "
 "लिनक्स की सहायता करके यह सुनिश्चित किया है कि सभी कुछ भली-भांति कार्य करें।"
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "मैनड्रिव ऑनलाइन"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
+msgid "%s Control Center"
 msgstr "मैनड्रिव लिनक्स नियंत्रण केन्द्र"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "लाया जा रहा है... कृपया प्रतिक्षा करें"
@@ -1151,12 +1156,12 @@ msgstr "एक वेब सर्वर की स्थापना"
 msgid "Configure installation server"
 msgstr "संसाधन सर्वर की संरचना करना"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
+msgid "Set up server for network installations of %s"
 msgstr "मैनड्रिव लिनक्स के नेटवर्क संसाधनों हेतु सर्वर की स्थापना"
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "नेटवर्क सेवाएँ"
@@ -1551,17 +1556,17 @@ msgstr "/के बारे में(_A)..."
 msgid "Cancel"
 msgstr "निरस्त करें"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
+msgid "%s Control Center %s [on %s]"
 msgstr "मैनड्रिव लिनक्स नियंत्रण केन्द्र %s [%s पर]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
+msgid "Welcome to the %s Control Center"
 msgstr "मैनड्रिव लिनक्स नियंत्रण केन्द्र में स्वागत"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "त्रुटि"
@@ -1632,12 +1637,12 @@ msgstr "अतिरिक्त प्रकरण"
 msgid "Get additional themes on www.damz.net"
 msgstr "अतिरिक्त प्रकरणों को www.damz.net से प्राप्त करें"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
+msgid "About - %s Control Center"
 msgstr "मैनड्रिव लिनक्स नियंत्रण केन्द्र - के बारे में"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "लेखक: "
@@ -1682,10 +1687,10 @@ msgstr " "
 msgid "Translator: "
 msgstr "अनुवादक: "
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, fuzzy, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
+msgid "%s %s (%s) Control Center"
 msgstr "मैनड्रिव लिनक्स नियंत्रण केन्द्र"
 
 #. -PO: here %s is eg: "1999-2008"
@@ -1992,9 +1997,6 @@ msgstr "स्क्रीन विघटन"
 #~ msgid "Country / Region"
 #~ msgstr "देश / क्षेत्र"
 
-#~ msgid "Mandriva Online"
-#~ msgstr "मैनड्रिव ऑनलाइन"
-
 #~ msgid "Updates"
 #~ msgstr "उन्नयन"
 
diff --git a/po/hr.po b/po/hr.po
index 0ebb6406..3f756d23 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakconf 0\n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2005-01-04 21:26+CET\n"
 "Last-Translator: auto\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -519,12 +519,17 @@ msgstr ""
 "I mnogim drugim neimenovanim i nepozantim beta testerima  te onima koji su "
 "prijavljivali greške, oni su pomogli da budemo sigurni da sve radi dobro."
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Mandriva Online"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Mandriva Linux Kontrolni Centar"
+msgid "%s Control Center"
+msgstr "%s Kontrolni Centar"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Učitavam... Molim pričekajte"
@@ -1122,12 +1127,12 @@ msgstr "Podešavanje..."
 msgid "Configure installation server"
 msgstr "Centar Menu Postavki"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
+msgid "Set up server for network installations of %s"
 msgstr ""
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, fuzzy, c-format
 msgid "Network Services"
 msgstr "Mrežna sučelja"
@@ -1521,17 +1526,17 @@ msgstr "/_O programu..."
 msgid "Cancel"
 msgstr "Odustani"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, fuzzy, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Mandriva Linux Kontrolni Centar %s"
+msgid "%s Control Center %s [on %s]"
+msgstr "%s Kontrolni Centar %s"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "Dobro došli u Mandriva Linux Kontrolni Centar"
+msgid "Welcome to the %s Control Center"
+msgstr "Dobro došli u %s Kontrolni Centar"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Greška"
@@ -1599,12 +1604,12 @@ msgstr "Dodatne teme"
 msgid "Get additional themes on www.damz.net"
 msgstr "Za više tema posjetite www.damz.net"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "O - Mandriva Linux Kontrolnom Centru"
+msgid "About - %s Control Center"
+msgstr "O - %s Kontrolnom Centru"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Autori: "
@@ -1651,11 +1656,11 @@ msgstr "lokalizacija@linux.hr"
 msgid "Translator: "
 msgstr "Prevoditelj: "
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, fuzzy, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Mandriva Linux Kontrolni Centar"
+msgid "%s %s (%s) Control Center"
+msgstr "%s Kontrolni Centar"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
@@ -1969,9 +1974,6 @@ msgstr "Razlučivost zaslona"
 #~ msgid "Country / Region"
 #~ msgstr "Država / Regija"
 
-#~ msgid "Mandriva Online"
-#~ msgstr "Mandriva Online"
-
 #~ msgid "Updates"
 #~ msgstr "Nadogradnje"
 
diff --git a/po/hu.po b/po/hu.po
index a91d0509..558a7116 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2008-03-11 17:13+0100\n"
 "Last-Translator: Lónyai Gergely <alephlg@gmail.com>\n"
 "Language-Team: Hungarian <aleph@mandriva.org>\n"
@@ -36,7 +36,7 @@ msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
 "Mandriva tools"
 msgstr ""
-"csomagkészítés és javítások, játékok, SPARC-verzió, Mandriva Linux-eszközök "
+"csomagkészítés és javítások, játékok, SPARC-verzió, %s-eszközök "
 "szövegellenőrzése"
 
 #: ../contributors.pl:13
@@ -344,7 +344,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 Mandriva Linux-fordítócsapat"
+msgstr "az egyszemélyes szlovák %s-fordítócsapat"
 
 #: ../contributors.pl:42
 #, c-format
@@ -544,12 +544,17 @@ msgstr ""
 "továbbá számos tesztelő és hibabejelentő, akik segítséget nyújtottak a "
 "fejlesztésben"
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Mandriva Linux - közreműködők"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Mandriva Linux Vezérlőközpont"
+msgid "%s Control Center"
+msgstr "%s Vezérlőközpont"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Betöltés; kis türelmet..."
@@ -1164,12 +1169,12 @@ msgstr "Webkiszolgáló beállítása"
 msgid "Configure installation server"
 msgstr "Telepítési kiszolgáló beállítása"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-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"
+msgid "Set up server for network installations of %s"
+msgstr "Kiszolgáló beállítása a %s hálózati telepítéséhez"
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "Hálózati szolgáltatások"
@@ -1568,17 +1573,17 @@ msgstr "/_Névjegy..."
 msgid "Cancel"
 msgstr "Mégsem"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Mandriva Linux Vezérlőközpont %s [rendszer: %s]"
+msgid "%s Control Center %s [on %s]"
+msgstr "%s Vezérlőközpont %s [rendszer: %s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "Üdvözöljük a Mandriva Linux Vezérlőközpontban"
+msgid "Welcome to the %s Control Center"
+msgstr "Üdvözöljük a %s Vezérlőközpontban"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Hiba"
@@ -1649,12 +1654,12 @@ msgstr "További témák"
 msgid "Get additional themes on www.damz.net"
 msgstr "További témákat a www.damz.net helyen lehet szerezni"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "Névjegy - Mandriva Linux Vezérlőközpont"
+msgid "About - %s Control Center"
+msgstr "Névjegy - %s Vezérlőközpont"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Szerzők: "
@@ -1699,11 +1704,11 @@ msgstr "biro.arpad gmail"
 msgid "Translator: "
 msgstr "Fordítás: "
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Mandriva Linux %s (%s) Vezérlőközpont"
+msgid "%s %s (%s) Control Center"
+msgstr "%s %s (%s) Vezérlőközpont"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
diff --git a/po/id.po b/po/id.po
index dc9c1d19..a28e1f0c 100644
--- a/po/id.po
+++ b/po/id.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2007-09-28 01:32+0700\n"
 "Last-Translator: Willy Sudiarto Raharjo <willysr@gmail.com>\n"
 "Language-Team: Indonesia <mdk-id@yahoogroups.com>\n"
@@ -546,12 +546,17 @@ msgstr ""
 "Dan banyak penguji beta dan pelapor bug yang tidak bernama dan tidak "
 "diketahui yang membantu memastikan semua bekerja dengan baik."
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Mandriva Online"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Pusat Kontrol Mandriva Linux"
+msgid "%s Control Center"
+msgstr "Pusat Kontrol %s"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Tunggu, sedang dimuat..."
@@ -1151,12 +1156,12 @@ msgstr "Setting web server"
 msgid "Configure installation server"
 msgstr "Konfigurasi installasi server"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
-msgstr "Setting server untuk installasi jaringan dari Mandriva Linux"
+msgid "Set up server for network installations of %s"
+msgstr "Setting server untuk installasi jaringan dari %s"
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "Layanan jaringan"
@@ -1552,17 +1557,17 @@ msgstr "/_Keterangan"
 msgid "Cancel"
 msgstr "Batal"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Pusat Kontrol Mandriva Linux %s [pada %s]"
+msgid "%s Control Center %s [on %s]"
+msgstr "Pusat Kontrol %s %s [pada %s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "Selamat Datang di Pusat Kontrol Mandriva Linux"
+msgid "Welcome to the %s Control Center"
+msgstr "Selamat Datang di Pusat Kontrol %s"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Kesalahan"
@@ -1633,12 +1638,12 @@ msgstr "Tema tambahan"
 msgid "Get additional themes on www.damz.net"
 msgstr "Dapatkan tema tambahan di www.damz.net"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "Keterangan - Pusat Kontrol Mandriva Linux"
+msgid "About - %s Control Center"
+msgstr "Keterangan - Pusat Kontrol %s"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Penulis: "
@@ -1683,11 +1688,11 @@ msgstr "willysr@gmail.com"
 msgid "Translator: "
 msgstr "Penerjemah: "
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Pusat Kontrol Mandriva Linux %s (%s)"
+msgid "%s %s (%s) Control Center"
+msgstr "Pusat Kontrol %s %s (%s)"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
@@ -1999,9 +2004,6 @@ msgstr "Resolusi Layar"
 #~ msgid "Country / Region"
 #~ msgstr "Negara"
 
-#~ msgid "Mandriva Online"
-#~ msgstr "Mandriva Online"
-
 #~ msgid "Updates"
 #~ msgstr "Update"
 
@@ -2215,28 +2217,26 @@ msgstr "Resolusi Layar"
 #~ msgid "Manager Connection"
 #~ msgstr "Mengelola koneksi"
 
-#~ msgid "Mandriva Linux Control Center %s\n"
-#~ msgstr "Pusat Kontrol Mandriva Linux %s\n"
+#~ msgid "%s Control Center %s\n"
+#~ msgstr "Pusat Kontrol %s %s\n"
 
 #~ msgid ""
-#~ "Mandriva Linux Control Center is Mandriva Linux's main configuration\n"
+#~ "%s 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 Mandriva Linux Control Center greatly\n"
+#~ "The tools accessed through the %s Control Center greatly\n"
 #~ "simplify the use of the system, notably by avoiding the use of the\n"
 #~ "evil command line."
 #~ msgstr ""
-#~ "Pusat Kontrol Mandriva Linux adalah konfigurator utama Linux Mandriva, "
-#~ "yang\n"
+#~ "Pusat Kontrol %s adalah konfigurator utama Linux Mandriva, yang\n"
 #~ "memungkinkan sistem administrator untuk mengkonfigurasi perangkat keras "
 #~ "dan layanan yangg\n"
 #~ "digunakan oleh semua pengguna.\n"
 #~ "\n"
 #~ "\n"
-#~ "Alat-alat yang diakses via Pusat Kontrol Mandriva Linux mempermudah "
-#~ "penggunaan\n"
+#~ "Alat-alat yang diakses via Pusat Kontrol %s mempermudah penggunaan\n"
 #~ "sistem, khususnya dengan mengurangi pemakaian baris perintah."
 
 #~ msgid "Monitor Connection"
diff --git a/po/is.po b/po/is.po
index 0964c616..57034bd3 100644
--- a/po/is.po
+++ b/po/is.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: control-center\n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2007-11-29 13:05+0000\n"
 "Last-Translator: Pjetur G. Hjaltason <pjetur@pjetur.net>\n"
 "Language-Team: Icelandic <kde-isl@molar.is>\n"
@@ -538,12 +538,17 @@ msgstr ""
 "Og margir ónefndir og óþekktir prófarar og villugjafar sem hjálpuðu til að "
 "þetta virkaði allt rétt."
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Mandriva Linux tilleggjendur"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Mandriva Linux Stjórnborð"
+msgid "%s Control Center"
+msgstr "%s Stjórnborð"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Hleð inn... Augnablik"
@@ -1143,12 +1148,12 @@ msgstr "Setja upp vefmiðlara"
 msgid "Configure installation server"
 msgstr "Stilla uppsetningar-miðlara"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
-msgstr "Setja upp miðlara fyrir netuppsetningar á Mandriva Linux"
+msgid "Set up server for network installations of %s"
+msgstr "Setja upp miðlara fyrir netuppsetningar á %s"
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "NetÞjónustur"
@@ -1545,17 +1550,17 @@ msgstr "/_Um..."
 msgid "Cancel"
 msgstr "Hætta við"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Mandriva Linux Stjórnborð %s [á %s]"
+msgid "%s Control Center %s [on %s]"
+msgstr "%s Stjórnborð %s [á %s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "Velkomin að Mandriva Linux Stjórnborði"
+msgid "Welcome to the %s Control Center"
+msgstr "Velkomin að %s Stjórnborði"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Villa"
@@ -1626,12 +1631,12 @@ msgstr "Aukaleg þemu"
 msgid "Get additional themes on www.damz.net"
 msgstr "Sækja aukaleg þemu frá www.damz.net"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "Um - Mandriva Linux Stjórnborð"
+msgid "About - %s Control Center"
+msgstr "Um - %s Stjórnborð"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Höfundar: "
@@ -1676,11 +1681,11 @@ msgstr "<pjetur@pjetur.net>,pjetur@pjetur.net"
 msgid "Translator: "
 msgstr "Þýðandi: "
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Mandriva Linux %s (%s) Stjórnborð"
+msgid "%s %s (%s) Control Center"
+msgstr "%s %s (%s) Stjórnborð"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
diff --git a/po/it.po b/po/it.po
index 1be3e528..c0d296a8 100644
--- a/po/it.po
+++ b/po/it.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: it\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2008-04-19 15:25+0200\n"
 "Last-Translator: Marcello Anni <marcello.anni@alice.it>\n"
 "Language-Team: Italian <kde-i18n-it@kde.org>\n"
@@ -39,7 +39,7 @@ msgid ""
 "Mandriva tools"
 msgstr ""
 "consistente pulizia e riorganizzazione dei pacchetti, giochi, porting su "
-"sparc, revisione degli strumenti Mandriva Linux"
+"sparc, revisione degli strumenti %s"
 
 #: ../contributors.pl:13
 #, c-format
@@ -59,7 +59,8 @@ msgstr "Olivier Thauvin"
 #: ../contributors.pl:14
 #, c-format
 msgid "figlet introduction, Distriblint (checking rpm in the distro)"
-msgstr "introduzione a figlet, distriblint (controllo degli RPM nella distribuzione)"
+msgstr ""
+"introduzione a figlet, distriblint (controllo degli RPM nella distribuzione)"
 
 #: ../contributors.pl:15
 #, c-format
@@ -201,7 +202,8 @@ msgstr "Stefan VanDer Eijk"
 #: ../contributors.pl:26
 #, c-format
 msgid "slbd distro checking, devel dependancies"
-msgstr "controllo sulla distribuzione slbd, dipendenze per i pacchetti di sviluppo"
+msgstr ""
+"controllo sulla distribuzione slbd, dipendenze per i pacchetti di sviluppo"
 
 #: ../contributors.pl:27
 #, c-format
@@ -547,12 +549,17 @@ msgstr ""
 "E molti beta-tester e segnalatori di bug sconosciuti e senza un nome che "
 "hanno permesso che tutto funzioni a dovere."
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Hanno contribuito a Mandriva Linux"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Centro di controllo Mandriva Linux"
+msgid "%s Control Center"
+msgstr "Centro di controllo %s"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Caricamento in corso... Attendi per favore"
@@ -570,7 +577,8 @@ msgstr "Autenticazione"
 
 #: ../control-center:153
 #, c-format
-msgid "Select the authentication method (local, NIS, LDAP, Windows Domain, ...)"
+msgid ""
+"Select the authentication method (local, NIS, LDAP, Windows Domain, ...)"
 msgstr ""
 "Seleziona il metodo di autenticazione (locale, NIS, LDAP, dominio di "
 "Windows, ...)"
@@ -696,7 +704,8 @@ msgstr "Personalizza il firewall"
 
 #: ../control-center:295
 #, c-format
-msgid "Set up a personal firewall in order to protect the computer and the network"
+msgid ""
+"Set up a personal firewall in order to protect the computer and the network"
 msgstr "Configura un firewall personale per proteggere il computer e la rete"
 
 #: ../control-center:304 ../control-center:305
@@ -996,7 +1005,8 @@ msgstr "Accesso a dischi e directory condivisi con Windows (SMB)"
 #: ../control-center:619
 #, c-format
 msgid "Configuration of Windows (Samba) shared drives and directories"
-msgstr "Configurazione dei dischi e delle directory condivise con Windows (Samba)"
+msgstr ""
+"Configurazione dei dischi e delle directory condivise con Windows (Samba)"
 
 #: ../control-center:628
 #, c-format
@@ -1164,12 +1174,12 @@ msgstr "Configura un web server"
 msgid "Configure installation server"
 msgstr "Configura server per l'installazione"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
-msgstr "Configura un server per installazioni di rete di Mandriva Linux"
+msgid "Set up server for network installations of %s"
+msgstr "Configura un server per installazioni di rete di %s"
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "Servizi di rete"
@@ -1211,7 +1221,8 @@ msgstr "Configura time server"
 
 #: ../control-center:837
 #, c-format
-msgid "Set the time of the server to be synchronized with an external time server"
+msgid ""
+"Set the time of the server to be synchronized with an external time server"
 msgstr ""
 "Seleziona un time server remoto per la sincronizzazione dell'orologio di "
 "sistema"
@@ -1294,7 +1305,8 @@ msgstr "Configura la macchina locale mediante un'interfaccia web"
 #: ../control-center:915
 #, c-format
 msgid "You don't seem to have webmin intalled. Local config is disabled"
-msgstr "Sembra che Webmin non sia installato, configurazione locale disabilitata"
+msgstr ""
+"Sembra che Webmin non sia installato, configurazione locale disabilitata"
 
 #: ../control-center:917
 #, c-format
@@ -1564,17 +1576,17 @@ msgstr "/_Informazioni su..."
 msgid "Cancel"
 msgstr "Annulla"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Centro di controllo Mandriva Linux %s [su %s]"
+msgid "%s Control Center %s [on %s]"
+msgstr "Centro di controllo %s %s [su %s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "Benvenuti nel Centro di controllo Mandriva Linux"
+msgid "Welcome to the %s Control Center"
+msgstr "Benvenuti nel Centro di controllo %s"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Errore"
@@ -1608,7 +1620,8 @@ msgstr "non posso avviare un processo: %s"
 #: ../control-center:1767
 #, c-format
 msgid "cannot fork and exec \"%s\" since it is not executable"
-msgstr "non è possibile istanziare un processo per \"%s\" perché non è eseguibile"
+msgstr ""
+"non è possibile istanziare un processo per \"%s\" perché non è eseguibile"
 
 #: ../control-center:1890
 #, c-format
@@ -1645,12 +1658,12 @@ msgstr "Temi addizionali"
 msgid "Get additional themes on www.damz.net"
 msgstr "Preleva altri temi da www.damz.net"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "Informazioni sul Centro di controllo Mandriva Linux"
+msgid "About - %s Control Center"
+msgstr "Informazioni sul Centro di controllo %s"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Autori: "
@@ -1697,11 +1710,11 @@ msgstr "<daniele@dcs.it>"
 msgid "Translator: "
 msgstr "Traduttori: "
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Centro di controllo %s (%s) Mandriva Linux"
+msgid "%s %s (%s) Control Center"
+msgstr "Centro di controllo %s (%s) %s"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
@@ -1946,4 +1959,3 @@ msgstr "Monitor"
 #: ../data/XFDrake-Resolution.desktop.in.h:1
 msgid "Screen Resolution"
 msgstr "Risoluzione schermo"
-
diff --git a/po/ja.po b/po/ja.po
index 1bf09e72..2b45263f 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakconf-ja\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2008-03-12 18:00+0900\n"
 "Last-Translator: BANDO Yukiko <ybando@k6.dion.ne.jp>\n"
 "Language-Team: Japanese <cooker-i18n@mandrivalinux.org>\n"
@@ -541,12 +541,17 @@ msgid ""
 msgstr ""
 "ここにお名前を記載できなかった多数のベータテスターとバグレポータのかたがた"
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Mandriva Linux への貢献者"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Mandriva Linux コントロールセンター"
+msgid "%s Control Center"
+msgstr "%s コントロールセンター"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "読み込み中です。お待ちください..."
@@ -1142,12 +1147,12 @@ msgstr "Web サーバを設定"
 msgid "Configure installation server"
 msgstr "インストールサーバを設定"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
-msgstr "Mandriva Linux をネットワークインストールするサーバを設定"
+msgid "Set up server for network installations of %s"
+msgstr "%s をネットワークインストールするサーバを設定"
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "ネットワークサービス"
@@ -1544,17 +1549,17 @@ msgstr "/情報(_A)"
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Mandriva Linux コントロールセンター %s [on %s]"
+msgid "%s Control Center %s [on %s]"
+msgstr "%s コントロールセンター %s [on %s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "Mandriva Linux コントロールセンターへようこそ"
+msgid "Welcome to the %s Control Center"
+msgstr "%s コントロールセンターへようこそ"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "エラー"
@@ -1625,12 +1630,12 @@ msgstr "追加のテーマ"
 msgid "Get additional themes on www.damz.net"
 msgstr "www.damz.netから追加テーマを取得"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "情報 - Mandriva Linux コントロールセンター"
+msgid "About - %s Control Center"
+msgstr "情報 - %s コントロールセンター"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "作者: "
@@ -1675,11 +1680,11 @@ msgstr "utuhiro78@yahoo.co.jp"
 msgid "Translator: "
 msgstr "翻訳者: "
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Mandriva Linux %s (%s) コントロールセンター"
+msgid "%s %s (%s) Control Center"
+msgstr "%s %s (%s) コントロールセンター"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
diff --git a/po/ka.po b/po/ka.po
index 96916380..f469fb5c 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakconf 0.96\n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2005-02-16 02:28+0300\n"
 "Last-Translator: Aiet Kolkhi <aiet@qartuli.net>\n"
 "Language-Team: Georgian <aiet@qartuli.com>\n"
@@ -554,12 +554,17 @@ msgstr ""
 "და უთვალავი დაუსახელებელი და უცნობი ბეტა-ტესტერი და ხარვეზებზე მონადირე, "
 "რომლებმაც ძალა და ენერგია არ დაიშურეს სისტემის გასამართავად."
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Mandriva Online"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
+msgid "%s Control Center"
 msgstr "მენდრეიქ-ლინუქსის საკონტროლო ცენტრი"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "ვიძახებ... გთხოვთ მოითმინოთ"
@@ -1157,12 +1162,12 @@ msgstr "ვებ–სერვერის დაყენება"
 msgid "Configure installation server"
 msgstr "საინსტალაციო სერვერის კონფიგურირება"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
+msgid "Set up server for network installations of %s"
 msgstr ""
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "ქსელური სერვისები"
@@ -1556,17 +1561,17 @@ msgstr "/_შესახებ..."
 msgid "Cancel"
 msgstr "გაუქმება"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
+msgid "%s Control Center %s [on %s]"
 msgstr "მანდრეიქ-ლინუქსის საკონტროლო ცენტრი %s [%s-ზე]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
+msgid "Welcome to the %s Control Center"
 msgstr "მოგესალმებათ მენდრეიქ-ლინუქსის საკონტროლო ცენტრი"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "შეცდომა"
@@ -1636,12 +1641,12 @@ msgstr "დამატებითი დეკორაციები"
 msgid "Get additional themes on www.damz.net"
 msgstr "ჩამოტვირთეთ დამატებითი დეკორაციები www.damz.net-ზე"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
+msgid "About - %s Control Center"
 msgstr "შესახებ - მანდრეიკის საკონტროლო ცენტრი"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "ავტორები:"
@@ -1686,10 +1691,10 @@ msgstr "aiet@gmx.net"
 msgid "Translator: "
 msgstr "მთარგმნელი: "
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, fuzzy, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
+msgid "%s %s (%s) Control Center"
 msgstr "მენდრეიქ-ლინუქსის საკონტროლო ცენტრი"
 
 #. -PO: here %s is eg: "1999-2008"
@@ -1991,9 +1996,6 @@ msgstr "ეკრანის რჩევადობა"
 #~ msgid "Country / Region"
 #~ msgstr "ქვეყანა / რეგიონი"
 
-#~ msgid "Mandriva Online"
-#~ msgstr "Mandriva Online"
-
 #~ msgid "Updates"
 #~ msgstr "განახლებები"
 
diff --git a/po/ko.po b/po/ko.po
index 5a6068cf..e366deb2 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakconf 0.96\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2002-09-05 19:08+0900\n"
 "Last-Translator: Jaegeum Cze <baedaron@hanafos.com>\n"
 "Language-Team: Korean <baedaron@hanafos.com>\n"
@@ -517,12 +517,17 @@ msgid ""
 "sure it all worked right."
 msgstr ""
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "맨드리바 온라인"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
+msgid "%s Control Center"
 msgstr "맨드리바 제어 센터"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "읽는 중, 기다려 주세요."
@@ -1122,12 +1127,12 @@ msgstr "설정..."
 msgid "Configure installation server"
 msgstr "메뉴 설정 센터"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
+msgid "Set up server for network installations of %s"
 msgstr ""
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, fuzzy, c-format
 msgid "Network Services"
 msgstr "네트웍 인터페이스"
@@ -1521,17 +1526,17 @@ msgstr "/이 프로그램은(_A)..."
 msgid "Cancel"
 msgstr "취소"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, fuzzy, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
+msgid "%s Control Center %s [on %s]"
 msgstr "맨드리바 제어 센터 %s"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
+msgid "Welcome to the %s Control Center"
 msgstr "맨드리바 제어 센터에 잘 오셨습니다."
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "오류"
@@ -1599,12 +1604,12 @@ msgstr "추가 테마"
 msgid "Get additional themes on www.damz.net"
 msgstr "www.damz.net에서 추가 테마 찾기"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
+msgid "About - %s Control Center"
 msgstr "이 프로그램은 - 맨드리바 컨트롤 센터"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "저자:"
@@ -1649,10 +1654,10 @@ msgstr "<tody@mizi.com>"
 msgid "Translator: "
 msgstr "번역자: "
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, fuzzy, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
+msgid "%s %s (%s) Control Center"
 msgstr "맨드리바 제어 센터"
 
 #. -PO: here %s is eg: "1999-2008"
@@ -1972,9 +1977,6 @@ msgstr "화면 해상도"
 #~ msgid "Country / Region"
 #~ msgstr "국가"
 
-#~ msgid "Mandriva Online"
-#~ msgstr "맨드리바 온라인"
-
 #, fuzzy
 #~ msgid "Updates"
 #~ msgstr "업데이트 버전"
diff --git a/po/ku.po b/po/ku.po
index b2ac43c6..ec572091 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakeconf-ku\n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2005-08-25 14:23+0100\n"
 "Last-Translator: Erdal Ronahî <erdal.ronahi@gmail.com>\n"
 "Language-Team: Kurdish <kadir@linux-ku.com>\n"
@@ -531,12 +531,17 @@ msgid ""
 "sure it all worked right."
 msgstr ""
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Tu Bi Xêr Hatî Mandriva Online"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Navenda Qontrola Mandriva Linux"
+msgid "%s Control Center"
+msgstr "Navenda Qontrola %s"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Damezrînin... Kerema xwe biseknin"
@@ -1138,12 +1143,12 @@ msgstr "Pêkanîna web"
 msgid "Configure installation server"
 msgstr "Pêkanîna Damezrîna server"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
+msgid "Set up server for network installations of %s"
 msgstr ""
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, fuzzy, c-format
 msgid "Network Services"
 msgstr "Servis"
@@ -1537,17 +1542,17 @@ msgstr "/_Derheq..."
 msgid "Cancel"
 msgstr "Betal"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Navenda Qontrola Mandriva Linux %s [on %s]"
+msgid "%s Control Center %s [on %s]"
+msgstr "Navenda Qontrola %s %s [on %s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "Xêr bin li Navenda Qontrola Mandriva Linux"
+msgid "Welcome to the %s Control Center"
+msgstr "Xêr bin li Navenda Qontrola %s"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "çewt"
@@ -1615,12 +1620,12 @@ msgstr "Themên zêde"
 msgid "Get additional themes on www.damz.net"
 msgstr "Themên zêde sêr www.damz.net ê dakişînê"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
+msgid "About - %s Control Center"
 msgstr ""
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Programçêker:"
@@ -1665,11 +1670,11 @@ msgstr "~ @ ~"
 msgid "Translator: "
 msgstr "Werger:"
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, fuzzy, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Navenda Qontrola Mandriva Linux"
+msgid "%s %s (%s) Control Center"
+msgstr "Navenda Qontrola %s"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
@@ -1974,9 +1979,6 @@ msgstr "Xuyakirina dîmender"
 #~ msgid "Country / Region"
 #~ msgstr "Welat"
 
-#~ msgid "Mandriva Online"
-#~ msgstr "Tu Bi Xêr Hatî Mandriva Online"
-
 #~ msgid "Updates"
 #~ msgstr "Rojanekirin"
 
diff --git a/po/ky.po b/po/ky.po
index 1ae9eef5..ad71f535 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakconf-ky\n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2005-07-20 10:17+0000\n"
 "Last-Translator: Timur Jamakeev <ztimur@mail..ru>\n"
 "Language-Team: Kyrgyz\n"
@@ -541,12 +541,17 @@ msgstr ""
 "көрсөткөн информаторлор, бардыгы туура иштеп жаткандыгына ишенүүбүзгө жардам "
 "беришти."
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Mandriva Online"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Mandriva Linux Башкаруу Борбору"
+msgid "%s Control Center"
+msgstr "%s Башкаруу Борбору"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Жүктөлүүдө... Күтө туруңуз"
@@ -1164,12 +1169,12 @@ msgstr "Веб серверин конфигурациялоо"
 msgid "Configure installation server"
 msgstr "Орнотуу серверинин конфигурациясы"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
-msgstr "Mandriva Linux машинасын тармак боюнча орнотуу үчүн серверди ырастоо"
+msgid "Set up server for network installations of %s"
+msgstr "%s машинасын тармак боюнча орнотуу үчүн серверди ырастоо"
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "гТармак интерфейстери"
@@ -1563,17 +1568,17 @@ msgstr "/_Программа жөнүндө..."
 msgid "Cancel"
 msgstr "Калтыр"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Mandriva Linux Башкаруу борбору %s [%s]"
+msgid "%s Control Center %s [on %s]"
+msgstr "%s Башкаруу борбору %s [%s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "Mandriva Linux Башкаруу борборуна кош келиңиз"
+msgid "Welcome to the %s Control Center"
+msgstr "%s Башкаруу борборуна кош келиңиз"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Ката"
@@ -1644,12 +1649,12 @@ msgstr "Кошумча темалар"
 msgid "Get additional themes on www.damz.net"
 msgstr "www.damz.net сайтынан кошумча темаларды алуу"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "Mandriva Linux Башкаруу борбору жөнүндө"
+msgid "About - %s Control Center"
+msgstr "%s Башкаруу борбору жөнүндө"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Авторлор:"
@@ -1694,11 +1699,11 @@ msgstr "ztimur@mail.ru"
 msgid "Translator: "
 msgstr "Котормочу: "
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, fuzzy, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Mandriva Linux Башкаруу Борбору"
+msgid "%s %s (%s) Control Center"
+msgstr "%s Башкаруу Борбору"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
@@ -2010,9 +2015,6 @@ msgstr "Экран жөндөмдүүлүгү"
 #~ msgid "Country / Region"
 #~ msgstr "Өлкө / Регион"
 
-#~ msgid "Mandriva Online"
-#~ msgstr "Mandriva Online"
-
 #~ msgid "Updates"
 #~ msgstr "Жаңылоолор"
 
diff --git a/po/lt.po b/po/lt.po
index 83048d08..47dc856a 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakconf 0.96\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2005-09-26 15:35+0200\n"
 "Last-Translator: Arvydas Svirka <arvydas@arvis.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -543,12 +543,17 @@ msgstr ""
 "Ir daug neįvardintų ir nežinomų beta versijos bandytojų ir klaidų pranešėjų, "
 "kurie padėjo, kad viskas puikiai veiktų."
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Mandriva Online"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Mandriva Linux valdymo centras"
+msgid "%s Control Center"
+msgstr "%s valdymo centras"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Kraunama... Prašome palaukti"
@@ -1157,12 +1162,12 @@ msgstr "Nustatyti web serverį"
 msgid "Configure installation server"
 msgstr "Konfigūruoti įdiegimo serverį"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
-msgstr "Serverio nustatymas Mandriva Linux įdiegimui per tinklą"
+msgid "Set up server for network installations of %s"
+msgstr "Serverio nustatymas %s įdiegimui per tinklą"
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "Tinklo paslaugos"
@@ -1558,17 +1563,17 @@ msgstr "/_Apie..."
 msgid "Cancel"
 msgstr "Atšaukti"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Mandriva Linux valdymo centras %s [čia: %s]"
+msgid "%s Control Center %s [on %s]"
+msgstr "%s valdymo centras %s [čia: %s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "Sveiki atvykę į Mandriva Linux valdymo centrą"
+msgid "Welcome to the %s Control Center"
+msgstr "Sveiki atvykę į %s valdymo centrą"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Klaida"
@@ -1639,12 +1644,12 @@ msgstr "Papildomos temos"
 msgid "Get additional themes on www.damz.net"
 msgstr "Gauti papildomas temas iš www.damz.net"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "Apie - Mandriva Linux valdymo centras"
+msgid "About - %s Control Center"
+msgstr "Apie - %s valdymo centras"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Autoriai: "
@@ -1693,11 +1698,11 @@ msgstr ""
 msgid "Translator: "
 msgstr "Vertėjas:"
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, fuzzy, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Mandriva Linux valdymo centras"
+msgid "%s %s (%s) Control Center"
+msgstr "%s valdymo centras"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
@@ -2003,9 +2008,6 @@ msgstr "Ekrano raiška"
 #~ msgid "Country / Region"
 #~ msgstr "Šalis/regionas"
 
-#~ msgid "Mandriva Online"
-#~ msgstr "Mandriva Online"
-
 #~ msgid "Updates"
 #~ msgstr "Atnaujinimai"
 
diff --git a/po/ltg.po b/po/ltg.po
index b2399b55..163c3bd2 100644
--- a/po/ltg.po
+++ b/po/ltg.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: control-center\n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2007-09-28 13:51+0200\n"
 "Last-Translator: Māris Laureckis <marisl@e-no.lv>\n"
 "Language-Team: Latgalian <marisl@e-no.lv>\n"
@@ -531,12 +531,17 @@ msgid ""
 "sure it all worked right."
 msgstr ""
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Mandriva Online"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
+msgid "%s Control Center"
 msgstr "Maņdryva Linukss vadeibys centrs"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Nūteik īluode... Lyudzu, pagaidit"
@@ -1131,12 +1136,12 @@ msgstr "Īstateit web serveri"
 msgid "Configure installation server"
 msgstr "Konfigurēt instaleišonys serveri"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
+msgid "Set up server for network installations of %s"
 msgstr ""
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "Teikla pakolpuojumi"
@@ -1530,17 +1535,17 @@ msgstr "/_Par programmu..."
 msgid "Cancel"
 msgstr "Atceļt"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
+msgid "%s Control Center %s [on %s]"
 msgstr "Maņdryva Linukss vadeibys centrs %s [ %s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
+msgid "Welcome to the %s Control Center"
 msgstr "Laipni lyudzam Maņdryva Linukss vadeibys centrā"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Kliuda"
@@ -1608,12 +1613,12 @@ msgstr "Papyldus temys"
 msgid "Get additional themes on www.damz.net"
 msgstr "Sajimt papyldus temys nu www.damz.net"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
+msgid "About - %s Control Center"
 msgstr "Par Maņdryva Linukss vadeibys centru"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Autori: "
@@ -1658,10 +1663,10 @@ msgstr "marisl@e-no.lv"
 msgid "Translator: "
 msgstr "Tulkuotuojs: "
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
+msgid "%s %s (%s) Control Center"
 msgstr "Maņdryva Linukss %s (%s) vadeibys centrs"
 
 #. -PO: here %s is eg: "1999-2008"
@@ -1963,9 +1968,6 @@ msgstr "Ekrana izškirtspieja"
 #~ msgid "Country / Region"
 #~ msgstr "Vaļsts / Regions"
 
-#~ msgid "Mandriva Online"
-#~ msgstr "Mandriva Online"
-
 #~ msgid "Updates"
 #~ msgstr "Modernizeijumi"
 
@@ -2108,8 +2110,8 @@ msgstr "Ekrana izškirtspieja"
 #~ msgid "Manager Connection"
 #~ msgstr "Pīslāgumu puorvaldeišona"
 
-#~ msgid "Mandriva Linux Control Center %s\n"
-#~ msgstr "Mandriva Linux vadeibys centrs %s\n"
+#~ msgid "%s Control Center %s\n"
+#~ msgstr "%s vadeibys centrs %s\n"
 
 #~ msgid "Monitor Connection"
 #~ msgstr "Monitora pīslāgumi"
diff --git a/po/lv.po b/po/lv.po
index f421017b..cf561727 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakconf 0.96\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2002-09-25 18:53+0200\n"
 "Last-Translator: Raivo Saars <spaiks@inbox.lv>\n"
 "Language-Team: ll10nt <ll10nt@listes.murds.lv>\n"
@@ -519,12 +519,17 @@ msgid ""
 "sure it all worked right."
 msgstr ""
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Mandriva Online"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Mandriva Linux vadības centrs"
+msgid "%s Control Center"
+msgstr "%s vadības centrs"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Ielādēju... Lūdzu, uzgaidiet"
@@ -1124,12 +1129,12 @@ msgstr "Konfigurēt..."
 msgid "Configure installation server"
 msgstr "Izvēlņu konfigurēšanas centrs"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
+msgid "Set up server for network installations of %s"
 msgstr ""
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, fuzzy, c-format
 msgid "Network Services"
 msgstr "Tīkla saskarsmes virsmas"
@@ -1523,17 +1528,17 @@ msgstr "/_Par..."
 msgid "Cancel"
 msgstr "Atcelt"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, fuzzy, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Mandriva Linux vadības centrs %s"
+msgid "%s Control Center %s [on %s]"
+msgstr "%s vadības centrs %s"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "Laipni lūdzam Mandriva Linux vadības centrā"
+msgid "Welcome to the %s Control Center"
+msgstr "Laipni lūdzam %s vadības centrā"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Kļūda"
@@ -1601,12 +1606,12 @@ msgstr "Papildus tēmas"
 msgid "Get additional themes on www.damz.net"
 msgstr "Saņemt papildus tēmas no www.damz.net"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "Par - Mandriva Linux vadības centrs"
+msgid "About - %s Control Center"
+msgstr "Par - %s vadības centrs"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Autori: "
@@ -1651,11 +1656,11 @@ msgstr "<ll10nt@listes.murds.lv>"
 msgid "Translator: "
 msgstr "Tulkotājs: "
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, fuzzy, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Mandriva Linux vadības centrs"
+msgid "%s %s (%s) Control Center"
+msgstr "%s vadības centrs"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
@@ -1974,9 +1979,6 @@ msgstr "Ekrāna izšķirtspēja"
 #~ msgid "Country / Region"
 #~ msgstr "Valsts"
 
-#~ msgid "Mandriva Online"
-#~ msgstr "Mandriva Online"
-
 #, fuzzy
 #~ msgid "Updates"
 #~ msgstr "Atjaunināt"
diff --git a/po/mk.po b/po/mk.po
index 7ee8f280..2bd15c91 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakconf-mk\n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2006-09-01 13:29+0200\n"
 "Last-Translator: Зоран Димовски <zoki.dimovski@gmail.com>\n"
 "Language-Team: Macedonian\n"
@@ -33,7 +33,7 @@ msgid ""
 "Mandriva tools"
 msgstr ""
 "масивно повторно градење и прочистување на пакетите, игри, sparc порти, "
-"крајно прегледување на Mandriva Linux алатките"
+"крајно прегледување на %s алатките"
 
 #: ../contributors.pl:13
 #, c-format
@@ -540,12 +540,17 @@ msgstr ""
 "И многу неименувани и непознати бета тестери и пријавувачи на грешки кои "
 "помогнаа да се осигураме дека се ќе излезе добро."
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Mandriva Online"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Mandriva Linux Контролен центар"
+msgid "%s Control Center"
+msgstr "%s Контролен центар"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Се вчитува... Ве молиме почекајте"
@@ -1167,12 +1172,12 @@ msgstr "Поставете веб сервер"
 msgid "Configure installation server"
 msgstr "Конфигурирај инсталационен сервер"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
-msgstr "Постави сервер за мрежна инсталација на Mandriva Linux"
+msgid "Set up server for network installations of %s"
+msgstr "Постави сервер за мрежна инсталација на %s"
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "Мрежни сервиси"
@@ -1571,17 +1576,17 @@ msgstr "/_За..."
 msgid "Cancel"
 msgstr "Откажи"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Mandriva Linux Контролен центар %s [на %s]"
+msgid "%s Control Center %s [on %s]"
+msgstr "%s Контролен центар %s [на %s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "Добредојдовте во Контролниот центар на Mandriva Linux"
+msgid "Welcome to the %s Control Center"
+msgstr "Добредојдовте во Контролниот центар на %s"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Грешка"
@@ -1652,12 +1657,12 @@ msgstr "Додатни теми"
 msgid "Get additional themes on www.damz.net"
 msgstr "Земете додатни теми од www.damz.net"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "За - Mandriva Linux Контролен центар"
+msgid "About - %s Control Center"
+msgstr "За - %s Контролен центар"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Автори: "
@@ -1702,11 +1707,11 @@ msgstr "<decata@mt.net.mk>"
 msgid "Translator: "
 msgstr "Преведувач: "
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, fuzzy, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Mandriva Linux Контролен центар"
+msgid "%s %s (%s) Control Center"
+msgstr "%s Контролен центар"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
@@ -2018,9 +2023,6 @@ msgstr "Резолуција на екранот"
 #~ msgid "Country / Region"
 #~ msgstr "Земја / Регион"
 
-#~ msgid "Mandriva Online"
-#~ msgstr "Mandriva Online"
-
 #~ msgid "Updates"
 #~ msgstr "Ажурирања"
 
diff --git a/po/mn.po b/po/mn.po
index 1fbf7392..35afd767 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakconf\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2003-12-23 19:36+0100\n"
 "Last-Translator: Sanlig Badral <Badral@openmn.org>\n"
 "Language-Team: Mongolian <openmn-core@lists.sf.net>\n"
@@ -520,12 +520,17 @@ msgid ""
 "sure it all worked right."
 msgstr ""
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Мандрива Дэлгүүр"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
+msgid "%s Control Center"
 msgstr "Мандрива Хяналтын Төв"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Ачаалж байна... Түр хүлээнэ үү"
@@ -1122,12 +1127,12 @@ msgstr "Тохируулах..."
 msgid "Configure installation server"
 msgstr "Цэс Тоноглол"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
+msgid "Set up server for network installations of %s"
 msgstr ""
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, fuzzy, c-format
 msgid "Network Services"
 msgstr "Сүлжээ-харьцах хэсэг"
@@ -1519,17 +1524,17 @@ msgstr "/Т_ухай..."
 msgid "Cancel"
 msgstr "Хүчингүй"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, fuzzy, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
+msgid "%s Control Center %s [on %s]"
 msgstr "Контрол Төвд"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, fuzzy, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
+msgid "Welcome to the %s Control Center"
 msgstr "Тавтай морил Контрол"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Алдаа"
@@ -1597,12 +1602,12 @@ msgstr ""
 msgid "Get additional themes on www.damz.net"
 msgstr "Нээх"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, fuzzy, c-format
-msgid "About - Mandriva Linux Control Center"
+msgid "About - %s Control Center"
 msgstr "Тухай Контрол"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, fuzzy, c-format
 msgid "Authors: "
 msgstr "Зохиогчид "
@@ -1651,10 +1656,10 @@ msgstr ""
 msgid "Translator: "
 msgstr ""
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, fuzzy, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
+msgid "%s %s (%s) Control Center"
 msgstr "Мандрива Хяналтын Төв"
 
 #. -PO: here %s is eg: "1999-2008"
@@ -1970,10 +1975,6 @@ msgstr "Дэлгэцийн нарийвчилал"
 #~ msgstr " / Муж"
 
 #, fuzzy
-#~ msgid "Mandriva Online"
-#~ msgstr "Мандрива Дэлгүүр"
-
-#, fuzzy
 #~ msgid "Updates"
 #~ msgstr "Шинэчлэх"
 
diff --git a/po/ms.po b/po/ms.po
index 3da57e13..c0a608b0 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: control-center\n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2008-04-06 20:35+0800\n"
 "Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n"
 "Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
@@ -19,15 +19,16 @@ msgstr ""
 msgid "Packagers"
 msgstr "Pempakej"
 
-#: ../contributors.pl:12
-#: ../contributors.pl:40
+#: ../contributors.pl:12 ../contributors.pl:40
 #, c-format
 msgid "Per Oyvind Karlsen"
 msgstr "Per Oyvind Karlsen"
 
 #: ../contributors.pl:12
 #, c-format
-msgid "massive packages rebuilding and cleaning, games, sparc port, proofreading of Mandriva tools"
+msgid ""
+"massive packages rebuilding and cleaning, games, sparc port, proofreading of "
+"Mandriva tools"
 msgstr ""
 
 #: ../contributors.pl:13
@@ -67,18 +68,21 @@ msgstr "Ben Reser"
 
 #: ../contributors.pl:16
 #, c-format
-msgid "updated nc with debian patches, fixed some perl packages, dnotify startup script, urpmc, hddtemp, wipe, etc..."
+msgid ""
+"updated nc with debian patches, fixed some perl packages, dnotify startup "
+"script, urpmc, hddtemp, wipe, etc..."
 msgstr ""
 
-#: ../contributors.pl:17
-#: ../contributors.pl:42
+#: ../contributors.pl:17 ../contributors.pl:42
 #, c-format
 msgid "Thomas Backlund"
 msgstr "Thomas Backlund"
 
 #: ../contributors.pl:17
 #, c-format
-msgid "\"deep and broad\" kernel work (many new patches before integration in official kernel)"
+msgid ""
+"\"deep and broad\" kernel work (many new patches before integration in "
+"official kernel)"
 msgstr ""
 
 #: ../contributors.pl:18
@@ -108,7 +112,10 @@ msgstr "Buchan Milne"
 
 #: ../contributors.pl:20
 #, c-format
-msgid "Samba 3.0 (prerelease) that co-exists with Samba 2.2.x, Samba-2.2.x, GIS software (grass, mapserver), cursor_themes collection, misc server-side contributions"
+msgid ""
+"Samba 3.0 (prerelease) that co-exists with Samba 2.2.x, Samba-2.2.x, GIS "
+"software (grass, mapserver), cursor_themes collection, misc server-side "
+"contributions"
 msgstr ""
 
 #: ../contributors.pl:21
@@ -118,7 +125,9 @@ msgstr "Goetz Waschk"
 
 #: ../contributors.pl:21
 #, c-format
-msgid "xine, totem, gstreamer, mplayer, vlc, vcdimager, xmms and plugins gnome-python, rox desktop"
+msgid ""
+"xine, totem, gstreamer, mplayer, vlc, vcdimager, xmms and plugins gnome-"
+"python, rox desktop"
 msgstr ""
 
 #: ../contributors.pl:22
@@ -128,7 +137,9 @@ msgstr "Austin Acton"
 
 #: ../contributors.pl:22
 #, c-format
-msgid "audio/video/MIDI apps, scientific apps, audio/video production howtos, bluetooth, pyqt & related"
+msgid ""
+"audio/video/MIDI apps, scientific apps, audio/video production howtos, "
+"bluetooth, pyqt & related"
 msgstr ""
 
 #: ../contributors.pl:23
@@ -191,15 +202,16 @@ msgstr "Andi Payn"
 msgid "many extra gnome applets and python modules"
 msgstr ""
 
-#: ../contributors.pl:29
-#: ../contributors.pl:41
+#: ../contributors.pl:29 ../contributors.pl:41
 #, c-format
 msgid "Tibor Pittich"
 msgstr "Tibor Pittich"
 
 #: ../contributors.pl:29
 #, c-format
-msgid "sk-i18n, contributed several packages, openldap testing and integration, bind-sdb-ldap, several years of using cooker and bug hunting, etc..."
+msgid ""
+"sk-i18n, contributed several packages, openldap testing and integration, "
+"bind-sdb-ldap, several years of using cooker and bug hunting, etc..."
 msgstr ""
 
 #: ../contributors.pl:30
@@ -239,7 +251,9 @@ msgstr "Brook Humphrey"
 
 #: ../contributors.pl:33
 #, c-format
-msgid "testing and bug reports, Dovecot, bibletime, sword, help with pure-ftpd, spamassassin, maildrop, clamav."
+msgid ""
+"testing and bug reports, Dovecot, bibletime, sword, help with pure-ftpd, "
+"spamassassin, maildrop, clamav."
 msgstr ""
 
 #: ../contributors.pl:34
@@ -249,7 +263,10 @@ msgstr "Olivier Blin"
 
 #: ../contributors.pl:34
 #, c-format
-msgid "http proxy support in installer, kernel 2.6 support in sndconfig, samba3 support in LinNeighborhood, fixes and enhancements in urpmi, bootsplash and drakxtools"
+msgid ""
+"http proxy support in installer, kernel 2.6 support in sndconfig, samba3 "
+"support in LinNeighborhood, fixes and enhancements in urpmi, bootsplash and "
+"drakxtools"
 msgstr ""
 
 #: ../contributors.pl:35
@@ -352,27 +369,22 @@ msgstr "Penterjemah Estonia"
 msgid "Andrea Celli"
 msgstr "Andrea Celli"
 
-#: ../contributors.pl:47
-#: ../contributors.pl:48
-#: ../contributors.pl:49
+#: ../contributors.pl:47 ../contributors.pl:48 ../contributors.pl:49
 #, c-format
 msgid "Italian Translator"
 msgstr "Penterjemah Itali"
 
-#: ../contributors.pl:48
-#: ../contributors.pl:64
+#: ../contributors.pl:48 ../contributors.pl:64
 #, c-format
 msgid "Simone Riccio"
 msgstr "Simone Riccio"
 
-#: ../contributors.pl:49
-#: ../contributors.pl:65
+#: ../contributors.pl:49 ../contributors.pl:65
 #, c-format
 msgid "Daniele Pighin"
 msgstr "Daniele Pighin"
 
-#: ../contributors.pl:50
-#: ../contributors.pl:68
+#: ../contributors.pl:50 ../contributors.pl:68
 #, c-format
 msgid "Vedran Ljubovic"
 msgstr "Vedran Ljubovic"
@@ -402,15 +414,9 @@ msgstr ""
 msgid "Bernhard Gruen"
 msgstr "Bernhard Gruen"
 
-#: ../contributors.pl:53
-#: ../contributors.pl:54
-#: ../contributors.pl:55
-#: ../contributors.pl:56
-#: ../contributors.pl:57
-#: ../contributors.pl:58
-#: ../contributors.pl:59
-#: ../contributors.pl:60
-#: ../contributors.pl:61
+#: ../contributors.pl:53 ../contributors.pl:54 ../contributors.pl:55
+#: ../contributors.pl:56 ../contributors.pl:57 ../contributors.pl:58
+#: ../contributors.pl:59 ../contributors.pl:60 ../contributors.pl:61
 #: ../contributors.pl:62
 #, c-format
 msgid "testing and bug reporting"
@@ -471,12 +477,8 @@ msgstr "Raphael Gertz"
 msgid "testing, bug report, Nvidia package try"
 msgstr ""
 
-#: ../contributors.pl:64
-#: ../contributors.pl:65
-#: ../contributors.pl:66
-#: ../contributors.pl:67
-#: ../contributors.pl:68
-#: ../contributors.pl:69
+#: ../contributors.pl:64 ../contributors.pl:65 ../contributors.pl:66
+#: ../contributors.pl:67 ../contributors.pl:68 ../contributors.pl:69
 #, c-format
 msgid "testing, bug reporting"
 msgstr "pengujian, laporan pepijat"
@@ -508,38 +510,41 @@ msgstr "MD, pengujian, laporan pepijat"
 
 #: ../contributors.pl:71
 #, c-format
-msgid "And many unnamed and unknown beta testers and bug reporters that helped make sure it all worked right."
+msgid ""
+"And many unnamed and unknown beta testers and bug reporters that helped make "
+"sure it all worked right."
 msgstr ""
 
-#: ../control-center:97
-#: ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Penyumbang Mandriva Linux"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Pusat Kawalan Mandriva Linux"
+msgid "%s Control Center"
+msgstr "Pusat Kawalan %s"
 
-#: ../control-center:107
-#: ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Muatan...Sila Tunggu"
 
-#: ../control-center:140
-#: ../control-center:141
+#: ../control-center:140 ../control-center:141
 #, fuzzy, c-format
 msgid "Configure 3D Desktop effects"
 msgstr "Tetapkan pelayan kumpulan berita"
 
 #. -PO: this message is already translated in drakx domain from which MCC will searchs it:
-#: ../control-center:152
-#: ../control-center:850
-#: ../control-center:853
+#: ../control-center:152 ../control-center:850 ../control-center:853
 #, c-format
 msgid "Authentication"
 msgstr "Pengesahan"
 
 #: ../control-center:153
 #, c-format
-msgid "Select the authentication method (local, NIS, LDAP, Windows Domain, ...)"
+msgid ""
+"Select the authentication method (local, NIS, LDAP, Windows Domain, ...)"
 msgstr ""
 
 #: ../control-center:162
@@ -607,14 +612,12 @@ msgstr "Cekara liut boot"
 msgid "Generate a standalone boot floppy"
 msgstr "Janakan cakera liut sendirian"
 
-#: ../control-center:223
-#: ../control-center:224
+#: ../control-center:223 ../control-center:224
 #, c-format
 msgid "Share the Internet connection with other local machines"
 msgstr ""
 
-#: ../control-center:233
-#: ../control-center:234
+#: ../control-center:233 ../control-center:234
 #, fuzzy, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Name=Network Interface"
@@ -629,14 +632,12 @@ msgstr "Akses Internet"
 msgid "Alter miscellaneous internet settings"
 msgstr ""
 
-#: ../control-center:253
-#: ../control-center:254
+#: ../control-center:253 ../control-center:254
 #, fuzzy, c-format
 msgid "Open a console as administrator"
 msgstr "Buka fail sebagai jenis:"
 
-#: ../control-center:264
-#: ../control-center:265
+#: ../control-center:264 ../control-center:265
 #, fuzzy, c-format
 msgid "Manage date and time"
 msgstr "Selit Tarikh dan Masa"
@@ -651,8 +652,7 @@ msgstr "Pasang LAN tanpa wayar"
 msgid "Choose the display manager that enables to select which user to log in"
 msgstr ""
 
-#: ../control-center:284
-#: ../control-center:285
+#: ../control-center:284 ../control-center:285
 #, c-format
 msgid "Configure a fax server"
 msgstr "Tetapkan pelayan faks"
@@ -664,17 +664,16 @@ msgstr "Pasang LAN tanpa wayar"
 
 #: ../control-center:295
 #, c-format
-msgid "Set up a personal firewall in order to protect the computer and the network"
+msgid ""
+"Set up a personal firewall in order to protect the computer and the network"
 msgstr ""
 
-#: ../control-center:304
-#: ../control-center:305
+#: ../control-center:304 ../control-center:305
 #, c-format
 msgid "Manage, add and remove fonts. Import Windows(TM) fonts"
 msgstr ""
 
-#: ../control-center:314
-#: ../control-center:315
+#: ../control-center:314 ../control-center:315
 #, c-format
 msgid "Set up the graphical server"
 msgstr "Tetapkan pelayan bergrafik"
@@ -689,14 +688,12 @@ msgstr "Gantung Ke Cakera"
 msgid "Create, delete and resize hard disk partitions"
 msgstr ""
 
-#: ../control-center:334
-#: ../control-center:335
+#: ../control-center:334 ../control-center:335
 #, fuzzy, c-format
 msgid "Browse and configure hardware"
 msgstr "Konfigurasikan peranti dan sambungan rangkaian"
 
-#: ../control-center:345
-#: ../control-center:346
+#: ../control-center:345 ../control-center:346
 #, fuzzy, c-format
 msgid "Sound Configuration"
 msgstr "Konfigurasi Sistem Bunyi"
@@ -731,8 +728,7 @@ msgstr ""
 msgid "Set up network interfaces failover and firewall replication"
 msgstr ""
 
-#: ../control-center:376
-#: ../control-center:377
+#: ../control-center:376 ../control-center:377
 #, c-format
 msgid "Set up the keyboard layout"
 msgstr "Tetapkan susunatur papan kekunci"
@@ -757,8 +753,7 @@ msgstr "Konfigurasikan penjimatan tenaga bagi sistem anda"
 msgid "Select the language and the country or region of the system"
 msgstr ""
 
-#: ../control-center:405
-#: ../control-center:406
+#: ../control-center:405 ../control-center:406
 #, c-format
 msgid "View and search system logs"
 msgstr "Lihat dan cari log sistem"
@@ -783,7 +778,9 @@ msgstr ""
 
 #: ../control-center:426
 #, fuzzy, c-format
-msgid "Upload your configuration in order to keep you informed about security and useful upgrades"
+msgid ""
+"Upload your configuration in order to keep you informed about security and "
+"useful upgrades"
 msgstr ""
 "Pembantu ini akan menolong Anda meng-upload konfigurasi Anda\n"
 "(pakej, konfigurasi peekakasan) ke pangkalan data pusat agar Anda selalu\n"
@@ -806,7 +803,9 @@ msgstr "Konfigurasi Sistem Bunyi"
 
 #: ../control-center:446
 #, c-format
-msgid "Look at available updates and apply any fixes or upgrades to installed packages"
+msgid ""
+"Look at available updates and apply any fixes or upgrades to installed "
+"packages"
 msgstr ""
 
 #: ../control-center:456
@@ -819,8 +818,7 @@ msgstr "Stail Menu"
 msgid "Menu Style Configuration"
 msgstr "Tetapan Gaya Menu"
 
-#: ../control-center:466
-#: ../control-center:467
+#: ../control-center:466 ../control-center:467
 #, c-format
 msgid "Import Windows(TM) documents and settings"
 msgstr ""
@@ -835,14 +833,12 @@ msgstr "Sambungan monitor"
 msgid "Monitor the network connections"
 msgstr "Perhati sambungan rangkaian"
 
-#: ../control-center:486
-#: ../control-center:487
+#: ../control-center:486 ../control-center:487
 #, c-format
 msgid "Set up the pointer device (mouse, touchpad)"
 msgstr ""
 
-#: ../control-center:505
-#: ../control-center:506
+#: ../control-center:505 ../control-center:506
 #, c-format
 msgid "Parental Controls"
 msgstr ""
@@ -852,8 +848,7 @@ msgstr ""
 msgid "Network Center"
 msgstr "Tab Tengah"
 
-#: ../control-center:497
-#: ../control-center:974
+#: ../control-center:497 ../control-center:974
 #, fuzzy, c-format
 msgid "Manage your network devices"
 msgstr "Mengurus kekunci GPG anda"
@@ -908,8 +903,7 @@ msgstr ""
 msgid "Set up sharing of your hard disk partitions"
 msgstr ""
 
-#: ../control-center:557
-#: ../control-center:559
+#: ../control-center:557 ../control-center:559
 #, c-format
 msgid "Set up the printer(s), the print job queues, ..."
 msgstr ""
@@ -954,8 +948,7 @@ msgstr "Buang sambungan"
 msgid "Delete a network interface"
 msgstr "Padam antaramuka rangkaian"
 
-#: ../control-center:608
-#: ../control-center:609
+#: ../control-center:608 ../control-center:609
 #, fuzzy, c-format
 msgid "Wireless connection"
 msgstr "Sambungan Gagal"
@@ -980,8 +973,7 @@ msgstr ""
 msgid "Manage configuration of Samba"
 msgstr "Urus penetapan Samba"
 
-#: ../control-center:638
-#: ../control-center:639
+#: ../control-center:638 ../control-center:639
 #, c-format
 msgid "Set up scanner"
 msgstr "Tetapkan scanner"
@@ -1006,8 +998,7 @@ msgstr "(dijumpai pada sistem ini)"
 msgid "Fine tune the security permissions of the system"
 msgstr ""
 
-#: ../control-center:668
-#: ../control-center:669
+#: ../control-center:668 ../control-center:669
 #, c-format
 msgid "Manage system services by enabling or disabling them"
 msgstr ""
@@ -1024,8 +1015,7 @@ msgstr ""
 
 #. -PO: here power means electrical power
 #. -PO: UPS==Uninterruptible power supply
-#: ../control-center:691
-#: ../control-center:694
+#: ../control-center:691 ../control-center:694
 #, c-format
 msgid "Set up a UPS for power monitoring"
 msgstr ""
@@ -1050,8 +1040,7 @@ msgstr "Virtualization"
 msgid "Virtual machines management"
 msgstr "GenericName=Pengurusan Gambar"
 
-#: ../control-center:725
-#: ../control-center:726
+#: ../control-center:725 ../control-center:726
 #, fuzzy, c-format
 msgid "Configure VPN connection to secure network access"
 msgstr "Konfigurasikan peranti rangkaian dan sambungan"
@@ -1066,15 +1055,12 @@ msgstr ""
 msgid "Set WebDAV mount points"
 msgstr "Tetap titik lekapan WebDAV"
 
-#: ../control-center:767
-#: ../control-center:771
+#: ../control-center:767 ../control-center:771
 #, c-format
 msgid "Software Management"
 msgstr "Pengurusan Perisian"
 
-#: ../control-center:781
-#: ../control-center:962
-#: ../control-center:996
+#: ../control-center:781 ../control-center:962 ../control-center:996
 #: ../control-center:1148
 #, fuzzy, c-format
 msgid "Others"
@@ -1085,8 +1071,7 @@ msgstr "Lain-lain"
 msgid "Server wizards"
 msgstr "Wizard pelayan"
 
-#: ../control-center:793
-#: ../control-center:796
+#: ../control-center:793 ../control-center:796
 #, c-format
 msgid "Sharing"
 msgstr "Perkongsian"
@@ -1108,7 +1093,9 @@ msgstr "Tetapkan Samba"
 
 #: ../control-center:803
 #, c-format
-msgid "Set up a file and print server for workstations running Linux and non-Linux systems"
+msgid ""
+"Set up a file and print server for workstations running Linux and non-Linux "
+"systems"
 msgstr ""
 
 #: ../control-center:805
@@ -1136,13 +1123,12 @@ msgstr "Tetapkan pelayan web"
 msgid "Configure installation server"
 msgstr "Tetapkan pelayan pemasangan"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
+msgid "Set up server for network installations of %s"
 msgstr ""
 
-#: ../control-center:821
-#: ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "Servis Rangkaian"
@@ -1184,11 +1170,11 @@ msgstr "Tetapkan masa"
 
 #: ../control-center:837
 #, c-format
-msgid "Set the time of the server to be synchronized with an external time server"
+msgid ""
+"Set the time of the server to be synchronized with an external time server"
 msgstr ""
 
-#: ../control-center:839
-#: ../control-center:840
+#: ../control-center:839 ../control-center:840
 #, c-format
 msgid "OpenSSH daemon configuration"
 msgstr "Tetapan daemon OpenSSH"
@@ -1213,8 +1199,7 @@ msgstr "Tetapkan LDAP"
 msgid "Configure the LDAP directory services"
 msgstr "Tetapkan servis direktori LDAP"
 
-#: ../control-center:871
-#: ../control-center:874
+#: ../control-center:871 ../control-center:874
 #, c-format
 msgid "Groupware"
 msgstr "Groupware"
@@ -1249,8 +1234,7 @@ msgstr "Tetapkan mel"
 msgid "Configure the Internet Mail services"
 msgstr "Tetapkan servis Mel Internet"
 
-#: ../control-center:895
-#: ../control-center:898
+#: ../control-center:895 ../control-center:898
 #, c-format
 msgid "Online Administration"
 msgstr "Pentadbiran Dalam Talian"
@@ -1305,8 +1289,7 @@ msgstr "Konfigurasikan peranti dan sambungan rangkaian"
 msgid "Configure printing and scanning"
 msgstr "Konfigurasikan peranti dan sambungan rangkaian"
 
-#: ../control-center:971
-#: ../drakxconf:28
+#: ../control-center:971 ../drakxconf:28
 #, c-format
 msgid "Network & Internet"
 msgstr "Rangkaian & Internet"
@@ -1356,8 +1339,7 @@ msgstr "Perkongsian NFS Terlekap"
 msgid "Configure WebDAV shares"
 msgstr "Tetapkan Perkongsian Fail"
 
-#: ../control-center:1065
-#: ../control-center:1068
+#: ../control-center:1065 ../control-center:1068
 #, fuzzy, c-format
 msgid "Local disks"
 msgstr "Layari Rangkaian Tempatan"
@@ -1412,8 +1394,7 @@ msgstr "Pemacu ZIP"
 msgid "Set where your ZIP drive is mounted"
 msgstr ""
 
-#: ../control-center:1115
-#: ../control-center:1118
+#: ../control-center:1115 ../control-center:1118
 #, c-format
 msgid "Security"
 msgstr "Keselamatan"
@@ -1438,9 +1419,7 @@ msgstr "Boot Microsoft Windows"
 msgid "Additional wizards"
 msgstr "Wizard tambahan"
 
-#: ../control-center:1211
-#: ../control-center:1212
-#: ../control-center:1213
+#: ../control-center:1211 ../control-center:1212 ../control-center:1213
 #: ../control-center:1226
 #, c-format
 msgid "/_Options"
@@ -1461,9 +1440,7 @@ msgstr "/_Mod Cangkok"
 msgid "/Expert mode in _wizards"
 msgstr "/Mod pakar dalam _wizard"
 
-#: ../control-center:1223
-#: ../control-center:1224
-#: ../control-center:1225
+#: ../control-center:1223 ../control-center:1224 ../control-center:1225
 #, c-format
 msgid "/_File"
 msgstr "/_Fail"
@@ -1483,9 +1460,7 @@ msgstr "<control>Q"
 msgid "Quit"
 msgstr "Keluar"
 
-#: ../control-center:1246
-#: ../control-center:1249
-#: ../control-center:1262
+#: ../control-center:1246 ../control-center:1249 ../control-center:1262
 #, c-format
 msgid "/_Themes"
 msgstr "/_Tema"
@@ -1504,20 +1479,14 @@ msgstr ""
 msgid "/_More themes"
 msgstr "/_Lagi tema"
 
-#: ../control-center:1264
-#: ../control-center:1265
-#: ../control-center:1266
-#: ../control-center:1267
-#: ../control-center:1268
-#: ../control-center:1269
+#: ../control-center:1264 ../control-center:1265 ../control-center:1266
+#: ../control-center:1267 ../control-center:1268 ../control-center:1269
 #: ../control-center:1272
 #, c-format
 msgid "/_Help"
 msgstr "/_Bantuan"
 
-#: ../control-center:1265
-#: ../control-center:1266
-#: ../control-center:1267
+#: ../control-center:1265 ../control-center:1266 ../control-center:1267
 #: ../control-center:1268
 #, c-format
 msgid "Help"
@@ -1553,18 +1522,17 @@ msgstr "/_Keterangan"
 msgid "Cancel"
 msgstr "Batal"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Pusat Kawalan Mandriva Linux %s [pada %s]"
+msgid "%s Control Center %s [on %s]"
+msgstr "Pusat Kawalan %s %s [pada %s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "Selamat Datang ke Pusat Kawalan Mandriva Linux"
+msgid "Welcome to the %s Control Center"
+msgstr "Selamat Datang ke Pusat Kawalan %s"
 
-#: ../control-center:1531
-#: ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Ralat"
@@ -1595,7 +1563,8 @@ msgstr "gagal mencabang: %s"
 #: ../control-center:1767
 #, c-format
 msgid "cannot fork and exec \"%s\" since it is not executable"
-msgstr "tidak dapat mencabang dan melaksana \"%s\" kerana ia bukan bolehlaksana"
+msgstr ""
+"tidak dapat mencabang dan melaksana \"%s\" kerana ia bukan bolehlaksana"
 
 #: ../control-center:1890
 #, c-format
@@ -1607,8 +1576,7 @@ msgstr "Program ini tamat secara tidak normal"
 msgid "Warning"
 msgstr "Amaran"
 
-#: ../control-center:1909
-#: ../drakconsole:31
+#: ../control-center:1909 ../drakconsole:31
 #, c-format
 msgid "Close"
 msgstr "Tutup"
@@ -1633,12 +1601,12 @@ msgstr "Tema tambahan"
 msgid "Get additional themes on www.damz.net"
 msgstr "Dapatkan tema tambahan di www.damz.net"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "Keterangan - Pusat Kawalan Mandriva Linux"
+msgid "About - %s Control Center"
+msgstr "Keterangan - Pusat Kawalan %s"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Penulis: "
@@ -1683,11 +1651,11 @@ msgstr "<sharuzzaman@myrealbox.com>"
 msgid "Translator: "
 msgstr "Penterjemah"
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Pusat Kawalan Mandriva Linux %s (%s)"
+msgid "%s %s (%s) Control Center"
+msgstr "Pusat Kawalan %s %s (%s)"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
@@ -1775,8 +1743,7 @@ msgstr "Pusat Kawalan"
 msgid "Choose the tool you want to use"
 msgstr "Pilih alatan yang anda hendak guna"
 
-#: ../menus_launcher.pl:19
-#: ../menus_launcher.pl:41
+#: ../menus_launcher.pl:19 ../menus_launcher.pl:41
 #, c-format
 msgid "Menu Configuration Center"
 msgstr "Pusat Konfigurasi Menu"
@@ -1786,9 +1753,7 @@ msgstr "Pusat Konfigurasi Menu"
 msgid "System menu"
 msgstr "Menu Sistem"
 
-#: ../menus_launcher.pl:29
-#: ../menus_launcher.pl:36
-#: ../print_launcher.pl:31
+#: ../menus_launcher.pl:29 ../menus_launcher.pl:36 ../print_launcher.pl:31
 #, c-format
 msgid "Configure..."
 msgstr "Konfigurasikan ..."
@@ -1809,8 +1774,7 @@ msgstr ""
 "\n"
 "Pilih menu yang hendak dikonfigurasi"
 
-#: ../print_launcher.pl:14
-#: ../print_launcher.pl:21
+#: ../print_launcher.pl:14 ../print_launcher.pl:21
 #, c-format
 msgid "Printing configuration"
 msgstr "Konfigurasi pencetak"
@@ -1936,4 +1900,3 @@ msgstr "Monitor"
 #: ../data/XFDrake-Resolution.desktop.in.h:1
 msgid "Screen Resolution"
 msgstr "Resolusi Skrin"
-
diff --git a/po/mt.po b/po/mt.po
index 20bb46b5..df6813c1 100644
--- a/po/mt.po
+++ b/po/mt.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2004-09-08 07:44+0200\n"
 "Last-Translator: Ramon Casha <ramon.casha@linux.org.mt>\n"
 "Language-Team: Maltese <mt@li.org>\n"
@@ -541,12 +541,17 @@ msgstr ""
 "U ħafna nies li ttestjaw il-beta u rrapportaw bugs, imsemmija u mhux "
 "magħrufa, li għenu biex jaċċertaw li kollox jaħdem."
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Mandriva Online"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Ċentru tal-Kontroll Mandriva Linux"
+msgid "%s Control Center"
+msgstr "Ċentru tal-Kontroll %s"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Tiela'... stenna ftit"
@@ -1144,12 +1149,12 @@ msgstr "Ikkonfigura web server"
 msgid "Configure installation server"
 msgstr "Ikkonfigura server tal-installazzjoni"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
+msgid "Set up server for network installations of %s"
 msgstr ""
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, fuzzy, c-format
 msgid "Network Services"
 msgstr "Interfaċċja tan-network"
@@ -1543,17 +1548,17 @@ msgstr "/_Dwar..."
 msgid "Cancel"
 msgstr "Ikkanċella"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Ċentru tal-Kontroll Mandriva Linux %s [fuq %s]"
+msgid "%s Control Center %s [on %s]"
+msgstr "Ċentru tal-Kontroll %s %s [fuq %s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "Merħba għaċ-Ċentru tal-Kontroll Mandriva Linux"
+msgid "Welcome to the %s Control Center"
+msgstr "Merħba għaċ-Ċentru tal-Kontroll %s"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Problema"
@@ -1621,12 +1626,12 @@ msgstr "Temi oħra"
 msgid "Get additional themes on www.damz.net"
 msgstr "Ikseb temi oħra minn www.damz.net"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "Dwar - Ċentru tal-Kontroll Mandriva Linux"
+msgid "About - %s Control Center"
+msgstr "Dwar - Ċentru tal-Kontroll %s"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Awturi: "
@@ -1671,11 +1676,11 @@ msgstr "<rcasha@waldonet.net.mt>"
 msgid "Translator: "
 msgstr "Traduttur: "
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, fuzzy, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Ċentru tal-Kontroll Mandriva Linux"
+msgid "%s %s (%s) Control Center"
+msgstr "Ċentru tal-Kontroll %s"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
@@ -1978,9 +1983,6 @@ msgstr "Reżoluzzjoni tal-iskrin"
 #~ msgid "Country / Region"
 #~ msgstr "Pajjiż"
 
-#~ msgid "Mandriva Online"
-#~ msgstr "Mandriva Online"
-
 #~ msgid "Updates"
 #~ msgstr "Aġġornamenti"
 
@@ -2101,8 +2103,8 @@ msgstr "Reżoluzzjoni tal-iskrin"
 #~ msgid "Floppy"
 #~ msgstr "Flopi"
 
-#~ msgid "Mandriva Linux Control Center %s\n"
-#~ msgstr "Ċentru tal-Kontroll Mandriva Linux %s\n"
+#~ msgid "%s Control Center %s\n"
+#~ msgstr "Ċentru tal-Kontroll %s %s\n"
 
 #~ msgid "Zip"
 #~ msgstr "Żip"
diff --git a/po/nb.po b/po/nb.po
index 6ef6f259..caae92e6 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2007-10-31 00:15+0100\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: dansk <dansk@dansk-gruppen.dk>\n"
@@ -548,12 +548,17 @@ msgstr ""
 "Og mange unavngitte og ukjente beta-testere og programvarefeilrapporterere "
 "som hjalp til med å sørge for at alt virket som det skal."
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Mandriva Linux-bidragsytere"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Mandriva Linux Kontrollsenter"
+msgid "%s Control Center"
+msgstr "%s Kontrollsenter"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Laster... Vennligst vent"
@@ -1157,12 +1162,12 @@ msgstr "Sett opp en vevtjener"
 msgid "Configure installation server"
 msgstr "Innstillinger for installasjonstjener"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
-msgstr "Sett opp en tjener for nettverksinstallasjon av Mandriva Linux"
+msgid "Set up server for network installations of %s"
+msgstr "Sett opp en tjener for nettverksinstallasjon av %s"
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "Nettverkstjenester"
@@ -1558,17 +1563,17 @@ msgstr "/_Om..."
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Mandriva Linux Kontrollsenter %s [på %s]"
+msgid "%s Control Center %s [on %s]"
+msgstr "%s Kontrollsenter %s [på %s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "Velkommen til Mandriva Linux Kontrollsenter"
+msgid "Welcome to the %s Control Center"
+msgstr "Velkommen til %s Kontrollsenter"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Feil"
@@ -1639,12 +1644,12 @@ msgstr "Flere temaer"
 msgid "Get additional themes on www.damz.net"
 msgstr "Få tak i flere temaer på www.damz.net"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "Om - Mandriva Linux Kontrollsenter"
+msgid "About - %s Control Center"
+msgstr "Om - %s Kontrollsenter"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Opphavspersoner: "
@@ -1691,11 +1696,11 @@ msgstr ""
 msgid "Translator: "
 msgstr "Oversetter: "
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Mandriva Linux %s (%s) Kontrollsenter"
+msgid "%s %s (%s) Control Center"
+msgstr "%s %s (%s) Kontrollsenter"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
diff --git a/po/nl.po b/po/nl.po
index de1e13bd..5efec563 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakconf-nl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2008-03-12 00:40+0100\n"
 "Last-Translator: Reinout van Schouwen <reinouts@gnome.org>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -548,12 +548,17 @@ msgstr ""
 "En vele ongenoemde en onbekende bèta-testers en foutrapporteurs die hebben "
 "geholpen om te zorgen dat het allemaal goed werkt."
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Mandriva Online"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Mandriva Linux Configuratiecentrum"
+msgid "%s Control Center"
+msgstr "%s Configuratiecentrum"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Bezig met laden... even geduld"
@@ -1166,12 +1171,12 @@ msgstr "Webserver instellen"
 msgid "Configure installation server"
 msgstr "Installatieserver configureren"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
-msgstr "Server instellen voor netwerkinstallaties van Mandriva Linux"
+msgid "Set up server for network installations of %s"
+msgstr "Server instellen voor netwerkinstallaties van %s"
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "Netwerkdiensten"
@@ -1569,17 +1574,17 @@ msgstr "/In_fo…"
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Mandriva Linux Configuratiecentrum %s [op %s]"
+msgid "%s Control Center %s [on %s]"
+msgstr "%s Configuratiecentrum %s [op %s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "Welkom bij het Mandriva Linux Configuratiecentrum"
+msgid "Welcome to the %s Control Center"
+msgstr "Welkom bij het %s Configuratiecentrum"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Fout"
@@ -1652,12 +1657,12 @@ msgstr "Aanvullende thema's"
 msgid "Get additional themes on www.damz.net"
 msgstr "Haal extra thema's van www.damz.net"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "Info - Mandriva Linux Configuratiecentrum"
+msgid "About - %s Control Center"
+msgstr "Info - %s Configuratiecentrum"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Auteurs: "
@@ -1704,11 +1709,11 @@ msgstr "vertaling@vrijschrift.org"
 msgid "Translator: "
 msgstr "Vertaler: "
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Mandriva Linux %s (%s) Configuratiecentrum"
+msgid "%s %s (%s) Control Center"
+msgstr "%s %s (%s) Configuratiecentrum"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
@@ -2020,9 +2025,6 @@ msgstr "Schermresolutie"
 #~ msgid "Country / Region"
 #~ msgstr "Land / regio"
 
-#~ msgid "Mandriva Online"
-#~ msgstr "Mandriva Online"
-
 #~ msgid "Updates"
 #~ msgstr "Herzieningen"
 
@@ -2179,8 +2181,8 @@ msgstr "Schermresolutie"
 #~ msgid "Manager Connection"
 #~ msgstr "Verbindingen beheren"
 
-#~ msgid "Mandriva Linux Control Center %s\n"
-#~ msgstr "Mandriva Linux Configuratiecentrum %s\n"
+#~ msgid "%s Control Center %s\n"
+#~ msgstr "%s Configuratiecentrum %s\n"
 
 #~ msgid "Monitor Connection"
 #~ msgstr "Verbindingen volgen"
diff --git a/po/nn.po b/po/nn.po
index f05b1faa..57a564b6 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: control-center\n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2008-03-11 19:52+0100\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -539,12 +539,17 @@ msgstr ""
 "Og tallause andre betatestarar og feilfinnarar som har vore med på å sørgja "
 "for at alt fungerer som det skal."
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Mandriva Online"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
+msgid "%s Control Center"
 msgstr "Kontrollsenter"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Lastar ... Vent litt"
@@ -1143,12 +1148,12 @@ msgstr "Set opp ein vevtenar"
 msgid "Configure installation server"
 msgstr "Set opp installasjonstenar"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
-msgstr "Set opp ein tenar for nettverksinstallering av Mandriva Linux"
+msgid "Set up server for network installations of %s"
+msgstr "Set opp ein tenar for nettverksinstallering av %s"
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "Nettverkstenester"
@@ -1545,17 +1550,17 @@ msgstr "/_Om ..."
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
+msgid "%s Control Center %s [on %s]"
 msgstr "Kontrollsenter %s [på %s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
+msgid "Welcome to the %s Control Center"
 msgstr "Velkommen til kontrollsenteret"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Feil"
@@ -1626,12 +1631,12 @@ msgstr "Fleire tema"
 msgid "Get additional themes on www.damz.net"
 msgstr "Få tak i fleire tema på <www.damz.net>"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
+msgid "About - %s Control Center"
 msgstr "Om – kontrollsenter"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Forfattarar: "
@@ -1676,11 +1681,11 @@ msgstr "<karl@huftis.org>"
 msgid "Translator: "
 msgstr "Omsetjar: "
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Mandriva Linux %s (%s) kontrollsenter"
+msgid "%s %s (%s) Control Center"
+msgstr "%s %s (%s) kontrollsenter"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
@@ -1992,9 +1997,6 @@ msgstr "Skjermoppløysing"
 #~ msgid "Country / Region"
 #~ msgstr "Land/språkområde"
 
-#~ msgid "Mandriva Online"
-#~ msgstr "Mandriva Online"
-
 #~ msgid "Updates"
 #~ msgstr "Oppdateringar"
 
diff --git a/po/pa_IN.po b/po/pa_IN.po
index 29852d30..85be9a54 100644
--- a/po/pa_IN.po
+++ b/po/pa_IN.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakconf\n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2005-03-14 05:31+0530\n"
 "Last-Translator: Jaswinder Singh Phulewala <jaswinderphulewala@yahoo.com>\n"
 "Language-Team: PLT <punlinux-i18n@list.sourceforge.net>\n"
@@ -534,12 +534,17 @@ msgstr ""
 "ਅਤੇ ਬਹੁਤ ਸਾਰੇ ਬਿਨਾ ਨਾਂ ਅਤੇ ਅਣਪਛਾਤੇ ਬੀਟਾ ਜਾਂਚਕਾਰ ਅਤੇ ਬੱਗ ਰਿਪੋਰਟਰ ਜੋ ਇਸ ਦੇ ਠੀਕ ਕੰਮ ਕਰਨ ਦਾ "
 "ਯਕੀਨ ਬਣਾਉਣ ਲਈ ਮਦਦ ਕਰਦੇ ਹਨ।"
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "ਮੈਂਡਰਿਵ ਆਨਲਾਈਨ"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
+msgid "%s Control Center"
 msgstr "ਮੈਂਡਰਿਵ ਲੀਨਕਸ ਕੰਟਰੋਲ ਸੈਂਟਰ"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "ਲੋਡ ਹੋ ਰਿਹਾ ਹੈ... ਕਿਰਪਾ ਕਰਕੇ ਉਡੀਕੋ"
@@ -1132,12 +1137,12 @@ msgstr "ਵੈਬ ਸਰਵਰ ਨਿਰਧਾਰਿਤ ਕਰੋ"
 msgid "Configure installation server"
 msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਸਰਵਰ ਸੰਰਚਿਤ ਕਰੋ"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
+msgid "Set up server for network installations of %s"
 msgstr "ਮੈਂਡਰਿਵ ਲੀਨਕਸ ਦੀ ਨੈੱਟਵਰਕ ਇੰਸਟਾਲੇਸ਼ਨ ਲਈ ਸਰਵਰ ਨਿਰਧਾਰਿਤ ਕਰੋ"
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "ਨੈੱਟਵਰਕ ਸੇਵਾਵਾਂ"
@@ -1531,17 +1536,17 @@ msgstr "/ਬਾਰੇ..."
 msgid "Cancel"
 msgstr "/ਰੱਦ ਕਰੋ"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
+msgid "%s Control Center %s [on %s]"
 msgstr "ਮੈਂਡਰਿਵ ਲੀਨਕਸ ਕੰਟਰੋਲ ਸੈਂਟਰ %s [%s ਤੇ]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
+msgid "Welcome to the %s Control Center"
 msgstr "ਮੈਂਡਰਿਵ ਲੀਨਕਸ ਕੰਟਰੋਲ ਸੈਂਟਰ ਵੱਲੋਂ ਜੀ ਆਇਆਂ ਨੂੰ"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "ਗਲਤੀ"
@@ -1609,12 +1614,12 @@ msgstr "ਵਾਧੂ ਸਰੂਪ"
 msgid "Get additional themes on www.damz.net"
 msgstr "ਵਾਧੂ ਸਰੂਪ www.damz.net ਤੋਂ ਪ੍ਰਾਪਤ ਕਰੋ"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
+msgid "About - %s Control Center"
 msgstr "ਬਾਰੇ - ਮੈਂਡਰਿਵ ਲੀਨਕਸ ਕੰਟਰੋਲ ਸੈਂਟਰ"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "ਸੰਪਾਦਕ:"
@@ -1659,10 +1664,10 @@ msgstr "jaswinderphulewala@yahoo.com"
 msgid "Translator: "
 msgstr "ਅਨੁਵਾਦਕ:"
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, fuzzy, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
+msgid "%s %s (%s) Control Center"
 msgstr "ਮੈਂਡਰਿਵ ਲੀਨਕਸ ਕੰਟਰੋਲ ਸੈਂਟਰ"
 
 #. -PO: here %s is eg: "1999-2008"
@@ -1970,9 +1975,6 @@ msgstr "ਪਰਦਾ ਰੈਜ਼ੋਲੂਸ਼ਨ"
 #~ msgid "Country / Region"
 #~ msgstr "ਦੇਸ਼ / ਖੇਤਰ"
 
-#~ msgid "Mandriva Online"
-#~ msgstr "ਮੈਂਡਰਿਵ ਆਨਲਾਈਨ"
-
 #~ msgid "Updates"
 #~ msgstr "ਨਵਿਨੀਕਰਨ"
 
diff --git a/po/pl.po b/po/pl.po
index 90389529..4a006d5f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: control-center\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2008-04-14 08:23+0200\n"
 "Last-Translator: Tomasz Bednarski - Amazis.net <tomasz.bednarski@mandriva."
 "pl>\n"
@@ -552,12 +552,17 @@ msgstr ""
 "I wielu niewymienionych i nieznanych testerów beta i ludzi zgłaszających "
 "błędy, którzy pomogli w tym, że wszystko poprawnie działa."
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Współautorzy Linuksa Mandriva Linux"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Centrum Sterowania Mandriva Linux"
+msgid "%s Control Center"
+msgstr "Centrum Sterowania %s"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Ładowanie... Proszę czekać"
@@ -1168,12 +1173,12 @@ msgstr "Konfiguracja serwera WWW"
 msgid "Configure installation server"
 msgstr "Konfiguracja serwera instalacyjnego"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
-msgstr "Konfiguracja serwera instalacyjnego Mandriva Linux"
+msgid "Set up server for network installations of %s"
+msgstr "Konfiguracja serwera instalacyjnego %s"
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "Usługi sieciowe"
@@ -1572,17 +1577,17 @@ msgstr "/_O programie..."
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Centrum Sterowania Mandriva Linux %s [na %s]"
+msgid "%s Control Center %s [on %s]"
+msgstr "Centrum Sterowania %s %s [na %s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "Witaj w Centrum Sterowania Mandriva Linux"
+msgid "Welcome to the %s Control Center"
+msgstr "Witaj w Centrum Sterowania %s"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Błąd"
@@ -1654,12 +1659,12 @@ msgstr "Dodatkowe tematy"
 msgid "Get additional themes on www.damz.net"
 msgstr "Pobieranie dodatkowych tematów z www.damz.net"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "O programie - Centrum Sterowania Mandriva Linux"
+msgid "About - %s Control Center"
+msgstr "O programie - Centrum Sterowania %s"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Autorzy: "
@@ -1704,11 +1709,11 @@ msgstr "arkadiusz.lipiec@gazeta.pl"
 msgid "Translator: "
 msgstr "Tłumacz: "
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Centrum Sterowania Mandriva Linux %s (%s)"
+msgid "%s %s (%s) Control Center"
+msgstr "Centrum Sterowania %s %s (%s)"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
diff --git a/po/pt.po b/po/pt.po
index 437f6b48..6da28e86 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2008-04-13 06:37+0100\n"
 "Last-Translator: Zé <ze@mandriva.org>\n"
 "Language-Team: Português <pt@li.org>\n"
@@ -89,8 +89,8 @@ msgid ""
 "updated nc with debian patches, fixed some perl packages, dnotify startup "
 "script, urpmc, hddtemp, wipe, etc..."
 msgstr ""
-"nc actualizado com correcções debian, corrigidos alguns pacotes perl, 'script' "
-"de arranque dnotify, urpmc, hddtemp, wipe, etc..."
+"nc actualizado com correcções debian, corrigidos alguns pacotes perl, "
+"'script' de arranque dnotify, urpmc, hddtemp, wipe, etc..."
 
 #: ../contributors.pl:17 ../contributors.pl:42
 #, c-format
@@ -103,8 +103,8 @@ msgid ""
 "\"deep and broad\" kernel work (many new patches before integration in "
 "official kernel)"
 msgstr ""
-"trabalho \"amplo e aprofundado\" no kernel (muitas novas correcções "
-"antes da integração no kernel oficial)"
+"trabalho \"amplo e aprofundado\" no kernel (muitas novas correcções antes da "
+"integração no kernel oficial)"
 
 #: ../contributors.pl:18
 #, c-format
@@ -153,8 +153,8 @@ msgid ""
 "xine, totem, gstreamer, mplayer, vlc, vcdimager, xmms and plugins gnome-"
 "python, rox desktop"
 msgstr ""
-"xine, totem, gstreamer, mplayer, vlc, vcdimager, xmms e extras gnome-"
-"python, rox desktop"
+"xine, totem, gstreamer, mplayer, vlc, vcdimager, xmms e extras gnome-python, "
+"rox desktop"
 
 #: ../contributors.pl:22
 #, c-format
@@ -199,8 +199,8 @@ msgstr "Oden Eriksson"
 #, c-format
 msgid "most web-based packages and many security-related packages"
 msgstr ""
-"a maior parte dos pacotes baseados em web e muitos pacotes relacionados "
-"com segurança"
+"a maior parte dos pacotes baseados em web e muitos pacotes relacionados com "
+"segurança"
 
 #: ../contributors.pl:26
 #, c-format
@@ -243,8 +243,8 @@ msgid ""
 "sk-i18n, contributed several packages, openldap testing and integration, "
 "bind-sdb-ldap, several years of using cooker and bug hunting, etc..."
 msgstr ""
-"sk-i18n, contribuiu com vários pacotes, teste e integração openldap, "
-"bind-sdb-ldap, vários anos de uso cooker e procura de erros, etc..."
+"sk-i18n, contribuiu com vários pacotes, teste e integração openldap, bind-"
+"sdb-ldap, vários anos de uso cooker e procura de erros, etc..."
 
 #: ../contributors.pl:30
 #, c-format
@@ -554,12 +554,17 @@ msgstr ""
 "E muitos verificadores beta e comunicadores de erros desconhecidos que "
 "ajudaram para que tudo corresse bem."
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Contribuidores Mandriva Linux"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Centro de Controlo Mandriva Linux"
+msgid "%s Control Center"
+msgstr "Centro de Controlo %s"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "A carregar... Por favor aguarde"
@@ -577,8 +582,10 @@ msgstr "Autenticação"
 
 #: ../control-center:153
 #, c-format
-msgid "Select the authentication method (local, NIS, LDAP, Windows Domain, ...)"
-msgstr "Seleccionar método de autenticação (local, NIS, LDAP, Domínio Windows, ...)"
+msgid ""
+"Select the authentication method (local, NIS, LDAP, Windows Domain, ...)"
+msgstr ""
+"Seleccionar método de autenticação (local, NIS, LDAP, Domínio Windows, ...)"
 
 #: ../control-center:162
 #, c-format
@@ -699,7 +706,8 @@ msgstr "Configurar 'firewall' pessoal"
 
 #: ../control-center:295
 #, c-format
-msgid "Set up a personal firewall in order to protect the computer and the network"
+msgid ""
+"Set up a personal firewall in order to protect the computer and the network"
 msgstr "Configurar 'firewall' pessoal para protecção do computador e da rede"
 
 #: ../control-center:304 ../control-center:305
@@ -805,7 +813,8 @@ msgstr "Configurar interface de rede"
 #: ../control-center:425
 #, c-format
 msgid "Upload your configuration to get information on upgrades"
-msgstr "Enviar a sua configuração para obter informações acerca de actualizações"
+msgstr ""
+"Enviar a sua configuração para obter informações acerca de actualizações"
 
 #: ../control-center:426
 #, c-format
@@ -993,7 +1002,8 @@ msgstr "Aceder a directórios e controladores partilhados Windows (SMB)"
 #: ../control-center:619
 #, c-format
 msgid "Configuration of Windows (Samba) shared drives and directories"
-msgstr "Configuração dos directórios e controladores partilhados (Samba) Windows"
+msgstr ""
+"Configuração dos directórios e controladores partilhados (Samba) Windows"
 
 #: ../control-center:628
 #, c-format
@@ -1018,7 +1028,8 @@ msgstr "Definir nível de segurança e auditoria"
 #: ../control-center:649
 #, c-format
 msgid "Set the system security level and the periodic security audit"
-msgstr "Definir nível de segurança do sistema e auditoria periódica de segurança"
+msgstr ""
+"Definir nível de segurança do sistema e auditoria periódica de segurança"
 
 #: ../control-center:658
 #, c-format
@@ -1140,7 +1151,8 @@ msgstr "Gerir partilhas Samba"
 #: ../control-center:806
 #, c-format
 msgid "Manage, create special share, create public/user share"
-msgstr "Gerir, criar partilhas especiais, criar partilhas públicas/utilizadores"
+msgstr ""
+"Gerir, criar partilhas especiais, criar partilhas públicas/utilizadores"
 
 #: ../control-center:808
 #, c-format
@@ -1157,12 +1169,12 @@ msgstr "Configurar servidor web"
 msgid "Configure installation server"
 msgstr "Configurar servidor de instalação"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
-msgstr "Configurar servidor para instalações de rede Mandriva Linux"
+msgid "Set up server for network installations of %s"
+msgstr "Configurar servidor para instalações de rede %s"
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "Serviços de Rede"
@@ -1204,8 +1216,10 @@ msgstr "Configurar hora"
 
 #: ../control-center:837
 #, c-format
-msgid "Set the time of the server to be synchronized with an external time server"
-msgstr "Definir hora do servidor para sincronização com servidor horário externo"
+msgid ""
+"Set the time of the server to be synchronized with an external time server"
+msgstr ""
+"Definir hora do servidor para sincronização com servidor horário externo"
 
 #: ../control-center:839 ../control-center:840
 #, c-format
@@ -1285,7 +1299,8 @@ msgstr "Configurar máquina local através de interface web"
 #: ../control-center:915
 #, c-format
 msgid "You don't seem to have webmin intalled. Local config is disabled"
-msgstr "Não parece ter o webmin instalado. A configuração local está desactivada"
+msgstr ""
+"Não parece ter o webmin instalado. A configuração local está desactivada"
 
 #: ../control-center:917
 #, c-format
@@ -1557,17 +1572,17 @@ msgstr "/_Acerca..."
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Centro de Controlo Mandriva Linux %s [em %s]"
+msgid "%s Control Center %s [on %s]"
+msgstr "Centro de Controlo %s %s [em %s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "Bem-vindo ao Centro de Controlo Mandriva Linux"
+msgid "Welcome to the %s Control Center"
+msgstr "Bem-vindo ao Centro de Controlo %s"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Erro"
@@ -1638,12 +1653,12 @@ msgstr "Temas adicionais"
 msgid "Get additional themes on www.damz.net"
 msgstr "Obter temas adicionais em www.damz.net"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "Acerca - Centro de Controlo Mandriva Linux"
+msgid "About - %s Control Center"
+msgstr "Acerca - Centro de Controlo %s"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Autores: "
@@ -1688,11 +1703,11 @@ msgstr "mmodem00@gmail.com, jose.jorge@oreka.com"
 msgid "Translator: "
 msgstr "Tradutor:"
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Centro de Controlo Mandriva Linux %s (%s)"
+msgid "%s %s (%s) Control Center"
+msgstr "Centro de Controlo %s %s (%s)"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
@@ -1937,4 +1952,3 @@ msgstr "Monitor"
 #: ../data/XFDrake-Resolution.desktop.in.h:1
 msgid "Screen Resolution"
 msgstr "Resolução de Ecrã"
-
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 7bf0c921..4a1d5fa6 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -22,7 +22,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2006-08-29 09:44-0300\n"
 "Last-Translator: Felipe Arruda <felipemiguel@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <kde-i18n-pt_br@mail.kde.org>\n"
@@ -555,12 +555,17 @@ msgstr ""
 "E muitos testadores e pessoas que reportaram erros que ajudaram a certificar "
 "que o trabalho saísse direito. "
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Mandriva Online"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Centro de Controle Mandriva Linux"
+msgid "%s Control Center"
+msgstr "Centro de Controle %s"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Abrindo... Por favor, aguarde"
@@ -1166,12 +1171,12 @@ msgstr "Configurar servidor web"
 msgid "Configure installation server"
 msgstr "Configurar servidor de instalação"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
-msgstr "Configurar servidor para instalações via rede do Mandriva Linux"
+msgid "Set up server for network installations of %s"
+msgstr "Configurar servidor para instalações via rede do %s"
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "Serviços de Rede"
@@ -1571,17 +1576,17 @@ msgstr "/_Sobre..."
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Centro de Controle Mandriva Linux %s [em %s]"
+msgid "%s Control Center %s [on %s]"
+msgstr "Centro de Controle %s %s [em %s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "Bem-vindo ao Centro de Controle Mandriva Linux"
+msgid "Welcome to the %s Control Center"
+msgstr "Bem-vindo ao Centro de Controle %s"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Erro"
@@ -1652,12 +1657,12 @@ msgstr "Temas adicionais"
 msgid "Get additional themes on www.damz.net"
 msgstr "Obter temas adicionais em www.damz.net"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "Sobre - Centro de Controle Mandriva Linux"
+msgid "About - %s Control Center"
+msgstr "Sobre - Centro de Controle %s"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Autores: "
@@ -1714,11 +1719,11 @@ msgstr ""
 msgid "Translator: "
 msgstr "Tradutor: "
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Centro de Controle Mandriva Linux %s (%s)"
+msgid "%s %s (%s) Control Center"
+msgstr "Centro de Controle %s %s (%s)"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
@@ -2030,9 +2035,6 @@ msgstr "Resolução de Ecrã"
 #~ msgid "Country / Region"
 #~ msgstr "País / Região"
 
-#~ msgid "Mandriva Online"
-#~ msgstr "Mandriva Online"
-
 #~ msgid "Updates"
 #~ msgstr "Atualizações"
 
diff --git a/po/ro.po b/po/ro.po
index c95adf5d..bfb6bde8 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakconf-ro\n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2008-03-18 17:46+0200\n"
 "Last-Translator: Pîrîu Cristian Ionuţ <piriu.cristian@rdslink.ro>\n"
 "Language-Team: Romanian <rtfs-project@lists.sourceforge.net>\n"
@@ -548,12 +548,17 @@ msgstr ""
 "Şi multi beta testeri şi bug reporteri nenumiţi şi necunoscuţi care ne-au "
 "ajutat să ne asigurăm că totul funcţionează corect."
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Mandriva Online"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Centrul de control Mandriva Linux"
+msgid "%s Control Center"
+msgstr "Centrul de control %s"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Încarc... Vă rog aşteptaţi!"
@@ -1160,12 +1165,12 @@ msgstr "Configurare server web"
 msgid "Configure installation server"
 msgstr "Configurare server de instalare"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
-msgstr "Configuraţi un server pentru instalarea în reţea a Mandriva Linux"
+msgid "Set up server for network installations of %s"
+msgstr "Configuraţi un server pentru instalarea în reţea a %s"
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "Servicii de reţea"
@@ -1563,17 +1568,17 @@ msgstr "/Despre..."
 msgid "Cancel"
 msgstr "Renuntă"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Centrul de control Mandriva Linux %s [pe %s]"
+msgid "%s Control Center %s [on %s]"
+msgstr "Centrul de control %s %s [pe %s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "Bun venit la Centrul de control Mandriva Linux"
+msgid "Welcome to the %s Control Center"
+msgstr "Bun venit la Centrul de control %s"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Eroare"
@@ -1644,12 +1649,12 @@ msgstr "Teme suplimentare"
 msgid "Get additional themes on www.damz.net"
 msgstr "Preluaţi teme suplimantare de la http://www.damz.net"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "Despre - Centrul de control Mandriva Linux"
+msgid "About - %s Control Center"
+msgstr "Despre - Centrul de control %s"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Autori: "
@@ -1694,11 +1699,11 @@ msgstr "<ovidiu.constantin@gmx.net>"
 msgid "Translator: "
 msgstr "Traducători:"
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Centrul de control Mandriva Linux %s (%s)"
+msgid "%s %s (%s) Control Center"
+msgstr "Centrul de control %s %s (%s)"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
@@ -2001,9 +2006,6 @@ msgstr "Rezoluţie ecran"
 #~ msgid "Country / Region"
 #~ msgstr "Ţara"
 
-#~ msgid "Mandriva Online"
-#~ msgstr "Mandriva Online"
-
 #~ msgid "Updates"
 #~ msgstr "Actualizări"
 
diff --git a/po/ru.po b/po/ru.po
index cf5a75cb..cf87f9fa 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2008-03-22 15:59+0400\n"
 "Last-Translator: akdengi <kazancas@mandriva.ru>\n"
 "Language-Team: \n"
@@ -307,7 +307,8 @@ msgstr "Emmanuel Blindauer"
 #: ../contributors.pl:35
 #, c-format
 msgid "lm_sensors for 2.6 kernel, testing, some contrib packages."
-msgstr "lm_sensors для ядра 2.6, тестирование, некоторые дополнительные пакеты."
+msgstr ""
+"lm_sensors для ядра 2.6, тестирование, некоторые дополнительные пакеты."
 
 #: ../contributors.pl:36
 #, c-format
@@ -547,12 +548,17 @@ msgstr ""
 "И многие другие неназванные и неизвестные бета-тестеры и информаторы об "
 "ошибках, которые помогли убедится в том, что все работает правильно."
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Контрибьюторы Mandriva Linux"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Центр управления Mandriva Linux"
+msgid "%s Control Center"
+msgstr "Центр управления %s"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Идет загрузка... Подождите, пожалуйста"
@@ -570,7 +576,8 @@ msgstr "Аутентификация"
 
 #: ../control-center:153
 #, c-format
-msgid "Select the authentication method (local, NIS, LDAP, Windows Domain, ...)"
+msgid ""
+"Select the authentication method (local, NIS, LDAP, Windows Domain, ...)"
 msgstr "Выберите метод аутентификации (local, NIS, LDAP, домен Windows, ...)"
 
 #: ../control-center:162
@@ -586,12 +593,14 @@ msgstr "Создание дискеты автоматической устан�
 #: ../control-center:172
 #, c-format
 msgid "Set up autologin to automatically log in"
-msgstr "Настройка автовхода и выбор пользователя для автоматического входа в систему"
+msgstr ""
+"Настройка автовхода и выбор пользователя для автоматического входа в систему"
 
 #: ../control-center:173
 #, c-format
 msgid "Enable autologin and select the user to automatically log in"
-msgstr "Включение автовхода и выбор пользователя для автоматического входа в систему"
+msgstr ""
+"Включение автовхода и выбор пользователя для автоматического входа в систему"
 
 #: ../control-center:182
 #, c-format
@@ -690,7 +699,8 @@ msgstr "Настройка файервола"
 
 #: ../control-center:295
 #, c-format
-msgid "Set up a personal firewall in order to protect the computer and the network"
+msgid ""
+"Set up a personal firewall in order to protect the computer and the network"
 msgstr "Настройка персонального файервола для защиты компьютера и сети"
 
 #: ../control-center:304 ../control-center:305
@@ -751,7 +761,8 @@ msgstr "Продвинутая настройка сетевых интерфе�
 #: ../control-center:367
 #, c-format
 msgid "Set up network interfaces failover and firewall replication"
-msgstr "Настройка перехвата отказавших сетевых интерфейсов и репликации файервола"
+msgstr ""
+"Настройка перехвата отказавших сетевых интерфейсов и репликации файервола"
 
 #: ../control-center:376 ../control-center:377
 #, c-format
@@ -1034,7 +1045,8 @@ msgstr "Настройка источников установки/обновл�
 #: ../control-center:679
 #, c-format
 msgid "Select from where software packages are downloaded "
-msgstr "Настройка источников для получения пакетов программ при обновлении системы"
+msgstr ""
+"Настройка источников для получения пакетов программ при обновлении системы"
 
 #. -PO: here power means electrical power
 #. -PO: UPS==Uninterruptible power supply
@@ -1150,12 +1162,12 @@ msgstr "Настройка веб-сервера"
 msgid "Configure installation server"
 msgstr "Настройка сервера инсталляции"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
-msgstr "Настройка сервера для установки Mandriva Linux по сети"
+msgid "Set up server for network installations of %s"
+msgstr "Настройка сервера для установки %s по сети"
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "Сетевые службы"
@@ -1197,8 +1209,10 @@ msgstr "Настройка времени"
 
 #: ../control-center:837
 #, c-format
-msgid "Set the time of the server to be synchronized with an external time server"
-msgstr "Настройка времени на сервере путем синхронизации с внешним сервером времени"
+msgid ""
+"Set the time of the server to be synchronized with an external time server"
+msgstr ""
+"Настройка времени на сервере путем синхронизации с внешним сервером времени"
 
 #: ../control-center:839 ../control-center:840
 #, c-format
@@ -1288,7 +1302,8 @@ msgstr "Удаленное администрирование"
 #: ../control-center:918
 #, c-format
 msgid "Click here if you want to configure a remote box via Web interface"
-msgstr "Нажмите сюда, если вы хотите настроить удаленную машину через веб-интерфейс"
+msgstr ""
+"Нажмите сюда, если вы хотите настроить удаленную машину через веб-интерфейс"
 
 #: ../control-center:931
 #, c-format
@@ -1548,17 +1563,17 @@ msgstr "/_О программе..."
 msgid "Cancel"
 msgstr "Отмена"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Центр управления Mandriva Linux %s [ %s ]"
+msgid "%s Control Center %s [on %s]"
+msgstr "Центр управления %s %s [ %s ]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "Добро пожаловать в Центр управления Mandriva Linux"
+msgid "Welcome to the %s Control Center"
+msgstr "Добро пожаловать в Центр управления %s"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Ошибка"
@@ -1631,12 +1646,12 @@ msgstr "Дополнительные темы"
 msgid "Get additional themes on www.damz.net"
 msgstr "Получить дополнительные темы с www.damz.net"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "О программе - Центр управления Mandriva Linux"
+msgid "About - %s Control Center"
+msgstr "О программе - Центр управления %s"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Авторы: "
@@ -1681,11 +1696,11 @@ msgstr "rc@mezon.ru, acid_jack@ukr.net, alice@lafox.net, kazancas@mandriva.ru"
 msgid "Translator: "
 msgstr "Переводчик: "
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Центр управления Mandriva Linux %s (%s)"
+msgid "%s %s (%s) Control Center"
+msgstr "Центр управления %s %s (%s)"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
@@ -1930,4 +1945,3 @@ msgstr "Монитор"
 #: ../data/XFDrake-Resolution.desktop.in.h:1
 msgid "Screen Resolution"
 msgstr "Разрешение экрана"
-
diff --git a/po/sc.po b/po/sc.po
index b186be56..1482dfc5 100644
--- a/po/sc.po
+++ b/po/sc.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakconf-sc\n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2005-09-14 11:07+0100\n"
 "Last-Translator: Antoni Pistis <antonio.pistis@virgilio.it>\n"
 "Language-Team: Sardu\n"
@@ -541,12 +541,17 @@ msgstr ""
 "E medas no nominaus e disconnotus beta testers e arrelateris de fartas, ki "
 "ant ajudau a assigurai ki totu giressit beni. "
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Mandriva Online"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Centru de Controllu Mandriva Linux"
+msgid "%s Control Center"
+msgstr "Centru de Controllu %s"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Carrighendi... Po praxeri, abeta"
@@ -1147,12 +1152,12 @@ msgstr "Assètia unu server web"
 msgid "Configure installation server"
 msgstr "Assètiu server de aposentada"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
-msgstr "Assètia unu server po aposentai Mandriva Linux de arretza"
+msgid "Set up server for network installations of %s"
+msgstr "Assètia unu server po aposentai %s de arretza"
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "Serbìtzius de Arretza"
@@ -1547,17 +1552,17 @@ msgstr "/_Apitzus de..."
 msgid "Cancel"
 msgstr "Annudda"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Centru de Controllu Mandriva Linux %s [in %s]"
+msgid "%s Control Center %s [on %s]"
+msgstr "Centru de Controllu %s %s [in %s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "Beni beniu in su Centru de Controllu Mandriva Linux"
+msgid "Welcome to the %s Control Center"
+msgstr "Beni beniu in su Centru de Controllu %s"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Faddina"
@@ -1628,12 +1633,12 @@ msgstr "Prus Temas"
 msgid "Get additional themes on www.damz.net"
 msgstr "Arcantza atrus temas in www.damz.net"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "Apitzus de - Centru de Controllu Mandriva Linux"
+msgid "About - %s Control Center"
+msgstr "Apitzus de - Centru de Controllu %s"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Autoris: "
@@ -1678,11 +1683,11 @@ msgstr "antonio.pistis@virgilio.it"
 msgid "Translator: "
 msgstr "Tradusidori: "
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, fuzzy, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Centru de Controllu Mandriva Linux"
+msgid "%s %s (%s) Control Center"
+msgstr "Centru de Controllu %s"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
@@ -1987,9 +1992,6 @@ msgstr "Arresolutzioni de su Bisori"
 #~ msgid "Country / Region"
 #~ msgstr "Stadu / Arrejoni"
 
-#~ msgid "Mandriva Online"
-#~ msgstr "Mandriva Online"
-
 #~ msgid "Updates"
 #~ msgstr "Ajorronus"
 
diff --git a/po/sk.po b/po/sk.po
index fda8041b..3683d1d3 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakconf\n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2005-09-12 16:48+0100\n"
 "Last-Translator: Tibor Pittich <Tibor.Pittich@mandriva.org>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -539,12 +539,17 @@ msgstr ""
 "A mnohí nepomenovaní a neznámi beta testeri a oznamovači chýb, čo tiež "
 "pomohlo k uisteniu sa či veci fungujú správne."
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Mandriva Online"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Kontrolné centrum Mandriva Linux"
+msgid "%s Control Center"
+msgstr "Kontrolné centrum %s"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Spúšťam... Prosím čakajte"
@@ -1148,12 +1153,12 @@ msgstr "Nastaviť webový server"
 msgid "Configure installation server"
 msgstr "Konfigurácia inštalačného servera"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
-msgstr "Nastaviť server pre sieťové inštalácie Mandriva Linuxu"
+msgid "Set up server for network installations of %s"
+msgstr "Nastaviť server pre sieťové inštalácie %su"
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "Sieťové služby"
@@ -1547,17 +1552,17 @@ msgstr "/_O aplikácii..."
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Kontrolné centrum Mandriva Linux %s [na %s]"
+msgid "%s Control Center %s [on %s]"
+msgstr "Kontrolné centrum %s %s [na %s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "Vitajte v kontrolnom centre Mandriva Linux"
+msgid "Welcome to the %s Control Center"
+msgstr "Vitajte v kontrolnom centre %s"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Chyba"
@@ -1628,12 +1633,12 @@ msgstr "Dodatkové témy"
 msgid "Get additional themes on www.damz.net"
 msgstr "Ďalšie témy nájdete na www.damz.net"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "O Kontrolnom centre Mandriva Linux"
+msgid "About - %s Control Center"
+msgstr "O Kontrolnom centre %s"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Autori:"
@@ -1678,11 +1683,11 @@ msgstr "i18n@mandrake.sk"
 msgid "Translator: "
 msgstr "Prekladateľ:"
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, fuzzy, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Kontrolné centrum Mandriva Linux"
+msgid "%s %s (%s) Control Center"
+msgstr "Kontrolné centrum %s"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
@@ -1993,9 +1998,6 @@ msgstr "Rozlíšenie obrazovky"
 #~ msgid "Country / Region"
 #~ msgstr "Krajina"
 
-#~ msgid "Mandriva Online"
-#~ msgstr "Mandriva Online"
-
 #~ msgid "Updates"
 #~ msgstr "Aktualizácie"
 
diff --git a/po/sl.po b/po/sl.po
index 487bdbbc..d83ae98c 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2008-03-30 23:38+0200\n"
 "Last-Translator: Jure Repinc <jlp@holodeck1.com>\n"
 "Language-Team: Slovenian <lugos-slo@lugos.si>\n"
@@ -25,7 +25,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+"Plural-Forms:  nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
+"n%100==4 ? 2 : 3);\n"
 
 #: ../contributors.pl:11
 #, c-format
@@ -552,12 +553,17 @@ msgstr ""
 "In mnogo neimenovanih in neznanih beta preizkuševalcev in poročevalcev o "
 "hroščih, ki so pomagali zagotoviti, da vse deluje pravilo."
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Sodelavci Mandriva Linux"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Nadzorno središče Mandriva Linux"
+msgid "%s Control Center"
+msgstr "Nadzorno središče %s"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Nalaganje ... Prosim počakajte"
@@ -575,7 +581,8 @@ msgstr "Overjanje"
 
 #: ../control-center:153
 #, c-format
-msgid "Select the authentication method (local, NIS, LDAP, Windows Domain, ...)"
+msgid ""
+"Select the authentication method (local, NIS, LDAP, Windows Domain, ...)"
 msgstr "Izberite metodo overjanja (krajevna, NIS, LDAP, Windows Domain ...)"
 
 #: ../control-center:162
@@ -697,7 +704,8 @@ msgstr "Nastavite osebni požarni zid"
 
 #: ../control-center:295
 #, c-format
-msgid "Set up a personal firewall in order to protect the computer and the network"
+msgid ""
+"Set up a personal firewall in order to protect the computer and the network"
 msgstr "Nastavite osebni požarni zid za zaščito računalnika in omrežja"
 
 #: ../control-center:304 ../control-center:305
@@ -758,7 +766,8 @@ msgstr "Napredne nastavitve za omrežne vmesnike in požarni zid"
 #: ../control-center:367
 #, c-format
 msgid "Set up network interfaces failover and firewall replication"
-msgstr "Nastavite preklapljanje omrežnih vmesnikov in replikacijo požarnega zidu"
+msgstr ""
+"Nastavite preklapljanje omrežnih vmesnikov in replikacijo požarnega zidu"
 
 #: ../control-center:376 ../control-center:377
 #, c-format
@@ -1161,12 +1170,12 @@ msgstr "Nastavite spletni strežnik"
 msgid "Configure installation server"
 msgstr "Nastavite namestitveni strežnik"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
-msgstr "Nastavite strežnik za omrežne namestitve Mandriva Linuxa"
+msgid "Set up server for network installations of %s"
+msgstr "Nastavite strežnik za omrežne namestitve %sa"
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "Omrežne storitve"
@@ -1208,7 +1217,8 @@ msgstr "Nastavite čas"
 
 #: ../control-center:837
 #, c-format
-msgid "Set the time of the server to be synchronized with an external time server"
+msgid ""
+"Set the time of the server to be synchronized with an external time server"
 msgstr ""
 "Nastavite čas na strežniku, ki bo sinhroniziran z zunanjim časovnim "
 "strežnikom"
@@ -1563,17 +1573,17 @@ msgstr "/_O ..."
 msgid "Cancel"
 msgstr "Prekliči"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Nadzorno središče Mandriva Linux %s [na %s]"
+msgid "%s Control Center %s [on %s]"
+msgstr "Nadzorno središče %s %s [na %s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "Dobrodošli v Nadzornem središču Mandriva Linux"
+msgid "Welcome to the %s Control Center"
+msgstr "Dobrodošli v Nadzornem središču %s"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Napaka"
@@ -1644,12 +1654,12 @@ msgstr "Dodatne teme"
 msgid "Get additional themes on www.damz.net"
 msgstr "Dodatne teme dobite na www.damz.net"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "O - Nadzorno središče Mandriva Linux"
+msgid "About - %s Control Center"
+msgstr "O - Nadzorno središče %s"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Avtorji: "
@@ -1698,11 +1708,11 @@ msgstr ""
 msgid "Translator: "
 msgstr "Prevajalec: "
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Nadzorno središče Mandriva Linux %s (%s)"
+msgid "%s %s (%s) Control Center"
+msgstr "Nadzorno središče %s %s (%s)"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
@@ -1947,4 +1957,3 @@ msgstr "Zaslon"
 #: ../data/XFDrake-Resolution.desktop.in.h:1
 msgid "Screen Resolution"
 msgstr "Ločljivost zaslona"
-
diff --git a/po/sq.po b/po/sq.po
index 1f14a3a4..450f6809 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakconf-sq\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2003-02-17 14:29+0100\n"
 "Last-Translator: Laurent Dhima <laurenti@alblinux.net>\n"
 "Language-Team: albanian <gnome-albanian-perkthyesit@lists.sourceforge.net>\n"
@@ -517,12 +517,17 @@ msgid ""
 "sure it all worked right."
 msgstr ""
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Mandriva Online"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Qendra Kontrolluese Mandriva Linux"
+msgid "%s Control Center"
+msgstr "Qendra Kontrolluese %s"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Duke ngarkuar... Ju lutemi një moment"
@@ -812,8 +817,8 @@ msgid ""
 "Look at available updates and apply any fixes or upgrades to installed "
 "packages"
 msgstr ""
-"Mandriva Linux Update ju ndihmon për të aplikuar korrigjimet apo rifreskimet "
-"e programeve të instaluar"
+"%s Update ju ndihmon për të aplikuar korrigjimet apo rifreskimet e "
+"programeve të instaluar"
 
 #: ../control-center:456
 #, c-format
@@ -1140,12 +1145,12 @@ msgstr "Konfiguroje..."
 msgid "Configure installation server"
 msgstr "Qendra e Konfigurimit në Menu"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
+msgid "Set up server for network installations of %s"
 msgstr ""
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, fuzzy, c-format
 msgid "Network Services"
 msgstr "Interfac rrjeti"
@@ -1541,17 +1546,17 @@ msgstr "/_Në lidhje me..."
 msgid "Cancel"
 msgstr "Anulo"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, fuzzy, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Qëndra Kontrolluese Mandriva Linux %s"
+msgid "%s Control Center %s [on %s]"
+msgstr "Qëndra Kontrolluese %s %s"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "Mirësevini në Qendrën Kontrolluese Mandriva Linux"
+msgid "Welcome to the %s Control Center"
+msgstr "Mirësevini në Qendrën Kontrolluese %s"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Gabim"
@@ -1619,12 +1624,12 @@ msgstr "Tema shtesë"
 msgid "Get additional themes on www.damz.net"
 msgstr "Prano tema shtesë tek www.damz.net"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "Informacione - Qendra Kontrolluese Mandriva Linux"
+msgid "About - %s Control Center"
+msgstr "Informacione - Qendra Kontrolluese %s"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Autorët: "
@@ -1669,11 +1674,11 @@ msgstr "<laurenti@alblinux.net>"
 msgid "Translator: "
 msgstr "Përktheu: "
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, fuzzy, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Qendra Kontrolluese Mandriva Linux"
+msgid "%s %s (%s) Control Center"
+msgstr "Qendra Kontrolluese %s"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
@@ -1993,9 +1998,6 @@ msgstr "Vendosmëria e Ekranit"
 #~ msgid "Country / Region"
 #~ msgstr "Shteti / Regjioni"
 
-#~ msgid "Mandriva Online"
-#~ msgstr "Mandriva Online"
-
 #, fuzzy
 #~ msgid "Updates"
 #~ msgstr "Azhurnimi"
diff --git a/po/sr.po b/po/sr.po
index c165f71b..2e4aa787 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakconf-sr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2004-02-01 15:24+0100\n"
 "Last-Translator: Toma Jankovic <webmaster@mandrake.co.yu>\n"
 "Language-Team: serbian <mdk@linux.rs.sr>\n"
@@ -535,12 +535,17 @@ msgid ""
 "sure it all worked right."
 msgstr ""
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Mandriva Online"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Mandriva Linux Контролни Центар"
+msgid "%s Control Center"
+msgstr "%s Контролни Центар"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Учитавам... Сачекајте моменат"
@@ -819,8 +824,8 @@ msgid ""
 "Look at available updates and apply any fixes or upgrades to installed "
 "packages"
 msgstr ""
-"Mandriva Linux Update вам помаже да извршите ажурирање система са новим "
-"софтверским пакетима"
+"%s Update вам помаже да извршите ажурирање система са новим софтверским "
+"пакетима"
 
 #: ../control-center:456
 #, c-format
@@ -1146,12 +1151,12 @@ msgstr "Подеси веб"
 msgid "Configure installation server"
 msgstr "Подеси инсталациони сервер"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
+msgid "Set up server for network installations of %s"
 msgstr ""
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, fuzzy, c-format
 msgid "Network Services"
 msgstr "Мрежни интерфејси"
@@ -1547,17 +1552,17 @@ msgstr "/_О..."
 msgid "Cancel"
 msgstr "Поништи"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Mandriva Linux Контролни Центар %s [на %s]"
+msgid "%s Control Center %s [on %s]"
+msgstr "%s Контролни Центар %s [на %s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "Добродошли у Mandriva Linux Контролни Центар"
+msgid "Welcome to the %s Control Center"
+msgstr "Добродошли у %s Контролни Центар"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Грешка"
@@ -1625,12 +1630,12 @@ msgstr "Додатне теме"
 msgid "Get additional themes on www.damz.net"
 msgstr "Скините нове теме са www.damz.net"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "О - Mandriva Linux Контролном Центру"
+msgid "About - %s Control Center"
+msgstr "О - %s Контролном Центру"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Аутори: "
@@ -1675,11 +1680,11 @@ msgstr "<tomaja@net.yu>"
 msgid "Translator: "
 msgstr "Преводилац:"
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, fuzzy, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Mandriva Linux Контролни Центар"
+msgid "%s %s (%s) Control Center"
+msgstr "%s Контролни Центар"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
@@ -1987,9 +1992,6 @@ msgstr "Резолуција екрана"
 #~ msgid "Country / Region"
 #~ msgstr "Земља"
 
-#~ msgid "Mandriva Online"
-#~ msgstr "Mandriva Online"
-
 #~ msgid "Updates"
 #~ msgstr "Ажурирање"
 
@@ -2326,32 +2328,30 @@ msgstr "Резолуција екрана"
 #~ msgid "Manager Connection"
 #~ msgstr "Управљање конекцијама"
 
-#~ msgid "Mandriva Linux Control Center %s\n"
-#~ msgstr "Mandriva Linux Контролни Центар %s\n"
+#~ msgid "%s Control Center %s\n"
+#~ msgstr "%s Контролни Центар %s\n"
 
 #~ msgid ""
-#~ "Mandriva Linux Control Center is Mandriva Linux's main configuration\n"
+#~ "%s 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 Mandriva Linux Control Center greatly\n"
+#~ "The tools accessed through the %s Control Center greatly\n"
 #~ "simplify the use of the system, notably by avoiding the use of the\n"
 #~ "evil command line."
 #~ msgstr ""
-#~ "Mandriva Linux Контролни Центар је Mandrivalinux-об главни "
-#~ "конфигурациони\n"
+#~ "%s Контролни Центар је Mandrivalinux-об главни конфигурациони\n"
 #~ "алат. Он омогућава администратору система да подеси хардвер\n"
 #~ "сервисе које користе сви корисници.\n"
 #~ "\n"
 #~ "\n"
-#~ "Алати којима се може приступити из Mandriva Linux Контролног Центра "
-#~ "веома\n"
+#~ "Алати којима се може приступити из %s Контролног Центра веома\n"
 #~ "поједностављују коришћење система, углавном избегавањем\n"
 #~ "коришћења командне линије."
 
-#~ msgid "Mandriva Linux Update: dummy description"
-#~ msgstr "Mandriva Linux Update: лажни опис"
+#~ msgid "%s Update: dummy description"
+#~ msgstr "%s Update: лажни опис"
 
 #~ msgid "Menus: dummy description"
 #~ msgstr "Менији: лажни опис"
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index 42c16ead..23e002bb 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakconf-sr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2004-02-01 15:24+0100\n"
 "Last-Translator: Toma Jankovic_<webmaster@mandrake.co.yu>\n"
 "Language-Team: serbian <mdk@linux.rs.sr>\n"
@@ -535,12 +535,17 @@ msgid ""
 "sure it all worked right."
 msgstr ""
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Mandriva Online"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Mandriva Linux Kontrolni Centar"
+msgid "%s Control Center"
+msgstr "%s Kontrolni Centar"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Učitavam... Sačekajte momenat"
@@ -820,8 +825,8 @@ msgid ""
 "Look at available updates and apply any fixes or upgrades to installed "
 "packages"
 msgstr ""
-"Mandriva Linux Update vam pomaže da izvršite ažuriranje sistema sa novim "
-"softverskim paketima"
+"%s Update vam pomaže da izvršite ažuriranje sistema sa novim softverskim "
+"paketima"
 
 #: ../control-center:456
 #, c-format
@@ -1147,12 +1152,12 @@ msgstr "Podesi veb"
 msgid "Configure installation server"
 msgstr "Podesi instalacioni server"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
+msgid "Set up server for network installations of %s"
 msgstr ""
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, fuzzy, c-format
 msgid "Network Services"
 msgstr "Mrežni interfejsi"
@@ -1548,17 +1553,17 @@ msgstr "/_O..."
 msgid "Cancel"
 msgstr "Poništi"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Mandriva Linux Kontrolni Centar %s [na %s]"
+msgid "%s Control Center %s [on %s]"
+msgstr "%s Kontrolni Centar %s [na %s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "Dobrodošli u Mandriva Linux Kontrolni Centar"
+msgid "Welcome to the %s Control Center"
+msgstr "Dobrodošli u %s Kontrolni Centar"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Greška"
@@ -1626,12 +1631,12 @@ msgstr "Dodatne teme"
 msgid "Get additional themes on www.damz.net"
 msgstr "Skinite nove teme sa www.damz.net"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "O - Mandriva Linux Kontrolnom Centru"
+msgid "About - %s Control Center"
+msgstr "O - %s Kontrolnom Centru"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Autori: "
@@ -1676,11 +1681,11 @@ msgstr "<tomaja@net.yu>"
 msgid "Translator: "
 msgstr "Prevodilac:"
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, fuzzy, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Mandriva Linux Kontrolni Centar"
+msgid "%s %s (%s) Control Center"
+msgstr "%s Kontrolni Centar"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
@@ -1988,9 +1993,6 @@ msgstr "Rezolucija ekrana"
 #~ msgid "Country / Region"
 #~ msgstr "Zemlja"
 
-#~ msgid "Mandriva Online"
-#~ msgstr "Mandriva Online"
-
 #~ msgid "Updates"
 #~ msgstr "Ažuriranje"
 
@@ -2327,32 +2329,30 @@ msgstr "Rezolucija ekrana"
 #~ msgid "Manager Connection"
 #~ msgstr "Upravljanje konekcijama"
 
-#~ msgid "Mandriva Linux Control Center %s\n"
-#~ msgstr "Mandriva Linux Kontrolni Centar %s\n"
+#~ msgid "%s Control Center %s\n"
+#~ msgstr "%s Kontrolni Centar %s\n"
 
 #~ msgid ""
-#~ "Mandriva Linux Control Center is Mandriva Linux's main configuration\n"
+#~ "%s 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 Mandriva Linux Control Center greatly\n"
+#~ "The tools accessed through the %s Control Center greatly\n"
 #~ "simplify the use of the system, notably by avoiding the use of the\n"
 #~ "evil command line."
 #~ msgstr ""
-#~ "Mandriva Linux Kontrolni Centar je Mandrivalinux-ob glavni "
-#~ "konfiguracioni\n"
+#~ "%s 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 Mandriva Linux Kontrolnog Centra "
-#~ "veoma\n"
+#~ "Alati kojima se može pristupiti iz %s Kontrolnog Centra veoma\n"
 #~ "pojednostavljuju korišćenje sistema, uglavnom izbegavanjem\n"
 #~ "korišćenja komandne linije."
 
-#~ msgid "Mandriva Linux Update: dummy description"
-#~ msgstr "Mandriva Linux Update: lažni opis"
+#~ msgid "%s Update: dummy description"
+#~ msgstr "%s Update: lažni opis"
 
 #~ msgid "Menus: dummy description"
 #~ msgstr "Meniji: lažni opis"
diff --git a/po/sv.po b/po/sv.po
index d0d6a8a4..f1781260 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: control-center-sv\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2008-02-27 23:41+0200\n"
 "Last-Translator: Thomas Backlund <tmb@mandriva.org>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -547,12 +547,17 @@ msgstr ""
 "Och många ej nämnda och okända betatestare och buggrapportörer som hjälpt "
 "till att kolla att allt fungerat korrekt"
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Bidragsgivare till Mandriva Linux"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
+msgid "%s Control Center"
 msgstr "Mandrivas kontrollcentral"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Laddar... Vänta"
@@ -1155,12 +1160,12 @@ msgstr "Sätt upp en webbserver"
 msgid "Configure installation server"
 msgstr "Anpassa installationsserver"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
-msgstr "Konfigurera en server för nätverksinstallationer av Mandriva Linux"
+msgid "Set up server for network installations of %s"
+msgstr "Konfigurera en server för nätverksinstallationer av %s"
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "Nätverkstjänster"
@@ -1555,17 +1560,17 @@ msgstr "/_Om..."
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
+msgid "%s Control Center %s [on %s]"
 msgstr "Mandrivas kontrollcentral %s [på %s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
+msgid "Welcome to the %s Control Center"
 msgstr "Välkommen till Mandrivas kontrollcentral"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Fel"
@@ -1636,12 +1641,12 @@ msgstr "Ytterligare teman"
 msgid "Get additional themes on www.damz.net"
 msgstr "Fler teman finns på www.damz.net"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
+msgid "About - %s Control Center"
 msgstr "Om - Mandrivas kontrollcentral"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Upphovsmän: "
@@ -1686,11 +1691,11 @@ msgstr "newzella@linux.nu tmb@mandriva.org"
 msgid "Translator: "
 msgstr "Översättare: "
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Mandriva Linux %s (%s) Kontroll-center"
+msgid "%s %s (%s) Control Center"
+msgstr "%s %s (%s) Kontroll-center"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
diff --git a/po/ta.po b/po/ta.po
index c70a11d6..1dce40ce 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakconf 1.0\n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2004-03-04 22:50+0530\n"
 "Last-Translator: Badri Seshadri <bseshadri@yahoo.co.uk>\n"
 "Language-Team: Tamil <tamilinix@yahoogroups.com>\n"
@@ -533,12 +533,17 @@ msgstr ""
 "மற்றும் இது எல்லாம் சரியாக வேலை செய்வதை உறுதிபடுத்த உதவிய பல பெயர்குறிப்படப்படாத "
 "மற்றும் தெரியாத பீட்டா சோதனையாளர்கள் மற்றும் பிழை கண்டுபிடித்தவர்கள்."
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "மாண்ட்ேரக்இணைய"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
+msgid "%s Control Center"
 msgstr "மாண்ட்ரிவ கட்டுப்பாடு மையம்"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "ஏற்றப்படுகிறது....தயவுசெய்து காத்திருக்கவும்..."
@@ -1136,12 +1141,12 @@ msgstr "வலையை வடிவமை"
 msgid "Configure installation server"
 msgstr "நிறுவல் சேவையகத்தை வடிவமை"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
+msgid "Set up server for network installations of %s"
 msgstr ""
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, fuzzy, c-format
 msgid "Network Services"
 msgstr "வலை முகப்புக்கள்"
@@ -1535,17 +1540,17 @@ msgstr "/_பற்றி"
 msgid "Cancel"
 msgstr "தவிர்"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
+msgid "%s Control Center %s [on %s]"
 msgstr "மாண்ட்ரிவ கட்டுப்பாடு மையம் %s [on %s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
+msgid "Welcome to the %s Control Center"
 msgstr "மாண்ட்ரிவ கட்டுப்பாடு மையத்திற்கு வருக"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "பிழை"
@@ -1613,12 +1618,12 @@ msgstr "மேலும் சில உருகருக்கள்"
 msgid "Get additional themes on www.damz.net"
 msgstr "மேலும் சில உருகருக்கள் பெற www.damz.net செல்லுங்கள்"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
+msgid "About - %s Control Center"
 msgstr "மாண்ட்ரிவ கட்டுப்பாடு மையம் - பற்றி"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "ஆசிரியர்கள்: "
@@ -1663,10 +1668,10 @@ msgstr "prabu_anand2000@yahoo.com"
 msgid "Translator: "
 msgstr "மொழிபெயர்த்தவர்"
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, fuzzy, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
+msgid "%s %s (%s) Control Center"
 msgstr "மாண்ட்ரிவ கட்டுப்பாடு மையம்"
 
 #. -PO: here %s is eg: "1999-2008"
@@ -1980,9 +1985,6 @@ msgstr "திரைப் பரிமாணங்கள்"
 #~ msgid "Country / Region"
 #~ msgstr "நாடு"
 
-#~ msgid "Mandriva Online"
-#~ msgstr "மாண்ட்ேரக்இணைய"
-
 #~ msgid "Updates"
 #~ msgstr "புதுப்பித்தல்கள்"
 
@@ -2125,7 +2127,7 @@ msgstr "திரைப் பரிமாணங்கள்"
 #~ msgid "Manager Connection"
 #~ msgstr "இணைப்புகளை மேலான்மைசெய்"
 
-#~ msgid "Mandriva Linux Control Center %s\n"
+#~ msgid "%s Control Center %s\n"
 #~ msgstr "மாண்ட்ரிவ கட்டுப்பாடு மையம் %s\n"
 
 #~ msgid "Monitor Connection"
diff --git a/po/tg.po b/po/tg.po
index a72bbd25..945d9ba5 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakconf-tg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2005-09-17 15:21+0500\n"
 "Last-Translator: Victor Ibragimov <youth_opportunities@tajikngo.org>\n"
 "Language-Team: Tajik\n"
@@ -547,12 +547,17 @@ msgstr ""
 "Ва бисёр бетта-озмунгарони беном ва номаълум, маърӯзачиён оиди ғалат, ки "
 "имконияти бовари ҳосил кардан ба он, ки ҳама чиз дуруст кор мекунад, доданд."
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Mandriva Online"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Маркази Идоракунии Mandriva Linux"
+msgid "%s Control Center"
+msgstr "Маркази Идоракунии %s"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Корандозӣ... Лутфан, интизор шавед"
@@ -1163,12 +1168,12 @@ msgstr "Танзимоти хидматрасони вэб"
 msgid "Configure installation server"
 msgstr "Танзими хидматрасони коргузорӣ"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
+msgid "Set up server for network installations of %s"
 msgstr "Танзимоти хидматрасон барои сабт крдани Мандрива Линкус аз шабака"
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "Хизматҳои шабака"
@@ -1564,17 +1569,17 @@ msgstr "/_Дар бораи..."
 msgid "Cancel"
 msgstr "Бекор кардан"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Маркази Идоракунии Mandriva Linux %s [дар %s]"
+msgid "%s Control Center %s [on %s]"
+msgstr "Маркази Идоракунии %s %s [дар %s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "Марҳамат ба Маркази Идоракунии Mandriva Linux"
+msgid "Welcome to the %s Control Center"
+msgstr "Марҳамат ба Маркази Идоракунии %s"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Хатогӣ"
@@ -1642,12 +1647,12 @@ msgstr "Мавзӯъҳои иловагӣ"
 msgid "Get additional themes on www.damz.net"
 msgstr "Мавзӯъҳои иловагӣ гиред, дар www.damz.net"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "Дар бораи - Маркази Идоракунии Mandriva Linux"
+msgid "About - %s Control Center"
+msgstr "Дар бораи - Маркази Идоракунии %s"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Муаллифҳо: "
@@ -1692,11 +1697,11 @@ msgstr "<rkovacs@khujand.org>"
 msgid "Translator: "
 msgstr "Тарҷумон: "
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, fuzzy, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Маркази Идоракунии Mandriva Linux"
+msgid "%s %s (%s) Control Center"
+msgstr "Маркази Идоракунии %s"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
@@ -2001,9 +2006,6 @@ msgstr "Ҳалнокии Экран"
 #~ msgid "Country / Region"
 #~ msgstr "Мамлакат/ Минтақа"
 
-#~ msgid "Mandriva Online"
-#~ msgstr "Mandriva Online"
-
 #~ msgid "Updates"
 #~ msgstr "Нав кардан"
 
diff --git a/po/th.po b/po/th.po
index 2b8c99b9..23f576ee 100644
--- a/po/th.po
+++ b/po/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakconf 0.90\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2003-03-01 08:12+0900\n"
 "Last-Translator: Pramote Khuwijitjaru <kmote@hotmail.com>\n"
 "Language-Team: Thai <en@li.org>\n"
@@ -518,12 +518,17 @@ msgid ""
 "sure it all worked right."
 msgstr ""
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Mandriva Online"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Mandriva Linux ฐานควบคุม"
+msgid "%s Control Center"
+msgstr "%s ฐานควบคุม"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "โปรดรอสักครู่..."
@@ -798,7 +803,7 @@ msgstr ""
 msgid ""
 "Look at available updates and apply any fixes or upgrades to installed "
 "packages"
-msgstr "Mandriva Linux Update ช่วยคุณติดตั้งตัวแก้ไขหรือตัวอัพเดทของแพ็คเกจที่ติดตั้งแล้ว"
+msgstr "%s Update ช่วยคุณติดตั้งตัวแก้ไขหรือตัวอัพเดทของแพ็คเกจที่ติดตั้งแล้ว"
 
 #: ../control-center:456
 #, c-format
@@ -1118,12 +1123,12 @@ msgstr "ทำการปรับแต่ง.."
 msgid "Configure installation server"
 msgstr "ศูนย์การปรับแต่งเมนู"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
+msgid "Set up server for network installations of %s"
 msgstr ""
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, fuzzy, c-format
 msgid "Network Services"
 msgstr "แผงวงจรระบบเครือข่าย"
@@ -1517,17 +1522,17 @@ msgstr "/เกี่ยวกับ..."
 msgid "Cancel"
 msgstr "ยกเลิก"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, fuzzy, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Mandriva Linux Control Center %s"
+msgid "%s Control Center %s [on %s]"
+msgstr "%s Control Center %s"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "ยินดีต้อนรับสู่ Mandriva Linux Control Center"
+msgid "Welcome to the %s Control Center"
+msgstr "ยินดีต้อนรับสู่ %s Control Center"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "ผิดพลาด"
@@ -1595,12 +1600,12 @@ msgstr "ธีมเพิ่มเติม"
 msgid "Get additional themes on www.damz.net"
 msgstr "อ่านธีมใหม่เพิ่มเติมจาก www.damz.net"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "เกี่ยวกับ - Mandriva Linux Control Center"
+msgid "About - %s Control Center"
+msgstr "เกี่ยวกับ - %s Control Center"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "ผู้แต่ง:  "
@@ -1645,11 +1650,11 @@ msgstr "<taekratt@yahoo.com>"
 msgid "Translator: "
 msgstr "ผู้แปล:"
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, fuzzy, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Mandriva Linux ฐานควบคุม"
+msgid "%s %s (%s) Control Center"
+msgstr "%s ฐานควบคุม"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
@@ -1965,9 +1970,6 @@ msgstr "ความละเอียดของจอ"
 #~ msgid "Country / Region"
 #~ msgstr "ขนาดจอภาพ"
 
-#~ msgid "Mandriva Online"
-#~ msgstr "Mandriva Online"
-
 #, fuzzy
 #~ msgid "Updates"
 #~ msgstr "อัพเดท"
@@ -2132,25 +2134,25 @@ msgstr "ความละเอียดของจอ"
 #~ msgid "KeyboardDrake helps you to set your keyboard layout"
 #~ msgstr "KeyboardDrake ช่วยคุณตั้งเลย์เอ้าท์ของคีย์บอร์ด"
 
-#~ msgid "Mandriva Linux Control Center %s\n"
-#~ msgstr "Mandriva Linux Control Center %s\n"
+#~ msgid "%s Control Center %s\n"
+#~ msgstr "%s Control Center %s\n"
 
 #~ msgid ""
-#~ "Mandriva Linux Control Center is Mandriva Linux's main configuration\n"
+#~ "%s 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 Mandriva Linux Control Center greatly\n"
+#~ "The tools accessed through the %s Control Center greatly\n"
 #~ "simplify the use of the system, notably by avoiding the use of the\n"
 #~ "evil command line."
 #~ msgstr ""
-#~ "Mandriva Linux Control Center คือเครื่องมือหลักสำหรับการปรับแต่ง Mandriva Linux\n"
+#~ "%s Control Center คือเครื่องมือหลักสำหรับการปรับแต่ง Mandriva Linux\n"
 #~ "ในนี้ ผู้ดูแลระบบจะสามารถปรับแต่งฮาร์ดแวร์\n"
 #~ "และบริการต่างๆ สำหรับผู้ใช้ทั้งหมด\n"
 #~ "\n"
 #~ "\n"
-#~ "เครื่องมือที่ใช้ผ่าน Mandriva Linux Control Center ได้ถูก\n"
+#~ "เครื่องมือที่ใช้ผ่าน %s Control Center ได้ถูก\n"
 #~ "ทำให้ง่ายต่อการใช้ระบบ เห็นได้ชัดเจนจากการไม่จำเป็นต้อง \n"
 #~ "ใช้คำสั่งแบบคอมมานด์ไลน์"
 
diff --git a/po/tl.po b/po/tl.po
index 7f678588..b9505d6f 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakconf-tl\n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2005-02-02 23:38+0000\n"
 "Last-Translator: Arys P. Deloso <arys@deloso.org>\n"
 "Language-Team: Filipino <salin@pandaypinoy.org>\n"
@@ -541,12 +541,17 @@ msgstr ""
 "At marami pang di-pinangalanan at di-kilalang mga beta tester at mga "
 "tagaulat ng bug na nakatulong sa pagtiyak na gumagana nang tama ang lahat."
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Mandriva Online"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Sentro ng Kontrol ng Mandriva Linux"
+msgid "%s Control Center"
+msgstr "Sentro ng Kontrol ng %s"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Naglo-load... Pakihintay"
@@ -1146,12 +1151,12 @@ msgstr "I-configure ang web server"
 msgid "Configure installation server"
 msgstr "I-configure ang pang-install na server"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
+msgid "Set up server for network installations of %s"
 msgstr ""
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "Serbisyong Pang-network"
@@ -1545,17 +1550,17 @@ msgstr "/Tung_kol sa..."
 msgid "Cancel"
 msgstr "I-cancel"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Sentro ng Kontrol ng Mandriva Linux %s [sa %s]"
+msgid "%s Control Center %s [on %s]"
+msgstr "Sentro ng Kontrol ng %s %s [sa %s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "Maligayang pagdating sa Sentro ng Kontrol ng Mandriva Linux"
+msgid "Welcome to the %s Control Center"
+msgstr "Maligayang pagdating sa Sentro ng Kontrol ng %s"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Error"
@@ -1623,12 +1628,12 @@ msgstr "Mga karagdagang theme"
 msgid "Get additional themes on www.damz.net"
 msgstr "Kumuha ng mga karagdagang theme sa www.damz.net"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "Tungkol sa - Sentro ng Kontrol ng Mandriva Linux"
+msgid "About - %s Control Center"
+msgstr "Tungkol sa - Sentro ng Kontrol ng %s"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Mga may-akda: "
@@ -1673,11 +1678,11 @@ msgstr "<arys@deloso.org>"
 msgid "Translator: "
 msgstr "Tagapagsalin: "
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, fuzzy, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Sentro ng Kontrol ng Mandriva Linux"
+msgid "%s %s (%s) Control Center"
+msgstr "Sentro ng Kontrol ng %s"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
@@ -1981,9 +1986,6 @@ msgstr "Resolution ng Screen"
 #~ msgid "Country / Region"
 #~ msgstr "Bansa / Rehiyon"
 
-#~ msgid "Mandriva Online"
-#~ msgstr "Mandriva Online"
-
 #~ msgid "Updates"
 #~ msgstr "Mga update"
 
diff --git a/po/tr.po b/po/tr.po
index 7f217b61..b0efed8e 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakconf\n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2008-04-18 00:34+0300\n"
 "Last-Translator: Atilla ÖNTAŞ <atilla_ontas@hotmail.com>\n"
 "Language-Team: Türkçe <tr@li.org>\n"
@@ -545,12 +545,17 @@ msgstr ""
 "Ve hata bildiren ve ya düzgün çalıştığından emin olmamızı sağlayan birçok "
 "tanımadığımız insandan oluşan beta test ekibi "
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Mandriva Linux'a Yardım Edenler"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Mandriva Linux Denetim Merkezi"
+msgid "%s Control Center"
+msgstr "%s Denetim Merkezi"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Yükleniyor... Lütfen Bekleyiniz"
@@ -568,8 +573,10 @@ msgstr "Kimlik kanıtlama"
 
 #: ../control-center:153
 #, c-format
-msgid "Select the authentication method (local, NIS, LDAP, Windows Domain, ...)"
-msgstr "Kimlik doğrulama yöntemini seçiniz.(local, NIS, LDAP, Windows Domain, ...)"
+msgid ""
+"Select the authentication method (local, NIS, LDAP, Windows Domain, ...)"
+msgstr ""
+"Kimlik doğrulama yöntemini seçiniz.(local, NIS, LDAP, Windows Domain, ...)"
 
 #: ../control-center:162
 #, c-format
@@ -589,7 +596,8 @@ msgstr "Otomatik giriş ayarı"
 #: ../control-center:173
 #, c-format
 msgid "Enable autologin and select the user to automatically log in"
-msgstr "Otomatik girişi etkinleştirin ve otomatik giriş yapacak kullanıcıyı seçin."
+msgstr ""
+"Otomatik girişi etkinleştirin ve otomatik giriş yapacak kullanıcıyı seçin."
 
 #: ../control-center:182
 #, c-format
@@ -599,7 +607,8 @@ msgstr "Yedekler"
 #: ../control-center:183
 #, c-format
 msgid "Configure backups of the system and of the users' data"
-msgstr "Sistem ve kullanıcı bilgilerini yedeklemek için gerekli ayarlamaları yapın"
+msgstr ""
+"Sistem ve kullanıcı bilgilerini yedeklemek için gerekli ayarlamaları yapın"
 
 #: ../control-center:193
 #, c-format
@@ -690,7 +699,8 @@ msgstr "Kişisel bir güvenlik duvarı kurun"
 
 #: ../control-center:295
 #, c-format
-msgid "Set up a personal firewall in order to protect the computer and the network"
+msgid ""
+"Set up a personal firewall in order to protect the computer and the network"
 msgstr "Ağınızı ve bilgisayarı korumak için bir güvenlik duvarı oluşturun."
 
 #: ../control-center:304 ../control-center:305
@@ -1144,12 +1154,12 @@ msgstr "Web sunucuyu yapılandır"
 msgid "Configure installation server"
 msgstr "Kurulum sunucusunu yapılandır"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
+msgid "Set up server for network installations of %s"
 msgstr "Ağdan Mandriva kurulumu için sunucu oluşturun."
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "Ağ servisleri"
@@ -1191,7 +1201,8 @@ msgstr "Saat'i yapılandır"
 
 #: ../control-center:837
 #, c-format
-msgid "Set the time of the server to be synchronized with an external time server"
+msgid ""
+"Set the time of the server to be synchronized with an external time server"
 msgstr "Sistem saatini uzaktaki bir zaman sunucusu ile eşleyin"
 
 #: ../control-center:839 ../control-center:840
@@ -1542,17 +1553,17 @@ msgstr "/Hakkın_da..."
 msgid "Cancel"
 msgstr "İptal"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Mandriva Linux Denetim Merkezi %s [%s]"
+msgid "%s Control Center %s [on %s]"
+msgstr "%s Denetim Merkezi %s [%s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "Mandriva Linux Denetim Merkezine Hoşgeldiniz"
+msgid "Welcome to the %s Control Center"
+msgstr "%s Denetim Merkezine Hoşgeldiniz"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Hata"
@@ -1620,12 +1631,12 @@ msgstr "Ek Temalar"
 msgid "Get additional themes on www.damz.net"
 msgstr "Ek temaları www.damz.net'ten alabilirsiniz"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "Hakkında - Mandriva Linux Denetim Merkezi"
+msgid "About - %s Control Center"
+msgstr "Hakkında - %s Denetim Merkezi"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Yazarlar: "
@@ -1670,11 +1681,11 @@ msgstr "atilla_ontas@hotmail.com"
 msgid "Translator: "
 msgstr "Çevirmen: "
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Mandriva Linux %s (%s) Denetim Merkezi"
+msgid "%s %s (%s) Control Center"
+msgstr "%s %s (%s) Denetim Merkezi"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
@@ -1919,4 +1930,3 @@ msgstr "Monitör"
 #: ../data/XFDrake-Resolution.desktop.in.h:1
 msgid "Screen Resolution"
 msgstr "Ekran Çözünürlüğü"
-
diff --git a/po/uk.po b/po/uk.po
index 9b20f915..305c6465 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,5 +1,5 @@
 # Ukrainian translation of drakconf.
-# $Id: uk.po 233189 2008-01-23 12:22:19Z tv $
+# $Id$
 # Copyright (C) 2000,2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 # Copyright (c) 2000 Mandriva
 #
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakconf-uk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2007-09-07 09:26+0300\n"
 "Last-Translator: Taras Boychuk <btr1@mail.ru>\n"
 "Language-Team: ukrainian <uk@li.org>\n"
@@ -551,12 +551,17 @@ msgstr ""
 "І багато безіменних і невідомих бета тестувальників і повідомлювачів про "
 "помилки, які допомагали бути впевненим, що все це працює правильно."
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Mandriva Online"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
+msgid "%s Control Center"
 msgstr "Центр керування Мандріва Лінакс"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Завантажую... Будь ласка, зачекайте..."
@@ -1158,12 +1163,12 @@ msgstr "Встановити веб-сервер"
 msgid "Configure installation server"
 msgstr "Налаштувати сервер встановлення"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
+msgid "Set up server for network installations of %s"
 msgstr "Встановити сервер для встановлення Мандріва Лінакса з мережі"
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "Мережеві служби"
@@ -1559,17 +1564,17 @@ msgstr "/_A Про програму..."
 msgid "Cancel"
 msgstr "Скасувати"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
+msgid "%s Control Center %s [on %s]"
 msgstr "Центр керування Мандріва Лінакс %s [%s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
+msgid "Welcome to the %s Control Center"
 msgstr "Ласкаво просимо до Центру керування Мандріва Лінакс"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Помилка"
@@ -1642,12 +1647,12 @@ msgstr "Додаткові теми"
 msgid "Get additional themes on www.damz.net"
 msgstr "Взяти додаткові теми з www.damz.net"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
+msgid "About - %s Control Center"
 msgstr "Про Центр керування Мандріва Лінакс"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Автори: "
@@ -1692,10 +1697,10 @@ msgstr "<btr1@ukrpost.net>"
 msgid "Translator: "
 msgstr "Перекладач:"
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
+msgid "%s %s (%s) Control Center"
 msgstr "Центр керування Мандріва Лінакс %s (%s)"
 
 #. -PO: here %s is eg: "1999-2008"
@@ -2008,9 +2013,6 @@ msgstr "Роздільна здатність екрану"
 #~ msgid "Country / Region"
 #~ msgstr "Країна / Регіон"
 
-#~ msgid "Mandriva Online"
-#~ msgstr "Mandriva Online"
-
 #~ msgid "Updates"
 #~ msgstr "Поновлення"
 
diff --git a/po/uz.po b/po/uz.po
index ba812cbb..636ca532 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: uz\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2007-09-15 23:43+0200\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <floss-uz-l10n@googlegroups.com>\n"
@@ -521,12 +521,17 @@ msgid ""
 "sure it all worked right."
 msgstr ""
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "  Hissa qo'shuvchilar  "
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Mandriva Linux boshqaruv markazi"
+msgid "%s Control Center"
+msgstr "%s boshqaruv markazi"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Yuklanmoqda... Iltimos kutib turing"
@@ -798,7 +803,7 @@ msgstr "Kompyuterlar guruhida o'rnatilgan dasturlarni boshqarish"
 #: ../control-center:445
 #, c-format
 msgid "Update your system"
-msgstr "Mandriva Linux tizimini yangilash"
+msgstr "%s tizimini yangilash"
 
 #: ../control-center:446
 #, c-format
@@ -1124,14 +1129,13 @@ msgstr "Veb-serverni o'rnatish va moslash"
 msgid "Configure installation server"
 msgstr "O'rnatish serverini moslash"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
+msgid "Set up server for network installations of %s"
 msgstr ""
-"Mandriva Linux OTni tarmoq orqali o'rnatish uchun maxsus serverni o'rnatish "
-"va moslash"
+"%s OTni tarmoq orqali o'rnatish uchun maxsus serverni o'rnatish va moslash"
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "Tarmoq xizmatlari"
@@ -1525,17 +1529,17 @@ msgstr "/_Haqida"
 msgid "Cancel"
 msgstr "Bekor qilish"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Mandriva Linux boshqaruv markazi %s [%s]"
+msgid "%s Control Center %s [on %s]"
+msgstr "%s boshqaruv markazi %s [%s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "Mandriva Linux boshqaruv markaziga marhamat"
+msgid "Welcome to the %s Control Center"
+msgstr "%s boshqaruv markaziga marhamat"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Xato"
@@ -1603,12 +1607,12 @@ msgstr "Qo'shimcha mavzular"
 msgid "Get additional themes on www.damz.net"
 msgstr "www.damz.net saytidan qo'shimcha mavzularni olish"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "Mandriva Linux boshqaruv markazi haqida"
+msgid "About - %s Control Center"
+msgstr "%s boshqaruv markazi haqida"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Mualliflar:"
@@ -1653,11 +1657,11 @@ msgstr "kmashrab@uni-bremen.de"
 msgid "Translator: "
 msgstr "Tarjimon: "
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Mandriva Linux %s (%s) boshqaruv markazi"
+msgid "%s %s (%s) Control Center"
+msgstr "%s %s (%s) boshqaruv markazi"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
diff --git a/po/uz@cyrillic.po b/po/uz@cyrillic.po
index 23e728a6..24bb3bf3 100644
--- a/po/uz@cyrillic.po
+++ b/po/uz@cyrillic.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: uz\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2007-09-15 23:43+0200\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <floss-uz-l10n@googlegroups.com>\n"
@@ -521,12 +521,17 @@ msgid ""
 "sure it all worked right."
 msgstr ""
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "  Ҳисса қўшувчилар  "
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Mandriva Linux бошқарув маркази"
+msgid "%s Control Center"
+msgstr "%s бошқарув маркази"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Юкланмоқда... Илтимос кутиб туринг"
@@ -796,7 +801,7 @@ msgstr "Компьютерлар гуруҳида ўрнатилган даст�
 #: ../control-center:445
 #, c-format
 msgid "Update your system"
-msgstr "Mandriva Linux тизимини янгилаш"
+msgstr "%s тизимини янгилаш"
 
 #: ../control-center:446
 #, c-format
@@ -1121,14 +1126,12 @@ msgstr "Веб-серверни ўрнатиш ва мослаш"
 msgid "Configure installation server"
 msgstr "Ўрнатиш серверини мослаш"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
-msgstr ""
-"Mandriva Linux ОТни тармоқ орқали ўрнатиш учун махсус серверни ўрнатиш ва "
-"мослаш"
+msgid "Set up server for network installations of %s"
+msgstr "%s ОТни тармоқ орқали ўрнатиш учун махсус серверни ўрнатиш ва мослаш"
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "Тармоқ хизматлари"
@@ -1522,17 +1525,17 @@ msgstr "/_Ҳақида"
 msgid "Cancel"
 msgstr "Бекор қилиш"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Mandriva Linux бошқарув маркази %s [%s]"
+msgid "%s Control Center %s [on %s]"
+msgstr "%s бошқарув маркази %s [%s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "Mandriva Linux бошқарув марказига марҳамат"
+msgid "Welcome to the %s Control Center"
+msgstr "%s бошқарув марказига марҳамат"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Хато"
@@ -1600,12 +1603,12 @@ msgstr "Қўшимча мавзулар"
 msgid "Get additional themes on www.damz.net"
 msgstr "www.damz.net сайтидан қўшимча мавзуларни олиш"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "Mandriva Linux бошқарув маркази ҳақида"
+msgid "About - %s Control Center"
+msgstr "%s бошқарув маркази ҳақида"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Муаллифлар:"
@@ -1650,11 +1653,11 @@ msgstr "kmashrab@uni-bremen.de"
 msgid "Translator: "
 msgstr "Таржимон: "
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Mandriva Linux %s (%s) бошқарув маркази"
+msgid "%s %s (%s) Control Center"
+msgstr "%s %s (%s) бошқарув маркази"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
diff --git a/po/vi.po b/po/vi.po
index b1f28438..3af17716 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakconf-vi\n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2005-03-04 13:14+0700\n"
 "Last-Translator: Trinh Minh Thanh <tmthanh@yahoo.com>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
@@ -31,7 +31,7 @@ msgid ""
 "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  Mandriva Linux"
+"cho các công cụ của  %s"
 
 #: ../contributors.pl:13
 #, c-format
@@ -535,12 +535,17 @@ msgid ""
 msgstr ""
 "Và rất nhiều người đã chạy thử và báo lỗi để đảm bảo hệ thống chạy tốt."
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Mandriva Online"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Trung Tâm Điều Khiển Mandriva Linux"
+msgid "%s Control Center"
+msgstr "Trung Tâm Điều Khiển %s"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Đang nạp... Hãy chờ"
@@ -1141,12 +1146,12 @@ msgstr "Thiết lập máy chủ web"
 msgid "Configure installation server"
 msgstr "Cấu hình máy chủ cài đặt"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-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"
+msgid "Set up server for network installations of %s"
+msgstr "Thiết lập máy chủ để cài đặt %s qua mạng"
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "Dịch vụ mạng"
@@ -1541,17 +1546,17 @@ msgstr "/Giới t_hiệu..."
 msgid "Cancel"
 msgstr "Bỏ qua"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Trung Tâm Điều Khiển Mandriva Linux %s [trên %s]"
+msgid "%s Control Center %s [on %s]"
+msgstr "Trung Tâm Điều Khiển %s %s [trên %s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "Chào Mừng Trung Tâm Điều Khiển Mandriva Linux"
+msgid "Welcome to the %s Control Center"
+msgstr "Chào Mừng Trung Tâm Điều Khiển %s"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Lỗi"
@@ -1622,12 +1627,12 @@ msgstr "Theme bổ sung"
 msgid "Get additional themes on www.damz.net"
 msgstr "Lấy thêm theme tại www.damz.net"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "Giới thiệu - Trung Tâm Điều Khiển Mandriva Linux"
+msgid "About - %s Control Center"
+msgstr "Giới thiệu - Trung Tâm Điều Khiển %s"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Tác giả: "
@@ -1676,11 +1681,11 @@ msgstr ""
 msgid "Translator: "
 msgstr "Dịch sang tiếng Việt:"
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, fuzzy, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Trung Tâm Điều Khiển Mandriva Linux"
+msgid "%s %s (%s) Control Center"
+msgstr "Trung Tâm Điều Khiển %s"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
@@ -1992,9 +1997,6 @@ msgstr "Độ phân giải màn hình"
 #~ msgid "Country / Region"
 #~ msgstr "Quốc gia / Vùng"
 
-#~ msgid "Mandriva Online"
-#~ msgstr "Mandriva Online"
-
 #~ msgid "Updates"
 #~ msgstr "Cập nhật"
 
diff --git a/po/wa.po b/po/wa.po
index 815aa971..479a0094 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakconf 0.96\n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2004-09-03 00:27+0200\n"
 "Last-Translator: Pablo Saratxaga <pablo@walon.org>\n"
 "Language-Team: Walloon <linux-wa@walon.org>\n"
@@ -35,7 +35,7 @@ msgid ""
 "Mandriva tools"
 msgstr ""
 "bråmint des rpacaedjaedjes eyet netiaedjes, djeus, poirtaedje sparc, "
-"verifiaedje des usteyes Mandriva Linux"
+"verifiaedje des usteyes %s"
 
 #: ../contributors.pl:13
 #, c-format
@@ -547,12 +547,17 @@ msgstr ""
 "Eyet bråmint ds ôtes nén lomés chal, eyet des sayeus des modêyes beta k' ont-"
 "st aidî a fé ki tot rotaxhe comifåt. "
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Mandriva Online"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Cinte di contrôle di Mandriva Linux"
+msgid "%s Control Center"
+msgstr "Cinte di contrôle di %s"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "Tårdjîz on pô s' i vs plait... dji tchedje"
@@ -1184,13 +1189,12 @@ msgstr "Apontyî on sierveu waibe"
 msgid "Configure installation server"
 msgstr "Apontyî on sierveu d' astalaedje"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
-msgstr ""
-"Apontyî on sierveu po fé des astalaedjes di Mandriva Linux viè l' rantoele"
+msgid "Set up server for network installations of %s"
+msgstr "Apontyî on sierveu po fé des astalaedjes di %s viè l' rantoele"
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "Siervices rantoele"
@@ -1588,17 +1592,17 @@ msgstr "/Å_d fwait..."
 msgid "Cancel"
 msgstr "Rinoncî"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Cinte di contrôle di Mandriva Linux %s [so %s]"
+msgid "%s Control Center %s [on %s]"
+msgstr "Cinte di contrôle di %s %s [so %s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "Wilicome å cinte di contrôle di Mandriva Linux"
+msgid "Welcome to the %s Control Center"
+msgstr "Wilicome å cinte di contrôle di %s"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "Aroke"
@@ -1669,12 +1673,12 @@ msgstr "Tinmes di rawete"
 msgid "Get additional themes on www.damz.net"
 msgstr "Aberweter des noveas tinmes di www.damz.net"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "Åd fwait - Cinte di contrôle di Mandriva Linux"
+msgid "About - %s Control Center"
+msgstr "Åd fwait - Cinte di contrôle di %s"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "Oteurs: "
@@ -1719,11 +1723,11 @@ msgstr "<pablo@mandrakesoft.com>"
 msgid "Translator: "
 msgstr "Ratourneu: "
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, fuzzy, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Cinte di contrôle di Mandriva Linux"
+msgid "%s %s (%s) Control Center"
+msgstr "Cinte di contrôle di %s"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
@@ -2035,9 +2039,6 @@ msgstr "Finté del waitroûle"
 #~ msgid "Country / Region"
 #~ msgstr "Payis/Redjon"
 
-#~ msgid "Mandriva Online"
-#~ msgstr "Mandriva Online"
-
 #~ msgid "Updates"
 #~ msgstr "Metaedjes a djoû"
 
@@ -2216,8 +2217,8 @@ msgstr "Finté del waitroûle"
 #~ msgid "Manager Connection"
 #~ msgstr "Manaedjî les raloyaedjes"
 
-#~ msgid "Mandriva Linux Control Center %s\n"
-#~ msgstr "Cinte di contrôle di Mandriva Linux %s\n"
+#~ msgid "%s Control Center %s\n"
+#~ msgstr "Cinte di contrôle di %s %s\n"
 
 #~ msgid "Monitor Connection"
 #~ msgstr "Corwaitî les raloyaedjes"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7dbbf9f4..eac1c7dd 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakconf 0.96\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2007-08-22 15:43+0800\n"
 "Last-Translator: Funda Wang <fundawang@gmail.com>\n"
-"Language-Team: Mandriva Linux i18n Team <cooker-i18n@mandrivalinux.org>\n"
+"Language-Team: %s i18n Team <cooker-i18n@mandrivalinux.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,7 +32,7 @@ msgstr "Per Oyvind Karlsen"
 msgid ""
 "massive packages rebuilding and cleaning, games, sparc port, proofreading of "
 "Mandriva tools"
-msgstr "繁杂的软件包重建和清理，游戏，sparc 移植，Mandriva Linux 工具审阅"
+msgstr "繁杂的软件包重建和清理，游戏，sparc 移植，%s 工具审阅"
 
 #: ../contributors.pl:13
 #, c-format
@@ -530,12 +530,17 @@ msgid ""
 "sure it all worked right."
 msgstr "以及许多不知名的 beta 测试者和 bug 报告者，帮助了这一程序工作良好。"
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Mandriva Linux 贡献者"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Mandriva Linux 控制中心"
+msgid "%s Control Center"
+msgstr "%s 控制中心"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "正在装入...请稍候"
@@ -1127,12 +1132,12 @@ msgstr "设置 Web 服务器"
 msgid "Configure installation server"
 msgstr "配置安装服务器"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
-msgstr "设置 Mandriva Linux 的网络安装服务器"
+msgid "Set up server for network installations of %s"
+msgstr "设置 %s 的网络安装服务器"
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "网络服务"
@@ -1526,17 +1531,17 @@ msgstr "/关于(_A)..."
 msgid "Cancel"
 msgstr "取消"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Mandriva Linux 控制中心 %s [位于 %s]"
+msgid "%s Control Center %s [on %s]"
+msgstr "%s 控制中心 %s [位于 %s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "欢迎使用 Mandriva Linux 控制中心"
+msgid "Welcome to the %s Control Center"
+msgstr "欢迎使用 %s 控制中心"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "错误"
@@ -1607,12 +1612,12 @@ msgstr "额外主题"
 msgid "Get additional themes on www.damz.net"
 msgstr "在 www.damz.net 里获得额外主题"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "关于 - Mandriva Linux 控制中心"
+msgid "About - %s Control Center"
+msgstr "关于 - %s 控制中心"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "作者："
@@ -1657,11 +1662,11 @@ msgstr "fundawang@gmail.com,shiyutang_i18n@yahoo.com.cn"
 msgid "Translator: "
 msgstr "翻译者："
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Mandriva Linux %s (%s) 控制中心"
+msgid "%s %s (%s) Control Center"
+msgstr "%s %s (%s) 控制中心"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
@@ -1906,4 +1911,3 @@ msgstr "显示器"
 #: ../data/XFDrake-Resolution.desktop.in.h:1
 msgid "Screen Resolution"
 msgstr "屏幕分辨率"
-
diff --git a/po/zh_TW.po b/po/zh_TW.po
index d7b2157f..7b4c47f1 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zh_TW\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-11 15:09+0100\n"
+"POT-Creation-Date: 2008-12-18 17:29+0100\n"
 "PO-Revision-Date: 2008-03-08 00:19+0800\n"
 "Last-Translator:  You-Cheng Hsieh <yochenhsieh@gmail.com>\n"
 "Language-Team: Chinese Traditional <zh@li.org>\n"
@@ -539,12 +539,17 @@ msgid ""
 "sure it all worked right."
 msgstr "與許多的無名與未知的 beta 測試者與臭蟲回報者，他們確認它能正常運作。"
 
-#: ../control-center:97 ../control-center:104
+#: ../control-center:60
+#, fuzzy, c-format
+msgid "Mandriva Linux"
+msgstr "Mandriva Online"
+
+#: ../control-center:101 ../control-center:108
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Mandriva Linux 控制中心"
+msgid "%s Control Center"
+msgstr "%s 控制中心"
 
-#: ../control-center:107 ../control-center:1552
+#: ../control-center:111 ../control-center:1586
 #, c-format
 msgid "Loading... Please wait"
 msgstr "準備中... 請稍候..."
@@ -1136,12 +1141,12 @@ msgstr "建立 web 伺服器"
 msgid "Configure installation server"
 msgstr "設定安裝伺服器"
 
-#: ../control-center:812
+#: ../control-center:845
 #, c-format
-msgid "Set up server for network installations of Mandriva Linux"
-msgstr "建立 Mandriva Linux 網路安裝伺服器"
+msgid "Set up server for network installations of %s"
+msgstr "建立 %s 網路安裝伺服器"
 
-#: ../control-center:821 ../control-center:824
+#: ../control-center:854 ../control-center:857
 #, c-format
 msgid "Network Services"
 msgstr "網路服務"
@@ -1535,17 +1540,17 @@ msgstr "/關於 (_A)..."
 msgid "Cancel"
 msgstr "取消"
 
-#: ../control-center:1340
+#: ../control-center:1374
 #, c-format
-msgid "Mandriva Linux Control Center %s [on %s]"
-msgstr "Mandriva Linux 控制中心 %s [on %s]"
+msgid "%s Control Center %s [on %s]"
+msgstr "%s 控制中心 %s [on %s]"
 
-#: ../control-center:1354
+#: ../control-center:1388
 #, c-format
-msgid "Welcome to the Mandriva Linux Control Center"
-msgstr "歡迎來到 Mandriva Linux 控制中心"
+msgid "Welcome to the %s Control Center"
+msgstr "歡迎來到 %s 控制中心"
 
-#: ../control-center:1531 ../control-center:1604
+#: ../control-center:1565 ../control-center:1638
 #, c-format
 msgid "Error"
 msgstr "錯誤"
@@ -1616,12 +1621,12 @@ msgstr "額外的佈景主題"
 msgid "Get additional themes on www.damz.net"
 msgstr "由 www.damz.net 下載更多佈景主題"
 
-#: ../control-center:1929
+#: ../control-center:1920
 #, c-format
-msgid "About - Mandriva Linux Control Center"
-msgstr "關於 - Mandriva Linux 控制中心"
+msgid "About - %s Control Center"
+msgstr "關於 - %s 控制中心"
 
-#: ../control-center:1938
+#: ../control-center:1929
 #, c-format
 msgid "Authors: "
 msgstr "作者："
@@ -1667,11 +1672,11 @@ msgstr ""
 msgid "Translator: "
 msgstr "翻譯者："
 
-#. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:2001
+#. -PO: here, %s will be replaced by the version (eg: "%s 2007.1 (Discovery) Control Center")
+#: ../control-center:1992
 #, c-format
-msgid "Mandriva Linux %s (%s) Control Center"
-msgstr "Mandriva Linux %s (%s) 控制中心"
+msgid "%s %s (%s) Control Center"
+msgstr "%s %s (%s) 控制中心"
 
 #. -PO: here %s is eg: "1999-2008"
 #: ../control-center:2005
@@ -1983,9 +1988,6 @@ msgstr "螢幕解析度"
 #~ msgid "Country / Region"
 #~ msgstr "國家/地區"
 
-#~ msgid "Mandriva Online"
-#~ msgstr "Mandriva Online"
-
 #~ msgid "Updates"
 #~ msgstr "更新"