Installer: Add TortoiseSVN/GIT integration support as a 3-way merge tool

--HG--
branch : stable

diff --git a/Installer/InnoSetup/WinMerge.iss b/Installer/InnoSetup/WinMerge.iss
index 71f5505..b3bc980 100755 (executable)
--- a/Installer/InnoSetup/WinMerge.iss
+++ b/Installer/InnoSetup/WinMerge.iss
@@ -608,9 +608,11 @@ Root: HKCU; SubKey: Software\TortoiseCVS\Prefs\External Merge2 Params; ValueType
 \r
 ;Set WinMerge as TortoiseGit diff tool\r
 Root: HKCU; SubKey: Software\TortoiseGit; ValueType: string; ValueName: Diff; ValueData: {app}\{code:ExeName} -e -ub -dl %bname -dr %yname %base %mine; Flags: uninsdeletevalue; Tasks: TortoiseGit\r
+Root: HKCU; SubKey: Software\TortoiseGit; ValueType: string; ValueName: Merge; ValueData: {code:TortoiseSVNGITMergeToolCommandLine}; Flags: uninsdeletevalue; Check: UseAs3WayMergeTool\r
 \r
 ;Set WinMerge as TortoiseSVN diff tool\r
 Root: HKCU; SubKey: Software\TortoiseSVN; ValueType: string; ValueName: Diff; ValueData: {app}\{code:ExeName} -e -ub -dl %bname -dr %yname %base %mine; Flags: uninsdeletevalue; Tasks: TortoiseSVN\r
+Root: HKCU; SubKey: Software\TortoiseSVN; ValueType: string; ValueName: Merge; ValueData: {code:TortoiseSVNGITMergeToolCommandLine}; Flags: uninsdeletevalue; Check: UseAs3WayMergeTool\r
 \r
 ;Whatever the user chooses at the [Select Setup Language] dialog should also determine what language WinMerge will start up in\r
 ;(unless the user already has a startup language specified)\r
@@ -669,11 +671,7 @@ Name: {app}; Type: dirifempty
 \r
 [Code]\r
 Var\r
