From bd3a0b6e09fb45cd475aa4d5a4a93458e7caff1a Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 5 Jul 2012 16:55:23 +0200 Subject: [PATCH] Fixed issue #1256: TortoiseProc crashes on composing invalid ref error message Signed-off-by: Sven Strickroth --- src/Changelog.txt | 1 + src/Resources/TortoiseProcENG.rc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Changelog.txt b/src/Changelog.txt index ab4e91bf6..fd8b31761 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -4,6 +4,7 @@ Released: unreleased == Features == * Fixed issue #238: submodule update should be recursive * Fixed issue #1234: Abbreviate renamings in the Log dialog as in the Commit Progress dialog + * Fixed issue #1256: TortoiseProc crashes on composing invalid ref error message == Bug Fix == * Fixed issue #913: Merge does not cope with ambiguous tag and branch names diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc index dfe53695d..16309ac54 100644 --- a/src/Resources/TortoiseProcENG.rc +++ b/src/Resources/TortoiseProcENG.rc @@ -3564,7 +3564,7 @@ BEGIN IDS_PROC_STASHSUCCESS "Stash Success" IDS_PROC_NOUSERDATA "User name and email must be set before commit.\r\n Do you want to set these now?" IDS_PROC_PREVIOUSVERSION "Previous Version" - IDS_PROC_REFINVALID """%"" is invalid." + IDS_PROC_REFINVALID """%s"" is invalid." IDS_IGNOREBUTTON "&Ignore" IDS_PROC_STASHAPPLYFAILED "Stash Apply failed!!!" IDS_PROC_FILEDIFF_VERSION2BASE "Version 2 (Base)" -- 2.11.4.GIT