Skip to content
Permalink
Browse files

Merge pull request #246 from csware/spelling-of-git

Fix spelling of Git
  • Loading branch information
sdottaka committed Jan 3, 2020
2 parents 5934f7e + 290dd14 commit a109622db6f1a390c919e9c0c8de8a7cbe6df1d5
Showing with 94 additions and 94 deletions.
  1. +3 −3 Docs/Manual/EN/Install.xml
  2. +2 −2 Docs/Manual/EN/Version_control.xml
  3. +3 −3 Docs/Manual/JP/Install.xml
  4. +2 −2 Docs/Manual/JP/Version_control.xml
  5. +4 −4 Installer/InnoSetup/WinMerge.iss
  6. +4 −4 Installer/InnoSetup/WinMergeX64.is6.iss
  7. +4 −4 Installer/InnoSetup/WinMergeX64.iss
  8. +2 −2 Translations/InnoSetup/Arabic.isl
  9. +2 −2 Translations/InnoSetup/Basque.isl
  10. +2 −2 Translations/InnoSetup/Brazilian.isl
  11. +2 −2 Translations/InnoSetup/Bulgarian.isl
  12. +2 −2 Translations/InnoSetup/Catalan.isl
  13. +2 −2 Translations/InnoSetup/Chinese_Simplified.isl
  14. +2 −2 Translations/InnoSetup/Chinese_Traditional.isl
  15. +2 −2 Translations/InnoSetup/Croatian.isl
  16. +2 −2 Translations/InnoSetup/Czech.isl
  17. +2 −2 Translations/InnoSetup/Danish.isl
  18. +2 −2 Translations/InnoSetup/Dutch.isl
  19. +2 −2 Translations/InnoSetup/English.isl
  20. +2 −2 Translations/InnoSetup/Finnish.isl
  21. +2 −2 Translations/InnoSetup/French.isl
  22. +2 −2 Translations/InnoSetup/Galician.isl
  23. +2 −2 Translations/InnoSetup/German.isl
  24. +2 −2 Translations/InnoSetup/Greek.isl
  25. +2 −2 Translations/InnoSetup/Hungarian.isl
  26. +2 −2 Translations/InnoSetup/Italian.isl
  27. +2 −2 Translations/InnoSetup/Japanese.isl
  28. +2 −2 Translations/InnoSetup/Korean.isl
  29. +2 −2 Translations/InnoSetup/Lithuanian.isl
  30. +2 −2 Translations/InnoSetup/Norwegian.isl
  31. +2 −2 Translations/InnoSetup/Persian.isl
  32. +2 −2 Translations/InnoSetup/Polish.isl
  33. +2 −2 Translations/InnoSetup/Portuguese.isl
  34. +2 −2 Translations/InnoSetup/Romanian.isl
  35. +2 −2 Translations/InnoSetup/Russian.isl
  36. +2 −2 Translations/InnoSetup/Serbian.isl
  37. +2 −2 Translations/InnoSetup/Sinhala.islu
  38. +2 −2 Translations/InnoSetup/Slovak.isl
  39. +2 −2 Translations/InnoSetup/Slovenian.isl
  40. +2 −2 Translations/InnoSetup/Spanish.isl
  41. +2 −2 Translations/InnoSetup/Swedish.isl
  42. +2 −2 Translations/InnoSetup/Turkish.isl
  43. +2 −2 Translations/InnoSetup/Ukrainian.isl
@@ -254,12 +254,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>

@@ -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>
@@ -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>

@@ -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>
@@ -635,11 +635,11 @@ Root: HKCU; SubKey: Software\TortoiseCVS\Prefs\External Merge2 Params; ValueType

;Set WinMerge as TortoiseGit diff tool
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
Root: HKCU; SubKey: Software\TortoiseGit; ValueType: string; ValueName: Merge; ValueData: {code:TortoiseSVNGITMergeToolCommandLine}; Flags: uninsdeletevalue; Check: UseAs3WayMergeTool
Root: HKCU; SubKey: Software\TortoiseGit; ValueType: string; ValueName: Merge; ValueData: {code:TortoiseSVNGitMergeToolCommandLine}; Flags: uninsdeletevalue; Check: UseAs3WayMergeTool

