patches and icons

daniele favara danjele at gmail.com
Thu May 25 07:47:02 CEST 2006


hi all,

here some patches to complete the support for icon-naming spec in xfce

1) libxfce4gui_legacy_office_icons.diff: patch to add XFCE_ICON_CATEGORY_OFFICE
2) xfdesktop4_office_icon.diff: patch to use xfce-office instead of
xfce-schedule in the menu
3) xfce4-mixer_sound_icon.diff: patch to use xfce4-sound in xfce-mcs-manager
4) legacy-icon-mapping.xml: file that will be in upstreamer CVS
(icon-namig-utils)

in Rodent it may be needed to link or copy:

 xfce-schedule --> xfce-office


screenshot: http://www.dsslive.org/xfce/xfce-setting-show.png
tango-icon-theme: http://www.dsslive.org/xfce/Tango-xfce.tar.gz

TODO:

 - xfce4-panel in xfce-mcs-manager is hardcoded (?)
 - tango style icon for preferences-desktop-default-applications (
Benny are u fine with it ? )


what do you think?


    -

-- 
----
http://dsslive.org
----
-------------- next part --------------
diff -Nru libxfcegui4-4.3.90.2svn+r21598.orig/libxfcegui4/icons.c libxfcegui4-4.3.90.2svn+r21598/libxfcegui4/icons.c
--- libxfcegui4-4.3.90.2svn+r21598.orig/libxfcegui4/icons.c	2006-05-24 14:46:23.000000000 +0000
+++ libxfcegui4-4.3.90.2svn+r21598/libxfcegui4/icons.c	2006-05-24 14:46:47.000000000 +0000
@@ -44,21 +44,22 @@
 static const gchar *builtin_icon_categories[][XFCE_N_BUILTIN_ICON_CATEGORIES] =
 {
 	{ "xfce-unknown", "gnome-fs-executable", "exec", "emblem-generic", NULL, NULL },
-	{ "xfce-edit", "gedit-icon", "edit", NULL, NULL, NULL },
+	{ "xfce-edit", "accessories-text-editor", "gedit-icon", "edit", NULL, NULL },
 	{ "xfce-filemanager", "file-manager", "folder", NULL, NULL, NULL },
-	{ "xfce-utils", "gnome-util", "utilities", NULL, NULL, NULL },
-	{ "xfce-games", "gnome-joystick", "games", "emblem-fun", NULL, NULL },
-	{ "xfce-man", "gnome-help", "help", NULL, NULL, NULL },
-	{ "xfce-multimedia", "gnome-multimedia", "multimedia", "emblem-multimedia", NULL, NULL },
-	{ "xfce-internet", "gnome-globe", "gnome-fs-network", "web-browser", "emblem-web", NULL },
-	{ "xfce-graphics", "gnome-graphics", "graphics", NULL, NULL, NULL },
-	{ "xfce-printer", "gnome-dev-printer", "printer", NULL, NULL, NULL },
+	{ "xfce-utils", "applications-accessories", "gnome-util", "utilities", NULL, NULL },
+	{ "xfce-games", "applications-games", "gnome-joystick", "games", "emblem-fun", NULL },
+	{ "xfce-man", "help-browser", "gnome-help", "help", NULL, NULL },
+	{ "xfce-multimedia", "applications-multimedia", "gnome-multimedia", "multimedia", "emblem-multimedia", NULL, NULL },
+	{ "xfce-internet", "applications-internet", "gnome-globe", "gnome-fs-network", "web-browser", "emblem-web" },
+	{ "xfce-graphics", "applications-graphics", "gnome-graphics", "graphics", NULL, NULL },
+	{ "xfce-printer", "printer", "gnome-dev-printer", NULL, NULL },
 	{ "xfce-schedule", "gnome-month", "productivity", "emblem-documents", NULL, NULL },
-	{ "xfce-sound", "gnome-audio", "sound", NULL, NULL, NULL },
-	{ "xfce-terminal", "gnome-terminal", "terminal", NULL, NULL, NULL },
-	{ "xfce-devel", "gnome-devel", NULL, NULL, NULL },
-	{ "xfce-settings", "gnome-settings", NULL, NULL, NULL },
-	{ "xfce-system", "gnome-system", NULL, NULL, NULL },
+	{ "xfce-office", "applications-office", "gnome-applications", NULL, NULL, NULL, NULL },
+	{ "xfce-sound", "preferences-desktop-sound", "gnome-audio", "sound", NULL, NULL },
+	{ "xfce-terminal", "utilities-terminal", "gnome-terminal", "terminal", NULL, NULL },
+	{ "xfce-devel", "applications-development", "gnome-devel", NULL, NULL },
+	{ "xfce-settings", "preferences-desktop", "gnome-settings", NULL, NULL },
+	{ "xfce-system", "applications-system", "gnome-system", NULL, NULL },
 	{ "xfce-wine", "wine", NULL, NULL, NULL }
 };
 
diff -Nru libxfcegui4-4.3.90.2svn+r21598.orig/libxfcegui4/icons.h libxfcegui4-4.3.90.2svn+r21598/libxfcegui4/icons.h
--- libxfcegui4-4.3.90.2svn+r21598.orig/libxfcegui4/icons.h	2006-05-24 14:46:23.000000000 +0000
+++ libxfcegui4-4.3.90.2svn+r21598/libxfcegui4/icons.h	2006-05-24 14:46:47.000000000 +0000
@@ -37,6 +37,7 @@
     XFCE_ICON_CATEGORY_GRAPHICS,
     XFCE_ICON_CATEGORY_PRINTER,
     XFCE_ICON_CATEGORY_PRODUCTIVITY,
+    XFCE_ICON_CATEGORY_OFFICE,
     XFCE_ICON_CATEGORY_SOUND,
     XFCE_ICON_CATEGORY_TERMINAL,
     XFCE_ICON_CATEGORY_DEVELOPMENT,










-------------- next part --------------
diff -Nru xfdesktop4-4.3.90.1svn+r21789/modules/menu/desktop-menuspec.c xfdesktop4-4.3.90.1svn+r21789.new/modules/menu/desktop-menuspec.c
--- xfdesktop4-4.3.90.1svn+r21789/modules/menu/desktop-menuspec.c	2006-03-03 12:14:33.000000000 +0100
+++ xfdesktop4-4.3.90.1svn+r21789.new/modules/menu/desktop-menuspec.c	2006-05-24 17:01:10.000000000 +0200
@@ -120,6 +120,10 @@
     else if(!strcmp(name, "PRODUCTIVITY"))
         return xfce_themed_icon_lookup_category(XFCE_ICON_CATEGORY_PRODUCTIVITY,
                                                 _xfce_desktop_menu_icon_size);
+    else if(!strcmp(name, "OFFICE"))
+        return xfce_themed_icon_lookup_category(XFCE_ICON_CATEGORY_OFFICE,
+                                                _xfce_desktop_menu_icon_size);
+
     else if(!strcmp(name, "SOUND"))
         return xfce_themed_icon_lookup_category(XFCE_ICON_CATEGORY_SOUND,
                                                 _xfce_desktop_menu_icon_size);
diff -Nru xfdesktop4-4.3.90.1svn+r21789/modules/menu/xfce-registered-categories.xml xfdesktop4-4.3.90.1svn+r21789.new/modules/menu/xfce-registered-categories.xml
--- xfdesktop4-4.3.90.1svn+r21789/modules/menu/xfce-registered-categories.xml	2006-02-23 09:43:47.000000000 +0100
+++ xfdesktop4-4.3.90.1svn+r21789.new/modules/menu/xfce-registered-categories.xml	2006-05-24 17:02:31.000000000 +0200
@@ -57,7 +57,7 @@
 	<category name="Profiling" builtin-icon="DEVELOPMENT" />
 	<category name="RevisionControl" replace="Revision Control" builtin-icon="DEVELOPMENT" />
 	<category name="Translation" builtin-icon="DEVELOPMENT" />
-	<category name="Office" toplevel="true" builtin-icon="PRODUCTIVITY">
+	<category name="Office" toplevel="true" builtin-icon="OFFICE">
 		<subcategory name="Calendar" />
 		<subcategory name="ContactManagement" />
 		<subcategory name="Database" />
@@ -74,19 +74,19 @@
 		<subcategory name="Photograph" />
 		<subcategory name="Viewer" />
 	</category>
-	<category name="Calendar" builtin-icon="PRODUCTIVITY" />
-	<category name="ContactManagement" replace="Contact Management" builtin-icon="PRODUCTIVITY" />
-	<category name="Database" builtin-icon="PRODUCTIVITY" />
-	<category name="Dictionary" builtin-icon="PRODUCTIVITY" />
-	<category name="Chart" builtin-icon="PRODUCTIVITY" />
-	<category name="Email" builtin-icon="PRODUCTIVITY" />
-	<category name="Finance" builtin-icon="PRODUCTIVITY" />
-	<category name="FlowChart" replace="Flow Chart" builtin-icon="PRODUCTIVITY" />
-	<category name="PDA" builtin-icon="PRODUCTIVITY" />
-	<category name="ProjectManagement" replace="Project Management" builtin-icon="PRODUCTIVITY" />
-	<category name="Presentation" builtin-icon="PRODUCTIVITY" />
-	<category name="Spreadsheet" builtin-icon="PRODUCTIVITY" />
-	<category name="WordProcessor" replace="Word Processing" builtin-icon="PRODUCTIVITY" />
+	<category name="Calendar" builtin-icon="OFFICE" />
+	<category name="ContactManagement" replace="Contact Management" builtin-icon="OFFICE" />
+	<category name="Database" builtin-icon="OFFICE" />
+	<category name="Dictionary" builtin-icon="OFFICE" />
+	<category name="Chart" builtin-icon="OFFICE" />
+	<category name="Email" builtin-icon="OFFICE" />
+	<category name="Finance" builtin-icon="OFFICE" />
+	<category name="FlowChart" replace="Flow Chart" builtin-icon="OFFICE" />
+	<category name="PDA" builtin-icon="OFFICE" />
+	<category name="ProjectManagement" replace="Project Management" builtin-icon="OFFICE" />
+	<category name="Presentation" builtin-icon="OFFICE" />
+	<category name="Spreadsheet" builtin-icon="OFFICE" />
+	<category name="WordProcessor" replace="Word Processing" builtin-icon="OFFICE" />
 	<category name="Graphics" toplevel="true" builtin-icon="GRAPHICS">
 		<subcategory name="2DGraphics" />
 		<subcategory name="3DGraphics" />
