Skip to content

Commit 6e5626f

Browse files
wl2776wl2776
authored
fix: several typos in source code (#895)
1 parent 91883c9 commit 6e5626f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+737
-737
lines changed

‎src/App.Commands.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public static bool IsCheckForUpdateCommandVisible
3737
}
3838
}
3939

40-
public static readonly Command OpenPreferenceCommand = new Command(_ => OpenDialog(new Views.Preference()));
40+
public static readonly Command OpenPreferencesCommand = new Command(_ => OpenDialog(new Views.Preferences()));
4141
public static readonly Command OpenHotkeysCommand = new Command(_ => OpenDialog(new Views.Hotkeys()));
4242
public static readonly Command OpenAppDataDirCommand = new Command(_ => Native.OS.OpenInFileManager(Native.OS.DataDir));
4343
public static readonly Command OpenAboutCommand = new Command(_ => OpenDialog(new Views.About()));

‎src/App.JsonCodeGen.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,6 @@ public override void Write(Utf8JsonWriter writer, GridLength value, JsonSerializ
5151
[JsonSerializable(typeof(Models.ThemeOverrides))]
5252
[JsonSerializable(typeof(Models.Version))]
5353
[JsonSerializable(typeof(Models.RepositorySettings))]
54-
[JsonSerializable(typeof(ViewModels.Preference))]
54+
[JsonSerializable(typeof(ViewModels.Preferences))]
5555
internal partial class JsonCodeGen : JsonSerializerContext { }
5656
}

‎src/App.axaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<NativeMenuItem Header="{DynamicResource Text.Hotkeys}" Command="{x:Static s:App.OpenHotkeysCommand}"/>
3636
<NativeMenuItem Header="{DynamicResource Text.SelfUpdate}" Command="{x:Static s:App.CheckForUpdateCommand}" IsVisible="{x:Static s:App.IsCheckForUpdateCommandVisible}"/>
3737
<NativeMenuItemSeparator/>
38-
<NativeMenuItem Header="{DynamicResource Text.Preference}" Command="{x:Static s:App.OpenPreferenceCommand}" Gesture="⌘+,"/>
38+
<NativeMenuItem Header="{DynamicResource Text.Preferences}" Command="{x:Static s:App.OpenPreferencesCommand}" Gesture="⌘+,"/>
3939
<NativeMenuItem Header="{DynamicResource Text.OpenAppDataDir}" Command="{x:Static s:App.OpenAppDataDirCommand}"/>
4040
<NativeMenuItemSeparator/>
4141
<NativeMenuItem Header="{DynamicResource Text.Quit}" Command="{x:Static s:App.QuitCommand}" Gesture="⌘+Q"/>

‎src/App.axaml.cs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ public static void Main(string[] args)
4141

4242
try
4343
{
44-
if (TryLaunchedAsRebaseTodoEditor(args, out int exitTodo))
44+
if (TryLaunchAsRebaseTodoEditor(args, out int exitTodo))
4545
Environment.Exit(exitTodo);
46-
else if (TryLaunchedAsRebaseMessageEditor(args, out int exitMessage))
46+
else if (TryLaunchAsRebaseMessageEditor(args, out int exitMessage))
4747
Environment.Exit(exitMessage);
4848
else
4949
BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
@@ -298,7 +298,7 @@ public override void Initialize()
298298
{
299299
AvaloniaXamlLoader.Load(this);
300300

301-
var pref = ViewModels.Preference.Instance;
301+
var pref = ViewModels.Preferences.Instance;
302302
pref.PropertyChanged += (_, _) => pref.Save();
303303

304304
SetLocale(pref.Locale);
@@ -312,13 +312,13 @@ public override void OnFrameworkInitializationCompleted()
312312
{
313313
BindingPlugins.DataValidators.RemoveAt(0);
314314

315-
if (TryLaunchedAsCoreEditor(desktop))
315+
if (TryLaunchAsCoreEditor(desktop))
316316
return;
317317

318-
if (TryLaunchedAsAskpass(desktop))
318+
if (TryLaunchAsAskpass(desktop))
319319
return;
320320

321-
TryLaunchedAsNormal(desktop);
321+
TryLaunchAsNormal(desktop);
322322
}
323323
}
324324
#endregion
@@ -349,7 +349,7 @@ private static void LogException(Exception ex)
349349
File.WriteAllText(file, builder.ToString());
350350
}
351351

