PATCH: [ 1471767 ] Change Plugins.txt in Start-menu to Plugins

diff --git a/Installer/InnoSetup/Changes.txt b/Installer/InnoSetup/Changes.txt
index 1d8a89d..2d9828a 100755 (executable)
--- a/Installer/InnoSetup/Changes.txt
+++ b/Installer/InnoSetup/Changes.txt
@@ -1,6 +1,9 @@
 2006-04-18 Kimmo
  PATCH: [ 1471760 ] Remove plugins.txt reference from component selection
-  InnoSetup/Languages: .isl
+  InnoSetup/Languages: *.isl
+ PATCH: [ 1471767 ] Change Plugins.txt in Start-menu to Plugins
+  InnoSetup: WinMerge.iss
+  InnoSetup/Languages: *.isl
 
 2006-03-12 Kimmo
  PATCH: [ 1447991 ] Let installer pick lang files from build folder

diff --git a/Installer/InnoSetup/Languages/Brazilian_Portuguese.isl b/Installer/InnoSetup/Languages/Brazilian_Portuguese.isl
index c97d4c3..7e3769b 100755 (executable)
--- a/Installer/InnoSetup/Languages/Brazilian_Portuguese.isl
+++ b/Installer/InnoSetup/Languages/Brazilian_Portuguese.isl
@@ -376,6 +376,7 @@ 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?

diff --git a/Installer/InnoSetup/Languages/Bulgarian.isl b/Installer/InnoSetup/Languages/Bulgarian.isl
index bdf8ff8..703a79b 100755 (executable)
--- a/Installer/InnoSetup/Languages/Bulgarian.isl
+++ b/Installer/InnoSetup/Languages/Bulgarian.isl
@@ -370,6 +370,7 @@ 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?

diff --git a/Installer/InnoSetup/Languages/Catalan.isl b/Installer/InnoSetup/Languages/Catalan.isl
index 474f08b..98e2df5 100755 (executable)
--- a/Installer/InnoSetup/Languages/Catalan.isl
+++ b/Installer/InnoSetup/Languages/Catalan.isl
@@ -354,6 +354,7 @@ ReadMe=Llegiu-me
 UsersGuide=Guia de l'usuari
 UpdatingCommonControls=Actualitzant els Controls Comuns del Sistema
 ViewStartMenuFolder=&Veure la carpera del menú Inicia del WinMerge
+PluginsText=Plugins
 
 ;Code Dialogs
 DeletePreviousStartMenu=L'instal·lador ha detectat que heu canviat la ubicació del vostre menú d'inici de "%s" a "%s". Voleu esborrar la carpeta del menú d'inici anterior?

diff --git a/Installer/InnoSetup/Languages/Chinese_Simplified.isl b/Installer/InnoSetup/Languages/Chinese_Simplified.isl
index d2e64e1..14a95f4 100755 (executable)
--- a/Installer/InnoSetup/Languages/Chinese_Simplified.isl
+++ b/Installer/InnoSetup/Languages/Chinese_Simplified.isl
@@ -361,6 +361,7 @@ 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?

diff --git a/Installer/InnoSetup/Languages/Chinese_Traditional.isl b/Installer/InnoSetup/Languages/Chinese_Traditional.isl
index 4922ce6..0951df9 100755 (executable)
--- a/Installer/InnoSetup/Languages/Chinese_Traditional.isl
+++ b/Installer/InnoSetup/Languages/Chinese_Traditional.isl
@@ -368,6 +368,7 @@ 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?

diff --git a/Installer/InnoSetup/Languages/Czech.isl b/Installer/InnoSetup/Languages/Czech.isl
index b3ebd1a..72fb840 100755 (executable)
--- a/Installer/InnoSetup/Languages/Czech.isl
+++ b/Installer/InnoSetup/Languages/Czech.isl
@@ -362,6 +362,7 @@ 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?

diff --git a/Installer/InnoSetup/Languages/Danish.isl b/Installer/InnoSetup/Languages/Danish.isl
index f506d81..1e2af79 100755 (executable)
--- a/Installer/InnoSetup/Languages/Danish.isl
+++ b/Installer/InnoSetup/Languages/Danish.isl
@@ -370,6 +370,7 @@ 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?

diff --git a/Installer/InnoSetup/Languages/Dutch.isl b/Installer/InnoSetup/Languages/Dutch.isl
index e28aaac..8912ff9 100755 (executable)
--- a/Installer/InnoSetup/Languages/Dutch.isl
+++ b/Installer/InnoSetup/Languages/Dutch.isl
@@ -348,6 +348,7 @@ 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?

diff --git a/Installer/InnoSetup/Languages/English.isl b/Installer/InnoSetup/Languages/English.isl
index 1cb1c05..fe30ea3 100755 (executable)
--- a/Installer/InnoSetup/Languages/English.isl
+++ b/Installer/InnoSetup/Languages/English.isl
@@ -368,6 +368,7 @@ 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?