diff -Nru xfdesktop4-4.3.90.1svn+r21789/modules/menu/xfce-registered-categories.xml.cs xfdesktop4-4.3.90.1svn+r21789.new/modules/menu/xfce-registered-categories.xml.cs
--- xfdesktop4-4.3.90.1svn+r21789/modules/menu/xfce-registered-categories.xml.cs	2006-02-23 09:43:47.000000000 +0100
+++ xfdesktop4-4.3.90.1svn+r21789.new/modules/menu/xfce-registered-categories.xml.cs	2006-05-24 17:02:31.000000000 +0200
@@ -57,7 +57,7 @@
 	<category name="Profiling" builtin-icon="DEVELOPMENT" />
 	<category name="RevisionControl" replace="Revizní Kontrola" builtin-icon="DEVELOPMENT" />
 	<category name="Translation" replace="Překlad" builtin-icon="DEVELOPMENT" />
-	<category name="Office" toplevel="true" replace="Kancelář" builtin-icon="PRODUCTIVITY">
+	<category name="Office" toplevel="true" replace="Kancelář" builtin-icon="OFFICE">
 		<subcategory name="Calendar" />
 		<subcategory name="ContactManagement" />
 		<subcategory name="Database" />
@@ -74,19 +74,19 @@
 		<subcategory name="Photograph" />
 		<subcategory name="Viewer" />
 	</category>
-	<category name="Calendar" replace="Kalendář" builtin-icon="PRODUCTIVITY" />
-	<category name="ContactManagement" replace="Správce adres" builtin-icon="PRODUCTIVITY" />
-	<category name="Database" replace="Databáze" builtin-icon="PRODUCTIVITY" />
-	<category name="Dictionary" replace="Slovníky" builtin-icon="PRODUCTIVITY" />
-	<category name="Chart" builtin-icon="PRODUCTIVITY" />
-	<category name="Email" replace="Pošta" builtin-icon="PRODUCTIVITY" />
-	<category name="Finance" replace="Finance" builtin-icon="PRODUCTIVITY" />
-	<category name="FlowChart" replace="Flow Chart" builtin-icon="PRODUCTIVITY" />
-	<category name="PDA" builtin-icon="PRODUCTIVITY" />
-	<category name="ProjectManagement" replace="Správa projektů" builtin-icon="PRODUCTIVITY" />
-	<category name="Presentation" replace="Prezentace" builtin-icon="PRODUCTIVITY" />
-	<category name="Spreadsheet" replace="Tabulkové procesory" builtin-icon="PRODUCTIVITY" />
-	<category name="WordProcessor" replace="Textové procesory" builtin-icon="PRODUCTIVITY" />
+	<category name="Calendar" replace="Kalendář" builtin-icon="OFFICE" />
+	<category name="ContactManagement" replace="Správce adres" builtin-icon="OFFICE" />
+	<category name="Database" replace="Databáze" builtin-icon="OFFICE" />
+	<category name="Dictionary" replace="Slovníky" builtin-icon="OFFICE" />
+	<category name="Chart" builtin-icon="OFFICE" />
+	<category name="Email" replace="Pošta" builtin-icon="OFFICE" />
+	<category name="Finance" replace="Finance" builtin-icon="OFFICE" />
+	<category name="FlowChart" replace="Flow Chart" builtin-icon="OFFICE" />
+	<category name="PDA" builtin-icon="OFFICE" />
+	<category name="ProjectManagement" replace="Správa projektů" builtin-icon="OFFICE" />
+	<category name="Presentation" replace="Prezentace" builtin-icon="OFFICE" />
+	<category name="Spreadsheet" replace="Tabulkové procesory" builtin-icon="OFFICE" />
+	<category name="WordProcessor" replace="Textové procesory" builtin-icon="OFFICE" />
 	<category name="Graphics" toplevel="true" replace="Grafika" builtin-icon="GRAPHICS">
 		<subcategory name="2DGraphics" />
 		<subcategory name="3DGraphics" />
diff -Nru xfdesktop4-4.3.90.1svn+r21789/modules/menu/xfce-registered-categories.xml.el xfdesktop4-4.3.90.1svn+r21789.new/modules/menu/xfce-registered-categories.xml.el
--- xfdesktop4-4.3.90.1svn+r21789/modules/menu/xfce-registered-categories.xml.el	2006-04-23 18:33:00.000000000 +0200
+++ xfdesktop4-4.3.90.1svn+r21789.new/modules/menu/xfce-registered-categories.xml.el	2006-05-24 17:02:31.000000000 +0200
@@ -57,7 +57,7 @@
 	<category name="Profiling" builtin-icon="DEVELOPMENT" />
 	<category name="RevisionControl" replace="Έλεγχος Εκδόσεων" builtin-icon="DEVELOPMENT" />
 	<category name="Translation" replace="Μετάφραση" builtin-icon="DEVELOPMENT" />
-	<category name="Office" toplevel="true" replace="Γραφείο" builtin-icon="PRODUCTIVITY">
+	<category name="Office" toplevel="true" replace="Γραφείο" builtin-icon="OFFICE">
 		<subcategory name="Calendar" />
 		<subcategory name="ContactManagement" />
 		<subcategory name="Database" />
@@ -74,19 +74,19 @@
 		<subcategory name="Photograph" />
 		<subcategory name="Viewer" />
 	</category>
-	<category name="Calendar" replace="Ημερολόγιο" builtin-icon="PRODUCTIVITY" />
-	<category name="ContactManagement" replace="Διαχείριση Επαφών" builtin-icon="PRODUCTIVITY" />
-	<category name="Database" replace="Βάσεις Δεδομένων" builtin-icon="PRODUCTIVITY" />
-	<category name="Dictionary" replace="Λεξικό" builtin-icon="PRODUCTIVITY" />
-	<category name="Chart" builtin-icon="PRODUCTIVITY" />
-	<category name="Email" replace="Ηλεκτρονική Αλληλογραφία" builtin-icon="PRODUCTIVITY" />
-	<category name="Finance" replace="Οικονομικά" builtin-icon="PRODUCTIVITY" />
-	<category name="FlowChart" replace="Flow Chart" builtin-icon="PRODUCTIVITY" />
-	<category name="PDA" builtin-icon="PRODUCTIVITY" />
-	<category name="ProjectManagement" replace="Διαχείριση Έργων" builtin-icon="PRODUCTIVITY" />
-	<category name="Presentation" replace="ΠαροÏ
σιάσεις" builtin-icon="PRODUCTIVITY" />
-	<category name="Spreadsheet" replace="Φύλλα Δεδομένων" builtin-icon="PRODUCTIVITY" />
-	<category name="WordProcessor" replace="Επεξεργασία ΚειμένοÏ
" builtin-icon="PRODUCTIVITY" />
+	<category name="Calendar" replace="Ημερολόγιο" builtin-icon="OFFICE" />
+	<category name="ContactManagement" replace="Διαχείριση Επαφών" builtin-icon="OFFICE" />
+	<category name="Database" replace="Βάσεις Δεδομένων" builtin-icon="OFFICE" />
+	<category name="Dictionary" replace="Λεξικό" builtin-icon="OFFICE" />
+	<category name="Chart" builtin-icon="OFFICE" />
+	<category name="Email" replace="Ηλεκτρονική Αλληλογραφία" builtin-icon="OFFICE" />
+	<category name="Finance" replace="Οικονομικά" builtin-icon="OFFICE" />
+	<category name="FlowChart" replace="Flow Chart" builtin-icon="OFFICE" />
+	<category name="PDA" builtin-icon="OFFICE" />
+	<category name="ProjectManagement" replace="Διαχείριση Έργων" builtin-icon="OFFICE" />
+	<category name="Presentation" replace="ΠαροÏ
σιάσεις" builtin-icon="OFFICE" />
+	<category name="Spreadsheet" replace="Φύλλα Δεδομένων" builtin-icon="OFFICE" />
+	<category name="WordProcessor" replace="Επεξεργασία ΚειμένοÏ
" builtin-icon="OFFICE" />
 	<category name="Graphics" toplevel="true" replace="Γραφικά" builtin-icon="GRAPHICS">
 		<subcategory name="2DGraphics" />
 		<subcategory name="3DGraphics" />
diff -Nru xfdesktop4-4.3.90.1svn+r21789/modules/menu/xfce-registered-categories.xml.es xfdesktop4-4.3.90.1svn+r21789.new/modules/menu/xfce-registered-categories.xml.es
--- xfdesktop4-4.3.90.1svn+r21789/modules/menu/xfce-registered-categories.xml.es	2006-04-11 16:39:42.000000000 +0200
+++ xfdesktop4-4.3.90.1svn+r21789.new/modules/menu/xfce-registered-categories.xml.es	2006-05-24 17:02:31.000000000 +0200
@@ -57,7 +57,7 @@
 	<category name="Profiling" builtin-icon="DEVELOPMENT" />
 	<category name="RevisionControl" replace="Control de revisión" builtin-icon="DEVELOPMENT" />
 	<category name="Translation" replace="Traducción" builtin-icon="DEVELOPMENT" />
-	<category name="Office" replace="Oficina" toplevel="true" builtin-icon="PRODUCTIVITY">
+	<category name="Office" replace="Oficina" toplevel="true" builtin-icon="OFFICE">
 		<subcategory name="Calendar" />
 		<subcategory name="ContactManagement" />
 		<subcategory name="Database" />
@@ -74,19 +74,19 @@
 		<subcategory name="Photograph" />
 		<subcategory name="Viewer" />
 	</category>
-	<category name="Calendar" replace="Calendario" builtin-icon="PRODUCTIVITY" />
-	<category name="ContactManagement" replace="Administración de contactos" builtin-icon="PRODUCTIVITY" />
-	<category name="Database" replace="Bases de datos" builtin-icon="PRODUCTIVITY" />
-	<category name="Dictionary" replace="Diccionario" builtin-icon="PRODUCTIVITY" />
-	<category name="Chart" replace="Carta" builtin-icon="PRODUCTIVITY" />
-	<category name="Email" builtin-icon="PRODUCTIVITY" />
-	<category name="Finance" replace="Financias" builtin-icon="PRODUCTIVITY" />
-	<category name="FlowChart" replace="Organigrama" builtin-icon="PRODUCTIVITY" />
-	<category name="PDA" builtin-icon="PRODUCTIVITY" />
-	<category name="ProjectManagement" replace="Administración de proyectos" builtin-icon="PRODUCTIVITY" />
-	<category name="Presentation" replace="Presentación" builtin-icon="PRODUCTIVITY" />
-	<category name="Spreadsheet" replace="Hoja de cáculo" builtin-icon="PRODUCTIVITY" />
-	<category name="WordProcessor" replace="Procesamiento de texto" builtin-icon="PRODUCTIVITY" />
+	<category name="Calendar" replace="Calendario" builtin-icon="OFFICE" />
+	<category name="ContactManagement" replace="Administración de contactos" builtin-icon="OFFICE" />
+	<category name="Database" replace="Bases de datos" builtin-icon="OFFICE" />
+	<category name="Dictionary" replace="Diccionario" builtin-icon="OFFICE" />
+	<category name="Chart" replace="Carta" builtin-icon="OFFICE" />
+	<category name="Email" builtin-icon="OFFICE" />
+	<category name="Finance" replace="Financias" builtin-icon="OFFICE" />
+	<category name="FlowChart" replace="Organigrama" builtin-icon="OFFICE" />
+	<category name="PDA" builtin-icon="OFFICE" />
+	<category name="ProjectManagement" replace="Administración de proyectos" builtin-icon="OFFICE" />
+	<category name="Presentation" replace="Presentación" builtin-icon="OFFICE" />
+	<category name="Spreadsheet" replace="Hoja de cáculo" builtin-icon="OFFICE" />
+	<category name="WordProcessor" replace="Procesamiento de texto" builtin-icon="OFFICE" />
 	<category name="Graphics" replace="Gráficos" toplevel="true" builtin-icon="GRAPHICS">
 		<subcategory name="2DGraphics" />
 		<subcategory name="3DGraphics" />
