From 933b534cb0adfc1582c5a48d8407cffd39455653 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sun, 20 May 2012 02:22:07 +0200 Subject: [PATCH] moved some more strings to resources Signed-off-by: Sven Strickroth --- Languages/Tortoise.pot | 33 +++++++++++++++++++++++++++++++++ src/Git/GitStatusListCtrl.cpp | 14 +++++++------- src/Resources/TortoiseProcENG.rc | 8 ++++++++ src/TortoiseProc/LogDlg.cpp | 10 +++++----- src/TortoiseProc/resource.h | 8 ++++++++ 5 files changed, 61 insertions(+), 12 deletions(-) diff --git a/Languages/Tortoise.pot b/Languages/Tortoise.pot index d4af9bf16..8f235fc1e 100644 --- a/Languages/Tortoise.pot +++ b/Languages/Tortoise.pot @@ -3026,6 +3026,11 @@ msgstr "" msgid "Diff previous revision" msgstr "" +#. Resource IDs: (81) +#, c-format +msgid "Diff with parent %d" +msgstr "" + #. Resource IDs: (1302) msgid "Difference between" msgstr "" @@ -3644,6 +3649,10 @@ msgstr "" msgid "Fetching Status..." msgstr "" +#. Resource IDs: (81) +msgid "Fetching changed files..." +msgstr "" + #. Resource IDs: (313) msgid "Fetching file..." msgstr "" @@ -4387,6 +4396,10 @@ msgstr "" msgid "Ignored" msgstr "" +#. Resource IDs: (78) +msgid "Ignored Files" +msgstr "" + #. Resource IDs: (16916) msgid "Image &and Text" msgstr "" @@ -4833,6 +4846,10 @@ msgstr "" msgid "Merged" msgstr "" +#. Resource IDs: (76) +msgid "Merged Files" +msgstr "" + #. Resource IDs: (10) msgid "Merges another branch" msgstr "" @@ -4899,6 +4916,10 @@ msgstr "" msgid "Modified" msgstr "" +#. Resource IDs: (76) +msgid "Modified Files" +msgstr "" + #. Resource IDs: (1070) msgid "More" msgstr "" @@ -5152,6 +5173,10 @@ msgstr "" msgid "North European" msgstr "" +#. Resource IDs: (78) +msgid "Not Versioned Files" +msgstr "" + #. Resource IDs: (3857) msgid "Not all of the system registry entries (or INI file) were removed." msgstr "" @@ -5176,6 +5201,10 @@ msgstr "" msgid "Note: this affects all Tortoise clients, not just TortoiseGit!" msgstr "" +#. Resource IDs: (82) +msgid "Notes" +msgstr "" + #. Resource IDs: (604) #, c-format msgid "Nothing need rebase\r\n%s equal %s" @@ -7192,6 +7221,10 @@ msgstr "" msgid "Tab size:" msgstr "" +#. Resource IDs: (82) +msgid "Tag Info" +msgstr "" + #. Resource IDs: (79) #, c-format msgid "Tagged the working tree to %s" diff --git a/src/Git/GitStatusListCtrl.cpp b/src/Git/GitStatusListCtrl.cpp index f77fb5eb7..31ac1fcd4 100644 --- a/src/Git/GitStatusListCtrl.cpp +++ b/src/Git/GitStatusListCtrl.cpp @@ -4817,7 +4817,8 @@ bool CGitStatusListCtrl::PrepareGroups(bool bForce /* = false */) //if(m_UnRevFileList.GetCount()>0) if(max >0) { - grp.pszHeader = _T("Merged Files"); + _tcsncpy_s(groupname, 1024, (LPCTSTR)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_MERGEDFILES)), 1023); + grp.pszHeader = groupname; grp.iGroupId = MERGE_MASK; grp.uAlign = LVGA_HEADER_LEFT; InsertGroup(0, &grp); @@ -4825,9 +4826,9 @@ bool CGitStatusListCtrl::PrepareGroups(bool bForce /* = false */) for(int i=0;i<=max;i++) { CString str; - str.Format(_T("Diff with parent %d"), i+1); - //_tcsncpy_s(groupname, 1024, (LPCTSTR)_T("Not Versioned"), 1023); + str.Format(IDS_STATUSLIST_GROUP_DIFFWITHPARENT, i+1); grp.pszHeader = str.GetBuffer(); + str.ReleaseBuffer(); grp.iGroupId = i; grp.uAlign = LVGA_HEADER_LEFT; InsertGroup(i+1, &grp); @@ -4835,8 +4836,7 @@ bool CGitStatusListCtrl::PrepareGroups(bool bForce /* = false */) } else { - CString sUnassignedName(_T("Modified File")); - _tcsncpy_s(groupname, 1024, (LPCTSTR)sUnassignedName, 1023); + _tcsncpy_s(groupname, 1024, (LPCTSTR)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_MODIFIEDFILES)), 1023); grp.pszHeader = groupname; grp.iGroupId = groupindex; grp.uAlign = LVGA_HEADER_LEFT; @@ -4844,7 +4844,7 @@ bool CGitStatusListCtrl::PrepareGroups(bool bForce /* = false */) { - _tcsncpy_s(groupname, 1024, (LPCTSTR)_T("Not Versioned"), 1023); + _tcsncpy_s(groupname, 1024, (LPCTSTR)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_NOTVERSIONEDFILES)), 1023); grp.pszHeader = groupname; grp.iGroupId = groupindex; grp.uAlign = LVGA_HEADER_LEFT; @@ -4853,7 +4853,7 @@ bool CGitStatusListCtrl::PrepareGroups(bool bForce /* = false */) //if(m_IgnoreFileList.GetCount()>0) { - _tcsncpy_s(groupname, 1024, (LPCTSTR)_T("Ignored"), 1023); + _tcsncpy_s(groupname, 1024, (LPCTSTR)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_IGNOREDFILES)), 1023); grp.pszHeader = groupname; grp.iGroupId = groupindex; grp.uAlign = LVGA_HEADER_LEFT; diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc index 8f17aeec9..0f059b65c 100644 --- a/src/Resources/TortoiseProcENG.rc +++ b/src/Resources/TortoiseProcENG.rc @@ -2372,7 +2372,9 @@ BEGIN IDS_PROC_LOG_NOBRANCH "" IDS_SETTINGS_CREATELIB_TT "Creates a library folder with special settings for Git working trees" + IDS_STATUSLIST_GROUP_MERGEDFILES "Merged Files" IDS_IMPORT_DEFAULTMSG "Initial import" + IDS_STATUSLIST_GROUP_MODIFIEDFILES "Modified Files" IDS_PROC_SYNC_PUSHTAGS "Push ta&gs" IDS_PROC_SYNC_PULL "&Pull" IDS_PROC_SYNC_FETCH "Fetc&h" @@ -2429,6 +2431,8 @@ BEGIN IDS_PROGRS_TITLE_COPY "Copy" IDS_PROGRS_MIMETYPE "Mime type" IDS_ERR_MISSINGVALUE "This field is required and must not be empty." + IDS_STATUSLIST_GROUP_NOTVERSIONEDFILES "Not Versioned Files" + IDS_STATUSLIST_GROUP_IGNOREDFILES "Ignored Files" IDS_PROGRS_REVERTMARKERS "The selected file appears to still have one or more conflict markers in it.\nAre you sure you want to mark the file resolved?" IDS_SETTINGS_SELECTDIFF "Select diff application" @@ -2525,8 +2529,10 @@ BEGIN IDS_ERR_WCCHANGED "The working tree has changed!\n\nPlease commit your changes first or revert." IDS_ERR_COPYFILES "Could not copy the files!\n\n%s" IDS_ERR_EXTMERGESTART "Could not start external merge program!\n\n%s" + IDS_STATUSLIST_GROUP_DIFFWITHPARENT "Diff with parent %d" IDS_ERR_FAILEDIGNOREPROPERTY "Could not add %s to the ignore list!" IDS_ERR_DIFFVIEWSTART "Could not start diff viewer!\n\n%s" + IDS_PROC_LOG_FETCHINGFILES "Fetching changed files..." END STRINGTABLE @@ -2638,6 +2644,8 @@ END STRINGTABLE BEGIN + IDS_NOTES "Notes" + IDS_PROC_LOG_TAGINFO "Tag Info" IDS_ERR_COPYITSELF "Can't copy \n%s\nto\n%s" IDS_ERR_INVALIDREV "Invalid revision number! Valid revisions are:\nHEAD, BASE, PREV, COMMITTED, WC,\npositive decimal numbers,\ndates in one of the following example forms:\n{2002-02-17}\n{15:30}\n{15:30:00.200000}\n{""2002-02-17 15:30""}\n{""2002-02-17 15:30 +0230""}\n{2002-02-17T15:30}\n{2002-02-17T15:30Z}\n{2002-02-17T15:30-04:00}\n{20020217T1530}\n{20020217T1530Z}\n{20020217T1530-0500}" IDS_ERR_EMPTYDIFF "No differences found!" diff --git a/src/TortoiseProc/LogDlg.cpp b/src/TortoiseProc/LogDlg.cpp index 675b542f4..596e4f656 100644 --- a/src/TortoiseProc/LogDlg.cpp +++ b/src/TortoiseProc/LogDlg.cpp @@ -550,7 +550,7 @@ CString CLogDlg::GetTagInfo(GitRev* pLogEntry) if(!output.IsEmpty()) { - output = _T("\n*Tag Info*\n\n") + output; + output = _T("\n*") + CString(MAKEINTRESOURCE(IDS_PROC_LOG_TAGINFO)) + _T("*\n\n") + output; } return output; @@ -611,7 +611,7 @@ void CLogDlg::FillLogMessageCtrl(bool bShow /* = true*/) { // set the log message text - pMsgView->SetWindowText(_T("Commit:")+pLogEntry->m_CommitHash.ToString()+_T("\r\n\r\n")); + pMsgView->SetWindowText(CString(MAKEINTRESOURCE(IDS_HASH)) + _T(": ") + pLogEntry->m_CommitHash.ToString() + _T("\r\n\r\n")); // turn bug ID's into links if the bugtraq: properties have been set // and we can find a match of those in the log message @@ -636,7 +636,7 @@ void CLogDlg::FillLogMessageCtrl(bool bShow /* = true*/) if(!pLogEntry->m_Notes.IsEmpty()) { - msg+= _T("\n*Notes* "); + msg+= _T("\n*") + CString(MAKEINTRESOURCE(IDS_NOTES)) + _T("* "); msg+= pLogEntry->m_Notes; msg+= _T("\n\n"); } @@ -678,7 +678,7 @@ void CLogDlg::FillLogMessageCtrl(bool bShow /* = true*/) m_ChangedFileListCtrl.m_CurrentVersion=pLogEntry->m_CommitHash; m_ChangedFileListCtrl.Show(GITSLC_SHOWVERSIONED); - m_ChangedFileListCtrl.SetBusyString(_T("Fetch Changed File...")); + m_ChangedFileListCtrl.SetBusyString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_FETCHINGFILES))); if(!pLogEntry->m_IsDiffFiles) m_ChangedFileListCtrl.SetBusy(TRUE); @@ -893,7 +893,7 @@ BOOL CLogDlg::Log(git_revnum_t /*rev*/, const CString& /*author*/, const CString } catch (CException * e) { - ::MessageBox(NULL, _T("not enough memory!"), _T("TortoiseGit"), MB_ICONERROR); + CMessageBox::Show(NULL, IDS_ERR_NOTENOUGHMEMORY, IDS_APPNAME, MB_ICONERROR); e->Delete(); m_bCancelled = TRUE; } diff --git a/src/TortoiseProc/resource.h b/src/TortoiseProc/resource.h index 34db49f13..18be8b122 100644 --- a/src/TortoiseProc/resource.h +++ b/src/TortoiseProc/resource.h @@ -524,7 +524,9 @@ #define IDS_PROC_LOG_NOBRANCH 1202 #define IDC_WHOLE_PROJECT 1203 #define IDS_SETTINGS_CREATELIB_TT 1203 +#define IDS_STATUSLIST_GROUP_MERGEDFILES 1204 #define IDS_IMPORT_DEFAULTMSG 1205 +#define IDS_STATUSLIST_GROUP_MODIFIEDFILES 1206 #define IDC_CHECKBOX 1207 #define IDS_PROC_SYNC_PUSHTAGS 1207 #define IDC_SHOWWHOLEPROJECT 1208 @@ -574,7 +576,9 @@ #define IDS_PROGRS_MIMETYPE 1236 #define IDS_ERR_MISSINGVALUE 1237 #define IDC_EXTERNALWARNING 1238 +#define IDS_STATUSLIST_GROUP_NOTVERSIONEDFILES 1238 #define IDC_SOUNDS 1239 +#define IDS_STATUSLIST_GROUP_IGNOREDFILES 1239 #define IDS_PROGRS_REVERTMARKERS 1240 #define IDC_ENABLEACCELERATORS 1240 #define IDS_SETTINGS_SELECTDIFF 1241 @@ -670,9 +674,13 @@ #define IDS_ERR_WCCHANGED 1288 #define IDS_ERR_COPYFILES 1289 #define IDS_ERR_EXTMERGESTART 1290 +#define IDS_STATUSLIST_GROUP_DIFFWITHPARENT 1291 #define IDS_ERR_FAILEDIGNOREPROPERTY 1292 #define IDS_ERR_DIFFVIEWSTART 1293 +#define IDS_PROC_LOG_FETCHINGFILES 1295 +#define IDS_NOTES 1296 #define IDC_GRAPHBARBUTTON 1297 +#define IDS_PROC_LOG_TAGINFO 1297 #define IDC_GRAPHBARSTACKEDBUTTON 1298 #define IDC_GRAPHLINEBUTTON 1299 #define IDC_GRAPHLINESTACKEDBUTTON 1300 -- 2.11.4.GIT