From 1036cb5d2afb4fc1963e0b40279bb21295f12b5e Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Wed, 18 Nov 2020 20:48:46 +0100 Subject: [PATCH] Fix typos Signed-off-by: Sven Strickroth --- Languages/Tortoise.pot | 12 ++++++------ src/Resources/TortoiseGitBlameENG.rc | 2 +- src/Resources/TortoiseMergeENG.rc | 2 +- src/Resources/TortoiseProcENG.rc | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Languages/Tortoise.pot b/Languages/Tortoise.pot index 61ea3ed76..7e4203eff 100644 --- a/Languages/Tortoise.pot +++ b/Languages/Tortoise.pot @@ -3001,7 +3001,7 @@ msgid "Could not find Super-project" msgstr "" #. Resource IDs: (IDS_ERR_GITNEEDHACKS) -msgid "Could not find \"msysgit\" or \"windows\" in versionstring of git.exe.\nIf you are using git of the cygwin or msys2 environment you need to enable special hacks.\nFor more information see the help file for the keyword \"cygwin git\" or \"msys2 git\"." +msgid "Could not find \"msysgit\" or \"windows\" in version string of git.exe.\nIf you are using git of the Cygwin or MSYS2 environment you need to enable special hacks.\nFor more information see the help file for the keyword \"Cygwin Git\" or \"NSYS2 Git\"." msgstr "" #. Resource IDs: (IDS_ERR_GITNOVALIDOUTPUT) @@ -4639,11 +4639,11 @@ msgid "Forward %d" msgstr "" #. Resource IDs: (IDS_ERR_GITUNNEEDEDHACKS) -msgid "Found \"msysgit\" or \"windows\" in versionstring of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\nYou can find more information in the help file for the keyword \"cygwin git\" or \"msys2 git\"." +msgid "Found \"msysgit\" or \"windows\" in version string of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\nYou can find more information in the help file for the keyword \"Cygwin Git\" or \"MSYS2 Git\"." msgstr "" #. Resource IDs: (IDS_REBASELOCKFILEFOUND) -msgid "Found a lock file indicating that a TortoiseGit rebase process is running. This blocks this operation.\n\nIf you are not runnig a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." +msgid "Found a lock file indicating that a TortoiseGit rebase process is running. This blocks this operation.\n\nIf you are not running a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." msgstr "" #. Resource IDs: (IDS_PROC_REBASE_EMPTYCOMMITMSG) @@ -8474,7 +8474,7 @@ msgid "Show la&beled commits only" msgstr "" #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 1063) -msgid "Show linenumber&s" +msgid "Show line number&s" msgstr "" #. Resource IDs: (IDS_MENULFSLOCKS) @@ -9536,7 +9536,7 @@ msgid "TortoiseGitBlame, Version %d.%d.%d.%d" msgstr "" #. Resource IDs: (1) -msgid "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" +msgid "TortoiseGitBlame\n\nTortoiseGitBlame\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" msgstr "" #. Resource IDs: (Dialog IDD_ABOUT: Control id 153, IDS_APP_TITLE) @@ -9628,7 +9628,7 @@ msgid "Trim right" msgstr "" #. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 1853) -msgid "Trust the exitcode of the external mege tool for auto resolving" +msgid "Trust the exitcode of the external merge tool for auto resolving" msgstr "" #. Resource IDs: (IDS_SVNERR_CLEANUPORFRESHCHECKOUT) diff --git a/src/Resources/TortoiseGitBlameENG.rc b/src/Resources/TortoiseGitBlameENG.rc index 6c2cc0051..d102ab60b 100644 --- a/src/Resources/TortoiseGitBlameENG.rc +++ b/src/Resources/TortoiseGitBlameENG.rc @@ -394,7 +394,7 @@ END STRINGTABLE BEGIN IDR_TORTOISE_GIT_BLAME_MAINFRAME - "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" + "TortoiseGitBlame\n\nTortoiseGitBlame\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" IDS_VERSION "TortoiseGitBlame, Version %d.%d.%d.%d" IDS_APPNAME "TortoiseGitBlame" IDS_CANNOTBLAMENOGIT "Cannot show blame. ""%s"" is not under version control by git." diff --git a/src/Resources/TortoiseMergeENG.rc b/src/Resources/TortoiseMergeENG.rc index 1a90be947..994a8e3ce 100644 --- a/src/Resources/TortoiseMergeENG.rc +++ b/src/Resources/TortoiseMergeENG.rc @@ -193,7 +193,7 @@ BEGIN CONTROL "Default to UTF-8 encoding",IDC_UTF8DEFAULT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,45,236,10 CONTROL "Use &one-pane view as default for 2-file diff",IDC_ONEPANE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,56,236,10 - CONTROL "Show linenumber&s",IDC_LINENUMBERS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,67,236,10 + CONTROL "Show line number&s",IDC_LINENUMBERS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,67,236,10 CONTROL "Add new files automatically to Git",IDC_AUTOADD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,79,236,10 CONTROL "Use Ribbons",IDC_USERIBBONS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,90,109,10 CONTROL "Use spaces",IDC_USESPACES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,103,95,10 diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc index e9bd92e16..4e5b21877 100644 --- a/src/Resources/TortoiseProcENG.rc +++ b/src/Resources/TortoiseProcENG.rc @@ -673,7 +673,7 @@ BEGIN PUSHBUTTON "...",IDC_EXTMERGEBROWSE,279,41,14,14 CONTROL "Block TortoiseGit while executing the external merge tool",IDC_MERGEBLOCK, "Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,7,61,286,22 - CONTROL "Trust the exitcode of the external mege tool for auto resolving",IDC_TRUSTEXITCODE, + CONTROL "Trust the exitcode of the external merge tool for auto resolving",IDC_TRUSTEXITCODE, "Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,7,85,286,22 LTEXT "Click on ""Advanced"" to specify alternate merge programs based on file extension",IDC_STATIC,7,108,160,33 PUSHBUTTON "&Advanced...",IDC_EXTMERGEADVANCED,206,111,87,14 @@ -3819,7 +3819,7 @@ BEGIN IDS_REPOBROWSE_SAVEAS "Save &as..." IDS_REPOBROWSE_SHOWLOG "Show &log" IDS_REPOBROWSE_OPEN "&Open" - IDS_REBASELOCKFILEFOUND "Found a lock file indicating that a TortoiseGit rebase process is running. This blocks this operation.\n\nIf you are not runnig a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." + IDS_REBASELOCKFILEFOUND "Found a lock file indicating that a TortoiseGit rebase process is running. This blocks this operation.\n\nIf you are not running a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." IDS_ERR_MUSTBESAMEWT "Target and source must be in the same working tree!" IDS_MERGE_UNRELATED "&Merge unrelated history" IDS_HOOKTYPE_PREREBASE "Pre-rebase hook" @@ -5009,9 +5009,9 @@ BEGIN IDS_ERR_GITDLLMISSING "Could not start git.exe. A dynamic library (dll) is missing.\nYou might need to specify an extra PATH.\nCheck help file for ""Extra PATH""." IDS_ERR_GITNOVALIDOUTPUT "Could not get read version information from git.exe.\nGot: ""%s""" - IDS_ERR_GITNEEDHACKS "Could not find ""msysgit"" or ""windows"" in versionstring of git.exe.\nIf you are using git of the cygwin or msys2 environment you need to enable special hacks.\nFor more information see the help file for the keyword ""cygwin git"" or ""msys2 git""." + IDS_ERR_GITNEEDHACKS "Could not find ""msysgit"" or ""windows"" in version string of git.exe.\nIf you are using git of the Cygwin or MSYS2 environment you need to enable special hacks.\nFor more information see the help file for the keyword ""Cygwin Git"" or ""NSYS2 Git""." IDS_ERR_GITUNNEEDEDHACKS - "Found ""msysgit"" or ""windows"" in versionstring of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\nYou can find more information in the help file for the keyword ""cygwin git"" or ""msys2 git""." + "Found ""msysgit"" or ""windows"" in version string of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\nYou can find more information in the help file for the keyword ""Cygwin Git"" or ""MSYS2 Git""." IDS_ERR_GITCALLFAILED "Calling git.exe failed (exit code: %d). Please check the git.exe path." IDS_GITEXEFILEFILTER "git.exe|git.exe||" IDS_REALLYCANCEL "Are you sure you want to cancel?" -- 2.11.4.GIT