Update to 2.3.1. Say good-bye to libzvt support for good.

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

8 files changed, 168 insertions, 46 deletions

diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index 468867ad1..3e358b1f1 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -6,16 +6,15 @@
 #
 
 PORTNAME=	gnometerminal
-PORTVERSION=	2.2.1
-PORTREVISION=	1
+PORTVERSION=	2.3.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-terminal/2.2
+MASTER_SITE_SUBDIR=	sources/gnome-terminal/2.3
 DISTNAME=	gnome-terminal-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Terminal component for the GNOME 2.0 Desktop
+COMMENT=	Terminal component for the GNOME 2 Desktop
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
@@ -24,7 +23,7 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier libgnomeui vte
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git a/x11/gnome-terminal/distinfo b/x11/gnome-terminal/distinfo
index bb26f7157..bb2d9cc91 100644
--- a/x11/gnome-terminal/distinfo
+++ b/x11/gnome-terminal/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-terminal-2.2.1.tar.bz2) = 05603de355b2d4095cbd6f6ac0c438aa
+MD5 (gnome2/gnome-terminal-2.3.1.tar.bz2) = 804adbea68ed98f839beec3f07dc6cd6
diff --git a/x11/gnome-terminal/files/patch-src_terminal-widget-zvt.c b/x11/gnome-terminal/files/patch-src_terminal-widget-zvt.c
deleted file mode 100644
index 84c13e0aa..000000000
--- a/x11/gnome-terminal/files/patch-src_terminal-widget-zvt.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/terminal-widget-zvt.c.orig	Wed Feb 12 18:06:32 2003
-+++ src/terminal-widget-zvt.c	Wed Feb 12 18:05:20 2003
-@@ -1132,8 +1132,8 @@
- terminal_widget_set_pango_font (GtkWidget                  *widget,
-                                 const PangoFontDescription *font_desc)
- {
--  g_return_if_fail (font_desc != NULL);
--  zvt_term_set_pango_font (ZVT_TERM (widget), font_desc);
-+  /*g_return_if_fail (font_desc != NULL);
-+  zvt_term_set_pango_font (ZVT_TERM (widget), font_desc);*/
- }
- 
- gboolean
diff --git a/x11/gnome-terminal/pkg-plist b/x11/gnome-terminal/pkg-plist
index 52c9e6d8a..638d95af1 100644
--- a/x11/gnome-terminal/pkg-plist
+++ b/x11/gnome-terminal/pkg-plist
@@ -18,30 +18,86 @@ share/gnome/help/gnome-terminal/C/figures/gnome-terminal-tabbed.png
 share/gnome/help/gnome-terminal/C/figures/terminal_window.png
 share/gnome/help/gnome-terminal/C/gnome-terminal.xml
 share/gnome/help/gnome-terminal/C/legal.xml
