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

This commit consitsts of the following subversion commits:

------------------------------------------------------------------------
r386 | dmorgan | 2011-02-03 10:31:48 +0000 (Thu, 03 Feb 2011) | 1 line

Import Cleaned desktop-common-data
------------------------------------------------------------------------

In addition to the above commits, the following cleaning work has been recorded:

- License is GPL according to the relevant rpm spec written by Mandriva

Each subdir on its own, only problematic ones are mentioned:
o backgrounds : three .jpg files will need to be replaced

o bookmarks:
  - konqueror/bookmarks-download.xml:  icons used in the file come from mandriva-kde-icons
    we'll have to replace them
    - the links will be much easier to replace when our wiki/forum... etc is up
  - konqueror/bookmarks-powerpack.xml: deleted, we don't have a powerpack
  - konqueror/bookmarks-one.xml: a subset from konqueror/bookmarks-download.xml, so we'll
    fix it along with bookmarks-download.xml

  - mozilla/* : the same goes as for konqueror bookmarks
  - cleant bookmarks to remove Mandriva's and add Mageia reference

o desktop:
  - delete powerpack/, we don't have a powerpack
  - detele {free,one}/upgrade.desktop.in, no powerpack so nothing to upgrade to
  - modify {free,one}/register.desktop.in to say Mageia instead of Mandriva and
    point to https://identity.mageia.org/

o dm:
  - changed Mandriva images

o faces: icons in this dir need to be replaced
  - added 2 oxygen icons to deal with

o kde: one icon in here need to be replaced (or dropped)  => DROPPED

o krootwarning: it's empty, drop it?

o man/*/chksession.8 : Occurances of "MandrakeSoft", 1) at the top of the page and
  2) copyright statement at the bottom

o menu:
  - the menu section icons in ./icons need to be replaced => done (oxygen icons)
  - category names should be changed? (i.e. s/X-MandrivaLinux/X-MageiaLinux/),
    a list of categories is available in menu-categories-list (same dir as CLEANUP_PROGRESS.txt)
    we keep it for now until decision is taken (best thing would be to push missing categories
    upstream) => not for now

o sounds: sound files need to be replaced

6 files changed, 7 insertions, 227 deletions

diff --git a/bookmarks/konqueror/bookmarks-download.xml b/bookmarks/konqueror/bookmarks-download.xml
index adcbc64..1fa5713 100644
--- a/bookmarks/konqueror/bookmarks-download.xml
+++ b/bookmarks/konqueror/bookmarks-download.xml
@@ -1,21 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE xbel>
 <xbel folded="no" >
- <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://www.mandriva.com/" >
+<bookmark con="/usr/share/icons/favicons/empty.png" href="http://www.mageia.com/" >
   <title>Mandriva</title>
  </bookmark>
- <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://store.mandriva.com/" >
-  <title>Mandriva Store</title>
- </bookmark>
- <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://expert.mandriva.com/" >
-  <title>Mandriva Expert</title>
- </bookmark>
- <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://www.mandriva.com/community/" >
-  <title>Mandriva Community</title>
- </bookmark>
- <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://wiki.mandriva.com/" >
-  <title>Mandriva Wiki</title>
- </bookmark>
  <bookmark icon="/usr/share/icons/favicons/jamendo.png" href="http://www.jamendo.com/" >
   <title>Jamendo</title>
  </bookmark>
@@ -80,9 +68,6 @@
  </folder>
  <folder folded="no" >
   <title>Programming</title>
-  <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://wiki.mandriva.com/en/Development" >
-   <title>Mandriva Cooker</title>
-  </bookmark>
   <separator/>
   <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://gcc.gnu.org/" >
    <title>GCC</title>
diff --git a/bookmarks/konqueror/bookmarks-one.xml b/bookmarks/konqueror/bookmarks-one.xml
index d81fe84..70e53b1 100644
--- a/bookmarks/konqueror/bookmarks-one.xml
+++ b/bookmarks/konqueror/bookmarks-one.xml
@@ -1,17 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE xbel>
 <xbel folded="no" >
- <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://www.mandriva.com/" >
-  <title>Mandriva</title>
  </bookmark>
- <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://store.mandriva.com/" >
-  <title>Mandriva Store</title>
- </bookmark>
- <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://expert.mandriva.com/" >
-  <title>Mandriva Expert</title>
- </bookmark>
- <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://www.mandriva.com/community/" >
-  <title>Mandriva Community</title>
+ <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.mageia.org/" >
+  <title>Mageia Community</title>
  </bookmark>
  <bookmark icon="/usr/share/icons/favicons/jamendo.png" href="http://www.jamendo.com/" >
   <title>Jamendo</title>
diff --git a/bookmarks/konqueror/bookmarks-powerpack.xml b/bookmarks/konqueror/bookmarks-powerpack.xml
deleted file mode 100644
index 8d43533..0000000
--- a/bookmarks/konqueror/bookmarks-powerpack.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE xbel>
-<xbel folded="no" >
- <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://www.mandriva.com/" >
-  <title>Mandriva</title>
- </bookmark>
- <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://store.mandriva.com/" >
-  <title>Mandriva Store</title>
- </bookmark>
- <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://expert.mandriva.com/" >
-  <title>Mandriva Expert</title>
- </bookmark>
- <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://www.mandriva.com/community/" >
-  <title>Mandriva Community</title>
- </bookmark>
- <bookmark icon="/usr/share/icons/favicons/jamendo.png" href="http://www.jamendo.com/" >
-  <title>Jamendo</title>
- </bookmark>
- <folder folded="yes" >
-  <title>Partners</title>
-  <bookmark href="http://www.transgaming.com/products/cedega/" >
-  <title>Cedega</title>
- </bookmark>
- <bookmark href="http://www.fluendo.com/" >
-  <title>Fluendo</title>
- </bookmark>
- <bookmark href="http://picasa.google.com/linux/" >
-  <title>Picasa</title>
- </bookmark>
- <bookmark href="http://earth.google.com/" >
-  <title>Google Earth</title>
- </bookmark>
- </folder>
- <separator/>
- <folder folded="yes" >
-  <title>Community</title>
-  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.gnu.org/software/software.html" >
-   <title>Free Software Foundation</title>
-  </bookmark>
-  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.gnu.org/" >
-   <title>The GNU Project</title>
-  </bookmark>
-  <separator/>
-  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://freshmeat.net/" >
-   <title>Freshmeat</title>
-  </bookmark>
-  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.gnome.org/" >
-   <title>GNOME</title>
-  </bookmark>
-  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.kde.org/" >
-   <title>KDE</title>
-  </bookmark>
-  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.linux.org/" >
-   <title>Linux.org</title>
-  </bookmark>
-  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.linuxfoundation.org/" >
-   <title>Linux Foundation</title>
-  </bookmark>
-  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.linuxgames.com/" >
-   <title>Linux Games</title>
-  </bookmark>
-  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.linuxhq.com/" >
-   <title>Linux HeadQuarters</title>
-  </bookmark>
-  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.kernel.org/" >
-   <title>Linux Kernel Archives</title>
-  </bookmark>
-  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.x.org/" >
-   <title>X.org</title>
-  </bookmark>
- </folder>
- <folder folded="yes" >
-  <title>News</title>
-  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://alllinuxdevices.com/" >
-   <title>All Linux Devices</title>
-  </bookmark>
-  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.linux.com/" >
-   <title>Linux.com</title>
-  </bookmark>
-  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.linuxplanet.com/" >
-   <title>Linux Planet</title>
-  </bookmark>
-  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://linuxtoday.com/" >
-   <title>Linux Today</title>
-  </bookmark>
-  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.lwn.net/" >
-   <title>Linux Weekly News</title>
-  </bookmark>
-  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://slashdot.org/" >
-   <title>Slashdot</title>
-  </bookmark>
- </folder>
- <folder folded="no" >
-  <title>Programming</title>
-  <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://wiki.mandriva.com/en/Development" >
-   <title>Mandriva Cooker</title>
-  </bookmark>
-  <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://wiki.mandriva.com/" >
-   <title>Mandriva Wiki</title>
-  </bookmark>
-  <separator/>
-  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://gcc.gnu.org/" >
-   <title>GCC</title>
-  </bookmark>
-  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.gtk.org/" >
-   <title>GTK+</title>
-  </bookmark>
-  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://techbase.kde.org/" >
-   <title>KDE TechBase</title>
-  </bookmark>
-  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.opensource.org/" >
-   <title>OpenSource.org</title>
-  </bookmark>
-  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.perl.org/" >
-   <title>Perl.org</title>
-  </bookmark>
-  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.python.org/" >
-   <title>Python.org</title>
-  </bookmark>
-  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.qtsoftware.com/products/" >
-   <title>Qt Software</title>
-  </bookmark>
-  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.rpm.org/" >
-   <title>RPM.org</title>
-  </bookmark>
-  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://sourceforge.net/" >
-   <title>SourceForge</title>
-  </bookmark>
- </folder>
-</xbel>
diff --git a/bookmarks/mozilla/mozilla-download.html b/bookmarks/mozilla/mozilla-download.html
index 98df84d..32df31d 100644
--- a/bookmarks/mozilla/mozilla-download.html
+++ b/bookmarks/mozilla/mozilla-download.html
@@ -3,14 +3,9 @@
 <TITLE>Bookmarks</TITLE>
 <H1>Bookmarks</H1>
 <DL><p>
