Skip to content

Commit c83be42

Browse files
committed
Minor SourceControl tweaks...
1 parent d578816 commit c83be42

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

External/Plugins/SourceControl/PluginMain.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ public void LoadSettings()
360360
if (settingObject.SVNPath == "svn.exe")
361361
{
362362
String programFiles = Environment.GetEnvironmentVariable("ProgramFiles");
363-
String slSvnPath = Path.Combine(programFiles, @"SlikSVN\bin\svn.exe");
363+
String slSvnPath = Path.Combine(programFiles, @"SlikSvn\bin\svn.exe");
364364
if (File.Exists(slSvnPath)) settingObject.SVNPath = slSvnPath;
365365
}
366366
// Try to find svn from TortoiseSVN

PluginCore/PluginCore/Resources/en_US.resX

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3803,13 +3803,16 @@ Please note that with injection enabled, you will not be able to use many projec
38033803
<value>Enable SVN integration with projects.</value>
38043804
</data>
38053805
<data name="SourceControl.Description.GITPath" xml:space="preserve">
3806-
<value>Path to GIT command line tool. Example: 'git' if the tool is already installed in the environment path.</value>
3806+
<value>Path to GIT command line tool. Example: 'git.exe' if the tool is already installed in the environment path.</value>
3807+
<comment>Modified after 4.7.1</comment>
38073808
</data>
38083809
<data name="SourceControl.Description.SVNPath" xml:space="preserve">
38093810
<value>PathPath to SVN command line tool. Example: 'svn.exe' if the tool is already installed in the environment path.</value>
3811+
<comment>Modified after 4.7.1</comment>
38103812
</data>
38113813
<data name="SourceControl.Description.TortoiseGITProcPath" xml:space="preserve">
3812-
<value>Path to TortoiseGit's TortoiseProc tool. Example: 'TortoiseProc.exe'.</value>
3814+
<value>Path to TortoiseGit's TortoiseProc tool. Example: 'TortoiseGitProc.exe'.</value>
3815+
<comment>Modified after 4.7.1</comment>
38133816
</data>
38143817
<data name="SourceControl.Description.TortoiseSVNProcPath" xml:space="preserve">
38153818
<value>Path to TortoiseSVN's TortoiseProc tool. Example: 'TortoiseProc.exe'.</value>
@@ -4412,13 +4415,16 @@ Custom locales must be an extension of a default locale, e.g. en-US.</value>
44124415
<comment>Added after 3.3.1</comment>
44134416
</data>
44144417
<data name="SourceControl.Description.EnableHG" xml:space="preserve">
4415-
<value>Enable Mercurial (Hg) integration in FlashDevelop</value>
4418+
<value>Enable Mercurial (HG) integration in FlashDevelop</value>
4419+
<comment>Modified after 4.7.1</comment>
44164420
</data>
44174421
<data name="SourceControl.Description.HGPath" xml:space="preserve">
4418-
<value>Path to Mercurial command line tool. Example: 'hg' if the tool is already installed in the environment path.</value>
4422+
<value>Path to Mercurial command line tool. Example: 'hg.exe' if the tool is already installed in the environment path.</value>
4423+
<comment>Modified after 4.7.1</comment>
44194424
</data>
44204425
<data name="SourceControl.Description.TortoiseHGProcPath" xml:space="preserve">
4421-
<value>Path to TortoiseHG's TortoiseProc tool. Example 'hgtk'.</value>
4426+
<value>Path to TortoiseHG's TortoiseProc tool. Example 'thgw.exe'.</value>
4427+
<comment>Modified after 4.7.1</comment>
44224428
</data>
44234429
<data name="FlashDevelop.Description.CustomShortcuts" xml:space="preserve">
44244430
<value>List of user defined override shortcuts.</value>

0 commit comments

Comments
 (0)