From 26da38c3363819ee78b6a5a4a34cd034309637ae Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sun, 19 Apr 2015 15:07:59 +0200 Subject: [PATCH] Rename "Squash" -> "Squash (with commit below)" Signed-off-by: Sven Strickroth --- Languages/Tortoise.pot | 4 ++++ src/Resources/TortoiseLoglistCommon.rc2 | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Languages/Tortoise.pot b/Languages/Tortoise.pot index f11337901..f1014ab38 100644 --- a/Languages/Tortoise.pot +++ b/Languages/Tortoise.pot @@ -8794,6 +8794,10 @@ msgstr "" msgid "Squash" msgstr "" +#. Resource IDs: (1254) +msgid "Squash (with commit below)" +msgstr "" + #. Resource IDs: (246) msgid "Stacked Bar Graph" msgstr "" diff --git a/src/Resources/TortoiseLoglistCommon.rc2 b/src/Resources/TortoiseLoglistCommon.rc2 index 81ac0fe05..580353699 100644 --- a/src/Resources/TortoiseLoglistCommon.rc2 +++ b/src/Resources/TortoiseLoglistCommon.rc2 @@ -81,7 +81,7 @@ BEGIN IDS_REBASE_SKIP "Skip" IDS_REBASE_EDIT "Edit" IDS_REBASE_PICK "Pick" - IDS_REBASE_SQUASH "Squash" + IDS_REBASE_SQUASH "Squash (with commit below)" IDS_SWITCH_TO_THIS "Switch/Checkout to this..." IDS_CREATE_BRANCH_AT_THIS "Create Branch at this version..." IDS_CREATE_TAG_AT_THIS "Create Tag at this version..." -- 2.11.4.GIT