-<DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="NC:PersonalToolbarFolder">Mandriva</H3>
+<DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="NC:PersonalToolbarFolder">Mageia</H3>
 <DL><p>
-<DT><A ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAANbY1E9YMgAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAP9SURBVHjatFVbbFRVFF33NdPODH2J0wfgNFPE6gehEaUBoQFD/JAQTUPihzHR6BjSaoiREHwkQvzxp6GmUhweqUJCUaKJ8KvpR1MNwWKLrdha2qFYYEpbps/hzp17XGfuVIpKZz7qSU/vvefuu9bZe619RhFCIOvxufoqIE4AyqN40/4jm0/UrMGPKAqSBM9VcQXPfB8Oh1csLYGFHhTzulKDzx7L5d3zS0fwmVIHgcexrQ4wEshL3pYEpUtHYKIJGyuBwibAtwJ5VtTH1Uey+VSncAK2GOAOL3H+BgWnOSewW9xMRTQqnVjO65PnnS8C24Fki7wLZkcgXVRmVGCZWoHbd4EpfIgY3zQoNAyvLs5t9fyXzzkO5GwAcltQJP7MzY4AWIvhRDc25ABVtXwsIHASmJ4ERrsBvxcofg2I97GgBgmfALi0KXZ6NY1UFgqFRhYjUGQfRJuDdX4x2IQttMnqTwBbT8ujOVnYJEzduPlXCAzuAX66DBaSosOGZpyF7v4Gr0+d+U8COWYOF7V5tYkabC8HlodoS4uYJFHU9JWkCjNQuX1XHidLNtMDDLcDN3qZ7XVgjlXT9Slm+iVejtTfRyDHbFP+LY9r0o8drLNrPcUUTiYSGPMEFEXx8FFOkunLuIExYOwgEJ0Cfi/is47w5N49LF+jvjAdT32s2DrkMvWBCwbKCa5JJyqpOkDVHcUFgc1LJKfgVoSvuB4dZiYPU7di9IqqSHv82UEGvyA9qP9LdUO7i6RuYKaLoNe4QF30PCeDJHc4d4Uk0yQn8TRLco2mmA7iV7tqqMPcOpSGOcXdH5930b1xLL8W7hwfymwKywwSdJJ5Jy0wnGx4JEEn8NBDwK0CXLbXDf5obo6kA74gcMs/bbpguM+inOCqJCCQqjka/C2T4lRMpavG/Thn7fz5hlXKtHCCwCcf1AfOaFm5Cx7WOMB4KTwbnBa4t3ubRPZ8sHznRQJu6V9ih/oXazRnaO6vUMEW1hMsDXc+zuMmyvrGfCmN8Rir4J1xMpMEvgTUOSEf4pk6GWitfBdexnq5xYESWo4eFwYumOv7fomvG1krekqq+32VCNAcRTyiFMa5VdJocLoxE4Hq2geLwvUW4Lq1arRttqZv1vYk0jEN1a80nutrfePjNSO+91NwhcxG0+DRTIN1EpkJNNdbF+ee2tc5W3Unvd7GeYi1jc0Hrnnp6AdXv95tBm/mHIDGDDQVqzwThZG4n3VEZHGC2outneFwVPYaQc8/KDi4q/ng1W/fVoLRmo9gmDSZbAaw5dGVUWQC/5DN8Rt88dMDke/ecQdck/stGHYmDbL/TV4wAjsb3gv3P/1cx2hgKPV7l+m4/j/HXwIMAKacWjiFjDFxAAAAAElFTkSuQmCC" HREF="http://www.mandriva.com/">Mandriva</A>
-<DT><A ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAANbY1E9YMgAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAP9SURBVHjatFVbbFRVFF33NdPODH2J0wfgNFPE6gehEaUBoQFD/JAQTUPihzHR6BjSaoiREHwkQvzxp6GmUhweqUJCUaKJ8KvpR1MNwWKLrdha2qFYYEpbps/hzp17XGfuVIpKZz7qSU/vvefuu9bZe619RhFCIOvxufoqIE4AyqN40/4jm0/UrMGPKAqSBM9VcQXPfB8Oh1csLYGFHhTzulKDzx7L5d3zS0fwmVIHgcexrQ4wEshL3pYEpUtHYKIJGyuBwibAtwJ5VtTH1Uey+VSncAK2GOAOL3H+BgWnOSewW9xMRTQqnVjO65PnnS8C24Fki7wLZkcgXVRmVGCZWoHbd4EpfIgY3zQoNAyvLs5t9fyXzzkO5GwAcltQJP7MzY4AWIvhRDc25ABVtXwsIHASmJ4ERrsBvxcofg2I97GgBgmfALi0KXZ6NY1UFgqFRhYjUGQfRJuDdX4x2IQttMnqTwBbT8ujOVnYJEzduPlXCAzuAX66DBaSosOGZpyF7v4Gr0+d+U8COWYOF7V5tYkabC8HlodoS4uYJFHU9JWkCjNQuX1XHidLNtMDDLcDN3qZ7XVgjlXT9Slm+iVejtTfRyDHbFP+LY9r0o8drLNrPcUUTiYSGPMEFEXx8FFOkunLuIExYOwgEJ0Cfi/is47w5N49LF+jvjAdT32s2DrkMvWBCwbKCa5JJyqpOkDVHcUFgc1LJKfgVoSvuB4dZiYPU7di9IqqSHv82UEGvyA9qP9LdUO7i6RuYKaLoNe4QF30PCeDJHc4d4Uk0yQn8TRLco2mmA7iV7tqqMPcOpSGOcXdH5930b1xLL8W7hwfymwKywwSdJJ5Jy0wnGx4JEEn8NBDwK0CXLbXDf5obo6kA74gcMs/bbpguM+inOCqJCCQqjka/C2T4lRMpavG/Thn7fz5hlXKtHCCwCcf1AfOaFm5Cx7WOMB4KTwbnBa4t3ubRPZ8sHznRQJu6V9ih/oXazRnaO6vUMEW1hMsDXc+zuMmyvrGfCmN8Rir4J1xMpMEvgTUOSEf4pk6GWitfBdexnq5xYESWo4eFwYumOv7fomvG1krekqq+32VCNAcRTyiFMa5VdJocLoxE4Hq2geLwvUW4Lq1arRttqZv1vYk0jEN1a80nutrfePjNSO+91NwhcxG0+DRTIN1EpkJNNdbF+ee2tc5W3Unvd7GeYi1jc0Hrnnp6AdXv95tBm/mHIDGDDQVqzwThZG4n3VEZHGC2outneFwVPYaQc8/KDi4q/ng1W/fVoLRmo9gmDSZbAaw5dGVUWQC/5DN8Rt88dMDke/ecQdck/stGHYmDbL/TV4wAjsb3gv3P/1cx2hgKPV7l+m4/j/HXwIMAKacWjiFjDFxAAAAAElFTkSuQmCC" HREF="http://store.mandriva.com/">Mandriva Store</A>
-<DT><A ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAANbY1E9YMgAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAP9SURBVHjatFVbbFRVFF33NdPODH2J0wfgNFPE6gehEaUBoQFD/JAQTUPihzHR6BjSaoiREHwkQvzxp6GmUhweqUJCUaKJ8KvpR1MNwWKLrdha2qFYYEpbps/hzp17XGfuVIpKZz7qSU/vvefuu9bZe619RhFCIOvxufoqIE4AyqN40/4jm0/UrMGPKAqSBM9VcQXPfB8Oh1csLYGFHhTzulKDzx7L5d3zS0fwmVIHgcexrQ4wEshL3pYEpUtHYKIJGyuBwibAtwJ5VtTH1Uey+VSncAK2GOAOL3H+BgWnOSewW9xMRTQqnVjO65PnnS8C24Fki7wLZkcgXVRmVGCZWoHbd4EpfIgY3zQoNAyvLs5t9fyXzzkO5GwAcltQJP7MzY4AWIvhRDc25ABVtXwsIHASmJ4ERrsBvxcofg2I97GgBgmfALi0KXZ6NY1UFgqFRhYjUGQfRJuDdX4x2IQttMnqTwBbT8ujOVnYJEzduPlXCAzuAX66DBaSosOGZpyF7v4Gr0+d+U8COWYOF7V5tYkabC8HlodoS4uYJFHU9JWkCjNQuX1XHidLNtMDDLcDN3qZ7XVgjlXT9Slm+iVejtTfRyDHbFP+LY9r0o8drLNrPcUUTiYSGPMEFEXx8FFOkunLuIExYOwgEJ0Cfi/is47w5N49LF+jvjAdT32s2DrkMvWBCwbKCa5JJyqpOkDVHcUFgc1LJKfgVoSvuB4dZiYPU7di9IqqSHv82UEGvyA9qP9LdUO7i6RuYKaLoNe4QF30PCeDJHc4d4Uk0yQn8TRLco2mmA7iV7tqqMPcOpSGOcXdH5930b1xLL8W7hwfymwKywwSdJJ5Jy0wnGx4JEEn8NBDwK0CXLbXDf5obo6kA74gcMs/bbpguM+inOCqJCCQqjka/C2T4lRMpavG/Thn7fz5hlXKtHCCwCcf1AfOaFm5Cx7WOMB4KTwbnBa4t3ubRPZ8sHznRQJu6V9ih/oXazRnaO6vUMEW1hMsDXc+zuMmyvrGfCmN8Rir4J1xMpMEvgTUOSEf4pk6GWitfBdexnq5xYESWo4eFwYumOv7fomvG1krekqq+32VCNAcRTyiFMa5VdJocLoxE4Hq2geLwvUW4Lq1arRttqZv1vYk0jEN1a80nutrfePjNSO+91NwhcxG0+DRTIN1EpkJNNdbF+ee2tc5W3Unvd7GeYi1jc0Hrnnp6AdXv95tBm/mHIDGDDQVqzwThZG4n3VEZHGC2outneFwVPYaQc8/KDi4q/ng1W/fVoLRmo9gmDSZbAaw5dGVUWQC/5DN8Rt88dMDke/ecQdck/stGHYmDbL/TV4wAjsb3gv3P/1cx2hgKPV7l+m4/j/HXwIMAKacWjiFjDFxAAAAAElFTkSuQmCC" HREF="http://expert.mandriva.com/">Mandriva Expert</A>
-<DT><A ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAANbY1E9YMgAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAP9SURBVHjatFVbbFRVFF33NdPODH2J0wfgNFPE6gehEaUBoQFD/JAQTUPihzHR6BjSaoiREHwkQvzxp6GmUhweqUJCUaKJ8KvpR1MNwWKLrdha2qFYYEpbps/hzp17XGfuVIpKZz7qSU/vvefuu9bZe619RhFCIOvxufoqIE4AyqN40/4jm0/UrMGPKAqSBM9VcQXPfB8Oh1csLYGFHhTzulKDzx7L5d3zS0fwmVIHgcexrQ4wEshL3pYEpUtHYKIJGyuBwibAtwJ5VtTH1Uey+VSncAK2GOAOL3H+BgWnOSewW9xMRTQqnVjO65PnnS8C24Fki7wLZkcgXVRmVGCZWoHbd4EpfIgY3zQoNAyvLs5t9fyXzzkO5GwAcltQJP7MzY4AWIvhRDc25ABVtXwsIHASmJ4ERrsBvxcofg2I97GgBgmfALi0KXZ6NY1UFgqFRhYjUGQfRJuDdX4x2IQttMnqTwBbT8ujOVnYJEzduPlXCAzuAX66DBaSosOGZpyF7v4Gr0+d+U8COWYOF7V5tYkabC8HlodoS4uYJFHU9JWkCjNQuX1XHidLNtMDDLcDN3qZ7XVgjlXT9Slm+iVejtTfRyDHbFP+LY9r0o8drLNrPcUUTiYSGPMEFEXx8FFOkunLuIExYOwgEJ0Cfi/is47w5N49LF+jvjAdT32s2DrkMvWBCwbKCa5JJyqpOkDVHcUFgc1LJKfgVoSvuB4dZiYPU7di9IqqSHv82UEGvyA9qP9LdUO7i6RuYKaLoNe4QF30PCeDJHc4d4Uk0yQn8TRLco2mmA7iV7tqqMPcOpSGOcXdH5930b1xLL8W7hwfymwKywwSdJJ5Jy0wnGx4JEEn8NBDwK0CXLbXDf5obo6kA74gcMs/bbpguM+inOCqJCCQqjka/C2T4lRMpavG/Thn7fz5hlXKtHCCwCcf1AfOaFm5Cx7WOMB4KTwbnBa4t3ubRPZ8sHznRQJu6V9ih/oXazRnaO6vUMEW1hMsDXc+zuMmyvrGfCmN8Rir4J1xMpMEvgTUOSEf4pk6GWitfBdexnq5xYESWo4eFwYumOv7fomvG1krekqq+32VCNAcRTyiFMa5VdJocLoxE4Hq2geLwvUW4Lq1arRttqZv1vYk0jEN1a80nutrfePjNSO+91NwhcxG0+DRTIN1EpkJNNdbF+ee2tc5W3Unvd7GeYi1jc0Hrnnp6AdXv95tBm/mHIDGDDQVqzwThZG4n3VEZHGC2outneFwVPYaQc8/KDi4q/ng1W/fVoLRmo9gmDSZbAaw5dGVUWQC/5DN8Rt88dMDke/ecQdck/stGHYmDbL/TV4wAjsb3gv3P/1cx2hgKPV7l+m4/j/HXwIMAKacWjiFjDFxAAAAAElFTkSuQmCC" HREF="http://www.mandriva.com/community/">Community</A>
-<DT><A ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAANbY1E9YMgAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAP9SURBVHjatFVbbFRVFF33NdPODH2J0wfgNFPE6gehEaUBoQFD/JAQTUPihzHR6BjSaoiREHwkQvzxp6GmUhweqUJCUaKJ8KvpR1MNwWKLrdha2qFYYEpbps/hzp17XGfuVIpKZz7qSU/vvefuu9bZe619RhFCIOvxufoqIE4AyqN40/4jm0/UrMGPKAqSBM9VcQXPfB8Oh1csLYGFHhTzulKDzx7L5d3zS0fwmVIHgcexrQ4wEshL3pYEpUtHYKIJGyuBwibAtwJ5VtTH1Uey+VSncAK2GOAOL3H+BgWnOSewW9xMRTQqnVjO65PnnS8C24Fki7wLZkcgXVRmVGCZWoHbd4EpfIgY3zQoNAyvLs5t9fyXzzkO5GwAcltQJP7MzY4AWIvhRDc25ABVtXwsIHASmJ4ERrsBvxcofg2I97GgBgmfALi0KXZ6NY1UFgqFRhYjUGQfRJuDdX4x2IQttMnqTwBbT8ujOVnYJEzduPlXCAzuAX66DBaSosOGZpyF7v4Gr0+d+U8COWYOF7V5tYkabC8HlodoS4uYJFHU9JWkCjNQuX1XHidLNtMDDLcDN3qZ7XVgjlXT9Slm+iVejtTfRyDHbFP+LY9r0o8drLNrPcUUTiYSGPMEFEXx8FFOkunLuIExYOwgEJ0Cfi/is47w5N49LF+jvjAdT32s2DrkMvWBCwbKCa5JJyqpOkDVHcUFgc1LJKfgVoSvuB4dZiYPU7di9IqqSHv82UEGvyA9qP9LdUO7i6RuYKaLoNe4QF30PCeDJHc4d4Uk0yQn8TRLco2mmA7iV7tqqMPcOpSGOcXdH5930b1xLL8W7hwfymwKywwSdJJ5Jy0wnGx4JEEn8NBDwK0CXLbXDf5obo6kA74gcMs/bbpguM+inOCqJCCQqjka/C2T4lRMpavG/Thn7fz5hlXKtHCCwCcf1AfOaFm5Cx7WOMB4KTwbnBa4t3ubRPZ8sHznRQJu6V9ih/oXazRnaO6vUMEW1hMsDXc+zuMmyvrGfCmN8Rir4J1xMpMEvgTUOSEf4pk6GWitfBdexnq5xYESWo4eFwYumOv7fomvG1krekqq+32VCNAcRTyiFMa5VdJocLoxE4Hq2geLwvUW4Lq1arRttqZv1vYk0jEN1a80nutrfePjNSO+91NwhcxG0+DRTIN1EpkJNNdbF+ee2tc5W3Unvd7GeYi1jc0Hrnnp6AdXv95tBm/mHIDGDDQVqzwThZG4n3VEZHGC2outneFwVPYaQc8/KDi4q/ng1W/fVoLRmo9gmDSZbAaw5dGVUWQC/5DN8Rt88dMDke/ecQdck/stGHYmDbL/TV4wAjsb3gv3P/1cx2hgKPV7l+m4/j/HXwIMAKacWjiFjDFxAAAAAElFTkSuQmCC" HREF="http://wiki.mandriva.com/">Mandriva Wiki</A>
-<DT><A ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/gD+AP7rGNSCAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB5klEQVQ4y5WTTWtTQRSGn7lJG5vGpulHUoiGhNgulBZNjShu/KApXboRRAgBF/YX6MJNoUv/QsVCu1IobhQqgiCCSEtK0EVNq0abDzW50KamsXdu5rqwXshC0xx4V8953zlzmBEAqaW0Nb+2RTt1KxbiwbUzQqSW0tb8aq4tsx0SjyC4+9hq1agJQWI4QCzYi1PTqO5L8jt1spVdnJhmy5OS8Qhnj/VhNBQ1wyTg7iTs7WIiOni4gOtjx3mTK/No7Qt12aDnSAdBr5tIvwcnUrYMqO7tU9B3yRZ1rIMLvz9ghwp4mslxIRpgszTAq41S836QklZ6srKBYUjioT6OOmhiDnFqYkYoxf8kpURDMDkawiUEmc/fbaYhDVrJMgxeZj6SLVQ4H/Vzor/bZg4xcmkGpUAp5qanuJ+8zGC3i2y+ws+9OjT+MFOamNJkNOTHpQnSm0VQqnmJX39s0zEWZnoyxu1EjHK1xnq+wtxymmxBZyTQy5DXTY/LyV+fQ0Qu2hO8fpfjw1YZn6cLv8/DkM9DJOCj06ER9ns5GRrgU0nn2dt1vlV2QCmEuHrnn0/5xpXTjA8H2a79QimLol7l+WqWol61e0RydtFaeJFu5w/ZlUqMIwCSs4vWwvJKe+apczy8d1P8Bjor/A30KCkYAAAAAElFTkSuQmCC" HREF="http://www.jamendo.com/">Jamendo</A>
+<DT><A HREF="http://www.mageia.org/">Mageia</A>
 </DL><p>
 <DT><H3 >Community</H3>
 <DL><P>
