|
From: <ki...@us...> - 2006-09-05 16:05:39
|
Revision: 3526
http://svn.sourceforge.net/winmerge/?rev=3526&view=rev
Author: kimmov
Date: 2006-09-05 08:48:17 -0700 (Tue, 05 Sep 2006)
Log Message:
-----------
PATCH: [ 1552248 ] Install as a TortoiseSVN diff tool
Modified Paths:
--------------
trunk/Installer/InnoSetup/Changes.txt
trunk/Installer/InnoSetup/Languages/Brazilian_Portuguese.isl
trunk/Installer/InnoSetup/Languages/Bulgarian.isl
trunk/Installer/InnoSetup/Languages/Catalan.isl
trunk/Installer/InnoSetup/Languages/Chinese_Simplified.isl
trunk/Installer/InnoSetup/Languages/Chinese_Traditional.isl
trunk/Installer/InnoSetup/Languages/Czech.isl
trunk/Installer/InnoSetup/Languages/Danish.isl
trunk/Installer/InnoSetup/Languages/Dutch.isl
trunk/Installer/InnoSetup/Languages/English.isl
trunk/Installer/InnoSetup/Languages/French.isl
trunk/Installer/InnoSetup/Languages/German.isl
trunk/Installer/InnoSetup/Languages/Hungarian.isl
trunk/Installer/InnoSetup/Languages/Italian.isl
trunk/Installer/InnoSetup/Languages/Japanese.isl
trunk/Installer/InnoSetup/Languages/Korean.isl
trunk/Installer/InnoSetup/Languages/Norwegian.isl
trunk/Installer/InnoSetup/Languages/Polish.isl
trunk/Installer/InnoSetup/Languages/Russian.isl
trunk/Installer/InnoSetup/Languages/Slovak.isl
trunk/Installer/InnoSetup/Languages/Spanish.isl
trunk/Installer/InnoSetup/Languages/Swedish.isl
trunk/Installer/InnoSetup/Languages/Turkish.isl
trunk/Installer/InnoSetup/WinMerge.iss
Modified: trunk/Installer/InnoSetup/Changes.txt
===================================================================
--- trunk/Installer/InnoSetup/Changes.txt 2006-09-05 14:58:56 UTC (rev 3525)
+++ trunk/Installer/InnoSetup/Changes.txt 2006-09-05 15:48:17 UTC (rev 3526)
@@ -1,3 +1,8 @@
+2006-09-05 Kimmo
+ PATCH: [ 1552248 ] Install as a TortoiseSVN diff tool
+ InnoSetup: WinMerge.iss
+ InnoSetup/Languages: *.isl
+
2006-08-31 Kimmo
PATCH: [ 1548912 ] Combine "WinMerge core" and "Runtimes" categories
InnoSetup: WinMerge.iss
Modified: trunk/Installer/InnoSetup/Languages/Brazilian_Portuguese.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Brazilian_Portuguese.isl 2006-09-05 14:58:56 UTC (rev 3525)
+++ trunk/Installer/InnoSetup/Languages/Brazilian_Portuguese.isl 2006-09-05 15:48:17 UTC (rev 3526)
@@ -368,6 +368,7 @@
;Tasks
ExplorerContextMenu=&Enable Explorer context menu integration
IntegrateTortoiseCVS=Integrate with &TortoiseCVS
+IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
IntegrateDelphi4=Borland\xAE Delphi &4 Binary File Support
UpdatingCommonControls=Updating the System's Common Controls
Modified: trunk/Installer/InnoSetup/Languages/Bulgarian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Bulgarian.isl 2006-09-05 14:58:56 UTC (rev 3525)
+++ trunk/Installer/InnoSetup/Languages/Bulgarian.isl 2006-09-05 15:48:17 UTC (rev 3526)
@@ -362,6 +362,7 @@
;Tasks
ExplorerContextMenu=&Enable Explorer context menu integration
IntegrateTortoiseCVS=Integrate with &TortoiseCVS
+IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
IntegrateDelphi4=Borland\xAE Delphi &4 Binary File Support
UpdatingCommonControls=Updating the System's Common Controls
Modified: trunk/Installer/InnoSetup/Languages/Catalan.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Catalan.isl 2006-09-05 14:58:56 UTC (rev 3525)
+++ trunk/Installer/InnoSetup/Languages/Catalan.isl 2006-09-05 15:48:17 UTC (rev 3526)
@@ -346,6 +346,7 @@
;Tasks
ExplorerContextMenu=&Habilita la integraci\xF3 del men\xFA de contexte a l'Explorador
IntegrateTortoiseCVS=Integra amb el &TortoiseCVS
+IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
IntegrateDelphi4=Suport per a fitxers binaris del Borland\xAE Delphi &4
UpdatingCommonControls=Actualitzant els Controls Comuns del Sistema
Modified: trunk/Installer/InnoSetup/Languages/Chinese_Simplified.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Chinese_Simplified.isl 2006-09-05 14:58:56 UTC (rev 3525)
+++ trunk/Installer/InnoSetup/Languages/Chinese_Simplified.isl 2006-09-05 15:48:17 UTC (rev 3526)
@@ -353,6 +353,7 @@
;Tasks
ExplorerContextMenu=&Enable Explorer context menu integration
IntegrateTortoiseCVS=Integrate with &TortoiseCVS
+IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
IntegrateDelphi4=Borland Delphi &4 Binary File Support
UpdatingCommonControls=Updating the System's Common Controls
Modified: trunk/Installer/InnoSetup/Languages/Chinese_Traditional.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Chinese_Traditional.isl 2006-09-05 14:58:56 UTC (rev 3525)
+++ trunk/Installer/InnoSetup/Languages/Chinese_Traditional.isl 2006-09-05 15:48:17 UTC (rev 3526)
@@ -360,6 +360,7 @@
;Tasks
ExplorerContextMenu=&Enable Explorer context menu integration
IntegrateTortoiseCVS=Integrate with &TortoiseCVS
+IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
IntegrateDelphi4=Borland Delphi &4 Binary File Support
UpdatingCommonControls=Updating the System's Common Controls
Modified: trunk/Installer/InnoSetup/Languages/Czech.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Czech.isl 2006-09-05 14:58:56 UTC (rev 3525)
+++ trunk/Installer/InnoSetup/Languages/Czech.isl 2006-09-05 15:48:17 UTC (rev 3526)
@@ -354,6 +354,7 @@
;Tasks
ExplorerContextMenu=&Enable Explorer context menu integration
IntegrateTortoiseCVS=Integrate with &TortoiseCVS
+IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
IntegrateDelphi4=Borland\xAE Delphi &4 Binary File Support
UpdatingCommonControls=Updating the System's Common Controls
Modified: trunk/Installer/InnoSetup/Languages/Danish.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Danish.isl 2006-09-05 14:58:56 UTC (rev 3525)
+++ trunk/Installer/InnoSetup/Languages/Danish.isl 2006-09-05 15:48:17 UTC (rev 3526)
@@ -362,6 +362,7 @@
;Tasks
ExplorerContextMenu=&Enable Explorer context menu integration
IntegrateTortoiseCVS=Integrate with &TortoiseCVS
+IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
IntegrateDelphi4=Borland\xAE Delphi &4 Binary File Support
UpdatingCommonControls=Updating the System's Common Controls
Modified: trunk/Installer/InnoSetup/Languages/Dutch.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Dutch.isl 2006-09-05 14:58:56 UTC (rev 3525)
+++ trunk/Installer/InnoSetup/Languages/Dutch.isl 2006-09-05 15:48:17 UTC (rev 3526)
@@ -340,6 +340,7 @@
;Tasks
ExplorerContextMenu=&Enable Explorer context menu integration
IntegrateTortoiseCVS=Integrate with &TortoiseCVS
+IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
IntegrateDelphi4=Borland\xAE Delphi &4 Binary File Support
UpdatingCommonControls=Updating the System's Common Controls
Modified: trunk/Installer/InnoSetup/Languages/English.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/English.isl 2006-09-05 14:58:56 UTC (rev 3525)
+++ trunk/Installer/InnoSetup/Languages/English.isl 2006-09-05 15:48:17 UTC (rev 3526)
@@ -360,6 +360,7 @@
;Tasks
ExplorerContextMenu=&Enable Explorer context menu integration
IntegrateTortoiseCVS=Integrate with &TortoiseCVS
+IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
IntegrateDelphi4=Borland\xAE Delphi &4 Binary File Support
UpdatingCommonControls=Updating the System's Common Controls
Modified: trunk/Installer/InnoSetup/Languages/French.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/French.isl 2006-09-05 14:58:56 UTC (rev 3525)
+++ trunk/Installer/InnoSetup/Languages/French.isl 2006-09-05 15:48:17 UTC (rev 3526)
@@ -355,6 +355,7 @@
;Tasks
ExplorerContextMenu=&Enable Explorer context menu integration
IntegrateTortoiseCVS=Integrate with &TortoiseCVS
+IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
IntegrateDelphi4=Borland\xAE Delphi &4 Binary File Support
UpdatingCommonControls=Updating the System's Common Controls
Modified: trunk/Installer/InnoSetup/Languages/German.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/German.isl 2006-09-05 14:58:56 UTC (rev 3525)
+++ trunk/Installer/InnoSetup/Languages/German.isl 2006-09-05 15:48:17 UTC (rev 3526)
@@ -353,6 +353,7 @@
;Tasks
ExplorerContextMenu=&Explorer Kontextmen\xFC-Integration aktivieren
IntegrateTortoiseCVS=Integrieren in &TortoiseCVS
+IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
IntegrateDelphi4=Borland\xAE Delphi &4 Bin\xE4rdatei-Unterst\xFCtzung
UpdatingCommonControls=Aktualisieren der System-Komponenten
Modified: trunk/Installer/InnoSetup/Languages/Hungarian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Hungarian.isl 2006-09-05 14:58:56 UTC (rev 3525)
+++ trunk/Installer/InnoSetup/Languages/Hungarian.isl 2006-09-05 15:48:17 UTC (rev 3526)
@@ -374,6 +374,7 @@
;Tasks
ExplorerContextMenu=Integr\xE1l\xE1s az Int\xE9z\xF5 &context-men\xFCj\xE9hez
IntegrateTortoiseCVS=Integr\xE1l\xE1s a &TortoiseCVS programmal
+IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
IntegrateDelphi4=Borland\xAE Delphi &4 bin\xE1ris f\xE1jl t\xE1mogat\xE1s
UpdatingCommonControls=Updating the System's Common Controls
Modified: trunk/Installer/InnoSetup/Languages/Italian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Italian.isl 2006-09-05 14:58:56 UTC (rev 3525)
+++ trunk/Installer/InnoSetup/Languages/Italian.isl 2006-09-05 15:48:17 UTC (rev 3526)
@@ -366,6 +366,7 @@
;Tasks
ExplorerContextMenu=&Attiva l'integrazione con il menu contestuale di Explorer
IntegrateTortoiseCVS=Integrazione con &TortoiseCVS
+IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
IntegrateDelphi4=Supporto per i file binari di Borland\xAE Delphi &4
UpdatingCommonControls=Aggiornamento dei controlli comuni del sistema in corso...
Modified: trunk/Installer/InnoSetup/Languages/Japanese.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Japanese.isl 2006-09-05 14:58:56 UTC (rev 3525)
+++ trunk/Installer/InnoSetup/Languages/Japanese.isl 2006-09-05 15:48:17 UTC (rev 3526)
@@ -350,6 +350,7 @@
;Tasks
ExplorerContextMenu=\x83G\x83N\x83X\x83v\x83\x8D\x81[\x83\x89\x82̃R\x83\x93\x83e\x83L\x83X\x83g\x83\x81\x83j\x83\x85\x81[\x82ɒlj\xC1(&E)
IntegrateTortoiseCVS=TortoiseCVS\x82Ƃ̘A\x8Cg(&T)
+IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
IntegrateDelphi4=Borland Delphi 4 \x83o\x83C\x83i\x83\x8A\x83t\x83@\x83C\x83\x8B\x83T\x83|\x81[\x83g(&4)
UpdatingCommonControls=\x83V\x83X\x83e\x83\x80\x82̃R\x83\x82\x83\x93\x83R\x83\x93\x83g\x83\x8D\x81[\x83\x8B\x82\xF0\x83A\x83b\x83v\x83f\x81[\x83g\x82\xB5\x82܂\xB7
Modified: trunk/Installer/InnoSetup/Languages/Korean.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Korean.isl 2006-09-05 14:58:56 UTC (rev 3525)
+++ trunk/Installer/InnoSetup/Languages/Korean.isl 2006-09-05 15:48:17 UTC (rev 3526)
@@ -368,6 +368,7 @@
;Tasks
ExplorerContextMenu=&Enable Explorer context menu integration
IntegrateTortoiseCVS=Integrate with &TortoiseCVS
+IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
IntegrateDelphi4=Borland Delphi &4 Binary File Support
UpdatingCommonControls=Updating the System's Common Controls
Modified: trunk/Installer/InnoSetup/Languages/Norwegian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Norwegian.isl 2006-09-05 14:58:56 UTC (rev 3525)
+++ trunk/Installer/InnoSetup/Languages/Norwegian.isl 2006-09-05 15:48:17 UTC (rev 3526)
@@ -358,6 +358,7 @@
;Tasks
ExplorerContextMenu=&Aktiver integrasjon i Windows utforsker sin kontekstmeny
IntegrateTortoiseCVS=Integrer med &TortoiseCVS
+IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
IntegrateDelphi4=St\xF8tte for Borland\xAE Delphi &4 bin\xE6re file
UpdatingCommonControls=Oppdater systemets felles kontrollelement
Modified: trunk/Installer/InnoSetup/Languages/Polish.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Polish.isl 2006-09-05 14:58:56 UTC (rev 3525)
+++ trunk/Installer/InnoSetup/Languages/Polish.isl 2006-09-05 15:48:17 UTC (rev 3526)
@@ -352,6 +352,7 @@
;Tasks
ExplorerContextMenu=&Wlacz integracje z menu Eksploratora
IntegrateTortoiseCVS=Integracja z &TortoiseCVS
+IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
IntegrateDelphi4=Obsluga plik\xF3w binarnych Borland\xAE Delphi &4
UpdatingCommonControls=Aktualizacja wsp\xF3lnych kontrolek systemowych SCC
Modified: trunk/Installer/InnoSetup/Languages/Russian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Russian.isl 2006-09-05 14:58:56 UTC (rev 3525)
+++ trunk/Installer/InnoSetup/Languages/Russian.isl 2006-09-05 15:48:17 UTC (rev 3526)
@@ -350,6 +350,7 @@
;Tasks
ExplorerContextMenu=&Enable Explorer context menu integration
IntegrateTortoiseCVS=Integrate with &TortoiseCVS
+IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
IntegrateDelphi4=Borland\xAE Delphi &4 Binary File Support
UpdatingCommonControls=Updating the System's Common Controls
Modified: trunk/Installer/InnoSetup/Languages/Slovak.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Slovak.isl 2006-09-05 14:58:56 UTC (rev 3525)
+++ trunk/Installer/InnoSetup/Languages/Slovak.isl 2006-09-05 15:48:17 UTC (rev 3526)
@@ -288,6 +288,7 @@
;Tasks
ExplorerContextMenu=&Enable Explorer context menu integration
IntegrateTortoiseCVS=Integrate with &TortoiseCVS
+IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
IntegrateDelphi4=Borland\xAE Delphi &4 Binary File Support
UpdatingCommonControls=Updating the System's Common Controls
Modified: trunk/Installer/InnoSetup/Languages/Spanish.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Spanish.isl 2006-09-05 14:58:56 UTC (rev 3525)
+++ trunk/Installer/InnoSetup/Languages/Spanish.isl 2006-09-05 15:48:17 UTC (rev 3526)
@@ -364,6 +364,7 @@
;Tasks
ExplorerContextMenu=&Enable Explorer context menu integration
IntegrateTortoiseCVS=Integrate with &TortoiseCVS
+IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
IntegrateDelphi4=Borland\xAE Delphi &4 Binary File Support
UpdatingCommonControls=Updating the System's Common Controls
Modified: trunk/Installer/InnoSetup/Languages/Swedish.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Swedish.isl 2006-09-05 14:58:56 UTC (rev 3525)
+++ trunk/Installer/InnoSetup/Languages/Swedish.isl 2006-09-05 15:48:17 UTC (rev 3526)
@@ -353,6 +353,7 @@
;Tasks
ExplorerContextMenu=&M\xF6jligg\xF6r integration med Explorers menyer
IntegrateTortoiseCVS=Integrera med &TortoiseCVS
+IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
IntegrateDelphi4=St\xF6d Borland\xAE Delphi4 Bin\xE4ra filer
UpdatingCommonControls=Uppdatera Systemets Vanliga Kontroller
Modified: trunk/Installer/InnoSetup/Languages/Turkish.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Turkish.isl 2006-09-05 14:58:56 UTC (rev 3525)
+++ trunk/Installer/InnoSetup/Languages/Turkish.isl 2006-09-05 15:48:17 UTC (rev 3526)
@@ -354,6 +354,7 @@
;Tasks
ExplorerContextMenu=&Enable Explorer context menu integration
IntegrateTortoiseCVS=Integrate with &TortoiseCVS
+IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
IntegrateDelphi4=Borland\xAE Delphi &4 Binary File Support
UpdatingCommonControls=Updating the System's Common Controls
Modified: trunk/Installer/InnoSetup/WinMerge.iss
===================================================================
--- trunk/Installer/InnoSetup/WinMerge.iss 2006-09-05 14:58:56 UTC (rev 3525)
+++ trunk/Installer/InnoSetup/WinMerge.iss 2006-09-05 15:48:17 UTC (rev 3526)
@@ -245,6 +245,7 @@
[Tasks]
Name: ShellExtension; Description: {cm:ExplorerContextMenu}; GroupDescription: {cm:OptionalFeatures}
Name: TortoiseCVS; Description: {cm:IntegrateTortoiseCVS}; GroupDescription: {cm:OptionalFeatures}; Check: TortoiseCVSInstalled
+Name: TortoiseSVN; Description: {cm:IntegrateTortoiseSVN}; GroupDescription: {cm:OptionalFeatures}; Check: TortoiseSVNInstalled; MinVersion: 0,5.0.2195sp3
Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked
Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}
@@ -457,6 +458,9 @@
Root: HKCU; SubKey: Software\TortoiseCVS; ValueType: string; ValueName: External Merge Application; ValueData: {app}\{code:ExeName}; Flags: uninsdeletevalue; Tasks: TortoiseCVS
Root: HKCU; SubKey: Software\TortoiseCVS; ValueType: dword; ValueName: MergeAsUnicode; ValueData: $00000001; Flags: uninsdeletevalue; Tasks: TortoiseCVS
+;Set WinMerge as TortoiseSVN diff tool
+Root: HKCU; SubKey: Software\TortoiseSVN; ValueType: string; ValueName: Diff; ValueData: {app}\{code:ExeName} -e -x -ub -dl %bname -dr %yname %base %mine; Flags: uninsdeletevalue; Tasks: TortoiseSVN
+
;Whatever the user chooses at the [Select Setup Language] dialog should also determine what language WinMerge will start up in
;(unless the user already has a startup language specified)
Root: HKCU; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000402; Flags: deletevalue; Languages: Bulgarian
@@ -824,6 +828,12 @@
Result := RegKeyExists(HKEY_LOCAL_MACHINE, 'SOFTWARE\TortoiseCVS\CustomIcons');
End;
+{Determines whether or not TortoiseSVN is installed}
+Function TortoiseSVNInstalled(): boolean;
+Begin
+ Result := RegKeyExists(HKEY_LOCAL_MACHINE, 'SOFTWARE\TortoiseSVN');
+End;
+
Function RelativeGroupPath(Unused: string): String;
Var
strGroup: String;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-13 17:03:48
|
Revision: 3559
http://svn.sourceforge.net/winmerge/?rev=3559&view=rev
Author: kimmov
Date: 2006-09-13 10:03:39 -0700 (Wed, 13 Sep 2006)
Log Message:
-----------
PATCH: [ 1557892 ] Updated Swedish.isl InnoSetup translation
- submitted by Hans Eriksson
Modified Paths:
--------------
trunk/Installer/InnoSetup/Changes.txt
trunk/Installer/InnoSetup/Languages/Swedish.isl
Modified: trunk/Installer/InnoSetup/Changes.txt
===================================================================
--- trunk/Installer/InnoSetup/Changes.txt 2006-09-12 21:30:47 UTC (rev 3558)
+++ trunk/Installer/InnoSetup/Changes.txt 2006-09-13 17:03:39 UTC (rev 3559)
@@ -1,3 +1,8 @@
+2006-09-13 Kimmo
+ PATCH: [ 1557892 ] Updated Swedish.isl InnoSetup translation
+ Submitted by Hans Eriksson
+ InnoSetup/Languages: Swedish.isl
+
2006-09-11 Takashi
Japanese translation update
InnoSetup/Languages: Japanese.isl
Modified: trunk/Installer/InnoSetup/Languages/Swedish.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Swedish.isl 2006-09-12 21:30:47 UTC (rev 3558)
+++ trunk/Installer/InnoSetup/Languages/Swedish.isl 2006-09-13 17:03:39 UTC (rev 3559)
@@ -353,7 +353,7 @@
;Tasks
ExplorerContextMenu=&M\xF6jligg\xF6r integration med Explorers menyer
IntegrateTortoiseCVS=Integrera med &TortoiseCVS
-IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
+IntegrateTortoiseSVN=Integrera med T&ortoiseSVN
IntegrateDelphi4=St\xF6d Borland\xAE Delphi4 Bin\xE4ra filer
UpdatingCommonControls=Uppdatera Systemets Vanliga Kontroller
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-19 14:49:38
|
Revision: 3580
http://svn.sourceforge.net/winmerge/?rev=3580&view=rev
Author: kimmov
Date: 2006-09-19 07:49:21 -0700 (Tue, 19 Sep 2006)
Log Message:
-----------
PATCH: [ 1560904 ] Install 64-bit ShellExtension
Modified Paths:
--------------
trunk/Installer/InnoSetup/Changes.txt
trunk/Installer/InnoSetup/WinMerge.iss
Modified: trunk/Installer/InnoSetup/Changes.txt
===================================================================
--- trunk/Installer/InnoSetup/Changes.txt 2006-09-18 20:18:03 UTC (rev 3579)
+++ trunk/Installer/InnoSetup/Changes.txt 2006-09-19 14:49:21 UTC (rev 3580)
@@ -1,3 +1,7 @@
+2006-09-20 Kimmo
+ PATCH: [ 1560904 ] Install 64-bit ShellExtension
+ InnoSetup: WinMerge.iss
+
2006-09-18 Kimmo
Synchronize language files from upstream (http://www.jrsoftware.org/files/istrans/)
InnoSetup/Languages: Bulgarian.isl Catalan.isl Czech.isl Italian.isl Japanese.isl
Modified: trunk/Installer/InnoSetup/WinMerge.iss
===================================================================
--- trunk/Installer/InnoSetup/WinMerge.iss 2006-09-18 20:18:03 UTC (rev 3579)
+++ trunk/Installer/InnoSetup/WinMerge.iss 2006-09-19 14:49:21 UTC (rev 3580)
@@ -3,42 +3,29 @@
;
; Programmed by: Christian Blackburn, Christian List, Kimmo Varis
; Purpose: The is the Inno Setup installation script for distributing our WinmMerge application.
-; Tools Needed To Compile: Inno Setup 5.1.4+ (http://www.jrsoftware.org/isdl.php), Inno Setup QuickStart Pack 5.1.4+(http://www.jrsoftware.org/isdl.php)
+; Tools Needed To Compile: Inno Setup 5.1.7+ (http://www.jrsoftware.org/isdl.php), Inno Setup QuickStart Pack 5.1.7+(http://www.jrsoftware.org/isdl.php)
; note: the versions of Inno Setup and the QuickStart Pack should be identical to ensure proper function
;Directly Dependant Files: Because this is an installer. It would be difficult to list and maintain each of the files referenced
-; throughout the script in the header. If you search this plain text script for a particular file in our CVS and it
+; throughout the script in the header. If you search this plain text script for a particular file in our Subversio repository and it
; doesn't appear then this script is not directly dependant on that file.
;Compilation Instructions: 1. Open this file in Inno Setup or ISTool
; 2. Make sure Compression=LZMA/Ultra, InternalCompressLevel=Ultra, and SolidCompression=True these values are lowered during
; development to speed up compilation, however at release we want the intaller to be as strong as possible.
-; 3. Compile the script:
+; 3. Check all files are present:
+; -From ISTool Click
+; 4. Compile the script: "Project" --> "Verify Files..."
; -From Inno Setup "Click "Build" --> "Compile"
; -From ISTool Click "Project" --> "Compile Setup"
-; 4. The compiled installer will appear in the \InnoSetup\Output\ directory at currently should be around 1.5MBs in size.
+; 5. The compiled installer will appear in the \InnoSetup\Output\ directory at currently should be around 1.5MBs in size.
;
; Installer To Do List:
-; Localization
-; # Create instructions and a sample language file using the Inno Setup Translator Tool (http://www2.arnes.si/~sopjsimo/translator.html)
-; # Seier will need to apply this {#AppVersion} directive to all localizations:
-; English.SetupAppTitle=Setup - WinMerge {#AppVersion}
-;
-; Bugs & Other Priority Items:
-; # Add the Windows Scripting Host if the user chooses the plugins (*.SCT)
; # We need to unregister, and delete the ShellExtension Dll if the user doesn't want it, during installation
; # When Explorer.exe is restarted we should record what windows were present before hand and restore them afterwards.
; # Display integration options in gray rather than hiding them if the user doesn't have the application in question installed
-; # Distribute AppHelp.dll since it's required by WinMerge.exe, ShellExtension.dll, Merge7zU311.zip
-; # Only display TortoiseCVS option if the user has it installed
; # We need to ask those that have the RCLLocalization.dll in their plugins folder if they actually want it, their answer will need to be stored in the registry
; # Write code to detect "\Programs\WinMerge\WinMerge" type start menu installs
;
-; # Application Integration:
-; # We need to backup the previously integrated viewer in TortoiseCVS, at uninstallation ([UninstallRun] Regedit -S Tortoise.reg)
-; or when the user deselects it this will need to be uninstalled
-; # We need to add support for Tortoises' SubVersion program mimicking our support settings for TortoiseCVS if possible
-; # We need to determine if our application can cooperate with WinCVS and if so how
-;
; Things that make the user's life easier:
; # Create instructions and a sample language file using the Inno Setup Translator Tool (http://www2.arnes.si/~sopjsimo/translator.html)
; # Add "WinMerge is running would you like to close it now?" support with programmatic termination
@@ -325,11 +312,11 @@
[Files]
;The MinVersion forces Inno Setup to only copy the following file if the user is running a WinNT platform system
Source: ..\..\Build\MergeUnicodeRelease\WinMergeU.exe; DestDir: {app}; Flags: promptifolder; MinVersion: 0, 4; Components: Core
-Source: ..\..\Build\MergeRelease\WinMerge.exe; DestDir: {app}; Flags: promptifolder; Components: Core
+Source: ..\..\Build\MergeRelease\WinMerge.exe; DestDir: {app}; Flags: promptifolder; Components: Core; Check: not IsWin64
;The MinVersion forces Inno Setup to only copy the following file if the user is running a WinNT platform system
Source: WinMergeU.exe.manifest; DestDir: {app}; Flags: promptifolder; MinVersion: 0, 5.01; Components: Core
-Source: WinMerge.exe.manifest; DestDir: {app}; Flags: promptifolder; Components: Core; MinVersion: 0,5.01
+Source: WinMerge.exe.manifest; DestDir: {app}; Flags: promptifolder; Components: Core; MinVersion: 0,5.01; Check: not IsWin64
; Icon for projectfiles
Source: MergeProject.ico; DestDir: {app}; Flags: promptifolder; Components: Core
@@ -346,8 +333,10 @@
Source: Runtimes\msvcp71.dll; DestDir: {sys}; Flags: restartreplace uninsneveruninstall sharedfile; Components: Core
; end VC system files
-Source: ..\..\Build\MergeRelease\ShellExtension.dll; DestDir: {app}; Flags: regserver uninsrestartdelete restartreplace promptifolder; MinVersion: 4, 0
-Source: ..\..\Build\MergeUnicodeRelease\ShellExtensionU.dll; DestDir: {app}; Flags: regserver uninsrestartdelete restartreplace promptifolder; MinVersion: 0, 4
+Source: ..\..\Build\MergeRelease\ShellExtension.dll; DestDir: {app}; Flags: regserver uninsrestartdelete restartreplace promptifolder; MinVersion: 4, 0; Check: not IsWin64
+Source: ..\..\Build\MergeUnicodeRelease\ShellExtensionU.dll; DestDir: {app}; Flags: regserver uninsrestartdelete restartreplace promptifolder; MinVersion: 0, 4; Check: not IsWin64
+; 64-bit version of ShellExtension
+Source: ..\..\Build\ShellExtensionX64\ShellExtensionX64.dll; DestDir: {app}; Flags: regserver uninsrestartdelete restartreplace promptifolder 64bit; MinVersion: 0,5.01.2600; Check: IsWin64
Source: ..\..\Build\Languages\MergeBulgarian.lang; DestDir: {app}\Languages; Components: Languages\Bulgarian; Flags: ignoreversion comparetimestamp
Source: ..\..\Build\Languages\MergeCatalan.lang; DestDir: {app}\Languages; Components: Languages\Catalan; Flags: ignoreversion comparetimestamp
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ga...@us...> - 2006-09-20 06:07:08
|
Revision: 3586
http://svn.sourceforge.net/winmerge/?rev=3586&view=rev
Author: galh
Date: 2006-09-19 23:06:36 -0700 (Tue, 19 Sep 2006)
Log Message:
-----------
PATCH: [ 1552248 ] Install as a ClearCase diff tool
Modified Paths:
--------------
trunk/Installer/InnoSetup/Changes.txt
trunk/Installer/InnoSetup/Languages/Brazilian_Portuguese.isl
trunk/Installer/InnoSetup/Languages/Bulgarian.isl
trunk/Installer/InnoSetup/Languages/Catalan.isl
trunk/Installer/InnoSetup/Languages/Chinese_Simplified.isl
trunk/Installer/InnoSetup/Languages/Chinese_Traditional.isl
trunk/Installer/InnoSetup/Languages/Czech.isl
trunk/Installer/InnoSetup/Languages/Danish.isl
trunk/Installer/InnoSetup/Languages/Dutch.isl
trunk/Installer/InnoSetup/Languages/English.isl
trunk/Installer/InnoSetup/Languages/French.isl
trunk/Installer/InnoSetup/Languages/German.isl
trunk/Installer/InnoSetup/Languages/Hungarian.isl
trunk/Installer/InnoSetup/Languages/Italian.isl
trunk/Installer/InnoSetup/Languages/Japanese.isl
trunk/Installer/InnoSetup/Languages/Korean.isl
trunk/Installer/InnoSetup/Languages/Norwegian.isl
trunk/Installer/InnoSetup/Languages/Polish.isl
trunk/Installer/InnoSetup/Languages/Russian.isl
trunk/Installer/InnoSetup/Languages/Slovak.isl
trunk/Installer/InnoSetup/Languages/Spanish.isl
trunk/Installer/InnoSetup/Languages/Swedish.isl
trunk/Installer/InnoSetup/Languages/Turkish.isl
trunk/Installer/InnoSetup/WinMerge.iss
Modified: trunk/Installer/InnoSetup/Changes.txt
===================================================================
--- trunk/Installer/InnoSetup/Changes.txt 2006-09-19 19:30:39 UTC (rev 3585)
+++ trunk/Installer/InnoSetup/Changes.txt 2006-09-20 06:06:36 UTC (rev 3586)
@@ -1,3 +1,8 @@
+2006-09-20 Gal
+ PATCH: [ 1552248 ] Install as a ClearCase diff tool
+ InnoSetup: WinMerge.iss
+ InnoSetup/Languages: *.isl
+
2006-09-20 Kimmo
PATCH: [ 1560904 ] Install 64-bit ShellExtension
InnoSetup: WinMerge.iss
@@ -95,4 +100,4 @@
InnoSetup: WinMerge.iss
2005-10-20 Kimmo
- Previous change history is in file readme.txt
\ No newline at end of file
+ Previous change history is in file readme.txt
Modified: trunk/Installer/InnoSetup/Languages/Brazilian_Portuguese.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Brazilian_Portuguese.isl 2006-09-19 19:30:39 UTC (rev 3585)
+++ trunk/Installer/InnoSetup/Languages/Brazilian_Portuguese.isl 2006-09-20 06:06:36 UTC (rev 3586)
@@ -369,6 +369,7 @@
ExplorerContextMenu=&Enable Explorer context menu integration
IntegrateTortoiseCVS=Integrate with &TortoiseCVS
IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
+IntegrateClearCase=Integrate with Rational &ClearCase
IntegrateDelphi4=Borland\xAE Delphi &4 Binary File Support
UpdatingCommonControls=Updating the System's Common Controls
Modified: trunk/Installer/InnoSetup/Languages/Bulgarian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Bulgarian.isl 2006-09-19 19:30:39 UTC (rev 3585)
+++ trunk/Installer/InnoSetup/Languages/Bulgarian.isl 2006-09-20 06:06:36 UTC (rev 3586)
@@ -364,6 +364,7 @@
ExplorerContextMenu=&Enable Explorer context menu integration
IntegrateTortoiseCVS=Integrate with &TortoiseCVS
IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
+IntegrateClearCase=Integrate with Rational &ClearCase
IntegrateDelphi4=Borland\xAE Delphi &4 Binary File Support
UpdatingCommonControls=Updating the System's Common Controls
Modified: trunk/Installer/InnoSetup/Languages/Catalan.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Catalan.isl 2006-09-19 19:30:39 UTC (rev 3585)
+++ trunk/Installer/InnoSetup/Languages/Catalan.isl 2006-09-20 06:06:36 UTC (rev 3586)
@@ -347,6 +347,7 @@
ExplorerContextMenu=&Habilita la integraci\xF3 del men\xFA de contexte a l'Explorador
IntegrateTortoiseCVS=Integra amb el &TortoiseCVS
IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
+IntegrateClearCase=Integrate with Rational &ClearCase
IntegrateDelphi4=Suport per a fitxers binaris del Borland\xAE Delphi &4
UpdatingCommonControls=Actualitzant els Controls Comuns del Sistema
Modified: trunk/Installer/InnoSetup/Languages/Chinese_Simplified.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Chinese_Simplified.isl 2006-09-19 19:30:39 UTC (rev 3585)
+++ trunk/Installer/InnoSetup/Languages/Chinese_Simplified.isl 2006-09-20 06:06:36 UTC (rev 3586)
@@ -354,6 +354,7 @@
ExplorerContextMenu=&Enable Explorer context menu integration
IntegrateTortoiseCVS=Integrate with &TortoiseCVS
IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
+IntegrateClearCase=Integrate with Rational &ClearCase
IntegrateDelphi4=Borland Delphi &4 Binary File Support
UpdatingCommonControls=Updating the System's Common Controls
Modified: trunk/Installer/InnoSetup/Languages/Chinese_Traditional.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Chinese_Traditional.isl 2006-09-19 19:30:39 UTC (rev 3585)
+++ trunk/Installer/InnoSetup/Languages/Chinese_Traditional.isl 2006-09-20 06:06:36 UTC (rev 3586)
@@ -361,6 +361,7 @@
ExplorerContextMenu=&Enable Explorer context menu integration
IntegrateTortoiseCVS=Integrate with &TortoiseCVS
IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
+IntegrateClearCase=Integrate with Rational &ClearCase
IntegrateDelphi4=Borland Delphi &4 Binary File Support
UpdatingCommonControls=Updating the System's Common Controls
Modified: trunk/Installer/InnoSetup/Languages/Czech.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Czech.isl 2006-09-19 19:30:39 UTC (rev 3585)
+++ trunk/Installer/InnoSetup/Languages/Czech.isl 2006-09-20 06:06:36 UTC (rev 3586)
@@ -362,6 +362,7 @@
ExplorerContextMenu=&Enable Explorer context menu integration
IntegrateTortoiseCVS=Integrate with &TortoiseCVS
IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
+IntegrateClearCase=Integrate with Rational &ClearCase
IntegrateDelphi4=Borland\xAE Delphi &4 Binary File Support
UpdatingCommonControls=Updating the System's Common Controls
Modified: trunk/Installer/InnoSetup/Languages/Danish.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Danish.isl 2006-09-19 19:30:39 UTC (rev 3585)
+++ trunk/Installer/InnoSetup/Languages/Danish.isl 2006-09-20 06:06:36 UTC (rev 3586)
@@ -363,6 +363,7 @@
ExplorerContextMenu=&Enable Explorer context menu integration
IntegrateTortoiseCVS=Integrate with &TortoiseCVS
IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
+IntegrateClearCase=Integrate with Rational &ClearCase
IntegrateDelphi4=Borland\xAE Delphi &4 Binary File Support
UpdatingCommonControls=Updating the System's Common Controls
Modified: trunk/Installer/InnoSetup/Languages/Dutch.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Dutch.isl 2006-09-19 19:30:39 UTC (rev 3585)
+++ trunk/Installer/InnoSetup/Languages/Dutch.isl 2006-09-20 06:06:36 UTC (rev 3586)
@@ -341,6 +341,7 @@
ExplorerContextMenu=&Enable Explorer context menu integration
IntegrateTortoiseCVS=Integrate with &TortoiseCVS
IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
+IntegrateClearCase=Integrate with Rational &ClearCase
IntegrateDelphi4=Borland\xAE Delphi &4 Binary File Support
UpdatingCommonControls=Updating the System's Common Controls
Modified: trunk/Installer/InnoSetup/Languages/English.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/English.isl 2006-09-19 19:30:39 UTC (rev 3585)
+++ trunk/Installer/InnoSetup/Languages/English.isl 2006-09-20 06:06:36 UTC (rev 3586)
@@ -361,6 +361,7 @@
ExplorerContextMenu=&Enable Explorer context menu integration
IntegrateTortoiseCVS=Integrate with &TortoiseCVS
IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
+IntegrateClearCase=Integrate with Rational &ClearCase
IntegrateDelphi4=Borland\xAE Delphi &4 Binary File Support
UpdatingCommonControls=Updating the System's Common Controls
Modified: trunk/Installer/InnoSetup/Languages/French.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/French.isl 2006-09-19 19:30:39 UTC (rev 3585)
+++ trunk/Installer/InnoSetup/Languages/French.isl 2006-09-20 06:06:36 UTC (rev 3586)
@@ -356,6 +356,7 @@
ExplorerContextMenu=&Enable Explorer context menu integration
IntegrateTortoiseCVS=Integrate with &TortoiseCVS
IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
+IntegrateClearCase=Integrate with Rational &ClearCase
IntegrateDelphi4=Borland\xAE Delphi &4 Binary File Support
UpdatingCommonControls=Updating the System's Common Controls
Modified: trunk/Installer/InnoSetup/Languages/German.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/German.isl 2006-09-19 19:30:39 UTC (rev 3585)
+++ trunk/Installer/InnoSetup/Languages/German.isl 2006-09-20 06:06:36 UTC (rev 3586)
@@ -354,6 +354,7 @@
ExplorerContextMenu=&Explorer Kontextmen\xFC-Integration aktivieren
IntegrateTortoiseCVS=Integrieren in &TortoiseCVS
IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
+IntegrateClearCase=Integrate with Rational &ClearCase
IntegrateDelphi4=Borland\xAE Delphi &4 Bin\xE4rdatei-Unterst\xFCtzung
UpdatingCommonControls=Aktualisieren der System-Komponenten
Modified: trunk/Installer/InnoSetup/Languages/Hungarian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Hungarian.isl 2006-09-19 19:30:39 UTC (rev 3585)
+++ trunk/Installer/InnoSetup/Languages/Hungarian.isl 2006-09-20 06:06:36 UTC (rev 3586)
@@ -374,7 +374,8 @@
;Tasks
ExplorerContextMenu=Integr\xE1l\xE1s az Int\xE9z\xF5 &context-men\xFCj\xE9hez
IntegrateTortoiseCVS=Integr\xE1l\xE1s a &TortoiseCVS programmal
-IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
+IntegrateTortoiseSVN=Integr\xE1l\xE1s a T&ortoiseSVN programmal
+IntegrateClearCase=Integr\xE1l\xE1s a Rational &ClearCase programmal
IntegrateDelphi4=Borland\xAE Delphi &4 bin\xE1ris f\xE1jl t\xE1mogat\xE1s
UpdatingCommonControls=Updating the System's Common Controls
Modified: trunk/Installer/InnoSetup/Languages/Italian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Italian.isl 2006-09-19 19:30:39 UTC (rev 3585)
+++ trunk/Installer/InnoSetup/Languages/Italian.isl 2006-09-20 06:06:36 UTC (rev 3586)
@@ -365,7 +365,8 @@
;Tasks
ExplorerContextMenu=&Attiva l'integrazione con il menu contestuale di Explorer
IntegrateTortoiseCVS=Integrazione con &TortoiseCVS
-IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
+IntegrateTortoiseSVN=Integrazione con T&ortoiseSVN
+IntegrateClearCase=Integrazione con Rational &ClearCase
IntegrateDelphi4=Supporto per i file binari di Borland\xAE Delphi &4
UpdatingCommonControls=Aggiornamento dei controlli comuni del sistema in corso...
Modified: trunk/Installer/InnoSetup/Languages/Japanese.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Japanese.isl 2006-09-19 19:30:39 UTC (rev 3585)
+++ trunk/Installer/InnoSetup/Languages/Japanese.isl 2006-09-20 06:06:36 UTC (rev 3586)
@@ -356,6 +356,7 @@
ExplorerContextMenu=\x83G\x83N\x83X\x83v\x83\x8D\x81[\x83\x89\x82̃R\x83\x93\x83e\x83L\x83X\x83g\x83\x81\x83j\x83\x85\x81[\x82ɒlj\xC1(&E)
IntegrateTortoiseCVS=TortoiseCVS\x82Ƃ̘A\x8Cg(&T)
IntegrateTortoiseSVN=TortoiseSVN\x82Ƃ̘A\x8Cg(&O)
+IntegrateClearCase=Rational ClearCase\x82Ƃ̘A\x8Cg(&C)
IntegrateDelphi4=Borland Delphi 4 \x83o\x83C\x83i\x83\x8A\x83t\x83@\x83C\x83\x8B\x83T\x83|\x81[\x83g(&4)
UpdatingCommonControls=\x83V\x83X\x83e\x83\x80\x82̃R\x83\x82\x83\x93\x83R\x83\x93\x83g\x83\x8D\x81[\x83\x8B\x82\xF0\x83A\x83b\x83v\x83f\x81[\x83g\x82\xB5\x82܂\xB7
Modified: trunk/Installer/InnoSetup/Languages/Korean.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Korean.isl 2006-09-19 19:30:39 UTC (rev 3585)
+++ trunk/Installer/InnoSetup/Languages/Korean.isl 2006-09-20 06:06:36 UTC (rev 3586)
@@ -369,6 +369,7 @@
ExplorerContextMenu=&Enable Explorer context menu integration
IntegrateTortoiseCVS=Integrate with &TortoiseCVS
IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
+IntegrateClearCase=Integrate with Rational &ClearCase
IntegrateDelphi4=Borland Delphi &4 Binary File Support
UpdatingCommonControls=Updating the System's Common Controls
Modified: trunk/Installer/InnoSetup/Languages/Norwegian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Norwegian.isl 2006-09-19 19:30:39 UTC (rev 3585)
+++ trunk/Installer/InnoSetup/Languages/Norwegian.isl 2006-09-20 06:06:36 UTC (rev 3586)
@@ -358,7 +358,8 @@
;Tasks
ExplorerContextMenu=&Aktiver integrasjon i Windows utforsker sin kontekstmeny
IntegrateTortoiseCVS=Integrer med &TortoiseCVS
-IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
+IntegrateTortoiseSVN=Integrer med T&ortoiseSVN
+IntegrateClearCase=Integrer med Rational &ClearCase
IntegrateDelphi4=St\xF8tte for Borland\xAE Delphi &4 bin\xE6re file
UpdatingCommonControls=Oppdater systemets felles kontrollelement
Modified: trunk/Installer/InnoSetup/Languages/Polish.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Polish.isl 2006-09-19 19:30:39 UTC (rev 3585)
+++ trunk/Installer/InnoSetup/Languages/Polish.isl 2006-09-20 06:06:36 UTC (rev 3586)
@@ -352,7 +352,8 @@
;Tasks
ExplorerContextMenu=&Wlacz integracje z menu Eksploratora
IntegrateTortoiseCVS=Integracja z &TortoiseCVS
-IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
+IntegrateTortoiseSVN=Integracja z T&ortoiseSVN
+IntegrateClearCase=Integracja z Rational &ClearCase
IntegrateDelphi4=Obsluga plik\xF3w binarnych Borland\xAE Delphi &4
UpdatingCommonControls=Aktualizacja wsp\xF3lnych kontrolek systemowych SCC
Modified: trunk/Installer/InnoSetup/Languages/Russian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Russian.isl 2006-09-19 19:30:39 UTC (rev 3585)
+++ trunk/Installer/InnoSetup/Languages/Russian.isl 2006-09-20 06:06:36 UTC (rev 3586)
@@ -351,6 +351,7 @@
ExplorerContextMenu=&Enable Explorer context menu integration
IntegrateTortoiseCVS=Integrate with &TortoiseCVS
IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
+IntegrateClearCase=Integrate with Rational &ClearCase
IntegrateDelphi4=Borland\xAE Delphi &4 Binary File Support
UpdatingCommonControls=Updating the System's Common Controls
Modified: trunk/Installer/InnoSetup/Languages/Slovak.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Slovak.isl 2006-09-19 19:30:39 UTC (rev 3585)
+++ trunk/Installer/InnoSetup/Languages/Slovak.isl 2006-09-20 06:06:36 UTC (rev 3586)
@@ -291,6 +291,7 @@
ExplorerContextMenu=&Enable Explorer context menu integration
IntegrateTortoiseCVS=Integrate with &TortoiseCVS
IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
+IntegrateClearCase=Integrate with Rational &ClearCase
IntegrateDelphi4=Borland\xAE Delphi &4 Binary File Support
UpdatingCommonControls=Updating the System's Common Controls
Modified: trunk/Installer/InnoSetup/Languages/Spanish.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Spanish.isl 2006-09-19 19:30:39 UTC (rev 3585)
+++ trunk/Installer/InnoSetup/Languages/Spanish.isl 2006-09-20 06:06:36 UTC (rev 3586)
@@ -360,6 +360,7 @@
ExplorerContextMenu=&Enable Explorer context menu integration
IntegrateTortoiseCVS=Integrate with &TortoiseCVS
IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
+IntegrateClearCase=Integrate with Rational &ClearCase
IntegrateDelphi4=Borland\xAE Delphi &4 Binary File Support
UpdatingCommonControls=Updating the System's Common Controls
Modified: trunk/Installer/InnoSetup/Languages/Swedish.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Swedish.isl 2006-09-19 19:30:39 UTC (rev 3585)
+++ trunk/Installer/InnoSetup/Languages/Swedish.isl 2006-09-20 06:06:36 UTC (rev 3586)
@@ -354,6 +354,7 @@
ExplorerContextMenu=&M\xF6jligg\xF6r integration med Explorers menyer
IntegrateTortoiseCVS=Integrera med &TortoiseCVS
IntegrateTortoiseSVN=Integrera med T&ortoiseSVN
+IntegrateClearCase=Integrera med Rational &ClearCase
IntegrateDelphi4=St\xF6d Borland\xAE Delphi4 Bin\xE4ra filer
UpdatingCommonControls=Uppdatera Systemets Vanliga Kontroller
Modified: trunk/Installer/InnoSetup/Languages/Turkish.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Turkish.isl 2006-09-19 19:30:39 UTC (rev 3585)
+++ trunk/Installer/InnoSetup/Languages/Turkish.isl 2006-09-20 06:06:36 UTC (rev 3586)
@@ -362,6 +362,7 @@
ExplorerContextMenu=&Enable Explorer context menu integration
IntegrateTortoiseCVS=Integrate with &TortoiseCVS
IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
+IntegrateClearCase=Integrate with Rational &ClearCase
IntegrateDelphi4=Borland\xAE Delphi &4 Binary File Support
UpdatingCommonControls=Updating the System's Common Controls
Modified: trunk/Installer/InnoSetup/WinMerge.iss
===================================================================
--- trunk/Installer/InnoSetup/WinMerge.iss 2006-09-19 19:30:39 UTC (rev 3585)
+++ trunk/Installer/InnoSetup/WinMerge.iss 2006-09-20 06:06:36 UTC (rev 3586)
@@ -233,6 +233,7 @@
Name: ShellExtension; Description: {cm:ExplorerContextMenu}; GroupDescription: {cm:OptionalFeatures}
Name: TortoiseCVS; Description: {cm:IntegrateTortoiseCVS}; GroupDescription: {cm:OptionalFeatures}; Check: TortoiseCVSInstalled
Name: TortoiseSVN; Description: {cm:IntegrateTortoiseSVN}; GroupDescription: {cm:OptionalFeatures}; Check: TortoiseSVNInstalled; MinVersion: 0,5.0.2195sp3
+Name: ClearCase; Description: {cm:IntegrateClearCase}; GroupDescription: {cm:OptionalFeatures}; Check: ClearCaseInstalled
Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked
Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}
@@ -927,3 +928,61 @@
Else
result := False;
End;
+
+{Returns ClearCase external tools configuration file name}
+Function ClearCaseMapFile(): string;
+Begin
+ if not RegQueryStringValue(HKEY_LOCAL_MACHINE, 'SOFTWARE\Rational Software\', 'RSINSTALLDIR', Result) then
+ begin
+ Result := 'C:\Program Files\Rational\';
+ end;
+ Result := Result + 'ClearCase\lib\mgrs\map';
+End;
+
+{Determines whether or not Rational ClearCase is installed}
+Function ClearCaseInstalled(): boolean;
+Begin
+ Result := FileExists(ClearCaseMapFile());
+End;
+
+{Intergrate WinMerge as ClearCase external diff tool}
+Procedure IntegrateClearCase();
+Var
+ MapFile: TStringList;
+ Unused: String;
+ I: Integer;
+
+Begin
+ MapFile := TStringList.Create();
+ {Read the entire map file to a string list}
+ MapFile.LoadFromFile(ClearCaseMapFile());
+ if MapFile.Count > 0 then
+ begin
+ for I := 0 to MapFile.Count do
+ begin
+ {Search for the 'text_file_delta xcompare ...' line}
+ if (MapFile.Strings[I][1] <> ';') and (Pos('text_file_delta', MapFile.Strings[I]) > 0) and (Pos('xcompare', MapFile.Strings[I]) > 0) then
+ begin
+ {Comment-out the current line}
+ MapFile.Strings[I] := ';' + MapFile.Strings[I];
+ {Insert a line below with WinMerge as the diff tool}
+ MapFile.Insert(I + 1, 'text_file_delta xcompare '+ ExpandConstant('{app}\') + ExeName(Unused));
+ break;
+ end;
+ end;
+ { Save the modified file. }
+ MapFile.SaveToFile('C:\Program Files\Rational\ClearCase\lib\mgrs\map');
+ end;
+End;
+
+procedure CurStepChanged(CurStep: TSetupStep);
+Begin
+ if CurStep = ssPostInstall then
+ begin
+ if IsTaskSelected('ClearCase') then
+ begin
+ IntegrateClearCase();
+ end;
+ end;
+End;
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-21 16:32:42
|
Revision: 3594
http://svn.sourceforge.net/winmerge/?rev=3594&view=rev
Author: kimmov
Date: 2006-09-21 09:32:34 -0700 (Thu, 21 Sep 2006)
Log Message:
-----------
PATCH: [ 1561668 ] Install translated readme texts
Modified Paths:
--------------
trunk/Installer/InnoSetup/Changes.txt
trunk/Installer/InnoSetup/WinMerge.iss
Modified: trunk/Installer/InnoSetup/Changes.txt
===================================================================
--- trunk/Installer/InnoSetup/Changes.txt 2006-09-20 20:12:10 UTC (rev 3593)
+++ trunk/Installer/InnoSetup/Changes.txt 2006-09-21 16:32:34 UTC (rev 3594)
@@ -1,3 +1,7 @@
+2006-09-21 Kimmo
+ PATCH: [ 1561668 ] Install translated readme texts
+ InnoSetup: WinMerge.iss
+
2006-09-20 Gal
PATCH: [ 1552248 ] Install as a ClearCase diff tool
InnoSetup: WinMerge.iss
Modified: trunk/Installer/InnoSetup/WinMerge.iss
===================================================================
--- trunk/Installer/InnoSetup/WinMerge.iss 2006-09-20 20:12:10 UTC (rev 3593)
+++ trunk/Installer/InnoSetup/WinMerge.iss 2006-09-21 16:32:34 UTC (rev 3594)
@@ -340,7 +340,9 @@
Source: ..\..\Build\ShellExtensionX64\ShellExtensionX64.dll; DestDir: {app}; Flags: regserver uninsrestartdelete restartreplace promptifolder 64bit; MinVersion: 0,5.01.2600; Check: IsWin64
Source: ..\..\Build\Languages\MergeBulgarian.lang; DestDir: {app}\Languages; Components: Languages\Bulgarian; Flags: ignoreversion comparetimestamp
+Source: ..\..\Docs\Users\Languages\ReadMe-Bulgarian.txt; DestDir: {app}\Docs; Components: Languages\Bulgarian
Source: ..\..\Build\Languages\MergeCatalan.lang; DestDir: {app}\Languages; Components: Languages\Catalan; Flags: ignoreversion comparetimestamp
+Source: ..\..\Docs\Users\Languages\ReadMe-Catalan.txt; DestDir: {app}\Docs; Components: Languages\Catalan
Source: ..\..\Build\Languages\MergeChineseSimplified.lang; DestDir: {app}\Languages; Components: Languages\Chinese_Simplified; Flags: ignoreversion comparetimestamp
Source: ..\..\Build\Languages\MergeChineseTraditional.lang; DestDir: {app}\Languages; Components: Languages\Chinese_Traditional; Flags: ignoreversion comparetimestamp
Source: ..\..\Build\Languages\MergeCzech.lang; DestDir: {app}\Languages; Components: Languages\Czech; Flags: ignoreversion comparetimestamp
@@ -358,7 +360,9 @@
Source: ..\..\Build\Languages\MergeRussian.lang; DestDir: {app}\Languages; Components: Languages\Russian; Flags: ignoreversion comparetimestamp
Source: ..\..\Build\Languages\MergeSlovak.lang; DestDir: {app}\Languages; Components: Languages\Slovak; Flags: ignoreversion comparetimestamp
Source: ..\..\Build\Languages\MergeSpanish.lang; DestDir: {app}\Languages; Components: Languages\Spanish; Flags: ignoreversion comparetimestamp
+Source: ..\..\Docs\Users\Languages\ReadMe-Spanish.txt; DestDir: {app}\Docs; Components: Languages\Spanish
Source: ..\..\Build\Languages\MergeSwedish.lang; DestDir: {app}\Languages; Components: Languages\Swedish; Flags: ignoreversion comparetimestamp
+Source: ..\..\Docs\Users\Languages\ReadMe-Swedish.txt; DestDir: {app}\Docs; Components: Languages\Swedish
Source: ..\..\Build\Languages\MergeTurkish.lang; DestDir: {app}\Languages; Components: Languages\Turkish; Flags: ignoreversion comparetimestamp
Source: ..\..\Filters\*.flt; DestDir: {app}\Filters; Flags: sortfilesbyextension comparetimestamp ignoreversion; Components: filters
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-26 16:09:43
|
Revision: 3645
http://svn.sourceforge.net/winmerge/?rev=3645&view=rev
Author: kimmov
Date: 2006-09-26 09:09:32 -0700 (Tue, 26 Sep 2006)
Log Message:
-----------
PATCH: [ 1563171 ] Catalan translation update
- submitted by Jordi Vilar
Modified Paths:
--------------
trunk/Installer/InnoSetup/Changes.txt
trunk/Installer/InnoSetup/Languages/Catalan.isl
Modified: trunk/Installer/InnoSetup/Changes.txt
===================================================================
--- trunk/Installer/InnoSetup/Changes.txt 2006-09-26 16:05:05 UTC (rev 3644)
+++ trunk/Installer/InnoSetup/Changes.txt 2006-09-26 16:09:32 UTC (rev 3645)
@@ -1,3 +1,8 @@
+2006-09-26 Kimmo
+ PATCH: [ 1563171 ] Catalan translation update
+ Submitted by Jordi Vilar
+ InnoSetup/Languages: Catalan.isl
+
2006-09-21 Kimmo
PATCH: [ 1561668 ] Install translated readme texts
InnoSetup: WinMerge.iss
Modified: trunk/Installer/InnoSetup/Languages/Catalan.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Catalan.isl 2006-09-26 16:05:05 UTC (rev 3644)
+++ trunk/Installer/InnoSetup/Languages/Catalan.isl 2006-09-26 16:09:32 UTC (rev 3645)
@@ -346,8 +346,8 @@
;Tasks
ExplorerContextMenu=&Habilita la integraci\xF3 del men\xFA de contexte a l'Explorador
IntegrateTortoiseCVS=Integra amb el &TortoiseCVS
-IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
-IntegrateClearCase=Integrate with Rational &ClearCase
+IntegrateTortoiseSVN=Integra amb el T&ortoiseSVN
+IntegrateClearCase=Integra amb el Rational &ClearCase
IntegrateDelphi4=Suport per a fitxers binaris del Borland\xAE Delphi &4
UpdatingCommonControls=Actualitzant els Controls Comuns del Sistema
@@ -356,7 +356,7 @@
UsersGuide=Guia de l'usuari
UpdatingCommonControls=Actualitzant els Controls Comuns del Sistema
ViewStartMenuFolder=&Veure la carpera del men\xFA Inicia del WinMerge
-PluginsText=Plugins
+PluginsText=Connectors
;Code Dialogs
DeletePreviousStartMenu=L'instal\xB7lador ha detectat que heu canviat la ubicaci\xF3 del vostre men\xFA d'inici de "%s" a "%s". Voleu esborrar la carpeta del men\xFA d'inici anterior?
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-11-01 18:42:59
|
Revision: 3756
http://svn.sourceforge.net/winmerge/?rev=3756&view=rev
Author: kimmov
Date: 2006-11-01 10:42:51 -0800 (Wed, 01 Nov 2006)
Log Message:
-----------
PATCH: [ 1588234 ] Remove manifest files from the installer
Modified Paths:
--------------
trunk/Installer/InnoSetup/Changes.txt
trunk/Installer/InnoSetup/WinMerge.iss
Modified: trunk/Installer/InnoSetup/Changes.txt
===================================================================
--- trunk/Installer/InnoSetup/Changes.txt 2006-11-01 18:32:37 UTC (rev 3755)
+++ trunk/Installer/InnoSetup/Changes.txt 2006-11-01 18:42:51 UTC (rev 3756)
@@ -1,3 +1,7 @@
+2006-11-01 Kimmo
+ PATCH: [ 1588234 ] Remove manifest files from the installer
+ InnoSetup: WinMerge.iss
+
2006-09-26 Kimmo
PATCH: [ 1563171 ] Catalan translation update
Submitted by Jordi Vilar
Modified: trunk/Installer/InnoSetup/WinMerge.iss
===================================================================
--- trunk/Installer/InnoSetup/WinMerge.iss 2006-11-01 18:32:37 UTC (rev 3755)
+++ trunk/Installer/InnoSetup/WinMerge.iss 2006-11-01 18:42:51 UTC (rev 3756)
@@ -248,9 +248,9 @@
Name: {app}\WinMerge.exe; Type: files; MinVersion: 4, 0
Name: {app}\WinMergeU.exe; Type: files; MinVersion: 0, 4
-;The other manifest file is legitimate, but is only valid on windows XP or higher, so if the operating system isn't at least windows XP the
-;Manifest file is indeed removed.
-Name: {app}\WinMergeU.exe.manifest; Type: files; OnlyBelowVersion: 0, 5.01
+;Remove manifest files as we don't need them in 2.6.2 / 2.7.1.1 or later
+Name: {app}\WinMerge.exe.manifest; Type: files
+Name: {app}\WinMergeU.exe.manifest; Type: files
;This won't work, because the file has to be unregistered, and explorer closed, first.
;Name: {app}\ShellExtension.dll; Type: files; Check: TaskDisabled('ShellExtension')
@@ -315,10 +315,6 @@
Source: ..\..\Build\MergeUnicodeRelease\WinMergeU.exe; DestDir: {app}; Flags: promptifolder; MinVersion: 0, 4; Components: Core
Source: ..\..\Build\MergeRelease\WinMerge.exe; DestDir: {app}; Flags: promptifolder; Components: Core; Check: not IsWin64
-;The MinVersion forces Inno Setup to only copy the following file if the user is running a WinNT platform system
-Source: WinMergeU.exe.manifest; DestDir: {app}; Flags: promptifolder; MinVersion: 0, 5.01; Components: Core
-Source: WinMerge.exe.manifest; DestDir: {app}; Flags: promptifolder; Components: Core; MinVersion: 0,5.01; Check: not IsWin64
-
; Icon for projectfiles
Source: MergeProject.ico; DestDir: {app}; Flags: promptifolder; Components: Core
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-11-03 19:54:18
|
Revision: 3769
http://svn.sourceforge.net/winmerge/?rev=3769&view=rev
Author: kimmov
Date: 2006-11-03 11:54:11 -0800 (Fri, 03 Nov 2006)
Log Message:
-----------
PATCH: [ 1589585 ] Install expat dlls
Modified Paths:
--------------
trunk/Installer/InnoSetup/Changes.txt
trunk/Installer/InnoSetup/WinMerge.iss
Modified: trunk/Installer/InnoSetup/Changes.txt
===================================================================
--- trunk/Installer/InnoSetup/Changes.txt 2006-11-03 19:52:27 UTC (rev 3768)
+++ trunk/Installer/InnoSetup/Changes.txt 2006-11-03 19:54:11 UTC (rev 3769)
@@ -1,3 +1,7 @@
+2006-11-03 Kimmo
+ PATCH: [ 1589585 ] Install expat dlls
+ InnoSetup: WinMerge.iss
+
2006-11-01 Kimmo
PATCH: [ 1588234 ] Remove manifest files from the installer
InnoSetup: WinMerge.iss
Modified: trunk/Installer/InnoSetup/WinMerge.iss
===================================================================
--- trunk/Installer/InnoSetup/WinMerge.iss 2006-11-03 19:52:27 UTC (rev 3768)
+++ trunk/Installer/InnoSetup/WinMerge.iss 2006-11-03 19:54:11 UTC (rev 3769)
@@ -335,6 +335,10 @@
; 64-bit version of ShellExtension
Source: ..\..\Build\ShellExtensionX64\ShellExtensionX64.dll; DestDir: {app}; Flags: regserver uninsrestartdelete restartreplace promptifolder 64bit; MinVersion: 0,5.01.2600; Check: IsWin64
+; Expat dlls
+Source: ..\..\Build\expat\libexpat.dll; DestDir: {app}; Flags: promptifolder; Components: Core; Check: not IsWin64
+Source: ..\..\Build\expat\libexpatw.dll; DestDir: {app}; Flags: promptifolder; Components: Core; MinVersion: 0, 4
+
Source: ..\..\Build\Languages\MergeBulgarian.lang; DestDir: {app}\Languages; Components: Languages\Bulgarian; Flags: ignoreversion comparetimestamp
Source: ..\..\Docs\Users\Languages\ReadMe-Bulgarian.txt; DestDir: {app}\Docs; Components: Languages\Bulgarian
Source: ..\..\Build\Languages\MergeCatalan.lang; DestDir: {app}\Languages; Components: Languages\Catalan; Flags: ignoreversion comparetimestamp
@@ -982,7 +986,6 @@
if IsTaskSelected('ClearCase') then
begin
IntegrateClearCase();
- end;
+ end;
end;
End;
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-11-08 21:53:55
|
Revision: 3788
http://svn.sourceforge.net/winmerge/?rev=3788&view=rev
Author: gerundt
Date: 2006-11-08 13:53:38 -0800 (Wed, 08 Nov 2006)
Log Message:
-----------
PATCH: [ 1592609 ] Remove outdated files from installer
Modified Paths:
--------------
trunk/Installer/InnoSetup/Changes.txt
Removed Paths:
-------------
trunk/Installer/InnoSetup/Art/Gold Watch.ico
trunk/Installer/InnoSetup/Runtimes/psapi.dll
trunk/Installer/InnoSetup/Setup Helper.au3
trunk/Installer/InnoSetup/Setup Helper.exe
Deleted: trunk/Installer/InnoSetup/Art/Gold Watch.ico
===================================================================
(Binary files differ)
Modified: trunk/Installer/InnoSetup/Changes.txt
===================================================================
--- trunk/Installer/InnoSetup/Changes.txt 2006-11-07 22:27:33 UTC (rev 3787)
+++ trunk/Installer/InnoSetup/Changes.txt 2006-11-08 21:53:38 UTC (rev 3788)
@@ -1,3 +1,9 @@
+2006-11-08 Tim
+ PATCH: [ 1592609 ] Remove outdated files from installer
+ InnoSetup deleted files: Setup Helper.au3, Setup Helper.exe
+ InnoSetup/Art deleted files: Gold Watch.ico
+ InnoSetup/Runtimes deleted files: psapi.dll
+
2006-11-03 Kimmo
PATCH: [ 1589585 ] Install expat dlls
InnoSetup: WinMerge.iss
Deleted: trunk/Installer/InnoSetup/Runtimes/psapi.dll
===================================================================
(Binary files differ)
Deleted: trunk/Installer/InnoSetup/Setup Helper.au3
===================================================================
--- trunk/Installer/InnoSetup/Setup Helper.au3 2006-11-07 22:27:33 UTC (rev 3787)
+++ trunk/Installer/InnoSetup/Setup Helper.au3 2006-11-08 21:53:38 UTC (rev 3788)
@@ -1,86 +0,0 @@
-AutoItSetOption("MustDeclareVars", 1)
-
-Dim $strAction
-Dim $strCommand
-
-;If a user is running this .exe file then...
-If $CMDLine[0] = 0 Then
- ;Let the user know they shouldn't run this:
- msgbox(4144, "Setup - WinMerge", "Users: " & @CR & "This application is part of WinMerge's installation and removal processes. It is not meant to be run externally by users." & @CRLF & @CRLF & "Developers:" & @CRLF & @TAB & "/i - Restarts Explorer to initialize the ShellExtension.dll as Explorer's starts" & @CRLF & @TAB & "/u - Closes Explorer, deletes ShellExtension.dll, and then restarts explorer")
-
- ;Terminates the program
- exit
-Else
- ;Determines what the user's first command-line input parameter was
- $strCommand = StringUpper($CMDLine[1])
-
- msgbox(4144, "Setup Helper", "[$strCommand]=[" & $strCommand & "]")
-
-
- ;Analyzes the command-line input parameter
- Select
- ;If we received /i then...
- Case $strCommand = "/I"
- ;If the ShellExtension.dll file exists on the user's system then...
- If FileExists(@ScriptDir + "\ShellExtension.dll") = 1 Then
- ;The installer is trying to upgrade ShellExtension.dll
- $strAction="update"
- Else
- ;The installer is trying to install ShellExtension.dll
- $strAction="install"
- EndIf
-
- ;If we received /u then...
- Case $strCommand = "/U"
- ;The uninstaller is trying to uninstall ShellExtension.dll
- $strAction="uninstall"
-
- ;If the user specified an invalid bit of syntax then...
- Case Else
- ;Let the user know they shouldn't run this:
- msgbox(4144, "Setup - WinMerge", "Users: " & @CR & "This application is part of WinMerge's installation and removal processes. It is not meant to be run externally by users." & @CRLF & @CRLF & "Developers:" & @CRLF & @TAB & "/i - Restarts Explorer to initialize the ShellExtension.dll as Explorer's starts" & @CRLF & @TAB & "/u - Closes Explorer, deletes ShellExtension.dll, and then restarts explorer")
-
- ;Terminates the program
- exit
- EndSelect
-EndIf
-
-
-
-msgbox(4144, "Setup - WinMerge", "In order to " & $strAction & " the WinMerge Explorer context menu support all instances of Explorer must be restarted. This is a non-destructive process, although some of your current folder viewing windows may be discarded. Please finish any and all work in your Explorer windows before clicking [OK].")
-
-;Kill Explorer until there's no longer any copies running
-Do
- ProcessClose("Explorer.exe")
-Until ProcessExists("Explorer.exe") = 0
-
-
-
-;If the user properly specified the /u switch then...
-If $strCommand = "/U" Then
-
- ;Deletes the shell extension file
- FileDelete(@ScriptDir & "\ShellExtension.dll")
-
- ;If the user's WinMerge directory is empty then...
- If FileExists(@ScriptDir & "\*.*") = 0 Then
-
- ;Deletes the WinMerge directory
- DirRemove(@ScriptDir, 1)
- Endif
-EndIf
-
-
-Run(@WindowsDir & "\Explorer.exe", "", @SW_HIDE)
-WinWait("My Documents")
-WinClose("My Documents")
-
-;If the user properly specified the /u switch then...
-If $strCommand = "/U" Then
-
- ;If the file exists then the Exit Code will be 1 signifying an error
- Exit(FileExists(@ScriptDir & "\ShellExtension.dll"))
-EndIf
-
-
-
Deleted: trunk/Installer/InnoSetup/Setup Helper.exe
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-11-09 15:19:38
|
Revision: 3794
http://svn.sourceforge.net/winmerge/?rev=3794&view=rev
Author: kimmov
Date: 2006-11-09 07:19:20 -0800 (Thu, 09 Nov 2006)
Log Message:
-----------
PATCH: [ 1591689 ] WinMerge (ANSI) shortcut installed to 64-bit Windows
Modified Paths:
--------------
trunk/Installer/InnoSetup/Changes.txt
trunk/Installer/InnoSetup/WinMerge.iss
Modified: trunk/Installer/InnoSetup/Changes.txt
===================================================================
--- trunk/Installer/InnoSetup/Changes.txt 2006-11-08 22:05:18 UTC (rev 3793)
+++ trunk/Installer/InnoSetup/Changes.txt 2006-11-09 15:19:20 UTC (rev 3794)
@@ -1,3 +1,7 @@
+2006-11-09 Kimmo
+ PATCH: [ 1591689 ] WinMerge (ANSI) shortcut installed to 64-bit Windows
+ InnoSetup: WinMerge.iss
+
2006-11-08 Tim
PATCH: [ 1592609 ] Remove outdated files from installer
InnoSetup deleted files: Setup Helper.au3, Setup Helper.exe
Modified: trunk/Installer/InnoSetup/WinMerge.iss
===================================================================
--- trunk/Installer/InnoSetup/WinMerge.iss 2006-11-08 22:05:18 UTC (rev 3793)
+++ trunk/Installer/InnoSetup/WinMerge.iss 2006-11-09 15:19:20 UTC (rev 3794)
@@ -388,7 +388,7 @@
;Start Menu Icons
Name: {group}\WinMerge; Filename: {app}\{code:ExeName}
;WinMerge (ANSI) for WinMerge.exe in NT-windows
-Name: {group}\WinMerge (ANSI); Filename: {app}\WinMerge.exe; IconIndex: 0; MinVersion: 0,4; Components: core
+Name: {group}\WinMerge (ANSI); Filename: {app}\WinMerge.exe; IconIndex: 0; MinVersion: 0,4; Components: core; Check: not IsWin64
Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe.txt; IconFileName: {win}\NOTEPAD.EXE
Name: {group}\{cm:PluginsText}; Filename: {app}\Docs\Plugins.txt; IconFileName: {win}\NOTEPAD.EXE Check: InstallPluginsText; Components: Plugins
Name: {group}\{cm:UsersGuide}; Filename: {app}\Docs\WinMerge.chm; Components: docs
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-11-10 14:24:50
|
Revision: 3802
http://svn.sourceforge.net/winmerge/?rev=3802&view=rev
Author: kimmov
Date: 2006-11-10 06:24:40 -0800 (Fri, 10 Nov 2006)
Log Message:
-----------
PATCH: [ 1593753 ] Add PCRE dll to installer
Modified Paths:
--------------
trunk/Installer/InnoSetup/Changes.txt
trunk/Installer/InnoSetup/WinMerge.iss
Modified: trunk/Installer/InnoSetup/Changes.txt
===================================================================
--- trunk/Installer/InnoSetup/Changes.txt 2006-11-09 20:18:15 UTC (rev 3801)
+++ trunk/Installer/InnoSetup/Changes.txt 2006-11-10 14:24:40 UTC (rev 3802)
@@ -1,3 +1,7 @@
+2006-11-10 Kimmo
+ PATCH: [ 1593753 ] Add PCRE dll to installer
+ InnoSetup: WinMerge.iss
+
2006-11-09 Kimmo
PATCH: [ 1591689 ] WinMerge (ANSI) shortcut installed to 64-bit Windows
InnoSetup: WinMerge.iss
Modified: trunk/Installer/InnoSetup/WinMerge.iss
===================================================================
--- trunk/Installer/InnoSetup/WinMerge.iss 2006-11-09 20:18:15 UTC (rev 3801)
+++ trunk/Installer/InnoSetup/WinMerge.iss 2006-11-10 14:24:40 UTC (rev 3802)
@@ -339,6 +339,9 @@
Source: ..\..\Build\expat\libexpat.dll; DestDir: {app}; Flags: promptifolder; Components: Core; Check: not IsWin64
Source: ..\..\Build\expat\libexpatw.dll; DestDir: {app}; Flags: promptifolder; Components: Core; MinVersion: 0, 4
+; PCRE dll
+Source: ..\..\Build\pcre\pcre.dll; DestDir: {app}; Flags: promptifolder; Components: Core
+
Source: ..\..\Build\Languages\MergeBulgarian.lang; DestDir: {app}\Languages; Components: Languages\Bulgarian; Flags: ignoreversion comparetimestamp
Source: ..\..\Docs\Users\Languages\ReadMe-Bulgarian.txt; DestDir: {app}\Docs; Components: Languages\Bulgarian
Source: ..\..\Build\Languages\MergeCatalan.lang; DestDir: {app}\Languages; Components: Languages\Catalan; Flags: ignoreversion comparetimestamp
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-11-21 19:46:21
|
Revision: 3824
http://svn.sourceforge.net/winmerge/?rev=3824&view=rev
Author: kimmov
Date: 2006-11-21 11:46:17 -0800 (Tue, 21 Nov 2006)
Log Message:
-----------
PATCH: [ 1591266 ] Remove unused reg files from installer folder
Modified Paths:
--------------
trunk/Installer/InnoSetup/Changes.txt
Removed Paths:
-------------
trunk/Installer/InnoSetup/TortoiseSVN.reg
trunk/Installer/InnoSetup/Visual SourceSafe Support.reg
Modified: trunk/Installer/InnoSetup/Changes.txt
===================================================================
--- trunk/Installer/InnoSetup/Changes.txt 2006-11-21 15:29:49 UTC (rev 3823)
+++ trunk/Installer/InnoSetup/Changes.txt 2006-11-21 19:46:17 UTC (rev 3824)
@@ -1,3 +1,7 @@
+2006-11-21 Kimmo
+ PATCH: [ 1591266 ] Remove unused reg files from installer folder
+ InnoSetup removed files: TortoiseSVN.reg Visual SourceSafe Support.reg
+
2006-11-10 Kimmo
PATCH: [ 1593753 ] Add PCRE dll to installer
InnoSetup: WinMerge.iss
Deleted: trunk/Installer/InnoSetup/TortoiseSVN.reg
===================================================================
--- trunk/Installer/InnoSetup/TortoiseSVN.reg 2006-11-21 15:29:49 UTC (rev 3823)
+++ trunk/Installer/InnoSetup/TortoiseSVN.reg 2006-11-21 19:46:17 UTC (rev 3824)
@@ -1,13 +0,0 @@
-\xFF\xFEW |
|
From: <sdo...@us...> - 2006-11-28 21:21:43
|
Revision: 3868
http://svn.sourceforge.net/winmerge/?rev=3868&view=rev
Author: sdottaka
Date: 2006-11-28 13:21:32 -0800 (Tue, 28 Nov 2006)
Log Message:
-----------
BUG: [ 1603032 ] Doubled item in language selection
Modified Paths:
--------------
trunk/Installer/InnoSetup/Changes.txt
trunk/Installer/InnoSetup/WinMerge.iss
Modified: trunk/Installer/InnoSetup/Changes.txt
===================================================================
--- trunk/Installer/InnoSetup/Changes.txt 2006-11-28 19:31:11 UTC (rev 3867)
+++ trunk/Installer/InnoSetup/Changes.txt 2006-11-28 21:21:32 UTC (rev 3868)
@@ -1,6 +1,6 @@
-2006-11-21 Kimmo
- PATCH: [ 1591266 ] Remove unused reg files from installer folder
- InnoSetup removed files: TortoiseSVN.reg Visual SourceSafe Support.reg
+2006-11-28 Takashi
+ BUG: [ 1603032 ] Doubled item in language selection
+ InnoSetup: WinMerge.iss
2006-11-10 Kimmo
PATCH: [ 1593753 ] Add PCRE dll to installer
Modified: trunk/Installer/InnoSetup/WinMerge.iss
===================================================================
--- trunk/Installer/InnoSetup/WinMerge.iss 2006-11-28 19:31:11 UTC (rev 3867)
+++ trunk/Installer/InnoSetup/WinMerge.iss 2006-11-28 21:21:32 UTC (rev 3868)
@@ -166,67 +166,67 @@
;Language components
Name: Languages; Description: {cm:Languages}; Flags: disablenouninstallwarning
-Name: Languages\Bulgarian; Description: {cm:BulgarianLanguage}; Flags: disablenouninstallwarning; Types: full
+Name: Languages\Bulgarian; Description: {cm:BulgarianLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Bulgarian
Name: Languages\Bulgarian; Description: {cm:BulgarianLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Bulgarian
-Name: Languages\Catalan; Description: {cm:CatalanLanguage}; Flags: disablenouninstallwarning; Types: full
+Name: Languages\Catalan; Description: {cm:CatalanLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Catalan
Name: Languages\Catalan; Description: {cm:CatalanLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Catalan
-Name: Languages\Chinese_Simplified; Description: {cm:ChineseSimplifiedLanguage}; Flags: disablenouninstallwarning; Types: full
+Name: Languages\Chinese_Simplified; Description: {cm:ChineseSimplifiedLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Chinese_Simplified
Name: Languages\Chinese_Simplified; Description: {cm:ChineseSimplifiedLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Chinese_Simplified
-Name: Languages\Chinese_Traditional; Description: {cm:ChineseTraditionalLanguage}; Flags: disablenouninstallwarning; Types: full
+Name: Languages\Chinese_Traditional; Description: {cm:ChineseTraditionalLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Chinese_Traditional
Name: Languages\Chinese_Traditional; Description: {cm:ChineseTraditionalLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Chinese_Traditional
-Name: Languages\Czech; Description: {cm:CzechLanguage}; Flags: disablenouninstallwarning; Types: full
+Name: Languages\Czech; Description: {cm:CzechLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Czech
Name: Languages\Czech; Description: {cm:CzechLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Czech
-Name: Languages\Danish; Description: {cm:DanishLanguage}; Flags: disablenouninstallwarning; Types: full
+Name: Languages\Danish; Description: {cm:DanishLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Danish
Name: Languages\Danish; Description: {cm:DanishLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Danish
-Name: Languages\Dutch; Description: {cm:DutchLanguage}; Flags: disablenouninstallwarning; Types: full
+Name: Languages\Dutch; Description: {cm:DutchLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Dutch
Name: Languages\Dutch; Description: {cm:DutchLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Dutch
-Name: Languages\French; Description: {cm:FrenchLanguage}; Flags: disablenouninstallwarning; Types: full
+Name: Languages\French; Description: {cm:FrenchLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not French
Name: Languages\French; Description: {cm:FrenchLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: French
-Name: Languages\German; Description: {cm:GermanLanguage}; Flags: disablenouninstallwarning; Types: full
+Name: Languages\German; Description: {cm:GermanLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not German
Name: Languages\German; Description: {cm:GermanLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: German
-Name: Languages\Hungarian; Description: {cm:HungarianLanguage}; Flags: disablenouninstallwarning; Types: full
+Name: Languages\Hungarian; Description: {cm:HungarianLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Hungarian
Name: Languages\Hungarian; Description: {cm:HungarianLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Hungarian
-Name: Languages\Italian; Description: {cm:ItalianLanguage}; Flags: disablenouninstallwarning; Types: full
+Name: Languages\Italian; Description: {cm:ItalianLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Italian
Name: Languages\Italian; Description: {cm:ItalianLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Italian
-Name: Languages\Japanese; Description: {cm:JapaneseLanguage}; Flags: disablenouninstallwarning; Types: full
+Name: Languages\Japanese; Description: {cm:JapaneseLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Japanese
Name: Languages\Japanese; Description: {cm:JapaneseLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Japanese
-Name: Languages\Korean; Description: {cm:KoreanLanguage}; Flags: disablenouninstallwarning; Types: full
+Name: Languages\Korean; Description: {cm:KoreanLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Korean
Name: Languages\Korean; Description: {cm:KoreanLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Korean
-Name: Languages\Norwegian; Description: {cm:NorwegianLanguage}; Flags: disablenouninstallwarning; Types: full
+Name: Languages\Norwegian; Description: {cm:NorwegianLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Norwegian
Name: Languages\Norwegian; Description: {cm:NorwegianLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Norwegian
-Name: Languages\Polish; Description: {cm:PolishLanguage}; Flags: disablenouninstallwarning; Types: full
+Name: Languages\Polish; Description: {cm:PolishLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Polish
Name: Languages\Polish; Description: {cm:PolishLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Polish
-Name: Languages\Portuguese; Description: {cm:PortugueseLanguage}; Flags: disablenouninstallwarning; Types: full
+Name: Languages\Portuguese; Description: {cm:PortugueseLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Portuguese
Name: Languages\Portuguese; Description: {cm:PortugueseLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Portuguese
-Name: Languages\Russian; Description: {cm:RussianLanguage}; Flags: disablenouninstallwarning; Types: full
+Name: Languages\Russian; Description: {cm:RussianLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Russian
Name: Languages\Russian; Description: {cm:RussianLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Russian
-Name: Languages\Slovak; Description: {cm:SlovakLanguage}; Flags: disablenouninstallwarning; Types: full
+Name: Languages\Slovak; Description: {cm:SlovakLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Slovak
Name: Languages\Slovak; Description: {cm:SlovakLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Slovak
-Name: Languages\Spanish; Description: {cm:SpanishLanguage}; Flags: disablenouninstallwarning; Types: full
+Name: Languages\Spanish; Description: {cm:SpanishLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Spanish
Name: Languages\Spanish; Description: {cm:SpanishLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Spanish
-Name: Languages\Swedish; Description: {cm:SwedishLanguage}; Flags: disablenouninstallwarning; Types: full
+Name: Languages\Swedish; Description: {cm:SwedishLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Swedish
Name: Languages\Swedish; Description: {cm:SwedishLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Swedish
-Name: Languages\Turkish; Description: {cm:TurkishLanguage}; Flags: disablenouninstallwarning; Types: full
+Name: Languages\Turkish; Description: {cm:TurkishLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Turkish
Name: Languages\Turkish; Description: {cm:TurkishLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Turkish
[Tasks]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ga...@us...> - 2006-12-05 06:27:12
|
Revision: 3910
http://svn.sourceforge.net/winmerge/?rev=3910&view=rev
Author: galh
Date: 2006-12-04 22:27:11 -0800 (Mon, 04 Dec 2006)
Log Message:
-----------
BUG: [ 1608510 ] ClearCase Support
Modified Paths:
--------------
trunk/Installer/InnoSetup/Changes.txt
trunk/Installer/InnoSetup/WinMerge.iss
Modified: trunk/Installer/InnoSetup/Changes.txt
===================================================================
--- trunk/Installer/InnoSetup/Changes.txt 2006-12-05 06:20:23 UTC (rev 3909)
+++ trunk/Installer/InnoSetup/Changes.txt 2006-12-05 06:27:11 UTC (rev 3910)
@@ -1,3 +1,8 @@
+
+2006-11-28 Gal
+ BUG: [ 1608510 ] ClearCase Support
+ InnoSetup: WinMerge.iss
+
2006-12-03 Kimmo
PATCH: [ 1606496 ] Slovak translation (update)
Submitted by Ivan Mas\xE1r
Modified: trunk/Installer/InnoSetup/WinMerge.iss
===================================================================
--- trunk/Installer/InnoSetup/WinMerge.iss 2006-12-05 06:20:23 UTC (rev 3909)
+++ trunk/Installer/InnoSetup/WinMerge.iss 2006-12-05 06:27:11 UTC (rev 3910)
@@ -941,7 +941,7 @@
Begin
if not RegQueryStringValue(HKEY_LOCAL_MACHINE, 'SOFTWARE\Rational Software\', 'RSINSTALLDIR', Result) then
begin
- Result := 'C:\Program Files\Rational\';
+ Result := {pf} + '\Rational\';
end;
Result := Result + 'ClearCase\lib\mgrs\map';
End;
@@ -956,13 +956,15 @@
Procedure IntegrateClearCase();
Var
MapFile: TStringList;
+ FileName: String;
Unused: String;
I: Integer;
Begin
+ FileName := ClearCaseMapFile();
MapFile := TStringList.Create();
{Read the entire map file to a string list}
- MapFile.LoadFromFile(ClearCaseMapFile());
+ MapFile.LoadFromFile(FileName);
if MapFile.Count > 0 then
begin
for I := 0 to MapFile.Count do
@@ -978,7 +980,7 @@
end;
end;
{ Save the modified file. }
- MapFile.SaveToFile('C:\Program Files\Rational\ClearCase\lib\mgrs\map');
+ MapFile.SaveToFile(FileName);
end;
End;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-12-13 08:42:38
|
Revision: 3961
http://svn.sourceforge.net/winmerge/?rev=3961&view=rev
Author: kimmov
Date: 2006-12-13 00:42:37 -0800 (Wed, 13 Dec 2006)
Log Message:
-----------
PATCH: [ 1614056 ] Add new SourceControl filter to installer
Modified Paths:
--------------
trunk/Installer/InnoSetup/Changes.txt
trunk/Installer/InnoSetup/WinMerge.iss
Modified: trunk/Installer/InnoSetup/Changes.txt
===================================================================
--- trunk/Installer/InnoSetup/Changes.txt 2006-12-13 08:17:21 UTC (rev 3960)
+++ trunk/Installer/InnoSetup/Changes.txt 2006-12-13 08:42:37 UTC (rev 3961)
@@ -1,3 +1,6 @@
+2006-12-13 Kimmo
+ PATCH: [ 1614056 ] Add new SourceControl filter to installer
+ InnoSetup: WinMerge.iss
2006-11-28 Gal
BUG: [ 1608510 ] ClearCase Support
Modified: trunk/Installer/InnoSetup/WinMerge.iss
===================================================================
--- trunk/Installer/InnoSetup/WinMerge.iss 2006-12-13 08:17:21 UTC (rev 3960)
+++ trunk/Installer/InnoSetup/WinMerge.iss 2006-12-13 08:42:37 UTC (rev 3961)
@@ -300,6 +300,7 @@
Name: {app}\Filters\Merge_VC_loose.flt; Type: Files; Check: not IsComponentSelected('Filters')
Name: {app}\Filters\Merge_VB_loose.flt; Type: Files; Check: not IsComponentSelected('Filters')
Name: {app}\Filters\XML_html.flt; Type: Files; Check: not IsComponentSelected('Filters')
+Name: {app}\Filters\SourceControl.flt; Type: Files; Check: not IsComponentSelected('Filters')
Name: {app}\Filters\FileFilter.tmpl; Type: Files; Check: not IsComponentSelected('Filters')
Name: {app}\Filters; Type: DirIfEmpty; Check: not IsComponentSelected('Filters')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-01-08 20:24:26
|
Revision: 4019
http://svn.sourceforge.net/winmerge/?rev=4019&view=rev
Author: gerundt
Date: 2007-01-08 12:24:20 -0800 (Mon, 08 Jan 2007)
Log Message:
-----------
PATCH: [ 1630397 ] Remove "Plugins.txt" from installer
Modified Paths:
--------------
trunk/Installer/InnoSetup/Changes.txt
trunk/Installer/InnoSetup/WinMerge.iss
Modified: trunk/Installer/InnoSetup/Changes.txt
===================================================================
--- trunk/Installer/InnoSetup/Changes.txt 2007-01-08 15:16:24 UTC (rev 4018)
+++ trunk/Installer/InnoSetup/Changes.txt 2007-01-08 20:24:20 UTC (rev 4019)
@@ -1,3 +1,7 @@
+2007-01-08 Tim
+ PATCH: [ 1630397 ] Remove "Plugins.txt" from installer
+ InnoSetup: WinMerge.iss
+
2006-12-13 Kimmo
PATCH: [ 1614056 ] Add new SourceControl filter to installer
InnoSetup: WinMerge.iss
Modified: trunk/Installer/InnoSetup/WinMerge.iss
===================================================================
--- trunk/Installer/InnoSetup/WinMerge.iss 2007-01-08 15:16:24 UTC (rev 4018)
+++ trunk/Installer/InnoSetup/WinMerge.iss 2007-01-08 20:24:20 UTC (rev 4019)
@@ -291,7 +291,6 @@
Name: {app}\MergePlugins\editor addin.sct; Type: Files; Check: not IsComponentSelected('Plugins')
Name: {app}\MergePlugins\insert datetime.sct; Type: Files; Check: not IsComponentSelected('Plugins')
-Name: {app}\Docs\Plugins.txt; Type: Files; Check: DontInstallPluginsText
Name: {app}\MergePlugins; Type: DirIfEmpty; Check: not IsComponentSelected('Plugins')
Name: {app}\Filters\ADAMulti.flt; Type: Files; Check: not IsComponentSelected('Filters')
@@ -381,7 +380,6 @@
;Please note IgnoreVersion and CompareTimeStamp are to instruct the installer to not not check for version info and go straight to comparing modification dates
Source: ..\..\Plugins\dlls\editor addin.sct; DestDir: {app}\MergePlugins; Flags: IgnoreVersion CompareTimeStamp; Components: Plugins
Source: ..\..\Plugins\dlls\insert datetime.sct; DestDir: {app}\MergePlugins; Flags: IgnoreVersion CompareTimeStamp; Components: Plugins
-Source: ..\..\Plugins\dlls\Plugins.txt; DestDir: {app}\Docs; DestName: Plugins.txt; Flags: IgnoreVersion CompareTimeStamp; Check: InstallPluginsText; Components: ; Tasks: ; Languages:
Source: ..\..\Plugins\dlls\*.dll; DestDir: {app}\MergePlugins; Flags: promptifolder; Components: Plugins
[INI]
@@ -394,7 +392,6 @@
;WinMerge (ANSI) for WinMerge.exe in NT-windows
Name: {group}\WinMerge (ANSI); Filename: {app}\WinMerge.exe; IconIndex: 0; MinVersion: 0,4; Components: core; Check: not IsWin64
Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe.txt; IconFileName: {win}\NOTEPAD.EXE
-Name: {group}\{cm:PluginsText}; Filename: {app}\Docs\Plugins.txt; IconFileName: {win}\NOTEPAD.EXE Check: InstallPluginsText; Components: Plugins
Name: {group}\{cm:UsersGuide}; Filename: {app}\Docs\WinMerge.chm; Components: docs
Name: {group}\{cm:UninstallProgram,WinMerge}; Filename: {uninstallexe}
@@ -793,32 +790,6 @@
}
end;
-{Install Plugins.txt if plugins are installed}
-Function InstallPluginsText(): Boolean;
-Begin
- {If Plugins are to be installed then...}
- If (IsComponentSelected('Plugins') = True) Then
- {We should install the Plugins.txt File}
- Result := True
- Else
- {The Plugins.txt file should not be installed}
- Result := False;
-End;
-
-{This function is needed as a check parameter in the [InstallDelete] section unfortunately there's not yet a way to get the Check: parameter to check
-for a false value and respond accordingly}
-Function DontInstallPluginsText(): Boolean;
-Begin
- {If the Plugins.txt file shouldn't be installed then...}
- If InstallPluginsText() = False Then
-
- {This function returns True}
- Result := True
- Else
- {This function returns False}
- Result := False;
-End;
-
{Determines whether or not TortoiseCVS is installed}
Function TortoiseCVSInstalled(): boolean;
Begin
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-01-15 22:00:05
|
Revision: 4056
http://svn.sourceforge.net/winmerge/?rev=4056&view=rev
Author: kimmov
Date: 2007-01-15 14:00:04 -0800 (Mon, 15 Jan 2007)
Log Message:
-----------
PATCH: [ 1414233 ] Template ExternalArchiveFormat.ini
- Submitted by Perry
Modified Paths:
--------------
trunk/Installer/InnoSetup/Changes.txt
Added Paths:
-----------
trunk/Installer/InnoSetup/ExternalArchiveFormat.ini
Modified: trunk/Installer/InnoSetup/Changes.txt
===================================================================
--- trunk/Installer/InnoSetup/Changes.txt 2007-01-15 20:48:33 UTC (rev 4055)
+++ trunk/Installer/InnoSetup/Changes.txt 2007-01-15 22:00:04 UTC (rev 4056)
@@ -1,3 +1,8 @@
+2007-01-15 Kimmo
+ PATCH: [ 1414233 ] Template ExternalArchiveFormat.ini
+ Submitted by Perry
+ Innosetup new file: ExternalArchiveFormat.ini
+
2007-01-08 Tim
PATCH: [ 1630397 ] Remove "Plugins.txt" from installer
InnoSetup: WinMerge.iss
Added: trunk/Installer/InnoSetup/ExternalArchiveFormat.ini
===================================================================
--- trunk/Installer/InnoSetup/ExternalArchiveFormat.ini (rev 0)
+++ trunk/Installer/InnoSetup/ExternalArchiveFormat.ini 2007-01-15 22:00:04 UTC (rev 4056)
@@ -0,0 +1,47 @@
+# ExternalArchiveFormat.ini
+#
+# This file may be used to customize how WinMerge handles archives
+# (This file is read by the WinMerge Merge7z dll files.)
+#
+# PURPOSE#1: To handle files which are zip files, but have other extensions
+#
+# For example, if you use OpenOffice .ods files (which are zip format)
+# but you never use Outlook Express .ods mailbox files (which are
+# not zip format), you might want to specify that all .ods files
+# are to be treated as archives.
+#
+# In that case, you need the following lines.
+# (You would remove the leading hash marks, which make these comments only.)
+#
+#[extensions]
+#.ods=.zip;Open Office 2.0 Spreadsheets
+#
+# Note#1: Merge7z ignores the semicolon and everything after it.
+# Note#2: Merge7z automatically handles .zip, .7z, and some other
+# common archive extensions already.
+# Note#3: If you use the "Detect archive type from file signature"
+# in WinMerge, then you don't shouldn't to specify extensions here.
+#
+# PURPOSE#2: Invoking other archive programs
+#
+# This file may also be used to link WinMerge to other archive programs
+# Following are example mappings entries to map .arj and .lzh files
+# to appropriate archive handlers.
+# (You would remove the leading hash marks, which make these comments only.)
+#
+#[extensions]
+#.ARJ = ARJ32.EXE
+#.LZH = LHA32.EXE
+#
+#[ARJ32.EXE]
+#DeCompress = ARJ32.EXE x "<archive>"
+#Compress = ARJ32.EXE a "<archive>" "<filename>"
+#
+#[LHA32.EXE]
+#DeCompress = LHA32.EXE x "<archive>" "<dir>\"
+#Compress = LHA32.EXE a /x "<archive>" "<dir>\" "<filename>"
+#BulkSize = 50,16000
+#
+#[LHA.EXE]
+#DeCompress = LHA.EXE x <archive> <dir>\
+#Compress = LHA.EXE a /x <archive> <dir>\ <filename>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-03-15 20:12:29
|
Revision: 4164
http://svn.sourceforge.net/winmerge/?rev=4164&view=rev
Author: gerundt
Date: 2007-03-15 13:11:39 -0700 (Thu, 15 Mar 2007)
Log Message:
-----------
BUG: [ 1677923 ] Uninstaller icon must be changed
Modified Paths:
--------------
trunk/Installer/InnoSetup/Changes.txt
trunk/Installer/InnoSetup/WinMerge.iss
Modified: trunk/Installer/InnoSetup/Changes.txt
===================================================================
--- trunk/Installer/InnoSetup/Changes.txt 2007-03-14 20:15:33 UTC (rev 4163)
+++ trunk/Installer/InnoSetup/Changes.txt 2007-03-15 20:11:39 UTC (rev 4164)
@@ -1,3 +1,7 @@
+2007-03-15 Tim
+ BUG: [ 1677923 ] Uninstaller icon must be changed
+ InnoSetup: WinMerge.iss
+
2007-01-22 Kimmo
PATCH: [ 1607375 ] Move runtime files to separate folder in trunk
Move InnoSetup/Runtimes folder to Installer/Runtimes
Modified: trunk/Installer/InnoSetup/WinMerge.iss
===================================================================
--- trunk/Installer/InnoSetup/WinMerge.iss 2007-03-14 20:15:33 UTC (rev 4163)
+++ trunk/Installer/InnoSetup/WinMerge.iss 2007-03-15 20:11:39 UTC (rev 4164)
@@ -34,9 +34,6 @@
; once the ShellExtension.dll file has been added or removed.
;
; Non-Essential Features:
-; # Add a Desktop.ini file to our \Program Files\WinMerge folder
-; Warn users about the reprocussions for enhancing their folder icon. Or figure out how to keep these folders visible at a command-prompt.
-; # Make an uninstall icon and use it: UninstallIconFile=..\src\res\Merge.ico
; # Make a Floppy Disk /Low Bandwidth Edition of the WinMerge Installer that doesn't include outdated 7-Zip Support (3.11, 3.12) or the Language files
; If the user requires any of these we'll download it on the fly. (maybe that should be the default behavior from the get go?)
; # See about getting a higher resolution copy of the Users's Guide.ico source art from somebody (A 32x32, and or 48x48 would be nice)
@@ -95,12 +92,9 @@
WizardSmallImageFile=Art\Small Logo.bmp
WizardImageStretch=false
-SetupIconFile=..\..\src\res\Merge.ico
+;It is confusing, if Setup/Uninstall use the same icon like WinMerge!
+;SetupIconFile=..\..\src\res\Merge.ico
-;The uninstall icon shouldn't match the WinMerge icon, because it would look confusing in the start menu.
-; So I've remmed this until someone (probably me [Seier Blackburn]) creates a decent WinMerge specific uninstall icon
-;UninstallIconFile=..\src\res\Merge.ico
-
;Compression Parameters
;Please note while Compression=lzma/ultra and InternalCompressLevel=Ultra are better than max
;they also require 320 MB of memory for compression. If you're system has at least 256MB RAM then by all
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-03-25 00:46:52
|
Revision: 4187
http://svn.sourceforge.net/winmerge/?rev=4187&view=rev
Author: gerundt
Date: 2007-03-24 17:46:50 -0700 (Sat, 24 Mar 2007)
Log Message:
-----------
RFE: [ 1687367 ] Move "MergeProject.ico" to WinMerge EXE
Modified Paths:
--------------
trunk/Installer/InnoSetup/Changes.txt
trunk/Installer/InnoSetup/WinMerge.iss
Removed Paths:
-------------
trunk/Installer/InnoSetup/MergeProject.ico
Modified: trunk/Installer/InnoSetup/Changes.txt
===================================================================
--- trunk/Installer/InnoSetup/Changes.txt 2007-03-25 00:39:22 UTC (rev 4186)
+++ trunk/Installer/InnoSetup/Changes.txt 2007-03-25 00:46:50 UTC (rev 4187)
@@ -1,3 +1,7 @@
+2007-03-25 Tim
+ RFE: [ 1687367 ] Move "MergeProject.ico" to WinMerge EXE
+ InnoSetup: MergeProject.ico WinMerge.iss
+
2007-03-24 Tim
PATCH: [ 1684865 ] WinMerge Icon Set Revision 4
(Initially without the 256*256 version)
Deleted: trunk/Installer/InnoSetup/MergeProject.ico
===================================================================
(Binary files differ)
Modified: trunk/Installer/InnoSetup/WinMerge.iss
===================================================================
--- trunk/Installer/InnoSetup/WinMerge.iss 2007-03-25 00:39:22 UTC (rev 4186)
+++ trunk/Installer/InnoSetup/WinMerge.iss 2007-03-25 00:46:50 UTC (rev 4187)
@@ -309,9 +309,6 @@
Source: ..\..\Build\MergeUnicodeRelease\WinMergeU.exe; DestDir: {app}; Flags: promptifolder; MinVersion: 0, 4; Components: Core
Source: ..\..\Build\MergeRelease\WinMerge.exe; DestDir: {app}; Flags: promptifolder; Components: Core; Check: not IsWin64
-; Icon for projectfiles
-Source: MergeProject.ico; DestDir: {app}; Flags: promptifolder; Components: Core
-
; List of installed files
Source: ..\..\Docs\Users\Files.txt; DestDir: {app}; Flags: promptifolder; Components: Core
@@ -406,7 +403,7 @@
Root: HKCR; Subkey: WinMerge.Project.File; ValueType: String; ValueData: {cm:ProjectFileDesc}; Flags: uninsdeletekey
Root: HKCR; Subkey: WinMerge.Project.File\shell\open\command; ValueType: String; ValueData: """{app}\{code:ExeName}"" ""%1"""; Flags: uninsdeletekey
Root: HKCR; Subkey: WinMerge.Project.File\shell\edit\command; ValueType: String; ValueData: """NOTEPAD.EXE"" ""%1"""; Flags: uninsdeletekey
-Root: HKCR; Subkey: WinMerge.Project.File\DefaultIcon; ValueType: String; ValueData: """{app}\MergeProject.ico"""; Flags: uninsdeletekey
+Root: HKCR; Subkey: WinMerge.Project.File\DefaultIcon; ValueType: String; ValueData: """{app}\{code:ExeName}"",1"; Flags: uninsdeletekey
; delete obsolete values
;In Inno Setup Version 4.18 ValueData couldn't be null and compile,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-04-03 14:30:21
|
Revision: 4227
http://svn.sourceforge.net/winmerge/?rev=4227&view=rev
Author: kimmov
Date: 2007-04-03 07:30:17 -0700 (Tue, 03 Apr 2007)
Log Message:
-----------
PATCH: [ 1693012 ] Remove libexpatw.dll from installer
Modified Paths:
--------------
trunk/Installer/InnoSetup/Changes.txt
trunk/Installer/InnoSetup/WinMerge.iss
Modified: trunk/Installer/InnoSetup/Changes.txt
===================================================================
--- trunk/Installer/InnoSetup/Changes.txt 2007-04-03 14:27:34 UTC (rev 4226)
+++ trunk/Installer/InnoSetup/Changes.txt 2007-04-03 14:30:17 UTC (rev 4227)
@@ -1,3 +1,7 @@
+2007-04-03 Kimmo
+ PATCH: [ 1693012 ] Remove libexpatw.dll from installer
+ InnoSetup: WinMerge.iss
+
2007-03-25 Tim
RFE: [ 1687367 ] Move "MergeProject.ico" to WinMerge EXE
InnoSetup: MergeProject.ico WinMerge.iss
Modified: trunk/Installer/InnoSetup/WinMerge.iss
===================================================================
--- trunk/Installer/InnoSetup/WinMerge.iss 2007-04-03 14:27:34 UTC (rev 4226)
+++ trunk/Installer/InnoSetup/WinMerge.iss 2007-04-03 14:30:17 UTC (rev 4227)
@@ -326,9 +326,8 @@
; 64-bit version of ShellExtension
Source: ..\..\Build\ShellExtensionX64\ShellExtensionX64.dll; DestDir: {app}; Flags: regserver uninsrestartdelete restartreplace promptifolder 64bit; MinVersion: 0,5.01.2600; Check: IsWin64
-; Expat dlls
-Source: ..\..\Build\expat\libexpat.dll; DestDir: {app}; Flags: promptifolder; Components: Core; Check: not IsWin64
-Source: ..\..\Build\expat\libexpatw.dll; DestDir: {app}; Flags: promptifolder; Components: Core; MinVersion: 0, 4
+; Expat dll
+Source: ..\..\Build\expat\libexpat.dll; DestDir: {app}; Flags: promptifolder; Components: Core;
; PCRE dll
Source: ..\..\Build\pcre\pcre.dll; DestDir: {app}; Flags: promptifolder; Components: Core
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-06-08 19:21:47
|
Revision: 4323
http://svn.sourceforge.net/winmerge/?rev=4323&view=rev
Author: kimmov
Date: 2007-06-08 12:21:43 -0700 (Fri, 08 Jun 2007)
Log Message:
-----------
PATCH: [ 1733032 ] Installer: need to uninstall filter files
Modified Paths:
--------------
trunk/Installer/InnoSetup/Changes.txt
trunk/Installer/InnoSetup/WinMerge.iss
Modified: trunk/Installer/InnoSetup/Changes.txt
===================================================================
--- trunk/Installer/InnoSetup/Changes.txt 2007-06-07 19:57:57 UTC (rev 4322)
+++ trunk/Installer/InnoSetup/Changes.txt 2007-06-08 19:21:43 UTC (rev 4323)
@@ -1,3 +1,7 @@
+2007-06-08 Kimmo
+ PATCH: [ 1733032 ] Installer: need to uninstall filter files
+ InnoSetup: WinMerge.iss
+
2007-04-03 Kimmo
PATCH: [ 1693012 ] Remove libexpatw.dll from installer
InnoSetup: WinMerge.iss
Modified: trunk/Installer/InnoSetup/WinMerge.iss
===================================================================
--- trunk/Installer/InnoSetup/WinMerge.iss 2007-06-07 19:57:57 UTC (rev 4322)
+++ trunk/Installer/InnoSetup/WinMerge.iss 2007-06-08 19:21:43 UTC (rev 4323)
@@ -288,12 +288,16 @@
Name: {app}\MergePlugins; Type: DirIfEmpty; Check: not IsComponentSelected('Plugins')
Name: {app}\Filters\ADAMulti.flt; Type: Files; Check: not IsComponentSelected('Filters')
+Name: {app}\Filters\ASPNET.flt; Type: Files; Check: not IsComponentSelected('Filters')
+Name: {app}\Filters\CSharp_loose.flt; Type: Files; Check: not IsComponentSelected('Filters')
+Name: {app}\Filters\Delphi.flt; Type: Files; Check: not IsComponentSelected('Filters')
Name: {app}\Filters\MASM.flt; Type: Files; Check: not IsComponentSelected('Filters')
Name: {app}\Filters\Merge_GnuC_loose.flt; Type: Files; Check: not IsComponentSelected('Filters')
Name: {app}\Filters\Merge_VC_loose.flt; Type: Files; Check: not IsComponentSelected('Filters')
Name: {app}\Filters\Merge_VB_loose.flt; Type: Files; Check: not IsComponentSelected('Filters')
+Name: {app}\Filters\SourceControl.flt; Type: Files; Check: not IsComponentSelected('Filters')
+Name: {app}\Filters\Symbian.flt; Type: Files; Check: not IsComponentSelected('Filters')
Name: {app}\Filters\XML_html.flt; Type: Files; Check: not IsComponentSelected('Filters')
-Name: {app}\Filters\SourceControl.flt; Type: Files; Check: not IsComponentSelected('Filters')
Name: {app}\Filters\FileFilter.tmpl; Type: Files; Check: not IsComponentSelected('Filters')
Name: {app}\Filters; Type: DirIfEmpty; Check: not IsComponentSelected('Filters')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-09-25 14:04:21
|
Revision: 4560
http://winmerge.svn.sourceforge.net/winmerge/?rev=4560&view=rev
Author: kimmov
Date: 2007-09-25 07:04:18 -0700 (Tue, 25 Sep 2007)
Log Message:
-----------
PATCH: [ 1756364 ] Portuguese translation
Modified Paths:
--------------
trunk/Installer/InnoSetup/Languages/Brazilian_Portuguese.isl
trunk/Installer/InnoSetup/Languages/Bulgarian.isl
trunk/Installer/InnoSetup/Languages/Catalan.isl
trunk/Installer/InnoSetup/Languages/Chinese_Simplified.isl
trunk/Installer/InnoSetup/Languages/Chinese_Traditional.isl
trunk/Installer/InnoSetup/Languages/Czech.isl
trunk/Installer/InnoSetup/Languages/Danish.isl
trunk/Installer/InnoSetup/Languages/Dutch.isl
trunk/Installer/InnoSetup/Languages/English.isl
trunk/Installer/InnoSetup/Languages/French.isl
trunk/Installer/InnoSetup/Languages/German.isl
trunk/Installer/InnoSetup/Languages/Hungarian.isl
trunk/Installer/InnoSetup/Languages/Italian.isl
trunk/Installer/InnoSetup/Languages/Japanese.isl
trunk/Installer/InnoSetup/Languages/Korean.isl
trunk/Installer/InnoSetup/Languages/Norwegian.isl
trunk/Installer/InnoSetup/Languages/Polish.isl
trunk/Installer/InnoSetup/Languages/Russian.isl
trunk/Installer/InnoSetup/Languages/Slovak.isl
trunk/Installer/InnoSetup/Languages/Spanish.isl
trunk/Installer/InnoSetup/Languages/Swedish.isl
trunk/Installer/InnoSetup/Languages/Turkish.isl
trunk/Installer/InnoSetup/WinMerge.iss
Added Paths:
-----------
trunk/Installer/InnoSetup/Languages/Portuguese.isl
Modified: trunk/Installer/InnoSetup/Languages/Brazilian_Portuguese.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Brazilian_Portuguese.isl 2007-09-24 23:07:19 UTC (rev 4559)
+++ trunk/Installer/InnoSetup/Languages/Brazilian_Portuguese.isl 2007-09-25 14:04:18 UTC (rev 4560)
@@ -358,7 +358,8 @@
KoreanLanguage=Korean menus and dialogs
NorwegianLanguage=Norwegian menus and dialogs
PolishLanguage=Polish menus and dialogs
-PortugueseLanguage=Portuguese (Brazilian) menus and dialogs
+PortugueseBrazilLanguage=Portuguese (Brazilian) menus and dialogs
+PortugueseLanguage=Portuguese menus and dialogs
RussianLanguage=Russian menus and dialogs
SlovakLanguage=Slovak menus and dialogs
SpanishLanguage=Spanish menus and dialogs
Modified: trunk/Installer/InnoSetup/Languages/Bulgarian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Bulgarian.isl 2007-09-24 23:07:19 UTC (rev 4559)
+++ trunk/Installer/InnoSetup/Languages/Bulgarian.isl 2007-09-25 14:04:18 UTC (rev 4560)
@@ -353,7 +353,8 @@
KoreanLanguage=Korean menus and dialogs
NorwegianLanguage=Norwegian menus and dialogs
PolishLanguage=Polish menus and dialogs
-PortugueseLanguage=Portuguese (Brazilian) menus and dialogs
+PortugueseBrazilLanguage=Portuguese (Brazilian) menus and dialogs
+PortugueseLanguage=Portuguese menus and dialogs
RussianLanguage=Russian menus and dialogs
SlovakLanguage=Slovak menus and dialogs
SpanishLanguage=Spanish menus and dialogs
Modified: trunk/Installer/InnoSetup/Languages/Catalan.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Catalan.isl 2007-09-24 23:07:19 UTC (rev 4559)
+++ trunk/Installer/InnoSetup/Languages/Catalan.isl 2007-09-25 14:04:18 UTC (rev 4560)
@@ -336,7 +336,8 @@
KoreanLanguage=Men\xFAs i di\xE0legs en Kore\xE0
NorwegianLanguage=Men\xFAs i di\xE0legs en Noruec
PolishLanguage=Men\xFAs i di\xE0legs en Polon\xE8s
-PortugueseLanguage=Men\xFAs i di\xE0legs en Portugu\xE8s (Brasiler)
+PortugueseBrazilLanguage=Men\xFAs i di\xE0legs en Portugu\xE8s (Brasiler)
+PortugueseLanguage=Men\xFAs i di\xE0legs en Portugu\xE8s
RussianLanguage=Men\xFAs i di\xE0legs en Rus
SlovakLanguage=Men\xFAs i di\xE0legs en Eslovac
SpanishLanguage=Men\xFAs i di\xE0legs en Castell\xE0
Modified: trunk/Installer/InnoSetup/Languages/Chinese_Simplified.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Chinese_Simplified.isl 2007-09-24 23:07:19 UTC (rev 4559)
+++ trunk/Installer/InnoSetup/Languages/Chinese_Simplified.isl 2007-09-25 14:04:18 UTC (rev 4560)
@@ -343,7 +343,8 @@
KoreanLanguage=Korean menus and dialogs
NorwegianLanguage=Norwegian menus and dialogs
PolishLanguage=Polish menus and dialogs
-PortugueseLanguage=Portuguese (Brazilian) menus and dialogs
+PortugueseBrazilLanguage=Portuguese (Brazilian) menus and dialogs
+PortugueseLanguage=Portuguese menus and dialogs
RussianLanguage=Russian menus and dialogs
SlovakLanguage=Slovak menus and dialogs
SpanishLanguage=Spanish menus and dialogs
Modified: trunk/Installer/InnoSetup/Languages/Chinese_Traditional.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Chinese_Traditional.isl 2007-09-24 23:07:19 UTC (rev 4559)
+++ trunk/Installer/InnoSetup/Languages/Chinese_Traditional.isl 2007-09-25 14:04:18 UTC (rev 4560)
@@ -350,7 +350,8 @@
KoreanLanguage=Korean menus and dialogs
NorwegianLanguage=Norwegian menus and dialogs
PolishLanguage=Polish menus and dialogs
-PortugueseLanguage=Portuguese (Brazilian) menus and dialogs
+PortugueseBrazilLanguage=Portuguese (Brazilian) menus and dialogs
+PortugueseLanguage=Portuguese menus and dialogs
RussianLanguage=Russian menus and dialogs
SlovakLanguage=Slovak menus and dialogs
SpanishLanguage=Spanish menus and dialogs
Modified: trunk/Installer/InnoSetup/Languages/Czech.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Czech.isl 2007-09-24 23:07:19 UTC (rev 4559)
+++ trunk/Installer/InnoSetup/Languages/Czech.isl 2007-09-25 14:04:18 UTC (rev 4560)
@@ -351,7 +351,8 @@
KoreanLanguage=Korean menus and dialogs
NorwegianLanguage=Norwegian menus and dialogs
PolishLanguage=Polish menus and dialogs
-PortugueseLanguage=Portuguese (Brazilian) menus and dialogs
+PortugueseBrazilLanguage=Portuguese (Brazilian) menus and dialogs
+PortugueseLanguage=Portuguese menus and dialogs
RussianLanguage=Russian menus and dialogs
SlovakLanguage=Slovak menus and dialogs
SpanishLanguage=Spanish menus and dialogs
Modified: trunk/Installer/InnoSetup/Languages/Danish.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Danish.isl 2007-09-24 23:07:19 UTC (rev 4559)
+++ trunk/Installer/InnoSetup/Languages/Danish.isl 2007-09-25 14:04:18 UTC (rev 4560)
@@ -352,7 +352,8 @@
KoreanLanguage=Korean menus and dialogs
NorwegianLanguage=Norwegian menus and dialogs
PolishLanguage=Polish menus and dialogs
-PortugueseLanguage=Portuguese (Brazilian) menus and dialogs
+PortugueseBrazilLanguage=Portuguese (Brazilian) menus and dialogs
+PortugueseLanguage=Portuguese menus and dialogs
RussianLanguage=Russian menus and dialogs
SlovakLanguage=Slovak menus and dialogs
SpanishLanguage=Spanish menus and dialogs
Modified: trunk/Installer/InnoSetup/Languages/Dutch.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Dutch.isl 2007-09-24 23:07:19 UTC (rev 4559)
+++ trunk/Installer/InnoSetup/Languages/Dutch.isl 2007-09-25 14:04:18 UTC (rev 4560)
@@ -330,7 +330,8 @@
KoreanLanguage=Korean menus and dialogs
NorwegianLanguage=Norwegian menus and dialogs
PolishLanguage=Polish menus and dialogs
-PortugueseLanguage=Portuguese (Brazilian) menus and dialogs
+PortugueseBrazilLanguage=Portuguese (Brazilian) menus and dialogs
+PortugueseLanguage=Portuguese menus and dialogs
RussianLanguage=Russian menus and dialogs
SlovakLanguage=Slovak menus and dialogs
SpanishLanguage=Spanish menus and dialogs
Modified: trunk/Installer/InnoSetup/Languages/English.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/English.isl 2007-09-24 23:07:19 UTC (rev 4559)
+++ trunk/Installer/InnoSetup/Languages/English.isl 2007-09-25 14:04:18 UTC (rev 4560)
@@ -350,7 +350,8 @@
KoreanLanguage=Korean menus and dialogs
NorwegianLanguage=Norwegian menus and dialogs
PolishLanguage=Polish menus and dialogs
-PortugueseLanguage=Portuguese (Brazilian) menus and dialogs
+PortugueseBrazilLanguage=Portuguese (Brazilian) menus and dialogs
+PortugueseLanguage=Portuguese menus and dialogs
RussianLanguage=Russian menus and dialogs
SlovakLanguage=Slovak menus and dialogs
SpanishLanguage=Spanish menus and dialogs
Modified: trunk/Installer/InnoSetup/Languages/French.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/French.isl 2007-09-24 23:07:19 UTC (rev 4559)
+++ trunk/Installer/InnoSetup/Languages/French.isl 2007-09-25 14:04:18 UTC (rev 4560)
@@ -345,7 +345,8 @@
KoreanLanguage=Korean menus and dialogs
NorwegianLanguage=Norwegian menus and dialogs
PolishLanguage=Polish menus and dialogs
-PortugueseLanguage=Portuguese (Brazilian) menus and dialogs
+PortugueseBrazilLanguage=Portuguese (Brazilian) menus and dialogs
+PortugueseLanguage=Portuguese menus and dialogs
RussianLanguage=Russian menus and dialogs
SlovakLanguage=Slovak menus and dialogs
SpanishLanguage=Spanish menus and dialogs
Modified: trunk/Installer/InnoSetup/Languages/German.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/German.isl 2007-09-24 23:07:19 UTC (rev 4559)
+++ trunk/Installer/InnoSetup/Languages/German.isl 2007-09-25 14:04:18 UTC (rev 4560)
@@ -343,7 +343,8 @@
KoreanLanguage=Koreanische Men\xFCs und Dialoge
NorwegianLanguage=Norwegische Men\xFCs und Dialoge
PolishLanguage=Polnische Men\xFCs und Dialoge
-PortugueseLanguage=Portugiesische (brasilianische) Men\xFCs und Dialoge
+PortugueseBrazilLanguage=Portugiesische (brasilianische) Men\xFCs und Dialoge
+PortugueseLanguage=Portugiesische Men\xFCs und Dialoge
RussianLanguage=Russische Men\xFCs und Dialoge
SlovakLanguage=Slowakische Men\xFCs und Dialoge
SpanishLanguage=Spanische Men\xFCs und Dialoge
Modified: trunk/Installer/InnoSetup/Languages/Hungarian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Hungarian.isl 2007-09-24 23:07:19 UTC (rev 4559)
+++ trunk/Installer/InnoSetup/Languages/Hungarian.isl 2007-09-25 14:04:18 UTC (rev 4560)
@@ -364,7 +364,8 @@
KoreanLanguage=Koreai men\xFCk \xE9s p\xE1rbesz\xE9dablakok
NorwegianLanguage=Norv\xE9g men\xFCk \xE9s p\xE1rbesz\xE9dablakok
PolishLanguage=Lengyel men\xFCk \xE9s p\xE1rbesz\xE9dablakok
-PortugueseLanguage=Portug\xE1l (Braz\xEDliai) men\xFCk \xE9s p\xE1rbesz\xE9dablakok
+PortugueseBrazilLanguage=Portug\xE1l (Braz\xEDliai) men\xFCk \xE9s p\xE1rbesz\xE9dablakok
+PortugueseLanguage=Portug\xE1l men\xFCk \xE9s p\xE1rbesz\xE9dablakok
RussianLanguage=Orosz men\xFCk \xE9s p\xE1rbesz\xE9dablakok
SlovakLanguage=Szlov\xE1k men\xFCk \xE9s p\xE1rbesz\xE9dablakok
SpanishLanguage=Spanyol men\xFCk \xE9s p\xE1rbesz\xE9dablakok
Modified: trunk/Installer/InnoSetup/Languages/Italian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Italian.isl 2007-09-24 23:07:19 UTC (rev 4559)
+++ trunk/Installer/InnoSetup/Languages/Italian.isl 2007-09-25 14:04:18 UTC (rev 4560)
@@ -355,7 +355,8 @@
KoreanLanguage=Menu e finestre di dialogo in coreano
NorwegianLanguage=Menu e finestre di dialogo in norvegese
PolishLanguage=Menu e finestre di dialogo in polacco
-PortugueseLanguage=Menu e finestre di dialogo in portoghese (brasiliano)
+PortugueseBrazilLanguage=Menu e finestre di dialogo in portoghese (brasiliano)
+PortugueseLanguage=Menu e finestre di dialogo in portoghese
RussianLanguage=Menu e finestre di dialogo in russo
SlovakLanguage=Menu e finestre di dialogo in slovacco
SpanishLanguage=Menu e finestre di dialogo in spagnolo
Modified: trunk/Installer/InnoSetup/Languages/Japanese.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Japanese.isl 2007-09-24 23:07:19 UTC (rev 4559)
+++ trunk/Installer/InnoSetup/Languages/Japanese.isl 2007-09-25 14:04:18 UTC (rev 4560)
@@ -345,7 +345,8 @@
KoreanLanguage=Korean menus and dialogs
NorwegianLanguage=Norwegian menus and dialogs
PolishLanguage=Polish menus and dialogs
-PortugueseLanguage=Portuguese (Brazilian) menus and dialogs
+PortugueseBrazilLanguage=Portuguese (Brazilian) menus and dialogs
+PortugueseLanguage=Portuguese menus and dialogs
RussianLanguage=Russian menus and dialogs
SlovakLanguage=Slovak menus and dialogs
SpanishLanguage=Spanish menus and dialogs
Modified: trunk/Installer/InnoSetup/Languages/Korean.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Korean.isl 2007-09-24 23:07:19 UTC (rev 4559)
+++ trunk/Installer/InnoSetup/Languages/Korean.isl 2007-09-25 14:04:18 UTC (rev 4560)
@@ -358,7 +358,8 @@
KoreanLanguage=Korean menus and dialogs
NorwegianLanguage=Norwegian menus and dialogs
PolishLanguage=Polish menus and dialogs
-PortugueseLanguage=Portuguese (Brazilian) menus and dialogs
+PortugueseBrazilLanguage=Portuguese (Brazilian) menus and dialogs
+PortugueseLanguage=Portuguese menus and dialogs
RussianLanguage=Russian menus and dialogs
SlovakLanguage=Slovak menus and dialogs
SpanishLanguage=Spanish menus and dialogs
Modified: trunk/Installer/InnoSetup/Languages/Norwegian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Norwegian.isl 2007-09-24 23:07:19 UTC (rev 4559)
+++ trunk/Installer/InnoSetup/Languages/Norwegian.isl 2007-09-25 14:04:18 UTC (rev 4560)
@@ -348,7 +348,8 @@
KoreanLanguage=Koreanske menyer og dialoger
NorwegianLanguage=Norske menyer og dialoger
PolishLanguage=Polske menyer og dialoger
-PortugueseLanguage=Portugisiske (Brasilianske) menyer og dialoger
+PortugueseBrazilLanguage=Portugisiske (Brasilianske) menyer og dialoger
+PortugueseLanguage=Portugisiske menyer og dialoger
RussianLanguage=Russiske menyer og dialoger
SlovakLanguage=Slovakiske menyer og dialoger
SpanishLanguage=Spanske menyer og dialoger
Modified: trunk/Installer/InnoSetup/Languages/Polish.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Polish.isl 2007-09-24 23:07:19 UTC (rev 4559)
+++ trunk/Installer/InnoSetup/Languages/Polish.isl 2007-09-25 14:04:18 UTC (rev 4560)
@@ -342,7 +342,8 @@
KoreanLanguage=Koreanski interfejs
NorwegianLanguage=Norweski interfejs
PolishLanguage=Polski interfejs
-PortugueseLanguage=Portugalski (Brazylijski) interfejs
+PortugueseBrazilLanguage=Portugalski (Brazylijski) interfejs
+PortugueseLanguage=Portugalski interfejs
RussianLanguage=Rosyjski interfejs
SlovakLanguage=Slowacki interfejs
SpanishLanguage=Hiszpanski interfejs
Added: trunk/Installer/InnoSetup/Languages/Portuguese.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Portuguese.isl (rev 0)
+++ trunk/Installer/InnoSetup/Languages/Portuguese.isl 2007-09-25 14:04:18 UTC (rev 4560)
@@ -0,0 +1,364 @@
+; *** Inno Setup version 5.1.11+ Portuguese (Portugal) messages ***
+;
+; Maintained by NARS (nars AT gmx.net)
+;
+; $jrsoftware: issrc/Files/Languages/Portuguese.isl,v 1.4 2007/02/26 23:46:46 nars Exp $
+
+[LangOptions]
+LanguageName=Portugu<00EA>s (Portugal)
+LanguageID=$0816
+LanguageCodePage=1252
+
+[Messages]
+
+; *** Application titles
+SetupAppTitle=Instala\xE7\xE3o
+SetupWindowTitle=%1 - Instala\xE7\xE3o
+UninstallAppTitle=Desinstala\xE7\xE3o
+UninstallAppFullTitle=%1 - Desinstala\xE7\xE3o
+
+; *** Misc. common
+InformationTitle=Informa\xE7\xE3o
+ConfirmTitle=Confirma\xE7\xE3o
+ErrorTitle=Erro
+
+; *** SetupLdr messages
+SetupLdrStartupMessage=Ir\xE1 ser instalado o %1. Deseja continuar?
+LdrCannotCreateTemp=N\xE3o foi poss\xEDvel criar um ficheiro tempor\xE1rio. Instala\xE7\xE3o cancelada
+LdrCannotExecTemp=N\xE3o foi poss\xEDvel executar um ficheiro na directoria tempor\xE1ria. Instala\xE7\xE3o cancelada
+
+; *** Startup error messages
+LastErrorMessage=%1.%n%nErro %2: %3
+SetupFileMissing=O ficheiro %1 n\xE3o foi encontrado na pasta de instala\xE7\xE3o. Corrija o problema ou obtenha uma nova c\xF3pia do programa.
+SetupFileCorrupt=Os ficheiros de instala\xE7\xE3o est\xE3o corrompidos. Obtenha uma nova c\xF3pia do programa.
+SetupFileCorruptOrWrongVer=Os ficheiros de instala\xE7\xE3o est\xE3o corrompidos, ou s\xE3o incompat\xEDveis com esta vers\xE3o do Assistente de Instala\xE7\xE3o. Corrija o problema ou obtenha uma nova c\xF3pia do programa.
+NotOnThisPlatform=Este programa n\xE3o pode ser executado no %1.
+OnlyOnThisPlatform=Este programa deve ser executado no %1.
+OnlyOnTheseArchitectures=Este programa s\xF3 pode ser instalado em vers\xF5es do Windows preparadas para as seguintes arquitecturas:%n%n%1
+MissingWOW64APIs=A vers\xE3o do Windows que est\xE1 a utilizar n\xE3o disp\xF5e das funcionalidades necess\xE1rias para o Assistente de Instala\xE7\xE3o poder realizar uma instala\xE7\xE3o de 64-bit's. Para corrigir este problema, por favor instale o Service Pack %1.
+WinVersionTooLowError=Este programa necessita do %1 vers\xE3o %2 ou mais recente.
+WinVersionTooHighError=Este programa n\xE3o pode ser instalado no %1 vers\xE3o %2 ou mais recente.
+AdminPrivilegesRequired=Deve iniciar sess\xE3o como administrador para instalar este programa.
+PowerUserPrivilegesRequired=Deve iniciar sess\xE3o como administrador ou membro do grupo de Super Utilizadores para instalar este programa.
+SetupAppRunningError=O Assistente de Instala\xE7\xE3o detectou que o %1 est\xE1 em execu\xE7\xE3o. Feche-o e de seguida clique em OK para continuar, ou clique em Cancelar para cancelar a instala\xE7\xE3o.
+UninstallAppRunningError=O Assistente de Desinstala\xE7\xE3o detectou que o %1 est\xE1 em execu\xE7\xE3o. Feche-o e de seguida clique em OK para continuar, ou clique em Cancelar para cancelar a desinstala\xE7\xE3o.
+
+; *** Misc. errors
+ErrorCreatingDir=O Assistente de Instala\xE7\xE3o n\xE3o consegue criar a directoria "%1"
+ErrorTooManyFilesInDir=N\xE3o \xE9 poss\xEDvel criar um ficheiro na directoria "%1" porque esta cont\xE9m demasiados ficheiros
+
+; *** Setup common messages
+ExitSetupTitle=Terminar a instala\xE7\xE3o
+ExitSetupMessage=A instala\xE7\xE3o n\xE3o est\xE1 completa. Se terminar agora, o programa n\xE3o ser\xE1 instalado.%n%nMais tarde poder\xE1 executar novamente este Assistente de Instala\xE7\xE3o e concluir a instala\xE7\xE3o.%n%nDeseja terminar a instala\xE7\xE3o?
+AboutSetupMenuItem=&Acerca de...
+AboutSetupTitle=Acerca do Assistente de Instala\xE7\xE3o
+AboutSetupMessage=%1 vers\xE3o %2%n%3%n%n%1 home page:%n%4
+AboutSetupNote=
+TranslatorNote=Portuguese translation maintained by NARS (na...@gm...)
+
+; *** Buttons
+ButtonBack=< &Anterior
+ButtonNext=&Seguinte >
+ButtonInstall=&Instalar
+ButtonOK=OK
+ButtonCancel=Cancelar
+ButtonYes=&Sim
+ButtonYesToAll=Sim para &todos
+ButtonNo=&N\xE3o
+ButtonNoToAll=N\xE3&o para todos
+ButtonFinish=&Concluir
+ButtonBrowse=&Procurar...
+ButtonWizardBrowse=P&rocurar...
+ButtonNewFolder=&Criar Nova Pasta
+
+; *** "Select Language" dialog messages
+SelectLanguageTitle=Seleccione o Idioma do Assistente de Instala\xE7\xE3o
+SelectLanguageLabel=Seleccione o idioma para usar durante a Instala\xE7\xE3o:
+
+; *** Common wizard text
+ClickNext=Clique em Seguinte para continuar ou em Cancelar para cancelar a instala\xE7\xE3o.
+BeveledLabel=
+BrowseDialogTitle=Procurar Pasta
+BrowseDialogLabel=Seleccione uma pasta na lista abaixo e clique em OK.
+NewFolderName=Nova Pasta
+
+; *** "Welcome" wizard page
+WelcomeLabel1=Bem-vindo ao Assistente de Instala\xE7\xE3o do [name]
+WelcomeLabel2=O Assistente de Instala\xE7\xE3o ir\xE1 instalar o [name/ver] no seu computador.%n%n\xC9 recomendado que feche todas as outras aplica\xE7\xF5es antes de continuar.
+
+; *** "Password" wizard page
+WizardPassword=Palavra-passe
+PasswordLabel1=Esta instala\xE7\xE3o est\xE1 protegida por palavra-passe.
+PasswordLabel3=Insira a palavra-passe e de seguida clique em Seguinte para continuar. Na palavra-passe existe diferen\xE7a entre mai\xFAsculas e min\xFAsculas.
+PasswordEditLabel=&Palavra-passe:
+IncorrectPassword=A palavra-passe que introduziu n\xE3o est\xE1 correcta. Tente novamente.
+
+; *** "License Agreement" wizard page
+WizardLicense=Contrato de licen\xE7a
+LicenseLabel=\xC9 importante que leia as seguintes informa\xE7\xF5es antes de continuar.
+LicenseLabel3=Leia atentamente o seguinte contrato de licen\xE7a. Deve aceitar os termos do contrato antes de continuar a instala\xE7\xE3o.
+LicenseAccepted=A&ceito o contrato
+LicenseNotAccepted=&N\xE3o aceito o contrato
+
+; *** "Information" wizard pages
+WizardInfoBefore=Informa\xE7\xE3o
+InfoBeforeLabel=\xC9 importante que leia as seguintes informa\xE7\xF5es antes de continuar.
+InfoBeforeClickLabel=Quando estiver pronto para continuar clique em Seguinte.
+WizardInfoAfter=Informa\xE7\xE3o
+InfoAfterLabel=\xC9 importante que leia as seguintes informa\xE7\xF5es antes de continuar.
+InfoAfterClickLabel=Quando estiver pronto para continuar clique em Seguinte.
+
+; *** "User Information" wizard page
+WizardUserInfo=Informa\xE7\xF5es do utilizador
+UserInfoDesc=Introduza as suas informa\xE7\xF5es.
+UserInfoName=Nome do &utilizador:
+UserInfoOrg=&Organiza\xE7\xE3o:
+UserInfoSerial=N\xFAmero de &s\xE9rie:
+UserInfoNameRequired=Deve introduzir um nome.
+
+; *** "Select Destination Location" wizard page
+WizardSelectDir=Seleccione a localiza\xE7\xE3o de destino
+SelectDirDesc=Onde dever\xE1 ser instalado o [name]?
+SelectDirLabel3=O [name] ser\xE1 instalado na seguinte pasta.
+SelectDirBrowseLabel=Para continuar, clique em Seguinte. Se desejar seleccionar uma pasta diferente, clique em Procurar.
+DiskSpaceMBLabel=\xC9 necess\xE1rio pelo menos [mb] MB de espa\xE7o livre em disco.
+ToUNCPathname=O Assistente de Instala\xE7\xE3o n\xE3o pode instalar num caminho do tipo UNC. Se est\xE1 a tentar fazer a instala\xE7\xE3o numa rede, precisa de mapear a unidade de rede.
+InvalidPath=\xC9 necess\xE1rio indicar o caminho completo com a letra de unidade; por exemplo:%n%nC:\APP%n%nou um caminho UNC no formato:%n%n\\servidor\partilha
+InvalidDrive=A unidade ou partilha UNC seleccionada n\xE3o existe ou n\xE3o est\xE1 acess\xEDvel. Seleccione outra.
+DiskSpaceWarningTitle=N\xE3o h\xE1 espa\xE7o suficiente no disco
+DiskSpaceWarning=O Assistente de Instala\xE7\xE3o necessita de pelo menos %1 KB de espa\xE7o livre, mas a unidade seleccionada tem apenas %2 KB dispon\xEDveis.%n%nDeseja continuar de qualquer forma?
+DirNameTooLong=O nome ou caminho para a pasta \xE9 demasiado longo.
+InvalidDirName=O nome da pasta n\xE3o \xE9 v\xE1lido.
+BadDirName32=O nome da pasta n\xE3o pode conter nenhum dos seguintes caracteres:%n%n%1
+DirExistsTitle=A pasta j\xE1 existe
+DirExists=A pasta:%n%n%1%n%nj\xE1 existe. Pretende instalar nesta pasta?
+DirDoesntExistTitle=A pasta n\xE3o existe
+DirDoesntExist=A pasta:%n%n%1%n%nn\xE3o existe. Pretende que esta pasta seja criada?
+
+; *** "Select Components" wizard page
+WizardSelectComponents=Seleccione os componentes
+SelectComponentsDesc=Que componentes dever\xE3o ser instalados?
+SelectComponentsLabel2=Seleccione os componentes que quer instalar e desseleccione os componentes que n\xE3o quer instalar. Clique em Seguinte quando estiver pronto para continuar.
+FullInstallation=Instala\xE7\xE3o Completa
+; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
+CompactInstallation=Instala\xE7\xE3o Compacta
+CustomInstallation=Instala\xE7\xE3o Personalizada
+NoUninstallWarningTitle=Componentes Encontrados
+NoUninstallWarning=O Assistente de Instala\xE7\xE3o detectou que os seguintes componentes est\xE3o instalados no seu computador:%n%n%1%n%nSe desseleccionar estes componentes eles n\xE3o ser\xE3o desinstalados.%n%nDeseja continuar?
+ComponentSize1=%1 KB
+ComponentSize2=%1 MB
+ComponentsDiskSpaceMBLabel=A selec\xE7\xE3o actual necessita de pelo menos [mb] MB de espa\xE7o em disco.
+
+; *** "Select Additional Tasks" wizard page
+WizardSelectTasks=Seleccione tarefas adicionais
+SelectTasksDesc=Que tarefas adicionais dever\xE3o ser executadas?
+SelectTasksLabel2=Seleccione as tarefas adicionais que deseja que o Assistente de Instala\xE7\xE3o execute na instala\xE7\xE3o do [name] e em seguida clique em Seguinte.
+
+; *** "Select Start Menu Folder" wizard page
+WizardSelectProgramGroup=Seleccione a pasta do Menu Iniciar
+SelectStartMenuFolderDesc=Onde dever\xE3o ser colocados os \xEDcones de atalho do programa?
+SelectStartMenuFolderLabel3=Os \xEDcones de atalho do programa ser\xE3o criados na seguinte pasta do Menu Iniciar.
+SelectStartMenuFolderBrowseLabel=Para continuar, clique em Seguinte. Se desejar seleccionar uma pasta diferente, clique em Procurar.
+MustEnterGroupName=\xC9 necess\xE1rio introduzir um nome para a pasta.
+GroupNameTooLong=O nome ou caminho para a pasta \xE9 demasiado longo.
+InvalidGroupName=O nome da pasta n\xE3o \xE9 v\xE1lido.
+BadGroupName=O nome da pasta n\xE3o pode conter nenhum dos seguintes caracteres:%n%n%1
+NoProgramGroupCheck2=&N\xE3o criar nenhuma pasta no Menu Iniciar
+
+; *** "Ready to Install" wizard page
+WizardReady=Pronto para Instalar
+ReadyLabel1=O Assistente de Instala\xE7\xE3o est\xE1 pronto para instalar o [name] no seu computador.
+ReadyLabel2a=Clique em Instalar para continuar a instala\xE7\xE3o, ou clique em Anterior se desejar rever ou alterar alguma das configura\xE7\xF5es.
+ReadyLabel2b=Clique em Instalar para continuar a instala\xE7\xE3o.
+ReadyMemoUserInfo=Informa\xE7\xF5es do utilizador:
+ReadyMemoDir=Localiza\xE7\xE3o de destino:
+ReadyMemoType=Tipo de instala\xE7\xE3o:
+ReadyMemoComponents=Componentes seleccionados:
+ReadyMemoGroup=Pasta do Menu Iniciar:
+ReadyMemoTasks=Tarefas adicionais:
+
+; *** "Preparing to Install" wizard page
+WizardPreparing=Preparando-se para instalar
+PreparingDesc=Preparando-se para instalar o [name] no seu computador.
+PreviousInstallNotCompleted=A instala\xE7\xE3o/remo\xE7\xE3o de um programa anterior n\xE3o foi completada. Necessitar\xE1 de reiniciar o computador para completar essa instala\xE7\xE3o.%n%nDepois de reiniciar o computador, execute novamente este Assistente de Instala\xE7\xE3o para completar a instala\xE7\xE3o do [name].
+CannotContinue=A Instala\xE7\xE3o n\xE3o pode continuar. Clique em Cancelar para sair.
+
+; *** "Installing" wizard page
+WizardInstalling=A instalar
+InstallingLabel=Aguarde enquanto o Assistente de Instala\xE7\xE3o instala o [name] no seu computador.
+
+; *** "Setup Completed" wizard page
+FinishedHeadingLabel=Instala\xE7\xE3o do [name] conclu\xEDda
+FinishedLabelNoIcons=O Assistente de Instala\xE7\xE3o concluiu a instala\xE7\xE3o do [name] no seu computador.
+FinishedLabel=O Assistente de Instala\xE7\xE3o concluiu a instala\xE7\xE3o do [name] no seu computador. A aplica\xE7\xE3o pode ser iniciada atrav\xE9s dos \xEDcones instalados.
+ClickFinish=Clique em Concluir para finalizar o Assistente de Instala\xE7\xE3o.
+FinishedRestartLabel=Para completar a instala\xE7\xE3o do [name], o Assistente de Instala\xE7\xE3o dever\xE1 reiniciar o seu computador. Deseja reiniciar agora?
+FinishedRestartMessage=Para completar a instala\xE7\xE3o do [name], o Assistente de Instala\xE7\xE3o dever\xE1 reiniciar o seu computador.%n%nDeseja reiniciar agora?
+ShowReadmeCheck=Sim, desejo ver o ficheiro LEIAME
+YesRadio=&Sim, desejo reiniciar o computador agora
+NoRadio=&N\xE3o, desejo reiniciar o computador mais tarde
+; used for example as 'Run MyProg.exe'
+RunEntryExec=Executar %1
+; used for example as 'View Readme.txt'
+RunEntryShellExec=Visualizar %1
+
+; *** "Setup Needs the Next Disk" stuff
+ChangeDiskTitle=O Assistente de Instala\xE7\xE3o precisa do disco seguinte
+SelectDiskLabel2=Introduza o disco %1 e clique em OK.%n%nSe os ficheiros deste disco estiverem num local diferente do mostrado abaixo, indique o caminho correcto ou clique em Procurar.
+PathLabel=&Caminho:
+FileNotInDir2=O ficheiro "%1" n\xE3o foi encontrado em "%2". Introduza o disco correcto ou seleccione outra pasta.
+SelectDirectoryLabel=Indique a localiza\xE7\xE3o do disco seguinte.
+
+; *** Installation phase messages
+SetupAborted=A instala\xE7\xE3o n\xE3o est\xE1 completa.%n%nCorrija o problema e execute o Assistente de Instala\xE7\xE3o novamente.
+EntryAbortRetryIgnore=Clique em Repetir para tentar novamente, Ignorar para continuar de qualquer forma, ou Abortar para cancelar a instala\xE7\xE3o.
+
+; *** Installation status messages
+StatusCreateDirs=A criar directorias...
+StatusExtractFiles=A extrair ficheiros...
+StatusCreateIcons=A criar atalhos...
+StatusCreateIniEntries=A criar entradas em INI...
+StatusCreateRegistryEntries=A criar entradas no registo...
+StatusRegisterFiles=A registar ficheiros...
+StatusSavingUninstall=A guardar informa\xE7\xF5es para desinstala\xE7\xE3o...
+StatusRunProgram=A concluir a instala\xE7\xE3o...
+StatusRollback=A anular as altera\xE7\xF5es...
+
+; *** Misc. errors
+ErrorInternal2=Erro interno: %1
+ErrorFunctionFailedNoCode=%1 falhou
+ErrorFunctionFailed=%1 falhou; c\xF3digo %2
+ErrorFunctionFailedWithMessage=%1 falhou; c\xF3digo %2.%n%3
+ErrorExecutingProgram=N\xE3o \xE9 poss\xEDvel executar o ficheiro:%n%1
+
+; *** Registry errors
+ErrorRegOpenKey=Erro ao abrir a chave de registo:%n%1\%2
+ErrorRegCreateKey=Erro ao criar a chave de registo:%n%1\%2
+ErrorRegWriteKey=Erro ao escrever na chave de registo:%n%1\%2
+
+; *** INI errors
+ErrorIniEntry=Erro ao criar entradas em INI no ficheiro "%1".
+
+; *** File copying errors
+FileAbortRetryIgnore=Clique em Repetir para tentar novamente, Ignorar para ignorar este ficheiro (n\xE3o recomendado), ou Abortar para cancelar a instala\xE7\xE3o.
+FileAbortRetryIgnore2=Clique em Repetir para tentar novamente, Ignorar para continuar de qualquer forma (n\xE3o recomendado), ou Abortar para cancelar a instala\xE7\xE3o.
+SourceIsCorrupted=O ficheiro de origem est\xE1 corrompido
+SourceDoesntExist=O ficheiro de origem "%1" n\xE3o existe
+ExistingFileReadOnly=O ficheiro existente tem o atributo "s\xF3 de leitura".%n%nClique em Repetir para remover o atributo "s\xF3 de leitura" e tentar novamente, Ignorar para ignorar este ficheiro, ou Abortar para cancelar a instala\xE7\xE3o.
+ErrorReadingExistingDest=Ocorreu um erro ao tentar ler o ficheiro existente:
+FileExists=O ficheiro j\xE1 existe.%n%nDeseja substitu\xED-lo?
+ExistingFileNewer=O ficheiro existente \xE9 mais recente que o que est\xE1 a ser instalado. \xC9 recomendado que mantenha o ficheiro existente.%n%nDeseja manter o ficheiro existente?
+ErrorChangingAttr=Ocorreu um erro ao tentar alterar os atributos do ficheiro existente:
+ErrorCreatingTemp=Ocorreu um erro ao tentar criar um ficheiro na directoria de destino:
+ErrorReadingSource=Ocorreu um erro ao tentar ler o ficheiro de origem:
+ErrorCopying=Ocorreu um erro ao tentar copiar um ficheiro:
+ErrorReplacingExistingFile=Ocorreu um erro ao tentar substituir o ficheiro existente:
+ErrorRestartReplace=RestartReplace falhou:
+ErrorRenamingTemp=Ocorreu um erro ao tentar mudar o nome de um ficheiro na directoria de destino:
+ErrorRegisterServer=N\xE3o \xE9 poss\xEDvel registar o DLL/OCX: %1
+ErrorRegSvr32Failed=O RegSvr32 falhou com o c\xF3digo de sa\xEDda %1
+ErrorRegisterTypeLib=N\xE3o foi poss\xEDvel registar a livraria de tipos: %1
+
+; *** Post-installation errors
+ErrorOpeningReadme=Ocorreu um erro ao tentar abrir o ficheiro LEIAME.
+ErrorRestartingComputer=O Assistente de Instala\xE7\xE3o n\xE3o consegue reiniciar o computador. Por favor reinicie manualmente.
+
+; *** Uninstaller messages
+UninstallNotFound=O ficheiro "%1" n\xE3o existe. N\xE3o \xE9 poss\xEDvel desinstalar.
+UninstallOpenError=N\xE3o foi poss\xEDvel abrir o ficheiro "%1". N\xE3o \xE9 poss\xEDvel desinstalar.
+UninstallUnsupportedVer=O ficheiro log de desinstala\xE7\xE3o "%1" est\xE1 num formato que n\xE3o \xE9 reconhecido por esta vers\xE3o do desinstalador. N\xE3o \xE9 poss\xEDvel desinstalar
+UninstallUnknownEntry=Foi encontrada uma entrada desconhecida (%1) no ficheiro log de desinstala\xE7\xE3o
+ConfirmUninstall=Tem a certeza que deseja remover completamente o %1 e todos os seus componentes?
+UninstallOnlyOnWin64=Esta desinstala\xE7\xE3o s\xF3 pode ser realizada na vers\xE3o de 64-bit's do Windows.
+OnlyAdminCanUninstall=Esta desinstala\xE7\xE3o s\xF3 pode ser realizada por um utilizador com privil\xE9gios administrativos.
+UninstallStatusLabel=Por favor aguarde enquanto o %1 est\xE1 a ser removido do seu computador.
+UninstalledAll=O %1 foi removido do seu computador com sucesso.
+UninstalledMost=A desinstala\xE7\xE3o do %1 est\xE1 conclu\xEDda.%n%nAlguns elementos n\xE3o puderam ser removidos. Estes elementos podem ser removidos manualmente.
+UninstalledAndNeedsRestart=Para completar a desinstala\xE7\xE3o do %1, o computador deve ser reiniciado.%n%nDeseja reiniciar agora?
+UninstallDataCorrupted=O ficheiro "%1" est\xE1 corrompido. N\xE3o \xE9 poss\xEDvel desinstalar
+
+; *** Uninstallation phase messages
+ConfirmDeleteSharedFileTitle=Remover ficheiro partilhado?
+ConfirmDeleteSharedFile2=O sistema indica que o seguinte ficheiro partilhado j\xE1 n\xE3o est\xE1 a ser utilizado por nenhum programa. Deseja remov\xEA-lo?%n%nSe algum programa ainda necessitar deste ficheiro, poder\xE1 n\xE3o funcionar correctamente depois de o remover. Se n\xE3o tiver a certeza, seleccione N\xE3o. Manter o ficheiro n\xE3o causar\xE1 nenhum problema.
+SharedFileNameLabel=Nome do ficheiro:
+SharedFileLocationLabel=Localiza\xE7\xE3o:
+WizardUninstalling=Estado da desinstala\xE7\xE3o
+StatusUninstalling=A desinstalar o %1...
+
+; The custom messages below aren't used by Setup itself, but if you make
+; use of them in your scripts, you'll want to translate them.
+
+[CustomMessages]
+
+NameAndVersion=%1 vers\xE3o %2
+AdditionalIcons=\xCDcones adicionais:
+OptionalFeatures=Optional Features:
+CreateDesktopIcon=Criar \xEDcone no &Ambiente de Trabalho
+CreateQuickLaunchIcon=Criar \xEDcone na barra de Inicia\xE7\xE3o &R\xE1pida
+ProgramOnTheWeb=%1 na Web
+UninstallProgram=Desinstalar o %1
+LaunchProgram=Executar o %1
+AssocFileExtension=&Associar o %1 aos ficheiros com a extens\xE3o %2
+AssocingFileExtension=A associar o %1 aos ficheiros com a extens\xE3o %2...
+
+;Things we can also localize
+CompanyName=Thingamahoochie Software
+
+;Types
+TypicalInstallation=Typical Installation
+FullInstallation=Full Installation
+CompactInstallation=Compact Installation
+CustomInstallation=Custom Installation
+
+;Components
+AppCoreFiles=WinMerge Core Files
+ApplicationRuntimes=Application Runtimes
+UsersGuide=User's Guide
+Filters=Filters
+Plugins=Plugins
+
+;Localization Components
+Languages=Languages
+BulgarianLanguage=Bulgarian menus and dialogs
+CatalanLanguage=Catalan menus and dialogs
+ChineseSimplifiedLanguage=Chinese (Simplified) menus and dialogs
+ChineseTraditionalLanguage=Chinese (Traditional) menus and dialogs
+CzechLanguage=Czech menus and dialogs
+DanishLanguage=Danish menus and dialogs
+DutchLanguage=Dutch menus and dialogs
+FrenchLanguage=French menus and dialogs
+GermanLanguage=German menus and dialogs
+HungarianLanguage=Hungarian menus and dialogs
+ItalianLanguage=Italian menus and dialogs
+JapaneseLanguage=Japanese menus and dialogs
+KoreanLanguage=Korean menus and dialogs
+NorwegianLanguage=Norwegian menus and dialogs
+PolishLanguage=Polish menus and dialogs
+PortugueseBrazilLanguage=Portuguese (Brazilian) menus and dialogs
+PortugueseLanguage=Portuguese menus and dialogs
+RussianLanguage=Russian menus and dialogs
+SlovakLanguage=Slovak menus and dialogs
+SpanishLanguage=Spanish menus and dialogs
+SwedishLanguage=Swedish menus and dialogs
+TurkishLanguage=Turkish menus and dialogs
+
+;Tasks
+ExplorerContextMenu=&Enable Explorer context menu integration
+IntegrateTortoiseCVS=Integrate with &TortoiseCVS
+IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
+IntegrateClearCase=Integrate with Rational &ClearCase
+IntegrateDelphi4=Borland\xAE Delphi &4 Binary File Support
+UpdatingCommonControls=Updating the System's Common Controls
+
+;Icon Labels
+ReadMe=Read Me
+UsersGuide=User's Guide
+UpdatingCommonControls=Updating the System's Common Controls
+ViewStartMenuFolder=&View the WinMerge Start Menu Folder
+PluginsText=Plugins
+
+;Code Dialogs
+DeletePreviousStartMenu=The installer has detected that you changed the location of your start menu from "%s" to "%s". Would you like to delete the previous start menu folder?
+
+; Project file description
+ProjectFileDesc=WinMerge Project file
Property changes on: trunk/Installer/InnoSetup/Languages/Portuguese.isl
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/Installer/InnoSetup/Languages/Russian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Russian.isl 2007-09-24 23:07:19 UTC (rev 4559)
+++ trunk/Installer/InnoSetup/Languages/Russian.isl 2007-09-25 14:04:18 UTC (rev 4560)
@@ -340,7 +340,8 @@
KoreanLanguage=Korean menus and dialogs
NorwegianLanguage=Norwegian menus and dialogs
PolishLanguage=Polish menus and dialogs
-PortugueseLanguage=Portuguese (Brazilian) menus and dialogs
+PortugueseBrazilLanguage=Portuguese (Brazilian) menus and dialogs
+PortugueseLanguage=Portuguese menus and dialogs
RussianLanguage=Russian menus and dialogs
SlovakLanguage=Slovak menus and dialogs
SpanishLanguage=Spanish menus and dialogs
Modified: trunk/Installer/InnoSetup/Languages/Slovak.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Slovak.isl 2007-09-24 23:07:19 UTC (rev 4559)
+++ trunk/Installer/InnoSetup/Languages/Slovak.isl 2007-09-25 14:04:18 UTC (rev 4560)
@@ -282,7 +282,8 @@
KoreanLanguage=K\xF3rejsk\xE9 ponuky a dial\xF3gy
NorwegianLanguage=N\xF3rske ponuky a dial\xF3gy
PolishLanguage=Po\xBEsk\xE9 ponuky a dial\xF3gy
-PortugueseLanguage=Portugalsk\xE9 (Brazilian) ponuky a dial\xF3gy
+PortugueseBrazilLanguage=Portugalsk\xE9 (Brazilian) ponuky a dial\xF3gy
+PortugueseLanguage=Portugalsk\xE9 ponuky a dial\xF3gy
RussianLanguage=Rusk\xE9 ponuky a dial\xF3gy
SlovakLanguage=Slovensk\xE9 ponuky a dial\xF3gy
SpanishLanguage=\x8Apanielske ponuky a dial\xF3gy
Modified: trunk/Installer/InnoSetup/Languages/Spanish.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Spanish.isl 2007-09-24 23:07:19 UTC (rev 4559)
+++ trunk/Installer/InnoSetup/Languages/Spanish.isl 2007-09-25 14:04:18 UTC (rev 4560)
@@ -349,7 +349,8 @@
KoreanLanguage=Korean menus and dialogs
NorwegianLanguage=Norwegian menus and dialogs
PolishLanguage=Polish menus and dialogs
-PortugueseLanguage=Portuguese (Brazilian) menus and dialogs
+PortugueseBrazilLanguage=Portuguese (Brazilian) menus and dialogs
+PortugueseLanguage=Portuguese menus and dialogs
RussianLanguage=Russian menus and dialogs
SlovakLanguage=Slovak menus and dialogs
SpanishLanguage=Spanish menus and dialogs
Modified: trunk/Installer/InnoSetup/Languages/Swedish.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Swedish.isl 2007-09-24 23:07:19 UTC (rev 4559)
+++ trunk/Installer/InnoSetup/Languages/Swedish.isl 2007-09-25 14:04:18 UTC (rev 4560)
@@ -343,7 +343,8 @@
KoreanLanguage=Koreanska menyer och dialoger
NorwegianLanguage=Norska menyer och dialoger
PolishLanguage=Polska menyer och dialoger
-PortugueseLanguage=Portugisiska (Brasiliansk) menyer och dialoger
+PortugueseBrazilLanguage=Portugisiska (Brasiliansk) menyer och dialoger
+PortugueseLanguage=Portugisiska menyer och dialoger
RussianLanguage=Ryska menyer och dialoger
SlovakLanguage=Slovakiska menyer och dialoger
SpanishLanguage=Spanska menyer och dialoger
Modified: trunk/Installer/InnoSetup/Languages/Turkish.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Turkish.isl 2007-09-24 23:07:19 UTC (rev 4559)
+++ trunk/Installer/InnoSetup/Languages/Turkish.isl 2007-09-25 14:04:18 UTC (rev 4560)
@@ -351,7 +351,8 @@
KoreanLanguage=Korean menus and dialogs
NorwegianLanguage=Norwegian menus and dialogs
PolishLanguage=Polish menus and dialogs
-PortugueseLanguage=Portuguese (Brazilian) menus and dialogs
+PortugueseBrazilLanguage=Portuguese (Brazilian) menus and dialogs
+PortugueseLanguage=Portuguese menus and dialogs
RussianLanguage=Russian menus and dialogs
SlovakLanguage=Slovak menus and dialogs
SpanishLanguage=Spanish menus and dialogs
Modified: trunk/Installer/InnoSetup/WinMerge.iss
===================================================================
--- trunk/Installer/InnoSetup/WinMerge.iss 2007-09-24 23:07:19 UTC (rev 4559)
+++ trunk/Installer/InnoSetup/WinMerge.iss 2007-09-25 14:04:18 UTC (rev 4560)
@@ -1,4 +1,4 @@
-; RCS ID line follows -- this is updated by CVS
+; ID line follows -- this is updated by SVN
; $Id$
;
; Programmed by: Christian Blackburn, Christian List, Kimmo Varis
@@ -129,7 +129,8 @@
Name: Korean; MessagesFile: Languages\Korean.isl
Name: Norwegian; MessagesFile: Languages\Norwegian.isl
Name: Polish; MessagesFile: Languages\Polish.isl
-Name: Portuguese; MessagesFile: Languages\Brazilian_Portuguese.isl
+Name: Portuguese; MessagesFile: Languages\Portuguese.isl
+Name: PortugueseBrazilian; MessagesFile: Languages\Brazilian_Portuguese.isl
Name: Russian; MessagesFile: Languages\Russian.isl
Name: Slovak; MessagesFile: Languages\Slovak.isl
Name: Spanish; MessagesFile: Languages\Spanish.isl; InfoAfterFile: ..\..\Docs\Users\Languages\ReadMe-Spanish.txt
@@ -208,6 +209,9 @@
Name: Languages\Portuguese; Description: {cm:PortugueseLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Portuguese
Name: Languages\Portuguese; Description: {cm:PortugueseLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Portuguese
+Name: Languages\PortugueseBrazilian; Description: {cm:PortugueseBrazilLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not PortugueseBrazilian
+Name: Languages\PortugueseBrazilian; Description: {cm:PortugueseBrazilLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: PortugueseBrazilian
+
Name: Languages\Russian; Description: {cm:RussianLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Russian
Name: Languages\Russian; Description: {cm:RussianLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Russian
@@ -249,8 +253,8 @@
;This won't work, because the file has to be unregistered, and explorer closed, first.
;Name: {app}\ShellExtension.dll; Type: files; Check: TaskDisabled('ShellExtension')
+Name: {app}\Languages\MergeBrazilian.lang; Type: files; Check: not IsComponentSelected('PortugueseBrazilian')
Name: {app}\Languages\MergeBulgarian.lang; Type: files; Check: not IsComponentSelected('Bulgarian')
-Name: {app}\Languages\MergeBrazilian.lang; Type: files; Check: not IsComponentSelected('Portuguese')
Name: {app}\Languages\MergeCatalan.lang; Type: files; Check: not IsComponentSelected('Catalan')
Name: {app}\Languages\MergeChineseSimplified.lang; Type: files; Check: not IsComponentSelected('Chinese_Simplified')
Name: {app}\Languages\MergeChineseTraditional.lang; Type: files; Check: not IsComponentSelected('Chinese_Traditional')
@@ -265,6 +269,7 @@
Name: {app}\Languages\MergeKorean.lang; Type: files; Check: not IsComponentSelected('Korean')
Name: {app}\Languages\MergeNorwegian.lang; Type: files; Check: not IsComponentSelected('Norwegian')
Name: {app}\Languages\MergePolish.lang; Type: files; Check: not IsComponentSelected('Polish')
+Name: {app}\Languages\MergePortuguese.lang; Type: files; Check: not IsComponentSelected('Portuguese')
Name: {app}\Languages\MergeSlovak.lang; Type: files; Check: not IsComponentSelected('Slovak')
Name: {app}\Languages\MergeSpanish.lang; Type: files; Check: not IsComponentSelected('Spanish')
Name: {app}\Languages\MergeRussian.lang; Type: files; Check: not IsComponentSelected('Russian')
@@ -331,11 +336,12 @@
Source: ..\..\Build\ShellExtensionX64\ShellExtensionX64.dll; DestDir: {app}; Flags: regserver uninsrestartdelete restartreplace promptifolder 64bit; MinVersion: 0,5.01.2600; Check: IsWin64
; Expat dll
-Source: ..\..\Build\expat\libexpat.dll; DestDir: {app}; Flags: promptifolder; Components: Core;
+Source: ..\..\Build\expat\libexpat.dll; DestDir: {app}; Flags: promptifolder; Components: Core
; PCRE dll
Source: ..\..\Build\pcre\pcre.dll; DestDir: {app}; Flags: promptifolder; Components: Core
+Source: ..\..\Build\Languages\MergeBrazilian.lang; DestDir: {app}\Languages; Components: Languages\PortugueseBrazilian; Flags: ignoreversion comparetimestamp
Source: ..\..\Build\Languages\MergeBulgarian.lang; DestDir: {app}\Languages; Components: Languages\Bulgarian; Flags: ignoreversion comparetimestamp
Source: ..\..\Docs\Users\Languages\ReadMe-Bulgarian.txt; DestDir: {app}\Docs; Components: Languages\Bulgarian
Source: ..\..\Build\Languages\MergeCatalan.lang; DestDir: {app}\Languages; Components: Languages\Catalan; Flags: ignoreversion comparetimestamp
@@ -353,7 +359,7 @@
Source: ..\..\Build\Languages\MergeKorean.lang; DestDir: {app}\Languages; Components: Languages\Korean; Flags: ignoreversion comparetimestamp
Source: ..\..\Build\Languages\MergeNorwegian.lang; DestDir: {app}\Languages; Components: Languages\Norwegian; Flags: ignoreversion comparetimestamp
Source: ..\..\Build\Languages\MergePolish.lang; DestDir: {app}\Languages; Components: Languages\Polish; Flags: ignoreversion comparetimestamp
-Source: ..\..\Build\Languages\MergeBrazilian.lang; DestDir: {app}\Languages; Components: Languages\Portuguese; Flags: ignoreversion comparetimestamp
+Source: ..\..\Build\Languages\MergePortuguese.lang; DestDir: {app}\Languages; Components: Languages\Portuguese; Flags: ignoreversion comparetimestamp
Source: ..\..\Build\Languages\MergeRussian.lang; DestDir: {app}\Languages; Components: Languages\Russian; Flags: ignoreversion comparetimestamp
Source: ..\..\Build\Languages\MergeSlovak.lang; DestDir: {app}\Languages; Components: Languages\Slovak; Flags: ignoreversion comparetimestamp
Source: ..\..\Build\Languages\MergeSpanish.lang; DestDir: {app}\Languages; Components: Languages\Spanish; Flags: ignoreversion comparetimestamp
@@ -467,6 +473,8 @@
Root: HKCU; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000412; Flags: deletevalue; Languages: Korean
Root: HKCU; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000414; Flags: deletevalue; Languages: Norwegian
Root: HKCU; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000415; Flags: deletevalue; Languages: Polish
+Root: HKCU; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000816; Flags: deletevalue; Languages: Portuguese
+Root: HKCU; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000416; Flags: deletevalue; Languages: PortugueseBrazilian
Root: HKCU; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000419; Flags: deletevalue; Languages: Russian
Root: HKCU; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $0000041b; Flags: deletevalue; Languages: Slovak
Root: HKCU; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000c0a; Flags: deletevalue; Languages: Spanish
@@ -991,4 +999,3 @@
IntegrateClearCase(WinMergeExeName(), '..\..\bin\cleardiffmrg.exe');
end;
End;
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2008-03-13 21:39:20
|
Revision: 5143
http://winmerge.svn.sourceforge.net/winmerge/?rev=5143&view=rev
Author: gerundt
Date: 2008-03-13 14:39:08 -0700 (Thu, 13 Mar 2008)
Log Message:
-----------
BUG: [ 1909967 ] Installer Should Ignore Shortcut Creation Errors - Remove start menu order trick
Modified Paths:
--------------
trunk/Installer/InnoSetup/WinMerge.iss
Removed Paths:
-------------
trunk/Installer/InnoSetup/Start Menu Order.reg
Deleted: trunk/Installer/InnoSetup/Start Menu Order.reg
===================================================================
--- trunk/Installer/InnoSetup/Start Menu Order.reg 2008-03-12 17:24:32 UTC (rev 5142)
+++ trunk/Installer/InnoSetup/Start Menu Order.reg 2008-03-13 21:39:08 UTC (rev 5143)
@@ -1,45 +0,0 @@
-\xFF\xFEW |