;Set WinMerge as TortoiseSVN diff tool
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
Root: HKCU; SubKey: Software\TortoiseSVN; ValueType: string; ValueName: Merge; ValueData: {code:TortoiseSVNGITMergeToolCommandLine}; Flags: uninsdeletevalue; Check: UseAs3WayMergeTool
Root: HKCU; SubKey: Software\TortoiseSVN; ValueType: string; ValueName: Merge; ValueData: {code:TortoiseSVNGitMergeToolCommandLine}; Flags: uninsdeletevalue; Check: UseAs3WayMergeTool

;Whatever the user chooses at the [Select Setup Language] dialog should also determine what language WinMerge will start up in
;(unless the user already has a startup language specified)
@@ -838,7 +838,7 @@ begin
Result := g_CheckListBox.Checked[0];
end;
function TortoiseSVNGITMergeToolCommandLine(Unused: string): string;
function TortoiseSVNGitMergeToolCommandLine(Unused: string): string;
var
lmr: string;
Args: string;
@@ -861,7 +861,7 @@ end;
function ThreeWayMergePage_ShouldSkipPage(Page: TWizardPage): Boolean;
begin
Result := not (IsTaskSelected('TortoiseSVN') or IsTaskSelected('TortoiseGIT'));
Result := not (IsTaskSelected('TortoiseSVN') or IsTaskSelected('TortoiseGit'));
end;
#include "modpath.iss"
@@ -615,11 +615,11 @@ Root: HKCU; SubKey: Software\TortoiseCVS\Prefs\External Merge2 Params; ValueType

;Set WinMerge as TortoiseGit diff tool
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
Root: HKCU; SubKey: Software\TortoiseGit; ValueType: string; ValueName: Merge; ValueData: {code:TortoiseSVNGITMergeToolCommandLine}; Flags: uninsdeletevalue; Check: UseAs3WayMergeTool
Root: HKCU; SubKey: Software\TortoiseGit; ValueType: string; ValueName: Merge; ValueData: {code:TortoiseSVNGitMergeToolCommandLine}; Flags: uninsdeletevalue; Check: UseAs3WayMergeTool

;Set WinMerge as TortoiseSVN diff tool
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
Root: HKCU; SubKey: Software\TortoiseSVN; ValueType: string; ValueName: Merge; ValueData: {code:TortoiseSVNGITMergeToolCommandLine}; Flags: uninsdeletevalue; Check: UseAs3WayMergeTool
Root: HKCU; SubKey: Software\TortoiseSVN; ValueType: string; ValueName: Merge; ValueData: {code:TortoiseSVNGitMergeToolCommandLine}; Flags: uninsdeletevalue; Check: UseAs3WayMergeTool

;Whatever the user chooses at the [Select Setup Language] dialog should also determine what language WinMerge will start up in
;(unless the user already has a startup language specified)
@@ -833,7 +833,7 @@ begin
Result := g_CheckListBox.Checked[0];
end;
function TortoiseSVNGITMergeToolCommandLine(Unused: string): string;
function TortoiseSVNGitMergeToolCommandLine(Unused: string): string;
var
lmr: string;
Args: string;
@@ -856,7 +856,7 @@ end;
function ThreeWayMergePage_ShouldSkipPage(Page: TWizardPage): Boolean;
begin
Result := not (IsTaskSelected('TortoiseSVN') or IsTaskSelected('TortoiseGIT'));
Result := not (IsTaskSelected('TortoiseSVN') or IsTaskSelected('TortoiseGit'));
end;
#include "modpath.is6.iss"
@@ -613,11 +613,11 @@ Root: HKCU; SubKey: Software\TortoiseCVS\Prefs\External Merge2 Params; ValueType

;Set WinMerge as TortoiseGit diff tool
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
Root: HKCU; SubKey: Software\TortoiseGit; ValueType: string; ValueName: Merge; ValueData: {code:TortoiseSVNGITMergeToolCommandLine}; Flags: uninsdeletevalue; Check: UseAs3WayMergeTool
Root: HKCU; SubKey: Software\TortoiseGit; ValueType: string; ValueName: Merge; ValueData: {code:TortoiseSVNGitMergeToolCommandLine}; Flags: uninsdeletevalue; Check: UseAs3WayMergeTool

;Set WinMerge as TortoiseSVN diff tool
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
Root: HKCU; SubKey: Software\TortoiseSVN; ValueType: string; ValueName: Merge; ValueData: {code:TortoiseSVNGITMergeToolCommandLine}; Flags: uninsdeletevalue; Check: UseAs3WayMergeTool
Root: HKCU; SubKey: Software\TortoiseSVN; ValueType: string; ValueName: Merge; ValueData: {code:TortoiseSVNGitMergeToolCommandLine}; Flags: uninsdeletevalue; Check: UseAs3WayMergeTool