+share/gnome/help/gnome-terminal/de/figures/gnome-terminal-default.png
+share/gnome/help/gnome-terminal/de/figures/gnome-terminal-tabbed.png
+share/gnome/help/gnome-terminal/de/figures/terminal_window.png
+share/gnome/help/gnome-terminal/de/gnome-terminal.xml
+share/gnome/help/gnome-terminal/de/legal.xml
+share/gnome/help/gnome-terminal/es/figures/gnome-terminal-default.png
+share/gnome/help/gnome-terminal/es/figures/gnome-terminal-tabbed.png
+share/gnome/help/gnome-terminal/es/figures/terminal_window.png
+share/gnome/help/gnome-terminal/es/gnome-terminal.xml
+share/gnome/help/gnome-terminal/es/legal.xml
+share/gnome/help/gnome-terminal/fr/figures/gnome-terminal-default.png
+share/gnome/help/gnome-terminal/fr/figures/gnome-terminal-tabbed.png
+share/gnome/help/gnome-terminal/fr/figures/terminal_window.png
+share/gnome/help/gnome-terminal/fr/gnome-terminal.xml
+share/gnome/help/gnome-terminal/fr/legal.xml
+share/gnome/help/gnome-terminal/it/figures/gnome-terminal-default.png
+share/gnome/help/gnome-terminal/it/figures/gnome-terminal-tabbed.png
+share/gnome/help/gnome-terminal/it/figures/terminal_window.png
+share/gnome/help/gnome-terminal/it/gnome-terminal.xml
+share/gnome/help/gnome-terminal/it/legal.xml
+share/gnome/help/gnome-terminal/ja/figures/gnome-terminal-default.png
+share/gnome/help/gnome-terminal/ja/figures/gnome-terminal-tabbed.png
+share/gnome/help/gnome-terminal/ja/figures/terminal_window.png
+share/gnome/help/gnome-terminal/ja/gnome-terminal.xml
+share/gnome/help/gnome-terminal/ja/legal.xml
+share/gnome/help/gnome-terminal/ko/figures/gnome-terminal-default.png
+share/gnome/help/gnome-terminal/ko/figures/gnome-terminal-tabbed.png
+share/gnome/help/gnome-terminal/ko/figures/terminal_window.png
+share/gnome/help/gnome-terminal/ko/gnome-terminal.xml
+share/gnome/help/gnome-terminal/ko/legal.xml
 share/gnome/help/gnome-terminal/ro/figures/gnome-terminal-default.png
 share/gnome/help/gnome-terminal/ro/figures/gnome-terminal-tabbed.png
 share/gnome/help/gnome-terminal/ro/figures/terminal_window.png
 share/gnome/help/gnome-terminal/ro/gnome-terminal.xml
 share/gnome/help/gnome-terminal/ro/legal.xml
+share/gnome/help/gnome-terminal/sv/figures/gnome-terminal-default.png
+share/gnome/help/gnome-terminal/sv/figures/gnome-terminal-tabbed.png
+share/gnome/help/gnome-terminal/sv/figures/terminal_window.png
+share/gnome/help/gnome-terminal/sv/gnome-terminal.xml
+share/gnome/help/gnome-terminal/sv/legal.xml
+share/gnome/help/gnome-terminal/zh_CN/figures/gnome-terminal-default.png
+share/gnome/help/gnome-terminal/zh_CN/figures/gnome-terminal-tabbed.png
+share/gnome/help/gnome-terminal/zh_CN/figures/terminal_window.png
+share/gnome/help/gnome-terminal/zh_CN/gnome-terminal.xml
+share/gnome/help/gnome-terminal/zh_CN/legal.xml
+share/gnome/help/gnome-terminal/zh_TW/figures/gnome-terminal-default.png
+share/gnome/help/gnome-terminal/zh_TW/figures/gnome-terminal-tabbed.png
+share/gnome/help/gnome-terminal/zh_TW/figures/terminal_window.png
+share/gnome/help/gnome-terminal/zh_TW/gnome-terminal.xml
+share/gnome/help/gnome-terminal/zh_TW/legal.xml
 share/gnome/omf/gnome-terminal/gnome-terminal-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-terminal/gnome-terminal-de.omf
+share/gnome/omf/gnome-terminal/gnome-terminal-es.omf
+share/gnome/omf/gnome-terminal/gnome-terminal-fr.omf
+share/gnome/omf/gnome-terminal/gnome-terminal-it.omf
+share/gnome/omf/gnome-terminal/gnome-terminal-ja.omf
+share/gnome/omf/gnome-terminal/gnome-terminal-ko.omf
 share/gnome/omf/gnome-terminal/gnome-terminal-ro.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-ro.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-terminal/gnome-terminal-sv.omf
+share/gnome/omf/gnome-terminal/gnome-terminal-zh_CN.omf
+share/gnome/omf/gnome-terminal/gnome-terminal-zh_TW.omf
 share/gnome/pixmaps/gnome-terminal.png
 share/locale/am/LC_MESSAGES/gnome-terminal.mo
 share/locale/ar/LC_MESSAGES/gnome-terminal.mo
+share/locale/az/LC_MESSAGES/gnome-terminal.mo
 share/locale/be/LC_MESSAGES/gnome-terminal.mo
 share/locale/bg/LC_MESSAGES/gnome-terminal.mo
 share/locale/ca/LC_MESSAGES/gnome-terminal.mo
 share/locale/cs/LC_MESSAGES/gnome-terminal.mo