diff --git a/bookmarks/mozilla/mozilla-one.html b/bookmarks/mozilla/mozilla-one.html
index dc5c30e..5899edd 100644
--- a/bookmarks/mozilla/mozilla-one.html
+++ b/bookmarks/mozilla/mozilla-one.html
@@ -3,11 +3,8 @@
 <TITLE>Bookmarks</TITLE>
 <H1>Bookmarks</H1>
 <DL><p>
-<DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="NC:PersonalToolbarFolder">Mandriva</H3>
+<DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="NC:PersonalToolbarFolder">Mageia</H3>
 <DL><p>
-<DT><A ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAANbY1E9YMgAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAP9SURBVHjatFVbbFRVFF33NdPODH2J0wfgNFPE6gehEaUBoQFD/JAQTUPihzHR6BjSaoiREHwkQvzxp6GmUhweqUJCUaKJ8KvpR1MNwWKLrdha2qFYYEpbps/hzp17XGfuVIpKZz7qSU/vvefuu9bZe619RhFCIOvxufoqIE4AyqN40/4jm0/UrMGPKAqSBM9VcQXPfB8Oh1csLYGFHhTzulKDzx7L5d3zS0fwmVIHgcexrQ4wEshL3pYEpUtHYKIJGyuBwibAtwJ5VtTH1Uey+VSncAK2GOAOL3H+BgWnOSewW9xMRTQqnVjO65PnnS8C24Fki7wLZkcgXVRmVGCZWoHbd4EpfIgY3zQoNAyvLs5t9fyXzzkO5GwAcltQJP7MzY4AWIvhRDc25ABVtXwsIHASmJ4ERrsBvxcofg2I97GgBgmfALi0KXZ6NY1UFgqFRhYjUGQfRJuDdX4x2IQttMnqTwBbT8ujOVnYJEzduPlXCAzuAX66DBaSosOGZpyF7v4Gr0+d+U8COWYOF7V5tYkabC8HlodoS4uYJFHU9JWkCjNQuX1XHidLNtMDDLcDN3qZ7XVgjlXT9Slm+iVejtTfRyDHbFP+LY9r0o8drLNrPcUUTiYSGPMEFEXx8FFOkunLuIExYOwgEJ0Cfi/is47w5N49LF+jvjAdT32s2DrkMvWBCwbKCa5JJyqpOkDVHcUFgc1LJKfgVoSvuB4dZiYPU7di9IqqSHv82UEGvyA9qP9LdUO7i6RuYKaLoNe4QF30PCeDJHc4d4Uk0yQn8TRLco2mmA7iV7tqqMPcOpSGOcXdH5930b1xLL8W7hwfymwKywwSdJJ5Jy0wnGx4JEEn8NBDwK0CXLbXDf5obo6kA74gcMs/bbpguM+inOCqJCCQqjka/C2T4lRMpavG/Thn7fz5hlXKtHCCwCcf1AfOaFm5Cx7WOMB4KTwbnBa4t3ubRPZ8sHznRQJu6V9ih/oXazRnaO6vUMEW1hMsDXc+zuMmyvrGfCmN8Rir4J1xMpMEvgTUOSEf4pk6GWitfBdexnq5xYESWo4eFwYumOv7fomvG1krekqq+32VCNAcRTyiFMa5VdJocLoxE4Hq2geLwvUW4Lq1arRttqZv1vYk0jEN1a80nutrfePjNSO+91NwhcxG0+DRTIN1EpkJNNdbF+ee2tc5W3Unvd7GeYi1jc0Hrnnp6AdXv95tBm/mHIDGDDQVqzwThZG4n3VEZHGC2outneFwVPYaQc8/KDi4q/ng1W/fVoLRmo9gmDSZbAaw5dGVUWQC/5DN8Rt88dMDke/ecQdck/stGHYmDbL/TV4wAjsb3gv3P/1cx2hgKPV7l+m4/j/HXwIMAKacWjiFjDFxAAAAAElFTkSuQmCC" HREF="http://www.mandriva.com/">Mandriva</A>
-<DT><A ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAANbY1E9YMgAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAP9SURBVHjatFVbbFRVFF33NdPODH2J0wfgNFPE6gehEaUBoQFD/JAQTUPihzHR6BjSaoiREHwkQvzxp6GmUhweqUJCUaKJ8KvpR1MNwWKLrdha2qFYYEpbps/hzp17XGfuVIpKZz7qSU/vvefuu9bZe619RhFCIOvxufoqIE4AyqN40/4jm0/UrMGPKAqSBM9VcQXPfB8Oh1csLYGFHhTzulKDzx7L5d3zS0fwmVIHgcexrQ4wEshL3pYEpUtHYKIJGyuBwibAtwJ5VtTH1Uey+VSncAK2GOAOL3H+BgWnOSewW9xMRTQqnVjO65PnnS8C24Fki7wLZkcgXVRmVGCZWoHbd4EpfIgY3zQoNAyvLs5t9fyXzzkO5GwAcltQJP7MzY4AWIvhRDc25ABVtXwsIHASmJ4ERrsBvxcofg2I97GgBgmfALi0KXZ6NY1UFgqFRhYjUGQfRJuDdX4x2IQttMnqTwBbT8ujOVnYJEzduPlXCAzuAX66DBaSosOGZpyF7v4Gr0+d+U8COWYOF7V5tYkabC8HlodoS4uYJFHU9JWkCjNQuX1XHidLNtMDDLcDN3qZ7XVgjlXT9Slm+iVejtTfRyDHbFP+LY9r0o8drLNrPcUUTiYSGPMEFEXx8FFOkunLuIExYOwgEJ0Cfi/is47w5N49LF+jvjAdT32s2DrkMvWBCwbKCa5JJyqpOkDVHcUFgc1LJKfgVoSvuB4dZiYPU7di9IqqSHv82UEGvyA9qP9LdUO7i6RuYKaLoNe4QF30PCeDJHc4d4Uk0yQn8TRLco2mmA7iV7tqqMPcOpSGOcXdH5930b1xLL8W7hwfymwKywwSdJJ5Jy0wnGx4JEEn8NBDwK0CXLbXDf5obo6kA74gcMs/bbpguM+inOCqJCCQqjka/C2T4lRMpavG/Thn7fz5hlXKtHCCwCcf1AfOaFm5Cx7WOMB4KTwbnBa4t3ubRPZ8sHznRQJu6V9ih/oXazRnaO6vUMEW1hMsDXc+zuMmyvrGfCmN8Rir4J1xMpMEvgTUOSEf4pk6GWitfBdexnq5xYESWo4eFwYumOv7fomvG1krekqq+32VCNAcRTyiFMa5VdJocLoxE4Hq2geLwvUW4Lq1arRttqZv1vYk0jEN1a80nutrfePjNSO+91NwhcxG0+DRTIN1EpkJNNdbF+ee2tc5W3Unvd7GeYi1jc0Hrnnp6AdXv95tBm/mHIDGDDQVqzwThZG4n3VEZHGC2outneFwVPYaQc8/KDi4q/ng1W/fVoLRmo9gmDSZbAaw5dGVUWQC/5DN8Rt88dMDke/ecQdck/stGHYmDbL/TV4wAjsb3gv3P/1cx2hgKPV7l+m4/j/HXwIMAKacWjiFjDFxAAAAAElFTkSuQmCC" HREF="http://store.mandriva.com/">Mandriva Store</A>
-<DT><A ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAANbY1E9YMgAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAP9SURBVHjatFVbbFRVFF33NdPODH2J0wfgNFPE6gehEaUBoQFD/JAQTUPihzHR6BjSaoiREHwkQvzxp6GmUhweqUJCUaKJ8KvpR1MNwWKLrdha2qFYYEpbps/hzp17XGfuVIpKZz7qSU/vvefuu9bZe619RhFCIOvxufoqIE4AyqN40/4jm0/UrMGPKAqSBM9VcQXPfB8Oh1csLYGFHhTzulKDzx7L5d3zS0fwmVIHgcexrQ4wEshL3pYEpUtHYKIJGyuBwibAtwJ5VtTH1Uey+VSncAK2GOAOL3H+BgWnOSewW9xMRTQqnVjO65PnnS8C24Fki7wLZkcgXVRmVGCZWoHbd4EpfIgY3zQoNAyvLs5t9fyXzzkO5GwAcltQJP7MzY4AWIvhRDc25ABVtXwsIHASmJ4ERrsBvxcofg2I97GgBgmfALi0KXZ6NY1UFgqFRhYjUGQfRJuDdX4x2IQttMnqTwBbT8ujOVnYJEzduPlXCAzuAX66DBaSosOGZpyF7v4Gr0+d+U8COWYOF7V5tYkabC8HlodoS4uYJFHU9JWkCjNQuX1XHidLNtMDDLcDN3qZ7XVgjlXT9Slm+iVejtTfRyDHbFP+LY9r0o8drLNrPcUUTiYSGPMEFEXx8FFOkunLuIExYOwgEJ0Cfi/is47w5N49LF+jvjAdT32s2DrkMvWBCwbKCa5JJyqpOkDVHcUFgc1LJKfgVoSvuB4dZiYPU7di9IqqSHv82UEGvyA9qP9LdUO7i6RuYKaLoNe4QF30PCeDJHc4d4Uk0yQn8TRLco2mmA7iV7tqqMPcOpSGOcXdH5930b1xLL8W7hwfymwKywwSdJJ5Jy0wnGx4JEEn8NBDwK0CXLbXDf5obo6kA74gcMs/bbpguM+inOCqJCCQqjka/C2T4lRMpavG/Thn7fz5hlXKtHCCwCcf1AfOaFm5Cx7WOMB4KTwbnBa4t3ubRPZ8sHznRQJu6V9ih/oXazRnaO6vUMEW1hMsDXc+zuMmyvrGfCmN8Rir4J1xMpMEvgTUOSEf4pk6GWitfBdexnq5xYESWo4eFwYumOv7fomvG1krekqq+32VCNAcRTyiFMa5VdJocLoxE4Hq2geLwvUW4Lq1arRttqZv1vYk0jEN1a80nutrfePjNSO+91NwhcxG0+DRTIN1EpkJNNdbF+ee2tc5W3Unvd7GeYi1jc0Hrnnp6AdXv95tBm/mHIDGDDQVqzwThZG4n3VEZHGC2outneFwVPYaQc8/KDi4q/ng1W/fVoLRmo9gmDSZbAaw5dGVUWQC/5DN8Rt88dMDke/ecQdck/stGHYmDbL/TV4wAjsb3gv3P/1cx2hgKPV7l+m4/j/HXwIMAKacWjiFjDFxAAAAAElFTkSuQmCC" HREF="http://expert.mandriva.com/">Mandriva Expert</A>
-<DT><A ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAANbY1E9YMgAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAP9SURBVHjatFVbbFRVFF33NdPODH2J0wfgNFPE6gehEaUBoQFD/JAQTUPihzHR6BjSaoiREHwkQvzxp6GmUhweqUJCUaKJ8KvpR1MNwWKLrdha2qFYYEpbps/hzp17XGfuVIpKZz7qSU/vvefuu9bZe619RhFCIOvxufoqIE4AyqN40/4jm0/UrMGPKAqSBM9VcQXPfB8Oh1csLYGFHhTzulKDzx7L5d3zS0fwmVIHgcexrQ4wEshL3pYEpUtHYKIJGyuBwibAtwJ5VtTH1Uey+VSncAK2GOAOL3H+BgWnOSewW9xMRTQqnVjO65PnnS8C24Fki7wLZkcgXVRmVGCZWoHbd4EpfIgY3zQoNAyvLs5t9fyXzzkO5GwAcltQJP7MzY4AWIvhRDc25ABVtXwsIHASmJ4ERrsBvxcofg2I97GgBgmfALi0KXZ6NY1UFgqFRhYjUGQfRJuDdX4x2IQttMnqTwBbT8ujOVnYJEzduPlXCAzuAX66DBaSosOGZpyF7v4Gr0+d+U8COWYOF7V5tYkabC8HlodoS4uYJFHU9JWkCjNQuX1XHidLNtMDDLcDN3qZ7XVgjlXT9Slm+iVejtTfRyDHbFP+LY9r0o8drLNrPcUUTiYSGPMEFEXx8FFOkunLuIExYOwgEJ0Cfi/is47w5N49LF+jvjAdT32s2DrkMvWBCwbKCa5JJyqpOkDVHcUFgc1LJKfgVoSvuB4dZiYPU7di9IqqSHv82UEGvyA9qP9LdUO7i6RuYKaLoNe4QF30PCeDJHc4d4Uk0yQn8TRLco2mmA7iV7tqqMPcOpSGOcXdH5930b1xLL8W7hwfymwKywwSdJJ5Jy0wnGx4JEEn8NBDwK0CXLbXDf5obo6kA74gcMs/bbpguM+inOCqJCCQqjka/C2T4lRMpavG/Thn7fz5hlXKtHCCwCcf1AfOaFm5Cx7WOMB4KTwbnBa4t3ubRPZ8sHznRQJu6V9ih/oXazRnaO6vUMEW1hMsDXc+zuMmyvrGfCmN8Rir4J1xMpMEvgTUOSEf4pk6GWitfBdexnq5xYESWo4eFwYumOv7fomvG1krekqq+32VCNAcRTyiFMa5VdJocLoxE4Hq2geLwvUW4Lq1arRttqZv1vYk0jEN1a80nutrfePjNSO+91NwhcxG0+DRTIN1EpkJNNdbF+ee2tc5W3Unvd7GeYi1jc0Hrnnp6AdXv95tBm/mHIDGDDQVqzwThZG4n3VEZHGC2outneFwVPYaQc8/KDi4q/ng1W/fVoLRmo9gmDSZbAaw5dGVUWQC/5DN8Rt88dMDke/ecQdck/stGHYmDbL/TV4wAjsb3gv3P/1cx2hgKPV7l+m4/j/HXwIMAKacWjiFjDFxAAAAAElFTkSuQmCC" HREF="http://www.mandriva.com/community/">Community</A>
+<DT><A HREF="http://www.mageia.org/">Mageia</A>
 <DT><A ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/gD+AP7rGNSCAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB5klEQVQ4y5WTTWtTQRSGn7lJG5vGpulHUoiGhNgulBZNjShu/KApXboRRAgBF/YX6MJNoUv/QsVCu1IobhQqgiCCSEtK0EVNq0abDzW50KamsXdu5rqwXshC0xx4V8953zlzmBEAqaW0Nb+2RTt1KxbiwbUzQqSW0tb8aq4tsx0SjyC4+9hq1agJQWI4QCzYi1PTqO5L8jt1spVdnJhmy5OS8Qhnj/VhNBQ1wyTg7iTs7WIiOni4gOtjx3mTK/No7Qt12aDnSAdBr5tIvwcnUrYMqO7tU9B3yRZ1rIMLvz9ghwp4mslxIRpgszTAq41S836QklZ6srKBYUjioT6OOmhiDnFqYkYoxf8kpURDMDkawiUEmc/fbaYhDVrJMgxeZj6SLVQ4H/Vzor/bZg4xcmkGpUAp5qanuJ+8zGC3i2y+ws+9OjT+MFOamNJkNOTHpQnSm0VQqnmJX39s0zEWZnoyxu1EjHK1xnq+wtxymmxBZyTQy5DXTY/LyV+fQ0Qu2hO8fpfjw1YZn6cLv8/DkM9DJOCj06ER9ns5GRrgU0nn2dt1vlV2QCmEuHrnn0/5xpXTjA8H2a79QimLol7l+WqWol61e0RydtFaeJFu5w/ZlUqMIwCSs4vWwvJKe+apczy8d1P8Bjor/A30KCkYAAAAAElFTkSuQmCC" HREF="http://www.jamendo.com/">Jamendo</A>
 </DL><P>
