diff --git a/dist/scwpic.isl.liquid b/dist/scwpic.isl.liquid index 6b186a7..9bc6185 100644 --- a/dist/scwpic.isl.liquid +++ b/dist/scwpic.isl.liquid @@ -2,4 +2,3 @@ MyAppName={{ strings.MyAppName | inno_escape }} MyOther={{ strings.MyOther | inno_escape }} MyAssociateWithFiles={{ strings.MyAssociateWithFiles | inno_escape }} -MyInstallVcRedist={{ strings.MyInstallVcRedist | inno_escape }} diff --git a/dist/scwpic.iss.in.liquid b/dist/scwpic.iss.in.liquid index bd60b29..5179578 100644 --- a/dist/scwpic.iss.in.liquid +++ b/dist/scwpic.iss.in.liquid @@ -94,11 +94,9 @@ Name: "associatewithfiles"; Description: "{cm:MyAssociateWithFiles,{#MyAppName}} ; YYC MARK: ; This script is compiled in place and retrieves the artifacts to be packaged ; from the directory given by the "PublishDir" define, which must contain -; "scwpic.exe", "vc_redist.x64.exe" and the "LICENSE" file. Otherwise -; exception will be thrown. +; "scwpic.exe" and the "LICENSE" file. Otherwise exception will be thrown. Source: "{#PublishDir}\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#PublishDir}\*"; Excludes: "vc_redist.x64.exe"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs -Source: "{#PublishDir}\vc_redist.x64.exe"; DestDir: "{tmp}"; Flags: deleteafterinstall +Source: "{#PublishDir}\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs ; NOTE: Don't use "Flags: ignoreversion" on any shared system files [Registry] @@ -389,4 +387,3 @@ Name: "{autodesktop}\{cm:MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: [Run] Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#MyAppName}}"; Flags: nowait postinstall skipifsilent -Filename: "{tmp}\vc_redist.x64.exe"; Parameters: "/install /quiet /norestart"; StatusMsg: "{cm:MyInstallVcRedist}"; Flags: waituntilterminated diff --git a/dist/scwpic.iss.in.toml b/dist/scwpic.iss.in.toml index 2779f74..bd7c8a8 100644 --- a/dist/scwpic.iss.in.toml +++ b/dist/scwpic.iss.in.toml @@ -12,7 +12,3 @@ comment = "Group caption for the extra installer task options." [strings.MyAssociateWithFiles] msgid = "Associate %1 with its supported file types." comment = "Installer task description. %1 is the application name." - -[strings.MyInstallVcRedist] -msgid = "Installing Microsoft Visual C++ Redistributable..." -comment = "Status message shown while installing the VC++ runtime." diff --git a/locales/inno/ar.po b/locales/inno/ar.po index 1d83a4e..b75a341 100644 --- a/locales/inno/ar.po +++ b/locales/inno/ar.po @@ -6,11 +6,11 @@ msgstr "" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" +"Language: ar\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: MetaGlot/polib\n" -"Language: ar\n" #. Display name of the application, used in the installer UI. msgid "SCW Photo Viewer" @@ -23,7 +23,3 @@ msgstr "" #. Installer task description. %1 is the application name. msgid "Associate %1 with its supported file types." msgstr "" - -#. Status message shown while installing the VC++ runtime. -msgid "Installing Microsoft Visual C++ Redistributable..." -msgstr "" diff --git a/locales/inno/ca.po b/locales/inno/ca.po index 3e522c5..604b746 100644 --- a/locales/inno/ca.po +++ b/locales/inno/ca.po @@ -6,11 +6,11 @@ msgstr "" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" +"Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: MetaGlot/polib\n" -"Language: ca\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. Display name of the application, used in the installer UI. @@ -24,7 +24,3 @@ msgstr "" #. Installer task description. %1 is the application name. msgid "Associate %1 with its supported file types." msgstr "" - -#. Status message shown while installing the VC++ runtime. -msgid "Installing Microsoft Visual C++ Redistributable..." -msgstr "" diff --git a/locales/inno/de.po b/locales/inno/de.po index fcdb7d9..fc439fa 100644 --- a/locales/inno/de.po +++ b/locales/inno/de.po @@ -6,11 +6,11 @@ msgstr "" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: MetaGlot/polib\n" -"Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. Display name of the application, used in the installer UI. @@ -24,7 +24,3 @@ msgstr "" #. Installer task description. %1 is the application name. msgid "Associate %1 with its supported file types." msgstr "" - -#. Status message shown while installing the VC++ runtime. -msgid "Installing Microsoft Visual C++ Redistributable..." -msgstr "" diff --git a/locales/inno/es.po b/locales/inno/es.po index abb265b..77279e8 100644 --- a/locales/inno/es.po +++ b/locales/inno/es.po @@ -6,11 +6,11 @@ msgstr "" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: MetaGlot/polib\n" -"Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. Display name of the application, used in the installer UI. @@ -24,7 +24,3 @@ msgstr "" #. Installer task description. %1 is the application name. msgid "Associate %1 with its supported file types." msgstr "" - -#. Status message shown while installing the VC++ runtime. -msgid "Installing Microsoft Visual C++ Redistributable..." -msgstr "" diff --git a/locales/inno/fr.po b/locales/inno/fr.po index 791378c..41bd449 100644 --- a/locales/inno/fr.po +++ b/locales/inno/fr.po @@ -6,11 +6,11 @@ msgstr "" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: MetaGlot/polib\n" -"Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. Display name of the application, used in the installer UI. @@ -24,7 +24,3 @@ msgstr "" #. Installer task description. %1 is the application name. msgid "Associate %1 with its supported file types." msgstr "" - -#. Status message shown while installing the VC++ runtime. -msgid "Installing Microsoft Visual C++ Redistributable..." -msgstr "" diff --git a/locales/inno/id.po b/locales/inno/id.po index c3e578d..9369835 100644 --- a/locales/inno/id.po +++ b/locales/inno/id.po @@ -6,11 +6,11 @@ msgstr "" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" +"Language: id\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: MetaGlot/polib\n" -"Language: id\n" #. Display name of the application, used in the installer UI. msgid "SCW Photo Viewer" @@ -23,7 +23,3 @@ msgstr "" #. Installer task description. %1 is the application name. msgid "Associate %1 with its supported file types." msgstr "" - -#. Status message shown while installing the VC++ runtime. -msgid "Installing Microsoft Visual C++ Redistributable..." -msgstr "" diff --git a/locales/inno/inno.pot b/locales/inno/inno.pot index 68f132b..be37ded 100644 --- a/locales/inno/inno.pot +++ b/locales/inno/inno.pot @@ -22,7 +22,3 @@ msgstr "" #. Installer task description. %1 is the application name. msgid "Associate %1 with its supported file types." msgstr "" - -#. Status message shown while installing the VC++ runtime. -msgid "Installing Microsoft Visual C++ Redistributable..." -msgstr "" diff --git a/locales/inno/it.po b/locales/inno/it.po index c21cbbe..79e105b 100644 --- a/locales/inno/it.po +++ b/locales/inno/it.po @@ -6,11 +6,11 @@ msgstr "" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" +"Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: MetaGlot/polib\n" -"Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. Display name of the application, used in the installer UI. @@ -24,7 +24,3 @@ msgstr "" #. Installer task description. %1 is the application name. msgid "Associate %1 with its supported file types." msgstr "" - -#. Status message shown while installing the VC++ runtime. -msgid "Installing Microsoft Visual C++ Redistributable..." -msgstr "" diff --git a/locales/inno/ja.po b/locales/inno/ja.po index ec65c1b..f8bc8e6 100644 --- a/locales/inno/ja.po +++ b/locales/inno/ja.po @@ -6,11 +6,11 @@ msgstr "" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" +"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: MetaGlot/polib\n" -"Language: ja\n" "Plural-Forms: nplurals=1; plural=0;\n" #. Display name of the application, used in the installer UI. @@ -24,7 +24,3 @@ msgstr "" #. Installer task description. %1 is the application name. msgid "Associate %1 with its supported file types." msgstr "" - -#. Status message shown while installing the VC++ runtime. -msgid "Installing Microsoft Visual C++ Redistributable..." -msgstr "" diff --git a/locales/inno/ko.po b/locales/inno/ko.po index ee2a739..b16134c 100644 --- a/locales/inno/ko.po +++ b/locales/inno/ko.po @@ -6,11 +6,11 @@ msgstr "" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" +"Language: ko\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: MetaGlot/polib\n" -"Language: ko\n" "Plural-Forms: nplurals=1; plural=0;\n" #. Display name of the application, used in the installer UI. @@ -24,7 +24,3 @@ msgstr "" #. Installer task description. %1 is the application name. msgid "Associate %1 with its supported file types." msgstr "" - -#. Status message shown while installing the VC++ runtime. -msgid "Installing Microsoft Visual C++ Redistributable..." -msgstr "" diff --git a/locales/inno/nb_NO.po b/locales/inno/nb_NO.po index db2adf4..a14be7e 100644 --- a/locales/inno/nb_NO.po +++ b/locales/inno/nb_NO.po @@ -6,11 +6,11 @@ msgstr "" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" +"Language: nb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: MetaGlot/polib\n" -"Language: nb\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. Display name of the application, used in the installer UI. @@ -24,7 +24,3 @@ msgstr "" #. Installer task description. %1 is the application name. msgid "Associate %1 with its supported file types." msgstr "" - -#. Status message shown while installing the VC++ runtime. -msgid "Installing Microsoft Visual C++ Redistributable..." -msgstr "" diff --git a/locales/inno/nl.po b/locales/inno/nl.po index bd4e708..3e0734e 100644 --- a/locales/inno/nl.po +++ b/locales/inno/nl.po @@ -6,11 +6,11 @@ msgstr "" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" +"Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: MetaGlot/polib\n" -"Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. Display name of the application, used in the installer UI. @@ -24,7 +24,3 @@ msgstr "" #. Installer task description. %1 is the application name. msgid "Associate %1 with its supported file types." msgstr "" - -#. Status message shown while installing the VC++ runtime. -msgid "Installing Microsoft Visual C++ Redistributable..." -msgstr "" diff --git a/locales/inno/pa_PK.po b/locales/inno/pa_PK.po index 44be29d..8d6005c 100644 --- a/locales/inno/pa_PK.po +++ b/locales/inno/pa_PK.po @@ -6,11 +6,11 @@ msgstr "" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" +"Language: pa_PK\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: MetaGlot/polib\n" -"Language: pa_PK\n" #. Display name of the application, used in the installer UI. msgid "SCW Photo Viewer" @@ -23,7 +23,3 @@ msgstr "" #. Installer task description. %1 is the application name. msgid "Associate %1 with its supported file types." msgstr "" - -#. Status message shown while installing the VC++ runtime. -msgid "Installing Microsoft Visual C++ Redistributable..." -msgstr "" diff --git a/locales/inno/ru.po b/locales/inno/ru.po index eab155d..d42234d 100644 --- a/locales/inno/ru.po +++ b/locales/inno/ru.po @@ -6,11 +6,11 @@ msgstr "" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" +"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: MetaGlot/polib\n" -"Language: ru\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" @@ -25,7 +25,3 @@ msgstr "" #. Installer task description. %1 is the application name. msgid "Associate %1 with its supported file types." msgstr "" - -#. Status message shown while installing the VC++ runtime. -msgid "Installing Microsoft Visual C++ Redistributable..." -msgstr "" diff --git a/locales/inno/si.po b/locales/inno/si.po index 9a9414c..6625910 100644 --- a/locales/inno/si.po +++ b/locales/inno/si.po @@ -6,11 +6,11 @@ msgstr "" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" +"Language: si\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: MetaGlot/polib\n" -"Language: si\n" #. Display name of the application, used in the installer UI. msgid "SCW Photo Viewer" @@ -23,7 +23,3 @@ msgstr "" #. Installer task description. %1 is the application name. msgid "Associate %1 with its supported file types." msgstr "" - -#. Status message shown while installing the VC++ runtime. -msgid "Installing Microsoft Visual C++ Redistributable..." -msgstr "" diff --git a/locales/inno/sl.po b/locales/inno/sl.po index 7cfe7c0..6039820 100644 --- a/locales/inno/sl.po +++ b/locales/inno/sl.po @@ -6,11 +6,11 @@ msgstr "" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" +"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: MetaGlot/polib\n" -"Language: sl\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || " "n%100==4 ? 2 : 3);\n" @@ -25,7 +25,3 @@ msgstr "" #. Installer task description. %1 is the application name. msgid "Associate %1 with its supported file types." msgstr "" - -#. Status message shown while installing the VC++ runtime. -msgid "Installing Microsoft Visual C++ Redistributable..." -msgstr "" diff --git a/locales/inno/ta.po b/locales/inno/ta.po index d38639c..4e2bb7b 100644 --- a/locales/inno/ta.po +++ b/locales/inno/ta.po @@ -6,11 +6,11 @@ msgstr "" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" +"Language: ta\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: MetaGlot/polib\n" -"Language: ta\n" #. Display name of the application, used in the installer UI. msgid "SCW Photo Viewer" @@ -23,7 +23,3 @@ msgstr "" #. Installer task description. %1 is the application name. msgid "Associate %1 with its supported file types." msgstr "" - -#. Status message shown while installing the VC++ runtime. -msgid "Installing Microsoft Visual C++ Redistributable..." -msgstr "" diff --git a/locales/inno/tr.po b/locales/inno/tr.po index 326d8e5..2086823 100644 --- a/locales/inno/tr.po +++ b/locales/inno/tr.po @@ -6,11 +6,11 @@ msgstr "" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" +"Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: MetaGlot/polib\n" -"Language: tr\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. Display name of the application, used in the installer UI. @@ -24,7 +24,3 @@ msgstr "" #. Installer task description. %1 is the application name. msgid "Associate %1 with its supported file types." msgstr "" - -#. Status message shown while installing the VC++ runtime. -msgid "Installing Microsoft Visual C++ Redistributable..." -msgstr "" diff --git a/locales/inno/uk.po b/locales/inno/uk.po index ae8dc51..e8dc76e 100644 --- a/locales/inno/uk.po +++ b/locales/inno/uk.po @@ -6,11 +6,11 @@ msgstr "" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" +"Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: MetaGlot/polib\n" -"Language: uk\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" @@ -25,7 +25,3 @@ msgstr "" #. Installer task description. %1 is the application name. msgid "Associate %1 with its supported file types." msgstr "" - -#. Status message shown while installing the VC++ runtime. -msgid "Installing Microsoft Visual C++ Redistributable..." -msgstr "" diff --git a/locales/inno/vi.po b/locales/inno/vi.po index 2ecb5ce..ca3abf4 100644 --- a/locales/inno/vi.po +++ b/locales/inno/vi.po @@ -6,11 +6,11 @@ msgstr "" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" +"Language: vi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: MetaGlot/polib\n" -"Language: vi\n" "Plural-Forms: nplurals=1; plural=0;\n" #. Display name of the application, used in the installer UI. @@ -24,7 +24,3 @@ msgstr "" #. Installer task description. %1 is the application name. msgid "Associate %1 with its supported file types." msgstr "" - -#. Status message shown while installing the VC++ runtime. -msgid "Installing Microsoft Visual C++ Redistributable..." -msgstr "" diff --git a/locales/inno/zh_CN.po b/locales/inno/zh_CN.po index 6dc49c8..6670ee7 100644 --- a/locales/inno/zh_CN.po +++ b/locales/inno/zh_CN.po @@ -20,9 +20,8 @@ msgstr "其他:" msgid "Associate %1 with its supported file types." msgstr "将 %1 与其支持的文件类型关联。" -#. Status message shown while installing the VC++ runtime. -msgid "Installing Microsoft Visual C++ Redistributable..." -msgstr "正在安装 Microsoft Visual C++ 运行库..." +#~ msgid "Installing Microsoft Visual C++ Redistributable..." +#~ msgstr "正在安装 Microsoft Visual C++ 运行库..." #~ msgid "Pineapple Pictures" #~ msgstr "菠萝看图"