4 files changed, 14 insertions, 14 deletions
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 233bd5f..726bcec 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -3,15 +3,10 @@
 ##
 
 set (SCHEMA_NAME "org.ayatana.indicator.datetime.gschema.xml")
-set (SCHEMA_FILE_IN_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME}.in.in")
-set (SCHEMA_FILE_IN    "${CMAKE_CURRENT_BINARY_DIR}/${SCHEMA_NAME}.in")
+set (SCHEMA_FILE_IN    "${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME}.in")
 set (SCHEMA_FILE       "${CMAKE_CURRENT_BINARY_DIR}/${SCHEMA_NAME}")
 # generate the .xml.in file so cmake constants are included
-configure_file(${SCHEMA_FILE_IN_IN} ${SCHEMA_FILE_IN})
-# generate the .xml file using intltool
-find_package(Intltool REQUIRED)
-set (ENV{LC_ALL} "C")
-intltool_merge_translations("${SCHEMA_FILE_IN}" "${SCHEMA_FILE}" ALL UTF8 STYLE "xml" NO_TRANSLATIONS)
+configure_file(${SCHEMA_FILE_IN} ${SCHEMA_FILE})
 
 # let GSettings do the rest
 find_package(GSettings REQUIRED)
@@ -32,7 +27,6 @@ if (${SYSTEMD_FOUND})
     set (SYSTEMD_USER_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SYSTEMD_USER_NAME}.in")
 
     # build it
-    set (pkglibexecdir "${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}")
     configure_file ("${SYSTEMD_USER_FILE_IN}" "${SYSTEMD_USER_FILE}")
 
     # install it
@@ -53,7 +47,6 @@ set (XDG_AUTOSTART_FILE "${CMAKE_CURRENT_BINARY_DIR}/${XDG_AUTOSTART_NAME}")
 set (XDG_AUTOSTART_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${XDG_AUTOSTART_NAME}.in")
 
 # build it
-set (pkglibexecdir "${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}")
 configure_file ("${XDG_AUTOSTART_FILE_IN}" "${XDG_AUTOSTART_FILE}")
 
 # install XDG autostart
diff --git a/data/ayatana-indicator-datetime.desktop.in b/data/ayatana-indicator-datetime.desktop.in
index 8d0bca2..e4f4521 100644
--- a/data/ayatana-indicator-datetime.desktop.in
+++ b/data/ayatana-indicator-datetime.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=Ayatana Indicator Date & Time
-Exec=@pkglibexecdir@/ayatana-indicator-datetime-service
+Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/ayatana-indicator-datetime/ayatana-indicator-datetime-service
 OnlyShowIn=MATE;Unity;XFCE;Pantheon;Budgie
 NoDisplay=true
 StartupNotify=false
diff --git a/data/ayatana-indicator-datetime.service.in b/data/ayatana-indicator-datetime.service.in
index da1cd54..6b7803b 100644
--- a/data/ayatana-indicator-datetime.service.in
+++ b/data/ayatana-indicator-datetime.service.in
@@ -4,7 +4,7 @@ PartOf=graphical-session.target
 PartOf=ayatana-indicators.target
 
 [Service]
-ExecStart=@pkglibexecdir@/ayatana-indicator-datetime-service
+ExecStart=@CMAKE_INSTALL_FULL_LIBEXECDIR@/ayatana-indicator-datetime/ayatana-indicator-datetime-service
 Restart=on-failure
 
 [Install]
diff --git a/data/org.ayatana.indicator.datetime.gschema.xml.in.in b/data/org.ayatana.indicator.datetime.gschema.xml.in
index e03db4b..62e86b9 100644
--- a/data/org.ayatana.indicator.datetime.gschema.xml.in.in
+++ b/data/org.ayatana.indicator.datetime.gschema.xml.in
@@ -87,6 +87,13 @@
               Shows events from Evolution in indicator-datetime's menu.
             </description>
         </key>
+        <key name="show-alarms" type="b">
+            <default>true</default>
+            <summary>Show alarms in the indicator</summary>
+            <description>
+              Shows alarms in the events list in indicator-datetime's menu.
+            </description>
+        </key>
         <key name="show-auto-detected-location" type="b">
             <default>false</default>
             <summary>Show the auto-detected location in the indicator</summary>
@@ -126,10 +133,10 @@
         </key>
         <key name="calendar-default-sound" type="s">
             <default>'@CALENDAR_DEFAULT_SOUND@'</default>
-            <_summary>The calendar's default sound file.</_summary>
-            <_description>
+            <summary>The calendar's default sound file.</summary>
+            <description>
               If a calendar or reminder event doesn't specify its own sound file, this file will be used as the fallback sound.
-            </_description>
+            </description>
         </key>
         <key name="alarm-default-sound" type="s">
             <default>'@ALARM_DEFAULT_SOUND@'</default>