Fix spelling of Git

Signed-off-by: Sven Strickroth <email@cs-ware.de>

diff --git a/Docs/Manual/EN/Install.xml b/Docs/Manual/EN/Install.xml
index 0778a6e..2d33746 100644 (file)
--- a/Docs/Manual/EN/Install.xml
+++ b/Docs/Manual/EN/Install.xml
@@ -254,12 +254,12 @@
           </varlistentry>\r
 \r
           <varlistentry>\r
-            <term>Integrate with TortoiseGIT<indexterm>\r
-                <primary>TortoiseGIT integration</primary>\r
+            <term>Integrate with TortoiseGit<indexterm>\r
+                <primary>TortoiseGit integration</primary>\r
               </indexterm></term>\r
 \r
             <listitem>\r
-              <para>Sets WinMerge to be the TortoiseGIT diff application.</para>\r
+              <para>Sets WinMerge to be the TortoiseGit diff application.</para>\r
             </listitem>\r
           </varlistentry>\r
 \r

diff --git a/Docs/Manual/EN/Version_control.xml b/Docs/Manual/EN/Version_control.xml
index ec82118..a3bb36f 100644 (file)
--- a/Docs/Manual/EN/Version_control.xml
+++ b/Docs/Manual/EN/Version_control.xml
@@ -65,7 +65,7 @@
         <primary>TortoiseSVN integration</primary>
       </indexterm>
 
-      <para>When you compare files in TortoiseCVS, TortoiseSVN, or TortoiseGIT,
+      <para>When you compare files in TortoiseCVS, TortoiseSVN, or TortoiseGit,
       you can have the VCS launch WinMerge instead of its native diff
       utility. You can configure some of these integrations during <link
       linkend="Installing_usinginstaller">WinMerge installation</link>.</para>
@@ -74,7 +74,7 @@
         <title>Tortoise SVN integration</title>
 
         <para>Here is a sample diff operation in TortoiseSVN that uses the
-        WinMerge integration. The integrations with TortoiseCVS and TortoiseGIT
+        WinMerge integration. The integrations with TortoiseCVS and TortoiseGit
         are similar.</para>
 
         <orderedlist>

diff --git a/Docs/Manual/JP/Install.xml b/Docs/Manual/JP/Install.xml
index 6ec4230..77e8db3 100644 (file)
--- a/Docs/Manual/JP/Install.xml
+++ b/Docs/Manual/JP/Install.xml
@@ -240,12 +240,12 @@
           </varlistentry>
 
           <varlistentry>
-            <term>Integrate with TortoiseGIT<indexterm>
-                <primary>TortoiseGIT integration</primary>
+            <term>Integrate with TortoiseGit<indexterm>
+                <primary>TortoiseGit integration</primary>
               </indexterm></term>
 
             <listitem>
-              <para>Sets WinMerge to be the TortoiseGIT diff application.</para>
+              <para>Sets WinMerge to be the TortoiseGit diff application.</para>
             </listitem>
           </varlistentry>
 

diff --git a/Docs/Manual/JP/Version_control.xml b/Docs/Manual/JP/Version_control.xml
index a2b7de9..604922b 100644 (file)
--- a/Docs/Manual/JP/Version_control.xml
+++ b/Docs/Manual/JP/Version_control.xml
@@ -66,7 +66,7 @@
         <primary>TortoiseSVN の統合</primary>
       </indexterm>
 
-      <para>TortoiseCVS、TortoiseSVN、または、TortoiseGIT でファイル比較する際、
+      <para>TortoiseCVS、TortoiseSVN、または、TortoiseGit でファイル比較する際、
         VCSは、組込みの差分ツールの代わりに、WinMergeを起動することができます。
        この設定は、<link
       linkend="Installing_usinginstaller">WinMergeのインストール</link>の最中のみで可能です。</para>
@@ -75,7 +75,7 @@
         <title>TortoiseSVNとの統合</title>
 
         <para>これは、WinMerge統合を使用した、TortoiseSVNでの比較操作のサンプルです。
-        この統合は、TortoiseCVS と TortoiseGIT
+        この統合は、TortoiseCVS と TortoiseGit
         も同じです。</para>
 
         <orderedlist>

diff --git a/Installer/InnoSetup/WinMerge.iss b/Installer/InnoSetup/WinMerge.iss
index f841cc5..7f66a94 100755 (executable)
--- a/Installer/InnoSetup/WinMerge.iss
+++ b/Installer/InnoSetup/WinMerge.iss
@@ -635,11 +635,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}\WinMergeU.exe -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
+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}\WinMergeU.exe -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
+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
@@ -838,7 +838,7 @@ begin
     Result := g_CheckListBox.Checked[0];\r
 end;\r
 \r
-function TortoiseSVNGITMergeToolCommandLine(Unused: string): string;\r
+function TortoiseSVNGitMergeToolCommandLine(Unused: string): string;\r
 var\r
     lmr: string;\r
     Args: string;\r
@@ -861,7 +861,7 @@ end;
 \r
 function ThreeWayMergePage_ShouldSkipPage(Page: TWizardPage): Boolean;\r
 begin\r
-    Result := not (IsTaskSelected('TortoiseSVN') or IsTaskSelected('TortoiseGIT'));\r
+    Result := not (IsTaskSelected('TortoiseSVN') or IsTaskSelected('TortoiseGit'));\r
 end;\r
 \r
 #include "modpath.iss"\r

diff --git a/Installer/InnoSetup/WinMergeX64.is6.iss b/Installer/InnoSetup/WinMergeX64.is6.iss
index a50cf15..78a79ff 100644 (file)
--- a/Installer/InnoSetup/WinMergeX64.is6.iss
+++ b/Installer/InnoSetup/WinMergeX64.is6.iss
@@ -615,11 +615,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}\WinMergeU.exe -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
+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}\WinMergeU.exe -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
+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
@@ -833,7 +833,7 @@ begin
     Result := g_CheckListBox.Checked[0];\r
 end;\r
 \r
-function TortoiseSVNGITMergeToolCommandLine(Unused: string): string;\r
+function TortoiseSVNGitMergeToolCommandLine(Unused: string): string;\r
 var\r
     lmr: string;\r
     Args: string;\r
@@ -856,7 +856,7 @@ end;
 \r
 function ThreeWayMergePage_ShouldSkipPage(Page: TWizardPage): Boolean;\r
 begin\r
-    Result := not (IsTaskSelected('TortoiseSVN') or IsTaskSelected('TortoiseGIT'));\r
+    Result := not (IsTaskSelected('TortoiseSVN') or IsTaskSelected('TortoiseGit'));\r
 end;\r
 \r
 #include "modpath.is6.iss"\r

diff --git a/Installer/InnoSetup/WinMergeX64.iss b/Installer/InnoSetup/WinMergeX64.iss
index bf646ea..be13e88 100644 (file)
--- a/Installer/InnoSetup/WinMergeX64.iss
+++ b/Installer/InnoSetup/WinMergeX64.iss
@@ -613,11 +613,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}\WinMergeU.exe -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
+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}\WinMergeU.exe -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
+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
@@ -821,7 +821,7 @@ begin
     Result := g_CheckListBox.Checked[0];\r
 end;\r
 \r
