aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--accessibility/atk/pkg-plist6
-rw-r--r--archivers/rpm4/pkg-plist2
-rw-r--r--archivers/rpm5/pkg-plist2
-rw-r--r--astro/glunarclock/pkg-plist2
-rw-r--r--astro/gpsdrive/pkg-plist2
-rw-r--r--audio/gtick/pkg-plist4
-rw-r--r--audio/mp3c/pkg-plist4
-rw-r--r--audio/zinf/pkg-plist2
-rw-r--r--cad/geda-gschem/pkg-plist6
-rw-r--r--cad/gschem/pkg-plist6
-rw-r--r--chinese/zhcon/pkg-plist3
-rw-r--r--comms/minicom/pkg-plist6
-rw-r--r--databases/postgresql7/pkg-plist9
-rw-r--r--databases/postgresql73/pkg-plist9
-rw-r--r--deskutils/gnochm/pkg-plist4
-rw-r--r--deskutils/gnome-pim/pkg-plist6
-rw-r--r--deskutils/gnomepim/pkg-plist6
-rw-r--r--deskutils/logjam/pkg-plist6
-rw-r--r--devel/bison/pkg-plist1
-rw-r--r--devel/bison175/pkg-plist1
-rw-r--r--devel/gettext/pkg-plist2
-rw-r--r--devel/glib20/pkg-plist6
-rw-r--r--devel/gmake/pkg-plist4
-rw-r--r--devel/gmake381/pkg-plist4
-rw-r--r--devel/kdbg/pkg-plist6
-rw-r--r--devel/libbonobo/pkg-plist2
-rw-r--r--devel/libgtop2/pkg-plist2
-rw-r--r--devel/popt/pkg-plist20
-rw-r--r--editors/poedit/pkg-plist10
-rw-r--r--finance/gnucash-devel/pkg-plist2
-rw-r--r--finance/gnucash/pkg-plist2
-rw-r--r--ftp/kftpgrabber/pkg-plist1
-rw-r--r--games/freeciv/pkg-plist26
-rw-r--r--games/gnubg/pkg-plist2
-rw-r--r--games/gturing/pkg-plist2
-rw-r--r--games/wesnoth-devel/pkg-plist2
-rw-r--r--games/wesnoth/pkg-plist2
-rw-r--r--graphics/eog2/pkg-plist2
-rw-r--r--graphics/gtksee/pkg-plist4
-rw-r--r--graphics/gwenview-kde4/pkg-plist10
-rw-r--r--graphics/gwenview/pkg-plist10
-rw-r--r--graphics/zphoto/pkg-plist2
-rw-r--r--japanese/lyx/pkg-plist22
-rw-r--r--japanese/texinfo/pkg-plist17
-rw-r--r--lang/clisp/pkg-plist2
-rw-r--r--mail/gnubiff/pkg-plist2
-rw-r--r--mail/kbiff/pkg-plist2
-rw-r--r--mail/spruce/pkg-plist2
-rw-r--r--misc/gnome-mime-data/pkg-plist4
-rw-r--r--misc/gnomemimedata/pkg-plist4
-rw-r--r--misc/hello/pkg-plist2
-rw-r--r--misc/kcd-devel/pkg-plist4
-rw-r--r--misc/kcd/pkg-plist4
-rw-r--r--misc/mc/pkg-plist2
-rw-r--r--net-im/kmerlin/pkg-plist4
-rw-r--r--net-im/kmess-kde4/pkg-plist2
-rw-r--r--net-im/kmess/pkg-plist2
-rw-r--r--net-im/sim-im/pkg-plist2
-rw-r--r--net-im/simicq/pkg-plist2
-rw-r--r--net-p2p/amule1/pkg-plist2
-rw-r--r--net/amule/pkg-plist2
-rw-r--r--net/amule1/pkg-plist2
-rw-r--r--net/kmerlin/pkg-plist4
-rw-r--r--net/kmess/pkg-plist2
-rw-r--r--net/simicq/pkg-plist2
-rw-r--r--net/tsclient/pkg-plist30
-rw-r--r--print/gtklp/pkg-plist4
-rw-r--r--security/gnupg/pkg-plist15
-rw-r--r--security/gnupg1/pkg-plist15
-rw-r--r--security/gringotts/pkg-plist1
-rw-r--r--sysutils/bubblemon2/pkg-plist2
-rw-r--r--sysutils/coreutils/pkg-plist6
-rw-r--r--sysutils/di/pkg-plist4
-rw-r--r--sysutils/libgksu/pkg-plist2
-rw-r--r--sysutils/libgksuui/pkg-plist2
-rw-r--r--sysutils/xcdroast/pkg-plist4
-rw-r--r--textproc/aspell/pkg-plist7
-rw-r--r--www/elinks/pkg-plist30
-rw-r--r--x11-fm/gentoo/pkg-plist12
-rw-r--r--x11-fm/xfe/pkg-plist2
-rw-r--r--x11-fm/xnc/pkg-plist2
-rw-r--r--x11-toolkits/gtk12/pkg-plist2
-rw-r--r--x11-toolkits/gtk20/pkg-plist20
-rw-r--r--x11-toolkits/gtk30/pkg-plist20
-rw-r--r--x11-wm/e16/pkg-plist2
-rw-r--r--x11-wm/enlightenment-devel/pkg-plist2
-rw-r--r--x11-wm/enlightenment/pkg-plist2
-rw-r--r--x11/gnome-desktop/pkg-plist2
-rw-r--r--x11/gnomedesktop/pkg-plist2
-rw-r--r--x11/xdialog/pkg-plist4
-rw-r--r--x11/yelp/pkg-plist2
91 files changed, 289 insertions, 210 deletions
diff --git a/accessibility/atk/pkg-plist b/accessibility/atk/pkg-plist
index 1a3bf58c5786..5e0de79d6386 100644
--- a/accessibility/atk/pkg-plist
+++ b/accessibility/atk/pkg-plist
@@ -128,6 +128,12 @@ share/locale/wa/LC_MESSAGES/atk10.mo
share/locale/yi/LC_MESSAGES/atk10.mo
share/locale/zh_CN/LC_MESSAGES/atk10.mo
share/locale/zh_TW/LC_MESSAGES/atk10.mo
+@unexec rmdir %D/share/locale/li/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/li 2> /dev/null || true
+@unexec rmdir %D/share/locale/mr/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/mr 2> /dev/null || true
+@unexec rmdir %D/share/locale/tk/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/tk 2> /dev/null || true
@dirrm %%DOCSDIR%%
@dirrm include/atk-1.0/atk
@dirrm include/atk-1.0
diff --git a/archivers/rpm4/pkg-plist b/archivers/rpm4/pkg-plist
index 8568027115ff..f6b8a24e3218 100644
--- a/archivers/rpm4/pkg-plist
+++ b/archivers/rpm4/pkg-plist
@@ -159,3 +159,5 @@ share/locale/zh_CN.GB2312/LC_MESSAGES/rpm.mo
@unexec rmdir %D/src/portbld/RPMS 2>/dev/null || true
@unexec rmdir %D/src/portbld/BUILD 2>/dev/null || true
@unexec rmdir %D/src/portbld 2>/dev/null || true
+@unexec rmdir %D/share/locale/en_RN/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/en_RN 2> /dev/null || true
diff --git a/archivers/rpm5/pkg-plist b/archivers/rpm5/pkg-plist
index 8568027115ff..f6b8a24e3218 100644
--- a/archivers/rpm5/pkg-plist
+++ b/archivers/rpm5/pkg-plist
@@ -159,3 +159,5 @@ share/locale/zh_CN.GB2312/LC_MESSAGES/rpm.mo
@unexec rmdir %D/src/portbld/RPMS 2>/dev/null || true
@unexec rmdir %D/src/portbld/BUILD 2>/dev/null || true
@unexec rmdir %D/src/portbld 2>/dev/null || true
+@unexec rmdir %D/share/locale/en_RN/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/en_RN 2> /dev/null || true
diff --git a/astro/glunarclock/pkg-plist b/astro/glunarclock/pkg-plist
index 747659debb64..4b6c0fdc521f 100644
--- a/astro/glunarclock/pkg-plist
+++ b/astro/glunarclock/pkg-plist
@@ -32,6 +32,8 @@ share/locale/sr/LC_MESSAGES/glunarclock-0.30.mo
share/locale/sv/LC_MESSAGES/glunarclock-0.30.mo
share/locale/vi/LC_MESSAGES/glunarclock-0.30.mo
share/locale/wa/LC_MESSAGES/glunarclock-0.30.mo
+@unexec rmdir %D/share/locale/ast_ES/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/ast_ES 2> /dev/null || true
@dirrm share/gnome/pixmaps/glunarclock
@dirrm share/gnome/help/glunarclock-applet-2/C/figures
@dirrm share/gnome/help/glunarclock-applet-2/C
diff --git a/astro/gpsdrive/pkg-plist b/astro/gpsdrive/pkg-plist
index f0ce8b18427b..8e8c55c75c9c 100644
--- a/astro/gpsdrive/pkg-plist
+++ b/astro/gpsdrive/pkg-plist
@@ -59,4 +59,6 @@ share/locale/sk/LC_MESSAGES/gpsdrive.mo
share/locale/sv/LC_MESSAGES/gpsdrive.mo
share/locale/tr/LC_MESSAGES/gpsdrive.mo
share/pixmaps/gpsicon.png
+@unexec rmdir %D/share/locale/gr/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/gr 2> /dev/null || true
@dirrm share/gpsdrive
diff --git a/audio/gtick/pkg-plist b/audio/gtick/pkg-plist
index 7394f32e0b3b..c37e81180f6d 100644
--- a/audio/gtick/pkg-plist
+++ b/audio/gtick/pkg-plist
@@ -11,3 +11,7 @@ share/locale/ga/LC_MESSAGES/gtick.mo
share/locale/nl/LC_MESSAGES/gtick.mo
share/locale/ro/LC_MESSAGES/gtick.mo
share/locale/ru/LC_MESSAGES/gtick.mo
+@unexec rmdir %D/share/locale/en@boldquot/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/en@boldquot 2> /dev/null || true
+@unexec rmdir %D/share/locale/en@quot/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/en@quot 2> /dev/null || true
diff --git a/audio/mp3c/pkg-plist b/audio/mp3c/pkg-plist
index feb6bc7d1566..8afd0cab4454 100644
--- a/audio/mp3c/pkg-plist
+++ b/audio/mp3c/pkg-plist
@@ -5,3 +5,7 @@ share/locale/es/LC_MESSAGES/mp3c.mo
share/locale/it/LC_MESSAGES/mp3c.mo
share/locale/pl/LC_MESSAGES/mp3c.mo
share/locale/pt/LC_MESSAGES/mp3c.mo
+@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/pl 2> /dev/null || true
+@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/pt 2> /dev/null || true
diff --git a/audio/zinf/pkg-plist b/audio/zinf/pkg-plist
index ace94b0de606..f33d89094ad9 100644
--- a/audio/zinf/pkg-plist
+++ b/audio/zinf/pkg-plist
@@ -40,3 +40,5 @@ share/zinf/themes/ZinfClassic.fat
@dirrm lib/zinf
@unexec rmdir %D/etc/sdr/plugins 2>/dev/null || true
@unexec rmdir %D/etc/sdr 2>/dev/null || true
+@unexec rmdir %D/share/locale/ca_ES/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/ca_ES 2> /dev/null || true
diff --git a/cad/geda-gschem/pkg-plist b/cad/geda-gschem/pkg-plist
index 9c25552e041c..4e4fedeace30 100644
--- a/cad/geda-gschem/pkg-plist
+++ b/cad/geda-gschem/pkg-plist
@@ -33,3 +33,9 @@ share/locale/ru/LC_MESSAGES/geda-gschem.mo
@unexec rmdir %D/share/doc/geda-doc/man 2>/dev/null || true
@unexec rmdir %D/share/gEDA/scheme 2>/dev/null || true
@dirrm share/gEDA/bitmap
+@unexec rmdir %D/share/locale/de_DE/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/de_DE 2> /dev/null || true
+@unexec rmdir %D/share/locale/nl_NL/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/nl_NL 2> /dev/null || true
+@unexec rmdir %D/share/locale/ja_JP/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/ja_JP 2> /dev/null || true
diff --git a/cad/gschem/pkg-plist b/cad/gschem/pkg-plist
index 9c25552e041c..4e4fedeace30 100644
--- a/cad/gschem/pkg-plist
+++ b/cad/gschem/pkg-plist
@@ -33,3 +33,9 @@ share/locale/ru/LC_MESSAGES/geda-gschem.mo
@unexec rmdir %D/share/doc/geda-doc/man 2>/dev/null || true
@unexec rmdir %D/share/gEDA/scheme 2>/dev/null || true
@dirrm share/gEDA/bitmap
+@unexec rmdir %D/share/locale/de_DE/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/de_DE 2> /dev/null || true
+@unexec rmdir %D/share/locale/nl_NL/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/nl_NL 2> /dev/null || true
+@unexec rmdir %D/share/locale/ja_JP/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/ja_JP 2> /dev/null || true
diff --git a/chinese/zhcon/pkg-plist b/chinese/zhcon/pkg-plist
index 46d9ee38d9ad..5a58ae69dd8b 100644
--- a/chinese/zhcon/pkg-plist
+++ b/chinese/zhcon/pkg-plist
@@ -40,13 +40,10 @@ lib/zhcon/input/winzm.mb
%%NLS%%share/locale/zh_CN.GB2312/LC_MESSAGES/zhcon.mo
%%NLS%%share/locale/zh_CN.GBK/LC_MESSAGES/zhcon.mo
%%NLS%%share/locale/zh_TW.Big5/LC_MESSAGES/zhcon.mo
-%%NLS%%@unexec rmdir %D/share/locale/zh_CN.GB2312/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/zh_CN.GB2312 2>/dev/null || true
%%NLS%%@unexec rmdir %D/share/locale/zh_CN.GBK/LC_MESSAGES 2>/dev/null || true
%%NLS%%@unexec rmdir %D/share/locale/zh_CN.GBK 2>/dev/null || true
%%NLS%%@unexec rmdir %D/share/locale/zh_CN.EUC/LC_MESSAGES 2>/dev/null || true
%%NLS%%@unexec rmdir %D/share/locale/zh_CN.EUC 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/zh_TW.Big5/LC_MESSAGES 2>/dev/null || true
@dirrm lib/zhcon/input
@dirrm lib/zhcon/font
@dirrm lib/zhcon
diff --git a/comms/minicom/pkg-plist b/comms/minicom/pkg-plist
index ba07603222a3..2942edb76c8f 100644
--- a/comms/minicom/pkg-plist
+++ b/comms/minicom/pkg-plist
@@ -13,14 +13,8 @@ share/locale/pl/LC_MESSAGES/minicom.mo
share/locale/pt_BR/LC_MESSAGES/minicom.mo
share/locale/ru/LC_MESSAGES/minicom.mo
@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/hu/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ja/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/cs 2>/dev/null || true
@unexec rmdir %D/share/locale/fi 2>/dev/null || true
@unexec rmdir %D/share/locale/pl 2>/dev/null || true
diff --git a/databases/postgresql7/pkg-plist b/databases/postgresql7/pkg-plist
index 29187a33ca67..6700f1c5353e 100644
--- a/databases/postgresql7/pkg-plist
+++ b/databases/postgresql7/pkg-plist
@@ -194,9 +194,12 @@ share/postgresql/post-install-notes
%%SERVER%%%%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres.mo
-%%GETTEXT%%@unexec rmdir %D/share/locale/*/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/* 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/cs 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
%%SERVER%%@unexec if cmp -s ~pgsql/.profile %D/share/postgresql/dot.profile.dist; then rm -f ~pgsql/.profile; fi
%%SERVER%%@unexec if cmp -s ~pgsql/.cshrc %D/share/postgresql/dot.cshrc.dist; then rm -f ~pgsql/.cshrc; fi
%%SERVER%%@unexec [ -f ~pgsql/dot.profile.dist ] && rm ~pgsql/dot.profile.dist
diff --git a/databases/postgresql73/pkg-plist b/databases/postgresql73/pkg-plist
index effd8e4f2f71..3b5b073108cb 100644
--- a/databases/postgresql73/pkg-plist
+++ b/databases/postgresql73/pkg-plist
@@ -133,9 +133,12 @@ share/postgresql/post-install-notes
%%SERVER%%%%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres.mo
-%%GETTEXT%%@unexec rmdir %D/share/locale/*/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/* 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2> /dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/cs 2> /dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2> /dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN 2> /dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2> /dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW 2> /dev/null || true
%%SERVER%%@unexec if cmp -s ~pgsql/.profile %D/share/postgresql/dot.profile.dist; then rm -f ~pgsql/.profile; fi
%%SERVER%%@unexec if cmp -s ~pgsql/.cshrc %D/share/postgresql/dot.cshrc.dist; then rm -f ~pgsql/.cshrc; fi
%%SERVER%%@unexec [ -f ~pgsql/dot.profile.dist ] && rm ~pgsql/dot.profile.dist
diff --git a/deskutils/gnochm/pkg-plist b/deskutils/gnochm/pkg-plist
index 5e55be62f8d7..1dddae51dd10 100644
--- a/deskutils/gnochm/pkg-plist
+++ b/deskutils/gnochm/pkg-plist
@@ -25,3 +25,7 @@ share/mime/packages/gnochm.xml
@dirrm share/gnome/gnochm
@exec update-mime-database %D/share/mime
@unexec update-mime-database %D/share/mime
+@unexec rmdir %D/share/locale/de_DE/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/de_DE 2> /dev/null || true
+@unexec rmdir %D/share/locale/tr_TR/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/tr_TR 2> /dev/null || true
diff --git a/deskutils/gnome-pim/pkg-plist b/deskutils/gnome-pim/pkg-plist
index 8330f8640bcf..e027e12e4d81 100644
--- a/deskutils/gnome-pim/pkg-plist
+++ b/deskutils/gnome-pim/pkg-plist
@@ -69,6 +69,12 @@ share/locale/vi/LC_MESSAGES/gnome-pim.mo
share/locale/wa/LC_MESSAGES/gnome-pim.mo
share/locale/zh_CN/LC_MESSAGES/gnome-pim.mo
share/locale/zh_TW/LC_MESSAGES/gnome-pim.mo
+@unexec rmdir %D/share/locale/gd/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/gd 2> /dev/null || true
+@unexec rmdir %D/share/locale/gv/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/gv 2> /dev/null || true
+@unexec rmdir %D/share/locale/kw/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/kw 2> /dev/null || true
@dirrm share/gnome/help/gnomecard/eu
@dirrm share/gnome/help/gnomecard/C
@dirrm share/gnome/help/gnomecard
diff --git a/deskutils/gnomepim/pkg-plist b/deskutils/gnomepim/pkg-plist
index 8330f8640bcf..e027e12e4d81 100644
--- a/deskutils/gnomepim/pkg-plist
+++ b/deskutils/gnomepim/pkg-plist
@@ -69,6 +69,12 @@ share/locale/vi/LC_MESSAGES/gnome-pim.mo
share/locale/wa/LC_MESSAGES/gnome-pim.mo
share/locale/zh_CN/LC_MESSAGES/gnome-pim.mo
share/locale/zh_TW/LC_MESSAGES/gnome-pim.mo
+@unexec rmdir %D/share/locale/gd/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/gd 2> /dev/null || true
+@unexec rmdir %D/share/locale/gv/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/gv 2> /dev/null || true
+@unexec rmdir %D/share/locale/kw/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/kw 2> /dev/null || true
@dirrm share/gnome/help/gnomecard/eu
@dirrm share/gnome/help/gnomecard/C
@dirrm share/gnome/help/gnomecard
diff --git a/deskutils/logjam/pkg-plist b/deskutils/logjam/pkg-plist
index b14fe3b1be01..ca0d9658c93a 100644
--- a/deskutils/logjam/pkg-plist
+++ b/deskutils/logjam/pkg-plist
@@ -10,3 +10,9 @@ share/locale/es/LC_MESSAGES/logjam.mo
share/locale/he/LC_MESSAGES/logjam.mo
share/locale/ru_RU/LC_MESSAGES/logjam.mo
share/locale/uk_UA/LC_MESSAGES/logjam.mo
+@unexec rmdir %D/share/locale/en_US.UTF-8/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/en_US.UTF-8 2> /dev/null || true
+@unexec rmdir %D/share/locale/ru_RU/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/ru_RU 2> /dev/null || true
+@unexec rmdir %D/share/locale/uk_UA/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/uk_UA 2> /dev/null || true
diff --git a/devel/bison/pkg-plist b/devel/bison/pkg-plist
index 455500c02571..f1d3f5a225f8 100644
--- a/devel/bison/pkg-plist
+++ b/devel/bison/pkg-plist
@@ -19,6 +19,5 @@ bin/bison
%%NLS%%share/locale/ru/LC_MESSAGES/bison.mo
%%NLS%%share/locale/sv/LC_MESSAGES/bison.mo
%%NLS%%share/locale/tr/LC_MESSAGES/bison.mo
-%%NLS%%@unexec rmdir %D/share/locale/hr/LC_MESSAGES 2> /dev/null || true
@dirrm %%DATADIR%%/m4sugar
@dirrm %%DATADIR%%
diff --git a/devel/bison175/pkg-plist b/devel/bison175/pkg-plist
index 455500c02571..f1d3f5a225f8 100644
--- a/devel/bison175/pkg-plist
+++ b/devel/bison175/pkg-plist
@@ -19,6 +19,5 @@ bin/bison
%%NLS%%share/locale/ru/LC_MESSAGES/bison.mo
%%NLS%%share/locale/sv/LC_MESSAGES/bison.mo
%%NLS%%share/locale/tr/LC_MESSAGES/bison.mo
-%%NLS%%@unexec rmdir %D/share/locale/hr/LC_MESSAGES 2> /dev/null || true
@dirrm %%DATADIR%%/m4sugar
@dirrm %%DATADIR%%
diff --git a/devel/gettext/pkg-plist b/devel/gettext/pkg-plist
index a1b9759aee8e..5561138f9b18 100644
--- a/devel/gettext/pkg-plist
+++ b/devel/gettext/pkg-plist
@@ -291,7 +291,6 @@ share/locale/zh_TW/LC_MESSAGES/gettext-tools.mo
@unexec rmdir %%LOCALBASE%%/share/locale/fi/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %%LOCALBASE%%/share/locale/gl/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %%LOCALBASE%%/share/locale/ko/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %%LOCALBASE%%/share/locale/nl/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %%LOCALBASE%%/share/locale/nn/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %%LOCALBASE%%/share/locale/no/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %%LOCALBASE%%/share/locale/pl/LC_MESSAGES 2>/dev/null || true
@@ -312,7 +311,6 @@ share/locale/zh_TW/LC_MESSAGES/gettext-tools.mo
@unexec rmdir %%LOCALBASE%%/share/locale/fi 2>/dev/null || true
@unexec rmdir %%LOCALBASE%%/share/locale/gl 2>/dev/null || true
@unexec rmdir %%LOCALBASE%%/share/locale/ko 2>/dev/null || true
-@unexec rmdir %%LOCALBASE%%/share/locale/nl 2>/dev/null || true
@unexec rmdir %%LOCALBASE%%/share/locale/nn 2>/dev/null || true
@unexec rmdir %%LOCALBASE%%/share/locale/no 2>/dev/null || true
@unexec rmdir %%LOCALBASE%%/share/locale/pl 2>/dev/null || true
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index 3b3abdb960c0..5a7533881bfe 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -155,6 +155,12 @@ share/locale/wa/LC_MESSAGES/glib20.mo
share/locale/yi/LC_MESSAGES/glib20.mo
share/locale/zh_CN/LC_MESSAGES/glib20.mo
share/locale/zh_TW/LC_MESSAGES/glib20.mo
+@unexec rmdir %D/share/locale/ne/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/ne 2> /dev/null || true
+@unexec rmdir %D/share/locale/sr@ije/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/sr@ije 2> /dev/null || true
+@unexec rmdir %D/share/locale/yi/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/yi 2> /dev/null || true
@dirrm share/glib-2.0/gettext/po
@dirrm share/glib-2.0/gettext
@dirrm share/glib-2.0
diff --git a/devel/gmake/pkg-plist b/devel/gmake/pkg-plist
index e27e6c91198e..c446cc3fb5b8 100644
--- a/devel/gmake/pkg-plist
+++ b/devel/gmake/pkg-plist
@@ -15,7 +15,3 @@ bin/gmake
%%NLS%%share/locale/sv/LC_MESSAGES/make.mo
%%NLS%%share/locale/tr/LC_MESSAGES/make.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/make.mo
-%%NLS%%@unexec rmdir %D/share/locale/he/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/hr/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/he 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/hr 2>/dev/null || true
diff --git a/devel/gmake381/pkg-plist b/devel/gmake381/pkg-plist
index e27e6c91198e..c446cc3fb5b8 100644
--- a/devel/gmake381/pkg-plist
+++ b/devel/gmake381/pkg-plist
@@ -15,7 +15,3 @@ bin/gmake
%%NLS%%share/locale/sv/LC_MESSAGES/make.mo
%%NLS%%share/locale/tr/LC_MESSAGES/make.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/make.mo
-%%NLS%%@unexec rmdir %D/share/locale/he/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/hr/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/he 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/hr 2>/dev/null || true
diff --git a/devel/kdbg/pkg-plist b/devel/kdbg/pkg-plist
index 44b253844d99..3656760ae6c2 100644
--- a/devel/kdbg/pkg-plist
+++ b/devel/kdbg/pkg-plist
@@ -102,10 +102,8 @@ share/locale/sr/LC_MESSAGES/kdbg.mo
share/locale/sv/LC_MESSAGES/kdbg.mo
share/locale/tr/LC_MESSAGES/kdbg.mo
share/locale/zh_CN.GB2312/LC_MESSAGES/kdbg.mo
-@dirrm share/locale/zh_CN.GB2312/LC_MESSAGES
-@dirrm share/locale/zh_CN.GB2312
-@dirrm share/locale/no_NY/LC_MESSAGES
-@dirrm share/locale/no_NY
+@unexec rmdir %D/share/locale/no_NY/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/no_NY 2> /dev/null || true
@dirrm share/doc/HTML/ru/kdbg
@dirrm share/doc/HTML/en/kdbg
@dirrm share/doc/HTML/de/kdbg
diff --git a/devel/libbonobo/pkg-plist b/devel/libbonobo/pkg-plist
index a3d113f0d6fc..17b01ff27ec7 100644
--- a/devel/libbonobo/pkg-plist
+++ b/devel/libbonobo/pkg-plist
@@ -257,3 +257,5 @@ share/locale/zh_TW/LC_MESSAGES/libbonobo-2.0.mo
@dirrm etc/bonobo-activation
@unexec /bin/rmdir %D/lib/bonobo/monikers 2>/dev/null || /usr/bin/true
@unexec /bin/rmdir %D/lib/bonobo 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/locale/li/LC_MESSAGES 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/locale/li 2>/dev/null || /usr/bin/true
diff --git a/devel/libgtop2/pkg-plist b/devel/libgtop2/pkg-plist
index cc1d2ecda163..8bc83937eb9c 100644
--- a/devel/libgtop2/pkg-plist
+++ b/devel/libgtop2/pkg-plist
@@ -111,3 +111,5 @@ share/locale/zh_CN/LC_MESSAGES/libgtop-2.0.mo
share/locale/zh_TW/LC_MESSAGES/libgtop-2.0.mo
@dirrm include/libgtop-2.0/glibtop
@dirrm include/libgtop-2.0
+@unexec rmdir %D/share/locale/mi/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/mi 2> /dev/null || true
diff --git a/devel/popt/pkg-plist b/devel/popt/pkg-plist
index 25609007112d..d94139fbb789 100644
--- a/devel/popt/pkg-plist
+++ b/devel/popt/pkg-plist
@@ -31,26 +31,16 @@ lib/libpopt.so.0
%%NLS%%share/locale/wa/LC_MESSAGES/popt.mo
%%NLS%%share/locale/zh/LC_MESSAGES/popt.mo
%%NLS%%share/locale/zh_CN.GB2312/LC_MESSAGES/popt.mo
-%%NLS%%@unexec rmdir %D/share/locale/zh_CN.GB2312/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/zh_CN.GB2312 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/zh/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/zh 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/wa/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/wa 2>/dev/null || true
%%NLS%%@unexec rmdir %D/share/locale/uk/LC_MESSAGES 2>/dev/null || true
%%NLS%%@unexec rmdir %D/share/locale/uk 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/tr/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/sv/LC_MESSAGES 2>/dev/null || true
%%NLS%%@unexec rmdir %D/share/locale/sr/LC_MESSAGES 2>/dev/null || true
%%NLS%%@unexec rmdir %D/share/locale/sr 2>/dev/null || true
%%NLS%%@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null || true
%%NLS%%@unexec rmdir %D/share/locale/sl 2>/dev/null || true
%%NLS%%@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
%%NLS%%@unexec rmdir %D/share/locale/sk 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true
%%NLS%%@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
%%NLS%%@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true
%%NLS%%@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
%%NLS%%@unexec rmdir %D/share/locale/pt 2>/dev/null || true
%%NLS%%@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
@@ -59,21 +49,11 @@ lib/libpopt.so.0
%%NLS%%@unexec rmdir %D/share/locale/no 2>/dev/null || true
%%NLS%%@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null || true
%%NLS%%@unexec rmdir %D/share/locale/ko 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/ja/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/is/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/is 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/id/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/hu/LC_MESSAGES 2>/dev/null || true
%%NLS%%@unexec rmdir %D/share/locale/gl/LC_MESSAGES 2>/dev/null || true
%%NLS%%@unexec rmdir %D/share/locale/gl 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
%%NLS%%@unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null || true
%%NLS%%@unexec rmdir %D/share/locale/fi 2>/dev/null || true
%%NLS%%@unexec rmdir %D/share/locale/eu_ES/LC_MESSAGES 2>/dev/null || true
%%NLS%%@unexec rmdir %D/share/locale/eu_ES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/da/LC_MESSAGES 2>/dev/null || true
%%NLS%%@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
%%NLS%%@unexec rmdir %D/share/locale/cs 2>/dev/null || true
diff --git a/editors/poedit/pkg-plist b/editors/poedit/pkg-plist
index 791098c5ec26..9953f7c2215f 100644
--- a/editors/poedit/pkg-plist
+++ b/editors/poedit/pkg-plist
@@ -50,3 +50,13 @@ share/locale/zh_TW/LC_MESSAGES/poedit.mo
%%DATADIR%%/help.zip
%%DATADIR%%/resources.zip
@dirrm %%DATADIR%%
+@unexec rmdir %D/share/locale/af_ZA/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/af_ZA 2> /dev/null || true
+@unexec rmdir %D/share/locale/am_ET/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/am_ET 2> /dev/null || true
+@unexec rmdir %D/share/locale/pa_IN/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/pa_IN 2> /dev/null || true
+@unexec rmdir %D/share/locale/sq_AL/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/sq_AL 2> /dev/null || true
+@unexec rmdir %D/share/locale/sv_SE/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/sv_SE 2> /dev/null || true
diff --git a/finance/gnucash-devel/pkg-plist b/finance/gnucash-devel/pkg-plist
index 865e0d484d87..8eb8b7259434 100644
--- a/finance/gnucash-devel/pkg-plist
+++ b/finance/gnucash-devel/pkg-plist
@@ -708,6 +708,8 @@ share/locale/tr/LC_MESSAGES/gnucash.mo
share/locale/uk/LC_MESSAGES/gnucash.mo
share/locale/zh_CN/LC_MESSAGES/gnucash.mo
share/locale/zh_TW/LC_MESSAGES/gnucash.mo
+@unexec rmdir %D/share/locale/es_NI/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/es_NI 2> /dev/null || true
@dirrm share/gnome/pixmaps/gnucash
@dirrm share/gnome/gnucash/scm/qif-import
@dirrm share/gnome/gnucash/scm/printing
diff --git a/finance/gnucash/pkg-plist b/finance/gnucash/pkg-plist
index 865e0d484d87..8eb8b7259434 100644
--- a/finance/gnucash/pkg-plist
+++ b/finance/gnucash/pkg-plist
@@ -708,6 +708,8 @@ share/locale/tr/LC_MESSAGES/gnucash.mo
share/locale/uk/LC_MESSAGES/gnucash.mo
share/locale/zh_CN/LC_MESSAGES/gnucash.mo
share/locale/zh_TW/LC_MESSAGES/gnucash.mo
+@unexec rmdir %D/share/locale/es_NI/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/es_NI 2> /dev/null || true
@dirrm share/gnome/pixmaps/gnucash
@dirrm share/gnome/gnucash/scm/qif-import
@dirrm share/gnome/gnucash/scm/printing
diff --git a/ftp/kftpgrabber/pkg-plist b/ftp/kftpgrabber/pkg-plist
index c55ede62f32d..90e7ec982ffc 100644
--- a/ftp/kftpgrabber/pkg-plist
+++ b/ftp/kftpgrabber/pkg-plist
@@ -17,6 +17,7 @@ share/icons/hicolor/32x32/apps/kftpgrabber.png
share/icons/hicolor/48x48/apps/kftpgrabber.png
share/locale/de/LC_MESSAGES/kftpgrabber.mo
share/locale/es/LC_MESSAGES/kftpgrabber.mo
+share/locale/hu/LC_MESSAGES/kftpgrabber.mo
share/services/kftpimportplugin_gftp.desktop
share/servicetypes/kftpbookmarkimportplugin.desktop
@unexec rmdir %D/share/servicetypes 2>/dev/null || true
diff --git a/games/freeciv/pkg-plist b/games/freeciv/pkg-plist
index a043fb2d08e5..5c7fe271919a 100644
--- a/games/freeciv/pkg-plist
+++ b/games/freeciv/pkg-plist
@@ -165,42 +165,16 @@ share/locale/ro/LC_MESSAGES/freeciv.mo
share/locale/ru/LC_MESSAGES/freeciv.mo
share/locale/sv/LC_MESSAGES/freeciv.mo
share/locale/uk/LC_MESSAGES/freeciv.mo
-@unexec rmdir %D/share/locale/da/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/da 2>/dev/null || true
-@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/de 2>/dev/null || true
-@unexec rmdir %D/share/locale/en_GB/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/en_GB 2>/dev/null || true
-@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/es 2>/dev/null || true
-@unexec rmdir %D/share/locale/et/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/et 2>/dev/null || true
@unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/fi 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr 2>/dev/null || true
-@unexec rmdir %D/share/locale/hu/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/hu 2>/dev/null || true
-@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/it 2>/dev/null || true
-@unexec rmdir %D/share/locale/ja/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ja 2>/dev/null || true
-@unexec rmdir %D/share/locale/nl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/nl 2>/dev/null || true
@unexec rmdir %D/share/locale/no/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/no 2>/dev/null || true
@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/pl 2>/dev/null || true
@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/pt 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt_BR 2>/dev/null || true
@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-@unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ru 2>/dev/null || true
-@unexec rmdir %D/share/locale/sv/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sv 2>/dev/null || true
@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/sk 2>/dev/null || true
@dirrm %%DATADIR%%/trident
diff --git a/games/gnubg/pkg-plist b/games/gnubg/pkg-plist
index ab142c1211a3..90d2cfb5370c 100644
--- a/games/gnubg/pkg-plist
+++ b/games/gnubg/pkg-plist
@@ -45,3 +45,5 @@ share/locale/is/LC_MESSAGES/gnubg.mo
share/locale/it/LC_MESSAGES/gnubg.mo
share/locale/ja/LC_MESSAGES/gnubg.mo
share/locale/tr/LC_MESSAGES/gnubg.mo
+@unexec rmdir %D/share/locale/en_US/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/en_US 2> /dev/null || true
diff --git a/games/gturing/pkg-plist b/games/gturing/pkg-plist
index aaf54a520af0..57940fa09755 100644
--- a/games/gturing/pkg-plist
+++ b/games/gturing/pkg-plist
@@ -41,8 +41,6 @@ share/gnome/help/gturing/C/gturing.xml
share/gnome/help/gturing/C/figures/mainwin.png
share/gnome/applications/gturing.desktop
bin/gturing
-@unexec rmdir %D/share/locale/*/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/* 2>/dev/null || true
%%PORTDOCS%%share/examples/gturing/subst.tur
%%PORTDOCS%%share/examples/gturing/sort.tur
%%PORTDOCS%%share/examples/gturing/dec2bin_shift.tur
diff --git a/games/wesnoth-devel/pkg-plist b/games/wesnoth-devel/pkg-plist
index b840191404bc..7e60f9659bdc 100644
--- a/games/wesnoth-devel/pkg-plist
+++ b/games/wesnoth-devel/pkg-plist
@@ -2771,6 +2771,8 @@ share/wesnoth/sounds/wolf-attack.wav
share/wesnoth/sounds/wolf-cry.wav
share/wesnoth/sounds/zombie-attack.wav
share/wesnoth/sounds/zombie-hit.wav
+@unexec rmdir %D/share/locale/el_GR/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/el_GR 2> /dev/null || true
@dirrm share/wesnoth/sounds
%%LITE:%%@dirrm share/wesnoth/music
@dirrm share/wesnoth/images/tools/exploder
diff --git a/games/wesnoth/pkg-plist b/games/wesnoth/pkg-plist
index b840191404bc..7e60f9659bdc 100644
--- a/games/wesnoth/pkg-plist
+++ b/games/wesnoth/pkg-plist
@@ -2771,6 +2771,8 @@ share/wesnoth/sounds/wolf-attack.wav
share/wesnoth/sounds/wolf-cry.wav
share/wesnoth/sounds/zombie-attack.wav
share/wesnoth/sounds/zombie-hit.wav
+@unexec rmdir %D/share/locale/el_GR/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/el_GR 2> /dev/null || true
@dirrm share/wesnoth/sounds
%%LITE:%%@dirrm share/wesnoth/music
@dirrm share/wesnoth/images/tools/exploder
diff --git a/graphics/eog2/pkg-plist b/graphics/eog2/pkg-plist
index a2e26eff2753..ecd22848fd0b 100644
--- a/graphics/eog2/pkg-plist
+++ b/graphics/eog2/pkg-plist
@@ -156,4 +156,6 @@ share/locale/zu/LC_MESSAGES/eog.mo
@dirrm share/gnome/help/eog
@dirrm share/gnome/eog/glade
@dirrm share/gnome/eog
+@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/zu 2> /dev/null || true
@unexec update-desktop-database > /dev/null || /usr/bin/true
diff --git a/graphics/gtksee/pkg-plist b/graphics/gtksee/pkg-plist
index c708fb4af612..fa8e7f07b568 100644
--- a/graphics/gtksee/pkg-plist
+++ b/graphics/gtksee/pkg-plist
@@ -6,3 +6,7 @@ bin/gtksee
%%NLS%%share/locale/ru/LC_MESSAGES/gtksee.mo
%%NLS%%share/locale/ru_UA/LC_MESSAGES/gtksee.mo
%%NLS%%share/locale/zh_CN.EUC/LC_MESSAGES/gtksee.mo
+%%NLS%%@unexec rmdir %D/share/locale/zh_CN.EUC/LC_MESSAGES 2> /dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/zh_CN.EUC 2> /dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ru_UA/LC_MESSAGES 2> /dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ru_UA 2> /dev/null || true
diff --git a/graphics/gwenview-kde4/pkg-plist b/graphics/gwenview-kde4/pkg-plist
index ca52481eb454..f21530fdf9a0 100644
--- a/graphics/gwenview-kde4/pkg-plist
+++ b/graphics/gwenview-kde4/pkg-plist
@@ -89,6 +89,16 @@ share/locale/xh/LC_MESSAGES/gwenview.mo
share/locale/zh_CN/LC_MESSAGES/gwenview.mo
share/locale/zh_TW/LC_MESSAGES/gwenview.mo
share/locale/zu/LC_MESSAGES/gwenview.mo
+@unexec rmdir %D/share/locale/fo/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/fo 2> /dev/null || true
+@unexec rmdir %D/share/locale/nso/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/nso 2> /dev/null || true
+@unexec rmdir %D/share/locale/ven/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/ven 2> /dev/null || true
+@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/xh 2> /dev/null || true
+@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/zu 2> /dev/null || true
@unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true
@unexec rmdir %D/share/icons/locolor/32x32 2>/dev/null || true
@unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true
diff --git a/graphics/gwenview/pkg-plist b/graphics/gwenview/pkg-plist
index ca52481eb454..f21530fdf9a0 100644
--- a/graphics/gwenview/pkg-plist
+++ b/graphics/gwenview/pkg-plist
@@ -89,6 +89,16 @@ share/locale/xh/LC_MESSAGES/gwenview.mo
share/locale/zh_CN/LC_MESSAGES/gwenview.mo
share/locale/zh_TW/LC_MESSAGES/gwenview.mo
share/locale/zu/LC_MESSAGES/gwenview.mo
+@unexec rmdir %D/share/locale/fo/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/fo 2> /dev/null || true
+@unexec rmdir %D/share/locale/nso/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/nso 2> /dev/null || true
+@unexec rmdir %D/share/locale/ven/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/ven 2> /dev/null || true
+@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/xh 2> /dev/null || true
+@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/zu 2> /dev/null || true
@unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true
@unexec rmdir %D/share/icons/locolor/32x32 2>/dev/null || true
@unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true
diff --git a/graphics/zphoto/pkg-plist b/graphics/zphoto/pkg-plist
index 98fbe669c3df..e30b2cf9ec9e 100644
--- a/graphics/zphoto/pkg-plist
+++ b/graphics/zphoto/pkg-plist
@@ -32,6 +32,8 @@ share/zphoto/doc/images/wxzphoto.png
share/zphoto/fonts/EfontSerifB.fdb
share/locale/ja/LC_MESSAGES/zphoto.mo
share/locale/ja_JP.SJIS/LC_MESSAGES/zphoto.mo
+@unexec rmdir %D/share/locale/ja_JP.SJIS/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/ja_JP.SJIS 2> /dev/null || true
@dirrm share/zphoto/templates/default/en
@dirrm share/zphoto/templates/default/ja
@dirrm share/zphoto/templates/default/all
diff --git a/japanese/lyx/pkg-plist b/japanese/lyx/pkg-plist
index 369ee278a391..88dc7769deb4 100644
--- a/japanese/lyx/pkg-plist
+++ b/japanese/lyx/pkg-plist
@@ -235,37 +235,15 @@ share/lyx/textclass.lst
@dirrm share/lyx/doc
@dirrm share/lyx/clipart
@dirrm share/lyx/bind
-@dirrm share/locale/wa/LC_MESSAGES
-@dirrm share/locale/wa
-@dirrm share/locale/tr/LC_MESSAGES
-@dirrm share/locale/tr
-@dirrm share/locale/sv/LC_MESSAGES
-@dirrm share/locale/sv
@dirrm share/locale/sl/LC_MESSAGES
@dirrm share/locale/sl
-@dirrm share/locale/ru/LC_MESSAGES
-@dirrm share/locale/ru
@dirrm share/locale/pt/LC_MESSAGES
@dirrm share/locale/pt
@dirrm share/locale/pl/LC_MESSAGES
@dirrm share/locale/pl
@dirrm share/locale/no/LC_MESSAGES
@dirrm share/locale/no
-@dirrm share/locale/nl/LC_MESSAGES
-@dirrm share/locale/nl
-@dirrm share/locale/it/LC_MESSAGES
-@dirrm share/locale/it
-@dirrm share/locale/hu/LC_MESSAGES
-@dirrm share/locale/hu
-@dirrm share/locale/fr/LC_MESSAGES
-@dirrm share/locale/fr
@dirrm share/locale/fi/LC_MESSAGES
@dirrm share/locale/fi
-@dirrm share/locale/es/LC_MESSAGES
-@dirrm share/locale/es
-@dirrm share/locale/de/LC_MESSAGES
-@dirrm share/locale/de
-@dirrm share/locale/da/LC_MESSAGES
-@dirrm share/locale/da
@dirrm share/locale/cs/LC_MESSAGES
@dirrm share/locale/cs
diff --git a/japanese/texinfo/pkg-plist b/japanese/texinfo/pkg-plist
index d0518cbaccc7..5cf5e83aab2b 100644
--- a/japanese/texinfo/pkg-plist
+++ b/japanese/texinfo/pkg-plist
@@ -53,9 +53,20 @@ share/locale/sv/LC_MESSAGES/texinfo.mo
share/locale/tr/LC_MESSAGES/texinfo.mo
share/locale/zh_CN/LC_MESSAGES/texinfo.mo
share/locale/zh_TW/LC_MESSAGES/texinfo.mo
-@unexec rmdir %D/share/locale/*/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/* 2>/dev/null || true
-@unexec rmdir %D/share/locale 2>/dev/null || true
+@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/cs 2>/dev/null || true
+@unexec rmdir %D/share/locale/de_AT/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/de_AT 2>/dev/null || true
+@unexec rmdir %D/share/locale/no/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/no 2>/dev/null || true
+@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/pl 2>/dev/null || true
+@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/ro 2>/dev/null || true
+@unexec rmdir %D/share/locale/no/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/no 2>/dev/null || true
+@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
@unexec rmdir %D/%%TEXMFLOCAL%%/tex/generic/dvips 2>/dev/null || true
@unexec rmdir %D/%%TEXMFLOCAL%%/pdftex/plain/misc 2>/dev/null || true
@unexec rmdir %D/%%TEXMFLOCAL%%/pdftex/plain 2>/dev/null || true
diff --git a/lang/clisp/pkg-plist b/lang/clisp/pkg-plist
index 41f0570d75eb..f611e2921446 100644
--- a/lang/clisp/pkg-plist
+++ b/lang/clisp/pkg-plist
@@ -67,8 +67,6 @@ share/locale/ru/LC_MESSAGES/clisplow.mo
@dirrm lib/clisp
@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/de 2>/dev/null || true
-@unexec rmdir %D/share/locale/en/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/en 2>/dev/null || true
@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/es 2>/dev/null || true
@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
diff --git a/mail/gnubiff/pkg-plist b/mail/gnubiff/pkg-plist
index 4e85afcb6004..3f278b10f410 100644
--- a/mail/gnubiff/pkg-plist
+++ b/mail/gnubiff/pkg-plist
@@ -30,4 +30,6 @@ share/locale/sv/LC_MESSAGES/gnubiff.mo
%%SHAREDIR%%/pixmaps/gnubiff.png
%%WITH_GNOME%%libdata/bonobo/servers/GNOME_gnubiffApplet.server
%%WITH_GNOME%%%%SHAREDIR%%/gnome-2.0/ui/GNOME_gnubiffApplet.xml
+@unexec rmdir %D/share/locale/fr_CA/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/fr_CA 2> /dev/null || true@
@dirrm %%SHAREDIR%%/gnubiff
diff --git a/mail/kbiff/pkg-plist b/mail/kbiff/pkg-plist
index 1898cba7b8db..5390eee2d243 100644
--- a/mail/kbiff/pkg-plist
+++ b/mail/kbiff/pkg-plist
@@ -60,6 +60,8 @@ share/locale/sv/LC_MESSAGES/kbiff.mo
share/locale/tr/LC_MESSAGES/kbiff.mo
share/locale/uk/LC_MESSAGES/kbiff.mo
share/locale/zh_TW.Big5/LC_MESSAGES/kbiff.mo
+@unexec rmdir %D/share/locale/no_NY/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/no_NY 2> /dev/null || true
@dirrm share/doc/HTML/fr/kbiff
@dirrm share/doc/HTML/es/kbiff
@dirrm share/doc/HTML/en/kbiff
diff --git a/mail/spruce/pkg-plist b/mail/spruce/pkg-plist
index e606af8503bd..a73efe956b63 100644
--- a/mail/spruce/pkg-plist
+++ b/mail/spruce/pkg-plist
@@ -12,3 +12,5 @@ bin/spruce
%%NLS%%share/locale/sk/LC_MESSAGES/spruce.mo
%%NLS%%share/locale/sv/LC_MESSAGES/spruce.mo
%%NLS%%share/locale/zh_TW.Big5/LC_MESSAGES/spruce.mo
+%%NLS%%@unexec rmdir %D/share/locale/ru_RU/LC_MESSAGES 2> /dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ru_RU 2> /dev/null || true
diff --git a/misc/gnome-mime-data/pkg-plist b/misc/gnome-mime-data/pkg-plist
index e2dbf809686b..362ed1422627 100644
--- a/misc/gnome-mime-data/pkg-plist
+++ b/misc/gnome-mime-data/pkg-plist
@@ -73,3 +73,7 @@ share/locale/wa/LC_MESSAGES/gnome-mime-data.mo
share/locale/yi/LC_MESSAGES/gnome-mime-data.mo
share/locale/zh_CN/LC_MESSAGES/gnome-mime-data.mo
share/locale/zh_TW/LC_MESSAGES/gnome-mime-data.mo
+@unexec rmdir %D/share/locale/sr@ije/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/sr@ije 2>/dev/null || true
+@unexec rmdir %D/share/locale/yi/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/yi
diff --git a/misc/gnomemimedata/pkg-plist b/misc/gnomemimedata/pkg-plist
index e2dbf809686b..362ed1422627 100644
--- a/misc/gnomemimedata/pkg-plist
+++ b/misc/gnomemimedata/pkg-plist
@@ -73,3 +73,7 @@ share/locale/wa/LC_MESSAGES/gnome-mime-data.mo
share/locale/yi/LC_MESSAGES/gnome-mime-data.mo
share/locale/zh_CN/LC_MESSAGES/gnome-mime-data.mo
share/locale/zh_TW/LC_MESSAGES/gnome-mime-data.mo
+@unexec rmdir %D/share/locale/sr@ije/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/sr@ije 2>/dev/null || true
+@unexec rmdir %D/share/locale/yi/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/yi
diff --git a/misc/hello/pkg-plist b/misc/hello/pkg-plist
index 914c002038dc..d0dfbd192c7e 100644
--- a/misc/hello/pkg-plist
+++ b/misc/hello/pkg-plist
@@ -33,3 +33,5 @@ info/hello.info
%%NLS%%share/locale/sv/LC_MESSAGES/hello.mo
%%NLS%%share/locale/tr/LC_MESSAGES/hello.mo
%%NLS%%share/locale/uk/LC_MESSAGES/hello.mo
+%%NLS%%@unexec rmdir %D/share/locale/de_DE/LC_MESSAGES 2> /dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/de_DE 2> /dev/null || true
diff --git a/misc/kcd-devel/pkg-plist b/misc/kcd-devel/pkg-plist
index c92f07ed9238..af488b09f1c8 100644
--- a/misc/kcd-devel/pkg-plist
+++ b/misc/kcd-devel/pkg-plist
@@ -9,3 +9,7 @@ share/locale/en_US.UTF-8/LC_MESSAGES/kcd.mo
%%PORTDOCS%%share/examples/kcd/kcd.sh.init
%%PORTDOCS%%@dirrm share/examples/kcd
%%PORTDOCS%%@dirrm share/doc/kcd
+@unexec rmdir %D/share/locale/en_GB.UTF-8/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/en_GB.UTF-8 2> /dev/null || true
+@unexec rmdir %D/share/locale/en_US.UTF-8/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/en_US.UTF-8 2> /dev/null || true
diff --git a/misc/kcd/pkg-plist b/misc/kcd/pkg-plist
index c92f07ed9238..af488b09f1c8 100644
--- a/misc/kcd/pkg-plist
+++ b/misc/kcd/pkg-plist
@@ -9,3 +9,7 @@ share/locale/en_US.UTF-8/LC_MESSAGES/kcd.mo
%%PORTDOCS%%share/examples/kcd/kcd.sh.init
%%PORTDOCS%%@dirrm share/examples/kcd
%%PORTDOCS%%@dirrm share/doc/kcd
+@unexec rmdir %D/share/locale/en_GB.UTF-8/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/en_GB.UTF-8 2> /dev/null || true
+@unexec rmdir %D/share/locale/en_US.UTF-8/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/en_US.UTF-8 2> /dev/null || true
diff --git a/misc/mc/pkg-plist b/misc/mc/pkg-plist
index 3e8128a1d7c9..6c2b42649854 100644
--- a/misc/mc/pkg-plist
+++ b/misc/mc/pkg-plist
@@ -137,8 +137,6 @@ share/mc/term/xterm.ti
@dirrm share/mc
@unexec rmdir %D/share/locale/wa/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/wa 2>/dev/null || true
-@unexec rmdir %D/share/locale/hu/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/hu 2>/dev/null || true
@unexec rmdir %D/man/es/man1 2>/dev/null || true
@unexec rmdir %D/man/es/cat1 2>/dev/null || true
@unexec rmdir %D/man/es 2>/dev/null || true
diff --git a/net-im/kmerlin/pkg-plist b/net-im/kmerlin/pkg-plist
index 986ac7fa2792..775e701920c8 100644
--- a/net-im/kmerlin/pkg-plist
+++ b/net-im/kmerlin/pkg-plist
@@ -83,6 +83,10 @@ share/locale/zh-TW/LC_MESSAGES/kmerlin.mo
share/icons/locolor/32x32/apps/kmerlin.png
share/icons/locolor/16x16/apps/kmerlin.png
share/applnk/Internet/kmerlin.desktop
+@unexec rmdir %D/share/locale/zh-CN/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/zh-CN 2> /dev/null || true
+@unexec rmdir %D/share/locale/zh-TW/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/zh-TW 2> /dev/null || true
@dirrm share/doc/HTML/en/kmerlin
@dirrm share/apps/kmerlin/icons/hicolor/16x16/actions
@dirrm share/apps/kmerlin/icons/hicolor/16x16
diff --git a/net-im/kmess-kde4/pkg-plist b/net-im/kmess-kde4/pkg-plist
index 75baf8b8626a..d9dd7a8a5ac3 100644
--- a/net-im/kmess-kde4/pkg-plist
+++ b/net-im/kmess-kde4/pkg-plist
@@ -112,6 +112,8 @@ share/sounds/kmess_chat.ogg
share/sounds/kmess_logoff.ogg
share/sounds/kmess_logon.ogg
share/sounds/kmess_msg.ogg
+@unexec rmdir %D/share/locale/zh_CN.GB18030/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/zh_CN.GB18030 2> /dev/null || true
@dirrm share/doc/HTML/en/kmess
@dirrm share/apps/kmess/pics
@dirrm share/apps/kmess/icons/hicolor/16x16/apps
diff --git a/net-im/kmess/pkg-plist b/net-im/kmess/pkg-plist
index 75baf8b8626a..d9dd7a8a5ac3 100644
--- a/net-im/kmess/pkg-plist
+++ b/net-im/kmess/pkg-plist
@@ -112,6 +112,8 @@ share/sounds/kmess_chat.ogg
share/sounds/kmess_logoff.ogg
share/sounds/kmess_logon.ogg
share/sounds/kmess_msg.ogg
+@unexec rmdir %D/share/locale/zh_CN.GB18030/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/zh_CN.GB18030 2> /dev/null || true
@dirrm share/doc/HTML/en/kmess
@dirrm share/apps/kmess/pics
@dirrm share/apps/kmess/icons/hicolor/16x16/apps
diff --git a/net-im/sim-im/pkg-plist b/net-im/sim-im/pkg-plist
index 122fbcdd7d7e..4555cb2b01a5 100644
--- a/net-im/sim-im/pkg-plist
+++ b/net-im/sim-im/pkg-plist
@@ -129,6 +129,8 @@ share/services/simctrl.desktop
@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
@unexec rmdir %D/share/icons 2>/dev/null || true
+@unexec rmdir %D/share/locale/sw/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/sw 2> /dev/null || true
@dirrm share/apps/sim/styles
@dirrm share/apps/sim/sounds
@dirrm share/apps/sim/pict
diff --git a/net-im/simicq/pkg-plist b/net-im/simicq/pkg-plist
index 122fbcdd7d7e..4555cb2b01a5 100644
--- a/net-im/simicq/pkg-plist
+++ b/net-im/simicq/pkg-plist
@@ -129,6 +129,8 @@ share/services/simctrl.desktop
@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
@unexec rmdir %D/share/icons 2>/dev/null || true
+@unexec rmdir %D/share/locale/sw/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/sw 2> /dev/null || true
@dirrm share/apps/sim/styles
@dirrm share/apps/sim/sounds
@dirrm share/apps/sim/pict
diff --git a/net-p2p/amule1/pkg-plist b/net-p2p/amule1/pkg-plist
index 7000b37e9957..5ebbd5f78e47 100644
--- a/net-p2p/amule1/pkg-plist
+++ b/net-p2p/amule1/pkg-plist
@@ -76,3 +76,5 @@ share/gnome/amuleweb/webserver/yellow.gif
share/gnome/amuleweb/aMule.tmpl
@dirrm share/gnome/amuleweb/webserver
@dirrm share/gnome/amuleweb
+@unexec rmdir %D/share/locale/ee/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/ee 2> /dev/null || true
diff --git a/net/amule/pkg-plist b/net/amule/pkg-plist
index 7000b37e9957..5ebbd5f78e47 100644
--- a/net/amule/pkg-plist
+++ b/net/amule/pkg-plist
@@ -76,3 +76,5 @@ share/gnome/amuleweb/webserver/yellow.gif
share/gnome/amuleweb/aMule.tmpl
@dirrm share/gnome/amuleweb/webserver
@dirrm share/gnome/amuleweb
+@unexec rmdir %D/share/locale/ee/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/ee 2> /dev/null || true
diff --git a/net/amule1/pkg-plist b/net/amule1/pkg-plist
index 7000b37e9957..5ebbd5f78e47 100644
--- a/net/amule1/pkg-plist
+++ b/net/amule1/pkg-plist
@@ -76,3 +76,5 @@ share/gnome/amuleweb/webserver/yellow.gif
share/gnome/amuleweb/aMule.tmpl
@dirrm share/gnome/amuleweb/webserver
@dirrm share/gnome/amuleweb
+@unexec rmdir %D/share/locale/ee/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/ee 2> /dev/null || true
diff --git a/net/kmerlin/pkg-plist b/net/kmerlin/pkg-plist
index 986ac7fa2792..775e701920c8 100644
--- a/net/kmerlin/pkg-plist
+++ b/net/kmerlin/pkg-plist
@@ -83,6 +83,10 @@ share/locale/zh-TW/LC_MESSAGES/kmerlin.mo
share/icons/locolor/32x32/apps/kmerlin.png
share/icons/locolor/16x16/apps/kmerlin.png
share/applnk/Internet/kmerlin.desktop
+@unexec rmdir %D/share/locale/zh-CN/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/zh-CN 2> /dev/null || true
+@unexec rmdir %D/share/locale/zh-TW/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/zh-TW 2> /dev/null || true
@dirrm share/doc/HTML/en/kmerlin
@dirrm share/apps/kmerlin/icons/hicolor/16x16/actions
@dirrm share/apps/kmerlin/icons/hicolor/16x16
diff --git a/net/kmess/pkg-plist b/net/kmess/pkg-plist
index 75baf8b8626a..d9dd7a8a5ac3 100644
--- a/net/kmess/pkg-plist
+++ b/net/kmess/pkg-plist
@@ -112,6 +112,8 @@ share/sounds/kmess_chat.ogg
share/sounds/kmess_logoff.ogg
share/sounds/kmess_logon.ogg
share/sounds/kmess_msg.ogg
+@unexec rmdir %D/share/locale/zh_CN.GB18030/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/zh_CN.GB18030 2> /dev/null || true
@dirrm share/doc/HTML/en/kmess
@dirrm share/apps/kmess/pics
@dirrm share/apps/kmess/icons/hicolor/16x16/apps
diff --git a/net/simicq/pkg-plist b/net/simicq/pkg-plist
index 122fbcdd7d7e..4555cb2b01a5 100644
--- a/net/simicq/pkg-plist
+++ b/net/simicq/pkg-plist
@@ -129,6 +129,8 @@ share/services/simctrl.desktop
@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
@unexec rmdir %D/share/icons 2>/dev/null || true
+@unexec rmdir %D/share/locale/sw/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/sw 2> /dev/null || true
@dirrm share/apps/sim/styles
@dirrm share/apps/sim/sounds
@dirrm share/apps/sim/pict
diff --git a/net/tsclient/pkg-plist b/net/tsclient/pkg-plist
index a6f6a8a49e0f..f5837070e12e 100644
--- a/net/tsclient/pkg-plist
+++ b/net/tsclient/pkg-plist
@@ -41,42 +41,16 @@ share/locale/ru/LC_MESSAGES/tsclient.mo
share/locale/se/LC_MESSAGES/tsclient.mo
share/locale/zh_CN/LC_MESSAGES/tsclient.mo
share/locale/zh_TW/LC_MESSAGES/tsclient.mo
-@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
@unexec rmdir %D/share/locale/se/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/se 2>/dev/null || true
-@unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ru 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt_PT/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt_PT 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt_BR 2>/dev/null || true
@unexec rmdir %D/share/locale/pl_PL/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/pl_PL 2>/dev/null || true
-@unexec rmdir %D/share/locale/no_bb/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/no_bb 2>/dev/null || true
+@unexec rmdir %D/share/locale/no_nb/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/no_nb 2>/dev/null || true
@unexec rmdir %D/share/locale/nl_NL/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/nl_NL 2>/dev/null || true
-@unexec rmdir %D/share/locale/ms/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ms 2>/dev/null || true
-@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/it 2>/dev/null || true
-@unexec rmdir %D/share/locale/hu/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/hu 2>/dev/null || true
@unexec rmdir %D/share/locale/gr/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/gr 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr 2>/dev/null || true
-@unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fi 2>/dev/null || true
-@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/es 2>/dev/null || true
@unexec rmdir %D/share/locale/da_DK/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/da_DK 2>/dev/null || true
-@unexec rmdir %D/share/locale/ar/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ar 2>/dev/null || true
-@unexec rmdir %D/share/nls/POSIX 2>/dev/null || true
-@unexec rmdir %D/share/nls/en_US.US-ASCII 2>/dev/null || true
@dirrm share/gnome/pixmaps/tsclient
diff --git a/print/gtklp/pkg-plist b/print/gtklp/pkg-plist
index c390b4f4ada9..8b63bc66b331 100644
--- a/print/gtklp/pkg-plist
+++ b/print/gtklp/pkg-plist
@@ -13,3 +13,7 @@ share/locale/nl/LC_MESSAGES/gtklp.mo
share/locale/pl/LC_MESSAGES/gtklp.mo
share/locale/pt_BR/LC_MESSAGES/gtklp.mo
share/locale/ru/LC_MESSAGES/gtklp.mo
+@unexec rmdir %D/share/locale/cht/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/cht 2> /dev/null || true
+@unexec rmdir %D/share/locale/cz/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/cz 2> /dev/null || true
diff --git a/security/gnupg/pkg-plist b/security/gnupg/pkg-plist
index 0ed7c785c3dc..97b79951c78b 100644
--- a/security/gnupg/pkg-plist
+++ b/security/gnupg/pkg-plist
@@ -58,35 +58,20 @@ info/gpgv.info
@unexec rmdir %D/share/locale/ca 2>/dev/null || true
@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-@unexec rmdir %D/share/locale/da/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/el/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/el 2>/dev/null || true
-@unexec rmdir %D/share/locale/eo/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/et/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/fi 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/gl/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/gl 2>/dev/null || true
-@unexec rmdir %D/share/locale/hu/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/id/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ja/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/nl/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/pl 2>/dev/null || true
@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/pt 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-@unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/sk 2>/dev/null || true
-@unexec rmdir %D/share/locale/sv/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/tr/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
@dirrm %%DOCSDIR%%
diff --git a/security/gnupg1/pkg-plist b/security/gnupg1/pkg-plist
index 0ed7c785c3dc..97b79951c78b 100644
--- a/security/gnupg1/pkg-plist
+++ b/security/gnupg1/pkg-plist
@@ -58,35 +58,20 @@ info/gpgv.info
@unexec rmdir %D/share/locale/ca 2>/dev/null || true
@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-@unexec rmdir %D/share/locale/da/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/el/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/el 2>/dev/null || true
-@unexec rmdir %D/share/locale/eo/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/et/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/fi 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/gl/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/gl 2>/dev/null || true
-@unexec rmdir %D/share/locale/hu/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/id/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ja/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/nl/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/pl 2>/dev/null || true
@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/pt 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-@unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/sk 2>/dev/null || true
-@unexec rmdir %D/share/locale/sv/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/tr/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
@dirrm %%DOCSDIR%%
diff --git a/security/gringotts/pkg-plist b/security/gringotts/pkg-plist
index 08596a02f623..3adfa8654161 100644
--- a/security/gringotts/pkg-plist
+++ b/security/gringotts/pkg-plist
@@ -3,7 +3,6 @@ share/pixmaps/gringotts.xpm
share/locale/de/LC_MESSAGES/gringotts.mo
share/locale/fr/LC_MESSAGES/gringotts.mo
share/locale/it/LC_MESSAGES/gringotts.mo
-@unexec rmdir -p %D/share/locale/*/LC_MESSAGES 2>/dev/null || true
%%GNOMEHIER%%share/gnome/apps/Utilities/gringotts.desktop
%%GNOMEHIER%%@unexec rmdir -p %D/share/gnome/apps/Utilities 2>/dev/null || true
%%PORTDOCS%%share/doc/gringotts/AUTHORS
diff --git a/sysutils/bubblemon2/pkg-plist b/sysutils/bubblemon2/pkg-plist
index 9bb7888561e5..b7bb50b0ffd1 100644
--- a/sysutils/bubblemon2/pkg-plist
+++ b/sysutils/bubblemon2/pkg-plist
@@ -28,3 +28,5 @@ share/locale/ru/LC_MESSAGES/bubblemon.mo
%%PORTDOCS%%share/doc/bubblemon2/TODO
%%PORTDOCS%%share/doc/bubblemon2/TRANSLATIONS
%%PORTDOCS%%@dirrm share/doc/bubblemon2
+@unexec rmdir %D/share/locale/sh/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/sh 2> /dev/null || true
diff --git a/sysutils/coreutils/pkg-plist b/sysutils/coreutils/pkg-plist
index b734cb5a7ebb..b542c7656883 100644
--- a/sysutils/coreutils/pkg-plist
+++ b/sysutils/coreutils/pkg-plist
@@ -165,9 +165,7 @@ bin/gyes
%%NLS%%@unexec rmdir %D/share/locale/no/LC_TIME 2>/dev/null || true
%%NLS%%@unexec rmdir %D/share/locale/nl/LC_TIME 2>/dev/null || true
%%NLS%%@unexec rmdir %D/share/locale/nb/LC_TIME 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/nb/LC_MESSAGES 2>/dev/null || true
%%NLS%%@unexec rmdir %D/share/locale/ms/LC_TIME 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/ms/LC_MESSAGES 2>/dev/null || true
%%NLS%%@unexec rmdir %D/share/locale/lg/LC_TIME 2>/dev/null || true
%%NLS%%@unexec rmdir %D/share/locale/lg/LC_MESSAGES 2>/dev/null || true
%%NLS%%@unexec rmdir %D/share/locale/lg 2>/dev/null || true
@@ -177,8 +175,6 @@ bin/gyes
%%NLS%%@unexec rmdir %D/share/locale/hu/LC_TIME 2>/dev/null || true
%%NLS%%@unexec rmdir %D/share/locale/gl/LC_TIME 2>/dev/null || true
%%NLS%%@unexec rmdir %D/share/locale/ga/LC_TIME 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/ga/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/ga 2>/dev/null || true
%%NLS%%@unexec rmdir %D/share/locale/fr/LC_TIME 2>/dev/null || true
%%NLS%%@unexec rmdir %D/share/locale/fi/LC_TIME 2>/dev/null || true
%%NLS%%@unexec rmdir %D/share/locale/et/LC_TIME 2>/dev/null || true
@@ -190,5 +186,3 @@ bin/gyes
%%NLS%%@unexec rmdir %D/share/locale/ca/LC_TIME 2>/dev/null || true
%%NLS%%@unexec rmdir %D/share/locale/be/LC_TIME 2>/dev/null || true
%%NLS%%@unexec rmdir %D/share/locale/af/LC_TIME 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/af/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/af 2>/dev/null || true
diff --git a/sysutils/di/pkg-plist b/sysutils/di/pkg-plist
index 83abec797e03..c23bf6ebf0d2 100644
--- a/sysutils/di/pkg-plist
+++ b/sysutils/di/pkg-plist
@@ -2,3 +2,7 @@ bin/di
bin/mi
share/locale/de_DE/LC_MESSAGES/di.mo
share/locale/en_US/LC_MESSAGES/di.mo
+@unexec rmdir %D/share/locale/de_DE/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/de_DE 2> /dev/null || true
+@unexec rmdir %D/share/locale/en_US/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/en_US 2> /dev/null || true
diff --git a/sysutils/libgksu/pkg-plist b/sysutils/libgksu/pkg-plist
index 7f58d182e0d6..d4770700d06f 100644
--- a/sysutils/libgksu/pkg-plist
+++ b/sysutils/libgksu/pkg-plist
@@ -14,3 +14,5 @@ share/locale/pt_BR/LC_MESSAGES/libgksu1.2.mo
share/locale/ru/LC_MESSAGES/libgksu1.2.mo
@dirrm lib/libgksu1.2
@dirrm include/libgksu1.2
+@unexec rmdir %D/share/locale/no_NB/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/no_NB 2> /dev/null || true
diff --git a/sysutils/libgksuui/pkg-plist b/sysutils/libgksuui/pkg-plist
index f998cce2ccd8..4537d74aeabb 100644
--- a/sysutils/libgksuui/pkg-plist
+++ b/sysutils/libgksuui/pkg-plist
@@ -13,5 +13,7 @@ share/locale/es/LC_MESSAGES/libgksuui1.0.mo
share/locale/no_NB/LC_MESSAGES/libgksuui1.0.mo
share/locale/pt_BR/LC_MESSAGES/libgksuui1.0.mo
share/locale/ru/LC_MESSAGES/libgksuui1.0.mo
+@unexec rmdir %D/share/locale/no_NB/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/no_NB 2> /dev/null || true
@dirrm share/libgksuui1.0
@dirrm include/libgksuui1.0
diff --git a/sysutils/xcdroast/pkg-plist b/sysutils/xcdroast/pkg-plist
index e32433ff3acf..8b8964835854 100644
--- a/sysutils/xcdroast/pkg-plist
+++ b/sysutils/xcdroast/pkg-plist
@@ -50,3 +50,7 @@ share/locale/zh_TW.Big5/LC_MESSAGES/xcdroast.mo
@dirrm lib/xcdroast-0.98/sound
@dirrm lib/xcdroast-0.98
@unexec if pw groupshow -n xcdwrite 2>/dev/null 1>&2; then pw groupdel -n xcdwrite; fi
+@unexec rmdir %D/share/locale/el_GR/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/el_GR 2> /dev/null || true
+@unexec rmdir %D/share/locale/sq_AL/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/sq_AL 2> /dev/null || true
diff --git a/textproc/aspell/pkg-plist b/textproc/aspell/pkg-plist
index ab50ed9b85ac..0e6f1f40475c 100644
--- a/textproc/aspell/pkg-plist
+++ b/textproc/aspell/pkg-plist
@@ -107,21 +107,14 @@ lib/libpspell.so.16
%%NLS%%@unexec rmdir %D/share/locale/be 2>/dev/null || true
%%NLS%%@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
%%NLS%%@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/da/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/en_GB/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
%%NLS%%@unexec rmdir %D/share/locale/ga/LC_MESSAGES 2>/dev/null || true
%%NLS%%@unexec rmdir %D/share/locale/ga 2>/dev/null || true
%%NLS%%@unexec rmdir %D/share/locale/mn/LC_MESSAGES 2>/dev/null || true
%%NLS%%@unexec rmdir %D/share/locale/mn 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/nl/LC_MESSAGES 2>/dev/null || true
%%NLS%%@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
%%NLS%%@unexec rmdir %D/share/locale/pt 2>/dev/null || true
%%NLS%%@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
%%NLS%%@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true
%%NLS%%@unexec rmdir %D/share/locale/sr/LC_MESSAGES 2>/dev/null || true
%%NLS%%@unexec rmdir %D/share/locale/sr 2>/dev/null || true
%%NLS%%@unexec rmdir %D/share/locale/tg/LC_MESSAGES 2>/dev/null || true
diff --git a/www/elinks/pkg-plist b/www/elinks/pkg-plist
index 5dd8abc900dd..1ed47c12d5a6 100644
--- a/www/elinks/pkg-plist
+++ b/www/elinks/pkg-plist
@@ -31,59 +31,29 @@ share/locale/tr/LC_MESSAGES/elinks.mo
share/locale/uk/LC_MESSAGES/elinks.mo
@unexec rmdir %D/share/locale/be/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/be 2>/dev/null || true
-@unexec rmdir %D/share/locale/bg/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/bg 2>/dev/null || true
@unexec rmdir %D/share/locale/ca/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/ca 2>/dev/null || true
@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-@unexec rmdir %D/share/locale/da/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/da 2>/dev/null || true
-@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/de 2>/dev/null || true
@unexec rmdir %D/share/locale/el/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/el 2>/dev/null || true
-@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/es 2>/dev/null || true
@unexec rmdir %D/share/locale/et/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/et 2>/dev/null || true
@unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/fi 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr 2>/dev/null || true
@unexec rmdir %D/share/locale/gl/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/gl 2>/dev/null || true
-@unexec rmdir %D/share/locale/hr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/hu 2>/dev/null || true
-@unexec rmdir %D/share/locale/id/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/id 2>/dev/null || true
-@unexec rmdir %D/share/locale/is/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/is 2>/dev/null || true
-@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/it 2>/dev/null || true
@unexec rmdir %D/share/locale/leet/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/leet 2>/dev/null || true
-@unexec rmdir %D/share/locale/lt/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/lt 2>/dev/null || true
-@unexec rmdir %D/share/locale/nl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/nl 2>/dev/null || true
@unexec rmdir %D/share/locale/no/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/no 2>/dev/null || true
@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/pl 2>/dev/null || true
@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/pt 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt_BR 2>/dev/null || true
@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-@unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ru 2>/dev/null || true
@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/sk 2>/dev/null || true
-@unexec rmdir %D/share/locale/sv/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sv 2>/dev/null || true
-@unexec rmdir %D/share/locale/tr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/tr 2>/dev/null || true
@unexec rmdir %D/share/locale/uk/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/uk 2>/dev/null || true
diff --git a/x11-fm/gentoo/pkg-plist b/x11-fm/gentoo/pkg-plist
index d1c6f13a8f34..4ee840f97fad 100644
--- a/x11-fm/gentoo/pkg-plist
+++ b/x11-fm/gentoo/pkg-plist
@@ -229,3 +229,15 @@ etc/gentoorc
%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
%%PORTDOCS%%@dirrm %%DOCSDIR%%/config
%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%NLS%%@unexec rmdir %D/share/locale/ru_RU.cp1251/LC_MESSAGES 2> /dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ru_RU.cp1251 2> /dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ru_RU.CP1251/LC_MESSAGES 2> /dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ru_RU.CP1251 2> /dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ru_RU.KOI8-R/LC_MESSAGES 2> /dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ru_RU.KOI8-R 2> /dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ru_RU.koi8r/LC_MESSAGES 2> /dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ru_RU.koi8r 2> /dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ru_RU.UTF-8/LC_MESSAGES 2> /dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ru_RU.UTF-8 2> /dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ru_RU.utf8/LC_MESSAGES 2> /dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ru_RU.utf8 2> /dev/null || true \ No newline at end of file
diff --git a/x11-fm/xfe/pkg-plist b/x11-fm/xfe/pkg-plist
index b1cd7ab9c9ea..111fdb3cfcca 100644
--- a/x11-fm/xfe/pkg-plist
+++ b/x11-fm/xfe/pkg-plist
@@ -153,3 +153,5 @@ share/pixmaps/xfe.png
@dirrm lib/foxicons
@dirrm lib/foxrc
@dirrm share/pixmaps
+@unexec rmdir %D/share/locale/es_AR/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/es_AR 2> /dev/null || true
diff --git a/x11-fm/xnc/pkg-plist b/x11-fm/xnc/pkg-plist
index f5b9c614d034..e2ff0ade480e 100644
--- a/x11-fm/xnc/pkg-plist
+++ b/x11-fm/xnc/pkg-plist
@@ -40,5 +40,7 @@ share/doc/xnc/doc6.html
share/doc/xnc/doc7.html
share/doc/xnc/doc8.html
share/doc/xnc/index.html
+@unexec rmdir %D/share/locale/sp/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/sp 2> /dev/null || true
@dirrm share/doc/xnc
@dirrm lib/xnc
diff --git a/x11-toolkits/gtk12/pkg-plist b/x11-toolkits/gtk12/pkg-plist
index c1568ba5fbe6..187c41e53c07 100644
--- a/x11-toolkits/gtk12/pkg-plist
+++ b/x11-toolkits/gtk12/pkg-plist
@@ -227,6 +227,8 @@ share/themes/Default/gtk/gtkrc.zh_CN
share/themes/Default/gtk/gtkrc.zh_TW.Big5
@exec mkdir -p %D/lib/gtk/themes/engines
@unexec rmdir %D/libdata/pkgconfig 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/sp/LC_MESSAGES 2> /dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/sp 2> /dev/null || true
@dirrm lib/gtk/themes/engines
@dirrm lib/gtk/themes
@dirrm lib/gtk
diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist
index 067be721fe1c..8a749542990a 100644
--- a/x11-toolkits/gtk20/pkg-plist
+++ b/x11-toolkits/gtk20/pkg-plist
@@ -468,3 +468,23 @@ share/themes/Emacs/gtk-2.0-key/gtkrc
@exec /bin/mkdir -p %D/lib/gtk-2.0/modules
@unexec /bin/rmdir %D/share/themes/Default 2>/dev/null || /usr/bin/true
@unexec /bin/rmdir %D/share/themes 2>/dev/null || /usr/bin/true
+@unexec rmdir %D/share/locale/ang/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/ang 2> /dev/null || true
+@unexec rmdir %D/share/locale/az_IR/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/az_IR 2> /dev/null || true
+@unexec rmdir %D/share/locale/br/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/br 2> /dev/null || true
+@unexec rmdir %D/share/locale/ia/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/ia 2> /dev/null || true
+@unexec rmdir %D/share/locale/mi/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/mi 2> /dev/null || true
+@unexec rmdir %D/share/locale/mr/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/mr 2> /dev/null || true
+@unexec rmdir %D/share/locale/nso/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/nso 2> /dev/null || true
+@unexec rmdir %D/share/locale/sr@ije/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/sr@ije 2> /dev/null || true
+@unexec rmdir %D/share/locale/uz@Latn/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/uz@Latn 2> /dev/null || true
+@unexec rmdir %D/share/locale/yi/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/yi 2> /dev/null || true
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index 067be721fe1c..8a749542990a 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -468,3 +468,23 @@ share/themes/Emacs/gtk-2.0-key/gtkrc
@exec /bin/mkdir -p %D/lib/gtk-2.0/modules
@unexec /bin/rmdir %D/share/themes/Default 2>/dev/null || /usr/bin/true
@unexec /bin/rmdir %D/share/themes 2>/dev/null || /usr/bin/true
+@unexec rmdir %D/share/locale/ang/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/ang 2> /dev/null || true
+@unexec rmdir %D/share/locale/az_IR/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/az_IR 2> /dev/null || true
+@unexec rmdir %D/share/locale/br/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/br 2> /dev/null || true
+@unexec rmdir %D/share/locale/ia/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/ia 2> /dev/null || true
+@unexec rmdir %D/share/locale/mi/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/mi 2> /dev/null || true
+@unexec rmdir %D/share/locale/mr/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/mr 2> /dev/null || true
+@unexec rmdir %D/share/locale/nso/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/nso 2> /dev/null || true
+@unexec rmdir %D/share/locale/sr@ije/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/sr@ije 2> /dev/null || true
+@unexec rmdir %D/share/locale/uz@Latn/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/uz@Latn 2> /dev/null || true
+@unexec rmdir %D/share/locale/yi/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/yi 2> /dev/null || true
diff --git a/x11-wm/e16/pkg-plist b/x11-wm/e16/pkg-plist
index cefdc7e06206..75ec15f49ea2 100644
--- a/x11-wm/e16/pkg-plist
+++ b/x11-wm/e16/pkg-plist
@@ -494,3 +494,5 @@ share/locale/tr/LC_MESSAGES/enlightenment.mo
@dirrm %%DATADIR%%/config/pix
@dirrm %%DATADIR%%/config
@dirrm %%DATADIR%%
+@unexec rmdir %D/share/locale/en_US/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/en_US 2> /dev/null || true
diff --git a/x11-wm/enlightenment-devel/pkg-plist b/x11-wm/enlightenment-devel/pkg-plist
index cefdc7e06206..75ec15f49ea2 100644
--- a/x11-wm/enlightenment-devel/pkg-plist
+++ b/x11-wm/enlightenment-devel/pkg-plist
@@ -494,3 +494,5 @@ share/locale/tr/LC_MESSAGES/enlightenment.mo
@dirrm %%DATADIR%%/config/pix
@dirrm %%DATADIR%%/config
@dirrm %%DATADIR%%
+@unexec rmdir %D/share/locale/en_US/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/en_US 2> /dev/null || true
diff --git a/x11-wm/enlightenment/pkg-plist b/x11-wm/enlightenment/pkg-plist
index cefdc7e06206..75ec15f49ea2 100644
--- a/x11-wm/enlightenment/pkg-plist
+++ b/x11-wm/enlightenment/pkg-plist
@@ -494,3 +494,5 @@ share/locale/tr/LC_MESSAGES/enlightenment.mo
@dirrm %%DATADIR%%/config/pix
@dirrm %%DATADIR%%/config
@dirrm %%DATADIR%%
+@unexec rmdir %D/share/locale/en_US/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/en_US 2> /dev/null || true
diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist
index aa4168e2f25a..98d244394cae 100644
--- a/x11/gnome-desktop/pkg-plist
+++ b/x11/gnome-desktop/pkg-plist
@@ -203,6 +203,8 @@ share/locale/yi/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/yo/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/zh_CN/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo
+@unexec rmdir %D/share/locale/yo/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/yo 2> /dev/null || true
@dirrm share/gnome/omf/gnome-desktop
@dirrm share/gnome/help/lgpl/eu
@dirrm share/gnome/help/lgpl/C
diff --git a/x11/gnomedesktop/pkg-plist b/x11/gnomedesktop/pkg-plist
index aa4168e2f25a..98d244394cae 100644
--- a/x11/gnomedesktop/pkg-plist
+++ b/x11/gnomedesktop/pkg-plist
@@ -203,6 +203,8 @@ share/locale/yi/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/yo/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/zh_CN/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo
+@unexec rmdir %D/share/locale/yo/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/yo 2> /dev/null || true
@dirrm share/gnome/omf/gnome-desktop
@dirrm share/gnome/help/lgpl/eu
@dirrm share/gnome/help/lgpl/C
diff --git a/x11/xdialog/pkg-plist b/x11/xdialog/pkg-plist
index f611f80cc6b0..d9f1dfd0ff58 100644
--- a/x11/xdialog/pkg-plist
+++ b/x11/xdialog/pkg-plist
@@ -65,3 +65,7 @@ bin/Xdialog
%%PORTDOCS%%%%DOCSDIR%%/yesno-wizard.png
%%PORTDOCS%%%%DOCSDIR%%/yesno.png
%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%NLS%%@unexec rmdir %D/share/locale/no_NO/LC_MESSAGES 2> /dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/no_NO 2> /dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/sv_SE/LC_MESSAGES 2> /dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/sv_SE 2> /dev/null || true
diff --git a/x11/yelp/pkg-plist b/x11/yelp/pkg-plist
index 6f1f190969df..d12169a1d3d8 100644
--- a/x11/yelp/pkg-plist
+++ b/x11/yelp/pkg-plist
@@ -118,6 +118,8 @@ share/locale/wa/LC_MESSAGES/yelp.mo
share/locale/zh_CN/LC_MESSAGES/yelp.mo
share/locale/zh_TW/LC_MESSAGES/yelp.mo
share/locale/zu/LC_MESSAGES/yelp.mo
+@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/zu 2> /dev/null || true
@dirrm share/gnome/yelp/ui
@dirrm share/gnome/yelp/icons
@dirrm share/gnome/yelp