diff -Nru xfdesktop4-4.3.90.1svn+r21789/modules/menu/xfce-registered-categories.xml.eu xfdesktop4-4.3.90.1svn+r21789.new/modules/menu/xfce-registered-categories.xml.eu
--- xfdesktop4-4.3.90.1svn+r21789/modules/menu/xfce-registered-categories.xml.eu	2006-04-29 17:35:03.000000000 +0200
+++ xfdesktop4-4.3.90.1svn+r21789.new/modules/menu/xfce-registered-categories.xml.eu	2006-05-24 17:02:31.000000000 +0200
@@ -57,7 +57,7 @@
 	<category name="Profiling" replace="Soslaiak" builtin-icon="DEVELOPMENT" />
 	<category name="RevisionControl" replace="Berrikuste Kontrola" builtin-icon="DEVELOPMENT" />
 	<category name="Translation"replace="Itzulpenak"  builtin-icon="DEVELOPMENT" />
-	<category name="Office"replace="Ofizina"  toplevel="true" builtin-icon="PRODUCTIVITY">
+	<category name="Office"replace="Ofizina"  toplevel="true" builtin-icon="OFFICE">
 		<subcategory name="Calendar" replace="Egutegia" />
 		<subcategory name="ContactManagement" replace="KontaktuKudeaketa" />
 		<subcategory name="Database" replace="Datubasea" />
@@ -74,19 +74,19 @@
 		<subcategory name="Photograph" replace="Argazkiak" />
 		<subcategory name="Viewer" replace="Ikustatzaileak" />
 	</category>
-	<category name="Calendar" replace="Egutegia" builtin-icon="PRODUCTIVITY" />
-	<category name="ContactManagement" replace="Kontaktu Kudeaketa" builtin-icon="PRODUCTIVITY" />
-	<category name="Database" replace="Datubaseak" builtin-icon="PRODUCTIVITY" />
-	<category name="Dictionary" replace="Hiztegiak" builtin-icon="PRODUCTIVITY" />
-	<category name="Chart" replace="Karaktereak" builtin-icon="PRODUCTIVITY" />
-	<category name="Email" replace="ePosta" builtin-icon="PRODUCTIVITY" />
-	<category name="Finance" replace="Finantzak" builtin-icon="PRODUCTIVITY" />
-	<category name="FlowChart" replace="Organigramak" builtin-icon="PRODUCTIVITY" />
-	<category name="PDA" builtin-icon="PRODUCTIVITY" />
-	<category name="ProjectManagement" replace="Proiektu Kudeaketa" builtin-icon="PRODUCTIVITY" />
-	<category name="Presentation" replace="Aurkezpenak" builtin-icon="PRODUCTIVITY" />
-	<category name="Spreadsheet" replace="Kalkulu Orriak" builtin-icon="PRODUCTIVITY" />
-	<category name="WordProcessor" replace="Testu Prozesatzaileak" builtin-icon="PRODUCTIVITY" />
+	<category name="Calendar" replace="Egutegia" builtin-icon="OFFICE" />
+	<category name="ContactManagement" replace="Kontaktu Kudeaketa" builtin-icon="OFFICE" />
+	<category name="Database" replace="Datubaseak" builtin-icon="OFFICE" />
+	<category name="Dictionary" replace="Hiztegiak" builtin-icon="OFFICE" />
+	<category name="Chart" replace="Karaktereak" builtin-icon="OFFICE" />
+	<category name="Email" replace="ePosta" builtin-icon="OFFICE" />
+	<category name="Finance" replace="Finantzak" builtin-icon="OFFICE" />
+	<category name="FlowChart" replace="Organigramak" builtin-icon="OFFICE" />
+	<category name="PDA" builtin-icon="OFFICE" />
+	<category name="ProjectManagement" replace="Proiektu Kudeaketa" builtin-icon="OFFICE" />
+	<category name="Presentation" replace="Aurkezpenak" builtin-icon="OFFICE" />
+	<category name="Spreadsheet" replace="Kalkulu Orriak" builtin-icon="OFFICE" />
+	<category name="WordProcessor" replace="Testu Prozesatzaileak" builtin-icon="OFFICE" />
 	<category name="Graphics" toplevel="true" replace="Grafikoak" builtin-icon="GRAPHICS">
 		<subcategory name="2DGraphics" replace="2dDGrafikoak" />
 		<subcategory name="3DGraphics" replace="3DGrafikoak" />
diff -Nru xfdesktop4-4.3.90.1svn+r21789/modules/menu/xfce-registered-categories.xml.fi xfdesktop4-4.3.90.1svn+r21789.new/modules/menu/xfce-registered-categories.xml.fi
--- xfdesktop4-4.3.90.1svn+r21789/modules/menu/xfce-registered-categories.xml.fi	2006-05-06 17:19:36.000000000 +0200
+++ xfdesktop4-4.3.90.1svn+r21789.new/modules/menu/xfce-registered-categories.xml.fi	2006-05-24 17:02:31.000000000 +0200
@@ -57,7 +57,7 @@
 	<category name="Profiling" replace="Profilointi" builtin-icon="DEVELOPMENT" />
 	<category name="RevisionControl" replace="Versionhallinta" builtin-icon="DEVELOPMENT" />
 	<category name="Translation" replace="Kääntäminen" builtin-icon="DEVELOPMENT" />
-	<category name="Office" replace="Toimisto" toplevel="true" builtin-icon="PRODUCTIVITY">
+	<category name="Office" replace="Toimisto" toplevel="true" builtin-icon="OFFICE">
 		<subcategory name="Calendar" />
 		<subcategory name="ContactManagement" />
 		<subcategory name="Database" />
@@ -74,19 +74,19 @@
 		<subcategory name="Photograph" />
 		<subcategory name="Viewer" />
 	</category>
-	<category name="Calendar" replace="Kalenteri" builtin-icon="PRODUCTIVITY" />
-	<category name="ContactManagement" replace="Yhteystietojen hallinta" builtin-icon="PRODUCTIVITY" />
-	<category name="Database" replace="Tietokannat" builtin-icon="PRODUCTIVITY" />
-	<category name="Dictionary" replace="Sanakirjat" builtin-icon="PRODUCTIVITY" />
-	<category name="Chart" replace="Kaaviot" builtin-icon="PRODUCTIVITY" />
-	<category name="Email" replace="Sähköposti" builtin-icon="PRODUCTIVITY" />
-	<category name="Finance" replace="Rahat" builtin-icon="PRODUCTIVITY" />
-	<category name="FlowChart" replace="Vuokaaviot" builtin-icon="PRODUCTIVITY" />
-	<category name="PDA" builtin-icon="PRODUCTIVITY" />
-	<category name="ProjectManagement" replace="Projektinhallinta" builtin-icon="PRODUCTIVITY" />
-	<category name="Presentation" replace="Esitys" builtin-icon="PRODUCTIVITY" />
-	<category name="Spreadsheet" replace="Taulukkolaskenta" builtin-icon="PRODUCTIVITY" />
-	<category name="WordProcessor" replace="Tekstinkäsittely" builtin-icon="PRODUCTIVITY" />
+	<category name="Calendar" replace="Kalenteri" builtin-icon="OFFICE" />
+	<category name="ContactManagement" replace="Yhteystietojen hallinta" builtin-icon="OFFICE" />
+	<category name="Database" replace="Tietokannat" builtin-icon="OFFICE" />
+	<category name="Dictionary" replace="Sanakirjat" builtin-icon="OFFICE" />
+	<category name="Chart" replace="Kaaviot" builtin-icon="OFFICE" />
+	<category name="Email" replace="Sähköposti" builtin-icon="OFFICE" />
+	<category name="Finance" replace="Rahat" builtin-icon="OFFICE" />
+	<category name="FlowChart" replace="Vuokaaviot" builtin-icon="OFFICE" />
+	<category name="PDA" builtin-icon="OFFICE" />
+	<category name="ProjectManagement" replace="Projektinhallinta" builtin-icon="OFFICE" />
+	<category name="Presentation" replace="Esitys" builtin-icon="OFFICE" />
+	<category name="Spreadsheet" replace="Taulukkolaskenta" builtin-icon="OFFICE" />
+	<category name="WordProcessor" replace="Tekstinkäsittely" builtin-icon="OFFICE" />
 	<category name="Graphics" replace="Grafiikka" toplevel="true" builtin-icon="GRAPHICS">
 		<subcategory name="2DGraphics" />
 		<subcategory name="3DGraphics" />
diff -Nru xfdesktop4-4.3.90.1svn+r21789/modules/menu/xfce-registered-categories.xml.fr xfdesktop4-4.3.90.1svn+r21789.new/modules/menu/xfce-registered-categories.xml.fr
--- xfdesktop4-4.3.90.1svn+r21789/modules/menu/xfce-registered-categories.xml.fr	2006-02-23 09:43:47.000000000 +0100
+++ xfdesktop4-4.3.90.1svn+r21789.new/modules/menu/xfce-registered-categories.xml.fr	2006-05-24 17:02:31.000000000 +0200
@@ -57,7 +57,7 @@
 	<category name="Profiling" builtin-icon="DEVELOPMENT" />
 	<category name="RevisionControl" replace="Contrôle de révision" builtin-icon="DEVELOPMENT" />
 	<category name="Translation" replace="Traduction" builtin-icon="DEVELOPMENT" />
-	<category name="Office" replace="Bureautique" toplevel="true" builtin-icon="PRODUCTIVITY">
+	<category name="Office" replace="Bureautique" toplevel="true" builtin-icon="OFFICE">
 		<subcategory name="Calendar" />
 		<subcategory name="ContactManagement" />
 		<subcategory name="Database" />