-function TortoiseSVNGITMergeToolCommandLine(Unused: string): string;\r
+function TortoiseSVNGitMergeToolCommandLine(Unused: string): string;\r
 var\r
     lmr: string;\r
     Args: string;\r
@@ -844,7 +844,7 @@ end;
 \r
 function ThreeWayMergePage_ShouldSkipPage(Page: TWizardPage): Boolean;\r
 begin\r
-    Result := not (IsTaskSelected('TortoiseSVN') or IsTaskSelected('TortoiseGIT'));\r
+    Result := not (IsTaskSelected('TortoiseSVN') or IsTaskSelected('TortoiseGit'));\r
 end;\r
 \r
 #include "modpath.iss"\r

diff --git a/Translations/InnoSetup/Arabic.isl b/Translations/InnoSetup/Arabic.isl
index cfd9791..0235b0d 100644 (file)
--- a/Translations/InnoSetup/Arabic.isl
+++ b/Translations/InnoSetup/Arabic.isl
@@ -61,14 +61,14 @@ UkrainianLanguage=Ukrainian menus and dialogs
 ;Tasks
 ExplorerContextMenu=&Enable Explorer context menu integration
 IntegrateTortoiseCVS=Integrate with &TortoiseCVS
-IntegrateTortoiseGIT=Integrate with To&rtoiseGIT
+IntegrateTortoiseGit=Integrate with To&rtoiseGit
 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?
+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

diff --git a/Translations/InnoSetup/Basque.isl b/Translations/InnoSetup/Basque.isl
index ef81a85..7fa05e9 100644 (file)
--- a/Translations/InnoSetup/Basque.isl
+++ b/Translations/InnoSetup/Basque.isl
@@ -61,14 +61,14 @@ UkrainianLanguage=Ukrainiera menuak eta elkarrizketak
 ;Tasks\r
 ExplorerContextMenu=&Gaitu Explorer hitzinguru menu baterapena\r
 IntegrateTortoiseCVS=Bateratu &TortoiseCVS-rekin\r
-IntegrateTortoiseGIT=Bateratu To&rtoiseGIT-rekin\r
+IntegrateTortoiseGit=Bateratu To&rtoiseGit-rekin\r
 IntegrateTortoiseSVN=Bateratu T&ortoiseSVN-rekin\r
 IntegrateClearCase=Bateratu Rational &ClearCase-rekin\r
 AddToPath=&Gehitu WinMerge agiritegia zure sistema helburura\r
 \r
 ; 3-way merge wizard page\r
 ThreeWayMergeWizardPageCaption=3-Way Merge\r
-ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?\r
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/Git?\r
 RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool\r
 MergeAtRightPane=Merge at right pane\r
 MergeAtCenterPane=Merge at center pane\r

diff --git a/Translations/InnoSetup/Brazilian.isl b/Translations/InnoSetup/Brazilian.isl
index b188212..db25ba9 100755 (executable)
--- a/Translations/InnoSetup/Brazilian.isl
+++ b/Translations/InnoSetup/Brazilian.isl
@@ -61,14 +61,14 @@ UkrainianLanguage=Ukrainian menus and dialogs
 ;Tasks\r
 ExplorerContextMenu=&Ativar a integração com o menu de contexto do explorer\r
 IntegrateTortoiseCVS=Integrar com o &TortoiseCVS\r
-IntegrateTortoiseGIT=Integrar com o To&rtoiseGIT\r
+IntegrateTortoiseGit=Integrar com o To&rtoiseGit\r
 IntegrateTortoiseSVN=Integrar com o T&ortoiseSVN\r
 IntegrateClearCase=Integrar com o Rational &ClearCase\r
 AddToPath=&Add WinMerge folder to your system path\r
 \r
 ; 3-way merge wizard page\r
 ThreeWayMergeWizardPageCaption=3-Way Merge\r
-ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?\r
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/Git?\r
 RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool\r
 MergeAtRightPane=Merge at right pane\r
 MergeAtCenterPane=Merge at center pane\r

diff --git a/Translations/InnoSetup/Bulgarian.isl b/Translations/InnoSetup/Bulgarian.isl
index 5159925..509d7b4 100755 (executable)
--- a/Translations/InnoSetup/Bulgarian.isl
+++ b/Translations/InnoSetup/Bulgarian.isl
@@ -61,14 +61,14 @@ UkrainianLanguage=Ukrainian menus and dialogs
 ;Tasks\r
 ExplorerContextMenu=&Enable Explorer context menu integration\r
 IntegrateTortoiseCVS=Integrate with &TortoiseCVS\r
-IntegrateTortoiseGIT=Integrate with To&rtoiseGIT\r
+IntegrateTortoiseGit=Integrate with To&rtoiseGit\r
 IntegrateTortoiseSVN=Integrate with T&ortoiseSVN\r
 IntegrateClearCase=Integrate with Rational &ClearCase\r
 AddToPath=&Add WinMerge folder to your system path\r
 \r
 ; 3-way merge wizard page\r
 ThreeWayMergeWizardPageCaption=3-Way Merge\r
-ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?\r
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/Git?\r
 RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool\r
 MergeAtRightPane=Merge at right pane\r
 MergeAtCenterPane=Merge at center pane\r

diff --git a/Translations/InnoSetup/Catalan.isl b/Translations/InnoSetup/Catalan.isl
index b0e9e24..3184f05 100755 (executable)
--- a/Translations/InnoSetup/Catalan.isl
+++ b/Translations/InnoSetup/Catalan.isl
@@ -62,14 +62,14 @@ UkrainianLanguage=Ukrainian menus and dialogs
 ;Tasks\r
 ExplorerContextMenu=&Habilita la integració del menú de contexte a l'Explorador\r
 IntegrateTortoiseCVS=Integra amb el &TortoiseCVS\r
-IntegrateTortoiseGIT=Integra amb el To&rtoiseGIT\r
+IntegrateTortoiseGit=Integra amb el To&rtoiseGit\r
 IntegrateTortoiseSVN=Integra amb el T&ortoiseSVN\r
 IntegrateClearCase=Integra amb el Rational &ClearCase\r
 AddToPath=&Add WinMerge folder to your system path\r
 \r
 ; 3-way merge wizard page\r
 ThreeWayMergeWizardPageCaption=3-Way Merge\r
-ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?\r
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/Git?\r
 RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool\r
 MergeAtRightPane=Merge at right pane\r
 MergeAtCenterPane=Merge at center pane\r

diff --git a/Translations/InnoSetup/Chinese_Simplified.isl b/Translations/InnoSetup/Chinese_Simplified.isl
index 69b1c0d..8a6a673 100755 (executable)
--- a/Translations/InnoSetup/Chinese_Simplified.isl
+++ b/Translations/InnoSetup/Chinese_Simplified.isl
@@ -61,14 +61,14 @@ UkrainianLanguage=Ukrainian menus and dialogs
 ;Tasks\r
 ExplorerContextMenu=¼¯³Éµ½×ÊÔ´¹ÜÀíÆ÷ÓÒ¼ü²Ëµ¥(&E)\r
 IntegrateTortoiseCVS=¼¯³Éµ½ &TortoiseCVS\r