diff --git a/bookmarks/mozilla/mozilla-powerpack.html b/bookmarks/mozilla/mozilla-powerpack.html
deleted file mode 100644
index 96d1bf6..0000000
--- a/bookmarks/mozilla/mozilla-powerpack.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!DOCTYPE NETSCAPE-Bookmark-file-1>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<TITLE>Bookmarks</TITLE>
-<H1>Bookmarks</H1>
-<DL><p>
-<DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="NC:PersonalToolbarFolder">Mandriva</H3>
-<DL><p>
-<DT><A ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAANbY1E9YMgAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAP9SURBVHjatFVbbFRVFF33NdPODH2J0wfgNFPE6gehEaUBoQFD/JAQTUPihzHR6BjSaoiREHwkQvzxp6GmUhweqUJCUaKJ8KvpR1MNwWKLrdha2qFYYEpbps/hzp17XGfuVIpKZz7qSU/vvefuu9bZe619RhFCIOvxufoqIE4AyqN40/4jm0/UrMGPKAqSBM9VcQXPfB8Oh1csLYGFHhTzulKDzx7L5d3zS0fwmVIHgcexrQ4wEshL3pYEpUtHYKIJGyuBwibAtwJ5VtTH1Uey+VSncAK2GOAOL3H+BgWnOSewW9xMRTQqnVjO65PnnS8C24Fki7wLZkcgXVRmVGCZWoHbd4EpfIgY3zQoNAyvLs5t9fyXzzkO5GwAcltQJP7MzY4AWIvhRDc25ABVtXwsIHASmJ4ERrsBvxcofg2I97GgBgmfALi0KXZ6NY1UFgqFRhYjUGQfRJuDdX4x2IQttMnqTwBbT8ujOVnYJEzduPlXCAzuAX66DBaSosOGZpyF7v4Gr0+d+U8COWYOF7V5tYkabC8HlodoS4uYJFHU9JWkCjNQuX1XHidLNtMDDLcDN3qZ7XVgjlXT9Slm+iVejtTfRyDHbFP+LY9r0o8drLNrPcUUTiYSGPMEFEXx8FFOkunLuIExYOwgEJ0Cfi/is47w5N49LF+jvjAdT32s2DrkMvWBCwbKCa5JJyqpOkDVHcUFgc1LJKfgVoSvuB4dZiYPU7di9IqqSHv82UEGvyA9qP9LdUO7i6RuYKaLoNe4QF30PCeDJHc4d4Uk0yQn8TRLco2mmA7iV7tqqMPcOpSGOcXdH5930b1xLL8W7hwfymwKywwSdJJ5Jy0wnGx4JEEn8NBDwK0CXLbXDf5obo6kA74gcMs/bbpguM+inOCqJCCQqjka/C2T4lRMpavG/Thn7fz5hlXKtHCCwCcf1AfOaFm5Cx7WOMB4KTwbnBa4t3ubRPZ8sHznRQJu6V9ih/oXazRnaO6vUMEW1hMsDXc+zuMmyvrGfCmN8Rir4J1xMpMEvgTUOSEf4pk6GWitfBdexnq5xYESWo4eFwYumOv7fomvG1krekqq+32VCNAcRTyiFMa5VdJocLoxE4Hq2geLwvUW4Lq1arRttqZv1vYk0jEN1a80nutrfePjNSO+91NwhcxG0+DRTIN1EpkJNNdbF+ee2tc5W3Unvd7GeYi1jc0Hrnnp6AdXv95tBm/mHIDGDDQVqzwThZG4n3VEZHGC2outneFwVPYaQc8/KDi4q/ng1W/fVoLRmo9gmDSZbAaw5dGVUWQC/5DN8Rt88dMDke/ecQdck/stGHYmDbL/TV4wAjsb3gv3P/1cx2hgKPV7l+m4/j/HXwIMAKacWjiFjDFxAAAAAElFTkSuQmCC" HREF="http://www.mandriva.com/">Mandriva</A>
-<DT><A ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAANbY1E9YMgAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAP9SURBVHjatFVbbFRVFF33NdPODH2J0wfgNFPE6gehEaUBoQFD/JAQTUPihzHR6BjSaoiREHwkQvzxp6GmUhweqUJCUaKJ8KvpR1MNwWKLrdha2qFYYEpbps/hzp17XGfuVIpKZz7qSU/vvefuu9bZe619RhFCIOvxufoqIE4AyqN40/4jm0/UrMGPKAqSBM9VcQXPfB8Oh1csLYGFHhTzulKDzx7L5d3zS0fwmVIHgcexrQ4wEshL3pYEpUtHYKIJGyuBwibAtwJ5VtTH1Uey+VSncAK2GOAOL3H+BgWnOSewW9xMRTQqnVjO65PnnS8C24Fki7wLZkcgXVRmVGCZWoHbd4EpfIgY3zQoNAyvLs5t9fyXzzkO5GwAcltQJP7MzY4AWIvhRDc25ABVtXwsIHASmJ4ERrsBvxcofg2I97GgBgmfALi0KXZ6NY1UFgqFRhYjUGQfRJuDdX4x2IQttMnqTwBbT8ujOVnYJEzduPlXCAzuAX66DBaSosOGZpyF7v4Gr0+d+U8COWYOF7V5tYkabC8HlodoS4uYJFHU9JWkCjNQuX1XHidLNtMDDLcDN3qZ7XVgjlXT9Slm+iVejtTfRyDHbFP+LY9r0o8drLNrPcUUTiYSGPMEFEXx8FFOkunLuIExYOwgEJ0Cfi/is47w5N49LF+jvjAdT32s2DrkMvWBCwbKCa5JJyqpOkDVHcUFgc1LJKfgVoSvuB4dZiYPU7di9IqqSHv82UEGvyA9qP9LdUO7i6RuYKaLoNe4QF30PCeDJHc4d4Uk0yQn8TRLco2mmA7iV7tqqMPcOpSGOcXdH5930b1xLL8W7hwfymwKywwSdJJ5Jy0wnGx4JEEn8NBDwK0CXLbXDf5obo6kA74gcMs/bbpguM+inOCqJCCQqjka/C2T4lRMpavG/Thn7fz5hlXKtHCCwCcf1AfOaFm5Cx7WOMB4KTwbnBa4t3ubRPZ8sHznRQJu6V9ih/oXazRnaO6vUMEW1hMsDXc+zuMmyvrGfCmN8Rir4J1xMpMEvgTUOSEf4pk6GWitfBdexnq5xYESWo4eFwYumOv7fomvG1krekqq+32VCNAcRTyiFMa5VdJocLoxE4Hq2geLwvUW4Lq1arRttqZv1vYk0jEN1a80nutrfePjNSO+91NwhcxG0+DRTIN1EpkJNNdbF+ee2tc5W3Unvd7GeYi1jc0Hrnnp6AdXv95tBm/mHIDGDDQVqzwThZG4n3VEZHGC2outneFwVPYaQc8/KDi4q/ng1W/fVoLRmo9gmDSZbAaw5dGVUWQC/5DN8Rt88dMDke/ecQdck/stGHYmDbL/TV4wAjsb3gv3P/1cx2hgKPV7l+m4/j/HXwIMAKacWjiFjDFxAAAAAElFTkSuQmCC" HREF="http://store.mandriva.com/">Mandriva Store</A>
-<DT><A ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAANbY1E9YMgAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAP9SURBVHjatFVbbFRVFF33NdPODH2J0wfgNFPE6gehEaUBoQFD/JAQTUPihzHR6BjSaoiREHwkQvzxp6GmUhweqUJCUaKJ8KvpR1MNwWKLrdha2qFYYEpbps/hzp17XGfuVIpKZz7qSU/vvefuu9bZe619RhFCIOvxufoqIE4AyqN40/4jm0/UrMGPKAqSBM9VcQXPfB8Oh1csLYGFHhTzulKDzx7L5d3zS0fwmVIHgcexrQ4wEshL3pYEpUtHYKIJGyuBwibAtwJ5VtTH1Uey+VSncAK2GOAOL3H+BgWnOSewW9xMRTQqnVjO65PnnS8C24Fki7wLZkcgXVRmVGCZWoHbd4EpfIgY3zQoNAyvLs5t9fyXzzkO5GwAcltQJP7MzY4AWIvhRDc25ABVtXwsIHASmJ4ERrsBvxcofg2I97GgBgmfALi0KXZ6NY1UFgqFRhYjUGQfRJuDdX4x2IQttMnqTwBbT8ujOVnYJEzduPlXCAzuAX66DBaSosOGZpyF7v4Gr0+d+U8COWYOF7V5tYkabC8HlodoS4uYJFHU9JWkCjNQuX1XHidLNtMDDLcDN3qZ7XVgjlXT9Slm+iVejtTfRyDHbFP+LY9r0o8drLNrPcUUTiYSGPMEFEXx8FFOkunLuIExYOwgEJ0Cfi/is47w5N49LF+jvjAdT32s2DrkMvWBCwbKCa5JJyqpOkDVHcUFgc1LJKfgVoSvuB4dZiYPU7di9IqqSHv82UEGvyA9qP9LdUO7i6RuYKaLoNe4QF30PCeDJHc4d4Uk0yQn8TRLco2mmA7iV7tqqMPcOpSGOcXdH5930b1xLL8W7hwfymwKywwSdJJ5Jy0wnGx4JEEn8NBDwK0CXLbXDf5obo6kA74gcMs/bbpguM+inOCqJCCQqjka/C2T4lRMpavG/Thn7fz5hlXKtHCCwCcf1AfOaFm5Cx7WOMB4KTwbnBa4t3ubRPZ8sHznRQJu6V9ih/oXazRnaO6vUMEW1hMsDXc+zuMmyvrGfCmN8Rir4J1xMpMEvgTUOSEf4pk6GWitfBdexnq5xYESWo4eFwYumOv7fomvG1krekqq+32VCNAcRTyiFMa5VdJocLoxE4Hq2geLwvUW4Lq1arRttqZv1vYk0jEN1a80nutrfePjNSO+91NwhcxG0+DRTIN1EpkJNNdbF+ee2tc5W3Unvd7GeYi1jc0Hrnnp6AdXv95tBm/mHIDGDDQVqzwThZG4n3VEZHGC2outneFwVPYaQc8/KDi4q/ng1W/fVoLRmo9gmDSZbAaw5dGVUWQC/5DN8Rt88dMDke/ecQdck/stGHYmDbL/TV4wAjsb3gv3P/1cx2hgKPV7l+m4/j/HXwIMAKacWjiFjDFxAAAAAElFTkSuQmCC" HREF="http://expert.mandriva.com/">Mandriva Expert</A>
-<DT><A ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAANbY1E9YMgAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAP9SURBVHjatFVbbFRVFF33NdPODH2J0wfgNFPE6gehEaUBoQFD/JAQTUPihzHR6BjSaoiREHwkQvzxp6GmUhweqUJCUaKJ8KvpR1MNwWKLrdha2qFYYEpbps/hzp17XGfuVIpKZz7qSU/vvefuu9bZe619RhFCIOvxufoqIE4AyqN40/4jm0/UrMGPKAqSBM9VcQXPfB8Oh1csLYGFHhTzulKDzx7L5d3zS0fwmVIHgcexrQ4wEshL3pYEpUtHYKIJGyuBwibAtwJ5VtTH1Uey+VSncAK2GOAOL3H+BgWnOSewW9xMRTQqnVjO65PnnS8C24Fki7wLZkcgXVRmVGCZWoHbd4EpfIgY3zQoNAyvLs5t9fyXzzkO5GwAcltQJP7MzY4AWIvhRDc25ABVtXwsIHASmJ4ERrsBvxcofg2I97GgBgmfALi0KXZ6NY1UFgqFRhYjUGQfRJuDdX4x2IQttMnqTwBbT8ujOVnYJEzduPlXCAzuAX66DBaSosOGZpyF7v4Gr0+d+U8COWYOF7V5tYkabC8HlodoS4uYJFHU9JWkCjNQuX1XHidLNtMDDLcDN3qZ7XVgjlXT9Slm+iVejtTfRyDHbFP+LY9r0o8drLNrPcUUTiYSGPMEFEXx8FFOkunLuIExYOwgEJ0Cfi/is47w5N49LF+jvjAdT32s2DrkMvWBCwbKCa5JJyqpOkDVHcUFgc1LJKfgVoSvuB4dZiYPU7di9IqqSHv82UEGvyA9qP9LdUO7i6RuYKaLoNe4QF30PCeDJHc4d4Uk0yQn8TRLco2mmA7iV7tqqMPcOpSGOcXdH5930b1xLL8W7hwfymwKywwSdJJ5Jy0wnGx4JEEn8NBDwK0CXLbXDf5obo6kA74gcMs/bbpguM+inOCqJCCQqjka/C2T4lRMpavG/Thn7fz5hlXKtHCCwCcf1AfOaFm5Cx7WOMB4KTwbnBa4t3ubRPZ8sHznRQJu6V9ih/oXazRnaO6vUMEW1hMsDXc+zuMmyvrGfCmN8Rir4J1xMpMEvgTUOSEf4pk6GWitfBdexnq5xYESWo4eFwYumOv7fomvG1krekqq+32VCNAcRTyiFMa5VdJocLoxE4Hq2geLwvUW4Lq1arRttqZv1vYk0jEN1a80nutrfePjNSO+91NwhcxG0+DRTIN1EpkJNNdbF+ee2tc5W3Unvd7GeYi1jc0Hrnnp6AdXv95tBm/mHIDGDDQVqzwThZG4n3VEZHGC2outneFwVPYaQc8/KDi4q/ng1W/fVoLRmo9gmDSZbAaw5dGVUWQC/5DN8Rt88dMDke/ecQdck/stGHYmDbL/TV4wAjsb3gv3P/1cx2hgKPV7l+m4/j/HXwIMAKacWjiFjDFxAAAAAElFTkSuQmCC" HREF="http://www.mandriva.com/community/">Community</A>
-<DT><A ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/gD+AP7rGNSCAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB5klEQVQ4y5WTTWtTQRSGn7lJG5vGpulHUoiGhNgulBZNjShu/KApXboRRAgBF/YX6MJNoUv/QsVCu1IobhQqgiCCSEtK0EVNq0abDzW50KamsXdu5rqwXshC0xx4V8953zlzmBEAqaW0Nb+2RTt1KxbiwbUzQqSW0tb8aq4tsx0SjyC4+9hq1agJQWI4QCzYi1PTqO5L8jt1spVdnJhmy5OS8Qhnj/VhNBQ1wyTg7iTs7WIiOni4gOtjx3mTK/No7Qt12aDnSAdBr5tIvwcnUrYMqO7tU9B3yRZ1rIMLvz9ghwp4mslxIRpgszTAq41S836QklZ6srKBYUjioT6OOmhiDnFqYkYoxf8kpURDMDkawiUEmc/fbaYhDVrJMgxeZj6SLVQ4H/Vzor/bZg4xcmkGpUAp5qanuJ+8zGC3i2y+ws+9OjT+MFOamNJkNOTHpQnSm0VQqnmJX39s0zEWZnoyxu1EjHK1xnq+wtxymmxBZyTQy5DXTY/LyV+fQ0Qu2hO8fpfjw1YZn6cLv8/DkM9DJOCj06ER9ns5GRrgU0nn2dt1vlV2QCmEuHrnn0/5xpXTjA8H2a79QimLol7l+WqWol61e0RydtFaeJFu5w/ZlUqMIwCSs4vWwvJKe+apczy8d1P8Bjor/A30KCkYAAAAAElFTkSuQmCC" HREF="http://www.jamendo.com/">Jamendo</A>
-<DT><H3>Partners</H3>
-<DT><A HREF="http://www.transgaming.com/products/cedega/">Cedega</A>
-<DT><A HREF="http://www.fluendo.com/">Fluendo</A>
-<DT><A HREF="http://picasa.google.com/linux/">Picasa</A>
-<DT><A HREF="http://earth.google.com/">Google Earth</A>
-</DL><P>
-</DL><p>
-<DT><H3 >Community</H3>
-<DL><P>
-<DT><A HREF="http://www.gnu.org/software/software.html">Free Software Foundation</A>
-<DT><A HREF="http://www.gnu.org/">The GNU Project</A>
-<HR>
-<DT><A HREF="http://freshmeat.net/">Freshmeat</A>
-<DT><A HREF="http://www.gnome.org/">GNOME</A>
-<DT><A HREF="http://www.kde.org/">KDE</A>
-<DT><A HREF="http://www.linux.org/">Linux.org</A>
-<DT><A HREF="http://www.linuxfoundation.org/">Linux Foundation</A>
-<DT><A HREF="http://www.linuxgames.com/">Linux Games</A>
-<DT><A HREF="http://www.linuxhq.com/">Linux HeadQuarters</A>
-<DT><A HREF="http://www.kernel.org/">Linux Kernel Archives</A>
-<DT><A HREF="http://www.x.org/">X.org</A>
-</DL><P>
-<DT><H3 >News</H3>
-<DL><P>
-<DT><A HREF="http://alllinuxdevices.com/">All Linux Devices</A>
-<DT><A HREF="http://www.linux.com/">Linux.com</A>
-<DT><A HREF="http://www.linuxplanet.com/">Linux Planet</A>
-<DT><A HREF="http://linuxtoday.com/">Linux Today</A>
-<DT><A HREF="http://www.lwn.net/">Linux Weekly News</A>
-<DT><A HREF="http://slashdot.org/">Slashdot</A>
-</DL><P>
-<DT><H3 >Programming</H3>
-<DL><P>
-<DT><A HREF="http://wiki.mandriva.com/en/Development">Mandriva Cooker</A>
-<DT><A HREF="http://wiki.mandriva.com/">Mandriva Wiki</A>
-<HR>
-<DT><A HREF="http://gcc.gnu.org/">GCC</A>
-<DT><A HREF="http://www.gtk.org/">GTK+</A>
-<DT><A HREF="http://techbase.kde.org/">KDE TechBase</A>
-<DT><A HREF="http://www.opensource.org/">OpenSource.org</A>
-<DT><A HREF="http://www.perl.org/">Perl.org</A>
-<DT><A HREF="http://www.python.org/">Python.org</A>
-<DT><A HREF="http://www.qtsoftware.com/products/">Qt Software</A>
-<DT><A HREF="http://www.rpm.org/">RPM.org</A>
-<DT><A HREF="http://sourceforge.net/">SourceForge</A>
-</DL><P>
-</DL><P>