Update to 2.13.3.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5277 df743ca5-7f9a-e211-a948-0013205c9059

8 files changed, 26 insertions, 168 deletions

diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 444f46205..bac3eaac8 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnomepanel/Makefile,v 1.112 2005/11/16 01:55:05 marcus Exp $
+#   $MCom: ports/x11/gnomepanel/Makefile,v 1.113 2005/11/22 07:52:11 marcus Exp $
 #
 
 PORTNAME=	gnomepanel
-PORTVERSION=	2.13.2
-PORTREVISION=	1
+PORTVERSION=	2.13.3
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-panel/2.13
diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo
index 5eb57d812..b1745ee62 100644
--- a/x11/gnome-panel/distinfo
+++ b/x11/gnome-panel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-panel-2.13.2.tar.bz2) = 094638531a956ab501d0dc0a9c071d7d
-SHA256 (gnome2/gnome-panel-2.13.2.tar.bz2) = 3f6f9f95626e0b75b766f85ccd56fd2200ed1b5eee5ad5dc6496a45fd5716a98
-SIZE (gnome2/gnome-panel-2.13.2.tar.bz2) = 2470582
+MD5 (gnome2/gnome-panel-2.13.3.tar.bz2) = 55d8339ee3414533ce5cef1166bc1318
+SHA256 (gnome2/gnome-panel-2.13.3.tar.bz2) = 3c545a72be7ce6662e330f67cd9e923e99a73d732790864fbc22cb967e90d6e7
+SIZE (gnome2/gnome-panel-2.13.3.tar.bz2) = 2469521
diff --git a/x11/gnome-panel/files/patch-applets_clock_clock.c b/x11/gnome-panel/files/patch-applets_clock_clock.c
index 4c9d37b61..981e4b4f2 100644
--- a/x11/gnome-panel/files/patch-applets_clock_clock.c
+++ b/x11/gnome-panel/files/patch-applets_clock_clock.c
@@ -22,63 +22,3 @@
          return (am[0] == '\0') ? CLOCK_FORMAT_24 : CLOCK_FORMAT_12;
  }
  
