gimp r28046 - in trunk: . data/tags po po-tags

[aurisj svn gnome org]

Author: aurisj
Date: Tue Feb 17 21:16:12 2009
New Revision: 28046
URL: http://svn.gnome.org/viewvc/gimp?rev=28046&view=rev

Log:
got rid of extra message domain for tags.

Removed:
   trunk/po-tags/
Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/data/tags/Makefile.am
   trunk/po/ChangeLog
   trunk/po/POTFILES.in

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Feb 17 21:16:12 2009
@@ -2074,7 +2074,6 @@
 po-plug-ins/Makefile.in
 po-python/Makefile.in
 po-script-fu/Makefile.in
-po-tags/Makefile.in
 po-tips/Makefile.in
 gimp-zip
 Makefile
@@ -2096,7 +2095,6 @@
 sed -e "/POTFILES =/r po-python/POTFILES" po-python/Makefile.in > po-python/Makefile && touch po-python/stamp-it
 sed -e "/POTFILES =/r po-plug-ins/POTFILES" po-plug-ins/Makefile.in > po-plug-ins/Makefile && touch po-plug-ins/stamp-it
 sed -e "/POTFILES =/r po-script-fu/POTFILES" po-script-fu/Makefile.in > po-script-fu/Makefile && touch po-script-fu/stamp-it
-sed -e "/POTFILES =/r po-tags/POTFILES" po-tags/Makefile.in > po-tags/Makefile && touch po-tags/stamp-it
 sed -e "/POTFILES =/r po-tips/POTFILES" po-tips/Makefile.in > po-tips/Makefile && touch po-tips/stamp-it])
 
 AC_OUTPUT

Modified: trunk/data/tags/Makefile.am
==============================================================================
--- trunk/data/tags/Makefile.am	(original)
+++ trunk/data/tags/Makefile.am	Tue Feb 17 21:16:12 2009
@@ -17,7 +17,7 @@
 
 
 gimp-tags-default.xml: gimp-tags-default.xml.in $(wildcard $(top_srcdir)/po-tags/*.po)
-	$(INTLTOOL_MERGE) $(top_srcdir)/po-tags $< $(@) -x -u -c $(top_builddir)/po-tags/.intltool-merge-cache
+	$(INTLTOOL_MERGE) $(top_srcdir)/po $< $(@) -x -u -c $(top_builddir)/po/.intltool-merge-cache
 
 
 validate: gimp-tags-default.xml

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Tue Feb 17 21:16:12 2009
@@ -457,6 +457,8 @@
 app/xcf/xcf-seek.c
 app/xcf/xcf.c
 
+data/tags/gimp-tags-default.xml.in
+
 desktop/gimp.desktop.in.in
 
 tools/gimp-remote.c