From 51cc6512ea1575c18a9983284767f3aa5e47673f Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 15 Jan 2015 11:43:07 +0100 Subject: [PATCH] Add tooltip explaining "Message only" Signed-off-by: Sven Strickroth --- Languages/Tortoise.pot | 4 ++++ src/Resources/TortoiseProcENG.rc | 2 ++ src/TortoiseProc/CommitDlg.cpp | 1 + src/TortoiseProc/resource.h | 1 + 4 files changed, 8 insertions(+) diff --git a/Languages/Tortoise.pot b/Languages/Tortoise.pot index 5e30eb9b4..c7d1a7aea 100644 --- a/Languages/Tortoise.pot +++ b/Languages/Tortoise.pot @@ -1781,6 +1781,10 @@ msgstr "" msgid "Allow to use custom Gravatar URL" msgstr "" +#. Resource IDs: (97) +msgid "Allows to create an empty commit which only has a commit message and no files (cf. git commit --allow-empty)." +msgstr "" + #. Resource IDs: (66) msgid "Already up to date." msgstr "" diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc index 93e7e771d..4636141eb 100644 --- a/src/Resources/TortoiseProcENG.rc +++ b/src/Resources/TortoiseProcENG.rc @@ -3664,6 +3664,8 @@ BEGIN IDS_ENCRYPT_SSL "SSL" IDS_SETTINGS_DELFILE "Deleting file" IDS_SETTINGS_DELCACHE "Deleting cached data" + IDS_COMMIT_MESSAGEONLY_TT + "Allows to create an empty commit which only has a commit message and no files (cf. git commit --allow-empty)." IDS_DISABLEUPDATECHECKSBUTTON "Disable update checks" IDS_DISABLEUPDATECHECKS "Do you really want to disable automatic update checks for TortoiseGit?\r\n\r\nAutomatic update checks can be re-enabled in TortoiseGit settings on the General page." IDS_REMINDMELATER "&Remind me later" diff --git a/src/TortoiseProc/CommitDlg.cpp b/src/TortoiseProc/CommitDlg.cpp index d6a4cb99d..924b81774 100644 --- a/src/TortoiseProc/CommitDlg.cpp +++ b/src/TortoiseProc/CommitDlg.cpp @@ -259,6 +259,7 @@ BOOL CCommitDlg::OnInitDialog() m_tooltips.AddTool(IDC_EXTERNALWARNING, IDS_COMMITDLG_EXTERNALS); m_tooltips.AddTool(IDC_COMMIT_AMEND,IDS_COMMIT_AMEND_TT); m_tooltips.AddTool(IDC_MERGEACTIVE, IDC_MERGEACTIVE_TT); + m_tooltips.AddTool(IDC_COMMIT_MESSAGEONLY, IDS_COMMIT_MESSAGEONLY_TT); // m_tooltips.AddTool(IDC_HISTORY, IDS_COMMITDLG_HISTORY_TT); CBugTraqAssociations bugtraq_associations; diff --git a/src/TortoiseProc/resource.h b/src/TortoiseProc/resource.h index 8106ef341..6e65ff897 100644 --- a/src/TortoiseProc/resource.h +++ b/src/TortoiseProc/resource.h @@ -1181,6 +1181,7 @@ #define IDC_BUTTON_FROM2 1542 #define IDC_BUTTON_REF 1542 #define IDC_REGEDT 1542 +#define IDS_COMMIT_MESSAGEONLY_TT 1542 #define IDC_LOCAL_BRANCH 1543 #define IDS_DISABLEUPDATECHECKSBUTTON 1543 #define IDC_LOCAL_BRANCHES 1543 -- 2.11.4.GIT