@@ -74,19 +74,19 @@
 		<subcategory name="Photograph" />
 		<subcategory name="Viewer" />
 	</category>
-	<category name="Calendar" replace="Agenda" builtin-icon="PRODUCTIVITY" />
-	<category name="ContactManagement" replace="Gestion des Contacts" builtin-icon="PRODUCTIVITY" />
-	<category name="Database" builtin-icon="PRODUCTIVITY" />
-	<category name="Dictionary" replace="Dictionnaire" builtin-icon="PRODUCTIVITY" />
-	<category name="Chart" replace="Graphiques" builtin-icon="PRODUCTIVITY" />
-	<category name="Email" builtin-icon="PRODUCTIVITY" />
-	<category name="Finance" replace="Finances" builtin-icon="PRODUCTIVITY" />
-	<category name="FlowChart" replace="Diagrammes" builtin-icon="PRODUCTIVITY" />
-	<category name="PDA" builtin-icon="PRODUCTIVITY" />
-	<category name="ProjectManagement" replace="Gestion de projets" builtin-icon="PRODUCTIVITY" />
-	<category name="Presentation" replace="Présentation" builtin-icon="PRODUCTIVITY" />
-	<category name="Spreadsheet" builtin-icon="PRODUCTIVITY" />
-	<category name="WordProcessor" replace="Traitement de texte" builtin-icon="PRODUCTIVITY" />
+	<category name="Calendar" replace="Agenda" builtin-icon="OFFICE" />
+	<category name="ContactManagement" replace="Gestion des Contacts" builtin-icon="OFFICE" />
+	<category name="Database" builtin-icon="OFFICE" />
+	<category name="Dictionary" replace="Dictionnaire" builtin-icon="OFFICE" />
+	<category name="Chart" replace="Graphiques" builtin-icon="OFFICE" />
+	<category name="Email" builtin-icon="OFFICE" />
+	<category name="Finance" replace="Finances" builtin-icon="OFFICE" />
+	<category name="FlowChart" replace="Diagrammes" builtin-icon="OFFICE" />
+	<category name="PDA" builtin-icon="OFFICE" />
+	<category name="ProjectManagement" replace="Gestion de projets" builtin-icon="OFFICE" />
+	<category name="Presentation" replace="Présentation" builtin-icon="OFFICE" />
+	<category name="Spreadsheet" builtin-icon="OFFICE" />
+	<category name="WordProcessor" replace="Traitement de texte" builtin-icon="OFFICE" />
 	<category name="Graphics" replace="Infographie" toplevel="true" builtin-icon="GRAPHICS">
 		<subcategory name="2DGraphics" />
 		<subcategory name="3DGraphics" />
diff -Nru xfdesktop4-4.3.90.1svn+r21789/modules/menu/xfce-registered-categories.xml.he xfdesktop4-4.3.90.1svn+r21789.new/modules/menu/xfce-registered-categories.xml.he
--- xfdesktop4-4.3.90.1svn+r21789/modules/menu/xfce-registered-categories.xml.he	2006-05-06 17:19:36.000000000 +0200
+++ xfdesktop4-4.3.90.1svn+r21789.new/modules/menu/xfce-registered-categories.xml.he	2006-05-24 17:02:31.000000000 +0200
@@ -57,7 +57,7 @@
 	<category name="Profiling" builtin-icon="DEVELOPMENT" />
 	<category name="RevisionControl" replace="בקרת שינויים" builtin-icon="DEVELOPMENT" />
 	<category name="Translation" replace="תרגום" builtin-icon="DEVELOPMENT" />
-	<category name="Office" toplevel="true" replace="יישומים משרדיים" builtin-icon="PRODUCTIVITY">
+	<category name="Office" toplevel="true" replace="יישומים משרדיים" builtin-icon="OFFICE">
 		<subcategory name="Calendar" />
 		<subcategory name="ContactManagement" />
 		<subcategory name="Database" />
@@ -74,19 +74,19 @@
 		<subcategory name="Photograph" />
 		<subcategory name="Viewer" />
 	</category>
-	<category name="Calendar" replace="לוח שנה" builtin-icon="PRODUCTIVITY" />
-	<category name="ContactManagement" replace="ניהול פגישות" builtin-icon="PRODUCTIVITY" />
-	<category name="Database" repalce="בסיס נתונים" builtin-icon="PRODUCTIVITY" />
-	<category name="Dictionary" replace="מילון" builtin-icon="PRODUCTIVITY" />
-	<category name="Chart" builtin-icon="PRODUCTIVITY" />
-	<category name="Email" replace="דואר אלקטרוני" builtin-icon="PRODUCTIVITY" />
-	<category name="Finance" replace="כספים" builtin-icon="PRODUCTIVITY" />
-	<category name="FlowChart" replace="תרשים זרימה" builtin-icon="PRODUCTIVITY" />
-	<category name="PDA" builtin-icon="PRODUCTIVITY" />
-	<category name="ProjectManagement" replace="ניהול פרויקט" builtin-icon="PRODUCTIVITY" />
-	<category name="Presentation" replace="מצגת" builtin-icon="PRODUCTIVITY" />
-	<category name="Spreadsheet" replace="גליון אלקטרוני" builtin-icon="PRODUCTIVITY" />
-	<category name="WordProcessor" replace="מעבד תמלילים" builtin-icon="PRODUCTIVITY" />
+	<category name="Calendar" replace="לוח שנה" builtin-icon="OFFICE" />
+	<category name="ContactManagement" replace="ניהול פגישות" builtin-icon="OFFICE" />
+	<category name="Database" repalce="בסיס נתונים" builtin-icon="OFFICE" />
+	<category name="Dictionary" replace="מילון" builtin-icon="OFFICE" />
+	<category name="Chart" builtin-icon="OFFICE" />
+	<category name="Email" replace="דואר אלקטרוני" builtin-icon="OFFICE" />
+	<category name="Finance" replace="כספים" builtin-icon="OFFICE" />
+	<category name="FlowChart" replace="תרשים זרימה" builtin-icon="OFFICE" />
+	<category name="PDA" builtin-icon="OFFICE" />
+	<category name="ProjectManagement" replace="ניהול פרויקט" builtin-icon="OFFICE" />
+	<category name="Presentation" replace="מצגת" builtin-icon="OFFICE" />
+	<category name="Spreadsheet" replace="גליון אלקטרוני" builtin-icon="OFFICE" />
+	<category name="WordProcessor" replace="מעבד תמלילים" builtin-icon="OFFICE" />
 	<category name="Graphics" replace="גרפיקה" toplevel="true" builtin-icon="GRAPHICS">
 		<subcategory name="2DGraphics" />
 		<subcategory name="3DGraphics" />
diff -Nru xfdesktop4-4.3.90.1svn+r21789/modules/menu/xfce-registered-categories.xml.hu xfdesktop4-4.3.90.1svn+r21789.new/modules/menu/xfce-registered-categories.xml.hu
--- xfdesktop4-4.3.90.1svn+r21789/modules/menu/xfce-registered-categories.xml.hu	2006-02-23 09:43:47.000000000 +0100
+++ xfdesktop4-4.3.90.1svn+r21789.new/modules/menu/xfce-registered-categories.xml.hu	2006-05-24 17:02:31.000000000 +0200
@@ -57,7 +57,7 @@
 	<category name="Profiling" builtin-icon="DEVELOPMENT" />
 	<category name="RevisionControl" replace="Revision Control" builtin-icon="DEVELOPMENT" />
 	<category name="Translation" replace="Fordítás" builtin-icon="DEVELOPMENT" />
-	<category name="Office" toplevel="true" replace="Iroda" builtin-icon="PRODUCTIVITY">
+	<category name="Office" toplevel="true" replace="Iroda" builtin-icon="OFFICE">
 		<subcategory name="Calendar" replace="Naptár" />
 		<subcategory name="ContactManagement" replace="Kapcsolatok" />
 		<subcategory name="Database" replace="Adatbázis" />
@@ -74,19 +74,19 @@
 		<subcategory name="Photograph" replace="Fotó" />
 		<subcategory name="Viewer" replace="Nézegető" />
 	</category>
-	<category name="Calendar" replace="Naptár" builtin-icon="PRODUCTIVITY" />
-	<category name="ContactManagement" replace="Kapcsolatok" builtin-icon="PRODUCTIVITY" />
-	<category name="Database" replace="Adatbázis" builtin-icon="PRODUCTIVITY" />
-	<category name="Dictionary" replace="Szótár" builtin-icon="PRODUCTIVITY" />
-	<category name="Chart" builtin-icon="PRODUCTIVITY" />
-	<category name="Email" builtin-icon="PRODUCTIVITY" />
-	<category name="Finance" builtin-icon="PRODUCTIVITY" />
-	<category name="FlowChart" replace="Flow Chart" builtin-icon="PRODUCTIVITY" />
-	<category name="PDA" builtin-icon="PRODUCTIVITY" />
-	<category name="ProjectManagement" replace="Projektek" builtin-icon="PRODUCTIVITY" />
-	<category name="Presentation" replace="Bemutató" builtin-icon="PRODUCTIVITY" />
-	<category name="Spreadsheet" replace="Tábla" builtin-icon="PRODUCTIVITY" />
-	<category name="WordProcessor" replace="Szövegszerkesztés" builtin-icon="PRODUCTIVITY" />
+	<category name="Calendar" replace="Naptár" builtin-icon="OFFICE" />
+	<category name="ContactManagement" replace="Kapcsolatok" builtin-icon="OFFICE" />
+	<category name="Database" replace="Adatbázis" builtin-icon="OFFICE" />
+	<category name="Dictionary" replace="Szótár" builtin-icon="OFFICE" />
+	<category name="Chart" builtin-icon="OFFICE" />
+	<category name="Email" builtin-icon="OFFICE" />
+	<category name="Finance" builtin-icon="OFFICE" />
+	<category name="FlowChart" replace="Flow Chart" builtin-icon="OFFICE" />
+	<category name="PDA" builtin-icon="OFFICE" />
+	<category name="ProjectManagement" replace="Projektek" builtin-icon="OFFICE" />
+	<category name="Presentation" replace="Bemutató" builtin-icon="OFFICE" />
+	<category name="Spreadsheet" replace="Tábla" builtin-icon="OFFICE" />
+	<category name="WordProcessor" replace="Szövegszerkesztés" builtin-icon="OFFICE" />
 	<category name="Graphics" toplevel="true" replace="Grafika" builtin-icon="GRAPHICS">
 		<subcategory name="2DGraphics" />
 		<subcategory name="3DGraphics" />
