- xfce-applications.menu: change some .desktop names to the current ones

- adapt the panel default config to xfce-4.8.0

26 files changed, 411 insertions, 329 deletions

diff --git a/ChangeLog b/ChangeLog
index 324c126..6644607 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-03-13 04:03 Ahmad Samir <ahmadsamir3891 at gmail.com>
+	* common/menus/xfce-applications.menu:
+	- change some .desktop names to the current ones
+	* common/xfce4/panel/:
+	- adapt to the new format of xfce-4.8.0
+	* common/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml:
+	- add a configuration file for the xfce-panel using the new xfconf fomat
+	  for xfce-4.8.0
+
 2011-02-20 17:29 Ahmad Samir <ahmadsamir3891 at gmail.com>
 	* tools/xfce4-firstrun:
 	- correct the xfce4-firstrun script
diff --git a/Makefile b/Makefile
index 1588ff3..632dd57 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ install:
 	-install -d $(DESTDIR)$(xfceconfdir)/xfce4/volstatus
 	-install -d $(DESTDIR)$(xfceconfdir)/xfce4/xfconf/xfce-perchannel-xml
 	-install -d $(DESTDIR)$(PREFIX)/bin
-	install -m 644 common/xfce4/panel/* $(DESTDIR)$(xfceconfdir)/xfce4/panel/
+	cp -pr common/xfce4/panel/* $(DESTDIR)$(xfceconfdir)/xfce4/panel/
 	install -m 644 common/xfce4/theme/* $(DESTDIR)$(xfceconfdir)/xfce4/theme/
 	install -m 644 common/xfce4/volstatus/* $(DESTDIR)$(xfceconfdir)/xfce4/volstatus/
 	install -m 644 common/xfce4/xfconf/xfce-perchannel-xml/* $(DESTDIR)$(xfceconfdir)/xfce4/xfconf/xfce-perchannel-xml/
diff --git a/common/menus/xfce-applications.menu b/common/menus/xfce-applications.menu
index 554c887..d1d899e 100644
--- a/common/menus/xfce-applications.menu
+++ b/common/menus/xfce-applications.menu
@@ -17,9 +17,9 @@
     <Layout>
         <Filename>xfce4-run-program.desktop</Filename>
         <Separator/>
-        <Filename>xfce4-terminal.desktop</Filename>
-        <Filename>xfce4-file-manager.desktop</Filename>
-        <Filename>xfce4-web-browser.desktop</Filename>
+        <Filename>exo-terminal-emulator.desktop</Filename>
+        <Filename>exo-file-manager.desktop</Filename>
+        <Filename>exo-web-browser.desktop</Filename>
         <Separator/>
         <Menuname>Settings</Menuname>
         <Separator/>
diff --git a/common/xfce4/panel/actions-12.rc b/common/xfce4/panel/actions-12.rc
deleted file mode 100644
index 5220803..0000000
--- a/common/xfce4/panel/actions-12.rc
+++ /dev/null
@@ -1,3 +0,0 @@
-type=1
-orientation=1
-
diff --git a/common/xfce4/panel/actions-16.rc b/common/xfce4/panel/actions-16.rc
deleted file mode 100644
index 516a79c..0000000
--- a/common/xfce4/panel/actions-16.rc
+++ /dev/null
@@ -1,3 +0,0 @@
-type=1
-orientation=0
-
diff --git a/common/xfce4/panel/clock-14.rc b/common/xfce4/panel/clock-14.rc
deleted file mode 100644
index 07e2bde..0000000
--- a/common/xfce4/panel/clock-14.rc
+++ /dev/null
@@ -1,15 +0,0 @@
-mode=2
-military=false
-ampm=false
-secs=false
-show_frame=false
-DigitalFormat=%R
-TooltipFormat=%A %d %B %Y
-ClockType=3
-ShowFrame=false
-ShowSeconds=false
-ShowMilitary=true
-ShowMeridiem=false
-TrueBinary=false
-FlashSeparators=false
-
diff --git a/common/xfce4/panel/launcher-10.rc b/common/xfce4/panel/launcher-10.rc
deleted file mode 100644
index 00b32f4..0000000
--- a/common/xfce4/panel/launcher-10.rc
+++ /dev/null
@@ -1,87 +0,0 @@
-[Global]
-MoveFirst=false
-
-[Entry 0]
-Name=Web Browser
-Name[am]=መረብ ቃኝ
-Name[ar]=متصفح الويب
-Name[be]=Гартач Сеціва
-Name[ca]=Navegador web
-Name[cs]=Webový prohlížeč
-Name[da]=Netlæser
-Name[de]=Webbrowser
-Name[el]=Περιηγητής ιστοσελίδων
-Name[en_GB]=Web Browser
-Name[eo]=TTT-Krozilo
-Name[es]=Navegador web
-Name[et]=Veebisirvija
-Name[eu]=Web Nabigatzailea
-Name[fr]=Navigateur Web
-Name[he]=דפדפן אינטרנט
-Name[hu]=Web böngésző
-Name[id]=Peramban Web
-Name[ja]=ウェブブラウザ
-Name[ko]=웹 브라우져
-Name[ku]=Geroka Înternetê
-Name[lv]=Tīmekļa pārlūks
-Name[mk]=Веб прелистувач
-Name[nb_NO]=Nettleser
-Name[nl]=Web browser
-Name[pa]=ਵੈੱਬ ਬਰਾਊਂਜ਼ਰ
-Name[pl]=Przeglądarka
-Name[pt_BR]=Navegador Web
-Name[pt_PT]=Navegador de Ajuda
-Name[ro]=Navigator documentaţie
-Name[ru]=Веб браузер
-Name[si]=වියුනු බ්‍රව්සරය
-Name[sq]=Shfletues Web
-Name[sv]=Webbläsare
-Name[tr]=Web Tarayıcı
-Name[ur]=ویب براؤزر
-Name[vi]=Trình duyệt Web
-Name[zh_CN]=网页浏览器
-Name[zh_TW]=網路瀏覽器
-Comment=Surf the internet
-Comment[am]=ኢንተርኔት ቃኝ
-Comment[ar]=ابحر في الانترنت
-Comment[be]=Вандроўкі ў Сеціве
-Comment[ca]=Navega per la xarxa
-Comment[cs]=Surfovat na internetu
-Comment[da]=Surf på internettet
-Comment[de]=Im Internet surfen
-Comment[el]=Περιήγηση στο διαδίκτυο
-Comment[en_GB]=Surf the internet
-Comment[eo]=Krozu tra la Interreto
-Comment[es]=Navegue en Internet
-Comment[et]=Sirvi veebi
-Comment[eu]=Internet nabigatu
-Comment[fr]=Naviguer sur internet
-Comment[he]=גלוש באינטרנט
-Comment[hu]=Barangolás a weben
-Comment[id]=Jelajahi internet
-Comment[ja]=インターネットを閲覧します
-Comment[ko]=정보의 바다로
-Comment[ku]=Gera di internetê de
-Comment[lv]=Pārlūkot internetu
-Comment[mk]=Сурфајте на интернет
-Comment[nb_NO]=Surfe på internett
-Comment[nl]=Surfen op internet
-Comment[pa]=ਇੰਟਰਨੈੱਟ ਵੇਖੋ
-Comment[pl]=Przeglądaj Internet
-Comment[pt_BR]=Navegar pela internet
-Comment[pt_PT]=Navegar na Internet
-Comment[ro]=Navigare pe Internet
-Comment[ru]=Просмотр интернет сайтов
-Comment[si]=අන්තර්ජාලය සැරිසරන්න
-Comment[sq]=Lundroni në Internet
-Comment[sv]=Surfa på internet
-Comment[tr]=İnternette gezin
-Comment[ur]=انٹرنیٹ سرف کریں
-Comment[vi]=Duyệt Internet
-Comment[zh_CN]=网上冲浪
-Comment[zh_TW]=網上衝浪
-Icon=web-browser
-Exec=exo-open --launch WebBrowser
-Terminal=false
-StartupNotify=false
-
diff --git a/common/xfce4/panel/launcher-12.rc b/common/xfce4/panel/launcher-12.rc
deleted file mode 100644
index 90c2c61..0000000
--- a/common/xfce4/panel/launcher-12.rc
+++ /dev/null
@@ -1,12 +0,0 @@
-[Entry 0]
-Name=MCC
-Comment=MCC
-Icon=/usr/share/icons/drakconf.png
-Exec=/usr/bin/mcc
-Terminal=false
-StartupNotify=true
-
-[Global]
-MoveFirst=false
-ArrowPosition=0
-
diff --git a/common/xfce4/panel/launcher-14/terminal-emulator.desktop b/common/xfce4/panel/launcher-14/terminal-emulator.desktop
new file mode 100644
index 0000000..09eeb62
--- /dev/null
+++ b/common/xfce4/panel/launcher-14/terminal-emulator.desktop
@@ -0,0 +1,92 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Exec=exo-open --launch TerminalEmulator
+Icon=utilities-terminal
+StartupNotify=false
+Terminal=false
+Categories=Utility;X-XFCE;X-Xfce-Toplevel;
+OnlyShowIn=XFCE;
+Name=Terminal Emulator
+Name[ar]=محاكي الطرفية
+Name[ast]=Emulador de terminal
+Name[be]=Эмулятар тэрмінала
+Name[bn]=টার্মিনাল ইম্যুলেটর
+Name[ca]=Emulador de terminal
+Name[cs]=Emulátor terminálu
+Name[cy]=Efelychydd Terfynell
+Name[da]=Terminal-emulering
+Name[de]=Terminal
+Name[dz]=ཊལ་མི་ནཱལ་ནུས་འཕྲུལ།
+Name[el]=Εξομοιωτής τερματικού
+Name[en_GB]=Terminal Emulator
+Name[es]=Emulador de terminal
+Name[et]=Terminaliemulaator
+Name[eu]=Terminal emuladorea
+Name[fi]=Pääteohjelma
+Name[fr]=Émulateur de Terminal
+Name[gl]=Emulador de terminal
+Name[he]=מסוף
+Name[hr]=Emulator terminala
+Name[hu]=Terminálemulátor
+Name[id]=Emulator Terminal
+Name[it]=Emulatore di terminale
+Name[ja]=ターミナルエミュレータ
+Name[kk]=Терминал эмуляторы
+Name[ku]=Emûlatorê Termînalê
+Name[lv]=Termināla emulators
+Name[mk]=Емулатор на терминал
+Name[nb]=Terminalemulator
+Name[nl]=Terminal-emulator
+Name[pa]=ਟਰਮੀਨਲ ਈਮੂਲੇਟਰ
+Name[pl]=Emulator terminala
+Name[pt]=Emulador de terminal
+Name[pt_BR]=Emulador de terminal
+Name[ro]=Emulator de terminal
+Name[ru]=Эмулятор терминала
+Name[sk]=Emulátor terminálu
+Name[sl]=Terminalski emulator
+Name[sq]=Emulues Terminali
+Name[sv]=Terminalemulator
+Name[tl_PH]=Terminal Emulator
+Name[tr]=Uçbirim Öykünücüsü
+Name[ug]=تېرمىنال تەقلىدلىگۈ
+Name[uk]=Емулятор терміналу
+Name[ur]=ٹرمنل ایمولیٹر
+Name[ur_PK]=ٹرمنل ایمولیٹر
+Name[zh_CN]=终端模拟器
+Name[zh_TW]=終端機模擬程式
+Comment=Use the command line
+Comment[ar]=إستعمل سطر الأوامر
+Comment[bn]=কমান্ড লাইন ব্যবহার করুন
+Comment[ca]=Empra la línia d'ordres
+Comment[cs]=Použít příkazový řádek
+Comment[da]=Brug kommandolinjen
+Comment[de]=Befehlszeile verwenden
+Comment[el]=Χρησιμοποιείστε την γραμμή εντολών
+Comment[en_GB]=Use the command line
+Comment[es]=Usar la línea de comandos
+Comment[eu]=Erabili komando lerroa
+Comment[fi]=Käytä komentoriviä
+Comment[fr]=Utiliser la ligne de commande
+Comment[gl]=Usar a liña de ordes
+Comment[he]=שימוש בשורת הפקודה
+Comment[hr]=Koristi naredbeni redak
+Comment[hu]=Parancssor használata
+Comment[id]=Gunakan baris perintah
+Comment[is]=Nota skipanalínuna
+Comment[it]=Usa la linea di comando
+Comment[ja]=コマンドラインを使用します
+Comment[kk]=Командалық жолды қолдану
+Comment[nb]=Bruk kommandlinjen
+Comment[pa]=ਕਮਾਂਡ ਲਾਈਨ ਵਰਤੋਂ
+Comment[pt]=Utilizar a linha de comandos
+Comment[pt_BR]=Usar a linha de comando
+Comment[ro]=Utilizați linia de comandă
+Comment[ru]=Использовать командную строку
+Comment[sv]=Använd kommandoraden
+Comment[tr]=Komut satırını kullan
+Comment[ug]=بۇيرۇق قۇرىنى ئىشلىتىدۇ
+Comment[uk]=Використовуєте командну стрічку
+Comment[zh_CN]=使用命令行
+Comment[zh_TW]=使用指令列
diff --git a/common/xfce4/panel/launcher-8.rc b/common/xfce4/panel/launcher-15/text-editor.desktop
index 99d2fb3..79c2e94 100644
--- a/common/xfce4/panel/launcher-8.rc
+++ b/common/xfce4/panel/launcher-15/text-editor.desktop
@@ -1,7 +1,4 @@
-[Global]
-MoveFirst=false
-
-[Entry 0]
+[Desktop Entry]
 Name=Editor
 Name[am]=አራሚ
 Name[ar]=محرر
@@ -101,4 +98,3 @@ Icon=accessories-text-editor
 Exec=mousepad
 Terminal=false
 StartupNotify=true
-
diff --git a/common/xfce4/panel/launcher-9.rc b/common/xfce4/panel/launcher-16/file-manager.desktop
index 76036b7..b2b9642 100644
--- a/common/xfce4/panel/launcher-9.rc
+++ b/common/xfce4/panel/launcher-16/file-manager.desktop
@@ -1,7 +1,4 @@
-[Global]
-MoveFirst=false
-
-[Entry 0]
+[Desktop Entry]
 Name=File Manager
 Name[am]=ፋይል አስተዳዳሪ
 Name[ar]=مدير الملفات
@@ -84,4 +81,3 @@ Icon=Thunar
 Exec=thunar
 Terminal=false
 StartupNotify=true
-
diff --git a/common/xfce4/panel/launcher-17/web-browser.desktop b/common/xfce4/panel/launcher-17/web-browser.desktop
new file mode 100644
index 0000000..aaab133
--- /dev/null
+++ b/common/xfce4/panel/launcher-17/web-browser.desktop
@@ -0,0 +1,94 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Exec=exo-open --launch WebBrowser %u
+Icon=web-browser
+StartupNotify=false
+Terminal=false
+Categories=Network;X-XFCE;X-Xfce-Toplevel;
+OnlyShowIn=XFCE;
+MimeType=x-scheme-handler/http;x-scheme-handler/https;
+Name=Web Browser
+Name[ar]=متصفّح وِب
+Name[ast]=Restolador web
+Name[be]=Гартач Сеціва
+Name[bn]=ওয়েব ব্রাউজার
+Name[ca]=Navegador web
+Name[cs]=Webový prohlížeč
+Name[cy]=Porydd Gwê
+Name[da]=Webbrowser
+Name[de]=Webbrowser
+Name[dz]=ཝེབ་བརྡ་འཚོལ་པ།
+Name[el]=Περιηγητής διαδικτύου
+Name[en_GB]=Web Browser
+Name[es]=Navegador web
+Name[et]=Veebibrauser
+Name[eu]=Web nabigatzailea
+Name[fi]=Web-selain
+Name[fr]=Navigateur Web
+Name[gl]=Navegador web
+Name[he]=דפדפן אינטרנט
+Name[hr]=Web preglednik
+Name[hu]=Webböngésző
+Name[id]=Peramban Web
+Name[it]=Browser web
+Name[ja]=ウェブブラウザ
+Name[kk]=Веб браузері
+Name[ku]=Geroka Torê
+Name[lv]=Tīmekļa pārlūks
+Name[mk]=Web пребарувач
+Name[nb]=Nettleser
+Name[nl]=Webbrowser
+Name[pa]=ਵੈੱਬ ਬਰਾਊਜ਼ਰ
+Name[pl]=Przeglądarka internetowa
+Name[pt]=Navegador web
+Name[pt_BR]=Navegador web
+Name[ro]=Navigator
+Name[ru]=Веб-браузер
+Name[sk]=Webový prehliadač
+Name[sl]=Spletni brskalnik
+Name[sq]=Shfletues Web
+Name[sv]=Webbläsare
+Name[tl_PH]=Web Browser
+Name[tr]=İnternet Tarayıcısı
+Name[ug]=توركۆرگۈ
+Name[uk]=Переглядач Web
+Name[ur]=ویب براؤزر
+Name[ur_PK]=ویب براؤزر
+Name[zh_CN]=网络浏览器
+Name[zh_TW]=網路瀏覽器
+Comment=Browse the web
+Comment[ar]=تصفح الوِب
+Comment[bn]=ওয়েব ব্রাউজ করুন
+Comment[ca]=Navega la web
+Comment[cs]=Procházet web
+Comment[da]=Gennemse internettet
+Comment[de]=Im Internet surfen
+Comment[el]=Περιηγηθείτε στον ιστό
+Comment[en_GB]=Browse the web
+Comment[es]=Navegar por la web
+Comment[eu]=Nabigatu web-a
+Comment[fi]=Selaa verkkosivuja
+Comment[fr]=Naviguer sur internet
+Comment[gl]=Navegar pola web
+Comment[he]=גלישה באינטרנט
+Comment[hr]=Pregledaj web
+Comment[hu]=Webböngészés
+Comment[id]=Ramban web
+Comment[is]=Flakka á vefnum
+Comment[it]=Naviga in rete
+Comment[ja]=ウェブを閲覧します
+Comment[kk]=Интернетті шолу
+Comment[nb]=Surfe på nettet
+Comment[pa]=ਵੈੱਬ ਬਰਾਊਜ਼ ਕਰੋ
+Comment[pt]=Navegar na web
+Comment[pt_BR]=Navegar pela web
+Comment[ro]=Navigați pe net
+Comment[ru]=Смотреть в интернете
+Comment[sv]=Surfa på webben
+Comment[tr]=Web'de gezin
+Comment[ug]=تور كۆرىدۇ
+Comment[uk]=Мандруйте Інтернетом
+Comment[zh_CN]=浏览网页
+Comment[zh_TW]=瀏覽網路
+
diff --git a/common/xfce4/panel/launcher-18/mcc.desktop b/common/xfce4/panel/launcher-18/mcc.desktop
new file mode 100755
index 0000000..762ce8a
--- /dev/null
+++ b/common/xfce4/panel/launcher-18/mcc.desktop
@@ -0,0 +1,110 @@
+#!/usr/bin/env xdg-open
+[Desktop Entry]
+Name=Configure Your Computer
+Name[ar]=اضبط حاسوبك
+Name[ast]=Configurar l'ordenador
+Name[bg]=Конфигуриране нa компютър
+Name[bn]=কম্পিউটারকে কনফিগার করুন
+Name[br]=Kefluniañ hoc'h urzhiataer
+Name[bs]=Podesite vaš računar
+Name[ca]=Configurar el teu ordinador
+Name[cs]=Nastavit váš počítač
+Name[cy]=Ffurfweddu eich Cyfrifiadur
+Name[da]=Konfigurér din maskine
+Name[de]=Den Computer konfigurieren
+Name[el]=Ρυθμίστε τον υπολογιστή σας
+Name[es]=Configurar su computadora
+Name[et]=Arvuti seadistamine
+Name[eu]=Konfiguratu Zure Konputagailua
+Name[fa]=پیکربندی رایانه خود
+Name[fi]=Aseta tietokone
+Name[fr]=Configurer votre ordinateur
+Name[gl]=Configure o seu Ordenador
+Name[he]=מרכז הבקרה של מנדריבה לינוקס
+Name[hu]=A számítógép beállítása
+Name[id]=Konfigurasikan Komputer Anda
+Name[is]=Stilla tölvuna þína
+Name[it]=Configura il computer
+Name[ja]=コンピュータを設定
+Name[ky]=Компьютерди ырастоо
+Name[mk]=Конфигурирајте го компјутерот
+Name[ms]=Tetapkan Komputer Anda
+Name[nb]=Innstillinger for maskinen
+Name[nl]=Uw computer configureren
+Name[nn]=Set opp maskina
+Name[pl]=Konfiguracja komputera
+Name[pt]=Centro de Controlo Mandriva
+Name[pt_BR]=Configure seu Computador
+Name[ro]=Configurați calculatorul
+Name[ru]=Настройка компьютера
+Name[sc]=Assètia sa computadora
+Name[sk]=Nastaviť váš počítač
+Name[sl]=Nastavite svoj računalnik
+Name[sv]=Konfigurera din dator
+Name[tg]=Батанзимдарории Компютери Шумо
+Name[th]=ปรับแต่งเครื่องคอมพิวเตอร์ของท่าน
+Name[tr]=Bilgisayarınızı Yapılandırın
+Name[uk]=Налаштувати комп'ютер
+Name[uz]=Kompyuterni moslash
+Name[uz@cyrillic]=Компьютерни мослаш
+Name[vi]=Cấu hình máy tính
+Name[wa]=Apontyî vosse copiutrece
+Name[zh_CN]=配置您的计算机
+Name[zh_TW]=設定您的電腦
+Comment=Configure Your Computer
+Comment[ar]=اضبط حاسوبك
+Comment[ast]=Configurar l'ordenador
+Comment[bg]=Конфигуриране нa компютър
+Comment[bn]=কম্পিউটারকে কনফিগার করুন
+Comment[br]=Kefluniañ hoc'h urzhiataer
+Comment[bs]=Podesite vaš računar
+Comment[ca]=Configurar el teu ordinador
+Comment[cs]=Nastavit váš počítač
+Comment[cy]=Ffurfweddu eich Cyfrifiadur
+Comment[da]=Konfigurér din maskine
+Comment[de]=Den Computer konfigurieren
+Comment[el]=Ρυθμίστε τον υπολογιστή σας
+Comment[es]=Configurar su computadora
+Comment[et]=Arvuti seadistamine
+Comment[eu]=Konfiguratu Zure Konputagailua
+Comment[fa]=پیکربندی رایانه خود
+Comment[fi]=Aseta tietokone
+Comment[fr]=Configurer votre ordinateur
+Comment[gl]=Configure o seu Ordenador
+Comment[he]=מרכז הבקרה של מנדריבה לינוקס
+Comment[hu]=A számítógép beállítása
+Comment[id]=Konfigurasikan Komputer Anda
+Comment[is]=Stilla tölvuna þína
+Comment[it]=Configura il computer
+Comment[ja]=コンピュータを設定
+Comment[ky]=Компьютерди ырастоо
+Comment[mk]=Конфигурирајте го компјутерот
+Comment[ms]=Tetapkan Komputer Anda
+Comment[nb]=Innstillinger for maskinen
+Comment[nl]=Uw computer configureren
+Comment[nn]=Set opp maskina
+Comment[pl]=Konfiguracja komputera
+Comment[pt]=Centro de Controlo Mandriva
+Comment[pt_BR]=Configure seu Computador
+Comment[ro]=Configurați calculatorul
+Comment[ru]=Настройка компьютера
+Comment[sc]=Assètia sa computadora
+Comment[sk]=Nastaviť váš počítač
+Comment[sl]=Nastavite svoj računalnik
+Comment[sv]=Konfigurera din dator
+Comment[tg]=Батанзимдарории Компютери Шумо
+Comment[th]=ปรับแต่งเครื่องคอมพิวเตอร์ของท่าน
+Comment[tr]=Bilgisayarınızı Yapılandırın
+Comment[uk]=Налаштувати комп'ютер
+Comment[uz]=Kompyuterni moslash
+Comment[uz@cyrillic]=Компьютерни мослаш
+Comment[vi]=Cấu hình máy tính
+Comment[wa]=Apontyî vosse copiutrece
+Comment[zh_CN]=配置您的计算机
+Comment[zh_TW]=設定您的電腦
+Exec=/usr/sbin/drakconf
+Icon=drakconf
+Terminal=false
+Type=Application
+StartupNotify=false
+Categories=GTK;X-MandrivaLinux-CrossDesktop;System;
diff --git a/common/xfce4/panel/launcher-7.rc b/common/xfce4/panel/launcher-7.rc
deleted file mode 100644
index c466698..0000000
--- a/common/xfce4/panel/launcher-7.rc
+++ /dev/null
@@ -1,85 +0,0 @@
-[Global]
-MoveFirst=false
-
-[Entry 0]
-Name=Command Prompt
-Name[am]=ትዕዛዝ መስጫ
-Name[ar]=سطر الأوامر
-Name[be]=Загадны радок
-Name[ca]=Indicador d’ordres
-Name[cs]=Příkaz
-Name[da]=Kommandoprompt
-Name[de]=Befehlseingabe
-Name[el]=Γραμμή εντολών
-Name[en_GB]=Command Prompt
-Name[eo]=Komandinvito
-Name[es]=Línea de comandos
-Name[et]=Käsuviip
-Name[eu]=Komando lerroa
-Name[fr]=Ligne de commande
-Name[he]=שורת פקודה
-Name[hu]=Parancssor
-Name[id]=Siap Ketik Perintah
-Name[ja]=コマンドプロンプト
-Name[ko]=명령어 입력
-Name[ku]=Nîşana fermanan
-Name[lv]=Komandu līnija
-Name[mk]=Команда
-Name[nb_NO]=Kommandolinje:
-Name[nl]=Commando-regel
-Name[pa]=ਕਮਾਂਡ ਪਰਾਉਂਟ
-Name[pl]=Znak Zachęty
-Name[pt_BR]=Prompt de comandos
-Name[pt_PT]=Comando Prompt
-Name[ro]=Linie de comandă
-Name[ru]=Командная строка
-Name[si]=විධාන ප්‍රේරකය
-Name[sv]=Kommandorad
-Name[tr]=Komut Satırı
-Name[ur]=کمانڈ پرمپٹ
-Name[vi]=Dấu nhắc lệnh
-Name[zh_CN]=命令提示符
-Name[zh_TW]=指令提示
-Comment=X terminal emulator
-Comment[am]=ተርሚናል አሳይ
-Comment[ar]=اكس ترمينل اميلاتور
-Comment[be]=Эмулятар X тэрмінала
-Comment[ca]=Emulador de terminal
-Comment[cs]=Emulátor terminálu X
-Comment[da]=X terminalemulering
-Comment[de]=X-Terminalemulator
-Comment[el]=Προσομοίωτής τερματικού X
-Comment[en_GB]=X terminal emulator
-Comment[eo]=X-Terminala imitilo
-Comment[es]=Emulador de terminal para X
-Comment[et]=X terminal emulaator
-Comment[eu]=X terminal emuladorea
-Comment[fr]=Émulateur de terminal X
-Comment[he]=מסוף
-Comment[hu]=X terminál emulátor
-Comment[id]=Emulator terminal X
-Comment[ja]=X ターミナルエミュレータ
-Comment[ko]=X 터미널
-Comment[ku]=Emulatorê termînala X
-Comment[lv]=X termināla emulators
-Comment[mk]=Емулатор за терминал за X
-Comment[nb_NO]=X terminal emulator
-Comment[nl]=X terminal emulator
-Comment[pa]=X ਟਰਮੀਨਲ ਈਮੁਲੇਟਰ
-Comment[pl]=Emulator terminala X
-Comment[pt_BR]=Emulador de terminal do X
-Comment[pt_PT]=Emulador de Terminal X
-Comment[ro]=Emulator de terminal X
-Comment[ru]=X эмулятор терминала
-Comment[si]=X terminal emulator
-Comment[sq]=Emulues terminali X
-Comment[sv]=Terminalemulator för X
-Comment[tr]=X Terminal Uygulaması
-Comment[ur]=ایکس ٹرمنل ایمولیٹر
-Comment[vi]=Trình giả lập terminal X
-Comment[zh_CN]=X 终端模拟器
-Comment[zh_TW]=X 終端機模擬器
-Icon=utilities-terminal
-Exec=exo-open --launch TerminalEmulator
-Terminal=false
-StartupNotify=true
diff --git a/common/xfce4/panel/pager-2.rc b/common/xfce4/panel/pager-2.rc
deleted file mode 100644
index b485293..0000000
--- a/common/xfce4/panel/pager-2.rc
+++ /dev/null
@@ -1,4 +0,0 @@
-rows=1
-scrolling=true
-show-names=false
-
diff --git a/common/xfce4/panel/panels.xml b/common/xfce4/panel/panels.xml
deleted file mode 100644
index 2c66d1d..0000000
--- a/common/xfce4/panel/panels.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE config SYSTEM "config.dtd">
-<panels>
-	<panel>
-		<properties>
-			<property name="size" value="34"/>
-			<property name="monitor" value="0"/>
-			<property name="screen-position" value="2"/>
-			<property name="fullwidth" value="1"/>
-			<property name="xoffset" value="0"/>
-			<property name="yoffset" value="0"/>
-			<property name="handlestyle" value="0"/>
-			<property name="autohide" value="0"/>
-			<property name="transparency" value="20"/>
-			<property name="activetrans" value="0"/>
-		</properties>
-		<items>
-			<item name="xfce4-menu" id="5"/>
-			<item name="separator" id="13"/>
-			<item name="places" id="1"/>
-			<item name="launcher" id="7"/>
-			<item name="launcher" id="8"/>
-			<item name="launcher" id="9"/>
-			<item name="launcher" id="10"/>
-			<item name="launcher" id="12"/>
-			<item name="separator" id="11"/>
-			<item name="separator" id="6"/>
-			<item name="xfce4-mixer-plugin" id="2"/>
-			<item name="systray" id="4"/>
-			<item name="clock" id="14"/>
-			<item name="xfswitch-plugin" id="15"/>
-			<item name="actions" id="16"/>
-		</items>
-	</panel>
-	<panel>
-		<properties>
-			<property name="size" value="26"/>
-			<property name="monitor" value="0"/>
-			<property name="screen-position" value="11"/>
-			<property name="fullwidth" value="1"/>
-			<property name="xoffset" value="0"/>
-			<property name="yoffset" value="1172"/>
-			<property name="handlestyle" value="0"/>
-			<property name="autohide" value="0"/>
-			<property name="transparency" value="20"/>
-			<property name="activetrans" value="0"/>
-		</properties>
-		<items>
-			<item name="showdesktop" id="1"/>
-			<item name="pager" id="2"/>
-			<item name="tasklist" id="3"/>
-			<item name="windowlist" id="1"/>
-		</items>
-	</panel>
-</panels>
diff --git a/common/xfce4/panel/places-1.rc b/common/xfce4/panel/places-1.rc
deleted file mode 100644
index 20881b1..0000000
--- a/common/xfce4/panel/places-1.rc
+++ /dev/null
@@ -1,12 +0,0 @@
-show_button_icon=true
-show_button_label=true
-label=
-show_icons=true
-show_volumes=true
-mount_open_volumes=true
-show_bookmarks=true
-show_recent=true
-show_recent_clear=true
-show_recent_number=10
-search_cmd=pinot
-
diff --git a/common/xfce4/panel/separator-11.rc b/common/xfce4/panel/separator-11.rc
deleted file mode 100644
index c46dd6a..0000000
--- a/common/xfce4/panel/separator-11.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-separator-type=2
-
diff --git a/common/xfce4/panel/separator-13.rc b/common/xfce4/panel/separator-13.rc
deleted file mode 100644
index c46dd6a..0000000
--- a/common/xfce4/panel/separator-13.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-separator-type=2
-
diff --git a/common/xfce4/panel/separator-6.rc b/common/xfce4/panel/separator-6.rc
deleted file mode 100644
index ea80172..0000000
--- a/common/xfce4/panel/separator-6.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-separator-type=1
-
diff --git a/common/xfce4/panel/systray-4.rc b/common/xfce4/panel/systray-4.rc
deleted file mode 100644
index 739d4b5..0000000
--- a/common/xfce4/panel/systray-4.rc
+++ /dev/null
@@ -1,9 +0,0 @@
-show_frame=1
-
-[Global]
-ShowFrame=false
-Rows=1
-
-[Applications]
-deluge=false
-
diff --git a/common/xfce4/panel/tasklist-3.rc b/common/xfce4/panel/tasklist-3.rc
deleted file mode 100644
index 7a8acf3..0000000
--- a/common/xfce4/panel/tasklist-3.rc
+++ /dev/null
@@ -1,7 +0,0 @@
-grouping=1
-width=300
-all_workspaces=false
-expand=true
-flat_buttons=true
-show_handles=true
-
diff --git a/common/xfce4/panel/windowlist-1.rc b/common/xfce4/panel/windowlist-1.rc
deleted file mode 100644
index 8759880..0000000
--- a/common/xfce4/panel/windowlist-1.rc
+++ /dev/null
@@ -1,6 +0,0 @@
-button_layout=1
-urgency_notify=1
-show_all_workspaces=true
-show_window_icons=true
-show_workspace_actions=false
-
diff --git a/common/xfce4/panel/xfce4-menu-5.rc b/common/xfce4/panel/xfce4-menu-5.rc
deleted file mode 100644
index fe954e2..0000000
--- a/common/xfce4/panel/xfce4-menu-5.rc
+++ /dev/null
@@ -1,7 +0,0 @@
-use_default_menu=true
-show_button_title=true
-menu_file=/etc/xdg/menus/xfce-applications.menu
-icon_file=/usr/share/icons/mageia.png
-show_menu_icons=true
-button_title=Mageia
-
diff --git a/common/xfce4/panel/xfce4-mixer-plugin-2.rc b/common/xfce4/panel/xfce4-mixer-plugin-2.rc
deleted file mode 100644
index c69ec77..0000000
--- a/common/xfce4/panel/xfce4-mixer-plugin-2.rc
+++ /dev/null
@@ -1,4 +0,0 @@
-card=
-track=Master
-command=xfce4-mixer
-
diff --git a/common/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/common/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
new file mode 100644
index 0000000..9794db7
--- /dev/null
+++ b/common/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xfce4-panel" version="1.0">
+  <property name="panels" type="uint" value="2">
+    <property name="panel-0" type="empty">
+      <property name="position" type="string" value="p=8;x=960;y=915"/>
+      <property name="role" type="string" value="xfce4-panel-12999715800"/>
+      <property name="length" type="uint" value="100"/>
+      <property name="size" type="uint" value="26"/>
+      <property name="plugin-ids" type="array">
+        <value type="int" value="9"/>
+        <value type="int" value="10"/>
+        <value type="int" value="11"/>
+        <value type="int" value="12"/>
+      </property>
+    </property>
+    <property name="panel-1" type="empty">
+      <property name="position" type="string" value="p=6;x=102;y=22"/>
+      <property name="role" type="string" value="xfce4-panel-12999717071"/>
+      <property name="length" type="uint" value="100"/>
+      <property name="plugin-ids" type="array">
+        <value type="int" value="1"/>
+        <value type="int" value="6"/>
+        <value type="int" value="14"/>
+        <value type="int" value="15"/>
+        <value type="int" value="16"/>
+        <value type="int" value="17"/>
+        <value type="int" value="18"/>
+        <value type="int" value="8"/>
+        <value type="int" value="13"/>
+        <value type="int" value="7"/>
+        <value type="int" value="5"/>
+        <value type="int" value="3"/>
+        <value type="int" value="2"/>
+        <value type="int" value="19"/>
+      </property>
+      <property name="size" type="uint" value="34"/>
+    </property>
+  </property>
+  <property name="plugins" type="empty">
+    <property name="plugin-1" type="string" value="applicationsmenu">
+      <property name="button-title" type="string" value="Mageia"/>
+      <property name="button-icon" type="string" value="/usr/share/icons/mageia.png"/>
+    </property>
+    <property name="plugin-2" type="string" value="actions"/>
+    <property name="plugin-3" type="string" value="clock">
+      <property name="show-frame" type="bool" value="false"/>
+    </property>
+    <property name="plugin-5" type="string" value="systray">
+      <property name="names-visible" type="array">
+        <value type="string" value="gnome-power-manager"/>
+        <value type="string" value="xfce4-power-manager"/>
+        <value type="string" value="net_applet"/>
+      </property>
+      <property name="show-frame" type="bool" value="false"/>
+    </property>
+    <property name="plugin-6" type="string" value="separator">
+      <property name="expand" type="bool" value="false"/>
+    </property>
+    <property name="plugin-7" type="string" value="xfce4-mixer-plugin"/>
+    <property name="plugin-8" type="string" value="separator">
+      <property name="expand" type="bool" value="false"/>
+    </property>
+    <property name="plugin-9" type="string" value="showdesktop"/>
+    <property name="plugin-10" type="string" value="pager"/>
+    <property name="plugin-11" type="string" value="tasklist"/>
+    <property name="plugin-12" type="string" value="windowmenu">
+      <property name="style" type="uint" value="1"/>
+    </property>
+    <property name="plugin-13" type="string" value="separator">
+      <property name="style" type="uint" value="0"/>
+      <property name="expand" type="bool" value="true"/>
+    </property>
+    <property name="plugin-14" type="string" value="launcher">
+      <property name="items" type="array">
+        <value type="string" value="terminal-emulator.desktop"/>
+      </property>
+    </property>
+    <property name="plugin-15" type="string" value="launcher">
+      <property name="items" type="array">
+        <value type="string" value="text-editor.desktop"/>
+      </property>
+    </property>
+    <property name="plugin-16" type="string" value="launcher">
+      <property name="items" type="array">
+        <value type="string" value="file-manager.desktop"/>
+      </property>
+    </property>
+    <property name="plugin-17" type="string" value="launcher">
+      <property name="items" type="array">
+        <value type="string" value="web-browser.desktop"/>
+      </property>
+    </property>
+    <property name="plugin-18" type="string" value="launcher">
+      <property name="items" type="array">
+        <value type="string" value="mcc.desktop"/>
+      </property>
+    </property>
+  </property>
+</channel>