;Whatever the user chooses at the [Select Setup Language] dialog should also determine what language WinMerge will start up in
;(unless the user already has a startup language specified)
@@ -821,7 +821,7 @@ begin
Result := g_CheckListBox.Checked[0];
end;
function TortoiseSVNGITMergeToolCommandLine(Unused: string): string;
function TortoiseSVNGitMergeToolCommandLine(Unused: string): string;
var
lmr: string;
Args: string;
@@ -844,7 +844,7 @@ end;
function ThreeWayMergePage_ShouldSkipPage(Page: TWizardPage): Boolean;
begin
Result := not (IsTaskSelected('TortoiseSVN') or IsTaskSelected('TortoiseGIT'));
Result := not (IsTaskSelected('TortoiseSVN') or IsTaskSelected('TortoiseGit'));
end;
#include "modpath.iss"
@@ -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
@@ -61,14 +61,14 @@ UkrainianLanguage=Ukrainiera menuak eta elkarrizketak
;Tasks
ExplorerContextMenu=&Gaitu Explorer hitzinguru menu baterapena
IntegrateTortoiseCVS=Bateratu &TortoiseCVS-rekin
IntegrateTortoiseGIT=Bateratu To&rtoiseGIT-rekin
IntegrateTortoiseGit=Bateratu To&rtoiseGit-rekin
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?
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
@@ -61,14 +61,14 @@ UkrainianLanguage=Ukrainian menus and dialogs
;Tasks
ExplorerContextMenu=&Ativar a integração com o menu de contexto do explorer
IntegrateTortoiseCVS=Integrar com o &TortoiseCVS
IntegrateTortoiseGIT=Integrar com o To&rtoiseGIT
IntegrateTortoiseGit=Integrar com o To&rtoiseGit
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?
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
@@ -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
@@ -62,14 +62,14 @@ UkrainianLanguage=Ukrainian menus and dialogs
;Tasks
ExplorerContextMenu=&Habilita la integració del menú de contexte a l'Explorador
IntegrateTortoiseCVS=Integra amb el &TortoiseCVS
IntegrateTortoiseGIT=Integra amb el To&rtoiseGIT
IntegrateTortoiseGit=Integra amb el To&rtoiseGit
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?
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
@@ -61,14 +61,14 @@ UkrainianLanguage=Ukrainian menus and dialogs
;Tasks
ExplorerContextMenu=集成到资源管理器右键菜单(&E)
IntegrateTortoiseCVS=集成到 &TortoiseCVS
IntegrateTortoiseGIT=���ɵ� To&rtoiseGIT
IntegrateTortoiseGit=集成到 To&rtoiseGit
IntegrateTortoiseSVN=集成到 T&ortoiseSVN
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?
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
@@ -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
@@ -61,14 +61,14 @@ UkrainianLanguage=Ukrainian menus and dialogs
;Tasks
ExplorerContextMenu=&Integracija u Explorer kontekst izbornik
IntegrateTortoiseCVS=Integracija s &TortoiseCVS
IntegrateTortoiseGIT=Integracija s To&rtoiseGIT
IntegrateTortoiseGit=Integracija s To&rtoiseGit
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?
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
@@ -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
@@ -61,14 +61,14 @@ UkrainianLanguage=Ukrainske menuer og dialoger
;Tasks
ExplorerContextMenu=&Installer Explorer kontekst menu integrationen
IntegrateTortoiseCVS=Integrer med &TortoiseCVS
IntegrateTortoiseGIT=Integrer med To&rtoiseGIT
IntegrateTortoiseGit=Integrer med To&rtoiseGit
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?
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
@@ -61,14 +61,14 @@ UkrainianLanguage=Oekra
;Tasks
ExplorerContextMenu=&Activeer integratie in contextmenu van Verkenner
IntegrateTortoiseCVS=Integreren met &TortoiseCVS
IntegrateTortoiseGIT=Integreren met To&rtoiseGIT
IntegrateTortoiseGit=Integreren met To&rtoiseGit
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?
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
@@ -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

0 comments on commit a109622

Please sign in to comment.
You can’t perform that action at this time.