diff --git a/Installer/InnoSetup/Languages/French.isl b/Installer/InnoSetup/Languages/French.isl
index 10f19da..5f3028f 100755 (executable)
--- a/Installer/InnoSetup/Languages/French.isl
+++ b/Installer/InnoSetup/Languages/French.isl
@@ -363,6 +363,7 @@ 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?

diff --git a/Installer/InnoSetup/Languages/German.isl b/Installer/InnoSetup/Languages/German.isl
index 9ccd372..2bb085a 100755 (executable)
--- a/Installer/InnoSetup/Languages/German.isl
+++ b/Installer/InnoSetup/Languages/German.isl
@@ -361,6 +361,7 @@ ReadMe=LIESMICH-Datei
 UsersGuide=Benutzerhandbuch
 UpdatingCommonControls=Aktualisieren der System-Komponenten
 ViewStartMenuFolder=&Anzeigen des Startmenü-Ordners
+PluginsText=Plugins
 
 ;Code Dialogs
 DeletePreviousStartMenu=Das Setup hat entdeckt, dass Sie den Startmenü-Ordner von "%s" in "%s" geändert haben. Möchten Sie den vorherigen Startmenü-Ordner löschen?

diff --git a/Installer/InnoSetup/Languages/Hungarian.isl b/Installer/InnoSetup/Languages/Hungarian.isl
index 294b1c0..6f9574c 100755 (executable)
--- a/Installer/InnoSetup/Languages/Hungarian.isl
+++ b/Installer/InnoSetup/Languages/Hungarian.isl
@@ -382,6 +382,7 @@ ReadMe=Olvass el
 UsersGuide=Felhasználói kézikönyv
 UpdatingCommonControls=Updating the System's Common Controls
 ViewStartMenuFolder=A WinMerge Start Menü mappájának &megtekintése
+PluginsText=Plugins
 
 ;Code Dialogs
 DeletePreviousStartMenu=A Telepítés észlelte, hogy megváltoztattad a Start Menü helyét errõl: "%s" erre: "%s". Szeretnéd eltávolítani a korábbi Start Menü mappát?

diff --git a/Installer/InnoSetup/Languages/Italian.isl b/Installer/InnoSetup/Languages/Italian.isl
index 20242aa..1e1c99b 100755 (executable)
--- a/Installer/InnoSetup/Languages/Italian.isl
+++ b/Installer/InnoSetup/Languages/Italian.isl
@@ -374,6 +374,7 @@ ReadMe=Leggimi
 UsersGuide=Guida per l'utente
 UpdatingCommonControls=Aggiornamento dei controlli comuni del sistema in corso...
 ViewStartMenuFolder=&Visualizza cartella del menu Start di WinMerge
+PluginsText=Plugins
 
 ;Code Dialogs
 DeletePreviousStartMenu=L'installer ha rilevato che il tuo menu Start è stato spostato da "%s" a "%s". Desideri eliminare la precedente cartella del menu Start?