diff -Nru xfdesktop4-4.3.90.1svn+r21789/modules/menu/xfce-registered-categories.xml.ja xfdesktop4-4.3.90.1svn+r21789.new/modules/menu/xfce-registered-categories.xml.ja
--- xfdesktop4-4.3.90.1svn+r21789/modules/menu/xfce-registered-categories.xml.ja	2006-02-23 09:43:47.000000000 +0100
+++ xfdesktop4-4.3.90.1svn+r21789.new/modules/menu/xfce-registered-categories.xml.ja	2006-05-24 17:02:31.000000000 +0200
@@ -76,7 +76,7 @@
 	<category name="Profiling" replace="プロファイリング" builtin-icon="DEVELOPMENT" />
 	<category name="RevisionControl" replace="リビジョン管理" builtin-icon="DEVELOPMENT" />
 	<category name="Translation" replace="翻訳" builtin-icon="DEVELOPMENT" />
-	<category name="Office" toplevel="true" replace="オフィス" builtin-icon="PRODUCTIVITY">
+	<category name="Office" toplevel="true" replace="オフィス" builtin-icon="OFFICE">
 		<subcategory name="Calendar" replace="カレンダー" />
 		<subcategory name="ContactManagement" replace="アポイント管理" />
 		<subcategory name="Database" replace="データベース" />
@@ -93,19 +93,19 @@
 		<subcategory name="Photograph" replace="写真" />
 		<subcategory name="Viewer" replace="ビューアー" />
 	</category>
-	<category name="Calendar" replace="カレンダー" builtin-icon="PRODUCTIVITY" />
-	<category name="ContactManagement" replace="アポイント管理" builtin-icon="PRODUCTIVITY" />
-	<category name="Database" replace="データベース" builtin-icon="PRODUCTIVITY" />
-	<category name="Dictionary" replace="電子辞書" builtin-icon="PRODUCTIVITY" />
-	<category name="Chart" replace="チャート" builtin-icon="PRODUCTIVITY" />
-	<category name="Email" replace="メール" builtin-icon="PRODUCTIVITY" />
-	<category name="Finance" replace="会計" builtin-icon="PRODUCTIVITY" />
-	<category name="FlowChart" replace="フローチャート" builtin-icon="PRODUCTIVITY" />
-	<category name="PDA" builtin-icon="PRODUCTIVITY" />
-	<category name="ProjectManagement" replace="プロジェクト管理" builtin-icon="PRODUCTIVITY" />
-	<category name="Presentation" replace="プレゼンテーション" builtin-icon="PRODUCTIVITY" />
-	<category name="Spreadsheet" replace="表計算" builtin-icon="PRODUCTIVITY" />
-	<category name="WordProcessor" replace="ワープロ" builtin-icon="PRODUCTIVITY" />
+	<category name="Calendar" replace="カレンダー" builtin-icon="OFFICE" />
+	<category name="ContactManagement" replace="アポイント管理" builtin-icon="OFFICE" />
+	<category name="Database" replace="データベース" builtin-icon="OFFICE" />
+	<category name="Dictionary" replace="電子辞書" builtin-icon="OFFICE" />
+	<category name="Chart" replace="チャート" builtin-icon="OFFICE" />
+	<category name="Email" replace="メール" builtin-icon="OFFICE" />
+	<category name="Finance" replace="会計" builtin-icon="OFFICE" />
+	<category name="FlowChart" replace="フローチャート" builtin-icon="OFFICE" />
+	<category name="PDA" builtin-icon="OFFICE" />
+	<category name="ProjectManagement" replace="プロジェクト管理" builtin-icon="OFFICE" />
+	<category name="Presentation" replace="プレゼンテーション" builtin-icon="OFFICE" />
+	<category name="Spreadsheet" replace="表計算" builtin-icon="OFFICE" />
+	<category name="WordProcessor" replace="ワープロ" builtin-icon="OFFICE" />
 	<category name="Graphics" toplevel="true" replace="グラフィックス" builtin-icon="GRAPHICS">
 		<subcategory name="2DGraphics" replace="2D グラフィックス" />
 		<subcategory name="3DGraphics" replace="3D グラフィックス" />
diff -Nru xfdesktop4-4.3.90.1svn+r21789/modules/menu/xfce-registered-categories.xml.nl xfdesktop4-4.3.90.1svn+r21789.new/modules/menu/xfce-registered-categories.xml.nl
--- xfdesktop4-4.3.90.1svn+r21789/modules/menu/xfce-registered-categories.xml.nl	2006-02-23 09:43:47.000000000 +0100
+++ xfdesktop4-4.3.90.1svn+r21789.new/modules/menu/xfce-registered-categories.xml.nl	2006-05-24 17:02:31.000000000 +0200
@@ -57,7 +57,7 @@
 	<category name="Profiling" builtin-icon="DEVELOPMENT" />
 	<category name="RevisionControl" replace="Versiebeheer" builtin-icon="DEVELOPMENT" />
 	<category name="Translation" replace="Vertalen" builtin-icon="DEVELOPMENT" />
-	<category name="Office" replace="Kantoor" toplevel="true" builtin-icon="PRODUCTIVITY">
+	<category name="Office" replace="Kantoor" toplevel="true" builtin-icon="OFFICE">
 		<subcategory name="Calendar" />
 		<subcategory name="ContactManagement" />
 		<subcategory name="Database" />
@@ -74,19 +74,19 @@
 		<subcategory name="Photograph" />
 		<subcategory name="Viewer" />
 	</category>
-	<category name="Calendar" replace="Agenda" builtin-icon="PRODUCTIVITY" />
-	<category name="ContactManagement" replace="Contact Management" builtin-icon="PRODUCTIVITY" />
-	<category name="Database" builtin-icon="PRODUCTIVITY" />
-	<category name="Dictionary" replace="Woordenboek" builtin-icon="PRODUCTIVITY" />
-	<category name="Chart" replace="Grafieken" builtin-icon="PRODUCTIVITY" />
-	<category name="Email" builtin-icon="PRODUCTIVITY" />
-	<category name="Finance" replace="Financieel" builtin-icon="PRODUCTIVITY" />
-	<category name="FlowChart" replace="Flow Chart" builtin-icon="PRODUCTIVITY" />
-	<category name="PDA" builtin-icon="PRODUCTIVITY" />
-	<category name="ProjectManagement" replace="Project Management" builtin-icon="PRODUCTIVITY" />
-	<category name="Presentation" replace="Presentatie" builtin-icon="PRODUCTIVITY" />
-	<category name="Spreadsheet" builtin-icon="PRODUCTIVITY" />
-	<category name="WordProcessor" replace="Tekstverwerking" builtin-icon="PRODUCTIVITY" />
+	<category name="Calendar" replace="Agenda" builtin-icon="OFFICE" />
+	<category name="ContactManagement" replace="Contact Management" builtin-icon="OFFICE" />
+	<category name="Database" builtin-icon="OFFICE" />
+	<category name="Dictionary" replace="Woordenboek" builtin-icon="OFFICE" />
+	<category name="Chart" replace="Grafieken" builtin-icon="OFFICE" />
+	<category name="Email" builtin-icon="OFFICE" />
+	<category name="Finance" replace="Financieel" builtin-icon="OFFICE" />
+	<category name="FlowChart" replace="Flow Chart" builtin-icon="OFFICE" />
+	<category name="PDA" builtin-icon="OFFICE" />
+	<category name="ProjectManagement" replace="Project Management" builtin-icon="OFFICE" />
+	<category name="Presentation" replace="Presentatie" builtin-icon="OFFICE" />
+	<category name="Spreadsheet" builtin-icon="OFFICE" />
+	<category name="WordProcessor" replace="Tekstverwerking" builtin-icon="OFFICE" />
 	<category name="Graphics" replace="Grafisch" toplevel="true" builtin-icon="GRAPHICS">
 		<subcategory name="2DGraphics" />
 		<subcategory name="3DGraphics" />
diff -Nru xfdesktop4-4.3.90.1svn+r21789/modules/menu/xfce-registered-categories.xml.pl xfdesktop4-4.3.90.1svn+r21789.new/modules/menu/xfce-registered-categories.xml.pl
--- xfdesktop4-4.3.90.1svn+r21789/modules/menu/xfce-registered-categories.xml.pl	2006-02-23 09:43:47.000000000 +0100
+++ xfdesktop4-4.3.90.1svn+r21789.new/modules/menu/xfce-registered-categories.xml.pl	2006-05-24 17:02:31.000000000 +0200
@@ -57,7 +57,7 @@
 	<category name="Profiling" replace="Profilowanie" builtin-icon="DEVELOPMENT" />
 	<category name="RevisionControl" replace="Kontrola wersji" builtin-icon="DEVELOPMENT" />
 	<category name="Translation" replace="TÅ‚umaczenie" builtin-icon="DEVELOPMENT" />
-	<category name="Office" replace="Biuro" toplevel="true" builtin-icon="PRODUCTIVITY">
+	<category name="Office" replace="Biuro" toplevel="true" builtin-icon="OFFICE">
 		<subcategory name="Calendar" replace="Kalendarz" />
 		<subcategory name="ContactManagement" replace="ZarzÄ
dzanie TreÅ›ciÄ
" />
 		<subcategory name="Database" replace="Baza danych" />
@@ -74,19 +74,19 @@
 		<subcategory name="Photograph" replace="Zdjęcie" />
 		<subcategory name="Viewer" replace="PrzeglÄ
darka" />
 	</category>