-IntegrateTortoiseGIT=¼¯³Éµ½ To&rtoiseGIT\r
+IntegrateTortoiseGit=¼¯³Éµ½ To&rtoiseGit\r
 IntegrateTortoiseSVN=¼¯³Éµ½ T&ortoiseSVN\r
 IntegrateClearCase=¼¯³Éµ½ Rational &ClearCase\r
 AddToPath=&Add WinMerge folder to your system path\r
 \r
 ; 3-way merge wizard page\r
 ThreeWayMergeWizardPageCaption=3-Way Merge\r
-ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?\r
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/Git?\r
 RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool\r
 MergeAtRightPane=Merge at right pane\r
 MergeAtCenterPane=Merge at center pane\r

diff --git a/Translations/InnoSetup/Chinese_Traditional.isl b/Translations/InnoSetup/Chinese_Traditional.isl
index 5159925..509d7b4 100755 (executable)
--- a/Translations/InnoSetup/Chinese_Traditional.isl
+++ b/Translations/InnoSetup/Chinese_Traditional.isl
@@ -61,14 +61,14 @@ UkrainianLanguage=Ukrainian menus and dialogs
 ;Tasks\r
 ExplorerContextMenu=&Enable Explorer context menu integration\r
 IntegrateTortoiseCVS=Integrate with &TortoiseCVS\r
-IntegrateTortoiseGIT=Integrate with To&rtoiseGIT\r
+IntegrateTortoiseGit=Integrate with To&rtoiseGit\r
 IntegrateTortoiseSVN=Integrate with T&ortoiseSVN\r
 IntegrateClearCase=Integrate with Rational &ClearCase\r
 AddToPath=&Add WinMerge folder to your system path\r
 \r
 ; 3-way merge wizard page\r
 ThreeWayMergeWizardPageCaption=3-Way Merge\r
-ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?\r
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/Git?\r
 RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool\r
 MergeAtRightPane=Merge at right pane\r
 MergeAtCenterPane=Merge at center pane\r

diff --git a/Translations/InnoSetup/Croatian.isl b/Translations/InnoSetup/Croatian.isl
index 10906f9..bfa8bd0 100644 (file)
--- a/Translations/InnoSetup/Croatian.isl
+++ b/Translations/InnoSetup/Croatian.isl
@@ -61,14 +61,14 @@ UkrainianLanguage=Ukrainian menus and dialogs
 ;Tasks\r
 ExplorerContextMenu=&Integracija u Explorer kontekst izbornik\r
 IntegrateTortoiseCVS=Integracija s &TortoiseCVS\r
-IntegrateTortoiseGIT=Integracija s To&rtoiseGIT\r
+IntegrateTortoiseGit=Integracija s To&rtoiseGit\r
 IntegrateTortoiseSVN=Integracija s T&ortoiseSVN\r
 IntegrateClearCase=Integracija s Rational &ClearCase\r
 AddToPath=&Add WinMerge folder to your system path\r
 \r
 ; 3-way merge wizard page\r
 ThreeWayMergeWizardPageCaption=3-Way Merge\r
-ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?\r
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/Git?\r
 RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool\r
 MergeAtRightPane=Merge at right pane\r
 MergeAtCenterPane=Merge at center pane\r

diff --git a/Translations/InnoSetup/Czech.isl b/Translations/InnoSetup/Czech.isl
index 5159925..509d7b4 100755 (executable)
--- a/Translations/InnoSetup/Czech.isl
+++ b/Translations/InnoSetup/Czech.isl
@@ -61,14 +61,14 @@ UkrainianLanguage=Ukrainian menus and dialogs
 ;Tasks\r
 ExplorerContextMenu=&Enable Explorer context menu integration\r
 IntegrateTortoiseCVS=Integrate with &TortoiseCVS\r
-IntegrateTortoiseGIT=Integrate with To&rtoiseGIT\r
+IntegrateTortoiseGit=Integrate with To&rtoiseGit\r
 IntegrateTortoiseSVN=Integrate with T&ortoiseSVN\r
 IntegrateClearCase=Integrate with Rational &ClearCase\r
 AddToPath=&Add WinMerge folder to your system path\r
 \r
 ; 3-way merge wizard page\r
 ThreeWayMergeWizardPageCaption=3-Way Merge\r
-ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?\r
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/Git?\r
 RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool\r
 MergeAtRightPane=Merge at right pane\r
 MergeAtCenterPane=Merge at center pane\r

diff --git a/Translations/InnoSetup/Danish.isl b/Translations/InnoSetup/Danish.isl
index aa98eec..39bf568 100755 (executable)
--- a/Translations/InnoSetup/Danish.isl
+++ b/Translations/InnoSetup/Danish.isl
@@ -61,14 +61,14 @@ UkrainianLanguage=Ukrainske menuer og dialoger
 ;Tasks\r
 ExplorerContextMenu=&Installer Explorer kontekst menu integrationen\r
 IntegrateTortoiseCVS=Integrer med &TortoiseCVS\r
-IntegrateTortoiseGIT=Integrer med To&rtoiseGIT\r
+IntegrateTortoiseGit=Integrer med To&rtoiseGit\r
 IntegrateTortoiseSVN=Integrer med T&ortoiseSVN\r
 IntegrateClearCase=Integrer med Rational &ClearCase\r
 AddToPath=&Tilføj WinMerge folderen til din system path\r
 \r
 ; 3-way merge wizard page\r
 ThreeWayMergeWizardPageCaption=3-Way Merge\r
-ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?\r
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/Git?\r
 RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool\r
 MergeAtRightPane=Merge at right pane\r
 MergeAtCenterPane=Merge at center pane\r

diff --git a/Translations/InnoSetup/Dutch.isl b/Translations/InnoSetup/Dutch.isl
index c83b510..79559d6 100755 (executable)
--- a/Translations/InnoSetup/Dutch.isl
+++ b/Translations/InnoSetup/Dutch.isl
@@ -61,14 +61,14 @@ UkrainianLanguage=Oekra
 ;Tasks\r
 ExplorerContextMenu=&Activeer integratie in contextmenu van Verkenner\r
 IntegrateTortoiseCVS=Integreren met &TortoiseCVS\r
-IntegrateTortoiseGIT=Integreren met To&rtoiseGIT\r
+IntegrateTortoiseGit=Integreren met To&rtoiseGit\r
 IntegrateTortoiseSVN= Integreren met T&ortoiseSVN\r
 IntegrateClearCase= Integreren met Rational &ClearCase\r
 AddToPath=&Add WinMerge folder to your system path\r
 \r
 ; 3-way merge wizard page\r
 ThreeWayMergeWizardPageCaption=3-Way Merge\r
-ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?\r
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/Git?\r
 RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool\r
 MergeAtRightPane=Merge at right pane\r
 MergeAtCenterPane=Merge at center pane\r

