Merge the translations into the desktop file on install. Closes #1109.

aegisub/configure.ac

@@ -534,7 +534,7 @@ DEFAULT_PLAYER_AUDIO=${DEFAULT_PLAYER_AUDIO:-NONE}
 ###############
 # Files that need substitution.
 AC_CONFIG_FILES([
-desktop/aegisub.desktop
+desktop/aegisub.desktop.template
 src/libresrc/default_config_platform.json
 tools/osx-bundle.sed
 Makefile.inc

aegisub/desktop/Makefile

@@ -6,6 +6,8 @@ applications_DATA = aegisub.desktop
 iconsscalabledir = $(DESKTOP_DATADIR)/icons/hicolor/scalable/apps
 iconsscalable_DATA = scalable/aegisub.svg
 
+aegisub.desktop: aegisub.desktop.template ../po
+	intltool-merge --quiet --desktop-style ../po aegisub.desktop.template aegisub.desktop
 
 all: ;
 
@@ -20,17 +22,17 @@ ICON_HICOLOR = \
 ICON_SCALABLE = \
 	scalable/apps/aegisub.svg
 
-DESKTOP_FILE = \
-	aegisub.desktop
+DESKTOP_FILE = aegisub.desktop
 
 EXTRA_DIST = \
-	aegisub.desktop.in \
+	aegisub.desktop.template.in \
+	aegisub.desktop.template \
 	$(ICON_HICOLOR) \
 	$(ICON_SCALABLE)
 
 install: install-desktop install-icons
 
-install-desktop:
+install-desktop: $(DESKTOP_FILE)
 	@$(BIN_MKDIR) -p $(DESTDIR)$(P_DESKTOP)
 	$(BIN_INSTALL) $(DESKTOP_FILE) $(DESTDIR)$(P_DESKTOP)/$(DESKTOP_FILE)
 

aegisub/desktop/aegisub.desktop.template.in

@@ -1,9 +1,9 @@
 [Desktop Entry]
 Version=1.0
 Type=Application
-Name=Aegisub
-GenericName=Subtitle Editor
-Comment=Create and edit subtitles for film and videos.
+_Name=Aegisub
+_GenericName=Subtitle Editor
+_Comment=Create and edit subtitles for film and videos.
 Exec=@AEGISUB_COMMAND@ %f
 TryExec=@AEGISUB_COMMAND@
 Icon=aegisub