OSDN Git Service

WinMerge*.iss: Always create MergePlugins folder even though not installing plugins 2.14.0+-jp-59
authorsdottaka <sdottaka@sourceforge.net>
Tue, 28 Oct 2014 13:28:16 +0000 (22:28 +0900)
committersdottaka <sdottaka@sourceforge.net>
Tue, 28 Oct 2014 13:28:16 +0000 (22:28 +0900)
--HG--
branch : stable

Installer/InnoSetup/WinMerge.iss
Installer/InnoSetup/WinMergeX64.iss
Translations/WinMerge/English.pot

index 3bf1806..9521ba4 100755 (executable)
@@ -520,6 +520,9 @@ Source: ..\..\Externals\winimerge\freeimage-license-gplv2.txt; DestDir: {app}\Wi
 Source: ..\..\Externals\winimerge\Build\Release\WinIMerge.exe; DestDir: {app}\WinIMerge; Components: WinIMerge\r
 Source: ..\..\Externals\winimerge\Build\Release\WinIMergeLib.dll; DestDir: {app}\WinIMerge; Components: WinIMerge\r
 \r
+[Dirs]\r
+Name: "{app}\MergePlugins"\r
+\r
 [Icons]\r
 ;Start Menu Icons\r
 Name: {group}\WinMerge; Filename: {app}\{code:ExeName}; AppUserModelID: "Thingamahoochie.WinMerge"\r
index f87cfc0..7647fc5 100644 (file)
@@ -499,6 +499,9 @@ Source: ..\..\Externals\winimerge\freeimage-license-gplv2.txt; DestDir: {app}\Wi
 Source: ..\..\Externals\winimerge\Build\x64\Release\WinIMerge.exe; DestDir: {app}\WinIMerge; Components: WinIMerge\r
 Source: ..\..\Externals\winimerge\Build\x64\Release\WinIMergeLib.dll; DestDir: {app}\WinIMerge; Components: WinIMerge\r
 \r
+[Dirs]\r
+Name: "{app}\MergePlugins"\r
+\r
 [Icons]\r
 ;Start Menu Icons\r
 Name: {group}\WinMerge; Filename: {app}\{code:ExeName}; AppUserModelID: "Thingamahoochie.WinMerge"\r
index 5127cbf..2f86424 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WinMerge\n"
 "Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n"
-"POT-Creation-Date: 2014-10-28 12:20+0000\n"
+"POT-Creation-Date: 2014-10-28 22:00+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"