diff --git a/Installer/InnoSetup/Languages/Japanese.isl b/Installer/InnoSetup/Languages/Japanese.isl
index a283e16..65b526c 100755 (executable)
--- a/Installer/InnoSetup/Languages/Japanese.isl
+++ b/Installer/InnoSetup/Languages/Japanese.isl
@@ -358,6 +358,7 @@ ReadMe=Read Me
 UsersGuide=\83\86\81[\83U\81[\83K\83C\83h
 UpdatingCommonControls=\83V\83X\83e\83\80\82Ì\83R\83\82\83\93\83R\83\93\83g\83\8d\81[\83\8b\82ð\83A\83b\83v\83f\81[\83g\82µ\82Ä\82¢\82Ü\82·
 ViewStartMenuFolder=WinMerge \83X\83^\81[\83g\83\81\83j\83\85\81[\83t\83H\83\8b\83_\82ð\95\\8e¦(&V)
+PluginsText=Plugins
 
 ;Code Dialogs
 DeletePreviousStartMenu=\83C\83\93\83X\83g\81[\83\89\82Í\81A\83X\83^\81[\83g\83\81\83j\83\85\81[\83t\83H\83\8b\83_\82Ì\88Ê\92u\82ª "%s" \82©\82ç "%s" \82É\95Ï\8dX\82³\82ê\82½\82±\82Æ\82ð\8c\9f\8fo\82µ\82Ü\82µ\82½. \88È\91O\82Ì\83X\83^\81[\83g\83\81\83j\83\85\81[\83t\83H\83\8b\83_\82ð\8dí\8f\9c\82µ\82Ü\82·\82©?

diff --git a/Installer/InnoSetup/Languages/Korean.isl b/Installer/InnoSetup/Languages/Korean.isl
index 62c4004..1aef4e6 100755 (executable)
--- a/Installer/InnoSetup/Languages/Korean.isl
+++ b/Installer/InnoSetup/Languages/Korean.isl
@@ -376,6 +376,7 @@ 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?

diff --git a/Installer/InnoSetup/Languages/Norwegian.isl b/Installer/InnoSetup/Languages/Norwegian.isl
index 31e6186..6ccb3a5 100755 (executable)
--- a/Installer/InnoSetup/Languages/Norwegian.isl
+++ b/Installer/InnoSetup/Languages/Norwegian.isl
@@ -366,6 +366,7 @@ ReadMe=LesMeg
 UsersGuide=Brukermanual
 UpdatingCommonControls=Oppdater systemets felles kontrollelement
 ViewStartMenuFolder=&Vis WinMerge sin startmeny-mappe
+PluginsText=Plugins
 
 ;Code Dialogs
 DeletePreviousStartMenu=Installasjonsprogrammet har oppdaget at du har endret plasseringen av startmenyen fra "%s" til "%s". Vil du slette den forrige startmeny-mappen?

diff --git a/Installer/InnoSetup/Languages/Polish.isl b/Installer/InnoSetup/Languages/Polish.isl
index 9c40bea..c0ac084 100755 (executable)
--- a/Installer/InnoSetup/Languages/Polish.isl
+++ b/Installer/InnoSetup/Languages/Polish.isl
@@ -360,6 +360,7 @@ ReadMe=Czytaj to
 UsersGuide=Przewodnik uzytkownika
 UpdatingCommonControls=Aktualizacja wspólnych kontrolek systemowych
 ViewStartMenuFolder=&Podglad katalogu menu Start programu WinMerge
+PluginsText=Plugins
 
 ;Code Dialogs
 DeletePreviousStartMenu=Instalator wykryl, ze zmieniles lokalizacje menu startowego z "%s" na "%s". Czy usunac poprzedni katalog menu startowego?

diff --git a/Installer/InnoSetup/Languages/Russian.isl b/Installer/InnoSetup/Languages/Russian.isl
index e70a7f9..bdbcac9 100755 (executable)
--- a/Installer/InnoSetup/Languages/Russian.isl
+++ b/Installer/InnoSetup/Languages/Russian.isl
@@ -358,6 +358,7 @@ 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?

diff --git a/Installer/InnoSetup/Languages/Slovak.isl b/Installer/InnoSetup/Languages/Slovak.isl
index b3a2598..d4da07d 100755 (executable)
--- a/Installer/InnoSetup/Languages/Slovak.isl
+++ b/Installer/InnoSetup/Languages/Slovak.isl
@@ -296,6 +296,7 @@ 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?

diff --git a/Installer/InnoSetup/Languages/Spanish.isl b/Installer/InnoSetup/Languages/Spanish.isl
index 7d56854..f8d4758 100755 (executable)
--- a/Installer/InnoSetup/Languages/Spanish.isl
+++ b/Installer/InnoSetup/Languages/Spanish.isl
@@ -372,6 +372,7 @@ 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?

diff --git a/Installer/InnoSetup/Languages/Swedish.isl b/Installer/InnoSetup/Languages/Swedish.isl
index 7249987..f19cbb2 100755 (executable)
--- a/Installer/InnoSetup/Languages/Swedish.isl
+++ b/Installer/InnoSetup/Languages/Swedish.isl
@@ -361,6 +361,7 @@ ReadMe=L
 UsersGuide=Användarguide
 UpdatingCommonControls=Uppdatera Systemets Vanliga Kontroller
 ViewStartMenuFolder=Visa WinMerges startkatalog
+PluginsText=Plugins
 
 ;Code Dialogs
 DeletePreviousStartMenu=Installationsprogrammet har upptäckt att du har ändrat sökvägen till din startmeny från "%s" till "%s". Vill du ta bort den tidigare startmenykatalogen?

diff --git a/Installer/InnoSetup/Languages/Turkish.isl b/Installer/InnoSetup/Languages/Turkish.isl
index 16f859d..8576794 100755 (executable)
--- a/Installer/InnoSetup/Languages/Turkish.isl
+++ b/Installer/InnoSetup/Languages/Turkish.isl
@@ -362,6 +362,7 @@ 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?

diff --git a/Installer/InnoSetup/WinMerge.iss b/Installer/InnoSetup/WinMerge.iss
index 83fb634..8ea4b26 100755 (executable)
--- a/Installer/InnoSetup/WinMerge.iss
+++ b/Installer/InnoSetup/WinMerge.iss
@@ -396,7 +396,7 @@ 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}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe.txt; IconFileName: {win}\NOTEPAD.EXE
-Name: {group}\Plugins.txt; Filename: {app}\Docs\Plugins.txt; Check: InstallPluginsText
+Name: {group}\{cm:PluginsText}; Filename: {app}\Docs\Plugins.txt; IconFileName: {win}\NOTEPAD.EXE Check: InstallPluginsText
 Name: {group}\{cm:UsersGuide}; Filename: {app}\Docs\WinMerge.chm; Components: docs
 Name: {group}\{cm:UninstallProgram,WinMerge}; Filename: {uninstallexe}