diff --git a/Translations/InnoSetup/English.isl b/Translations/InnoSetup/English.isl
index 5159925..509d7b4 100755 (executable)
--- a/Translations/InnoSetup/English.isl
+++ b/Translations/InnoSetup/English.isl
@@ -61,14 +61,14 @@ UkrainianLanguage=Ukrainian menus and dialogs
 ;Tasks\r
 ExplorerContextMenu=&Enable Explorer context menu integration\r
 IntegrateTortoiseCVS=Integrate with &TortoiseCVS\r
-IntegrateTortoiseGIT=Integrate with To&rtoiseGIT\r
+IntegrateTortoiseGit=Integrate with To&rtoiseGit\r
 IntegrateTortoiseSVN=Integrate with T&ortoiseSVN\r
 IntegrateClearCase=Integrate with Rational &ClearCase\r
 AddToPath=&Add WinMerge folder to your system path\r
 \r
 ; 3-way merge wizard page\r
 ThreeWayMergeWizardPageCaption=3-Way Merge\r
-ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?\r
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/Git?\r
 RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool\r
 MergeAtRightPane=Merge at right pane\r
 MergeAtCenterPane=Merge at center pane\r

diff --git a/Translations/InnoSetup/Finnish.isl b/Translations/InnoSetup/Finnish.isl
index 5159925..509d7b4 100644 (file)
--- a/Translations/InnoSetup/Finnish.isl
+++ b/Translations/InnoSetup/Finnish.isl
@@ -61,14 +61,14 @@ UkrainianLanguage=Ukrainian menus and dialogs
 ;Tasks\r
 ExplorerContextMenu=&Enable Explorer context menu integration\r
 IntegrateTortoiseCVS=Integrate with &TortoiseCVS\r
-IntegrateTortoiseGIT=Integrate with To&rtoiseGIT\r
+IntegrateTortoiseGit=Integrate with To&rtoiseGit\r
 IntegrateTortoiseSVN=Integrate with T&ortoiseSVN\r
 IntegrateClearCase=Integrate with Rational &ClearCase\r
 AddToPath=&Add WinMerge folder to your system path\r
 \r
 ; 3-way merge wizard page\r
 ThreeWayMergeWizardPageCaption=3-Way Merge\r
-ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?\r
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/Git?\r
 RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool\r
 MergeAtRightPane=Merge at right pane\r
 MergeAtCenterPane=Merge at center pane\r

diff --git a/Translations/InnoSetup/French.isl b/Translations/InnoSetup/French.isl
index 959bdb9..01f1b74 100755 (executable)
--- a/Translations/InnoSetup/French.isl
+++ b/Translations/InnoSetup/French.isl
@@ -61,14 +61,14 @@ UkrainianLanguage=Menus et dialogues Ukrainien
 ;Tasks\r
 ExplorerContextMenu=&Permetre l'intégration au menu contextuel de l'explorateur\r
 IntegrateTortoiseCVS=Integrer avec &TortoiseCVS\r
-IntegrateTortoiseGIT=Integrer avec To&rtoiseGIT\r
+IntegrateTortoiseGit=Integrer avec To&rtoiseGit\r
 IntegrateTortoiseSVN=Integrer avec T&ortoiseSVN\r
 IntegrateClearCase=Integrer avec Rational &ClearCase\r
 AddToPath=&Ajouter le répertoire WinMerge au chemin du système\r
 \r
 ; 3-way merge wizard page\r
 ThreeWayMergeWizardPageCaption=Merge à 3-voies\r
-ThreeWayMergeWizardPageDescription=Utilisez-vous WinMerge comme un outil de merge à 3-voies pour TortoiseSVN/GIT ?\r
+ThreeWayMergeWizardPageDescription=Utilisez-vous WinMerge comme un outil de merge à 3-voies pour TortoiseSVN/Git ?\r
 RegisterWinMergeAs3WayMergeTool=Enregistrer WinMerge comme outils de merge à 3-voies\r
 MergeAtRightPane=Merge vers panneau de Droite\r
 MergeAtCenterPane=Merge vers panneau du Milieu\r

diff --git a/Translations/InnoSetup/Galician.isl b/Translations/InnoSetup/Galician.isl
index 5159925..509d7b4 100644 (file)
--- a/Translations/InnoSetup/Galician.isl
+++ b/Translations/InnoSetup/Galician.isl
@@ -61,14 +61,14 @@ UkrainianLanguage=Ukrainian menus and dialogs
 ;Tasks\r
 ExplorerContextMenu=&Enable Explorer context menu integration\r
 IntegrateTortoiseCVS=Integrate with &TortoiseCVS\r
-IntegrateTortoiseGIT=Integrate with To&rtoiseGIT\r
+IntegrateTortoiseGit=Integrate with To&rtoiseGit\r
 IntegrateTortoiseSVN=Integrate with T&ortoiseSVN\r
 IntegrateClearCase=Integrate with Rational &ClearCase\r
 AddToPath=&Add WinMerge folder to your system path\r
 \r
 ; 3-way merge wizard page\r
 ThreeWayMergeWizardPageCaption=3-Way Merge\r
-ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?\r
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/Git?\r
 RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool\r
 MergeAtRightPane=Merge at right pane\r
 MergeAtCenterPane=Merge at center pane\r

diff --git a/Translations/InnoSetup/German.isl b/Translations/InnoSetup/German.isl
index e710de2..c1c7d1e 100755 (executable)
--- a/Translations/InnoSetup/German.isl
+++ b/Translations/InnoSetup/German.isl
@@ -61,13 +61,13 @@ UkrainianLanguage=Ukrainische Men
 ;Tasks\r
 ExplorerContextMenu=&Explorer Kontextmenü-Integration aktivieren\r
 IntegrateTortoiseCVS=Integrieren in &TortoiseCVS\r
-IntegrateTortoiseGIT=Integrieren in To&rtoiseGIT\r
+IntegrateTortoiseGit=Integrieren in To&rtoiseGit\r
 IntegrateTortoiseSVN=Integrieren in T&ortoiseSVN\r
 AddToPath=WinMerge-Ordner zum &Systempfad hinzufügen\r
 \r
 ; 3-way merge wizard page\r
 ThreeWayMergeWizardPageCaption=3-Wege-Merge\r
-ThreeWayMergeWizardPageDescription=Verwenden Sie WinMerge als 3-Wege-Mergeprogramm für TortoiseSVN/GIT?\r
+ThreeWayMergeWizardPageDescription=Verwenden Sie WinMerge als 3-Wege-Mergeprogramm für TortoiseSVN/Git?\r
 RegisterWinMergeAs3WayMergeTool=WinMerge als 3-Wege-Mergeprogramm registrieren\r
 MergeAtRightPane=Im rechten Bereich zusammenführen\r
 MergeAtCenterPane=Im mittleren Bereich zusammenführen\r

diff --git a/Translations/InnoSetup/Greek.isl b/Translations/InnoSetup/Greek.isl
index 01df5f8..428bf80 100644 (file)
--- a/Translations/InnoSetup/Greek.isl
+++ b/Translations/InnoSetup/Greek.isl
@@ -61,14 +61,14 @@ UkrainianLanguage=
 ;Tasks\r
 ExplorerContextMenu=Åí&åñãïðïßçóç åíóùìáôþóåùò óôéò åéäéêÝò åðéëïãÝò ôçò åîåñåõíÞóåùò\r
 IntegrateTortoiseCVS=ÅíóùìÜôùóç ôïõ &TortoiseCVS\r