-@@ -1319,7 +1325,7 @@ add_appointments_and_tasks (ClockData *c
-         update_frame_visibility (cd->appointment_list, GTK_TREE_MODEL (cd->appointments_model));
- 
-         switch (cd->orient) {
--        case PANEL_APPLET_ORIENT_DOWN:
-+	case PANEL_APPLET_ORIENT_UP:
-                 gtk_box_pack_start (GTK_BOX (vbox), cd->appointment_list, TRUE, TRUE, 0);
-                 gtk_box_pack_start (GTK_BOX (vbox), cd->task_list, TRUE, TRUE, 0);
-                 break;
-@@ -1409,7 +1415,7 @@ create_calendar (ClockData *cd,
-         gtk_calendar_select_day (GTK_CALENDAR (cd->calendar), tm->tm_mday);
- 
- 	switch (cd->orient) {
--        case PANEL_APPLET_ORIENT_DOWN:
-+	case PANEL_APPLET_ORIENT_UP:
-                 add_appointments_and_tasks (cd, vbox);
-                 gtk_box_pack_start (GTK_BOX (vbox), cd->calendar, TRUE, FALSE, 0);
-                 break;
-@@ -1498,7 +1504,7 @@ position_calendar_popup (ClockData *cd,
- 			gravity = GDK_GRAVITY_NORTH_EAST;
- 
- 		break;
--	case PANEL_APPLET_ORIENT_UP:
-+	case PANEL_APPLET_ORIENT_DOWN:
- 		y += button_h;
- 		if ((x + w) > monitor.x + monitor.width)
- 			x -= (x + w) - (monitor.x + monitor.width);
-@@ -1506,7 +1512,7 @@ position_calendar_popup (ClockData *cd,
- 		gravity = GDK_GRAVITY_NORTH_WEST;
- 
- 		break;
--	case PANEL_APPLET_ORIENT_DOWN:
-+	case PANEL_APPLET_ORIENT_UP:
- 		y -= h;
- 		if ((x + w) > monitor.x + monitor.width)
- 			x -= (x + w) - (monitor.x + monitor.width);
-@@ -1657,9 +1663,9 @@ create_clock_widget (ClockData *cd)
- 	cd->orient = panel_applet_get_orient (PANEL_APPLET (cd->applet));
- 
- 	/* Initialize label orientation */
--	if (cd->orient == PANEL_APPLET_ORIENT_LEFT)
-+	if (cd->orient == PANEL_APPLET_ORIENT_RIGHT)
- 		gtk_label_set_angle (GTK_LABEL (cd->clockw), 90);
--	else if (cd->orient == PANEL_APPLET_ORIENT_RIGHT)
-+	else if (cd->orient == PANEL_APPLET_ORIENT_LEFT)
- 		gtk_label_set_angle (GTK_LABEL (cd->clockw), 270);
- 	else
- 		gtk_label_set_angle (GTK_LABEL (cd->clockw), 0);
-@@ -1686,9 +1692,9 @@ applet_change_orient (PanelApplet       
- {
-         cd->orient = orient;
-         
--        if (cd->orient == PANEL_APPLET_ORIENT_LEFT)
-+	if (cd->orient == PANEL_APPLET_ORIENT_RIGHT)
-                 gtk_label_set_angle (GTK_LABEL (cd->clockw), 90);
--        else if (cd->orient == PANEL_APPLET_ORIENT_RIGHT)
-+	else if (cd->orient == PANEL_APPLET_ORIENT_LEFT)
-                 gtk_label_set_angle (GTK_LABEL (cd->clockw), 270);
-         else
-                 gtk_label_set_angle (GTK_LABEL (cd->clockw), 0);
diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist
index 2604d6b91..79253377b 100644
--- a/x11/gnome-panel/pkg-plist
+++ b/x11/gnome-panel/pkg-plist
@@ -96,10 +96,6 @@ share/gnome/help/fish-applet-2/de/figures/fish_applet.png
 share/gnome/help/fish-applet-2/de/figures/fish_settings.png
 share/gnome/help/fish-applet-2/de/fish-applet-2.xml
 share/gnome/help/fish-applet-2/de/legal.xml
-share/gnome/help/fish-applet-2/fr/figures/fish_applet.png
-share/gnome/help/fish-applet-2/fr/figures/fish_settings.png
-share/gnome/help/fish-applet-2/fr/fish-applet-2.xml
-share/gnome/help/fish-applet-2/fr/legal.xml
 share/gnome/help/fish-applet-2/ja/figures/fish_applet.png
 share/gnome/help/fish-applet-2/ja/fish-applet-2.xml
 share/gnome/help/fish-applet-2/ja/legal.xml
@@ -125,6 +121,9 @@ share/gnome/help/fish/C/legal.xml
 share/gnome/help/fish/es/figures/fish_applet.png
 share/gnome/help/fish/es/fish.xml
 share/gnome/help/fish/es/legal.xml
+share/gnome/help/fish/fr/figures/fish_applet.png
+share/gnome/help/fish/fr/fish.xml
+share/gnome/help/fish/fr/legal.xml
 share/gnome/help/fish/it/figures/fish_applet.png
 share/gnome/help/fish/it/fish.xml
 share/gnome/help/fish/it/legal.xml
@@ -145,7 +144,6 @@ share/gnome/help/window-list/es/figures/window_list_group_applet.png
 share/gnome/help/window-list/es/legal.xml
 share/gnome/help/window-list/es/window-list.xml
 share/gnome/help/window-list/fr/figures/window_list_applet.png
-share/gnome/help/window-list/fr/figures/window_list_group.png
 share/gnome/help/window-list/fr/figures/window_list_group_applet.png
 share/gnome/help/window-list/fr/legal.xml
 share/gnome/help/window-list/fr/window-list.xml
@@ -191,10 +189,6 @@ share/gnome/help/workspace-switcher/de/workspace-switcher.xml
 share/gnome/help/workspace-switcher/es/figures/workspace_switcher_applet.png
 share/gnome/help/workspace-switcher/es/legal.xml
 share/gnome/help/workspace-switcher/es/workspace-switcher.xml
-share/gnome/help/workspace-switcher/fr/figures/workspace_switcher_applet.png
-share/gnome/help/workspace-switcher/fr/figures/workspacelist_applet.png
-share/gnome/help/workspace-switcher/fr/legal.xml
-share/gnome/help/workspace-switcher/fr/workspace-switcher.xml
 share/gnome/help/workspace-switcher/it/figures/workspace_switcher_applet.png
 share/gnome/help/workspace-switcher/it/legal.xml
 share/gnome/help/workspace-switcher/it/workspace-switcher.xml
@@ -227,8 +221,8 @@ share/gnome/idl/gnome-panel-2.0/GNOME_Panel.idl
 share/gnome/omf/clock/clock-C.omf
 share/gnome/omf/clock/clock-de.omf
 share/gnome/omf/clock/clock-es.omf
-share/gnome/omf/clock/clock-it.omf
 share/gnome/omf/clock/clock-fr.omf
+share/gnome/omf/clock/clock-it.omf
 share/gnome/omf/clock/clock-ja.omf
 share/gnome/omf/clock/clock-ko.omf
 share/gnome/omf/clock/clock-nl.omf
@@ -240,31 +234,28 @@ share/gnome/omf/clock/clock-zh_CN.omf
 share/gnome/omf/clock/clock-zh_TW.omf
 share/gnome/omf/fish/fish-C.omf
 share/gnome/omf/fish/fish-es.omf
+share/gnome/omf/fish/fish-fr.omf
 share/gnome/omf/fish/fish-it.omf
 share/gnome/omf/fish/fish-uk.omf
 share/gnome/omf/gnome-panel/clock-de.omf
-share/gnome/omf/gnome-panel/clock-fr.omf
 share/gnome/omf/gnome-panel/clock-ja.omf
 share/gnome/omf/gnome-panel/clock-ko.omf
 share/gnome/omf/gnome-panel/clock-sv.omf
 share/gnome/omf/gnome-panel/clock-zh_CN.omf
 share/gnome/omf/gnome-panel/clock-zh_TW.omf
 share/gnome/omf/gnome-panel/fish-applet-2-de.omf
-share/gnome/omf/gnome-panel/fish-applet-2-fr.omf
 share/gnome/omf/gnome-panel/fish-applet-2-ja.omf
 share/gnome/omf/gnome-panel/fish-applet-2-ko.omf
 share/gnome/omf/gnome-panel/fish-applet-2-sv.omf
 share/gnome/omf/gnome-panel/fish-applet-2-zh_CN.omf
 share/gnome/omf/gnome-panel/fish-applet-2-zh_TW.omf
 share/gnome/omf/gnome-panel/window-list-de.omf
-share/gnome/omf/gnome-panel/window-list-fr.omf
 share/gnome/omf/gnome-panel/window-list-ja.omf
 share/gnome/omf/gnome-panel/window-list-ko.omf
 share/gnome/omf/gnome-panel/window-list-sv.omf
 share/gnome/omf/gnome-panel/window-list-zh_CN.omf
 share/gnome/omf/gnome-panel/window-list-zh_TW.omf
 share/gnome/omf/gnome-panel/workspace-switcher-de.omf
-share/gnome/omf/gnome-panel/workspace-switcher-fr.omf
 share/gnome/omf/gnome-panel/workspace-switcher-ja.omf
 share/gnome/omf/gnome-panel/workspace-switcher-ko.omf
 share/gnome/omf/gnome-panel/workspace-switcher-sv.omf
@@ -272,6 +263,7 @@ share/gnome/omf/gnome-panel/workspace-switcher-zh_CN.omf
 share/gnome/omf/gnome-panel/workspace-switcher-zh_TW.omf
 share/gnome/omf/window-list/window-list-C.omf
 share/gnome/omf/window-list/window-list-es.omf
+share/gnome/omf/window-list/window-list-fr.omf
 share/gnome/omf/window-list/window-list-it.omf
 share/gnome/omf/window-list/window-list-uk.omf
 share/gnome/omf/workspace-switcher/workspace-switcher-C.omf
@@ -418,8 +410,6 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrm share/gnome/help/workspace-switcher/ja
 @dirrm share/gnome/help/workspace-switcher/it/figures
 @dirrm share/gnome/help/workspace-switcher/it
-@dirrm share/gnome/help/workspace-switcher/fr/figures
-@dirrm share/gnome/help/workspace-switcher/fr
 @dirrm share/gnome/help/workspace-switcher/es/figures
 @dirrm share/gnome/help/workspace-switcher/es
 @dirrm share/gnome/help/workspace-switcher/de/figures
@@ -460,8 +450,6 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrm share/gnome/help/fish-applet-2/ko
 @dirrm share/gnome/help/fish-applet-2/ja/figures
 @dirrm share/gnome/help/fish-applet-2/ja
-@dirrm share/gnome/help/fish-applet-2/fr/figures
-@dirrm share/gnome/help/fish-applet-2/fr
 @dirrm share/gnome/help/fish-applet-2/de/figures
 @dirrm share/gnome/help/fish-applet-2/de
 @dirrm share/gnome/help/fish-applet-2
@@ -469,6 +457,8 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrm share/gnome/help/fish/uk
 @dirrm share/gnome/help/fish/it/figures
 @dirrm share/gnome/help/fish/it
+@dirrm share/gnome/help/fish/fr/figures
+@dirrm share/gnome/help/fish/fr
 @dirrm share/gnome/help/fish/es/figures
 @dirrm share/gnome/help/fish/es
 @dirrm share/gnome/help/fish/C/figures
diff --git a/x11/gnomepanel/Makefile b/x11/gnomepanel/Makefile
index 444f46205..bac3eaac8 100644
--- a/x11/gnomepanel/Makefile
+++ b/x11/gnomepanel/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnomepanel/Makefile,v 1.112 2005/11/16 01:55:05 marcus Exp $
+#   $MCom: ports/x11/gnomepanel/Makefile,v 1.113 2005/11/22 07:52:11 marcus Exp $
 #
 
 PORTNAME=	gnomepanel
-PORTVERSION=	2.13.2
-PORTREVISION=	1
+PORTVERSION=	2.13.3
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-panel/2.13
diff --git a/x11/gnomepanel/distinfo b/x11/gnomepanel/distinfo
index 5eb57d812..b1745ee62 100644
--- a/x11/gnomepanel/distinfo
+++ b/x11/gnomepanel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-panel-2.13.2.tar.bz2) = 094638531a956ab501d0dc0a9c071d7d
-SHA256 (gnome2/gnome-panel-2.13.2.tar.bz2) = 3f6f9f95626e0b75b766f85ccd56fd2200ed1b5eee5ad5dc6496a45fd5716a98
-SIZE (gnome2/gnome-panel-2.13.2.tar.bz2) = 2470582
+MD5 (gnome2/gnome-panel-2.13.3.tar.bz2) = 55d8339ee3414533ce5cef1166bc1318
+SHA256 (gnome2/gnome-panel-2.13.3.tar.bz2) = 3c545a72be7ce6662e330f67cd9e923e99a73d732790864fbc22cb967e90d6e7
+SIZE (gnome2/gnome-panel-2.13.3.tar.bz2) = 2469521
diff --git a/x11/gnomepanel/files/patch-applets_clock_clock.c b/x11/gnomepanel/files/patch-applets_clock_clock.c
index 4c9d37b61..981e4b4f2 100644
--- a/x11/gnomepanel/files/patch-applets_clock_clock.c
+++ b/x11/gnomepanel/files/patch-applets_clock_clock.c
@@ -22,63 +22,3 @@
          return (am[0] == '\0') ? CLOCK_FORMAT_24 : CLOCK_FORMAT_12;
  }
  
-@@ -1319,7 +1325,7 @@ add_appointments_and_tasks (ClockData *c
-         update_frame_visibility (cd->appointment_list, GTK_TREE_MODEL (cd->appointments_model));
- 
-         switch (cd->orient) {
--        case PANEL_APPLET_ORIENT_DOWN:
-+	case PANEL_APPLET_ORIENT_UP:
-                 gtk_box_pack_start (GTK_BOX (vbox), cd->appointment_list, TRUE, TRUE, 0);
-                 gtk_box_pack_start (GTK_BOX (vbox), cd->task_list, TRUE, TRUE, 0);
-                 break;
-@@ -1409,7 +1415,7 @@ create_calendar (ClockData *cd,
-         gtk_calendar_select_day (GTK_CALENDAR (cd->calendar), tm->tm_mday);
- 
- 	switch (cd->orient) {
--        case PANEL_APPLET_ORIENT_DOWN:
-+	case PANEL_APPLET_ORIENT_UP:
-                 add_appointments_and_tasks (cd, vbox);
-                 gtk_box_pack_start (GTK_BOX (vbox), cd->calendar, TRUE, FALSE, 0);
-                 break;
-@@ -1498,7 +1504,7 @@ position_calendar_popup (ClockData *cd,
- 			gravity = GDK_GRAVITY_NORTH_EAST;
- 
- 		break;
--	case PANEL_APPLET_ORIENT_UP:
-+	case PANEL_APPLET_ORIENT_DOWN:
- 		y += button_h;
- 		if ((x + w) > monitor.x + monitor.width)
- 			x -= (x + w) - (monitor.x + monitor.width);
-@@ -1506,7 +1512,7 @@ position_calendar_popup (ClockData *cd,
- 		gravity = GDK_GRAVITY_NORTH_WEST;
- 
- 		break;
--	case PANEL_APPLET_ORIENT_DOWN:
-+	case PANEL_APPLET_ORIENT_UP:
- 		y -= h;
- 		if ((x + w) > monitor.x + monitor.width)
- 			x -= (x + w) - (monitor.x + monitor.width);
-@@ -1657,9 +1663,9 @@ create_clock_widget (ClockData *cd)
- 	cd->orient = panel_applet_get_orient (PANEL_APPLET (cd->applet));
- 
- 	/* Initialize label orientation */
--	if (cd->orient == PANEL_APPLET_ORIENT_LEFT)
-+	if (cd->orient == PANEL_APPLET_ORIENT_RIGHT)
- 		gtk_label_set_angle (GTK_LABEL (cd->clockw), 90);
--	else if (cd->orient == PANEL_APPLET_ORIENT_RIGHT)
-+	else if (cd->orient == PANEL_APPLET_ORIENT_LEFT)
- 		gtk_label_set_angle (GTK_LABEL (cd->clockw), 270);
- 	else
- 		gtk_label_set_angle (GTK_LABEL (cd->clockw), 0);
-@@ -1686,9 +1692,9 @@ applet_change_orient (PanelApplet       
- {
-         cd->orient = orient;
-         
--        if (cd->orient == PANEL_APPLET_ORIENT_LEFT)
-+	if (cd->orient == PANEL_APPLET_ORIENT_RIGHT)
-                 gtk_label_set_angle (GTK_LABEL (cd->clockw), 90);
--        else if (cd->orient == PANEL_APPLET_ORIENT_RIGHT)
-+	else if (cd->orient == PANEL_APPLET_ORIENT_LEFT)
-                 gtk_label_set_angle (GTK_LABEL (cd->clockw), 270);
-         else
-                 gtk_label_set_angle (GTK_LABEL (cd->clockw), 0);
diff --git a/x11/gnomepanel/pkg-plist b/x11/gnomepanel/pkg-plist
index 2604d6b91..79253377b 100644
--- a/x11/gnomepanel/pkg-plist
+++ b/x11/gnomepanel/pkg-plist
@@ -96,10 +96,6 @@ share/gnome/help/fish-applet-2/de/figures/fish_applet.png
 share/gnome/help/fish-applet-2/de/figures/fish_settings.png
 share/gnome/help/fish-applet-2/de/fish-applet-2.xml
 share/gnome/help/fish-applet-2/de/legal.xml
-share/gnome/help/fish-applet-2/fr/figures/fish_applet.png
-share/gnome/help/fish-applet-2/fr/figures/fish_settings.png
-share/gnome/help/fish-applet-2/fr/fish-applet-2.xml
-share/gnome/help/fish-applet-2/fr/legal.xml
 share/gnome/help/fish-applet-2/ja/figures/fish_applet.png
 share/gnome/help/fish-applet-2/ja/fish-applet-2.xml
 share/gnome/help/fish-applet-2/ja/legal.xml
@@ -125,6 +121,9 @@ share/gnome/help/fish/C/legal.xml
 share/gnome/help/fish/es/figures/fish_applet.png
 share/gnome/help/fish/es/fish.xml
 share/gnome/help/fish/es/legal.xml
+share/gnome/help/fish/fr/figures/fish_applet.png
+share/gnome/help/fish/fr/fish.xml
+share/gnome/help/fish/fr/legal.xml
 share/gnome/help/fish/it/figures/fish_applet.png
 share/gnome/help/fish/it/fish.xml
 share/gnome/help/fish/it/legal.xml
@@ -145,7 +144,6 @@ share/gnome/help/window-list/es/figures/window_list_group_applet.png
 share/gnome/help/window-list/es/legal.xml
 share/gnome/help/window-list/es/window-list.xml
 share/gnome/help/window-list/fr/figures/window_list_applet.png
-share/gnome/help/window-list/fr/figures/window_list_group.png
 share/gnome/help/window-list/fr/figures/window_list_group_applet.png
 share/gnome/help/window-list/fr/legal.xml
 share/gnome/help/window-list/fr/window-list.xml
@@ -191,10 +189,6 @@ share/gnome/help/workspace-switcher/de/workspace-switcher.xml
 share/gnome/help/workspace-switcher/es/figures/workspace_switcher_applet.png
 share/gnome/help/workspace-switcher/es/legal.xml
 share/gnome/help/workspace-switcher/es/workspace-switcher.xml
-share/gnome/help/workspace-switcher/fr/figures/workspace_switcher_applet.png
-share/gnome/help/workspace-switcher/fr/figures/workspacelist_applet.png
-share/gnome/help/workspace-switcher/fr/legal.xml
-share/gnome/help/workspace-switcher/fr/workspace-switcher.xml
 share/gnome/help/workspace-switcher/it/figures/workspace_switcher_applet.png
 share/gnome/help/workspace-switcher/it/legal.xml
 share/gnome/help/workspace-switcher/it/workspace-switcher.xml
@@ -227,8 +221,8 @@ share/gnome/idl/gnome-panel-2.0/GNOME_Panel.idl
 share/gnome/omf/clock/clock-C.omf
 share/gnome/omf/clock/clock-de.omf
 share/gnome/omf/clock/clock-es.omf
-share/gnome/omf/clock/clock-it.omf
 share/gnome/omf/clock/clock-fr.omf
+share/gnome/omf/clock/clock-it.omf
 share/gnome/omf/clock/clock-ja.omf
 share/gnome/omf/clock/clock-ko.omf
 share/gnome/omf/clock/clock-nl.omf
@@ -240,31 +234,28 @@ share/gnome/omf/clock/clock-zh_CN.omf
 share/gnome/omf/clock/clock-zh_TW.omf
 share/gnome/omf/fish/fish-C.omf
 share/gnome/omf/fish/fish-es.omf
+share/gnome/omf/fish/fish-fr.omf
 share/gnome/omf/fish/fish-it.omf
 share/gnome/omf/fish/fish-uk.omf
 share/gnome/omf/gnome-panel/clock-de.omf
-share/gnome/omf/gnome-panel/clock-fr.omf
 share/gnome/omf/gnome-panel/clock-ja.omf
 share/gnome/omf/gnome-panel/clock-ko.omf
 share/gnome/omf/gnome-panel/clock-sv.omf
 share/gnome/omf/gnome-panel/clock-zh_CN.omf
 share/gnome/omf/gnome-panel/clock-zh_TW.omf
 share/gnome/omf/gnome-panel/fish-applet-2-de.omf
-share/gnome/omf/gnome-panel/fish-applet-2-fr.omf
 share/gnome/omf/gnome-panel/fish-applet-2-ja.omf
 share/gnome/omf/gnome-panel/fish-applet-2-ko.omf
 share/gnome/omf/gnome-panel/fish-applet-2-sv.omf
 share/gnome/omf/gnome-panel/fish-applet-2-zh_CN.omf
 share/gnome/omf/gnome-panel/fish-applet-2-zh_TW.omf
 share/gnome/omf/gnome-panel/window-list-de.omf
-share/gnome/omf/gnome-panel/window-list-fr.omf
 share/gnome/omf/gnome-panel/window-list-ja.omf
 share/gnome/omf/gnome-panel/window-list-ko.omf
 share/gnome/omf/gnome-panel/window-list-sv.omf
 share/gnome/omf/gnome-panel/window-list-zh_CN.omf
 share/gnome/omf/gnome-panel/window-list-zh_TW.omf
 share/gnome/omf/gnome-panel/workspace-switcher-de.omf
-share/gnome/omf/gnome-panel/workspace-switcher-fr.omf
 share/gnome/omf/gnome-panel/workspace-switcher-ja.omf
 share/gnome/omf/gnome-panel/workspace-switcher-ko.omf
 share/gnome/omf/gnome-panel/workspace-switcher-sv.omf
@@ -272,6 +263,7 @@ share/gnome/omf/gnome-panel/workspace-switcher-zh_CN.omf
 share/gnome/omf/gnome-panel/workspace-switcher-zh_TW.omf
 share/gnome/omf/window-list/window-list-C.omf
 share/gnome/omf/window-list/window-list-es.omf
+share/gnome/omf/window-list/window-list-fr.omf
 share/gnome/omf/window-list/window-list-it.omf
 share/gnome/omf/window-list/window-list-uk.omf
 share/gnome/omf/workspace-switcher/workspace-switcher-C.omf
@@ -418,8 +410,6 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrm share/gnome/help/workspace-switcher/ja
 @dirrm share/gnome/help/workspace-switcher/it/figures
 @dirrm share/gnome/help/workspace-switcher/it
-@dirrm share/gnome/help/workspace-switcher/fr/figures
-@dirrm share/gnome/help/workspace-switcher/fr
 @dirrm share/gnome/help/workspace-switcher/es/figures
 @dirrm share/gnome/help/workspace-switcher/es
 @dirrm share/gnome/help/workspace-switcher/de/figures
@@ -460,8 +450,6 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrm share/gnome/help/fish-applet-2/ko
 @dirrm share/gnome/help/fish-applet-2/ja/figures
 @dirrm share/gnome/help/fish-applet-2/ja
-@dirrm share/gnome/help/fish-applet-2/fr/figures
-@dirrm share/gnome/help/fish-applet-2/fr
 @dirrm share/gnome/help/fish-applet-2/de/figures
 @dirrm share/gnome/help/fish-applet-2/de
 @dirrm share/gnome/help/fish-applet-2
@@ -469,6 +457,8 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrm share/gnome/help/fish/uk
 @dirrm share/gnome/help/fish/it/figures
 @dirrm share/gnome/help/fish/it
+@dirrm share/gnome/help/fish/fr/figures
+@dirrm share/gnome/help/fish/fr
 @dirrm share/gnome/help/fish/es/figures
 @dirrm share/gnome/help/fish/es
 @dirrm share/gnome/help/fish/C/figures