+share/locale/cy/LC_MESSAGES/gnome-terminal.mo
 share/locale/da/LC_MESSAGES/gnome-terminal.mo
 share/locale/de/LC_MESSAGES/gnome-terminal.mo
 share/locale/el/LC_MESSAGES/gnome-terminal.mo
 share/locale/en_GB/LC_MESSAGES/gnome-terminal.mo
 share/locale/es/LC_MESSAGES/gnome-terminal.mo
 share/locale/et/LC_MESSAGES/gnome-terminal.mo
+share/locale/fa/LC_MESSAGES/gnome-terminal.mo
 share/locale/fi/LC_MESSAGES/gnome-terminal.mo
 share/locale/fr/LC_MESSAGES/gnome-terminal.mo
+share/locale/ga/LC_MESSAGES/gnome-terminal.mo
 share/locale/gl/LC_MESSAGES/gnome-terminal.mo
 share/locale/he/LC_MESSAGES/gnome-terminal.mo
 share/locale/hu/LC_MESSAGES/gnome-terminal.mo
@@ -51,6 +107,7 @@ share/locale/ko/LC_MESSAGES/gnome-terminal.mo
 share/locale/lt/LC_MESSAGES/gnome-terminal.mo
 share/locale/lv/LC_MESSAGES/gnome-terminal.mo
 share/locale/mk/LC_MESSAGES/gnome-terminal.mo
+share/locale/ml/LC_MESSAGES/gnome-terminal.mo
 share/locale/mn/LC_MESSAGES/gnome-terminal.mo
 share/locale/ms/LC_MESSAGES/gnome-terminal.mo
 share/locale/nl/LC_MESSAGES/gnome-terminal.mo
@@ -63,6 +120,8 @@ share/locale/ru/LC_MESSAGES/gnome-terminal.mo
 share/locale/sk/LC_MESSAGES/gnome-terminal.mo
 share/locale/sl/LC_MESSAGES/gnome-terminal.mo
 share/locale/sq/LC_MESSAGES/gnome-terminal.mo
+share/locale/sr/LC_MESSAGES/gnome-terminal.mo
+share/locale/sr@Latn/LC_MESSAGES/gnome-terminal.mo
 share/locale/sv/LC_MESSAGES/gnome-terminal.mo
 share/locale/tr/LC_MESSAGES/gnome-terminal.mo
 share/locale/uk/LC_MESSAGES/gnome-terminal.mo
@@ -70,8 +129,26 @@ share/locale/vi/LC_MESSAGES/gnome-terminal.mo
 share/locale/wa/LC_MESSAGES/gnome-terminal.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-terminal.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo
+@dirrm share/gnome/help/gnome-terminal/zh_TW/figures
+@dirrm share/gnome/help/gnome-terminal/zh_TW
+@dirrm share/gnome/help/gnome-terminal/zh_CN/figures
+@dirrm share/gnome/help/gnome-terminal/zh_CN
+@dirrm share/gnome/help/gnome-terminal/sv/figures
+@dirrm share/gnome/help/gnome-terminal/sv
 @dirrm share/gnome/help/gnome-terminal/ro/figures
 @dirrm share/gnome/help/gnome-terminal/ro
+@dirrm share/gnome/help/gnome-terminal/ko/figures
+@dirrm share/gnome/help/gnome-terminal/ko
+@dirrm share/gnome/help/gnome-terminal/ja/figures
+@dirrm share/gnome/help/gnome-terminal/ja
+@dirrm share/gnome/help/gnome-terminal/it/figures
+@dirrm share/gnome/help/gnome-terminal/it
+@dirrm share/gnome/help/gnome-terminal/fr/figures
+@dirrm share/gnome/help/gnome-terminal/fr
+@dirrm share/gnome/help/gnome-terminal/es/figures
+@dirrm share/gnome/help/gnome-terminal/es
+@dirrm share/gnome/help/gnome-terminal/de/figures
+@dirrm share/gnome/help/gnome-terminal/de
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles/Default
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/keybindings
@@ -82,5 +159,3 @@ share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-terminal/keybindings
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-terminal/global
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-terminal
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-ro.omf 2>/dev/null || /usr/bin/true
diff --git a/x11/gnometerminal/Makefile b/x11/gnometerminal/Makefile
index 468867ad1..3e358b1f1 100644
--- a/x11/gnometerminal/Makefile
+++ b/x11/gnometerminal/Makefile
@@ -6,16 +6,15 @@
 #
 
 PORTNAME=	gnometerminal
