From 3e0ef080319b40c854cacacb3e38ac300b8d068b Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Tue, 24 Dec 2013 10:58:28 -0800 Subject: [PATCH] Merge the translations into the desktop file on install. Closes #1109. --- aegisub/configure.ac | 2 +- aegisub/desktop/Makefile | 10 ++++++---- ...{aegisub.desktop.in => aegisub.desktop.template.in} | 6 +++--- 3 files changed, 10 insertions(+), 8 deletions(-) rename aegisub/desktop/{aegisub.desktop.in => aegisub.desktop.template.in} (72%) diff --git a/aegisub/configure.ac b/aegisub/configure.ac index 7c44985d0..890590e85 100644 --- a/aegisub/configure.ac +++ b/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 diff --git a/aegisub/desktop/Makefile b/aegisub/desktop/Makefile index a2848a1fd..02d04fddc 100644 --- a/aegisub/desktop/Makefile +++ b/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) diff --git a/aegisub/desktop/aegisub.desktop.in b/aegisub/desktop/aegisub.desktop.template.in similarity index 72% rename from aegisub/desktop/aegisub.desktop.in rename to aegisub/desktop/aegisub.desktop.template.in index e36595c93..b11a3e359 100644 --- a/aegisub/desktop/aegisub.desktop.in +++ b/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