-IntegrateTortoiseGIT=ÅíóùìÜôùóç ôïõ To&rtoiseGIT\r
+IntegrateTortoiseGit=ÅíóùìÜôùóç ôïõ To&rtoiseGit\r
 IntegrateTortoiseSVN=ÅíóùìÜôùóç ôïõ T&ortoiseSVN\r
 IntegrateClearCase=ÅíóùìÜôùóç ôïõ Rational &ClearCase\r
 AddToPath=&Add WinMerge folder to your system path\r
 \r
 ; 3-way merge wizard page\r
 ThreeWayMergeWizardPageCaption=3-Way Merge\r
-ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?\r
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/Git?\r
 RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool\r
 MergeAtRightPane=Merge at right pane\r
 MergeAtCenterPane=Merge at center pane\r

diff --git a/Translations/InnoSetup/Hungarian.isl b/Translations/InnoSetup/Hungarian.isl
index 2b95df0..4ecf6fe 100755 (executable)
--- a/Translations/InnoSetup/Hungarian.isl
+++ b/Translations/InnoSetup/Hungarian.isl
@@ -61,14 +61,14 @@ UkrainianLanguage=Ukrainian menus and dialogs
 ;Tasks\r
 ExplorerContextMenu=Integrálás az Intézõ &context-menüjéhez\r
 IntegrateTortoiseCVS=Integrálás a &TortoiseCVS programmal\r
-IntegrateTortoiseGIT=Integrálás a To&rtoiseGIT programmal\r
+IntegrateTortoiseGit=Integrálás a To&rtoiseGit programmal\r
 IntegrateTortoiseSVN=Integrálás a T&ortoiseSVN programmal\r
 IntegrateClearCase=Integrálás a Rational &ClearCase programmal\r
 AddToPath=&Add WinMerge folder to your system path\r
 \r
 ; 3-way merge wizard page\r
 ThreeWayMergeWizardPageCaption=3-Way Merge\r
-ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?\r
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/Git?\r
 RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool\r
 MergeAtRightPane=Merge at right pane\r
 MergeAtCenterPane=Merge at center pane\r

diff --git a/Translations/InnoSetup/Italian.isl b/Translations/InnoSetup/Italian.isl
index 0666f39..9665c7f 100755 (executable)
--- a/Translations/InnoSetup/Italian.isl
+++ b/Translations/InnoSetup/Italian.isl
@@ -62,14 +62,14 @@ UkrainianLanguage=Menu e finestre di dialogo in ucraino
 ;Tasks\r
 ExplorerContextMenu=&Attiva l'integrazione con il menu contestuale di Explorer\r
 IntegrateTortoiseCVS=Integrazione con &TortoiseCVS\r
-IntegrateTortoiseGIT=Integrazione con To&rtoiseGIT\r
+IntegrateTortoiseGit=Integrazione con To&rtoiseGit\r
 IntegrateTortoiseSVN=Integrazione con T&ortoiseSVN\r
 IntegrateClearCase=Integrazione con Rational &ClearCase\r
 AddToPath=&Aggiungi cartella WinMerge al percorso di sistema\r
 \r
 ; 3-way merge wizard page\r
 ThreeWayMergeWizardPageCaption=Unione a 3 vie\r
-ThreeWayMergeWizardPageDescription=Vuoi usare WinMerge come strumento di unione a 3 vie per TortoiseSVN/GIT?\r
+ThreeWayMergeWizardPageDescription=Vuoi usare WinMerge come strumento di unione a 3 vie per TortoiseSVN/Git?\r
 RegisterWinMergeAs3WayMergeTool=Registra WinMerge come strumento unione a 3 vie\r
 MergeAtRightPane=Unisci nel riquadro a destra\r
 MergeAtCenterPane=Unisci nel riqadro centrale\r