-PORTVERSION=	2.2.1
-PORTREVISION=	1
+PORTVERSION=	2.3.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-terminal/2.2
+MASTER_SITE_SUBDIR=	sources/gnome-terminal/2.3
 DISTNAME=	gnome-terminal-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Terminal component for the GNOME 2.0 Desktop
+COMMENT=	Terminal component for the GNOME 2 Desktop
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
@@ -24,7 +23,7 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier libgnomeui vte
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git a/x11/gnometerminal/distinfo b/x11/gnometerminal/distinfo
index bb26f7157..bb2d9cc91 100644
--- a/x11/gnometerminal/distinfo
+++ b/x11/gnometerminal/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-terminal-2.2.1.tar.bz2) = 05603de355b2d4095cbd6f6ac0c438aa
+MD5 (gnome2/gnome-terminal-2.3.1.tar.bz2) = 804adbea68ed98f839beec3f07dc6cd6
diff --git a/x11/gnometerminal/files/patch-src_terminal-widget-zvt.c b/x11/gnometerminal/files/patch-src_terminal-widget-zvt.c
deleted file mode 100644
index 84c13e0aa..000000000
--- a/x11/gnometerminal/files/patch-src_terminal-widget-zvt.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/terminal-widget-zvt.c.orig	Wed Feb 12 18:06:32 2003
-+++ src/terminal-widget-zvt.c	Wed Feb 12 18:05:20 2003
-@@ -1132,8 +1132,8 @@
- terminal_widget_set_pango_font (GtkWidget                  *widget,
-                                 const PangoFontDescription *font_desc)
- {
--  g_return_if_fail (font_desc != NULL);
--  zvt_term_set_pango_font (ZVT_TERM (widget), font_desc);
-+  /*g_return_if_fail (font_desc != NULL);
-+  zvt_term_set_pango_font (ZVT_TERM (widget), font_desc);*/
- }
- 
- gboolean
diff --git a/x11/gnometerminal/pkg-plist b/x11/gnometerminal/pkg-plist
index 52c9e6d8a..638d95af1 100644
--- a/x11/gnometerminal/pkg-plist
+++ b/x11/gnometerminal/pkg-plist
@@ -18,30 +18,86 @@ share/gnome/help/gnome-terminal/C/figures/gnome-terminal-tabbed.png
 share/gnome/help/gnome-terminal/C/figures/terminal_window.png
 share/gnome/help/gnome-terminal/C/gnome-terminal.xml
 share/gnome/help/gnome-terminal/C/legal.xml
