Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-16 16:10:06 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into refactor

Browse Source
This commit is contained in:
Paul Licameli 2015-06-03 14:59:24 -04:00
commit 54e9e4950c
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/PluginManager.cpp
View File

@ -516,7 +516,7 @@ void PluginRegistrationDialog::PopulateOrExchange(ShuttleGui &S)
{ {
/*i18n-hint: The dialog shows a list of plugins with check-boxes /*i18n-hint: The dialog shows a list of plugins with check-boxes
beside each one.*/ 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 ); S.StartHorizontalLay(wxALIGN_LEFT,0 );
{ {

19
win/audacity.iss Normal file → Executable file
View File

@ -35,9 +35,9 @@ AppVerName=Audacity {#AppVersion}
; Specify AppVersion as well, so it appears in the Add/Remove Programs entry. ; Specify AppVersion as well, so it appears in the Add/Remove Programs entry.
AppVersion={#AppVersion} AppVersion={#AppVersion}
AppPublisher="Audacity Team" AppPublisher="Audacity Team"
AppPublisherURL=http://audacity.sourceforge.net AppPublisherURL=http://web.audacityteam.org
AppSupportURL=http://audacity.sourceforge.net AppSupportURL=http://web.audacityteam.org
AppUpdatesURL=http://audacity.sourceforge.net AppUpdatesURL=http://web.audacityteam.org
ChangesAssociations=yes ChangesAssociations=yes
DefaultDirName={pf}\Audacity DefaultDirName={pf}\Audacity
@ -122,12 +122,12 @@ Name: "uk"; MessagesFile: "compiler:Languages\Ukrainian.isl"
#endif #endif
[INI] [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}" Filename: "{app}\FirstTime.ini"; Section: "FromInno"; Key: "Language"; String: "{language}"
[Tasks] [Tasks]
Name: desktopicon; Description: "Create a &desktop icon"; GroupDescription: "Additional icons:" Name: desktopicon; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"
Name: resetPrefs; Description: "Reset Preferences"; Flags: unchecked Name: resetPrefs; Description: "{cm:ResetPrefs}"; Flags: unchecked
; No longer allow user to choose whether to associate AUP file type with Audacity. ; 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 ; 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. ; 1) Can't get the documented {%WXWIN|default dir} parsing to work.
; 2) Need the DLL's in the release dir for testing, anyway. ; 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_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\wxbase28u_vc_custom.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\win\release\wxmsw28u_adv_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_core_vc_custom.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\win\release\wxmsw28u_html_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\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. ; 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 . ; 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] [Run]
Filename: "{app}\audacity.exe"; Description: "Launch Audacity"; Flags: nowait postinstall skipifsilent 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

BIN
win/audacity_InnoWizard_InfoBefore.rtf
View File

Binary file not shown.