diff --git a/Translations/InnoSetup/Japanese.isl b/Translations/InnoSetup/Japanese.isl
index 66447f8..50358a7 100755 (executable)
--- a/Translations/InnoSetup/Japanese.isl
+++ b/Translations/InnoSetup/Japanese.isl
@@ -61,14 +61,14 @@ UkrainianLanguage=Ukrainian menus and dialogs
 ;Tasks\r
 ExplorerContextMenu=\83G\83N\83X\83v\83\8d\81[\83\89\82Ì\83R\83\93\83e\83L\83X\83g\83\81\83j\83\85\81[\82É\92Ç\89Á(&E)\r
 IntegrateTortoiseCVS=TortoiseCVS\82Æ\82Ì\98A\8cg(&T)\r
-IntegrateTortoiseGIT=TortoiseGIT\82Æ\82Ì\98A\8cg(&R)\r
+IntegrateTortoiseGit=TortoiseGit\82Æ\82Ì\98A\8cg(&R)\r
 IntegrateTortoiseSVN=TortoiseSVN\82Æ\82Ì\98A\8cg(&O)\r
 IntegrateClearCase=Rational ClearCase\82Æ\82Ì\98A\8cg(&C)\r
 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)\r
 \r
 ; 3-way merge wizard page\r
 ThreeWayMergeWizardPageCaption=3\95û\8cü\83}\81[\83W\r
-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©?\r
+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©?\r
 RegisterWinMergeAs3WayMergeTool=WinMerge \82ð3\95û\8cü\83}\81[\83W\83c\81[\83\8b\82Æ\82µ\82Ä\93o\98^\82·\82é\r
 MergeAtRightPane=\89E\91¤\83y\83C\83\93\82Å\83}\81[\83W\r
 MergeAtCenterPane=\92\86\89\9b\83y\83C\83\93\82Å\83}\81[\83W\r

diff --git a/Translations/InnoSetup/Korean.isl b/Translations/InnoSetup/Korean.isl
index 5159925..509d7b4 100755 (executable)
--- a/Translations/InnoSetup/Korean.isl
+++ b/Translations/InnoSetup/Korean.isl
@@ -61,14 +61,14 @@ UkrainianLanguage=Ukrainian menus and dialogs
 ;Tasks\r
 ExplorerContextMenu=&Enable Explorer context menu integration\r
 IntegrateTortoiseCVS=Integrate with &TortoiseCVS\r
-IntegrateTortoiseGIT=Integrate with To&rtoiseGIT\r
+IntegrateTortoiseGit=Integrate with To&rtoiseGit\r
 IntegrateTortoiseSVN=Integrate with T&ortoiseSVN\r
 IntegrateClearCase=Integrate with Rational &ClearCase\r
 AddToPath=&Add WinMerge folder to your system path\r
 \r
 ; 3-way merge wizard page\r
 ThreeWayMergeWizardPageCaption=3-Way Merge\r
-ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?\r
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/Git?\r
 RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool\r
 MergeAtRightPane=Merge at right pane\r
 MergeAtCenterPane=Merge at center pane\r

diff --git a/Translations/InnoSetup/Lithuanian.isl b/Translations/InnoSetup/Lithuanian.isl
index 6a4fd7a..9d3593f 100644 (file)
--- a/Translations/InnoSetup/Lithuanian.isl
+++ b/Translations/InnoSetup/Lithuanian.isl
@@ -61,14 +61,14 @@ UkrainianLanguage=Ukrainie
 ;Tasks\r
 ExplorerContextMenu=L&eisti \84Explorer\93 kontekstinio meniu integracijà\r
 IntegrateTortoiseCVS=Integruoti su \84&TortoiseCVS\93\r
-IntegrateTortoiseGIT=Integruoti su \84To&rtoiseGIT\93\r
+IntegrateTortoiseGit=Integruoti su \84To&rtoiseGit\93\r
 IntegrateTortoiseSVN=Integruoti su \84T&ortoiseSVN\93\r
 IntegrateClearCase=Integruoti su \84Rational &ClearCase\93\r
 AddToPath=Átr&aukti \84WinMerge\93 katalogà á sistemos %PATH% kintamajá\r
 \r
 ; 3-way merge wizard page\r
 ThreeWayMergeWizardPageCaption=3 krypèiø suliejimas\r
-ThreeWayMergeWizardPageDescription=Gal norite naudoti \84WinMerge\93 kaip 3 krypèiø suliejimo áranká \84TortoiseSVN/GIT\93 programose?\r
+ThreeWayMergeWizardPageDescription=Gal norite naudoti \84WinMerge\93 kaip 3 krypèiø suliejimo áranká \84TortoiseSVN/Git\93 programose?\r
 RegisterWinMergeAs3WayMergeTool=Registruoti \84WinMerge\93 kaip 3 krypèiø suliejimo áranká\r
 MergeAtRightPane=Sulieti deðiniajame polangyje\r
 MergeAtCenterPane=Sulieti viduriniame polangyje\r

diff --git a/Translations/InnoSetup/Norwegian.isl b/Translations/InnoSetup/Norwegian.isl
index 3c19b67..6a6dd71 100755 (executable)
--- a/Translations/InnoSetup/Norwegian.isl
+++ b/Translations/InnoSetup/Norwegian.isl
@@ -65,14 +65,14 @@ UkrainianLanguage=Ukrainian menus and dialogs
 ;Tasks\r
 ExplorerContextMenu=&Aktiver integrasjon i Windows utforsker sin kontekstmeny\r
 IntegrateTortoiseCVS=Integrer med &TortoiseCVS\r
-IntegrateTortoiseGIT=Integrer med To&rtoiseGIT\r
+IntegrateTortoiseGit=Integrer med To&rtoiseGit\r
 IntegrateTortoiseSVN=Integrer med T&ortoiseSVN\r
 IntegrateClearCase=Integrer med Rational &ClearCase\r
 AddToPath=&Add WinMerge folder to your system path\r
 \r
 ; 3-way merge wizard page\r
 ThreeWayMergeWizardPageCaption=3-Way Merge\r
-ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?\r
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/Git?\r
 RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool\r
 MergeAtRightPane=Merge at right pane\r
 MergeAtCenterPane=Merge at center pane\r

diff --git a/Translations/InnoSetup/Persian.isl b/Translations/InnoSetup/Persian.isl
index 509db33..4f1f1c5 100644 (file)
--- a/Translations/InnoSetup/Persian.isl
+++ b/Translations/InnoSetup/Persian.isl
@@ -61,14 +61,14 @@ UkrainianLanguage= 
 ;Tasks\r
 ExplorerContextMenu=&E ÝÚÇá äãæÏä í\98\81ÇÑ\8då ÓÇÒí ÝåÑÓÊ ÌÓÊÌæ\90Ñ ãÊä \r
 IntegrateTortoiseCVS=&T í\98\81ÇÑÌå ÓÇÒí ÈÇ ÊæÑÊæÆíÒ Óí æí ÇÓ \r
-IntegrateTortoiseGIT=Integrate with To&rtoiseGIT\r
+IntegrateTortoiseGit=Integrate with To&rtoiseGit\r
 IntegrateTortoiseSVN=&o í\98\81ÇÑÌå ÓÇÒí ÈÇ ÊæÑÊæÆíÒ ÇÓ æí Çä \r
 IntegrateClearCase=&C í\98\81ÇÑ\8då ÓÇÒí ÈÇ ÑÔäÇá \98áÑ\98íÓ \r
 AddToPath=&A ÇÖÇÝå äãæÏä \81æÔå æíäãÑÌ Èå ãÓíÑåÇí ÓíÓÊã \r
 \r
 ; 3-way merge wizard page\r
 ThreeWayMergeWizardPageCaption=3-Way Merge\r
-ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?\r
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/Git?\r
 RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool\r
 MergeAtRightPane=Merge at right pane\r
 MergeAtCenterPane=Merge at center pane\r

diff --git a/Translations/InnoSetup/Polish.isl b/Translations/InnoSetup/Polish.isl
index 58fb181..5b3804c 100755 (executable)
--- a/Translations/InnoSetup/Polish.isl
+++ b/Translations/InnoSetup/Polish.isl
@@ -61,14 +61,14 @@ UkrainianLanguage=Ukraiński
 ;Tasks\r
 ExplorerContextMenu=&Włącz integrację z menu kontekstowym Eksploratora\r
 IntegrateTortoiseCVS=Integracja z &TortoiseCVS\r
-IntegrateTortoiseGIT=Integracja z To&rtoiseGIT\r
+IntegrateTortoiseGit=Integracja z To&rtoiseGit\r
 IntegrateTortoiseSVN=Integracja z T&ortoiseSVN\r
 IntegrateClearCase=Integracja z Rational &ClearCase\r
 AddToPath=&Dodaj folder WinMerge do ścieżki systemowej\r
 \r
 ; 3-way merge wizard page\r
 ThreeWayMergeWizardPageCaption=Scalanie trójstronne\r
-ThreeWayMergeWizardPageDescription=Czy używasz WinMerge jako narzędzia do scalania trójstronnego dla TortoiseSVN/GIT?\r
+ThreeWayMergeWizardPageDescription=Czy używasz WinMerge jako narzędzia do scalania trójstronnego dla TortoiseSVN/Git?\r
 RegisterWinMergeAs3WayMergeTool=Zarejestruj WinMerge jako narzędzie do scalania trójstronnego\r
 MergeAtRightPane=Scal w prawym panelu\r
 MergeAtCenterPane=Scal w środkowym panelu\r

diff --git a/Translations/InnoSetup/Portuguese.isl b/Translations/InnoSetup/Portuguese.isl
index 5b80fbb..f53cf4e 100644 (file)
--- a/Translations/InnoSetup/Portuguese.isl
+++ b/Translations/InnoSetup/Portuguese.isl
@@ -61,14 +61,14 @@ UkrainianLanguage=Ucraniano menus e di
 ;Tasks\r
 ExplorerContextMenu=&Permitir o menu de contexto no Explorador\r
 IntegrateTortoiseCVS=Integrar com &TortoiseCVS\r
-IntegrateTortoiseGIT=Integrar com To&rtoiseGIT\r
+IntegrateTortoiseGit=Integrar com To&rtoiseGit\r
 IntegrateTortoiseSVN=Integrar com T&ortoiseSVN\r
 IntegrateClearCase=Integrar com Rational &ClearCase\r
 AddToPath=&Criar pasta do WinMerge no caminho do sistema\r
 \r
 ; 3-way merge wizard page\r
 ThreeWayMergeWizardPageCaption=3-Combinação de modos\r
-ThreeWayMergeWizardPageDescription=Utilizar o WinMerge como ferramenta de três vias para TortoiseSVN/GIT?\r
+ThreeWayMergeWizardPageDescription=Utilizar o WinMerge como ferramenta de três vias para TortoiseSVN/Git?\r
 RegisterWinMergeAs3WayMergeTool=Registar o WinMerge como ferramenta de combinação de três vias\r
 MergeAtRightPane=Combinar na janela direita\r
 MergeAtCenterPane=Combinar na janela do meio\r

diff --git a/Translations/InnoSetup/Romanian.isl b/Translations/InnoSetup/Romanian.isl
index af4a1f7..37df48a 100644 (file)
--- a/Translations/InnoSetup/Romanian.isl
+++ b/Translations/InnoSetup/Romanian.isl
@@ -61,14 +61,14 @@ UkrainianLanguage=Ukrainian menus and dialogs
 ;Tasks\r
 ExplorerContextMenu=&Activeaza integrarea in meniurile contextuale Explorer\r
 IntegrateTortoiseCVS=Integrare cu &TortoiseCVS\r
-IntegrateTortoiseGIT=Integrare cu To&rtoiseGIT\r
+IntegrateTortoiseGit=Integrare cu To&rtoiseGit\r
 IntegrateTortoiseSVN=Integrare cu T&ortoiseSVN\r
 IntegrateClearCase=Integrare cu Rational &ClearCase\r
 AddToPath=&Add WinMerge folder to your system path\r
 \r
 ; 3-way merge wizard page\r
 ThreeWayMergeWizardPageCaption=3-Way Merge\r
-ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?\r
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/Git?\r
 RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool\r
 MergeAtRightPane=Merge at right pane\r
 MergeAtCenterPane=Merge at center pane\r

diff --git a/Translations/InnoSetup/Russian.isl b/Translations/InnoSetup/Russian.isl
index 8e76c31..0444e04 100755 (executable)
--- a/Translations/InnoSetup/Russian.isl
+++ b/Translations/InnoSetup/Russian.isl
@@ -61,14 +61,14 @@ UkrainianLanguage=
 ;Tasks\r
 ExplorerContextMenu=&Enable Explorer context menu integration\r
 IntegrateTortoiseCVS=Integrate with &TortoiseCVS\r
-IntegrateTortoiseGIT=Integrate with To&rtoiseGIT\r
+IntegrateTortoiseGit=Integrate with To&rtoiseGit\r
 IntegrateTortoiseSVN=Integrate with T&ortoiseSVN\r
 IntegrateClearCase=Integrate with Rational &ClearCase\r
 AddToPath=&Add WinMerge folder to your system path\r
 \r
 ; 3-way merge wizard page\r
 ThreeWayMergeWizardPageCaption=3-Way Merge\r
-ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?\r
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/Git?\r
 RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool\r
 MergeAtRightPane=Merge at right pane\r
 MergeAtCenterPane=Merge at center pane\r

diff --git a/Translations/InnoSetup/Serbian.isl b/Translations/InnoSetup/Serbian.isl
index 5159925..509d7b4 100644 (file)
--- a/Translations/InnoSetup/Serbian.isl
+++ b/Translations/InnoSetup/Serbian.isl
@@ -61,14 +61,14 @@ UkrainianLanguage=Ukrainian menus and dialogs
 ;Tasks\r
 ExplorerContextMenu=&Enable Explorer context menu integration\r
 IntegrateTortoiseCVS=Integrate with &TortoiseCVS\r
-IntegrateTortoiseGIT=Integrate with To&rtoiseGIT\r
+IntegrateTortoiseGit=Integrate with To&rtoiseGit\r
 IntegrateTortoiseSVN=Integrate with T&ortoiseSVN\r
 IntegrateClearCase=Integrate with Rational &ClearCase\r
 AddToPath=&Add WinMerge folder to your system path\r
 \r
 ; 3-way merge wizard page\r
 ThreeWayMergeWizardPageCaption=3-Way Merge\r
-ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?\r
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/Git?\r
 RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool\r
 MergeAtRightPane=Merge at right pane\r
 MergeAtCenterPane=Merge at center pane\r

diff --git a/Translations/InnoSetup/Sinhala.islu b/Translations/InnoSetup/Sinhala.islu
index bc26e68..6063200 100644 (file)
--- a/Translations/InnoSetup/Sinhala.islu
+++ b/Translations/InnoSetup/Sinhala.islu
@@ -61,14 +61,14 @@ UkrainianLanguage=Ukrainian menus and dialogs
 ;Tasks\r
 ExplorerContextMenu=&Enable Explorer context menu integration\r
 IntegrateTortoiseCVS=Integrate with &TortoiseCVS\r
-IntegrateTortoiseGIT=Integrate with To&rtoiseGIT\r
+IntegrateTortoiseGit=Integrate with To&rtoiseGit\r
 IntegrateTortoiseSVN=Integrate with T&ortoiseSVN\r
 IntegrateClearCase=Integrate with Rational &ClearCase\r
 AddToPath=&Add WinMerge folder to your system path\r
 \r
 ; 3-way merge wizard page\r
 ThreeWayMergeWizardPageCaption=3-Way Merge\r
-ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?\r
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/Git?\r
 RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool\r
 MergeAtRightPane=Merge at right pane\r
 MergeAtCenterPane=Merge at center pane\r

diff --git a/Translations/InnoSetup/Slovak.isl b/Translations/InnoSetup/Slovak.isl
index c678784..a30c885 100755 (executable)
--- a/Translations/InnoSetup/Slovak.isl
+++ b/Translations/InnoSetup/Slovak.isl
@@ -61,14 +61,14 @@ UkrainianLanguage=Ukrainian menus and dialogs
 ;Tasks\r
 ExplorerContextMenu=&Zapni integráciu do kontextovej ponuky Prieskumníka\r
 IntegrateTortoiseCVS=Integrácia s &TortoiseCVS\r
-IntegrateTortoiseGIT=Integrácia s To&rtoiseGIT\r
+IntegrateTortoiseGit=Integrácia s To&rtoiseGit\r
 IntegrateTortoiseSVN=Integrácia s T&ortoiseSVN\r
 IntegrateClearCase=Integrácia s Rational &ClearCase\r
 AddToPath=&Add WinMerge folder to your system path\r
 \r
 ; 3-way merge wizard page\r
 ThreeWayMergeWizardPageCaption=3-Way Merge\r
-ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?\r
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/Git?\r
 RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool\r
 MergeAtRightPane=Merge at right pane\r
 MergeAtCenterPane=Merge at center pane\r

diff --git a/Translations/InnoSetup/Slovenian.isl b/Translations/InnoSetup/Slovenian.isl
index 845ccc2..f7c55c9 100644 (file)
--- a/Translations/InnoSetup/Slovenian.isl
+++ b/Translations/InnoSetup/Slovenian.isl
@@ -61,14 +61,14 @@ UkrainianLanguage=Ukrainian menus and dialogs
 ;Tasks\r
 ExplorerContextMenu=&Enable Explorer context menu integration\r
 IntegrateTortoiseCVS=Integrate with &TortoiseCVS\r
-IntegrateTortoiseGIT=Integrate with To&rtoiseGIT\r
+IntegrateTortoiseGit=Integrate with To&rtoiseGit\r
 IntegrateTortoiseSVN=Integrate with T&ortoiseSVN\r
 IntegrateClearCase=Integrate with Rational &ClearCase\r
 AddToPath=&Add WinMerge folder to your system path\r
 \r
 ; 3-way merge wizard page\r
 ThreeWayMergeWizardPageCaption=3-Way Merge\r
-ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?\r
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/Git?\r
 RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool\r
 MergeAtRightPane=Merge at right pane\r
 MergeAtCenterPane=Merge at center pane\r

diff --git a/Translations/InnoSetup/Spanish.isl b/Translations/InnoSetup/Spanish.isl
index 5159925..509d7b4 100755 (executable)
--- a/Translations/InnoSetup/Spanish.isl
+++ b/Translations/InnoSetup/Spanish.isl
@@ -61,14 +61,14 @@ UkrainianLanguage=Ukrainian menus and dialogs
 ;Tasks\r
 ExplorerContextMenu=&Enable Explorer context menu integration\r
 IntegrateTortoiseCVS=Integrate with &TortoiseCVS\r
-IntegrateTortoiseGIT=Integrate with To&rtoiseGIT\r
+IntegrateTortoiseGit=Integrate with To&rtoiseGit\r
 IntegrateTortoiseSVN=Integrate with T&ortoiseSVN\r
 IntegrateClearCase=Integrate with Rational &ClearCase\r
 AddToPath=&Add WinMerge folder to your system path\r
 \r
 ; 3-way merge wizard page\r
 ThreeWayMergeWizardPageCaption=3-Way Merge\r
-ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?\r
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/Git?\r
 RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool\r
 MergeAtRightPane=Merge at right pane\r
 MergeAtCenterPane=Merge at center pane\r

diff --git a/Translations/InnoSetup/Swedish.isl b/Translations/InnoSetup/Swedish.isl
index 5ddb1f7..65fb21d 100755 (executable)
--- a/Translations/InnoSetup/Swedish.isl
+++ b/Translations/InnoSetup/Swedish.isl
@@ -61,14 +61,14 @@ UkrainianLanguage=Ukrainska menyer och dialoger
 ;Tasks\r
 ExplorerContextMenu=&Möjliggör integration med Explorers menyer\r
 IntegrateTortoiseCVS=Integrera med &TortoiseCVS\r
-IntegrateTortoiseGIT=Integrera med To&rtoiseGIT\r
+IntegrateTortoiseGit=Integrera med To&rtoiseGit\r
 IntegrateTortoiseSVN=Integrera med T&ortoiseSVN\r
 IntegrateClearCase=Integrera med Rational &ClearCase\r
 AddToPath=&Lägg till WinMerge-katalogen till Er systemsökväg\r
 \r
 ; 3-way merge wizard page\r
 ThreeWayMergeWizardPageCaption=3-Way Merge\r
-ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?\r
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/Git?\r
 RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool\r
 MergeAtRightPane=Merge at right pane\r
 MergeAtCenterPane=Merge at center pane\r

diff --git a/Translations/InnoSetup/Turkish.isl b/Translations/InnoSetup/Turkish.isl
index 4a2f3e0..2684e9d 100755 (executable)
--- a/Translations/InnoSetup/Turkish.isl
+++ b/Translations/InnoSetup/Turkish.isl
@@ -61,14 +61,14 @@ UkrainianLanguage=Ukraynaca men
 ;Tasks\r
 ExplorerContextMenu=&Windows gezgini sað týk menü bütünleþtirmesi kullanýlsýn\r
 IntegrateTortoiseCVS=&TortoiseCVS ile bütünleþtir\r
-IntegrateTortoiseGIT=To&rtoiseGIT ile bütünleþtir\r
+IntegrateTortoiseGit=To&rtoiseGit ile bütünleþtir\r
 IntegrateTortoiseSVN=T&ortoiseSVN ile bütünleþtir\r
 IntegrateClearCase=Rational &ClearCase ile bütünleþtir\r
 AddToPath=Win&Merge klasörü sistem yoluna eklensin\r
 \r
 ; 3-way merge wizard page\r
 ThreeWayMergeWizardPageCaption=3 Yollu Birleþtirme\r
-ThreeWayMergeWizardPageDescription=WinMerge uygulamasýný TortoiseSVN/GIT için 3 yollu birleþtirme aracý olarak kullanýyor musunuz?\r
+ThreeWayMergeWizardPageDescription=WinMerge uygulamasýný TortoiseSVN/Git için 3 yollu birleþtirme aracý olarak kullanýyor musunuz?\r
 RegisterWinMergeAs3WayMergeTool=WinMerge 3 yollu birleþtirme aracý olarak kaydedilsin\r
 MergeAtRightPane=Sað panoda birleþtirilsin\r
 MergeAtCenterPane=Orta panoda birleþtirilsin\r

diff --git a/Translations/InnoSetup/Ukrainian.isl b/Translations/InnoSetup/Ukrainian.isl
index 3cd3478..5f8a887 100644 (file)
--- a/Translations/InnoSetup/Ukrainian.isl
+++ b/Translations/InnoSetup/Ukrainian.isl
@@ -61,14 +61,14 @@ UkrainianLanguage=
 ;Tasks\r
 ExplorerContextMenu=&²íòåãðóâàòèñÿ â êîíòåêñòíå ìåíþ îáîëîíêè ÎÑ\r
 IntegrateTortoiseCVS=²íòåãðóâàòèñÿ â &TortoiseCVS\r
-IntegrateTortoiseGIT=²íòåãðóâàòèñÿ â To&rtoiseGIT\r
+IntegrateTortoiseGit=²íòåãðóâàòèñÿ â To&rtoiseGit\r
 IntegrateTortoiseSVN=²íòåãðóâàòèñÿ â T&ortoiseSVN\r
 IntegrateClearCase=²íòåãðóâàòèñÿ â Rational &ClearCase\r
 AddToPath=&Add WinMerge folder to your system path\r
 \r
 ; 3-way merge wizard page\r
 ThreeWayMergeWizardPageCaption=3-Way Merge\r
-ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/GIT?\r
+ThreeWayMergeWizardPageDescription=Do you use WinMerge as a 3-way merge tool for TortoiseSVN/Git?\r
 RegisterWinMergeAs3WayMergeTool=Register WinMerge as a 3-way merge tool\r
 MergeAtRightPane=Merge at right pane\r
 MergeAtCenterPane=Merge at center pane\r