generate empathy.application from empathy.application.in

This allow us to mark the description key as translatable.

https://bugzilla.gnome.org/show_bug.cgi?id=684281

diff --git a/po/POTFILES.in b/po/POTFILES.in
index d1ef0f3ef6e2dabb4af4641be5b26e7734967b2a..31f8ae2308cc549d0a82b364f560bb91aa679bc7 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -112,3 +112,4 @@ src/empathy-status-icon.c
 
 ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c
 ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c
+[type: gettext/xml]ubuntu-online-accounts/empathy.application.in

diff --git a/ubuntu-online-accounts/.gitignore b/ubuntu-online-accounts/.gitignore
new file mode 100644 (file)
index 0000000..7c66317
--- /dev/null
+++ b/ubuntu-online-accounts/.gitignore
@@ -0,0 +1 @@
+empathy.application

diff --git a/ubuntu-online-accounts/Makefile.am b/ubuntu-online-accounts/Makefile.am
index 60aaf57b5b205fc3ab30a3a8057c70a420b1b38f..e964da556760028e427e0874b168913883467fec 100644 (file)
--- a/ubuntu-online-accounts/Makefile.am
+++ b/ubuntu-online-accounts/Makefile.am
@@ -2,6 +2,11 @@ SUBDIRS = mc-plugin cc-plugins
 
 appdir = $(ACCOUNTS_APPLICATION_FILES_DIR)
 
+empathy.application: empathy.application.in
+       $(AM_V_GEN)intltool-merge --no-translations -x -u $< $@
+
 app_DATA = empathy.application
 
 EXTRA_DIST = $(app_DATA)
+
+DISTCLEANFILES = $(app_DATA)

diff --git a/ubuntu-online-accounts/empathy.application b/ubuntu-online-accounts/empathy.application
deleted file mode 100644 (file)
index 598bff8..0000000
--- a/ubuntu-online-accounts/empathy.application
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<application id="empathy">
-  <description>Empathy</description>
-  <desktop-entry>empathy.desktop</desktop-entry>
-  <service-types>
-    <service-type id="IM">
-      <description>Integrate your IM accounts</description>
-    </service-type>
-  </service-types>
-</application>

diff --git a/ubuntu-online-accounts/empathy.application.in b/ubuntu-online-accounts/empathy.application.in
new file mode 100644 (file)
index 0000000..9477b6a
--- /dev/null
+++ b/ubuntu-online-accounts/empathy.application.in
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<application id="empathy">
+  <description>Empathy</description>
+  <desktop-entry>empathy.desktop</desktop-entry>
+  <translation>empathy</translation>
+  <service-types>
+    <service-type id="IM">
+      <_description>Integrate your IM accounts</_description>
+    </service-type>
+  </service-types>
+</application>