-	<category name="Calendar" replace="Kalendarz" builtin-icon="PRODUCTIVITY" />
-	<category name="ContactManagement" replace="ZarzÄ
dzanie treÅ›ciÄ
" builtin-icon="PRODUCTIVITY" />
-	<category name="Database" replace="Baza danych" builtin-icon="PRODUCTIVITY" />
-	<category name="Dictionary" replace="SÅ‚ownik" builtin-icon="PRODUCTIVITY" />
-	<category name="Chart" replace="Wykres" builtin-icon="PRODUCTIVITY" />
-	<category name="Email" replace="Email" builtin-icon="PRODUCTIVITY" />
-	<category name="Finance" replace="Finanse" builtin-icon="PRODUCTIVITY" />
-	<category name="FlowChart" replace="Arkusz" builtin-icon="PRODUCTIVITY" />
-	<category name="PDA" builtin-icon="PRODUCTIVITY" />
-	<category name="ProjectManagement" replace="ZarzÄ
dzanie Projektem" builtin-icon="PRODUCTIVITY" />
-	<category name="Presentation" replace="Prezentacja" builtin-icon="PRODUCTIVITY" />
-	<category name="Spreadsheet" replace="Arkusz Kalkulacyjny" builtin-icon="PRODUCTIVITY" />
-	<category name="WordProcessor" replace="Edytor Tekstu" builtin-icon="PRODUCTIVITY" />
+	<category name="Calendar" replace="Kalendarz" builtin-icon="OFFICE" />
+	<category name="ContactManagement" replace="ZarzÄ
dzanie treÅ›ciÄ
" builtin-icon="OFFICE" />
+	<category name="Database" replace="Baza danych" builtin-icon="OFFICE" />
+	<category name="Dictionary" replace="SÅ‚ownik" builtin-icon="OFFICE" />
+	<category name="Chart" replace="Wykres" builtin-icon="OFFICE" />
+	<category name="Email" replace="Email" builtin-icon="OFFICE" />
+	<category name="Finance" replace="Finanse" builtin-icon="OFFICE" />
+	<category name="FlowChart" replace="Arkusz" builtin-icon="OFFICE" />
+	<category name="PDA" builtin-icon="OFFICE" />
+	<category name="ProjectManagement" replace="ZarzÄ
dzanie Projektem" builtin-icon="OFFICE" />
+	<category name="Presentation" replace="Prezentacja" builtin-icon="OFFICE" />
+	<category name="Spreadsheet" replace="Arkusz Kalkulacyjny" builtin-icon="OFFICE" />
+	<category name="WordProcessor" replace="Edytor Tekstu" builtin-icon="OFFICE" />
 	<category name="Graphics" replace="Grafika" toplevel="true" builtin-icon="GRAPHICS">
 		<subcategory name="2DGraphics" replace="Grafika 2D" />
 		<subcategory name="3DGraphics" replace="Grafika 3D" />
diff -Nru xfdesktop4-4.3.90.1svn+r21789/modules/menu/xfce-registered-categories.xml.pt_BR xfdesktop4-4.3.90.1svn+r21789.new/modules/menu/xfce-registered-categories.xml.pt_BR
--- xfdesktop4-4.3.90.1svn+r21789/modules/menu/xfce-registered-categories.xml.pt_BR	2006-02-23 09:43:47.000000000 +0100
+++ xfdesktop4-4.3.90.1svn+r21789.new/modules/menu/xfce-registered-categories.xml.pt_BR	2006-05-24 17:02:31.000000000 +0200
@@ -59,7 +59,7 @@
 	<category name="Profiling" replace="Perfil" builtin-icon="DEVELOPMENT" />
 	<category name="RevisionControl" replace="Controle de Versão" builtin-icon="DEVELOPMENT" />
 	<category name="Translation" replace="Tradução" builtin-icon="DEVELOPMENT" />
-	<category name="Office" replace="Escritório" toplevel="true" builtin-icon="PRODUCTIVITY">
+	<category name="Office" replace="Escritório" toplevel="true" builtin-icon="OFFICE">
 		<subcategory name="Calendar" />
 		<subcategory name="ContactManagement" />
 		<subcategory name="Database" />
@@ -76,19 +76,19 @@
 		<subcategory name="Photograph" />
 		<subcategory name="Viewer" />
 	</category>
-	<category name="Calendar" replace="Calendário" builtin-icon="PRODUCTIVITY" />
-	<category name="ContactManagement" replace="Gerência de Contatos" builtin-icon="PRODUCTIVITY" />
-	<category name="Database" replace="Banco de Dados" builtin-icon="PRODUCTIVITY" />
-	<category name="Dictionary" replace="Dicionário" builtin-icon="PRODUCTIVITY" />
-	<category name="Chart" replace="Fluxograma" builtin-icon="PRODUCTIVITY" />
-	<category name="Email" replace="Correio Eletrônico" builtin-icon="PRODUCTIVITY" />
-	<category name="Finance" replace="Finanças" builtin-icon="PRODUCTIVITY" />
-	<category name="FlowChart" replace="Fluxograma" builtin-icon="PRODUCTIVITY" />
-	<category name="PDA" builtin-icon="PRODUCTIVITY" />
-	<category name="ProjectManagement" replace="Gerência de Projeto" builtin-icon="PRODUCTIVITY" />
-	<category name="Presentation" replace="Apresentações" builtin-icon="PRODUCTIVITY" />
-	<category name="Spreadsheet" replace="Planilhas" builtin-icon="PRODUCTIVITY" />
-	<category name="WordProcessor" replace="Processador de Textos" builtin-icon="PRODUCTIVITY" />
+	<category name="Calendar" replace="Calendário" builtin-icon="OFFICE" />
+	<category name="ContactManagement" replace="Gerência de Contatos" builtin-icon="OFFICE" />
+	<category name="Database" replace="Banco de Dados" builtin-icon="OFFICE" />
+	<category name="Dictionary" replace="Dicionário" builtin-icon="OFFICE" />
+	<category name="Chart" replace="Fluxograma" builtin-icon="OFFICE" />
+	<category name="Email" replace="Correio Eletrônico" builtin-icon="OFFICE" />
+	<category name="Finance" replace="Finanças" builtin-icon="OFFICE" />
+	<category name="FlowChart" replace="Fluxograma" builtin-icon="OFFICE" />
+	<category name="PDA" builtin-icon="OFFICE" />
+	<category name="ProjectManagement" replace="Gerência de Projeto" builtin-icon="OFFICE" />
+	<category name="Presentation" replace="Apresentações" builtin-icon="OFFICE" />
+	<category name="Spreadsheet" replace="Planilhas" builtin-icon="OFFICE" />
+	<category name="WordProcessor" replace="Processador de Textos" builtin-icon="OFFICE" />
 	<category name="Graphics" replace="Gráficos" toplevel="true" builtin-icon="GRAPHICS">
 		<subcategory name="2DGraphics" />
 		<subcategory name="3DGraphics" />
diff -Nru xfdesktop4-4.3.90.1svn+r21789/modules/menu/xfce-registered-categories.xml.ro xfdesktop4-4.3.90.1svn+r21789.new/modules/menu/xfce-registered-categories.xml.ro
--- xfdesktop4-4.3.90.1svn+r21789/modules/menu/xfce-registered-categories.xml.ro	2006-02-23 09:43:47.000000000 +0100
+++ xfdesktop4-4.3.90.1svn+r21789.new/modules/menu/xfce-registered-categories.xml.ro	2006-05-24 17:02:32.000000000 +0200
@@ -57,7 +57,7 @@
 	<category name="Profiling" replace="Optimizare" builtin-icon="DEVELOPMENT" />
 	<category name="RevisionControl" replace="Control revizii" builtin-icon="DEVELOPMENT" />
 	<category name="Translation" replace="Traducere" builtin-icon="DEVELOPMENT" />
-	<category name="Office" replace="Birou" toplevel="true" builtin-icon="PRODUCTIVITY">
+	<category name="Office" replace="Birou" toplevel="true" builtin-icon="OFFICE">
 		<subcategory name="Calendar" />
 		<subcategory name="ContactManagement" />
 		<subcategory name="Database" />
@@ -74,19 +74,19 @@
 		<subcategory name="Photograph" />
 		<subcategory name="Viewer" />
 	</category>
-	<category name="Calendar" replace="Calendar" builtin-icon="PRODUCTIVITY" />
-	<category name="ContactManagement" replace="Administrare contacte" builtin-icon="PRODUCTIVITY" />
-	<category name="Database" replace="Baze de date" builtin-icon="PRODUCTIVITY" />
-	<category name="Dictionary" replace="Dicţionar" builtin-icon="PRODUCTIVITY" />
-	<category name="Chart" replace="Hărţi" builtin-icon="PRODUCTIVITY" />
-	<category name="Email" replace="Poştă electronică" builtin-icon="PRODUCTIVITY" />
-	<category name="Finance" replace="Finanţe" builtin-icon="PRODUCTIVITY" />
-	<category name="FlowChart" replace="Diagrame" builtin-icon="PRODUCTIVITY" />
-	<category name="PDA" builtin-icon="PRODUCTIVITY" />
-	<category name="ProjectManagement" replace="Management de proiecte" builtin-icon="PRODUCTIVITY" />
-	<category name="Presentation" replace="Prezentări" builtin-icon="PRODUCTIVITY" />
-	<category name="Spreadsheet" replace="Calcul tabelar" builtin-icon="PRODUCTIVITY" />
-	<category name="WordProcessor" replace="Procesor de texte" builtin-icon="PRODUCTIVITY" />
+	<category name="Calendar" replace="Calendar" builtin-icon="OFFICE" />
+	<category name="ContactManagement" replace="Administrare contacte" builtin-icon="OFFICE" />
+	<category name="Database" replace="Baze de date" builtin-icon="OFFICE" />
+	<category name="Dictionary" replace="Dicţionar" builtin-icon="OFFICE" />
+	<category name="Chart" replace="Hărţi" builtin-icon="OFFICE" />
+	<category name="Email" replace="Poştă electronică" builtin-icon="OFFICE" />
+	<category name="Finance" replace="Finanţe" builtin-icon="OFFICE" />
+	<category name="FlowChart" replace="Diagrame" builtin-icon="OFFICE" />
+	<category name="PDA" builtin-icon="OFFICE" />
+	<category name="ProjectManagement" replace="Management de proiecte" builtin-icon="OFFICE" />
+	<category name="Presentation" replace="Prezentări" builtin-icon="OFFICE" />
+	<category name="Spreadsheet" replace="Calcul tabelar" builtin-icon="OFFICE" />
+	<category name="WordProcessor" replace="Procesor de texte" builtin-icon="OFFICE" />
 	<category name="Graphics" replace="Grafică" toplevel="true" builtin-icon="GRAPHICS">
 		<subcategory name="2DGraphics" />
 		<subcategory name="3DGraphics" />
diff -Nru xfdesktop4-4.3.90.1svn+r21789/modules/menu/xfce-registered-categories.xml.ru xfdesktop4-4.3.90.1svn+r21789.new/modules/menu/xfce-registered-categories.xml.ru
--- xfdesktop4-4.3.90.1svn+r21789/modules/menu/xfce-registered-categories.xml.ru	2006-04-17 15:11:27.000000000 +0200
+++ xfdesktop4-4.3.90.1svn+r21789.new/modules/menu/xfce-registered-categories.xml.ru	2006-05-24 17:02:32.000000000 +0200
@@ -57,7 +57,7 @@
 	<category name="Profiling" builtin-icon="DEVELOPMENT" />
 	<category name="RevisionControl" replace="Система контроля версий" builtin-icon="DEVELOPMENT" />
 	<category name="Translation" builtin-icon="DEVELOPMENT" />
-	<category name="Office" toplevel="true" replace="Офис" builtin-icon="PRODUCTIVITY">
+	<category name="Office" toplevel="true" replace="Офис" builtin-icon="OFFICE">
 		<subcategory name="Calendar" />
 		<subcategory name="ContactManagement" />
 		<subcategory name="Database" />
