From ed3fcea4feb6db163604fda674cccc4743d1fe7d Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sun, 21 Jan 2018 21:42:33 +0100 Subject: [PATCH] Update TortoiseProcENG.rc Signed-off-by: Sven Strickroth --- src/Resources/TortoiseProcENG.rc | 42 ++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc index 28728bd0b..acfcca72f 100644 --- a/src/Resources/TortoiseProcENG.rc +++ b/src/Resources/TortoiseProcENG.rc @@ -3751,7 +3751,6 @@ BEGIN IDS_BROWSE_REFS_ONLYMERGED "Only merged (to HEAD)" IDS_BROWSE_REFS_ONLYUNMERGED "Only unmerged (to HEAD)" IDS_ARCHIVEFILEFILTER "ZIP archive (*.zip)|*.zip|All Files (*.*)|*.*||" - IDS_PROC_REMOTEBRANCH "Remote Branch" IDS_PROC_USELFS_TT "Use Git LFS" IDS_EXTRAPATH_TT "If your git installation needs an extra entry in the PATH environment variable, you can enter it here and it will get appended to %PATH% automatically when TortoiseGit starts." IDS_FIRSTSTART_HINT1 "TortoiseGit is designed as a Shell Extension. Therefore the main interaction with TortoiseGit will be using the context menu of the Windows shell such as the Windows Explorer." @@ -3762,6 +3761,27 @@ END STRINGTABLE BEGIN + IDS_TAGCOMPARE_DIFFER "Differ" + IDS_TAGCOMPARE_LOCALHASH "Local SHA1" + IDS_TAGCOMPARE_LOCALMESSAGE "Local message" + IDS_TAGCOMPARE_REMOTEHASH "Remote SHA1" + IDS_TAGCOMPARE_REMOTEMESSAGE "Remote message" + IDS_DELETE_REMOTETAG "Delete tag on remote" + IDS_DELETE_LOCALTAG "Delete local tag" + IDS_CONFLICT_NOTASUBMODULE "file, not a submodule" + IDS_REBASE_CURRENTBRANCHUPTODATE + "Current branch is up to date or newer than the fetched branch. Open rebase anyway?" + IDS_GITCONFIG_SETTING "This option represents ""%s"" git config setting." + IDS_SETTINGS_GITCONFIG_INHERIT_TT + "If this is enabled, no value is stored or overwritten at this config level." + IDS_PROC_REMOTEBRANCH "Remote Branch" + IDS_VIEW_SHOWROTHERLABELS "Other refs" + IDS_CONFLICT_HINT_IN_COMMIT_MESSAGE + "It looks as if there is a conflict hint (a line like ""# Conflicts:"") in your commit message. This hint is automatically added by Git for cli users and there is no need to keep it.\n\nDo you want to ignore this warning and keep these lines or abort committing in order to edit the commit message?\n\nYou can automatically remove these lines by enabling ""Strip lines starting with ""#"" in commit messages"" in TortoiseGit settings." +END + +STRINGTABLE +BEGIN IDS_ABOUTVERSION "TortoiseGit %d.%d.%d.%d %s\n%s\n" IDS_ABOUTVERSIONBOX "TortoiseGit %d.%d.%d, Build %d - %s, %s" END @@ -4923,26 +4943,6 @@ BEGIN IDS_TAGCOMPARE_ONLYREMOTE "Only remote" END -STRINGTABLE -BEGIN - IDS_TAGCOMPARE_DIFFER "Differ" - IDS_TAGCOMPARE_LOCALHASH "Local SHA1" - IDS_TAGCOMPARE_LOCALMESSAGE "Local message" - IDS_TAGCOMPARE_REMOTEHASH "Remote SHA1" - IDS_TAGCOMPARE_REMOTEMESSAGE "Remote message" - IDS_DELETE_REMOTETAG "Delete tag on remote" - IDS_DELETE_LOCALTAG "Delete local tag" - IDS_CONFLICT_NOTASUBMODULE "file, not a submodule" - IDS_REBASE_CURRENTBRANCHUPTODATE - "Current branch is up to date or newer than the fetched branch. Open rebase anyway?" - IDS_GITCONFIG_SETTING "This option represents ""%s"" git config setting." - IDS_SETTINGS_GITCONFIG_INHERIT_TT - "If this is enabled, no value is stored or overwritten at this config level." - IDS_VIEW_SHOWROTHERLABELS "Other refs" - IDS_CONFLICT_HINT_IN_COMMIT_MESSAGE - "It looks as if there is a conflict hint (a line like ""# Conflicts:"") in your commit message. This hint is automatically added by Git for cli users and there is no need to keep it.\n\nDo you want to ignore this warning and keep these lines or abort committing in order to edit the commit message?\n\nYou can automatically remove these lines by enabling ""Strip lines starting with ""#"" in commit messages"" in TortoiseGit settings." -END - #endif // English (U.S.) resources ///////////////////////////////////////////////////////////////////////////// -- 2.11.4.GIT