+share/gnome/help/gnome-terminal/de/figures/gnome-terminal-default.png
+share/gnome/help/gnome-terminal/de/figures/gnome-terminal-tabbed.png
+share/gnome/help/gnome-terminal/de/figures/terminal_window.png
+share/gnome/help/gnome-terminal/de/gnome-terminal.xml
+share/gnome/help/gnome-terminal/de/legal.xml
+share/gnome/help/gnome-terminal/es/figures/gnome-terminal-default.png
+share/gnome/help/gnome-terminal/es/figures/gnome-terminal-tabbed.png
+share/gnome/help/gnome-terminal/es/figures/terminal_window.png
+share/gnome/help/gnome-terminal/es/gnome-terminal.xml
+share/gnome/help/gnome-terminal/es/legal.xml
+share/gnome/help/gnome-terminal/fr/figures/gnome-terminal-default.png
+share/gnome/help/gnome-terminal/fr/figures/gnome-terminal-tabbed.png
+share/gnome/help/gnome-terminal/fr/figures/terminal_window.png
+share/gnome/help/gnome-terminal/fr/gnome-terminal.xml
+share/gnome/help/gnome-terminal/fr/legal.xml
+share/gnome/help/gnome-terminal/it/figures/gnome-terminal-default.png
+share/gnome/help/gnome-terminal/it/figures/gnome-terminal-tabbed.png
+share/gnome/help/gnome-terminal/it/figures/terminal_window.png
+share/gnome/help/gnome-terminal/it/gnome-terminal.xml
+share/gnome/help/gnome-terminal/it/legal.xml
+share/gnome/help/gnome-terminal/ja/figures/gnome-terminal-default.png
+share/gnome/help/gnome-terminal/ja/figures/gnome-terminal-tabbed.png
+share/gnome/help/gnome-terminal/ja/figures/terminal_window.png
+share/gnome/help/gnome-terminal/ja/gnome-terminal.xml
+share/gnome/help/gnome-terminal/ja/legal.xml
+share/gnome/help/gnome-terminal/ko/figures/gnome-terminal-default.png
+share/gnome/help/gnome-terminal/ko/figures/gnome-terminal-tabbed.png
+share/gnome/help/gnome-terminal/ko/figures/terminal_window.png
+share/gnome/help/gnome-terminal/ko/gnome-terminal.xml
+share/gnome/help/gnome-terminal/ko/legal.xml
 share/gnome/help/gnome-terminal/ro/figures/gnome-terminal-default.png
 share/gnome/help/gnome-terminal/ro/figures/gnome-terminal-tabbed.png
 share/gnome/help/gnome-terminal/ro/figures/terminal_window.png
 share/gnome/help/gnome-terminal/ro/gnome-terminal.xml
 share/gnome/help/gnome-terminal/ro/legal.xml
+share/gnome/help/gnome-terminal/sv/figures/gnome-terminal-default.png
+share/gnome/help/gnome-terminal/sv/figures/gnome-terminal-tabbed.png
+share/gnome/help/gnome-terminal/sv/figures/terminal_window.png
+share/gnome/help/gnome-terminal/sv/gnome-terminal.xml
+share/gnome/help/gnome-terminal/sv/legal.xml
+share/gnome/help/gnome-terminal/zh_CN/figures/gnome-terminal-default.png
+share/gnome/help/gnome-terminal/zh_CN/figures/gnome-terminal-tabbed.png
+share/gnome/help/gnome-terminal/zh_CN/figures/terminal_window.png
+share/gnome/help/gnome-terminal/zh_CN/gnome-terminal.xml
+share/gnome/help/gnome-terminal/zh_CN/legal.xml
+share/gnome/help/gnome-terminal/zh_TW/figures/gnome-terminal-default.png
+share/gnome/help/gnome-terminal/zh_TW/figures/gnome-terminal-tabbed.png
+share/gnome/help/gnome-terminal/zh_TW/figures/terminal_window.png
+share/gnome/help/gnome-terminal/zh_TW/gnome-terminal.xml
+share/gnome/help/gnome-terminal/zh_TW/legal.xml
 share/gnome/omf/gnome-terminal/gnome-terminal-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-terminal/gnome-terminal-de.omf
+share/gnome/omf/gnome-terminal/gnome-terminal-es.omf
+share/gnome/omf/gnome-terminal/gnome-terminal-fr.omf
+share/gnome/omf/gnome-terminal/gnome-terminal-it.omf
+share/gnome/omf/gnome-terminal/gnome-terminal-ja.omf
+share/gnome/omf/gnome-terminal/gnome-terminal-ko.omf
 share/gnome/omf/gnome-terminal/gnome-terminal-ro.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-ro.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-terminal/gnome-terminal-sv.omf
+share/gnome/omf/gnome-terminal/gnome-terminal-zh_CN.omf
+share/gnome/omf/gnome-terminal/gnome-terminal-zh_TW.omf
 share/gnome/pixmaps/gnome-terminal.png
 share/locale/am/LC_MESSAGES/gnome-terminal.mo
 share/locale/ar/LC_MESSAGES/gnome-terminal.mo
+share/locale/az/LC_MESSAGES/gnome-terminal.mo
 share/locale/be/LC_MESSAGES/gnome-terminal.mo
 share/locale/bg/LC_MESSAGES/gnome-terminal.mo
 share/locale/ca/LC_MESSAGES/gnome-terminal.mo
 share/locale/cs/LC_MESSAGES/gnome-terminal.mo
