Synthesized commit during git-svn import combining previous Mandriva history with Mageia.

This commit consitsts of the following subversion commits:

------------------------------------------------------------------------
r487 | dmorgan | 2011-02-08 00:31:17 +0000 (Tue, 08 Feb 2011) | 1 line

Import cleaned drakmenustyle
------------------------------------------------------------------------

52 files changed, 307 insertions, 140 deletions

diff --git a/drakmenustyle b/drakmenustyle
index f1646bc..df8e7c2 100755
--- a/drakmenustyle
+++ b/drakmenustyle
@@ -35,15 +35,15 @@ my $in = 'interactive'->vnew;
 
 my %menu_styles = (
     if_($> != 0, use_system_settings => N("Use system administrator settings")),
-    mandriva => N("Mandriva menu"),
+    mageia => N("Mageia menu"),
     upstream => N("Original menu (default menu from KDE/GNOME, may not contain all applications)"),
 );
   
 my $cfg_file = $> ? "$ENV{HOME}/.menustyle" : '/etc/sysconfig/menustyle';
 my %h = getVarsFromSh($cfg_file);
 
-my $default = $> ? 'use_system_settings' : 'mandriva';
-my $value = $h{MDV_MENU_STYLE} || $default;
+my $default = $> ? 'use_system_settings' : 'mageia';
+my $value = $h{MGA_MENU_STYLE} || $default;
 my $old_value = $value;
 
 $in->ask_from_(
@@ -62,7 +62,7 @@ $in->ask_from_(
 if ($value eq 'use_system_settings') {
     rm_rf($cfg_file) if $> && -e $cfg_file;
 } else {
-    setVarsInSh($cfg_file, { MDV_MENU_STYLE => $value });
+    setVarsInSh($cfg_file, { MGA_MENU_STYLE => $value });
 }
 
 if ($old_value ne $value) {
diff --git a/drakmenustyle16.png b/drakmenustyle16.png
index d59852a..34f64c6 100644
--- a/drakmenustyle16.png
+++ b/drakmenustyle16.png
diff --git a/drakmenustyle32.png b/drakmenustyle32.png
index d45f196..cde76cc 100644
--- a/drakmenustyle32.png
+++ b/drakmenustyle32.png
diff --git a/drakmenustyle48.png b/drakmenustyle48.png
index 3a00217..226c8d1 100644
--- a/drakmenustyle48.png
+++ b/drakmenustyle48.png
diff --git a/po/Messages.sh b/po/Messages.sh
new file mode 100755
index 0000000..114747e
--- /dev/null
+++ b/po/Messages.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+PROJECT="drakmenustyle"
+
+echo "Merging translations"
+
+catalogs=`find . -name '*.po'`
+
+for cat in $catalogs; do
+  echo $cat
+  msgmerge -o $cat.new $cat ${PROJECT}.pot
+  mv $cat.new $cat
+done
+
+echo "Done merging translations"
diff --git a/po/ar.po b/po/ar.po
index 4607259..e1b3663 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -13,7 +13,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=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
 #: ../drakmenustyle:37
 #, c-format
@@ -22,13 +23,15 @@ msgstr "استخدم إعدادات مُدير النظام"
 
 #: ../drakmenustyle:38
 #, c-format
-msgid "Mandriva menu"
-msgstr "قائمة ماندريفا"
+msgid "Mageia menu"
+msgstr ""
 
 #: ../drakmenustyle:39
 #, c-format
-msgid "Original menu (default menu from KDE/GNOME, may not contain all applications)"
-msgstr "القائمة الأصلية (ربما لا تحتوي القائمة الافتراضية من كِدي/جنوم التطبيقات كلها)"
+msgid ""
+"Original menu (default menu from KDE/GNOME, may not contain all applications)"
+msgstr ""
+"القائمة الأصلية (ربما لا تحتوي القائمة الافتراضية من كِدي/جنوم التطبيقات كلها)"
 
 #: ../drakmenustyle:50
 #, c-format
@@ -44,4 +47,3 @@ msgstr "سمْت القائمة"
 #, c-format
 msgid "Choose your menu style:"
 msgstr "اختر سمْت قائمتك:"
-
diff --git a/po/ast.po b/po/ast.po
new file mode 100644
index 0000000..e1ccbb3
--- /dev/null
+++ b/po/ast.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2006 Mandriva
+# Pablo Saratxaga <pablo@mandriva.com>, 2006
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: drakmenustyle\n"
+"POT-Creation-Date: 2008-05-13 18:18+0200\n"
+"PO-Revision-Date: 2010-01-23 21:05+0100\n"
+"Last-Translator: marquinos <marcoscostales@gmail.com>\n"
+"Language-Team: spanish\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../drakmenustyle:37
+#, c-format
+msgid "Use system administrator settings"
+msgstr "Siguir les configuraciones del alministrador del sistema"
+
+#: ../drakmenustyle:38
+#, c-format
+msgid "Mageia menu"
+msgstr ""
+
+#: ../drakmenustyle:39
+#, c-format
+msgid ""
+"Original menu (default menu from KDE/GNOME, may not contain all applications)"
+msgstr ""
+"Menú orixinal (menú predetermináu pa KDE/GNOME, puede nun caltener toles "
+"aplicaciones)"
+
+#: ../drakmenustyle:50
+#, c-format
+msgid "Menu Style Configuration"
+msgstr "Configuración del Estilo de Menú"
+
+#: ../drakmenustyle:51
+#, c-format
+msgid "Menu Style"
+msgstr "Estilu del Menú"
+
+#: ../drakmenustyle:55
+#, c-format
+msgid "Choose your menu style:"
+msgstr "Escueye l'estilu del to menú:"
+
+#~ msgid "The change is done, but to be effective you must logout"
+#~ msgstr "Se ha realizado el cambio, pero no se hará efectivo hasta que salga"
+
+#~ msgid "Discovery menu"
+#~ msgstr "Menú «Discovery»"
diff --git a/po/bg.po b/po/bg.po
index b246146..12b541f 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -5,7 +5,8 @@ msgstr ""
 "POT-Creation-Date: 2008-05-13 18:18+0200\n"
 "PO-Revision-Date: 2009-03-10 01:12+0200\n"
 "Last-Translator: Kolio Kolev <kolio_kolev@biotronica.net>\n"
-"Language-Team: Mandriva User Group - Bulgaria <mandriva-bg@googlegroups.com>\n"
+"Language-Team: Mandriva User Group - Bulgaria <mandriva-bg@googlegroups."
+"com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,8 +22,8 @@ msgstr "Използвай настройките зададени от сист
 
 #: ../drakmenustyle:38
 #, c-format
-msgid "Mandriva menu"
-msgstr "Мандрива меню"
+msgid "Mageia menu"
+msgstr ""
 
 #: ../drakmenustyle:39
 #, c-format
@@ -46,4 +47,3 @@ msgstr "Стил на меню"
 #, c-format
 msgid "Choose your menu style:"
 msgstr "Изберете стил на менюто:"
-
diff --git a/po/br.po b/po/br.po
index 5cd17ca..7cc8aec 100644
--- a/po/br.po
+++ b/po/br.po
@@ -18,8 +18,8 @@ msgstr "Implijit dibaboù merour ar reiziad"
 
 #: ../drakmenustyle:38
 #, c-format
-msgid "Mandriva menu"
-msgstr "Meuziad Mandriva"
+msgid "Mageia menu"
+msgstr ""
 
 #: ../drakmenustyle:39
 #, c-format
diff --git a/po/bs.po b/po/bs.po
index 3153c5a..6aba6e7 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -23,8 +23,8 @@ msgstr "Koristi postavke administratora sistema"
 
 #: ../drakmenustyle:38
 #, c-format
-msgid "Mandriva menu"
-msgstr "Mandriva meni"
+msgid "Mageia menu"
+msgstr ""
 
 #: ../drakmenustyle:39
 #, c-format
diff --git a/po/ca.po b/po/ca.po
index 85d1b95..4ded3da 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -26,8 +26,8 @@ msgstr "Segueix els paràmetres de l'administrador del sistema"
 
 #: ../drakmenustyle:38
 #, c-format
-msgid "Mandriva menu"
-msgstr "Menú Mandriva"
+msgid "Mageia menu"
+msgstr ""
 
 #: ../drakmenustyle:39
 #, c-format
diff --git a/po/cs.po b/po/cs.po
index faaf84e..6523875 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -23,8 +23,8 @@ msgstr "Použít nastavení správce systému"
 
 #: ../drakmenustyle:38
 #, c-format
-msgid "Mandriva menu"
-msgstr "Nabídka Mandriva"
+msgid "Mageia menu"
+msgstr ""
 
 #: ../drakmenustyle:39
 #, c-format
diff --git a/po/cy.po b/po/cy.po
index 0d87982..485b1e4 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -21,8 +21,8 @@ msgstr "Defnyddio gosodiadau gweinyddwr y system"
 
 #: ../drakmenustyle:38
 #, c-format
-msgid "Mandriva menu"
-msgstr "Dewislen Mandriva"
+msgid "Mageia menu"
+msgstr ""
 
 #: ../drakmenustyle:39
 #, c-format
diff --git a/po/da.po b/po/da.po
index f9d379b..c82ac8d 100644
--- a/po/da.po
+++ b/po/da.po
@@ -24,8 +24,8 @@ msgstr "Brug systemadministrator-opsætning"
 
 #: ../drakmenustyle:38
 #, c-format
-msgid "Mandriva menu"
-msgstr "Mandriva-menu"
+msgid "Mageia menu"
+msgstr ""
 
 #: ../drakmenustyle:39
 #, c-format
diff --git a/po/de.po b/po/de.po
index 96a622b..b272d81 100644
--- a/po/de.po
+++ b/po/de.po
@@ -22,8 +22,8 @@ msgstr "Einstellungen des Systemadministrators benutzen"
 
 #: ../drakmenustyle:38
 #, c-format
-msgid "Mandriva menu"
-msgstr "Mandriva-Menü"
+msgid "Mageia menu"
+msgstr ""
 
 #: ../drakmenustyle:39
 #, c-format
diff --git a/po/drakmenustyle.pot b/po/drakmenustyle.pot
index d270d13..b693645 100644
--- a/po/drakmenustyle.pot
+++ b/po/drakmenustyle.pot
@@ -21,7 +21,7 @@ msgstr ""
 
 #: ../drakmenustyle:38
 #, c-format
-msgid "Mandriva menu"
+msgid "Mageia menu"
 msgstr ""
 
 #: ../drakmenustyle:39
diff --git a/po/el.po b/po/el.po
index 3a14dc8..db3a876 100755
--- a/po/el.po
+++ b/po/el.po
@@ -22,8 +22,8 @@ msgstr "Χρήση των ρυθμίσεων του διαχειριστή το�
 
 #: ../drakmenustyle:38
 #, c-format
-msgid "Mandriva menu"
-msgstr "Mandriva μενού"
+msgid "Mageia menu"
+msgstr ""
 
 #: ../drakmenustyle:39
 #, c-format
diff --git a/po/eo.po b/po/eo.po
index c1bf1e6..e774b84 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -23,8 +23,8 @@ msgstr "Uzu la konfiguraĵon de la sistemestro"
 
 #: ../drakmenustyle:38
 #, c-format
-msgid "Mandriva menu"
-msgstr "Mandriva menuo"
+msgid "Mageia menu"
+msgstr ""
 
 #: ../drakmenustyle:39
 #, c-format
diff --git a/po/es.po b/po/es.po
index 18705a8..8975bf7 100644
--- a/po/es.po
+++ b/po/es.po
@@ -21,8 +21,8 @@ msgstr "Seguir las configuraciones del administrador del sistema"
 
 #: ../drakmenustyle:38
 #, c-format
-msgid "Mandriva menu"
-msgstr "Menú de Mandriva"
+msgid "Mageia menu"
+msgstr ""
 
 #: ../drakmenustyle:39
 #, c-format
diff --git a/po/et.po b/po/et.po
index 6867c49..976f09e 100644
--- a/po/et.po
+++ b/po/et.po
@@ -21,8 +21,8 @@ msgstr "Süsteemiadministraatori seadistuste kasutamine"
 
 #: ../drakmenustyle:38
 #, c-format
-msgid "Mandriva menu"
-msgstr "Mandriva menüü"
+msgid "Mageia menu"
+msgstr ""
 
 #: ../drakmenustyle:39
 #, c-format
diff --git a/po/eu.po b/po/eu.po
index ff1bb0a..52505af 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -21,8 +21,8 @@ msgstr "Erabili sistema kudeatzailearen ezarpenak"
 
 #: ../drakmenustyle:38
 #, c-format
-msgid "Mandriva menu"
-msgstr "Mandriva menua"
+msgid "Mageia menu"
+msgstr ""
 
 #: ../drakmenustyle:39
 #, c-format
diff --git a/po/fi.po b/po/fi.po
index 5ba4ebb..39821c5 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -2,40 +2,42 @@
 # Copyright (C) 2006 Free Software Foundation, Inc.
 #
 # Thomas Backlund <tmb@mandriva.org>, 2006.
+# Jani Välimaa <jani.valimaa@gmail.com>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: drakmenustyle-fi - Mandriva 2007 Release\n"
+"Project-Id-Version: drakmenustyle-fi\n"
 "POT-Creation-Date: 2008-05-13 18:18+0200\n"
-"PO-Revision-Date: 2006-08-26 21:41+0300\n"
-"Last-Translator: Thomas Backlund <tmb@mandriva.org>\n"
+"PO-Revision-Date: 2009-04-29 23:51+0300\n"
+"Last-Translator: Jani Välimaa <jani.valimaa@gmail.com>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 0.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../drakmenustyle:37
 #, c-format
 msgid "Use system administrator settings"
-msgstr "Käytä järjestelmävalvojan asetuksia"
+msgstr "Käytä järjestelmänvalvojan asetuksia"
 
 #: ../drakmenustyle:38
 #, c-format
-msgid "Mandriva menu"
-msgstr "Mandriva valikko"
+msgid "Mageia menu"
+msgstr ""
 
 #: ../drakmenustyle:39
 #, c-format
 msgid ""
 "Original menu (default menu from KDE/GNOME, may not contain all applications)"
 msgstr ""
-"Alkuperäisvalikko (KDE/GNOMEn oletusvalikko, ei ehkä sisällä kaikki ohjelmia)"
+"Alkuperäisvalikko (Työpöytäympäristön oletusvalikko, ei ehkä sisällä kaikki "
+"ohjelmia)"
 
 #: ../drakmenustyle:50
 #, c-format
 msgid "Menu Style Configuration"
-msgstr "Valikkotyylin Asetukset"
+msgstr "Valikkotyylin asetukset"
 
 #: ../drakmenustyle:51
 #, c-format
@@ -45,7 +47,7 @@ msgstr "Valikkotyyli"
 #: ../drakmenustyle:55
 #, c-format
 msgid "Choose your menu style:"
-msgstr "Valitse valikkosi tyyli:"
+msgstr "Valitse valikon tyyli:"
 
 #~ msgid "The change is done, but to be effective you must logout"
 #~ msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 263e6ec..aabe91a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,8 +21,8 @@ msgstr "Utiliser les réglages de l'administrateur système"
 
 #: ../drakmenustyle:38
 #, c-format
-msgid "Mandriva menu"
-msgstr "Menu Mandriva"
+msgid "Mageia menu"
+msgstr "Menu Mageia"
 
 #: ../drakmenustyle:39
 #, c-format
diff --git a/po/gl.po b/po/gl.po
index cc65725..f6a1d65 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -26,8 +26,8 @@ msgstr "Usa-las preferencias do administrador do sistema"
 
 #: ../drakmenustyle:38
 #, c-format
-msgid "Mandriva menu"
-msgstr "Menú de Mandriva"
+msgid "Mageia menu"
+msgstr ""
 
 #: ../drakmenustyle:39
 #, c-format
diff --git a/po/he.po b/po/he.po
index 9596fb4..eee3827 100644
--- a/po/he.po
+++ b/po/he.po
@@ -21,8 +21,8 @@ msgstr "שימוש בהגדרות של מנהל המערכת"
 
 #: ../drakmenustyle:38
 #, c-format
-msgid "Mandriva menu"
-msgstr "תפריט מנדריבה"
+msgid "Mageia menu"
+msgstr ""
 
 #: ../drakmenustyle:39
 #, c-format
diff --git a/po/hu.po b/po/hu.po
index d8f8710..96956b7 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -25,13 +25,16 @@ msgstr "Rendszergazdai beállítások használata"
 
 #: ../drakmenustyle:38
 #, c-format
-msgid "Mandriva menu"
-msgstr "Mandriva menü"
+msgid "Mageia menu"
+msgstr ""
 
 #: ../drakmenustyle:39
 #, c-format
-msgid "Original menu (default menu from KDE/GNOME, may not contain all applications)"
-msgstr "Eredeti menü (a KDE/GNOME alapértelmezett menüje; nem biztos, hogy minden alkalmazást tartalmaz)"
+msgid ""
+"Original menu (default menu from KDE/GNOME, may not contain all applications)"
+msgstr ""
+"Eredeti menü (a KDE/GNOME alapértelmezett menüje; nem biztos, hogy minden "
+"alkalmazást tartalmaz)"
 
 #: ../drakmenustyle:50
 #, c-format
@@ -51,6 +54,6 @@ msgstr "Válasszon menüstílust:"
 #~ msgid "The change is done, but to be effective you must logout"
 #~ msgstr ""
 #~ "A módosítás el lett végezve - a következő bejelentkezéskor lép életbe"
+
 #~ msgid "Discovery menu"
 #~ msgstr "Discovery-menü"
-
diff --git a/po/id.po b/po/id.po
index 9dfb24d..3c95898 100644
--- a/po/id.po
+++ b/po/id.po
@@ -21,8 +21,8 @@ msgstr "Gunakan setting administrator sistem"
 
 #: ../drakmenustyle:38
 #, c-format
-msgid "Mandriva menu"
-msgstr "Menu Mandriva"
+msgid "Mageia menu"
+msgstr ""
 
 #: ../drakmenustyle:39
 #, c-format
diff --git a/po/is.po b/po/is.po
index 04674f7..9a154be 100644
--- a/po/is.po
+++ b/po/is.po
@@ -22,8 +22,8 @@ msgstr "Nota stillingar kerfisstjóra"
 
 #: ../drakmenustyle:38
 #, c-format
-msgid "Mandriva menu"
-msgstr "Mandriva valmynd"
+msgid "Mageia menu"
+msgstr ""
 
 #: ../drakmenustyle:39
 #, c-format
diff --git a/po/it.po b/po/it.po
index b5cb42f..d9947c3 100644
--- a/po/it.po
+++ b/po/it.po
@@ -28,8 +28,8 @@ msgstr "Usa le impostazioni dell'amministratore di sistema"
 
 #: ../drakmenustyle:38
 #, c-format
-msgid "Mandriva menu"
-msgstr "Menu Mandriva"
+msgid "Mageia menu"
+msgstr ""
 
 #: ../drakmenustyle:39
 #, c-format
diff --git a/po/ja.po b/po/ja.po
index f322be1..b867288 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -20,8 +20,8 @@ msgstr "システム管理者による設定を使う"
 
 #: ../drakmenustyle:38
 #, c-format
-msgid "Mandriva menu"
-msgstr "Mandriva メニュー"
+msgid "Mageia menu"
+msgstr ""
 
 #: ../drakmenustyle:39
 #, c-format
diff --git a/po/ky.po b/po/ky.po
index 68e527f..5356fcf 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -21,13 +21,15 @@ msgstr "Системдик администратордун ырастоолор
 
 #: ../drakmenustyle:38
 #, c-format
-msgid "Mandriva menu"
-msgstr "Mandriva менюсу"
+msgid "Mageia menu"
+msgstr ""
 
 #: ../drakmenustyle:39
 #, c-format
-msgid "Original menu (default menu from KDE/GNOME, may not contain all applications)"
-msgstr "Башкы меню (KDE/GNOME алдынала менюлары, бардык жабдыктарды камтыбашы мүмкүн)"
+msgid ""
+"Original menu (default menu from KDE/GNOME, may not contain all applications)"
+msgstr ""
+"Башкы меню (KDE/GNOME алдынала менюлары, бардык жабдыктарды камтыбашы мүмкүн)"
 
 #: ../drakmenustyle:50
 #, c-format
@@ -43,4 +45,3 @@ msgstr "Меню стили"
 #, c-format
 msgid "Choose your menu style:"
 msgstr "Меню стилин таңдаңыз:"
-
diff --git a/po/ltg.po b/po/ltg.po
index f095777..49fa89f 100644
--- a/po/ltg.po
+++ b/po/ltg.po
@@ -21,8 +21,8 @@ msgstr "Lītuot sistemys administratora īstatiejumus"
 
 #: ../drakmenustyle:38
 #, c-format
-msgid "Mandriva menu"
-msgstr "Mandriva izvieļne"
+msgid "Mageia menu"
+msgstr ""
 
 #: ../drakmenustyle:39
 #, c-format
diff --git a/po/mk.po b/po/mk.po
index d2fe952..d53bb50 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -23,8 +23,8 @@ msgstr "Користи поставувања на системски админ
 
 #: ../drakmenustyle:38
 #, c-format
-msgid "Mandriva menu"
-msgstr "„Mandriva“ мени"
+msgid "Mageia menu"
+msgstr ""
 
 #: ../drakmenustyle:39
 #, c-format
diff --git a/po/ms.po b/po/ms.po
index 6b11ba8..0f13254 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -20,13 +20,15 @@ msgstr "Guna tetapan pentadbir sistem"
 
 #: ../drakmenustyle:38
 #, c-format
-msgid "Mandriva menu"
-msgstr "Menu Mandriva"
+msgid "Mageia menu"
+msgstr ""
 
 #: ../drakmenustyle:39
 #, c-format
-msgid "Original menu (default menu from KDE/GNOME, may not contain all applications)"
-msgstr "Menu asal (menu piawai KDE/GNOME, mungkin tidak mengandungi semua aplikasi)"
+msgid ""
+"Original menu (default menu from KDE/GNOME, may not contain all applications)"
+msgstr ""
+"Menu asal (menu piawai KDE/GNOME, mungkin tidak mengandungi semua aplikasi)"
 
 #: ../drakmenustyle:50
 #, c-format
@@ -45,4 +47,3 @@ msgstr "Pilih gaya menu anda:"
 
 #~ msgid "The change is done, but to be effective you must logout"
 #~ msgstr "Perubahan telah dibuat, tetapi untuk efektif anda mesti log keluar"
-
diff --git a/po/nb.po b/po/nb.po
index 7b9ff1c..db71002 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -23,12 +23,13 @@ msgstr "Bruk systemadministratoroppsettet"
 
 #: ../drakmenustyle:38
 #, c-format
-msgid "Mandriva menu"
-msgstr "Mandriva-meny"
+msgid "Mageia menu"
+msgstr ""
 
 #: ../drakmenustyle:39
 #, c-format
-msgid "Original menu (default menu from KDE/GNOME, may not contain all applications)"
+msgid ""
+"Original menu (default menu from KDE/GNOME, may not contain all applications)"
 msgstr ""
 "Opprinnelig meny (standardmeny fra KDE/GNOME, inneholder ikke nødvendigvis "
 "alle applikasjoner)"
@@ -47,5 +48,3 @@ msgstr "Menystil"
 #, c-format
 msgid "Choose your menu style:"
 msgstr "Velg din menystil:"
-
-
diff --git a/po/nl.po b/po/nl.po
index a4b9b75..109ddd7 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -20,8 +20,8 @@ msgstr "Instellingen van systeembeheerder overnemen"
 
 #: ../drakmenustyle:38
 #, c-format
-msgid "Mandriva menu"
-msgstr "Mandriva-menu"
+msgid "Mageia menu"
+msgstr ""
 
 #: ../drakmenustyle:39
 #, c-format
diff --git a/po/nn.po b/po/nn.po
index f9c311e..e0731a5 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -1,5 +1,4 @@
-# Translation of nn to Norwegian Nynorsk
-# Copyright (C) 2006 Free Software Foundation, Inc.
+# Translation of drakmenustyle to Norwegian Nynorsk
 #
 # Karl Ove Hufthammer <karl@huftis.org>, 2006.
 msgid ""
@@ -22,8 +21,8 @@ msgstr "Bruk systemadministratorinnstillingar"
 
 #: ../drakmenustyle:38
 #, c-format
-msgid "Mandriva menu"
-msgstr "Mandriva-meny"
+msgid "Mageia menu"
+msgstr ""
 
 #: ../drakmenustyle:39
 #, c-format
diff --git a/po/pl.po b/po/pl.po
index 17260aa..6a72bea 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,13 +8,15 @@ msgstr ""
 "Project-Id-Version: drakmenustyle\n"
 "POT-Creation-Date: 2008-05-13 18:18+0200\n"
 "PO-Revision-Date: 2009-01-07 10:50+0100\n"
-"Last-Translator: Amazis.net sp. z o.o. - Tomasz Bednarski <tomasz.bednarski@amazis.pl>\n"
+"Last-Translator: Amazis.net sp. z o.o. - Tomasz Bednarski <tomasz."
+"bednarski@amazis.pl>\n"
 "Language-Team:  <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%"
+"100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: ../drakmenustyle:37
 #, c-format
@@ -23,12 +25,13 @@ msgstr "Użyj ustawień administratora systemu"
 
 #: ../drakmenustyle:38
 #, c-format
-msgid "Mandriva menu"
-msgstr "Menu Mandriva"
+msgid "Mageia menu"
+msgstr ""
 
 #: ../drakmenustyle:39
 #, c-format
-msgid "Original menu (default menu from KDE/GNOME, may not contain all applications)"
+msgid ""
+"Original menu (default menu from KDE/GNOME, may not contain all applications)"
 msgstr ""
 "Oryginalne menu (domyślne menu dla KDE/GNOME; może nie zawierać wszystkich "
 "aplikacji)"
@@ -47,4 +50,3 @@ msgstr "Styl menu"
 #, c-format
 msgid "Choose your menu style:"
 msgstr "Wybierz styl menu:"
-
diff --git a/po/pt.po b/po/pt.po
index 18789a8..b5b4c00 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -28,8 +28,8 @@ msgstr "Usar configuração do administrador do sistema"
 
 #: ../drakmenustyle:38
 #, c-format
-msgid "Mandriva menu"
-msgstr "Menu Mandriva"
+msgid "Mageia menu"
+msgstr ""
 
 #: ../drakmenustyle:39
 #, c-format
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 57fde9d..3b0e8bd 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -25,8 +25,8 @@ msgstr "Usar configurações do administrador do sistema"
 
 #: ../drakmenustyle:38
 #, c-format
-msgid "Mandriva menu"
-msgstr "Menu Mandriva"
+msgid "Mageia menu"
+msgstr ""
 
 #: ../drakmenustyle:39
 #, c-format
diff --git a/po/ro.po b/po/ro.po
index 24873b8..e0f5364 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,4 +1,5 @@
-# Copyright (c) 1999-2009 Mandriva
+# Translation of drakmenustyle.po to Romanian
+# Copyright (c) 1999-2010 Mandriva
 #
 # Vă rugăm să nu actualizaţi fișierul, cu excepția cazului în care sînteți
 # sigur de calitatea traducerii dumneavoastră, de gramatică și de ortografie.
@@ -40,9 +41,9 @@ msgstr ""
 "Project-Id-Version: drakmenustyle-ro\n"
 "Report-Msgid-Bugs-To: https://qa.mandriva.com\n"
 "POT-Creation-Date: 2008-05-13 18:18+0200\n"
-"PO-Revision-Date: 2009-04-11 15:17+0100\n"
-"Last-Translator: Florin Cătălin RUSSEN <cfrussen@yahoo.co.uk>\n"
-"Language-Team: Mandrivausers.ro <cfrussen@yahoo.co.uk>\n"
+"PO-Revision-Date: 2010-05-17 13:37+0100\n"
+"Last-Translator: Cătălin Florin RUSSEN <cfrussen@yahoo.co.uk>\n"
+"Language-Team: Romanian <cooker-i18n@mandrivalinux.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -58,8 +59,8 @@ msgstr "Utilizați configurările administratorului de sistem"
 
 #: ../drakmenustyle:38
 #, c-format
-msgid "Mandriva menu"
-msgstr "Meniul Mandriva"
+msgid "Mageia menu"
+msgstr ""
 
 #: ../drakmenustyle:39
 #, c-format
@@ -72,7 +73,7 @@ msgstr ""
 #: ../drakmenustyle:50
 #, c-format
 msgid "Menu Style Configuration"
-msgstr "Configurație stil de meniu"
+msgstr "Configurare stil de meniu"
 
 #: ../drakmenustyle:51
 #, c-format
diff --git a/po/ru.po b/po/ru.po
index 7b06c6c..082d730 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -23,8 +23,8 @@ msgstr "Использовать настройки системного адм�
 
 #: ../drakmenustyle:38
 #, c-format
-msgid "Mandriva menu"
-msgstr "Меню Mandriva"
+msgid "Mageia menu"
+msgstr ""
 
 #: ../drakmenustyle:39
 #, c-format
diff --git a/po/sl.po b/po/sl.po
index 30fb420..80f3d57 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -24,8 +24,8 @@ msgstr "Uporabi nastavitve upravitelja sistema"
 
 #: ../drakmenustyle:38
 #, c-format
-msgid "Mandriva menu"
-msgstr "Meni Mandriva"
+msgid "Mageia menu"
+msgstr ""
 
 #: ../drakmenustyle:39
 #, c-format
diff --git a/po/sv.po b/po/sv.po
index f2367cb..54afb2f 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -22,8 +22,8 @@ msgstr "Använd systemadministratörens inställningar"
 
 #: ../drakmenustyle:38
 #, c-format
-msgid "Mandriva menu"
-msgstr "Mandriva meny"
+msgid "Mageia menu"
+msgstr ""
 
 #: ../drakmenustyle:39
 #, c-format
diff --git a/po/tg.po b/po/tg.po
index 72587e3..9d70f02 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -24,8 +24,8 @@ msgstr "Танзимотҳои идораи система истифода ба
 
 #: ../drakmenustyle:38
 #, c-format
-msgid "Mandriva menu"
-msgstr "Менюи Mandriva"
+msgid "Mageia menu"
+msgstr ""
 
 #: ../drakmenustyle:39
 #, c-format
diff --git a/po/tr.po b/po/tr.po
index 9918e91..faafa77 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -2,8 +2,8 @@
 # Copyright (C) 2007 Free Software Foundation, Inc.
 # Kerem Can Karakaş <kerem@mandriva.com.tr>, 2007.
 # Atilla ÖNTAŞ <atilla_ontas@mandriva.com>, 2009.
-# 
-# 
+#
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: drakmenustyle\n"
@@ -14,8 +14,7 @@ msgstr ""
 "Language-Team: Turkish <cooker-i18n@mandrivalinux.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Content-Transfer-Encoding: 8bitPlural-Forms: nplurals=2; plural=n != 1;\n"
 
 #: ../drakmenustyle:37
 #, c-format
@@ -24,14 +23,16 @@ msgstr "Sistem yöneticisi ayarlarını kullan"
 
 #: ../drakmenustyle:38
 #, c-format
-msgid "Mandriva menu"
-msgstr "Mandriva menü"
+msgid "Mageia menu"
+msgstr ""
 
 #: ../drakmenustyle:39
 #, c-format
 msgid ""
 "Original menu (default menu from KDE/GNOME, may not contain all applications)"
-msgstr "Orijinal menü (KDE/GNOME için öntanımlı menü; bütün uygulamaları içermeyebilir)"
+msgstr ""
+"Orijinal menü (KDE/GNOME için öntanımlı menü; bütün uygulamaları "
+"içermeyebilir)"
 
 #: ../drakmenustyle:50
 #, c-format
diff --git a/po/uk.po b/po/uk.po
index bab1dc5..b5c0b37 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,5 +1,5 @@
 # translation of drakmenustyle.po to ukrainian
-# $Id$
+# $Id: uk.po 242498 2008-05-13 16:19:03Z tv $
 # Tr-ion of drakmenustyle to uk_UA
 # Copyright (C) 2007, 2008 Free Software Foundation, Inc.
 #
@@ -27,8 +27,8 @@ msgstr "Використовувати налаштування системно
 
 #: ../drakmenustyle:38
 #, c-format
-msgid "Mandriva menu"
-msgstr "Меню Мандріви"
+msgid "Mageia menu"
+msgstr ""
 
 #: ../drakmenustyle:39
 #, c-format
diff --git a/po/uz.po b/po/uz.po
new file mode 100644
index 0000000..c2e4bd4
--- /dev/null
+++ b/po/uz.po
@@ -0,0 +1,47 @@
+# Copyright (C) 2009 Free Software Foundation, Inc.
+#
+# Nurali Abdurahmonov <mavnur@gmail.com>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"POT-Creation-Date: 2008-05-13 18:18+0200\n"
+"PO-Revision-Date: 2009-12-16 21:04+0500\n"
+"Last-Translator: Nurali Abdurahmonov <mavnur@gmail.com>\n"
+"Language-Team: American English <kde-i18n-doc@kde.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8-bit\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../drakmenustyle:37
+#, c-format
+msgid "Use system administrator settings"
+msgstr "Tizim administratori moslamalaridan foydalanish"
+
+#: ../drakmenustyle:38
+#, c-format
+msgid "Mageia menu"
+msgstr ""
+
+#: ../drakmenustyle:39
+#, c-format
+msgid ""
+"Original menu (default menu from KDE/GNOME, may not contain all applications)"
+msgstr ""
+"Asl menyu (KDE/GNOME standart menyusi; baʼzi dasturlar boʻlmasligi mumkin)"
+
+#: ../drakmenustyle:50
+#, c-format
+msgid "Menu Style Configuration"
+msgstr "Menyu uslubini boshqarish"
+
+#: ../drakmenustyle:51
+#, c-format
+msgid "Menu Style"
+msgstr "Menyu uslubi"
+
+#: ../drakmenustyle:55
+#, c-format
+msgid "Choose your menu style:"
+msgstr "Menyu uslubini tanlang:"
diff --git a/po/uz@cyrillic.po b/po/uz@cyrillic.po
new file mode 100644
index 0000000..44e70d7
--- /dev/null
+++ b/po/uz@cyrillic.po
@@ -0,0 +1,47 @@
+# Copyright (C) 2009 Free Software Foundation, Inc.
+#
+# Nurali Abdurahmonov <mavnur@gmail.com>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"POT-Creation-Date: 2008-05-13 18:18+0200\n"
+"PO-Revision-Date: 2009-12-16 21:04+0500\n"
+"Last-Translator: Nurali Abdurahmonov <mavnur@gmail.com>\n"
+"Language-Team: American English <kde-i18n-doc@kde.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8-bit\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../drakmenustyle:37
+#, c-format
+msgid "Use system administrator settings"
+msgstr "Тизим администратори мосламаларидан фойдаланиш"
+
+#: ../drakmenustyle:38
+#, c-format
+msgid "Mageia menu"
+msgstr ""
+
+#: ../drakmenustyle:39
+#, c-format
+msgid ""
+"Original menu (default menu from KDE/GNOME, may not contain all applications)"
+msgstr ""
+"Асл меню (KDE/GNOME стандарт менюси; баъзи дастурлар бўлмаслиги мумкин)"
+
+#: ../drakmenustyle:50
+#, c-format
+msgid "Menu Style Configuration"
+msgstr "Меню услубини бошқариш"
+
+#: ../drakmenustyle:51
+#, c-format
+msgid "Menu Style"
+msgstr "Меню услуби"
+
+#: ../drakmenustyle:55
+#, c-format
+msgid "Choose your menu style:"
+msgstr "Меню услубини танланг:"
diff --git a/po/wa.po b/po/wa.po
index 0260cb6..7cdf572 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -21,8 +21,8 @@ msgstr "Eployî l' apontiaedje fwait pal manaedjeu do sistinme"
 
 #: ../drakmenustyle:38
 #, c-format
-msgid "Mandriva menu"
-msgstr "Menu d' Mandriva"
+msgid "Mageia menu"
+msgstr ""
 
 #: ../drakmenustyle:39
 #, c-format
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8ffbf90..ebda10c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -21,8 +21,8 @@ msgstr "使用系统管理员设置"
 
 #: ../drakmenustyle:38
 #, c-format
-msgid "Mandriva menu"
-msgstr "Mandriva 菜单"
+msgid "Mageia menu"
+msgstr ""
 
 #: ../drakmenustyle:39
 #, c-format
diff --git a/po/zh_TW.po b/po/zh_TW.po
index a917e27..bf6c90f 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -21,8 +21,8 @@ msgstr "使用系統管理者的設定"
 
 #: ../drakmenustyle:38
 #, c-format
-msgid "Mandriva menu"
-msgstr "Mandriva 選單"
+msgid "Mageia menu"
+msgstr ""
 
 #: ../drakmenustyle:39
 #, c-format
@@ -44,9 +44,3 @@ msgstr "選單風格"
 #, c-format
 msgid "Choose your menu style:"
 msgstr "選擇您的選單風格："
-
-#~ msgid "The change is done, but to be effective you must logout"
-#~ msgstr "已經完成變更，但您必須重新登入後才會生效"
-
-#~ msgid "Discovery menu"
-#~ msgstr "Discovery 選單"