@@ -74,19 +74,19 @@
 		<subcategory name="Photograph" />
 		<subcategory name="Viewer" />
 	</category>
-	<category name="Calendar" replace="Календарь" builtin-icon="PRODUCTIVITY" />
-	<category name="ContactManagement" replace="Управление контактами" builtin-icon="PRODUCTIVITY" />
-	<category name="Database" replace="База данныÑ
" builtin-icon="PRODUCTIVITY" />
-	<category name="Dictionary" replace="Словарь" builtin-icon="PRODUCTIVITY" />
-	<category name="Chart" replace="Чертежи" builtin-icon="PRODUCTIVITY" />
-	<category name="Email" replace="Электронная почта" builtin-icon="PRODUCTIVITY" />
-	<category name="Finance" replace="Финансы" builtin-icon="PRODUCTIVITY" />
-	<category name="FlowChart" replace="Диаграммы" builtin-icon="PRODUCTIVITY" />
-	<category name="PDA" replace="КПК" builtin-icon="PRODUCTIVITY" />
-	<category name="ProjectManagement" replace="Управление проектами" builtin-icon="PRODUCTIVITY" />
-	<category name="Presentation" replace="Презентации" builtin-icon="PRODUCTIVITY" />
-	<category name="Spreadsheet" replace="Электронные таблицы" builtin-icon="PRODUCTIVITY" />
-	<category name="WordProcessor" replace="Текстовый процессор" builtin-icon="PRODUCTIVITY" />
+	<category name="Calendar" replace="Календарь" builtin-icon="OFFICE" />
+	<category name="ContactManagement" replace="Управление контактами" builtin-icon="OFFICE" />
+	<category name="Database" replace="База данныÑ
" builtin-icon="OFFICE" />
+	<category name="Dictionary" replace="Словарь" builtin-icon="OFFICE" />
+	<category name="Chart" replace="Чертежи" builtin-icon="OFFICE" />
+	<category name="Email" replace="Электронная почта" builtin-icon="OFFICE" />
+	<category name="Finance" replace="Финансы" builtin-icon="OFFICE" />
+	<category name="FlowChart" replace="Диаграммы" builtin-icon="OFFICE" />
+	<category name="PDA" replace="КПК" builtin-icon="OFFICE" />
+	<category name="ProjectManagement" replace="Управление проектами" builtin-icon="OFFICE" />
+	<category name="Presentation" replace="Презентации" builtin-icon="OFFICE" />
+	<category name="Spreadsheet" replace="Электронные таблицы" builtin-icon="OFFICE" />
+	<category name="WordProcessor" replace="Текстовый процессор" builtin-icon="OFFICE" />
 	<category name="Graphics" replace="Графика" toplevel="true" builtin-icon="GRAPHICS">
 		<subcategory name="2DGraphics" />
 		<subcategory name="3DGraphics" />
diff -Nru xfdesktop4-4.3.90.1svn+r21789/modules/menu/xfce-registered-categories.xml.sk xfdesktop4-4.3.90.1svn+r21789.new/modules/menu/xfce-registered-categories.xml.sk
--- xfdesktop4-4.3.90.1svn+r21789/modules/menu/xfce-registered-categories.xml.sk	2006-02-23 09:43:47.000000000 +0100
+++ xfdesktop4-4.3.90.1svn+r21789.new/modules/menu/xfce-registered-categories.xml.sk	2006-05-24 17:02:32.000000000 +0200
@@ -57,7 +57,7 @@
 	<category name="Profiling" builtin-icon="DEVELOPMENT" />
 	<category name="RevisionControl" replace="Revision Control" builtin-icon="DEVELOPMENT" />
 	<category name="Translation" replace="Preklad" builtin-icon="DEVELOPMENT" />
-	<category name="Office" toplevel="true" replace="Kancelária" builtin-icon="PRODUCTIVITY">
+	<category name="Office" toplevel="true" replace="Kancelária" builtin-icon="OFFICE">
 		<subcategory name="Calendar" />
 		<subcategory name="ContactManagement" />
 		<subcategory name="Database" />
@@ -74,19 +74,19 @@
 		<subcategory name="Photograph" />
 		<subcategory name="Viewer" />
 	</category>
-	<category name="Calendar" replace="Kalendár" builtin-icon="PRODUCTIVITY" />
-	<category name="ContactManagement" replace="Správca adries" builtin-icon="PRODUCTIVITY" />
-	<category name="Database" replace="Databázy" builtin-icon="PRODUCTIVITY" />
-	<category name="Dictionary" replace="Slovníky" builtin-icon="PRODUCTIVITY" />
-	<category name="Chart" builtin-icon="PRODUCTIVITY" />
-	<category name="Email" replace="Pošta" builtin-icon="PRODUCTIVITY" />
-	<category name="Finance" replace="Financie" builtin-icon="PRODUCTIVITY" />
-	<category name="FlowChart" replace="Flow Chart" builtin-icon="PRODUCTIVITY" />
-	<category name="PDA" builtin-icon="PRODUCTIVITY" />
-	<category name="ProjectManagement" replace="Project Management" builtin-icon="PRODUCTIVITY" />
-	<category name="Presentation" replace="Prezentácie" builtin-icon="PRODUCTIVITY" />
-	<category name="Spreadsheet" replace="Tabuľkový procesor" builtin-icon="PRODUCTIVITY" />
-	<category name="WordProcessor" replace="Textový procesor" builtin-icon="PRODUCTIVITY" />
+	<category name="Calendar" replace="Kalendár" builtin-icon="OFFICE" />
+	<category name="ContactManagement" replace="Správca adries" builtin-icon="OFFICE" />
+	<category name="Database" replace="Databázy" builtin-icon="OFFICE" />
+	<category name="Dictionary" replace="Slovníky" builtin-icon="OFFICE" />
+	<category name="Chart" builtin-icon="OFFICE" />
+	<category name="Email" replace="Pošta" builtin-icon="OFFICE" />
+	<category name="Finance" replace="Financie" builtin-icon="OFFICE" />
+	<category name="FlowChart" replace="Flow Chart" builtin-icon="OFFICE" />
+	<category name="PDA" builtin-icon="OFFICE" />
+	<category name="ProjectManagement" replace="Project Management" builtin-icon="OFFICE" />
+	<category name="Presentation" replace="Prezentácie" builtin-icon="OFFICE" />
+	<category name="Spreadsheet" replace="Tabuľkový procesor" builtin-icon="OFFICE" />
+	<category name="WordProcessor" replace="Textový procesor" builtin-icon="OFFICE" />
 	<category name="Graphics" toplevel="true" replace="Grafika" builtin-icon="GRAPHICS">
 		<subcategory name="2DGraphics" />
 		<subcategory name="3DGraphics" />
diff -Nru xfdesktop4-4.3.90.1svn+r21789/modules/menu/xfce-registered-categories.xml.sv xfdesktop4-4.3.90.1svn+r21789.new/modules/menu/xfce-registered-categories.xml.sv
--- xfdesktop4-4.3.90.1svn+r21789/modules/menu/xfce-registered-categories.xml.sv	2006-02-23 09:43:47.000000000 +0100
+++ xfdesktop4-4.3.90.1svn+r21789.new/modules/menu/xfce-registered-categories.xml.sv	2006-05-24 17:02:32.000000000 +0200
@@ -57,7 +57,7 @@
 	<category name="Profiling" replace="Profilering" builtin-icon="DEVELOPMENT" />
 	<category name="RevisionControl" replace="Revisionskontroll" builtin-icon="DEVELOPMENT" />
 	<category name="Translation" replace="Översättning" builtin-icon="DEVELOPMENT" />
-	<category name="Office" toplevel="true" replace="Kontor" builtin-icon="PRODUCTIVITY">
+	<category name="Office" toplevel="true" replace="Kontor" builtin-icon="OFFICE">
 		<subcategory name="Calendar" replace="Kalender" />
 		<subcategory name="ContactManagement" replace="Kontakthantering" />
 		<subcategory name="Database" replace="Databas" />
@@ -74,19 +74,19 @@
 		<subcategory name="Photograph" replace="Fotografier" />
 		<subcategory name="Viewer" replace="Visare" />
 	</category>
-	<category name="Calendar" replace="Kalender" builtin-icon="PRODUCTIVITY" />
-	<category name="ContactManagement" replace="Kontakthantering" builtin-icon="PRODUCTIVITY" />
-	<category name="Database" replace="Databas" builtin-icon="PRODUCTIVITY" />
-	<category name="Dictionary" replace="Ordlistor" builtin-icon="PRODUCTIVITY" />
-	<category name="Chart" builtin-icon="PRODUCTIVITY" />
-	<category name="Email" replace="E-post" builtin-icon="PRODUCTIVITY" />
-	<category name="Finance" replace="Finans" builtin-icon="PRODUCTIVITY" />
-	<category name="FlowChart" replace="Flow Chart" builtin-icon="PRODUCTIVITY" />
-	<category name="PDA" builtin-icon="PRODUCTIVITY" />
-	<category name="ProjectManagement" replace="Projekthantering" builtin-icon="PRODUCTIVITY" />
-	<category name="Presentation" builtin-icon="PRODUCTIVITY" />
-	<category name="Spreadsheet" replace="Kalkylprogram" builtin-icon="PRODUCTIVITY" />
-	<category name="WordProcessor" replace="Ordbehandlare" builtin-icon="PRODUCTIVITY" />
+	<category name="Calendar" replace="Kalender" builtin-icon="OFFICE" />
+	<category name="ContactManagement" replace="Kontakthantering" builtin-icon="OFFICE" />
+	<category name="Database" replace="Databas" builtin-icon="OFFICE" />
+	<category name="Dictionary" replace="Ordlistor" builtin-icon="OFFICE" />
+	<category name="Chart" builtin-icon="OFFICE" />
+	<category name="Email" replace="E-post" builtin-icon="OFFICE" />
+	<category name="Finance" replace="Finans" builtin-icon="OFFICE" />
+	<category name="FlowChart" replace="Flow Chart" builtin-icon="OFFICE" />
+	<category name="PDA" builtin-icon="OFFICE" />
+	<category name="ProjectManagement" replace="Projekthantering" builtin-icon="OFFICE" />
+	<category name="Presentation" builtin-icon="OFFICE" />
+	<category name="Spreadsheet" replace="Kalkylprogram" builtin-icon="OFFICE" />
+	<category name="WordProcessor" replace="Ordbehandlare" builtin-icon="OFFICE" />
 	<category name="Graphics" toplevel="true" replace="Grafik" builtin-icon="GRAPHICS">
 		<subcategory name="2DGraphics" replace="2d-grafik" />
 		<subcategory name="3DGraphics" replace="3d-grafik" />