352-
private static bool TryLaunchedAsRebaseTodoEditor(string[] args, out int exitCode)
352+
private static bool TryLaunchAsRebaseTodoEditor(string[] args, out int exitCode)
353353
{
354354
exitCode = -1;
355355

@@ -402,7 +402,7 @@ private static bool TryLaunchedAsRebaseTodoEditor(string[] args, out int exitCod
402402
return true;
403403
}
404404

405-
private static bool TryLaunchedAsRebaseMessageEditor(string[] args, out int exitCode)
405+
private static bool TryLaunchAsRebaseMessageEditor(string[] args, out int exitCode)
406406
{
407407
exitCode = -1;
408408

@@ -436,7 +436,7 @@ private static bool TryLaunchedAsRebaseMessageEditor(string[] args, out int exit
436436
return true;
437437
}
438438

439-
private bool TryLaunchedAsCoreEditor(IClassicDesktopStyleApplicationLifetime desktop)
439+
private bool TryLaunchAsCoreEditor(IClassicDesktopStyleApplicationLifetime desktop)
440440
{
441441
var args = desktop.Args;
442442
if (args == null || args.Length <= 1 || !args[0].Equals("--core-editor", StringComparison.Ordinal))
@@ -451,7 +451,7 @@ private bool TryLaunchedAsCoreEditor(IClassicDesktopStyleApplicationLifetime des
451451
return true;
452452
}
453453

454-
private bool TryLaunchedAsAskpass(IClassicDesktopStyleApplicationLifetime desktop)
454+
private bool TryLaunchAsAskpass(IClassicDesktopStyleApplicationLifetime desktop)
455455
{
456456
var launchAsAskpass = Environment.GetEnvironmentVariable("SOURCEGIT_LAUNCH_AS_ASKPASS");
457457
if (launchAsAskpass is not "TRUE")
@@ -467,7 +467,7 @@ private bool TryLaunchedAsAskpass(IClassicDesktopStyleApplicationLifetime deskto
467467
return false;
468468
}
469469

470-
private void TryLaunchedAsNormal(IClassicDesktopStyleApplicationLifetime desktop)
470+
private void TryLaunchAsNormal(IClassicDesktopStyleApplicationLifetime desktop)
471471
{
472472
Native.OS.SetupEnternalTools();
473473
Models.AvatarManager.Instance.Start();
@@ -480,7 +480,7 @@ private void TryLaunchedAsNormal(IClassicDesktopStyleApplicationLifetime desktop
480480
desktop.MainWindow = new Views.Launcher() { DataContext = _launcher };
481481

482482
#if !DISABLE_UPDATE_DETECTION
483-
var pref = ViewModels.Preference.Instance;
483+
var pref = ViewModels.Preferences.Instance;
484484
if (pref.ShouldCheck4UpdateOnStartup())
485485
Check4Update();
486486
#endif
@@ -512,7 +512,7 @@ private void Check4Update(bool manually = false)
512512
// Should not check ignored tag if this is called manually.
513513
if (!manually)
514514
{
515-
var pref = ViewModels.Preference.Instance;
515+
var pref = ViewModels.Preferences.Instance;
516516
if (ver.TagName == pref.IgnoreUpdateTag)
517517
return;
518518
}

‎src/Converters/IntConverters.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ public static class IntConverters
2323
new FuncValueConverter<int, bool>(v => v != 1);
2424

2525
public static readonly FuncValueConverter<int, bool> IsSubjectLengthBad =
26-
new FuncValueConverter<int, bool>(v => v > ViewModels.Preference.Instance.SubjectGuideLength);
26+
new FuncValueConverter<int, bool>(v => v > ViewModels.Preferences.Instance.SubjectGuideLength);
2727

2828
public static readonly FuncValueConverter<int, bool> IsSubjectLengthGood =
29-
new FuncValueConverter<int, bool>(v => v <= ViewModels.Preference.Instance.SubjectGuideLength);
29+
new FuncValueConverter<int, bool>(v => v <= ViewModels.Preferences.Instance.SubjectGuideLength);
3030

3131
public static readonly FuncValueConverter<int, Thickness> ToTreeMargin =
3232
new FuncValueConverter<int, Thickness>(v => new Thickness(v * 16, 0, 0, 0));

‎src/Resources/Locales/de_DE.axaml

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@
367367
<x:String x:Key="Text.Hotkeys.Global.GotoPrevTab" xml:space="preserve">Zum vorherigen Tab wechseln</x:String>
368368
<x:String x:Key="Text.Hotkeys.Global.GotoNextTab" xml:space="preserve">Zum nächsten Tab wechseln</x:String>
369369
<x:String x:Key="Text.Hotkeys.Global.NewTab" xml:space="preserve">Neuen Tab erstellen</x:String>
370-
<x:String x:Key="Text.Hotkeys.Global.OpenPreference" xml:space="preserve">Einstellungen öffnen</x:String>
370+
<x:String x:Key="Text.Hotkeys.Global.OpenPreferences" xml:space="preserve">Einstellungen öffnen</x:String>
371371
<x:String x:Key="Text.Hotkeys.Repo" xml:space="preserve">REPOSITORY</x:String>
372372
<x:String x:Key="Text.Hotkeys.Repo.Commit" xml:space="preserve">Gestagte Änderungen committen</x:String>
373373
<x:String x:Key="Text.Hotkeys.Repo.CommitAndPush" xml:space="preserve">Gestagte Änderungen committen und pushen</x:String>
@@ -441,58 +441,58 @@
441441
<x:String x:Key="Text.Period.MonthsAgo" xml:space="preserve">Vor {0} Monaten</x:String>
442442
<x:String x:Key="Text.Period.LastYear" xml:space="preserve">Leztes Jahr</x:String>
443443
<x:String x:Key="Text.Period.YearsAgo" xml:space="preserve">Vor {0} Jahren</x:String>
444-
<x:String x:Key="Text.Preference" xml:space="preserve">Einstellungen</x:String>
445-
<x:String x:Key="Text.Preference.AI" xml:space="preserve">OPEN AI</x:String>
446-
<x:String x:Key="Text.Preference.AI.AnalyzeDiffPrompt" xml:space="preserve">Analysierung des Diff Befehl</x:String>
447-
<x:String x:Key="Text.Preference.AI.ApiKey" xml:space="preserve">API Schlüssel</x:String>
448-
<x:String x:Key="Text.Preference.AI.GenerateSubjectPrompt" xml:space="preserve">Generiere Nachricht Befehl</x:String>
449-
<x:String x:Key="Text.Preference.AI.Name" xml:space="preserve">Name</x:String>
450-
<x:String x:Key="Text.Preference.AI.Server" xml:space="preserve">Server</x:String>
451-
<x:String x:Key="Text.Preference.AI.Model" xml:space="preserve">Modell</x:String>
452-
<x:String x:Key="Text.Preference.Appearance" xml:space="preserve">DARSTELLUNG</x:String>
453-
<x:String x:Key="Text.Preference.Appearance.DefaultFont" xml:space="preserve">Standardschriftart</x:String>
454-
<x:String x:Key="Text.Preference.Appearance.FontSize" xml:space="preserve">Schriftgröße</x:String>
455-
<x:String x:Key="Text.Preference.Appearance.FontSize.Default" xml:space="preserve">Standard</x:String>
456-
<x:String x:Key="Text.Preference.Appearance.FontSize.Editor" xml:space="preserve">Texteditor</x:String>
457-
<x:String x:Key="Text.Preference.Appearance.MonospaceFont" xml:space="preserve">Monospace-Schriftart</x:String>
458-
<x:String x:Key="Text.Preference.Appearance.OnlyUseMonoFontInEditor" xml:space="preserve">Verwende die Monospace-Schriftart nur im Texteditor</x:String>
459-
<x:String x:Key="Text.Preference.Appearance.Theme" xml:space="preserve">Design</x:String>
460-
<x:String x:Key="Text.Preference.Appearance.ThemeOverrides" xml:space="preserve">Design-Anpassungen</x:String>
461-
<x:String x:Key="Text.Preference.Appearance.UseFixedTabWidth" xml:space="preserve">Fixe Tab-Breite in Titelleiste</x:String>
462-
<x:String x:Key="Text.Preference.Appearance.UseNativeWindowFrame" xml:space="preserve">Verwende nativen Fensterrahmen</x:String>
463-
<x:String x:Key="Text.Preference.DiffMerge" xml:space="preserve">DIFF/MERGE TOOL</x:String>
464-
<x:String x:Key="Text.Preference.DiffMerge.Path" xml:space="preserve">Installationspfad</x:String>
465-
<x:String x:Key="Text.Preference.DiffMerge.Path.Placeholder" xml:space="preserve">Installationspfad zum Diff/Merge Tool</x:String>
466-
<x:String x:Key="Text.Preference.DiffMerge.Type" xml:space="preserve">Tool</x:String>
467-
<x:String x:Key="Text.Preference.General" xml:space="preserve">ALLGEMEIN</x:String>
468-
<x:String x:Key="Text.Preference.General.Check4UpdatesOnStartup" xml:space="preserve">Beim Starten nach Updates suchen</x:String>
469-
<x:String x:Key="Text.Preference.General.Locale" xml:space="preserve">Sprache</x:String>
470-
<x:String x:Key="Text.Preference.General.MaxHistoryCommits" xml:space="preserve">Commit-Historie</x:String>
471-
<x:String x:Key="Text.Preference.General.ShowAuthorTime" xml:space="preserve">Zeige Autor Zeitpunkt anstatt Commit Zeitpunkt</x:String>
472-
<x:String x:Key="Text.Preference.General.ShowChildren" xml:space="preserve">Zeige Nachfolger in den Commit Details</x:String>
473-
<x:String x:Key="Text.Preference.General.SubjectGuideLength" xml:space="preserve">Längenvorgabe für Commit-Nachrichten</x:String>
474-
<x:String x:Key="Text.Preference.Git" xml:space="preserve">GIT</x:String>
475-
<x:String x:Key="Text.Preference.Git.CRLF" xml:space="preserve">Aktiviere Auto-CRLF</x:String>
476-
<x:String x:Key="Text.Preference.Git.DefaultCloneDir" xml:space="preserve">Klon Standardordner</x:String>
477-
<x:String x:Key="Text.Preference.Git.Email" xml:space="preserve">Benutzer Email</x:String>
478-
<x:String x:Key="Text.Preference.Git.Email.Placeholder" xml:space="preserve">Globale Git Benutzer Email</x:String>
479-
<x:String x:Key="Text.Preference.Git.Path" xml:space="preserve">Installationspfad</x:String>
480-
<x:String x:Key="Text.Preference.Git.User" xml:space="preserve">Benutzername</x:String>
481-
<x:String x:Key="Text.Preference.Git.User.Placeholder" xml:space="preserve">Globaler Git Benutzername</x:String>
482-
<x:String x:Key="Text.Preference.Git.Version" xml:space="preserve">Git Version</x:String>
483-
<x:String x:Key="Text.Preference.Git.Invalid" xml:space="preserve">Diese App setzt Git (>= 2.23.0) voraus</x:String>
484-
<x:String x:Key="Text.Preference.GPG" xml:space="preserve">GPG SIGNIERUNG</x:String>
485-
<x:String x:Key="Text.Preference.GPG.CommitEnabled" xml:space="preserve">Commit-Signierung</x:String>
486-
<x:String x:Key="Text.Preference.GPG.TagEnabled" xml:space="preserve">Tag-Signierung</x:String>
487-
<x:String x:Key="Text.Preference.GPG.Format" xml:space="preserve">GPG Format</x:String>
488-
<x:String x:Key="Text.Preference.GPG.Path" xml:space="preserve">GPG Installationspfad</x:String>
489-
<x:String x:Key="Text.Preference.GPG.Path.Placeholder" xml:space="preserve">Installationspfad zum GPG Programm</x:String>
490-
<x:String x:Key="Text.Preference.GPG.UserKey" xml:space="preserve">Benutzer Signierungsschlüssel</x:String>
491-
<x:String x:Key="Text.Preference.GPG.UserKey.Placeholder" xml:space="preserve">GPG Benutzer Signierungsschlüssel</x:String>
492-
<x:String x:Key="Text.Preference.Integration" xml:space="preserve">EINBINDUNGEN</x:String>
493-
<x:String x:Key="Text.Preference.Shell" xml:space="preserve">SHELL/TERMINAL</x:String>
494-
<x:String x:Key="Text.Preference.Shell.Type" xml:space="preserve">Shell/Terminal</x:String>
495-
<x:String x:Key="Text.Preference.Shell.Path" xml:space="preserve">Pfad</x:String>
444+
<x:String x:Key="Text.Preferences" xml:space="preserve">Einstellungen</x:String>
445+
<x:String x:Key="Text.Preferences.AI" xml:space="preserve">OPEN AI</x:String>
446+
<x:String x:Key="Text.Preferences.AI.AnalyzeDiffPrompt" xml:space="preserve">Analysierung des Diff Befehl</x:String>
447+
<x:String x:Key="Text.Preferences.AI.ApiKey" xml:space="preserve">API Schlüssel</x:String>
448+
<x:String x:Key="Text.Preferences.AI.GenerateSubjectPrompt" xml:space="preserve">Generiere Nachricht Befehl</x:String>
449+
<x:String x:Key="Text.Preferences.AI.Name" xml:space="preserve">Name</x:String>
450+
<x:String x:Key="Text.Preferences.AI.Server" xml:space="preserve">Server</x:String>
451+
<x:String x:Key="Text.Preferences.AI.Model" xml:space="preserve">Modell</x:String>
452+
<x:String x:Key="Text.Preferences.Appearance" xml:space="preserve">DARSTELLUNG</x:String>
453+
<x:String x:Key="Text.Preferences.Appearance.DefaultFont" xml:space="preserve">Standardschriftart</x:String>
454+
<x:String x:Key="Text.Preferences.Appearance.FontSize" xml:space="preserve">Schriftgröße</x:String>
455+
<x:String x:Key="Text.Preferences.Appearance.FontSize.Default" xml:space="preserve">Standard</x:String>
456+
<x:String x:Key="Text.Preferences.Appearance.FontSize.Editor" xml:space="preserve">Texteditor</x:String>
457+
<x:String x:Key="Text.Preferences.Appearance.MonospaceFont" xml:space="preserve">Monospace-Schriftart</x:String>
458+
<x:String x:Key="Text.Preferences.Appearance.OnlyUseMonoFontInEditor" xml:space="preserve">Verwende die Monospace-Schriftart nur im Texteditor</x:String>
459+
<x:String x:Key="Text.Preferences.Appearance.Theme" xml:space="preserve">Design</x:String>
460+
<x:String x:Key="Text.Preferences.Appearance.ThemeOverrides" xml:space="preserve">Design-Anpassungen</x:String>
461+
<x:String x:Key="Text.Preferences.Appearance.UseFixedTabWidth" xml:space="preserve">Fixe Tab-Breite in Titelleiste</x:String>
462+
<x:String x:Key="Text.Preferences.Appearance.UseNativeWindowFrame" xml:space="preserve">Verwende nativen Fensterrahmen</x:String>
463+
<x:String x:Key="Text.Preferences.DiffMerge" xml:space="preserve">DIFF/MERGE TOOL</x:String>
464+
<x:String x:Key="Text.Preferences.DiffMerge.Path" xml:space="preserve">Installationspfad</x:String>
465+
<x:String x:Key="Text.Preferences.DiffMerge.Path.Placeholder" xml:space="preserve">Installationspfad zum Diff/Merge Tool</x:String>
466+
<x:String x:Key="Text.Preferences.DiffMerge.Type" xml:space="preserve">Tool</x:String>
467+
<x:String x:Key="Text.Preferences.General" xml:space="preserve">ALLGEMEIN</x:String>
468+
<x:String x:Key="Text.Preferences.General.Check4UpdatesOnStartup" xml:space="preserve">Beim Starten nach Updates suchen</x:String>
469+
<x:String x:Key="Text.Preferences.General.Locale" xml:space="preserve">Sprache</x:String>
470+
<x:String x:Key="Text.Preferences.General.MaxHistoryCommits" xml:space="preserve">Commit-Historie</x:String>
471+
<x:String x:Key="Text.Preferences.General.ShowAuthorTime" xml:space="preserve">Zeige Autor Zeitpunkt anstatt Commit Zeitpunkt</x:String>
472+
<x:String x:Key="Text.Preferences.General.ShowChildren" xml:space="preserve">Zeige Nachfolger in den Commit Details</x:String>
473+
<x:String x:Key="Text.Preferences.General.SubjectGuideLength" xml:space="preserve">Längenvorgabe für Commit-Nachrichten</x:String>
474+
<x:String x:Key="Text.Preferences.Git" xml:space="preserve">GIT</x:String>
475+
<x:String x:Key="Text.Preferences.Git.CRLF" xml:space="preserve">Aktiviere Auto-CRLF</x:String>
476+
<x:String x:Key="Text.Preferences.Git.DefaultCloneDir" xml:space="preserve">Klon Standardordner</x:String>
477+
<x:String x:Key="Text.Preferences.Git.Email" xml:space="preserve">Benutzer Email</x:String>
478+
<x:String x:Key="Text.Preferences.Git.Email.Placeholder" xml:space="preserve">Globale Git Benutzer Email</x:String>
479+
<x:String x:Key="Text.Preferences.Git.Path" xml:space="preserve">Installationspfad</x:String>
480+
<x:String x:Key="Text.Preferences.Git.User" xml:space="preserve">Benutzername</x:String>
481+
<x:String x:Key="Text.Preferences.Git.User.Placeholder" xml:space="preserve">Globaler Git Benutzername</x:String>
482+
<x:String x:Key="Text.Preferences.Git.Version" xml:space="preserve">Git Version</x:String>
483+
<x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">Diese App setzt Git (>= 2.23.0) voraus</x:String>
484+
<x:String x:Key="Text.Preferences.GPG" xml:space="preserve">GPG SIGNIERUNG</x:String>
485+
<x:String x:Key="Text.Preferences.GPG.CommitEnabled" xml:space="preserve">Commit-Signierung</x:String>
486+
<x:String x:Key="Text.Preferences.GPG.TagEnabled" xml:space="preserve">Tag-Signierung</x:String>
487+
<x:String x:Key="Text.Preferences.GPG.Format" xml:space="preserve">GPG Format</x:String>
488+
<x:String x:Key="Text.Preferences.GPG.Path" xml:space="preserve">GPG Installationspfad</x:String>
489+
<x:String x:Key="Text.Preferences.GPG.Path.Placeholder" xml:space="preserve">Installationspfad zum GPG Programm</x:String>
490+
<x:String x:Key="Text.Preferences.GPG.UserKey" xml:space="preserve">Benutzer Signierungsschlüssel</x:String>
491+
<x:String x:Key="Text.Preferences.GPG.UserKey.Placeholder" xml:space="preserve">GPG Benutzer Signierungsschlüssel</x:String>
492+
<x:String x:Key="Text.Preferences.Integration" xml:space="preserve">EINBINDUNGEN</x:String>
493+
<x:String x:Key="Text.Preferences.Shell" xml:space="preserve">SHELL/TERMINAL</x:String>
494+
<x:String x:Key="Text.Preferences.Shell.Type" xml:space="preserve">Shell/Terminal</x:String>
495+
<x:String x:Key="Text.Preferences.Shell.Path" xml:space="preserve">Pfad</x:String>
496496
<x:String x:Key="Text.PruneRemote" xml:space="preserve">Remote löschen</x:String>
497497
<x:String x:Key="Text.PruneRemote.Target" xml:space="preserve">Ziel:</x:String>
498498
<x:String x:Key="Text.PruneWorktrees" xml:space="preserve">Worktrees löschen</x:String>

0 commit comments

Comments
 (0)