-    {Stores the version of 7-Zip Installed}\r
-    int7Zip_Version: Integer;\r
-\r
-    {Determines two things whether or not ComCtrl is needed and whether or not we've already checked}\r
-    intComCtlNeeded: Integer;\r
+    g_CheckListBox: TNewCheckListBox;\r
 \r
 {Determines whether or not the user chose to create a start menu}\r
 Function GroupCreated(): boolean;\r
@@ -1116,6 +1114,37 @@ begin
        Result := Dir;\r
 end;\r
 \r
+function UseAs3WayMergeTool(): Boolean;\r
+begin\r
+    Result := g_CheckListBox.Checked[0];\r
+end;\r
+\r
+function TortoiseSVNGITMergeToolCommandLine(Unused: string): string;\r
+var\r
+    lmr: string;\r
+    Args: string;\r
+begin\r
+    if g_CheckListBox.Checked[1] then begin\r
+        lmr := 'r';\r
+        Args := '/e /ub /fr /wl /wm /dl %bname /dm %tname /dr %yname  %base %theirs %mine /o %merged';\r
+    end else if g_CheckListBox.Checked[2] then begin\r
+        lmr := 'm';\r
+        Args := '/e /ub /fm /wl /wr /dl %tname /dm %bname /dr %yname  %theirs %base %mine /o %merged';\r
+    end else begin\r
+        lmr := 'l';\r
+        Args := '/e /ub /fl /wm /wr /dl %yname /dm %tname /dr %bname  %mine %theirs %base /o %merged';\r
+    end;\r
+    if g_CheckListBox.Checked[4] then begin\r
+        Args := Args + ' /a' + lmr;\r
+    end;\r
+    Result := WinMergeExeName() + ' ' + Args;\r
+end;\r
+\r
+function ThreeWayMergePage_ShouldSkipPage(Page: TWizardPage): Boolean;\r
+begin\r
+    Result := not (IsTaskSelected('TortoiseSVN') or IsTaskSelected('TortoiseGIT'));\r
+end;\r
+\r
 #include "modpath.iss"\r
 \r
 procedure CurStepChanged(CurStep: TSetupStep);\r
@@ -1150,3 +1179,52 @@ Begin
         IntegrateClearCase(WinMergeExeName(), '..\..\bin\cleardiffmrg.exe');\r
     end;\r
 End;\r
+\r
+function BooleanToString(Value : Boolean) : String; \r
+begin\r
+  if Value then\r
+    Result := 'true'\r
+  else\r
+    Result := 'false';\r
+end;\r
+\r
+function StringToBoolean(Value : String) : Boolean; \r
+begin\r
+  if Value = 'true' then\r
+    Result := true\r
+  else\r
+    Result := false;\r
+end;\r
+\r
+procedure RegisterPreviousData(PreviousDataKey: Integer);\r
+begin\r
+  SetPreviousData(PreviousDataKey, 'UseAs3WayMergeTool', BooleanToString(g_CheckListBox.Checked[0]));\r
+  SetPreviousData(PreviousDataKey, 'MergeAtRightPane', BooleanToString(g_CheckListBox.Checked[1]));\r
+  SetPreviousData(PreviousDataKey, 'MergeAtCenterPane', BooleanToString(g_CheckListBox.Checked[2]));\r
+  SetPreviousData(PreviousDataKey, 'MergeAtLeftPane', BooleanToString(g_CheckListBox.Checked[3]));\r
+  SetPreviousData(PreviousDataKey, 'AutoMergeAtStartup', BooleanToString(g_CheckListBox.Checked[4]));\r
+end;\r
+\r
+function GetSysColor(ColorType: Integer): Integer;\r
+external 'GetSysColor@user32.dll';\r
+\r
+procedure InitializeWizard();\r
+var\r
+  Page: TWizardPage;\r
+begin\r
+  Page := CreateCustomPage(wpSelectTasks, ExpandConstant('{cm:ThreeWayMergeWizardPageCaption}'), ExpandConstant('{cm:ThreeWayMergeWizardPageDescription}'));\r
+  Page.OnShouldSkipPage := @ThreeWayMergePage_ShouldSkipPage;\r
+\r
+  g_CheckListBox := TNewCheckListBox.Create(Page);\r
+  g_CheckListBox.Width := Page.SurfaceWidth;\r
+  g_CheckListBox.Height := ScaleY(128);\r
+  g_CheckListBox.Flat := True;\r
+  g_CheckListBox.BorderStyle := bsNone;\r
+  g_CheckListBox.Color := GetSysColor(15);\r
+  g_CheckListBox.Parent := Page.Surface;\r
+  g_CheckListBox.AddCheckBox(ExpandConstant('{cm:RegisterWinMergeAs3WayMergeTool}'), '', 0, StringToBoolean(GetPreviousData('UseAs3WayMergeTool', 'true')), True, False, True, nil);\r
+  g_CheckListBox.AddRadioButton(ExpandConstant('{cm:MergeAtRightPane}'), '', 1, StringToBoolean(GetPreviousData('MergeAtRightPane', 'true')), True, nil);\r
+  g_CheckListBox.AddRadioButton(ExpandConstant('{cm:MergeAtCenterPane}'), '', 1, StringToBoolean(GetPreviousData('MergeAtCenterPane', 'false')), True, nil);\r
+  g_CheckListBox.AddRadioButton(ExpandConstant('{cm:MergeAtLeftPane}'), '', 1, StringToBoolean(GetPreviousData('MergeAtLeftPane', 'false')), True, nil);\r
+  g_CheckListBox.AddCheckBox(ExpandConstant('{cm:AutoMergeAtStartup}'), '', 1, StringToBoolean(GetPreviousData('AutoMergeAtStartup', 'true')), True, False, True, nil);\r
+end;\r

diff --git a/Installer/InnoSetup/WinMergeX64.iss b/Installer/InnoSetup/WinMergeX64.iss
index 96644d5..46d853e 100644 (file)
--- a/Installer/InnoSetup/WinMergeX64.iss
+++ b/Installer/InnoSetup/WinMergeX64.iss
@@ -587,9 +587,11 @@ Root: HKCU; SubKey: Software\TortoiseCVS\Prefs\External Merge2 Params; ValueType
 \r
 ;Set WinMerge as TortoiseGit diff tool\r
 Root: HKCU; SubKey: Software\TortoiseGit; ValueType: string; ValueName: Diff; ValueData: {app}\{code:ExeName} -e -ub -dl %bname -dr %yname %base %mine; Flags: uninsdeletevalue; Tasks: TortoiseGit\r
+Root: HKCU; SubKey: Software\TortoiseGit; ValueType: string; ValueName: Merge; ValueData: {code:TortoiseSVNGITMergeToolCommandLine}; Flags: uninsdeletevalue; Check: UseAs3WayMergeTool\r
 \r
 ;Set WinMerge as TortoiseSVN diff tool\r
 Root: HKCU; SubKey: Software\TortoiseSVN; ValueType: string; ValueName: Diff; ValueData: {app}\{code:ExeName} -e -ub -dl %bname -dr %yname %base %mine; Flags: uninsdeletevalue; Tasks: TortoiseSVN\r
+Root: HKCU; SubKey: Software\TortoiseSVN; ValueType: string; ValueName: Merge; ValueData: {code:TortoiseSVNGITMergeToolCommandLine}; Flags: uninsdeletevalue; Check: UseAs3WayMergeTool\r
 \r
 ;Whatever the user chooses at the [Select Setup Language] dialog should also determine what language WinMerge will start up in\r
 ;(unless the user already has a startup language specified)\r
@@ -653,11 +655,7 @@ Name: {app}; Type: dirifempty
 \r
 [Code]\r
 Var\r
-    {Stores the version of 7-Zip Installed}\r
-    int7Zip_Version: Integer;\r
-\r
-    {Determines two things whether or not ComCtrl is needed and whether or not we've already checked}\r
-    intComCtlNeeded: Integer;\r
+    g_CheckListBox: TNewCheckListBox;\r
 \r
 {Determines whether or not the user chose to create a start menu}\r
 Function GroupCreated(): boolean;\r
@@ -1100,6 +1098,37 @@ begin
        Result := Dir;\r
 end;\r
 \r
+function UseAs3WayMergeTool(): Boolean;\r
+begin\r
+    Result := g_CheckListBox.Checked[0];\r
+end;\r
+\r
+function TortoiseSVNGITMergeToolCommandLine(Unused: string): string;\r
+var\r
+    lmr: string;\r
+    Args: string;\r
+begin\r
+    if g_CheckListBox.Checked[1] then begin\r
+        lmr := 'r';\r
+        Args := '/e /ub /fr /wl /wm /dl %bname /dm %tname /dr %yname  %base %theirs %mine /o %merged';\r
+    end else if g_CheckListBox.Checked[2] then begin\r
+        lmr := 'm';\r
+        Args := '/e /ub /fm /wl /wr /dl %tname /dm %bname /dr %yname  %theirs %base %mine /o %merged';\r
+    end else begin\r
+        lmr := 'l';\r
+        Args := '/e /ub /fl /wm /wr /dl %yname /dm %tname /dr %bname  %mine %theirs %base /o %merged';\r
+    end;\r
+    if g_CheckListBox.Checked[4] then begin\r
+        Args := Args + ' /a' + lmr;\r
+    end;\r
+    Result := WinMergeExeName() + ' ' + Args;\r
+end;\r
+\r
+function ThreeWayMergePage_ShouldSkipPage(Page: TWizardPage): Boolean;\r
+begin\r
+    Result := not (IsTaskSelected('TortoiseSVN') or IsTaskSelected('TortoiseGIT'));\r
+end;\r
+\r
 #include "modpath.iss"\r
 \r
 procedure CurStepChanged(CurStep: TSetupStep);\r
@@ -1134,3 +1163,49 @@ Begin
         IntegrateClearCase(WinMergeExeName(), '..\..\bin\cleardiffmrg.exe');\r
     end;\r
 End;\r
+\r
+function BooleanToString(Value : Boolean) : String; \r
+begin\r
+  if Value then\r
+    Result := 'true'\r
+  else\r
+    Result := 'false';\r
+end;\r
+\r
+function StringToBoolean(Value : String) : Boolean; \r
+begin\r
+  if Value = 'true' then\r
+    Result := true\r
+  else\r
+    Result := false;\r
+end;\r
+\r
+procedure RegisterPreviousData(PreviousDataKey: Integer);\r
+begin\r  SetPreviousData(PreviousDataKey, 'UseAs3WayMergeTool', BooleanToString(g_CheckListBox.Checked[0]));\r
+  SetPreviousData(PreviousDataKey, 'MergeAtRightPane', BooleanToString(g_CheckListBox.Checked[1]));\r
+  SetPreviousData(PreviousDataKey, 'MergeAtCenterPane', BooleanToString(g_CheckListBox.Checked[2]));\r
+  SetPreviousData(PreviousDataKey, 'MergeAtLeftPane', BooleanToString(g_CheckListBox.Checked[3]));\r
+  SetPreviousData(PreviousDataKey, 'AutoMergeAtStartup', BooleanToString(g_CheckListBox.Checked[4]));\r
+end;\r
+\rfunction GetSysColor(ColorType: Integer): Integer;\r
+external 'GetSysColor@user32.dll';\r
+\r
+procedure InitializeWizard();\r
+var\r
+  Page: TWizardPage;\r
+begin\r
+  Page := CreateCustomPage(wpSelectTasks, ExpandConstant('{cm:ThreeWayMergeWizardPageCaption}'), ExpandConstant('{cm:ThreeWayMergeWizardPageDescription}'));\r
+  Page.OnShouldSkipPage := @ThreeWayMergePage_ShouldSkipPage;\r
+\r
+  g_CheckListBox := TNewCheckListBox.Create(Page);\r
+  g_CheckListBox.Width := Page.SurfaceWidth;\r
+  g_CheckListBox.Height := ScaleY(128);\r
+  g_CheckListBox.Flat := True;\r
+  g_CheckListBox.BorderStyle := bsNone;\r
+  g_CheckListBox.Color := GetSysColor(15);\r
+  g_CheckListBox.Parent := Page.Surface;\r
+  g_CheckListBox.AddCheckBox(ExpandConstant('{cm:RegisterWinMergeAs3WayMergeTool}'), '', 0, StringToBoolean(GetPreviousData('UseAs3WayMergeTool', 'true')), True, False, True, nil);\r
+  g_CheckListBox.AddRadioButton(ExpandConstant('{cm:MergeAtRightPane}'), '', 1, StringToBoolean(GetPreviousData('MergeAtRightPane', 'true')), True, nil);\r
+  g_CheckListBox.AddRadioButton(ExpandConstant('{cm:MergeAtCenterPane}'), '', 1, StringToBoolean(GetPreviousData('MergeAtCenterPane', 'false')), True, nil);\r
+  g_CheckListBox.AddRadioButton(ExpandConstant('{cm:MergeAtLeftPane}'), '', 1, StringToBoolean(GetPreviousData('MergeAtLeftPane', 'false')), True, nil);\r
+  g_CheckListBox.AddCheckBox(ExpandConstant('{cm:AutoMergeAtStartup}'), '', 1, StringToBoolean(GetPreviousData('AutoMergeAtStartup', 'true')), True, False, True, nil);\rend;\r

diff --git a/Translations/InnoSetup/Basque.isl b/Translations/InnoSetup/Basque.isl
index 4535b4d..556e0c7 100644 (file)
--- a/Translations/InnoSetup/Basque.isl
+++ b/Translations/InnoSetup/Basque.isl
@@ -375,6 +375,15 @@ IntegrateTortoiseSVN=Bateratu T&ortoiseSVN-rekin
 IntegrateClearCase=Bateratu Rational &ClearCase-rekin
 AddToPath=&Gehitu WinMerge agiritegia zure sistema helburura
 
+; 3-way merge wizard page
+ThreeWayMergeWizardPageCaption=3-Way Merge
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?
+RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool
+MergeAtRightPane=Merge at right pane
+MergeAtCenterPane=Merge at center pane
+MergeAtLeftPane=Merge at left pane
+AutoMergeAtStartup=Auto-merge at startup time
+
 ;Icon Labels
 ReadMe=Irakurri nazazu
 UsersGuide=Erabiltzaile Gida

diff --git a/Translations/InnoSetup/Brazilian_Portuguese.isl b/Translations/InnoSetup/Brazilian_Portuguese.isl
index 8ac6513..c228795 100755 (executable)
--- a/Translations/InnoSetup/Brazilian_Portuguese.isl
+++ b/Translations/InnoSetup/Brazilian_Portuguese.isl
@@ -374,6 +374,15 @@ IntegrateTortoiseSVN=Integrar com o T&ortoiseSVN
 IntegrateClearCase=Integrar com o Rational &ClearCase
 AddToPath=&Add WinMerge folder to your system path
 
+; 3-way merge wizard page
+ThreeWayMergeWizardPageCaption=3-Way Merge
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?
+RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool
+MergeAtRightPane=Merge at right pane
+MergeAtCenterPane=Merge at center pane
+MergeAtLeftPane=Merge at left pane
+AutoMergeAtStartup=Auto-merge at startup time
+
 ;Icon Labels
 ReadMe=Leia Me
 UsersGuide=Guia do Usuário

diff --git a/Translations/InnoSetup/Bulgarian.isl b/Translations/InnoSetup/Bulgarian.isl
index d4518f4..a6ccee0 100755 (executable)
--- a/Translations/InnoSetup/Bulgarian.isl
+++ b/Translations/InnoSetup/Bulgarian.isl
@@ -376,6 +376,15 @@ IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
 IntegrateClearCase=Integrate with Rational &ClearCase
 AddToPath=&Add WinMerge folder to your system path
 
+; 3-way merge wizard page
+ThreeWayMergeWizardPageCaption=3-Way Merge
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?
+RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool
+MergeAtRightPane=Merge at right pane
+MergeAtCenterPane=Merge at center pane
+MergeAtLeftPane=Merge at left pane
+AutoMergeAtStartup=Auto-merge at startup time
+
 ;Icon Labels
 ReadMe=Read Me
 UsersGuide=User's Guide

diff --git a/Translations/InnoSetup/Catalan.isl b/Translations/InnoSetup/Catalan.isl
index d8e48f5..5b9088f 100755 (executable)
--- a/Translations/InnoSetup/Catalan.isl
+++ b/Translations/InnoSetup/Catalan.isl
@@ -359,6 +359,15 @@ IntegrateTortoiseSVN=Integra amb el T&ortoiseSVN
 IntegrateClearCase=Integra amb el Rational &ClearCase
 AddToPath=&Add WinMerge folder to your system path
 
+; 3-way merge wizard page
+ThreeWayMergeWizardPageCaption=3-Way Merge
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?
+RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool
+MergeAtRightPane=Merge at right pane
+MergeAtCenterPane=Merge at center pane
+MergeAtLeftPane=Merge at left pane
+AutoMergeAtStartup=Auto-merge at startup time
+
 ;Icon Labels
 ReadMe=Llegiu-me
 UsersGuide=Guia de l'usuari

diff --git a/Translations/InnoSetup/Chinese_Simplified.isl b/Translations/InnoSetup/Chinese_Simplified.isl
index 5553cd5..435d16f 100755 (executable)
--- a/Translations/InnoSetup/Chinese_Simplified.isl
+++ b/Translations/InnoSetup/Chinese_Simplified.isl
@@ -366,6 +366,15 @@ IntegrateTortoiseSVN=
 IntegrateClearCase=¼¯³Éµ½ Rational &ClearCase
 AddToPath=&Add WinMerge folder to your system path
 
+; 3-way merge wizard page
+ThreeWayMergeWizardPageCaption=3-Way Merge
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?
+RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool
+MergeAtRightPane=Merge at right pane
+MergeAtCenterPane=Merge at center pane
+MergeAtLeftPane=Merge at left pane
+AutoMergeAtStartup=Auto-merge at startup time
+
 ;Icon Labels
 ReadMe=˵Ã÷Îļþ
 UsersGuide=Óû§ÊÖ²á

diff --git a/Translations/InnoSetup/Chinese_Traditional.isl b/Translations/InnoSetup/Chinese_Traditional.isl
index 444c7e1..80c3961 100755 (executable)
--- a/Translations/InnoSetup/Chinese_Traditional.isl
+++ b/Translations/InnoSetup/Chinese_Traditional.isl
@@ -373,6 +373,15 @@ IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
 IntegrateClearCase=Integrate with Rational &ClearCase
 AddToPath=&Add WinMerge folder to your system path
 
+; 3-way merge wizard page
+ThreeWayMergeWizardPageCaption=3-Way Merge
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?
+RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool
+MergeAtRightPane=Merge at right pane
+MergeAtCenterPane=Merge at center pane
+MergeAtLeftPane=Merge at left pane
+AutoMergeAtStartup=Auto-merge at startup time
+
 ;Icon Labels
 ReadMe=Read Me
 UsersGuide=User's Guide

diff --git a/Translations/InnoSetup/Croatian.isl b/Translations/InnoSetup/Croatian.isl
index fb1f065..3638f95 100644 (file)
--- a/Translations/InnoSetup/Croatian.isl
+++ b/Translations/InnoSetup/Croatian.isl
@@ -369,6 +369,15 @@ IntegrateTortoiseSVN=Integracija s T&ortoiseSVN
 IntegrateClearCase=Integracija s Rational &ClearCase
 AddToPath=&Add WinMerge folder to your system path
 
+; 3-way merge wizard page
+ThreeWayMergeWizardPageCaption=3-Way Merge
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?
+RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool
+MergeAtRightPane=Merge at right pane
+MergeAtCenterPane=Merge at center pane
+MergeAtLeftPane=Merge at left pane
+AutoMergeAtStartup=Auto-merge at startup time
+
 ;Icon Labels
 ReadMe=Proèitaj
 UsersGuide=Vodiæ za korisnika

diff --git a/Translations/InnoSetup/Czech.isl b/Translations/InnoSetup/Czech.isl
index 241a35c..169be40 100755 (executable)
--- a/Translations/InnoSetup/Czech.isl
+++ b/Translations/InnoSetup/Czech.isl
@@ -374,6 +374,15 @@ IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
 IntegrateClearCase=Integrate with Rational &ClearCase
 AddToPath=&Add WinMerge folder to your system path
 
+; 3-way merge wizard page
+ThreeWayMergeWizardPageCaption=3-Way Merge
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?
+RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool
+MergeAtRightPane=Merge at right pane
+MergeAtCenterPane=Merge at center pane
+MergeAtLeftPane=Merge at left pane
+AutoMergeAtStartup=Auto-merge at startup time
+
 ;Icon Labels
 ReadMe=Read Me
 UsersGuide=User's Guide

diff --git a/Translations/InnoSetup/Danish.isl b/Translations/InnoSetup/Danish.isl
index c2e41cd..390bad3 100755 (executable)
--- a/Translations/InnoSetup/Danish.isl
+++ b/Translations/InnoSetup/Danish.isl
@@ -375,6 +375,15 @@ IntegrateTortoiseSVN=Integrer med T&ortoiseSVN
 IntegrateClearCase=Integrer med Rational &ClearCase
 AddToPath=&Tilføj WinMerge folderen til din system path
 
+; 3-way merge wizard page
+ThreeWayMergeWizardPageCaption=3-Way Merge
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?
+RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool
+MergeAtRightPane=Merge at right pane
+MergeAtCenterPane=Merge at center pane
+MergeAtLeftPane=Merge at left pane
+AutoMergeAtStartup=Auto-merge at startup time
+
 ;Icon Labels
 ReadMe=Læs mig
 UsersGuide=Brugermanualen

diff --git a/Translations/InnoSetup/Dutch.isl b/Translations/InnoSetup/Dutch.isl
index fdffdf8..71ba6b2 100755 (executable)
--- a/Translations/InnoSetup/Dutch.isl
+++ b/Translations/InnoSetup/Dutch.isl
@@ -353,6 +353,15 @@ IntegrateTortoiseSVN= Integreren met T&ortoiseSVN
 IntegrateClearCase= Integreren met Rational &ClearCase
 AddToPath=&Add WinMerge folder to your system path
 
+; 3-way merge wizard page
+ThreeWayMergeWizardPageCaption=3-Way Merge
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?
+RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool
+MergeAtRightPane=Merge at right pane
+MergeAtCenterPane=Merge at center pane
+MergeAtLeftPane=Merge at left pane
+AutoMergeAtStartup=Auto-merge at startup time
+
 ;Icon Labels
 ReadMe=Lees Mij
 UsersGuide=Gebruikershandleiding

diff --git a/Translations/InnoSetup/English.isl b/Translations/InnoSetup/English.isl
index 9f67936..e129c9d 100755 (executable)
--- a/Translations/InnoSetup/English.isl
+++ b/Translations/InnoSetup/English.isl
@@ -378,6 +378,15 @@ IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
 IntegrateClearCase=Integrate with Rational &ClearCase
 AddToPath=&Add WinMerge folder to your system path
 
+; 3-way merge wizard page
+ThreeWayMergeWizardPageCaption=3-Way Merge
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?
+RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool
+MergeAtRightPane=Merge at right pane
+MergeAtCenterPane=Merge at center pane
+MergeAtLeftPane=Merge at left pane
+AutoMergeAtStartup=Auto-merge at startup time
+
 ;Icon Labels
 ReadMe=Read Me
 UsersGuide=User's Guide

diff --git a/Translations/InnoSetup/French.isl b/Translations/InnoSetup/French.isl
index 1419acd..faf0afd 100755 (executable)
--- a/Translations/InnoSetup/French.isl
+++ b/Translations/InnoSetup/French.isl
@@ -368,6 +368,15 @@ IntegrateTortoiseSVN=Integrer avec T&ortoiseSVN
 IntegrateClearCase=Integrer avec Rational &ClearCase
 AddToPath=&Ajouter le répertoire WinMerge au chemin du système
 
+; 3-way merge wizard page
+ThreeWayMergeWizardPageCaption=3-Way Merge
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?
+RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool
+MergeAtRightPane=Merge at right pane
+MergeAtCenterPane=Merge at center pane
+MergeAtLeftPane=Merge at left pane
+AutoMergeAtStartup=Auto-merge at startup time
+
 ;Icon Labels
 ReadMe=Lisez moi
 UsersGuide=Guide de l'usager

diff --git a/Translations/InnoSetup/Galician.isl b/Translations/InnoSetup/Galician.isl
index de0e4ed..b8eb628 100644 (file)
--- a/Translations/InnoSetup/Galician.isl
+++ b/Translations/InnoSetup/Galician.isl
@@ -375,6 +375,15 @@ IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
 IntegrateClearCase=Integrate with Rational &ClearCase
 AddToPath=&Add WinMerge folder to your system path
 
+; 3-way merge wizard page
+ThreeWayMergeWizardPageCaption=3-Way Merge
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?
+RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool
+MergeAtRightPane=Merge at right pane
+MergeAtCenterPane=Merge at center pane
+MergeAtLeftPane=Merge at left pane
+AutoMergeAtStartup=Auto-merge at startup time
+
 ;Icon Labels
 ReadMe=Read Me
 UsersGuide=User's Guide

diff --git a/Translations/InnoSetup/German.isl b/Translations/InnoSetup/German.isl
index 6e306b1..d764dda 100755 (executable)
--- a/Translations/InnoSetup/German.isl
+++ b/Translations/InnoSetup/German.isl
@@ -365,6 +365,15 @@ IntegrateTortoiseSVN=Integrieren in T&ortoiseSVN
 IntegrateClearCase=Integrieren in Rational &ClearCase
 AddToPath=&Add WinMerge folder to your system path
 
+; 3-way merge wizard page
+ThreeWayMergeWizardPageCaption=3-Way Merge
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?
+RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool
+MergeAtRightPane=Merge at right pane
+MergeAtCenterPane=Merge at center pane
+MergeAtLeftPane=Merge at left pane
+AutoMergeAtStartup=Auto-merge at startup time
+
 ;Icon Labels
 ReadMe=LIESMICH-Datei
 UsersGuide=Benutzerhandbuch

diff --git a/Translations/InnoSetup/Greek.isl b/Translations/InnoSetup/Greek.isl
index 741dd76..65777b4 100644 (file)
--- a/Translations/InnoSetup/Greek.isl
+++ b/Translations/InnoSetup/Greek.isl
@@ -376,6 +376,15 @@ IntegrateTortoiseSVN=
 IntegrateClearCase=ÅíóùìÜôùóç ôïõ Rational &ClearCase
 AddToPath=&Add WinMerge folder to your system path
 
+; 3-way merge wizard page
+ThreeWayMergeWizardPageCaption=3-Way Merge
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?
+RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool
+MergeAtRightPane=Merge at right pane
+MergeAtCenterPane=Merge at center pane
+MergeAtLeftPane=Merge at left pane
+AutoMergeAtStartup=Auto-merge at startup time
+
 ;Icon Labels
 ReadMe=Áðáñáßôçôåò Ðëçñïöïñßåò (Read Me)
 UsersGuide=Ïäçãßåò ×ñÞóåùò

diff --git a/Translations/InnoSetup/Hungarian.isl b/Translations/InnoSetup/Hungarian.isl
index 554f0d6..9dd0ee8 100755 (executable)
--- a/Translations/InnoSetup/Hungarian.isl
+++ b/Translations/InnoSetup/Hungarian.isl
@@ -395,6 +395,15 @@ IntegrateTortoiseSVN=Integr
 IntegrateClearCase=Integrálás a Rational &ClearCase programmal
 AddToPath=&Add WinMerge folder to your system path
 
+; 3-way merge wizard page
+ThreeWayMergeWizardPageCaption=3-Way Merge
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?
+RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool
+MergeAtRightPane=Merge at right pane
+MergeAtCenterPane=Merge at center pane
+MergeAtLeftPane=Merge at left pane
+AutoMergeAtStartup=Auto-merge at startup time
+
 ;Icon Labels
 ReadMe=Olvass el
 UsersGuide=Felhasználói kézikönyv

diff --git a/Translations/InnoSetup/Italian.isl b/Translations/InnoSetup/Italian.isl
index 58b5d05..0a2d1c6 100755 (executable)
--- a/Translations/InnoSetup/Italian.isl
+++ b/Translations/InnoSetup/Italian.isl
@@ -379,6 +379,15 @@ IntegrateTortoiseSVN=Integrazione con T&ortoiseSVN
 IntegrateClearCase=Integrazione con Rational &ClearCase
 AddToPath=&Add WinMerge folder to your system path
 
+; 3-way merge wizard page
+ThreeWayMergeWizardPageCaption=3-Way Merge
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?
+RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool
+MergeAtRightPane=Merge at right pane
+MergeAtCenterPane=Merge at center pane
+MergeAtLeftPane=Merge at left pane
+AutoMergeAtStartup=Auto-merge at startup time
+
 ;Icon Labels
 ReadMe=Leggimi
 UsersGuide=Guida per l'utente

diff --git a/Translations/InnoSetup/Japanese.isl b/Translations/InnoSetup/Japanese.isl
index b37499a..4141b62 100755 (executable)
--- a/Translations/InnoSetup/Japanese.isl
+++ b/Translations/InnoSetup/Japanese.isl
@@ -378,6 +378,15 @@ IntegrateTortoiseSVN=TortoiseSVN
 IntegrateClearCase=Rational ClearCase\82Æ\82Ì\98A\8cg(&C)
 AddToPath=\83V\83X\83e\83\80\8aÂ\8b«\95Ï\90\94PATH\82ÖWinMerge\82Ì\83t\83H\83\8b\83_\82ð\92Ç\89Á\82·\82é(&A)
 
+; 3-way merge wizard page
+ThreeWayMergeWizardPageCaption=3\95û\8cü\83}\81[\83W
+ThreeWayMergeWizardPageDescription=TortoiseSVN/GIT\82Å WinMerge \82ð3\95û\8cü\83}\81[\83W\83c\81[\83\8b\82Æ\82µ\82Ä\8eg\97p\82µ\82Ü\82·\82©?
+RegisterWinMergeAs3WayMergeTool=WinMerge \82ð3\95û\8cü\83}\81[\83W\83c\81[\83\8b\82Æ\82µ\82Ä\93o\98^\82·\82é
+MergeAtRightPane=\89E\91¤\83y\83C\83\93\82Å\83}\81[\83W
+MergeAtCenterPane=\92\86\89\9b\83y\83C\83\93\82Å\83}\81[\83W
+MergeAtLeftPane=\8d¶\91¤\83y\83C\83\93\82Å\83}\81[\83W
+AutoMergeAtStartup=\8bN\93®\8e\9e\82É\8e©\93®\83}\81[\83W\82·\82é
+
 ;Icon Labels
 ReadMe=Read Me
 UsersGuide=\83\86\81[\83U\81[\83K\83C\83h

diff --git a/Translations/InnoSetup/Korean.isl b/Translations/InnoSetup/Korean.isl
index 21bae7f..ae41c50 100755 (executable)
--- a/Translations/InnoSetup/Korean.isl
+++ b/Translations/InnoSetup/Korean.isl
@@ -380,6 +380,15 @@ IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
 IntegrateClearCase=Integrate with Rational &ClearCase
 AddToPath=&Add WinMerge folder to your system path
 
+; 3-way merge wizard page
+ThreeWayMergeWizardPageCaption=3-Way Merge
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?
+RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool
+MergeAtRightPane=Merge at right pane
+MergeAtCenterPane=Merge at center pane
+MergeAtLeftPane=Merge at left pane
+AutoMergeAtStartup=Auto-merge at startup time
+
 ;Icon Labels
 ReadMe=Read Me
 UsersGuide=User's Guide

diff --git a/Translations/InnoSetup/Norwegian.isl b/Translations/InnoSetup/Norwegian.isl
index 59b5aae..e42e1d7 100755 (executable)
--- a/Translations/InnoSetup/Norwegian.isl
+++ b/Translations/InnoSetup/Norwegian.isl
@@ -372,6 +372,15 @@ IntegrateTortoiseSVN=Integrer med T&ortoiseSVN
 IntegrateClearCase=Integrer med Rational &ClearCase
 AddToPath=&Add WinMerge folder to your system path
 
+; 3-way merge wizard page
+ThreeWayMergeWizardPageCaption=3-Way Merge
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?
+RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool
+MergeAtRightPane=Merge at right pane
+MergeAtCenterPane=Merge at center pane
+MergeAtLeftPane=Merge at left pane
+AutoMergeAtStartup=Auto-merge at startup time
+
 ;Icon Labels
 ReadMe=LesMeg
 UsersGuide=Brukermanual

diff --git a/Translations/InnoSetup/Persian.isl b/Translations/InnoSetup/Persian.isl
index d85931d..908b96b 100644 (file)
--- a/Translations/InnoSetup/Persian.isl
+++ b/Translations/InnoSetup/Persian.isl
@@ -376,6 +376,15 @@ IntegrateTortoiseSVN=&o 혁
 IntegrateClearCase=&C í\98\81ÇÑ\8då ÓÇÒí ÈÇ ÑÔäÇá \98áÑ\98íÓ 
 AddToPath=&A ÇÖÇÝå äãæÏä \81æÔå æíäãÑÌ Èå ãÓíÑåÇí ÓíÓÊã 
 
+; 3-way merge wizard page
+ThreeWayMergeWizardPageCaption=3-Way Merge
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?
+RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool
+MergeAtRightPane=Merge at right pane
+MergeAtCenterPane=Merge at center pane
+MergeAtLeftPane=Merge at left pane
+AutoMergeAtStartup=Auto-merge at startup time
+
 ;Icon Labels
 ReadMe= ãÑÇ ÈÎæÇä 
 UsersGuide= ÑÇåäãÇí \98ÇÑÈÑí 

diff --git a/Translations/InnoSetup/Polish.isl b/Translations/InnoSetup/Polish.isl
index 503239f..029ff0b 100755 (executable)
--- a/Translations/InnoSetup/Polish.isl
+++ b/Translations/InnoSetup/Polish.isl
@@ -365,6 +365,15 @@ IntegrateTortoiseSVN=Integracja z T&ortoiseSVN
 IntegrateClearCase=Integracja z Rational &ClearCase
 AddToPath=&Dodaj folder WinMerge do sciezki systemowej
 
+; 3-way merge wizard page
+ThreeWayMergeWizardPageCaption=3-Way Merge
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?
+RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool
+MergeAtRightPane=Merge at right pane
+MergeAtCenterPane=Merge at center pane
+MergeAtLeftPane=Merge at left pane
+AutoMergeAtStartup=Auto-merge at startup time
+
 ;Icon Labels
 ReadMe=Czytaj to
 UsersGuide=Przewodnik u¿ytkownika

diff --git a/Translations/InnoSetup/Portuguese.isl b/Translations/InnoSetup/Portuguese.isl
index 765ac78..f830717 100644 (file)
--- a/Translations/InnoSetup/Portuguese.isl
+++ b/Translations/InnoSetup/Portuguese.isl
@@ -357,6 +357,15 @@ IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
 IntegrateClearCase=Integrate with Rational &ClearCase
 AddToPath=&Add WinMerge folder to your system path
 
+; 3-way merge wizard page
+ThreeWayMergeWizardPageCaption=3-Way Merge
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?
+RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool
+MergeAtRightPane=Merge at right pane
+MergeAtCenterPane=Merge at center pane
+MergeAtLeftPane=Merge at left pane
+AutoMergeAtStartup=Auto-merge at startup time
+
 ;Icon Labels
 ReadMe=Read Me
 UsersGuide=User's Guide

diff --git a/Translations/InnoSetup/Romanian.isl b/Translations/InnoSetup/Romanian.isl
index bbd4f86..1c946dd 100644 (file)
--- a/Translations/InnoSetup/Romanian.isl
+++ b/Translations/InnoSetup/Romanian.isl
@@ -376,6 +376,15 @@ IntegrateTortoiseSVN=Integrare cu T&ortoiseSVN
 IntegrateClearCase=Integrare cu Rational &ClearCase
 AddToPath=&Add WinMerge folder to your system path
 
+; 3-way merge wizard page
+ThreeWayMergeWizardPageCaption=3-Way Merge
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?
+RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool
+MergeAtRightPane=Merge at right pane
+MergeAtCenterPane=Merge at center pane
+MergeAtLeftPane=Merge at left pane
+AutoMergeAtStartup=Auto-merge at startup time
+
 ;Icon Labels
 ReadMe=Citeste
 UsersGuide=Ghidul utilizatorului

diff --git a/Translations/InnoSetup/Russian.isl b/Translations/InnoSetup/Russian.isl
index cf937ba..81dce12 100755 (executable)
--- a/Translations/InnoSetup/Russian.isl
+++ b/Translations/InnoSetup/Russian.isl
@@ -363,6 +363,15 @@ IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
 IntegrateClearCase=Integrate with Rational &ClearCase
 AddToPath=&Add WinMerge folder to your system path
 
+; 3-way merge wizard page
+ThreeWayMergeWizardPageCaption=3-Way Merge
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?
+RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool
+MergeAtRightPane=Merge at right pane
+MergeAtCenterPane=Merge at center pane
+MergeAtLeftPane=Merge at left pane
+AutoMergeAtStartup=Auto-merge at startup time
+
 ;Icon Labels
 ReadMe=Read Me
 UsersGuide=User's Guide

diff --git a/Translations/InnoSetup/Serbian.isl b/Translations/InnoSetup/Serbian.isl
index 64cf0e5..13cfd1d 100644 (file)
--- a/Translations/InnoSetup/Serbian.isl
+++ b/Translations/InnoSetup/Serbian.isl
@@ -370,6 +370,15 @@ IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
 IntegrateClearCase=Integrate with Rational &ClearCase
 AddToPath=&Add WinMerge folder to your system path
 
+; 3-way merge wizard page
+ThreeWayMergeWizardPageCaption=3-Way Merge
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?
+RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool
+MergeAtRightPane=Merge at right pane
+MergeAtCenterPane=Merge at center pane
+MergeAtLeftPane=Merge at left pane
+AutoMergeAtStartup=Auto-merge at startup time
+
 ;Icon Labels
 ReadMe=Read Me
 UsersGuide=User's Guide

diff --git a/Translations/InnoSetup/Slovak.isl b/Translations/InnoSetup/Slovak.isl
index d4b91b1..fd868c0 100755 (executable)
--- a/Translations/InnoSetup/Slovak.isl
+++ b/Translations/InnoSetup/Slovak.isl
@@ -304,6 +304,15 @@ IntegrateTortoiseSVN=Integr
 IntegrateClearCase=Integrácia s Rational &ClearCase
 AddToPath=&Add WinMerge folder to your system path
 
+; 3-way merge wizard page
+ThreeWayMergeWizardPageCaption=3-Way Merge
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?
+RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool
+MergeAtRightPane=Merge at right pane
+MergeAtCenterPane=Merge at center pane
+MergeAtLeftPane=Merge at left pane
+AutoMergeAtStartup=Auto-merge at startup time
+
 ;Icon Labels
 ReadMe=súbor Èítaj ma!
 UsersGuide=Príruèka pou\9eívate¾a

diff --git a/Translations/InnoSetup/Slovenian.isl b/Translations/InnoSetup/Slovenian.isl
index f58d4a7..c8f439e 100644 (file)
--- a/Translations/InnoSetup/Slovenian.isl
+++ b/Translations/InnoSetup/Slovenian.isl
@@ -363,6 +363,15 @@ IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
 IntegrateClearCase=Integrate with Rational &ClearCase
 AddToPath=&Add WinMerge folder to your system path
 
+; 3-way merge wizard page
+ThreeWayMergeWizardPageCaption=3-Way Merge
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?
+RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool
+MergeAtRightPane=Merge at right pane
+MergeAtCenterPane=Merge at center pane
+MergeAtLeftPane=Merge at left pane
+AutoMergeAtStartup=Auto-merge at startup time
+
 ;Icon Labels
 ReadMe=Read Me
 UsersGuide=User's Guide

diff --git a/Translations/InnoSetup/Spanish.isl b/Translations/InnoSetup/Spanish.isl
index c2c3c63..1e9b784 100755 (executable)
--- a/Translations/InnoSetup/Spanish.isl
+++ b/Translations/InnoSetup/Spanish.isl
@@ -372,6 +372,15 @@ IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
 IntegrateClearCase=Integrate with Rational &ClearCase
 AddToPath=&Add WinMerge folder to your system path
 
+; 3-way merge wizard page
+ThreeWayMergeWizardPageCaption=3-Way Merge
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?
+RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool
+MergeAtRightPane=Merge at right pane
+MergeAtCenterPane=Merge at center pane
+MergeAtLeftPane=Merge at left pane
+AutoMergeAtStartup=Auto-merge at startup time
+
 ;Icon Labels
 ReadMe=Read Me
 UsersGuide=User's Guide

diff --git a/Translations/InnoSetup/Swedish.isl b/Translations/InnoSetup/Swedish.isl
index 7115308..665f61b 100755 (executable)
--- a/Translations/InnoSetup/Swedish.isl
+++ b/Translations/InnoSetup/Swedish.isl
@@ -366,6 +366,15 @@ IntegrateTortoiseSVN=Integrera med T&ortoiseSVN
 IntegrateClearCase=Integrera med Rational &ClearCase
 AddToPath=&Lägg till WinMerge-katalogen till din systemsökväg
 
+; 3-way merge wizard page
+ThreeWayMergeWizardPageCaption=3-Way Merge
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?
+RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool
+MergeAtRightPane=Merge at right pane
+MergeAtCenterPane=Merge at center pane
+MergeAtLeftPane=Merge at left pane
+AutoMergeAtStartup=Auto-merge at startup time
+
 ;Icon Labels
 ReadMe=Läs Mig
 UsersGuide=Användarguide

diff --git a/Translations/InnoSetup/Turkish.isl b/Translations/InnoSetup/Turkish.isl
index d7b46ec..32bea35 100755 (executable)
--- a/Translations/InnoSetup/Turkish.isl
+++ b/Translations/InnoSetup/Turkish.isl
@@ -365,6 +365,15 @@ IntegrateTortoiseSVN=T&ortoiseSVN ile b
 IntegrateClearCase=Rational &ClearCase ile bütünleþ
 AddToPath=Win&Merge klasörünü sistem yoluna ekle
 
+; 3-way merge wizard page
+ThreeWayMergeWizardPageCaption=3-Way Merge
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?
+RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool
+MergeAtRightPane=Merge at right pane
+MergeAtCenterPane=Merge at center pane
+MergeAtLeftPane=Merge at left pane
+AutoMergeAtStartup=Auto-merge at startup time
+
 ;Icon Labels
 ReadMe=Beni Oku
 UsersGuide=Kullanýcý Kitabý

diff --git a/Translations/InnoSetup/Ukrainian.isl b/Translations/InnoSetup/Ukrainian.isl
index f61fb6a..8d01f33 100644 (file)
--- a/Translations/InnoSetup/Ukrainian.isl
+++ b/Translations/InnoSetup/Ukrainian.isl
@@ -372,6 +372,15 @@
    IntegrateClearCase=²íòåãðóâàòèñÿ â Rational &ClearCase
    AddToPath=&Add WinMerge folder to your system path
 
+; 3-way merge wizard page
+ThreeWayMergeWizardPageCaption=3-Way Merge
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?
+RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool
+MergeAtRightPane=Merge at right pane
+MergeAtCenterPane=Merge at center pane
+MergeAtLeftPane=Merge at left pane
+AutoMergeAtStartup=Auto-merge at startup time
+
    ;Icon Labels
    ReadMe=Ïðî÷èòàòè Read Me
    UsersGuide=Äîâ³äêà êîðèñòóâà÷à