From 8c454ffa6b5a4504a55b0c04266e8fe1304f1125 Mon Sep 17 00:00:00 2001 From: Leland Lucius Date: Wed, 3 Jun 2015 10:52:05 -0500 Subject: [PATCH 1/3] Additional fix for bug #673 and fix for bug #1007 --- win/audacity.iss | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) mode change 100644 => 100755 win/audacity.iss diff --git a/win/audacity.iss b/win/audacity.iss old mode 100644 new mode 100755 index 0c63e834d..2b147958f --- a/win/audacity.iss +++ b/win/audacity.iss @@ -35,9 +35,9 @@ AppVerName=Audacity {#AppVersion} ; Specify AppVersion as well, so it appears in the Add/Remove Programs entry. AppVersion={#AppVersion} AppPublisher="Audacity Team" -AppPublisherURL=http://audacity.sourceforge.net -AppSupportURL=http://audacity.sourceforge.net -AppUpdatesURL=http://audacity.sourceforge.net +AppPublisherURL=http://web.audacityteam.org +AppSupportURL=http://web.audacityteam.org +AppUpdatesURL=http://web.audacityteam.org ChangesAssociations=yes DefaultDirName={pf}\Audacity @@ -122,12 +122,12 @@ Name: "uk"; MessagesFile: "compiler:Languages\Ukrainian.isl" #endif [INI] -Filename: "{app}\FirstTime.ini"; Section: "FromInno"; Key: "ResetThePrefs"; String: "yes"; Tasks: resetPrefs; +Filename: "{app}\FirstTime.ini"; Section: "FromInno"; Key: "ResetPrefs"; String: "1"; Tasks: resetPrefs; Filename: "{app}\FirstTime.ini"; Section: "FromInno"; Key: "Language"; String: "{language}" [Tasks] -Name: desktopicon; Description: "Create a &desktop icon"; GroupDescription: "Additional icons:" -Name: resetPrefs; Description: "Reset Preferences"; Flags: unchecked +Name: desktopicon; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}" +Name: resetPrefs; Description: "{cm:ResetPrefs}"; Flags: unchecked ; No longer allow user to choose whether to associate AUP file type with Audacity. ; Name: associate_aup; Description: "&Associate Audacity project files"; GroupDescription: "Other tasks:"; Flags: checkedonce @@ -148,13 +148,12 @@ Source: "..\presets\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs ; 1) Can't get the documented {%WXWIN|default dir} parsing to work. ; 2) Need the DLL's in the release dir for testing, anyway. Source: "..\win\release\wxbase28u_net_vc_custom.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\win\release\wxbase28u_xml_vc_custom.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "..\win\release\wxbase28u_vc_custom.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "..\win\release\wxmsw28u_adv_vc_custom.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "..\win\release\wxmsw28u_core_vc_custom.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "..\win\release\wxmsw28u_html_vc_custom.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "..\win\release\wxmsw28u_adv_vc_custom.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "..\win\release\wxmsw28u_qa_vc_custom.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "..\win\release\wxbase28u_xml_vc_custom.dll"; DestDir: "{app}"; Flags: ignoreversion ; MSVC runtime DLLs. Some users can't put these in the system dir, so just put them in the EXE dir. ; It's legal, per http://www.fsf.org/licensing/licenses/gpl-faq.html#WindowsRuntimeAndGPL . @@ -249,3 +248,7 @@ Root: HKCR; Subkey: "Audacity.Project\shell\open\command"; ValueType: string; Va [Run] Filename: "{app}\audacity.exe"; Description: "Launch Audacity"; Flags: nowait postinstall skipifsilent +[CustomMessages] +en.ResetPrefs=Reset Preferences +es.ResetPrefs=¿Desea restablecer las preferencias? +fr.ResetPrefs=Réinitialiser les Préférences From c1ef377e5ba0f595d1bb5aaf2e4a3e27b7823776 Mon Sep 17 00:00:00 2001 From: James Crook Date: Wed, 3 Jun 2015 19:17:32 +0100 Subject: [PATCH 2/3] Plugins -> Plug-ins --- src/PluginManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PluginManager.cpp b/src/PluginManager.cpp index 8891d944d..732464a3d 100644 --- a/src/PluginManager.cpp +++ b/src/PluginManager.cpp @@ -516,7 +516,7 @@ void PluginRegistrationDialog::PopulateOrExchange(ShuttleGui &S) { /*i18n-hint: The dialog shows a list of plugins with check-boxes beside each one.*/ - S.StartStatic(_("Select Plugins, click the Enable or Disable button, then click OK."), true); + S.StartStatic(_("Select Plug-ins, click the Enable or Disable button, then click OK."), true); { S.StartHorizontalLay(wxALIGN_LEFT,0 ); { From 388b35623c196076c6ddef472ad56b2ec6c4d4cd Mon Sep 17 00:00:00 2001 From: James Crook Date: Wed, 3 Jun 2015 19:36:46 +0100 Subject: [PATCH 3/3] From sourceforge to audacityteam about page. --- win/audacity_InnoWizard_InfoBefore.rtf | Bin 1703 -> 1695 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/win/audacity_InnoWizard_InfoBefore.rtf b/win/audacity_InnoWizard_InfoBefore.rtf index 1cd3cf371e3b7956213a3fb157e724b2845e7c60..a86ecdd1446f0bef3017baddb99b30fadb5b7cbf 100644 GIT binary patch delta 31 ncmZ3^JD+#MGDg0V)Wlr9{GxRI#H9SvlF0!~;+rosUSRli<>005;g3uXWS