diff -Nru xfdesktop4-4.3.90.1svn+r21789/modules/menu/xfce-registered-categories.xml.zh_CN xfdesktop4-4.3.90.1svn+r21789.new/modules/menu/xfce-registered-categories.xml.zh_CN
--- xfdesktop4-4.3.90.1svn+r21789/modules/menu/xfce-registered-categories.xml.zh_CN	2006-02-23 09:43:47.000000000 +0100
+++ xfdesktop4-4.3.90.1svn+r21789.new/modules/menu/xfce-registered-categories.xml.zh_CN	2006-05-24 17:02:32.000000000 +0200
@@ -57,7 +57,7 @@
 	<category name="Profiling" replace="性能分析" builtin-icon="DEVELOPMENT" />
 	<category name="RevisionControl" replace="版本控制" builtin-icon="DEVELOPMENT" />
 	<category name="Translation" replace="翻译" builtin-icon="DEVELOPMENT" />
-	<category name="Office" toplevel="true" replace="办å
¬" builtin-icon="PRODUCTIVITY">
+	<category name="Office" toplevel="true" replace="办å
¬" builtin-icon="OFFICE">
 		<subcategory name="Calendar" />
 		<subcategory name="ContactManagement" />
 		<subcategory name="Database" />
@@ -74,19 +74,19 @@
 		<subcategory name="Photograph" />
 		<subcategory name="Viewer" />
 	</category>
-	<category name="Calendar" replace="日历" builtin-icon="PRODUCTIVITY" />
-	<category name="ContactManagement" replace="联系人管理" builtin-icon="PRODUCTIVITY" />
-	<category name="Database" replace="数据库" builtin-icon="PRODUCTIVITY" />
-	<category name="Dictionary" replace="å­—å
¸" builtin-icon="PRODUCTIVITY" />
-	<category name="Chart" replace="图表" builtin-icon="PRODUCTIVITY" />
-	<category name="Email" replace="电子邮件" builtin-icon="PRODUCTIVITY" />
-	<category name="Finance" replace="财务" builtin-icon="PRODUCTIVITY" />
-	<category name="FlowChart" replace="流程图" builtin-icon="PRODUCTIVITY" />
-	<category name="PDA" replace="个人电子助理" builtin-icon="PRODUCTIVITY" />
-	<category name="ProjectManagement" replace="项目管理" builtin-icon="PRODUCTIVITY" />
-	<category name="Presentation" replace="演示" builtin-icon="PRODUCTIVITY" />
-	<category name="Spreadsheet" replace="电子表格" builtin-icon="PRODUCTIVITY" />
-	<category name="WordProcessor" replace="字处理" builtin-icon="PRODUCTIVITY" />
+	<category name="Calendar" replace="日历" builtin-icon="OFFICE" />
+	<category name="ContactManagement" replace="联系人管理" builtin-icon="OFFICE" />
+	<category name="Database" replace="数据库" builtin-icon="OFFICE" />
+	<category name="Dictionary" replace="å­—å
¸" builtin-icon="OFFICE" />
+	<category name="Chart" replace="图表" builtin-icon="OFFICE" />
+	<category name="Email" replace="电子邮件" builtin-icon="OFFICE" />
+	<category name="Finance" replace="财务" builtin-icon="OFFICE" />
+	<category name="FlowChart" replace="流程图" builtin-icon="OFFICE" />
+	<category name="PDA" replace="个人电子助理" builtin-icon="OFFICE" />
+	<category name="ProjectManagement" replace="项目管理" builtin-icon="OFFICE" />
+	<category name="Presentation" replace="演示" builtin-icon="OFFICE" />
+	<category name="Spreadsheet" replace="电子表格" builtin-icon="OFFICE" />
+	<category name="WordProcessor" replace="字处理" builtin-icon="OFFICE" />
 	<category name="Graphics" replace="图形" toplevel="true" builtin-icon="GRAPHICS">
 		<subcategory name="2DGraphics" />
 		<subcategory name="3DGraphics" />
diff -Nru xfdesktop4-4.3.90.1svn+r21789/modules/menu/xfce-registered-categories.xml.zh_TW xfdesktop4-4.3.90.1svn+r21789.new/modules/menu/xfce-registered-categories.xml.zh_TW
--- xfdesktop4-4.3.90.1svn+r21789/modules/menu/xfce-registered-categories.xml.zh_TW	2006-02-23 09:43:47.000000000 +0100
+++ xfdesktop4-4.3.90.1svn+r21789.new/modules/menu/xfce-registered-categories.xml.zh_TW	2006-05-24 17:02:32.000000000 +0200
@@ -57,7 +57,7 @@
 	<category name="Profiling" builtin-icon="DEVELOPMENT" />
 	<category name="RevisionControl" replace="Revision Control" builtin-icon="DEVELOPMENT" />
 	<category name="Translation" replace="翻譯" builtin-icon="DEVELOPMENT" />
-	<category name="Office" toplevel="true" builtin-icon="PRODUCTIVITY">
+	<category name="Office" toplevel="true" builtin-icon="OFFICE">
 		<subcategory name="Calendar" />
 		<subcategory name="ContactManagement" />
 		<subcategory name="Database" />
@@ -74,19 +74,19 @@
 		<subcategory name="Photograph" />
 		<subcategory name="Viewer" />
 	</category>
-	<category name="Calendar" replace="日曆" builtin-icon="PRODUCTIVITY" />
-	<category name="ContactManagement" replace="聯絡人管理" builtin-icon="PRODUCTIVITY" />
-	<category name="Database" replace="資料庫" builtin-icon="PRODUCTIVITY" />
-	<category name="Dictionary" replace="å­—å
¸" builtin-icon="PRODUCTIVITY" />
-	<category name="Chart" replace="圖表" builtin-icon="PRODUCTIVITY" />
-	<category name="Email" replace="電子郵件" builtin-icon="PRODUCTIVITY" />
-	<category name="Finance" replace="財務" builtin-icon="PRODUCTIVITY" />
-	<category name="FlowChart" replace="流程圖" builtin-icon="PRODUCTIVITY" />
-	<category name="PDA" builtin-icon="PRODUCTIVITY" />
-	<category name="ProjectManagement" replace="專案管理" builtin-icon="PRODUCTIVITY" />
-	<category name="Presentation" builtin-icon="PRODUCTIVITY" />
-	<category name="Spreadsheet" replace="試算表" builtin-icon="PRODUCTIVITY" />
-	<category name="WordProcessor" replace="文書處理" builtin-icon="PRODUCTIVITY" />
+	<category name="Calendar" replace="日曆" builtin-icon="OFFICE" />
+	<category name="ContactManagement" replace="聯絡人管理" builtin-icon="OFFICE" />
+	<category name="Database" replace="資料庫" builtin-icon="OFFICE" />
+	<category name="Dictionary" replace="å­—å
¸" builtin-icon="OFFICE" />
+	<category name="Chart" replace="圖表" builtin-icon="OFFICE" />
+	<category name="Email" replace="電子郵件" builtin-icon="OFFICE" />
+	<category name="Finance" replace="財務" builtin-icon="OFFICE" />
+	<category name="FlowChart" replace="流程圖" builtin-icon="OFFICE" />
+	<category name="PDA" builtin-icon="OFFICE" />
+	<category name="ProjectManagement" replace="專案管理" builtin-icon="OFFICE" />
+	<category name="Presentation" builtin-icon="OFFICE" />
+	<category name="Spreadsheet" replace="試算表" builtin-icon="OFFICE" />
+	<category name="WordProcessor" replace="文書處理" builtin-icon="OFFICE" />
 	<category name="Graphics" replace="繪圖" toplevel="true" builtin-icon="GRAPHICS">
 		<subcategory name="2DGraphics" />
 		<subcategory name="3DGraphics" />









-------------- next part --------------
A non-text attachment was scrubbed...
Name: legacy-icon-mapping.xml
Type: text/xml
Size: 32103 bytes
Desc: not available
URL: <http://mail.xfce.org/pipermail/xfce4-dev/attachments/20060525/95416065/attachment.xml>
-------------- next part --------------
diff -Nru xfce4-mixer-4.3.90.1svn+r21697.orig/settings/sound.c xfce4-mixer-4.3.90.1svn+r21697/settings/sound.c
--- xfce4-mixer-4.3.90.1svn+r21697.orig/settings/sound.c	2006-05-25 07:37:08.000000000 +0200
+++ xfce4-mixer-4.3.90.1svn+r21697/settings/sound.c	2006-05-25 07:38:25.000000000 +0200
@@ -82,7 +82,7 @@
 	plugin->run_dialog = run_dialog;
 	plugin->icon = xfce_themed_icon_load ("xfce4-mixer", 48);
   if (G_LIKELY (plugin->icon != NULL))
-    g_object_set_data_full (G_OBJECT (plugin->icon), "mcs-plugin-icon-name", g_strdup ("xfce4-mixer"), g_free);
+    g_object_set_data_full (G_OBJECT (plugin->icon), "mcs-plugin-icon-name", g_strdup ("xfce-sound"), g_free);
 	
 	register_vcs ();
 
@@ -108,7 +108,7 @@
 	gtk_widget_show (GTK_WIDGET (sb));
 	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), GTK_WIDGET (sb), TRUE, FALSE, 6);
 
-	gtk_window_set_icon_name (GTK_WINDOW (dialog), "xfce4-mixer");
+	gtk_window_set_icon_name (GTK_WINDOW (dialog), "xfce-sound");
 	gtk_window_set_position (GTK_WINDOW(dialog), GTK_WIN_POS_CENTER);
 	gtk_window_set_resizable (GTK_WINDOW(dialog), FALSE);
 	
diff -Nru xfce4-mixer-4.3.90.1svn+r21697.orig/settings/xfce-mixer-settings.desktop.in xfce4-mixer-4.3.90.1svn+r21697/settings/xfce-mixer-settings.desktop.in
--- xfce4-mixer-4.3.90.1svn+r21697.orig/settings/xfce-mixer-settings.desktop.in	2006-05-25 07:37:08.000000000 +0200
+++ xfce4-mixer-4.3.90.1svn+r21697/settings/xfce-mixer-settings.desktop.in	2006-05-25 07:39:34.000000000 +0200
@@ -3,7 +3,7 @@
 _Name=Xfce 4 Mixer Settings
 _Comment=Mixer Settings
 Exec=xfce-setting-show sound
-Icon=xfce4-mixer
+Icon=xfce-sound
 Terminal=false
 Type=Application
 Categories=X-XFCE;Settings;DesktopSettings;



More information about the Xfce4-dev mailing list