+share/locale/cy/LC_MESSAGES/gnome-terminal.mo
 share/locale/da/LC_MESSAGES/gnome-terminal.mo
 share/locale/de/LC_MESSAGES/gnome-terminal.mo
 share/locale/el/LC_MESSAGES/gnome-terminal.mo
 share/locale/en_GB/LC_MESSAGES/gnome-terminal.mo
 share/locale/es/LC_MESSAGES/gnome-terminal.mo
 share/locale/et/LC_MESSAGES/gnome-terminal.mo
+share/locale/fa/LC_MESSAGES/gnome-terminal.mo
 share/locale/fi/LC_MESSAGES/gnome-terminal.mo
 share/locale/fr/LC_MESSAGES/gnome-terminal.mo
+share/locale/ga/LC_MESSAGES/gnome-terminal.mo
 share/locale/gl/LC_MESSAGES/gnome-terminal.mo
 share/locale/he/LC_MESSAGES/gnome-terminal.mo
 share/locale/hu/LC_MESSAGES/gnome-terminal.mo
@@ -51,6 +107,7 @@ share/locale/ko/LC_MESSAGES/gnome-terminal.mo
 share/locale/lt/LC_MESSAGES/gnome-terminal.mo
 share/locale/lv/LC_MESSAGES/gnome-terminal.mo
 share/locale/mk/LC_MESSAGES/gnome-terminal.mo
+share/locale/ml/LC_MESSAGES/gnome-terminal.mo
 share/locale/mn/LC_MESSAGES/gnome-terminal.mo
 share/locale/ms/LC_MESSAGES/gnome-terminal.mo
 share/locale/nl/LC_MESSAGES/gnome-terminal.mo
@@ -63,6 +120,8 @@ share/locale/ru/LC_MESSAGES/gnome-terminal.mo
 share/locale/sk/LC_MESSAGES/gnome-terminal.mo
 share/locale/sl/LC_MESSAGES/gnome-terminal.mo
 share/locale/sq/LC_MESSAGES/gnome-terminal.mo
+share/locale/sr/LC_MESSAGES/gnome-terminal.mo
+share/locale/sr@Latn/LC_MESSAGES/gnome-terminal.mo
 share/locale/sv/LC_MESSAGES/gnome-terminal.mo
 share/locale/tr/LC_MESSAGES/gnome-terminal.mo
 share/locale/uk/LC_MESSAGES/gnome-terminal.mo
@@ -70,8 +129,26 @@ share/locale/vi/LC_MESSAGES/gnome-terminal.mo
 share/locale/wa/LC_MESSAGES/gnome-terminal.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-terminal.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo
+@dirrm share/gnome/help/gnome-terminal/zh_TW/figures
+@dirrm share/gnome/help/gnome-terminal/zh_TW
+@dirrm share/gnome/help/gnome-terminal/zh_CN/figures
+@dirrm share/gnome/help/gnome-terminal/zh_CN
+@dirrm share/gnome/help/gnome-terminal/sv/figures
+@dirrm share/gnome/help/gnome-terminal/sv
 @dirrm share/gnome/help/gnome-terminal/ro/figures
 @dirrm share/gnome/help/gnome-terminal/ro
+@dirrm share/gnome/help/gnome-terminal/ko/figures
+@dirrm share/gnome/help/gnome-terminal/ko
+@dirrm share/gnome/help/gnome-terminal/ja/figures
+@dirrm share/gnome/help/gnome-terminal/ja
+@dirrm share/gnome/help/gnome-terminal/it/figures
+@dirrm share/gnome/help/gnome-terminal/it
+@dirrm share/gnome/help/gnome-terminal/fr/figures
+@dirrm share/gnome/help/gnome-terminal/fr
+@dirrm share/gnome/help/gnome-terminal/es/figures
+@dirrm share/gnome/help/gnome-terminal/es
+@dirrm share/gnome/help/gnome-terminal/de/figures
+@dirrm share/gnome/help/gnome-terminal/de
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles/Default
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/keybindings
@@ -82,5 +159,3 @@ share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-terminal/keybindings
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-terminal/global
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-terminal
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-ro.omf 2>/dev/null || /usr/bin/true