[gnome-clocks] Make appdata file translatable

[Daniel Mustieles García <dmustieles src gnome org>]

commit 6a1d6cad9fda684c2a437bde226bf97e639e53c5
Author: Daniel Mustieles <daniel mustieles gmail com>
Date:   Mon Feb 10 09:53:11 2014 +0100

    Make appdata file translatable

 Makefile.am                               |    2 +-
 data/appdata/org.gnome.clocks.appdata.xml |   14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index db8c012..d0fc263 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,7 @@ appdata_DATA = data/appdata/org.gnome.clocks.appdata.xml
 
 # gsettings
 gsettings_SCHEMAS = data/org.gnome.clocks.gschema.xml
- INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_MERGE_RULE@
 @GSETTINGS_RULES@
 
 # icons
diff --git a/data/appdata/org.gnome.clocks.appdata.xml b/data/appdata/org.gnome.clocks.appdata.xml
index e97c674..ba59b59 100644
--- a/data/appdata/org.gnome.clocks.appdata.xml
+++ b/data/appdata/org.gnome.clocks.appdata.xml
@@ -3,16 +3,16 @@
   <id type="desktop">org.gnome.clocks.desktop</id>
   <licence>CC0</licence>
   <description>
-    <p>
+    <_p>
       A simple and elegant clock application.
       It includes world clocks, alarms, a stopwatch and a timer.
-    </p>
-    <p>Goals:</p>
+    </_p>
+    <_p>Goals:</_p>
     <ul>
-      <li>Show the time in different cities around the world</li>
-      <li>Set alarms to wake you up</li>
-      <li>Measure elapsed time with an accurate stopwatch</li>
-      <li>Set timers to properly cook your food</li>
+      <_li>Show the time in different cities around the world</_li>
+      <_li>Set alarms to wake you up</_li>
+      <_li>Measure elapsed time with an accurate stopwatch</_li>
+      <_li>Set timers to properly cook your food</_li>
     </ul>
   </description>
   <screenshots>