[gedit] Revert "Actually merge the translations into the AppData file"

[Richard Hughes <rhughes src gnome org>]

commit cc40b096cddec49b2eef34c9d36d6c8c54771493
Author: Richard Hughes <richard hughsie com>
Date:   Wed Sep 25 16:58:36 2013 +0100

    Revert "Actually merge the translations into the AppData file"
    
    This reverts commit 6ce4b0a6a7ac6fd6c04700e0585e73741866c319.
    
    It breaks the ostree build. We'll continue debugging on bugzilla.
    
    Sorry for the noise.

 data/Makefile.am |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 546c1dc..1298d2c 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -3,7 +3,7 @@ desktop_in_files = gedit.desktop.in
 desktop_DATA    = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
- INTLTOOL_XML_RULE@
+ INTLTOOL_XML_NOMERGE_RULE@
 appdatadir = $(datadir)/appdata
 dist_appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 appdata_in_files = gedit.appdata.xml.in