Skip to content

Commit 7bba40d

Browse files
authored
typos: (#1397)
1 parent 0c22409 commit 7bba40d

39 files changed

+84
-84
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ You can find the current translation status in [TRANSLATION.md](https://github.c
5656

5757
**To use this tool, you need to install Git(>=2.25.1) first.**
5858

59-
You can download the latest stable from [Releases](https://github.com/sourcegit-scm/sourcegit/releases/latest) or download workflow artifacts from [Github Actions](https://github.com/sourcegit-scm/sourcegit/actions) to try this app based on latest commits.
59+
You can download the latest stable from [Releases](https://github.com/sourcegit-scm/sourcegit/releases/latest) or download workflow artifacts from [GitHub Actions](https://github.com/sourcegit-scm/sourcegit/actions) to try this app based on latest commits.
6060

6161
This software creates a folder `$"{System.Environment.SpecialFolder.ApplicationData}/SourceGit"`, which is platform-dependent, to store user settings, downloaded avatars and crash logs.
6262

@@ -93,7 +93,7 @@ For **macOS** users:
9393
brew tap ybeapps/homebrew-sourcegit
9494
brew install --cask --no-quarantine sourcegit
9595
```
96-
* If you want to install `SourceGit.app` from Github Release manually, you need run following command to make sure it works:
96+
* If you want to install `SourceGit.app` from GitHub Release manually, you need run following command to make sure it works:
9797
```shell
9898
sudo xattr -cr /Applications/SourceGit.app
9999
```

build/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
dotnet publish -c Release -r $RUNTIME_IDENTIFIER -o $DESTINATION_FOLDER src/SourceGit.csproj
1313
```
1414
> [!NOTE]
15-
> Please replace the `$RUNTIME_IDENTIFIER` with one of `win-x64`,`win-arm64`,`linux-x64`,`linux-arm64`,`osx-x64`,`osx-arm64`, and replece the `$DESTINATION_FOLDER` with the real path that will store the output executable files.
15+
> Please replace the `$RUNTIME_IDENTIFIER` with one of `win-x64`,`win-arm64`,`linux-x64`,`linux-arm64`,`osx-x64`,`osx-arm64`, and replace the `$DESTINATION_FOLDER` with the real path that will store the output executable files.

src/App.manifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
33
<!-- This manifest is used on Windows only.
4-
Don't remove it as it might cause problems with window transparency and embeded controls.
4+
Don't remove it as it might cause problems with window transparency and embedded controls.
55
For more details visit https://learn.microsoft.com/en-us/windows/win32/sbscs/application-manifests -->
66
<assemblyIdentity version="1.0.0.0" name="SourceGit.Desktop"/>
77

src/Commands/Blame.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ private void ParseLine(string line)
8989

9090
private readonly Models.BlameData _result = new Models.BlameData();
9191
private readonly StringBuilder _content = new StringBuilder();
92-
private readonly string _dateFormat = Models.DateTimeFormat.Actived.DateOnly;
92+
private readonly string _dateFormat = Models.DateTimeFormat.Active.DateOnly;
9393
private string _lastSHA = string.Empty;
9494
private bool _needUnifyCommitSHA = false;
9595
private int _minSHALen = 64;

src/Commands/MergeTool.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public static bool OpenForMerge(string repo, int toolType, string toolPath, stri
2424

2525
if (!File.Exists(toolPath))
2626
{
27-
Dispatcher.UIThread.Post(() => App.RaiseException(repo, $"Can NOT found external merge tool in '{toolPath}'!"));
27+
Dispatcher.UIThread.Post(() => App.RaiseException(repo, $"Can NOT find external merge tool in '{toolPath}'!"));
2828
return false;
2929
}
3030

@@ -54,7 +54,7 @@ public static bool OpenForDiff(string repo, int toolType, string toolPath, Model
5454

5555
if (!File.Exists(toolPath))
5656
{
57-
Dispatcher.UIThread.Invoke(() => App.RaiseException(repo, $"Can NOT found external diff tool in '{toolPath}'!"));
57+
Dispatcher.UIThread.Invoke(() => App.RaiseException(repo, $"Can NOT find external diff tool in '{toolPath}'!"));
5858
return false;
5959
}
6060

src/Models/Commit.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ public static double OpacityForNotMerged
3737
public List<Decorator> Decorators { get; set; } = new List<Decorator>();
3838
public bool HasDecorators => Decorators.Count > 0;
3939

40-
public string AuthorTimeStr => DateTime.UnixEpoch.AddSeconds(AuthorTime).ToLocalTime().ToString(DateTimeFormat.Actived.DateTime);
41-
public string CommitterTimeStr => DateTime.UnixEpoch.AddSeconds(CommitterTime).ToLocalTime().ToString(DateTimeFormat.Actived.DateTime);
42-
public string AuthorTimeShortStr => DateTime.UnixEpoch.AddSeconds(AuthorTime).ToLocalTime().ToString(DateTimeFormat.Actived.DateOnly);
43-
public string CommitterTimeShortStr => DateTime.UnixEpoch.AddSeconds(CommitterTime).ToLocalTime().ToString(DateTimeFormat.Actived.DateOnly);
40+
public string AuthorTimeStr => DateTime.UnixEpoch.AddSeconds(AuthorTime).ToLocalTime().ToString(DateTimeFormat.Active.DateTime);
41+
public string CommitterTimeStr => DateTime.UnixEpoch.AddSeconds(CommitterTime).ToLocalTime().ToString(DateTimeFormat.Active.DateTime);
42+
public string AuthorTimeShortStr => DateTime.UnixEpoch.AddSeconds(AuthorTime).ToLocalTime().ToString(DateTimeFormat.Active.DateOnly);
43+
public string CommitterTimeShortStr => DateTime.UnixEpoch.AddSeconds(CommitterTime).ToLocalTime().ToString(DateTimeFormat.Active.DateOnly);
4444

4545
public bool IsMerged { get; set; } = false;
4646
public bool IsCommitterVisible => !Author.Equals(Committer) || AuthorTime != CommitterTime;

src/Models/DateTimeFormat.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public static int ActiveIndex
2525
set;
2626
} = 0;
2727

28-
public static DateTimeFormat Actived
28+
public static DateTimeFormat Active
2929
{
3030
get => Supported[ActiveIndex];
3131
}

src/Models/IpcChannel.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public IpcChannel()
1919
{
2020
try
2121
{
22-
_singletoneLock = File.Open(Path.Combine(Native.OS.DataDir, "process.lock"), FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
22+
_singletonLock = File.Open(Path.Combine(Native.OS.DataDir, "process.lock"), FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
2323
_isFirstInstance = true;
2424
_server = new NamedPipeServerStream(
2525
"SourceGitIPCChannel" + Environment.UserName,
@@ -67,7 +67,7 @@ public void SendToFirstInstance(string cmd)
6767
public void Dispose()
6868
{
6969
_cancellationTokenSource?.Cancel();
70-
_singletoneLock?.Dispose();
70+
_singletonLock?.Dispose();
7171
}
7272

7373
private async void StartServer()
@@ -96,7 +96,7 @@ private async void StartServer()
9696
}
9797
}
9898

99-
private FileStream _singletoneLock = null;
99+
private FileStream _singletonLock = null;
100100
private bool _isFirstInstance = false;
101101
private NamedPipeServerStream _server = null;
102102
private CancellationTokenSource _cancellationTokenSource = null;

src/Models/RepositorySettings.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public bool EnableTopoOrderInHistories
3232
set;
3333
} = false;
3434

35-
public bool OnlyHighlighCurrentBranchInHistories
35+
public bool OnlyHighlightCurrentBranchInHistories
3636
{
3737
get;
3838
set;
@@ -188,7 +188,7 @@ public bool AutoRestoreAfterStash
188188
set;
189189
} = false;
190190

191-
public string PreferedOpenAIService
191+
public string PreferredOpenAIService
192192
{
193193
get;
194194
set;

src/Models/Stash.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ public class Stash
1111
public ulong Time { get; set; } = 0;
1212
public string Message { get; set; } = "";
1313

14-
public string TimeStr => DateTime.UnixEpoch.AddSeconds(Time).ToLocalTime().ToString(DateTimeFormat.Actived.DateTime);
14+
public string TimeStr => DateTime.UnixEpoch.AddSeconds(Time).ToLocalTime().ToString(DateTimeFormat.Active.DateTime);
1515
}
1616
}

0 commit comments

Comments
 (0)