From 21dca7e60514b1bba226b8f89e364ea893a57313 Mon Sep 17 00:00:00 2001 From: Sup Yut Sum Date: Tue, 17 Feb 2015 23:46:49 +0800 Subject: [PATCH] Fixed issue #2427: "Submodule of Project: " cannot be localized Signed-off-by: Sup Yut Sum --- Languages/Tortoise.pot | 8 ++++---- src/Changelog.txt | 8 +++++++- src/Resources/TortoiseProcENG.rc | 2 +- src/TortoiseProc/SubmoduleAddDlg.cpp | 5 ++++- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/Languages/Tortoise.pot b/Languages/Tortoise.pot index cf814548c..dd786fb50 100644 --- a/Languages/Tortoise.pot +++ b/Languages/Tortoise.pot @@ -8874,10 +8874,6 @@ msgstr "" msgid "Submodule Diff" msgstr "" -#. Resource IDs: (1585) -msgid "Submodule Info" -msgstr "" - #. Resource IDs: (76) msgid "Submodule Init" msgstr "" @@ -8899,6 +8895,10 @@ msgstr "" msgid "Submodule \"%1!s!\"\r\nRevision %2!s!" msgstr "" +#. Resource IDs: (1585) +msgid "Submodule of Project: " +msgstr "" + #. Resource IDs: (1708) msgid "Submodules" msgstr "" diff --git a/src/Changelog.txt b/src/Changelog.txt index cc18f58f9..91883d7a2 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -1,4 +1,10 @@ -= Release 1.8.13.0 = += Release 1.8.14.0 = +Released: Unreleased + +== Bug Fixes == + * Fixed issue #2427: "Submodule of Project: " cannot be localized + += Release 1.8.13.0 = Released: 2015-02-15 == Features == diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc index e697ba186..4b08aefbb 100644 --- a/src/Resources/TortoiseProcENG.rc +++ b/src/Resources/TortoiseProcENG.rc @@ -1512,7 +1512,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFR CAPTION "Submodule Add" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - GROUPBOX "Submodule Info",IDC_GROUP_SUBMODULE,7,7,257,62 + GROUPBOX "Submodule of Project: ",IDC_GROUP_SUBMODULE,7,7,257,62 LTEXT "Repository:",IDC_STATIC,15,24,40,8 CONTROL "",IDC_COMBOBOXEX_REPOSITORY,"ComboBoxEx32",CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP,61,22,171,70 PUSHBUTTON "...",IDC_REP_BROWSE,237,22,20,14 diff --git a/src/TortoiseProc/SubmoduleAddDlg.cpp b/src/TortoiseProc/SubmoduleAddDlg.cpp index 51586a6e5..543465c66 100644 --- a/src/TortoiseProc/SubmoduleAddDlg.cpp +++ b/src/TortoiseProc/SubmoduleAddDlg.cpp @@ -116,7 +116,10 @@ BOOL CSubmoduleAddDlg::OnInitDialog() GetDlgItem(IDC_PUTTYKEYFILE)->EnableWindow(m_bAutoloadPuttyKeyFile); GetDlgItem(IDC_PUTTYKEYFILE_BROWSE)->EnableWindow(m_bAutoloadPuttyKeyFile); - GetDlgItem(IDC_GROUP_SUBMODULE)->SetWindowText(CString(_T("Submodule of Project: "))+m_strProject); + CString text; + GetDlgItem(IDC_GROUP_SUBMODULE)->GetWindowText(text); + text += m_strProject; + GetDlgItem(IDC_GROUP_SUBMODULE)->SetWindowText(text); m_tooltips.Create(this); -- 2.11.4.GIT