diff --git a/packages/win_installer/aegisub3.iss b/packages/win_installer/aegisub3.iss index 7de5a4ebb..2888f221b 100644 --- a/packages/win_installer/aegisub3.iss +++ b/packages/win_installer/aegisub3.iss @@ -37,6 +37,7 @@ #endif #include "fragment_setupbase.iss" +#include "fragment_strings.iss" [Setup] AppID={{24BC8B57-716C-444F-B46B-A3349B9164C5} diff --git a/packages/win_installer/fragment_runtimes.iss b/packages/win_installer/fragment_runtimes.iss index 7011f6c5b..c407dcee0 100644 --- a/packages/win_installer/fragment_runtimes.iss +++ b/packages/win_installer/fragment_runtimes.iss @@ -43,5 +43,5 @@ DestDir: {tmp}; Source: src\vcredist_{#SUFFIX}.exe; Flags: nocompression deleteafterinstall [Run] -Filename: {tmp}\vcredist_{#SUFFIX}.exe; StatusMsg: Installing runtime libraries...; Parameters: "/q" +Filename: {tmp}\vcredist_{#SUFFIX}.exe; StatusMsg: {cm:InstallRuntime}; Parameters: "/q" diff --git a/packages/win_installer/fragment_setupbase.iss b/packages/win_installer/fragment_setupbase.iss index 4c3d48037..3da83c467 100644 --- a/packages/win_installer/fragment_setupbase.iss +++ b/packages/win_installer/fragment_setupbase.iss @@ -93,10 +93,6 @@ Name: "sr_RS_latin"; MessagesFile: "compiler:Languages\SerbianLatin.isl" Name: "zh_CN"; MessagesFile: "compiler:Languages\ChineseSimplified.isl" Name: "zh_TW"; MessagesFile: "compiler:Languages\ChineseTraditional.isl" -[Messages] -; Replacement for License page, no need to bother the user with legal mumbo-jumbo -WelcomeLabel2=This will install Aegisub {#BUILD_GIT_VERSION_STRING} on your computer.%n%nAegisub is covered by the GNU General Public License version 2. This means you may use the application for any purpose without charge, but that no warranties of any kind are given either.%n%nSee the Aegisub website for information on obtaining the source code. - [Files] ; small bitmaps (used by beautify code) DestDir: {tmp}; Flags: dontcopy; Source: welcome.bmp diff --git a/packages/win_installer/fragment_strings.iss b/packages/win_installer/fragment_strings.iss new file mode 100644 index 000000000..9ec13db24 --- /dev/null +++ b/packages/win_installer/fragment_strings.iss @@ -0,0 +1,6 @@ +[CustomMessages] +InstallRuntime=Installing runtime libraries... + +; Replacement for License page, no need to bother the user with legal mumbo-jumbo +[Messages] +WelcomeLabel2=This will install Aegisub {#BUILD_GIT_VERSION_STRING} on your computer.%n%nAegisub is covered by the GNU General Public License version 2. This means you may use the application for any purpose without charge, but that no warranties of any kind are given either.%n%nSee the Aegisub website for information on obtaining the source code. diff --git a/packages/win_installer/fragment_strings.iss.in b/packages/win_installer/fragment_strings.iss.in new file mode 100644 index 000000000..96d4658d4 --- /dev/null +++ b/packages/win_installer/fragment_strings.iss.in @@ -0,0 +1,6 @@ +[CustomMessages] +_InstallRuntime=Installing runtime libraries... + +; Replacement for License page, no need to bother the user with legal mumbo-jumbo +[Messages] +_WelcomeLabel2=This will install Aegisub {#BUILD_GIT_VERSION_STRING} on your computer.%n%nAegisub is covered by the GNU General Public License version 2. This means you may use the application for any purpose without charge, but that no warranties of any kind are given either.%n%nSee the Aegisub website for information on obtaining the source code. diff --git a/packages/win_installer/update_strings.sh b/packages/win_installer/update_strings.sh new file mode 100755 index 000000000..b75802e6e --- /dev/null +++ b/packages/win_installer/update_strings.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +intltool-merge --quiet --keys-style ../../po fragment_strings.iss.in fragment_strings.iss + +# None of the intltool formats quite match InnoSetup's, so munge one that's close +sed -i '' 's/^\[\(.*\)\]\(.\)/\1.\2/' fragment_strings.iss diff --git a/po/make_pot.sh b/po/make_pot.sh index b63bbf258..95dc228c4 100755 --- a/po/make_pot.sh +++ b/po/make_pot.sh @@ -45,3 +45,10 @@ do | sed 's/\([0-9]\+\):[^=]\+=\(.*\)$/aegisub.desktop|\1|"\2"/' \ | maybe_append done + +grep '^[A-Za-z0-9]*=.*' ../packages/win_installer/fragment_strings.iss | while read line +do + echo "$line" \ + | sed 's/[^=]*=\(.*\)/packages\/win_installer\/fragment_strings.iss|1|"\1"/' \ + | maybe_append +done