From 4324a20b8a890ec8acb9fc3ef6ad236bc107ce96 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sun, 13 Jan 2013 12:45:34 +0100 Subject: [PATCH] Saved resource files with VS2012 Signed-off-by: Sven Strickroth --- src/Resources/TortoiseGitBlameENG.rc | 68 +++++----- src/Resources/TortoiseMergeENG.rc | 23 ++-- src/Resources/TortoiseProcENG.rc | 252 +++++++++++++++++------------------ src/SshAskPass/SshAskPass.rc | 10 +- src/TortoiseIDiff/TortoiseIDiff.rc | 6 +- src/TortoiseShell/resourceshell.rc | 66 ++++----- src/TortoiseUDiff/TortoiseUDiff.rc | 4 +- src/touch/touch.rc | 20 +-- 8 files changed, 224 insertions(+), 225 deletions(-) diff --git a/src/Resources/TortoiseGitBlameENG.rc b/src/Resources/TortoiseGitBlameENG.rc index 8b5cc8682..5d7b92176 100644 --- a/src/Resources/TortoiseGitBlameENG.rc +++ b/src/Resources/TortoiseGitBlameENG.rc @@ -10,7 +10,7 @@ #ifndef APSTUDIO_INVOKED #include "..\targetver.h" #endif -#include "afxres.h" +#include #include "..\TortoiseGitBlame\MenuEncode.h" ///////////////////////////////////////////////////////////////////////////// @@ -20,10 +20,8 @@ // English (U.S.) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #pragma code_page(1252) -#endif //_WIN32 #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// @@ -41,7 +39,7 @@ BEGIN "#ifndef APSTUDIO_INVOKED\r\n" "#include ""..\\targetver.h""\r\n" "#endif\r\n" - "#include ""afxres.h""\r\n" + "#include \r\n" "#include ""..\\TortoiseGitBlame\\MenuEncode.h""\r\n" "\0" END @@ -56,10 +54,10 @@ BEGIN "LANGUAGE 9, 1\r\n" "#pragma code_page(1252)\r\n" "#include ""res\\TortoiseGitBlame.rc2"" // non-Microsoft Visual C++ edited resources\r\n" - "#include ""afxres.rc"" // Standard components\r\n" - "#include ""afxprint.rc"" // printing/print preview resources\r\n" + "#include // Standard components\r\n" + "#include // printing/print preview resources\r\n" "#if !defined(_AFXDLL)\r\n" - "#include ""afxribbon.rc"" // MFC ribbon and control bar resources\r\n" + "#include // MFC ribbon and control bar resources\r\n" "#endif\r\n" "#endif\r\n" "\0" @@ -96,7 +94,7 @@ IDR_TORTOISE_GIT_BLAME_MAINFRAME_256 BITMAP "..\\Resources\\bla // Toolbar // -IDR_TORTOISE_GIT_BLAME_MAINFRAME TOOLBAR 16, 16 +IDR_TORTOISE_GIT_BLAME_MAINFRAME TOOLBAR 16, 16 BEGIN BUTTON ID_FILE_OPEN SEPARATOR @@ -108,7 +106,7 @@ BEGIN BUTTON ID_APP_ABOUT END -IDR_TORTOISE_GIT_BLAME_MAINFRAME_256 TOOLBAR 16, 16 +IDR_TORTOISE_GIT_BLAME_MAINFRAME_256 TOOLBAR 16, 16 BEGIN BUTTON ID_FILE_OPEN SEPARATOR @@ -126,7 +124,7 @@ END // Menu // -IDR_TORTOISE_GIT_BLAME_MAINFRAME MENU +IDR_TORTOISE_GIT_BLAME_MAINFRAME MENU BEGIN POPUP "&File" BEGIN @@ -286,7 +284,7 @@ BEGIN END END -IDR_OUTPUT_POPUP MENU +IDR_OUTPUT_POPUP MENU BEGIN POPUP "Popup" BEGIN @@ -297,7 +295,7 @@ BEGIN END END -IDR_BLAME_POPUP MENU +IDR_BLAME_POPUP MENU BEGIN POPUP "BlAMEPOPUP" BEGIN @@ -316,7 +314,7 @@ END // Accelerator // -IDR_TORTOISE_GIT_BLAME_MAINFRAME ACCELERATORS +IDR_TORTOISE_GIT_BLAME_MAINFRAME ACCELERATORS BEGIN "O", ID_FILE_OPEN, VIRTKEY, CONTROL "X", ID_EDIT_CUT, VIRTKEY, CONTROL @@ -344,7 +342,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM CAPTION "About TortoiseGitBlame" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - ICON IDR_TORTOISE_GIT_BLAME_MAINFRAME,IDC_STATIC,14,14,21,20 + ICON IDR_TORTOISE_GIT_BLAME_MAINFRAME,IDC_STATIC,14,14,20,20 LTEXT "TortoiseGitBlame",IDC_VERSION,42,14,138,8,SS_NOPREFIX LTEXT "Copyright (C) 2009-2013 TortoiseGit",IDC_COPYRIGHT,42,26,156,8 DEFPUSHBUTTON "OK",IDOK,173,69,50,14,WS_GROUP @@ -370,7 +368,7 @@ END // #ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO +GUIDELINES DESIGNINFO BEGIN IDD_ABOUTBOX, DIALOG BEGIN @@ -388,12 +386,12 @@ END // String Table // -STRINGTABLE +STRINGTABLE BEGIN IDP_OLE_INIT_FAILED "OLE initialization failed. Make sure that the OLE libraries are the correct version." END -STRINGTABLE +STRINGTABLE BEGIN IDR_TORTOISE_GIT_BLAME_MAINFRAME "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" @@ -409,19 +407,19 @@ BEGIN IDS_PARENTS "Parent(s)" END -STRINGTABLE +STRINGTABLE BEGIN AFX_IDS_APP_TITLE "TortoiseGitBlame" AFX_IDS_IDLEMESSAGE " " AFX_IDS_HELPMODEMESSAGE "Select an object on which to get Help" END -STRINGTABLE +STRINGTABLE BEGIN ID_INDICATOR_NUM "NUM" END -STRINGTABLE +STRINGTABLE BEGIN ID_FILE_NEW "Create a new document\nNew" ID_FILE_OPEN "Open an existing document\nOpen" @@ -435,7 +433,7 @@ BEGIN ID_FILE_PRINT_PREVIEW "Display full pages\nPrint Preview" END -STRINGTABLE +STRINGTABLE BEGIN ID_APP_ABOUT "Display program information, version number and copyright\nAbout" ID_APP_EXIT "Quit the application; prompts to save documents\nExit" @@ -446,7 +444,7 @@ BEGIN ID_HELP "Display help for current task or command\nHelp" END -STRINGTABLE +STRINGTABLE BEGIN IDS_EDIT_MENU "Edit" IDS_GIT_LOG_TAB "Git Log" @@ -454,7 +452,7 @@ BEGIN ID_VIEW_PREV "Show previous change of selected commit\nShow previous" END -STRINGTABLE +STRINGTABLE BEGIN ID_FILE_MRU_FILE1 "Open this document" ID_FILE_MRU_FILE2 "Open this document" @@ -474,18 +472,18 @@ BEGIN ID_FILE_MRU_FILE16 "Open this document" END -STRINGTABLE +STRINGTABLE BEGIN ID_NEXT_PANE "Switch to the next window pane\nNext Pane" ID_PREV_PANE "Switch back to the previous window pane\nPrevious Pane" END -STRINGTABLE +STRINGTABLE BEGIN ID_WINDOW_SPLIT "Split the active window into panes\nSplit" END -STRINGTABLE +STRINGTABLE BEGIN ID_EDIT_CLEAR "Erase the selection\nErase" ID_EDIT_CLEAR_ALL "Erase everything\nErase All" @@ -500,12 +498,12 @@ BEGIN ID_EDIT_REDO "Redo the previously undone action\nRedo" END -STRINGTABLE +STRINGTABLE BEGIN ID_VIEW_STATUS_BAR "Show or hide the status bar\nToggle Status Bar" END -STRINGTABLE +STRINGTABLE BEGIN AFX_IDS_SCSIZE "Change the window size" AFX_IDS_SCMOVE "Change the window position" @@ -516,18 +514,18 @@ BEGIN AFX_IDS_SCCLOSE "Close the active window and prompts to save the documents" END -STRINGTABLE +STRINGTABLE BEGIN AFX_IDS_SCRESTORE "Restore the window to normal size" AFX_IDS_SCTASKLIST "Activate Task List" END -STRINGTABLE +STRINGTABLE BEGIN AFX_IDS_PREVIEW_CLOSE "Close print preview mode\nCancel Preview" END -STRINGTABLE +STRINGTABLE BEGIN IDS_STATUS_PANE1 "Pane 1" IDS_STATUS_PANE2 "Pane 2" @@ -535,7 +533,7 @@ BEGIN IDS_TOOLBAR_CUSTOMIZE "Customize..." END -STRINGTABLE +STRINGTABLE BEGIN IDS_OUTPUT_WND "Git Revision List" IDS_PROPERTIES_WND "Commit Info" @@ -564,10 +562,10 @@ END LANGUAGE 9, 1 #pragma code_page(1252) #include "res\TortoiseGitBlame.rc2" // non-Microsoft Visual C++ edited resources -#include "afxres.rc" // Standard components -#include "afxprint.rc" // printing/print preview resources +#include // Standard components +#include // printing/print preview resources #if !defined(_AFXDLL) -#include "afxribbon.rc" // MFC ribbon and control bar resources +#include // MFC ribbon and control bar resources #endif #endif diff --git a/src/Resources/TortoiseMergeENG.rc b/src/Resources/TortoiseMergeENG.rc index 1ff23f201..0dfe21022 100644 --- a/src/Resources/TortoiseMergeENG.rc +++ b/src/Resources/TortoiseMergeENG.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -17,6 +17,7 @@ #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU) LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +#pragma code_page(1252) ///////////////////////////////////////////////////////////////////////////// // @@ -132,6 +133,7 @@ IDB_LOGO PNG "ribbon\\TortoiseMerge.png" #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) ///////////////////////////////////////////////////////////////////////////// // @@ -888,6 +890,7 @@ END #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DES) LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_SWISS +#pragma code_page(1252) ///////////////////////////////////////////////////////////////////////////// // @@ -938,7 +941,7 @@ END 2 TEXTINCLUDE BEGIN - "#include ""afxres.h""\r\n" + "#include \r\n" "\0" END @@ -953,10 +956,10 @@ BEGIN "LANGUAGE 9, 1\r\n" "#pragma code_page(1252)\r\n" "#include ""TortoiseMerge.rc2"" // non-Microsoft Visual C++ edited resources\r\n" - "#include ""afxres.rc"" // Standard components\r\n" - "#include ""afxprint.rc"" // printing/print preview resources\r\n" - "#include ""afxribbon.rc"" // ribbon and control bar resources\r\n" - "#include ""afxolecl.rc"" // OLE container resources\r\n" + "#include // Standard components\r\n" + "#include // printing/print preview resources\r\n" + "#include // ribbon and control bar resources\r\n" + "#include // OLE container resources\r\n" "#endif\r\n" "\0" END @@ -982,10 +985,10 @@ END LANGUAGE 9, 1 #pragma code_page(1252) #include "TortoiseMerge.rc2" // non-Microsoft Visual C++ edited resources -#include "afxres.rc" // Standard components -#include "afxprint.rc" // printing/print preview resources -#include "afxribbon.rc" // ribbon and control bar resources -#include "afxolecl.rc" // OLE container resources +#include // Standard components +#include // printing/print preview resources +#include // ribbon and control bar resources +#include // OLE container resources #endif ///////////////////////////////////////////////////////////////////////////// diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc index f7f4316a2..877b12e80 100644 --- a/src/Resources/TortoiseProcENG.rc +++ b/src/Resources/TortoiseProcENG.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -16,9 +16,8 @@ // Neutral resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU) -#ifdef _WIN32 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -#endif //_WIN32 +#pragma code_page(1252) ///////////////////////////////////////////////////////////////////////////// // @@ -122,9 +121,8 @@ IDC_PANCURDOWN CURSOR "pandown.cur" // English (U.S.) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#endif //_WIN32 +#pragma code_page(1252) ///////////////////////////////////////////////////////////////////////////// // @@ -1500,7 +1498,7 @@ BEGIN PUSHBUTTON "Help",IDHELP,338,241,50,14 END -IDD_CLEAN DIALOGEX 0, 0, 261, 157 +IDD_CLEAN DIALOGEX 0, 0, 261, 150 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "Clean" FONT 8, "MS Shell Dlg", 400, 0, 0x1 @@ -1744,7 +1742,7 @@ END // #ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO +GUIDELINES DESIGNINFO BEGIN IDD_ABOUT, DIALOG BEGIN @@ -2411,7 +2409,7 @@ BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 254 TOPMARGIN, 7 - BOTTOMMARGIN, 146 + BOTTOMMARGIN, 142 END IDD_PATCH_VIEW, DIALOG @@ -2546,7 +2544,7 @@ END // Toolbar // -IDR_REVGRAPHBAR TOOLBAR 20, 20 +IDR_REVGRAPHBAR TOOLBAR 20, 20 BEGIN BUTTON ID_VIEW_ZOOMIN BUTTON ID_VIEW_ZOOMOUT @@ -2568,7 +2566,7 @@ END // Menu // -IDR_REVISIONGRAPH MENU +IDR_REVISIONGRAPH MENU BEGIN POPUP "&File" BEGIN @@ -2602,7 +2600,7 @@ BEGIN END END -IDR_STATGRAPH MENU +IDR_STATGRAPH MENU BEGIN POPUP "&File" BEGIN @@ -2616,7 +2614,7 @@ END // Accelerator // -IDR_ACC_LOGDLG ACCELERATORS +IDR_ACC_LOGDLG ACCELERATORS BEGIN "C", ID_EDIT_COPY, VIRTKEY, CONTROL, NOINVERT VK_INSERT, ID_EDIT_COPY, VIRTKEY, CONTROL, NOINVERT @@ -2629,7 +2627,7 @@ BEGIN VK_F5, ID_LOGDLG_REFRESH, VIRTKEY, SHIFT, NOINVERT END -IDR_ACC_COMMITDLG ACCELERATORS +IDR_ACC_COMMITDLG ACCELERATORS BEGIN "M", ID_FOCUS_MESSAGE, VIRTKEY, ALT, NOINVERT END @@ -2640,7 +2638,7 @@ END // String Table // -STRINGTABLE +STRINGTABLE BEGIN IDS_MSGBOX_HELP "Help" IDS_MSGBOX_DONOTSHOWAGAIN "Don't show this message again" @@ -2660,7 +2658,7 @@ BEGIN IDS_SVNACTION_REVERT "Reverted" END -STRINGTABLE +STRINGTABLE BEGIN ID_VIEW_ZOOM100 "Zoom 100%" ID_VIEW_ZOOMALL "Zoom to fit" @@ -2671,7 +2669,7 @@ BEGIN ID_VIEW_SHOWHEAD "Show HEAD revision nodes" END -STRINGTABLE +STRINGTABLE BEGIN IDS_SVNACTION_RESOLVE "Resolved" IDS_SVNACTION_UPDATE "Updated" @@ -2691,7 +2689,7 @@ BEGIN IDS_ERR_INVALIDPATH "The parameters '/path' and '/pathfile' are mutually exclusive.\nYou must only specify one of them." END -STRINGTABLE +STRINGTABLE BEGIN IDS_PROC_LOG_STATS "Showing %ld revision(s), from revision %s to revision %s - %ld revision(s) selected\r\n" IDS_PROC_LOG_ALLBRANCHES "" @@ -2712,7 +2710,7 @@ BEGIN IDS_PROC_SYNC_SUBKODULEINIT "Submodule Init" END -STRINGTABLE +STRINGTABLE BEGIN IDS_STATGRAPH_FILECHANGESBYUNIT "File changes each %s" IDS_STATGRAPH_PERCENTAGE_OF_AUTHORSHIP "Percent of authorship" @@ -2732,7 +2730,7 @@ BEGIN IDS_PROC_LOG_COMMITTEREMAIL "Committer Email" END -STRINGTABLE +STRINGTABLE BEGIN IDS_PROC_LOG_MERGEPOINT "Merge Point" IDS_PROC_LOG_PARENT1 "Parent 1" @@ -2748,7 +2746,7 @@ BEGIN IDS_FETCH_TAGS_ONLY "All tags only" END -STRINGTABLE +STRINGTABLE BEGIN IDS_LOG_POPUP_COPY "C&reate branch/tag from revision" IDS_COMMITDLG_FILE "File" @@ -2769,7 +2767,7 @@ BEGIN IDS_PROGRS_TITLE_RESOLVE "Resolve" END -STRINGTABLE +STRINGTABLE BEGIN IDS_LOG_REVERTTOREV_CONFIRM "Do you really want to revert all changes in\n%s\nand go back to this revision? These changes will be reverted by reverse-merging the revisions into your working tree." @@ -2785,7 +2783,7 @@ BEGIN IDS_PROGRESS_UNIFIEDDIFF "Getting unified diff" END -STRINGTABLE +STRINGTABLE BEGIN IDS_DLGTITLE_ADD_DIFF_TOOL "Add extension specific diff program" IDS_DLGTITLE_ADD_MERGE_TOOL "Add extension specific merge program" @@ -2797,13 +2795,13 @@ BEGIN IDS_REVGRAPH_POPUP_UNIDIFFREVS "&Unified diff" END -STRINGTABLE +STRINGTABLE BEGIN IDS_REVGRAPH_POPUP_COMPAREHEADS "Compare &HEAD revisions" IDS_REVGRAPH_POPUP_UNIDIFFHEADS "Unified &diff of HEAD revisions" END -STRINGTABLE +STRINGTABLE BEGIN IDS_PROGRS_TITLE_SWITCH "Switch" IDS_PROGRS_TITLE_EXPORT "Export" @@ -2824,7 +2822,7 @@ BEGIN IDS_PROC_BROWSEREFS_FETCHFROM "Fetch from ""%s""" END -STRINGTABLE +STRINGTABLE BEGIN IDS_MSYSGIT_PATH_TT "MsysGit Install Path" IDS_PROC_BROWSEREFS_COMPAREREFS "Compare selected refs" @@ -2848,7 +2846,7 @@ BEGIN IDS_PROC_COPY_SUCCESS "Tagged the working tree to %s" END -STRINGTABLE +STRINGTABLE BEGIN IDS_LOG_FILTER_REFNAME "Refname" IDS_ERR_NOTENOUGHMEMORY "Not enough memory to complete operation." @@ -2873,7 +2871,7 @@ BEGIN "Failed to start the issue tracker COM provider '%s'.\n%s" END -STRINGTABLE +STRINGTABLE BEGIN IDS_PROC_SETTINGS_TITLE "Settings - TortoiseGit" IDS_SETTINGS_ALTERNATIVEEDITOR_TT @@ -2896,7 +2894,7 @@ BEGIN "Check to use a less verbose date and time format in log messages" END -STRINGTABLE +STRINGTABLE BEGIN IDS_SETTINGS_RELATIVETIMES_TT "Check to show relative times in log messages" @@ -2917,7 +2915,7 @@ BEGIN IDS_PROC_LOG_FETCHINGFILES "Fetching changed files..." END -STRINGTABLE +STRINGTABLE BEGIN IDS_ERR_PROVIDER_VALIDATE_FAILED "The issue-tracker provider was unable to validate the parameter string" @@ -2941,7 +2939,7 @@ BEGIN IDS_B_T_BOTHEMPTY "The local branch name and the remote branch name are empty.\nContinue?" END -STRINGTABLE +STRINGTABLE BEGIN IDS_WARN_FOLDERNOTEXIST "The folder \n%s\ndoes not exist.\nWould you like to create it first?" IDS_WARN_GITINIT_FOLDERNOTEMPTY @@ -2951,33 +2949,33 @@ BEGIN IDS_WARN_NOVALIDPATH "The path/URL you've entered seems to be illegal on Windows!\nYou can try it anyway, but you might get an error later.\n\nA valid path on windows must not contain '<<>|""?*:' or one of the following device names:\ncom1-com9, lpt1-lpt9, prn, aux, con, nul, clock$\n\nDo you want to proceed anyway?" END -STRINGTABLE +STRINGTABLE BEGIN IDS_CHECKOUT_TT_DIR "Location where the contents of the\nrepository URL will be saved to." IDS_CHECKOUT_EXPORTDIR "Export directory:" END -STRINGTABLE +STRINGTABLE BEGIN IDS_SETTINGS_EXTMENULAYOUT_TT "Check those menu entries you want to appear only in the extended context menu (SHIFT + left click)" IDS_REVGRAPH_ERR_NOGRAPH "No graph available" END -STRINGTABLE +STRINGTABLE BEGIN IDS_REPOBROWSE_SAVEAS "Save &as..." IDS_REPOBROWSE_SHOWLOG "Show &log" IDS_REPOBROWSE_OPEN "&Open" END -STRINGTABLE +STRINGTABLE BEGIN IDS_ABOUTVERSION "TortoiseGit %d.%d.%d.%d \r\n%s \r\n" IDS_ABOUTVERSIONBOX "TortoiseGit %d.%d.%d, Build %d - %s, %s" END -STRINGTABLE +STRINGTABLE BEGIN IDS_CHSTAT_FILECOL "File" IDS_CHSTAT_WCCOL "Local status" @@ -2990,12 +2988,12 @@ BEGIN "The issue-tracker provider could not be created. Please check that it is installed correctly." END -STRINGTABLE +STRINGTABLE BEGIN IDS_ERR_NOTFOUND_SUPER_PRJECT "Could not find Super-project" END -STRINGTABLE +STRINGTABLE BEGIN IDS_LOG_COPY_SUCCESS "Branch/tag created successfully!" IDS_LOG_MESSAGEEDITTITLE "Edit log message" @@ -3007,7 +3005,7 @@ BEGIN IDS_LOG_SHOW_WHOLE "Show Whole Project" END -STRINGTABLE +STRINGTABLE BEGIN IDS_PROC_SENDMAIL_WRAPTOOLTIP "Be warned that email clients tend to automatic wrap lines.\r\nRecommendation: Use attachments." @@ -3032,7 +3030,7 @@ BEGIN IDS_PROC_PICK "Pick up %s" END -STRINGTABLE +STRINGTABLE BEGIN IDS_NOTES "Notes" IDS_PROC_LOG_TAGINFO "Tag Info" @@ -3054,34 +3052,34 @@ BEGIN "The two selected URL's are not created from the same root.\nIt's not possible to show the log messages between them!" END -STRINGTABLE +STRINGTABLE BEGIN IDS_INPUT_REMOVEONE "Remove %s" IDS_INPUT_REMOVEMORE "Remove %ld items" END -STRINGTABLE +STRINGTABLE BEGIN IDS_LOG_COMPAREWITHBASE "Compare with b&ase" END -STRINGTABLE +STRINGTABLE BEGIN IDS_MENUREFRESH "Refresh" END -STRINGTABLE +STRINGTABLE BEGIN IDS_DIFF_WCNAME "%s: Working Tree" END -STRINGTABLE +STRINGTABLE BEGIN IDS_PROC_RENAME "Rename %s" IDS_PROC_NEWNAME "New name for %s" END -STRINGTABLE +STRINGTABLE BEGIN IDS_COMMONFILEFILTER "All Files (*.*)|*.*||" IDS_PROGRAMSFILEFILTER "Programs (*.exe)|*.exe|All Files (*.*)|*.*||" @@ -3089,7 +3087,7 @@ BEGIN IDS_PICTUREFILEFILTER "Pictures (*.svg, *.wmf, *.jpg, *.png, *.bmp, *.gif)|*.svg;*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All (*.*)|*.*||" END -STRINGTABLE +STRINGTABLE BEGIN IDS_PUTTYKEYFILEFILTER "Putty Private Key (*.ppk)|*.ppk|All Files (*.*)|*.*||" IDS_PROC_GITCONFIG_REMOTEEMPTY "Remote name must not be empty." @@ -3114,12 +3112,12 @@ BEGIN IDS_PROC_COMMIT_HIDEPATCH "Hide Patch<<" END -STRINGTABLE +STRINGTABLE BEGIN IDS_CHECKUPDATE_SUMMARY "Changed files: %d" END -STRINGTABLE +STRINGTABLE BEGIN IDS_COMMITDLG_EXTERNALS "There are changes or unversioned items inside one or more submodule.\nThose files are not listed for commit. You need to commit those files in submodule" IDS_COMMITDLG_STATISTICSFORMAT "%d files selected, %d files total" @@ -3129,7 +3127,7 @@ BEGIN "You haven't entered an issue number!\nAre you sure you want to commit without an issue number?" END -STRINGTABLE +STRINGTABLE BEGIN IDS_COMMITDLG_NOTHINGTOCOMMITUNVERSIONED "No files were changed or added since\nthe last commit. There's nothing\nfor TortoiseGit to do here...\nDo you want to see the unversioned files?" @@ -3143,7 +3141,7 @@ BEGIN "The submodule ""%s"" is dirty.\nMerely committing the superproject cannot track or save such changes to the submodule.\nCommit the submodule now or ignore dirty changes?" END -STRINGTABLE +STRINGTABLE BEGIN IDS_PROC_CLEANUP "Cleaning up" IDS_PROC_REMOVEFORCE "%s\nDo you want to remove it anyway?" @@ -3163,7 +3161,7 @@ BEGIN "The folder %s\ncontains unversioned and/or modified file(s). Do you want to remove it anyway?" END -STRINGTABLE +STRINGTABLE BEGIN IDS_SETTINGS_CHECKNEWER_TT "If enabled, TortoiseGit checks once a week if a newer version is available" @@ -3175,7 +3173,7 @@ BEGIN "A newline separated list of paths for which no icon overlays are shown.\r\nIf you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\nAn empty list will allow overlays on all paths." END -STRINGTABLE +STRINGTABLE BEGIN IDS_SVN_PROGRESS_SPEED "Transferring at %s" IDS_SVN_PROGRESS_TOTALTRANSFERRED "%I64d kBytes transferred" @@ -3188,7 +3186,7 @@ BEGIN IDS_SETTINGS_CONF_VALUECOL "Value" END -STRINGTABLE +STRINGTABLE BEGIN IDS_CHECKNEWER_YOURVERSION "Your version is: %d.%d.%d.%d" IDS_CHECKNEWER_CURRENTVERSION "Current version is: %s" @@ -3199,7 +3197,7 @@ BEGIN IDS_CHECKNEWER_NETERROR "Could not check for a newer version!" END -STRINGTABLE +STRINGTABLE BEGIN IDS_STATUSLIST_COLFILE "Path" IDS_STATUSLIST_COLSTATUS "Status" @@ -3208,7 +3206,7 @@ BEGIN IDS_STATUSLIST_COLAUTHOR "Author" END -STRINGTABLE +STRINGTABLE BEGIN IDS_STATUSLIST_COLDATE "Date" IDS_STATUSLIST_COLREVISION "Revision" @@ -3218,20 +3216,20 @@ BEGIN IDS_STATUSLIST_SWITCHEDTO "switched to\r\n%s" END -STRINGTABLE +STRINGTABLE BEGIN IDS_STATUSLIST_COLADD "Lines added" IDS_STATUSLIST_COLDEL "Lines removed" END -STRINGTABLE +STRINGTABLE BEGIN IDS_SVNERR_CHECKPATHORURL "Check the path and/or URL you've entered." IDS_SVNERR_CLEANUPORFRESHCHECKOUT "Try a 'Cleanup'. If that doesn't work you need to do a fresh checkout." END -STRINGTABLE +STRINGTABLE BEGIN IDS_SETTINGS_INCLUDELIST_TT "A newline separated list of paths for which icon overlays are shown.\r\nIf you add an '*' char at the end of a path, then all files and subdirs inside that path are included too." @@ -3249,7 +3247,7 @@ BEGIN "Disable this option if you have really big working trees and experience\r\ntoo much disk access when browsing the working tree." END -STRINGTABLE +STRINGTABLE BEGIN IDS_PROGRS_CONFLICTSOCCURED_WARNING "Warning!" IDS_PROGRS_CONFLICTSOCCURED "One or more files are in a conflicted state." @@ -3257,27 +3255,27 @@ BEGIN IDS_PROGRS_FINISHED "Finished!" END -STRINGTABLE +STRINGTABLE BEGIN IDS_PROGRS_PATHATREV "%s - at revision: %d" IDS_PROGRS_TIME "%ld minute(s) and %ld second(s)" IDS_PROGRS_FINALINFO "%s in %s" END -STRINGTABLE +STRINGTABLE BEGIN IDS_REPOSTATUS_HEADREV "Lowest shown revision: %ld - Highest shown revision: %ld - HEAD revision: %ld" IDS_REPOSTATUS_WCINFO "Lowest shown revision: %ld - Highest shown revision: %ld" END -STRINGTABLE +STRINGTABLE BEGIN IDS_STATGRAPH_COMMITSBYAUTHOR "Commits by author" IDS_STATGRAPH_COMMITSBYDATE "Commits by date" IDS_STATGRAPH_COMMITSBYDATEY "commits" END -STRINGTABLE +STRINGTABLE BEGIN IDS_STATGRAPH_COMMITSBYAUTHORX "author" IDS_STATGRAPH_COMMITSBYAUTHORY "commits" @@ -3290,12 +3288,12 @@ BEGIN IDS_STATGRAPH_COMMITSBYDATEXYEAR "year" END -STRINGTABLE +STRINGTABLE BEGIN IDS_CLIPBOARD_PROGRESS_DEST "Clipboard" END -STRINGTABLE +STRINGTABLE BEGIN IDS_SVNACTION_SKIPMISSING "Skipped missing target" IDS_SVNACTION_ADDING "Adding" @@ -3304,12 +3302,12 @@ BEGIN IDS_SVNACTION_CONFLICTED "Conflicted" END -STRINGTABLE +STRINGTABLE BEGIN IDS_REVGRAPH_SAVEPIC "&Save graph as..." END -STRINGTABLE +STRINGTABLE BEGIN IDS_STATUSLIST_CONTEXT_ADD "Add" IDS_STATUSLIST_CONTEXT_EXPLORE "Explore to" @@ -3323,7 +3321,7 @@ BEGIN IDS_STATUSLIST_CONTEXT_ADD_RECURSIVE "Add..." END -STRINGTABLE +STRINGTABLE BEGIN IDS_REVGRAPH_ERR_GDIINIT "GDI+ couldn't be initialized!" IDS_REVGRAPH_ERR_NOBITMAP @@ -3331,13 +3329,13 @@ BEGIN IDS_REVGRAPH_ERR_NOENCODER "No image encoder found for %s." END -STRINGTABLE +STRINGTABLE BEGIN IDS_PROGRS_TITLE_RENAME "Rename/move" IDS_PROGRS_TITLE_MERGEREINTEGRATE "Merge Reintegrate" END -STRINGTABLE +STRINGTABLE BEGIN IDS_PROGRS_CLOSE_MANUAL "Close manually" IDS_PROGRS_CLOSE_NOERROR "Auto-close if no errors" @@ -3346,13 +3344,13 @@ BEGIN IDS_PROGRS_CLOSE_LOCAL "Auto-close for local operations" END -STRINGTABLE +STRINGTABLE BEGIN IDS_COMMITDLG_POPUP_PASTEFILELIST "Paste filename list" IDS_COMMITDLG_POPUP_PASTELASTMESSAGE "Paste last commit message" END -STRINGTABLE +STRINGTABLE BEGIN IDS_LOG_FILTER_BY "Filter by" IDS_LOG_FILTER_PATHS "Paths" @@ -3362,7 +3360,7 @@ BEGIN IDS_LOG_FILTER_REGEX "Use regular expression" END -STRINGTABLE +STRINGTABLE BEGIN IDS_SVNACTION_EXISTS "Versioned" IDS_SVNACTION_CHANGELISTSET "Assigned to changelist '%s'" @@ -3375,19 +3373,19 @@ BEGIN IDS_SVN_SUMMARIZEDELETED "Deleted" END -STRINGTABLE +STRINGTABLE BEGIN IDS_FILEDIFF_FILE "File" IDS_FILEDIFF_ACTION "Action" IDS_FILEDIFF_WAIT "Please wait while differences are obtained..." END -STRINGTABLE +STRINGTABLE BEGIN IDS_MERGE_RECORDONLY "Record Only" END -STRINGTABLE +STRINGTABLE BEGIN IDS_SVNPROGRESS_MENUUSETHEIRS "Resolve conflict using 'theirs'" IDS_SVNPROGRESS_MENUUSEMINE "Resolve conflict using 'mine'" @@ -3396,7 +3394,7 @@ BEGIN IDS_SVNPROGRESS_RESOLVED "Resolved:\n%s" END -STRINGTABLE +STRINGTABLE BEGIN IDS_PROC_NEWNAMECOPY "Copy: New name for %s" IDS_PROC_NEWNAMEMOVE "Move: New name for %s" @@ -3404,7 +3402,7 @@ BEGIN IDS_PROC_MULTIRENAME "TortoiseGit has detected similar filenames. Do you want the files:%s\nto be renamed too?" END -STRINGTABLE +STRINGTABLE BEGIN IDS_SETTINGS_UNVERSIONEDRECURSE_TT "If set, files inside unversioned folders can be shown in the status control.\r\nThe status control is used for example in the commit dialog." @@ -3432,7 +3430,7 @@ BEGIN "If checked, the commit dialog will be started again automatically after an error,\r\nwhile preserving your last selection and log message." END -STRINGTABLE +STRINGTABLE BEGIN IDS_PROGRESS_COMPARE "Comparing %s to %s" IDS_PROGRESS_INFO "Getting information..." @@ -3441,19 +3439,19 @@ BEGIN IDS_PROGRESSREVISIONTEXT "Revision %s" END -STRINGTABLE +STRINGTABLE BEGIN IDS_COLOURPICKER_CUSTOMTEXT "More..." IDS_COLOURPICKER_DEFAULTTEXT "Automatic" END -STRINGTABLE +STRINGTABLE BEGIN IDS_LOG_FILTER_BUGIDS "Bug-IDs" IDS_LOG_FILTER_REGEX_TT "Regular expressions filter:\r\n. : any character\r\nc+ : match character c one or more times\r\nc* : match character c zero or more times\r\n^ : start of line\r\n$ : end of line\r\n(string){n} : match string n times\r\n(abcd) : subexpression\r\n[aei0-9] : match a,e,i and 0..9\r\n[^aei0-9] : anything but a,e,i and 0..9\r\n\r\n\\w : matches a-z,A-Z,0-9 and _\r\n\\W : any non-alphanumeric character\r\n\\d : digits 0-9\r\n\\s : whitespaces" END -STRINGTABLE +STRINGTABLE BEGIN IDS_PROC_CHERRYPICKFAILED "Cherry Pick failed" IDS_PROC_NOPARENT "Parent %d does not exist" @@ -3477,25 +3475,25 @@ BEGIN "Do you really want to delete %s?" END -STRINGTABLE +STRINGTABLE BEGIN IDS_FILEDIFF_POPBLAME "&Blame revisions" IDS_FILEDIFF_POPSAVELIST "&Save list of selected files to..." END -STRINGTABLE +STRINGTABLE BEGIN IDS_PROC_CLEANUP_INFO1 "Cleaning up." IDS_PROC_CLEANUP_INFO2 "Please wait..." IDS_PROC_COPYRENAME "Copy and rename" END -STRINGTABLE +STRINGTABLE BEGIN IDS_FILEDIFF_SWITCHLEFTRIGHT_TT "Switches the comparison left<<->right" END -STRINGTABLE +STRINGTABLE BEGIN IDS_STATGRAPH_QUARTERLABEL "Q%d/%.2d" IDS_STATGRAPH_PIEBUTTON_TT "Pie Graph" @@ -3507,19 +3505,19 @@ BEGIN "%d most active author(s) with at least %d commits each (%d %%)" END -STRINGTABLE +STRINGTABLE BEGIN IDS_FILEDIFF_CHANGEDLISTINTRO "Changed files between %s, %s and %s, %s" END -STRINGTABLE +STRINGTABLE BEGIN IDS_FILEDIFF_POPEXPORT "&Export selection to..." IDS_FILEDIFF_POPCLIPBOARD "Copy selection to cli&pboard" IDS_FILEDIFF_POPREVERTTOREV "Revert to revision %s" END -STRINGTABLE +STRINGTABLE BEGIN IDS_HOOKTYPE_STARTCOMMIT "Start Commit Hook" IDS_HOOKTYPE_PRECOMMIT "Pre-Commit Hook" @@ -3527,13 +3525,13 @@ BEGIN IDS_HOOKTYPE_STARTUPDATE "Start Update Hook" END -STRINGTABLE +STRINGTABLE BEGIN IDS_HOOKTYPE_PREUPDATE "Pre-Update Hook" IDS_HOOKTYPE_POSTUPDATE "Post-Update Hook" END -STRINGTABLE +STRINGTABLE BEGIN IDS_SETTINGS_SHOWEXCLUDEDASNORMAL_TT "If enabled, working tree folders which are excluded from\nshowing overlays still show the overlay for status 'normal'" @@ -3555,7 +3553,7 @@ BEGIN IDS_SETTINGS_HOOKS_SELECTSCRIPTFILE "Select hook script file" END -STRINGTABLE +STRINGTABLE BEGIN IDS_SETTINGS_HOOKS_TYPECOL "Hook Type" IDS_SETTINGS_HOOKS_PATHCOL "Path" @@ -3575,7 +3573,7 @@ BEGIN "TortoiseGit will not show the following overlays: %s" END -STRINGTABLE +STRINGTABLE BEGIN IDS_PROGRS_TITLEFAILED "Failed!" IDS_PROGRS_INFOFAILED "The operation failed." @@ -3583,14 +3581,14 @@ BEGIN IDS_PROGRS_INFOGETTINGINFO "Getting required information..." END -STRINGTABLE +STRINGTABLE BEGIN IDS_SVNPROGRESS_EXPORTING "Exporting %s" IDS_SVNPROGRESS_EXPORTINGTO "to %s" IDS_SVNPROGRESS_EXPORTINGWAIT "Gathering information. Please wait..." END -STRINGTABLE +STRINGTABLE BEGIN IDS_STATUSLIST_NESTED "Nested" IDS_STATUSLIST_BUSYMSG "Please wait..." @@ -3600,13 +3598,13 @@ BEGIN IDS_STATUSLIST_UNCHECKGROUP "Deselect changelist" END -STRINGTABLE +STRINGTABLE BEGIN IDS_STATUSLIST_KEEPLOCAL "item kept locally" IDS_STATUSLIST_NOPROPVALUE "(no value)" END -STRINGTABLE +STRINGTABLE BEGIN IDS_PROGRS_CMD_CHECKOUT "Checkout from %s, revision %s, %s, %s" IDS_PROGRS_CMD_IMPORT "Import %s to %s%s" @@ -3622,34 +3620,34 @@ BEGIN IDS_PROGRS_CMD_REVERT "Revert" END -STRINGTABLE +STRINGTABLE BEGIN ID_VIEW_ZOOMIN "Zoom in" ID_VIEW_ZOOMOUT "Zoom out" END -STRINGTABLE +STRINGTABLE BEGIN IDS_SVNPROGRESS_UNVERSION "Unversioning %s" END -STRINGTABLE +STRINGTABLE BEGIN IDS_FILEDIFF_FILTERCUE "Filter paths" END -STRINGTABLE +STRINGTABLE BEGIN IDS_REPOSTATUS_EMPTYFILELIST "No files to show with the current setting.\nCheck one or more settings below to see unversioned, ignored and/or unmodified files.\nTo see remote changes, click on 'Check Repository'" END -STRINGTABLE +STRINGTABLE BEGIN IDS_PROC_MOVERENAME "Move and rename" END -STRINGTABLE +STRINGTABLE BEGIN IDS_B_T_NOTEMPTY "Branch/Tag name must not be empty or is invalid." IDS_CHOOSE_REPOSITORY "Choose Repository" @@ -3664,7 +3662,7 @@ BEGIN IDS_SVNACTION_SENDMAIL_RETRY "Retrying..." END -STRINGTABLE +STRINGTABLE BEGIN IDS_ERR_PAGEANT "Could not start the Putty Agent (pageant)." IDS_MENU_VIEWPATCH "View Patch" @@ -3681,7 +3679,7 @@ BEGIN IDS_REBASE_ABORT_TT "Recover to the status before rebase" END -STRINGTABLE +STRINGTABLE BEGIN IDS_REBASE_FASTFORWARD_FMT "Branch %s behind %s\r\n%s will fastforward to %s" @@ -3701,7 +3699,7 @@ BEGIN IDS_STATGRAPH_COMMITSBYUNIT "Commits each %s" END -STRINGTABLE +STRINGTABLE BEGIN IDS_LOG_FILTER_SUBJECT "Subject" IDS_STATUSLIST_SHOWLOGOLDNAME "Show log &before rename/copy" @@ -3722,7 +3720,7 @@ BEGIN IDS_FAIL "Fail" END -STRINGTABLE +STRINGTABLE BEGIN IDS_DONE "Done" IDS_PROC_SKIPPATCH "Skip Patch: %s" @@ -3743,7 +3741,7 @@ BEGIN IDS_PROC_COMMITMESSAGE "Commit Message" END -STRINGTABLE +STRINGTABLE BEGIN IDS_PROGS_TITLE_CHERRYPICK "Cherry Pick" IDS_PROC_REVISIONFILES "Revision Files" @@ -3763,7 +3761,7 @@ BEGIN IDS_FINISHBUTTON "Finish" END -STRINGTABLE +STRINGTABLE BEGIN IDS_PROC_STARTREBASEBUTTON "Start Rebase" IDS_PROC_STARTREBASEFFBUTTON "Start (FastFwd)" @@ -3787,7 +3785,7 @@ BEGIN IDS_PROC_COMMIT_RESTOREFILES_KEEP "&Keep current state" END -STRINGTABLE +STRINGTABLE BEGIN IDS_PROC_COMMIT_RECOMMIT "&ReCommit" IDS_PROC_STASHFAILED "Stash failed!!!" @@ -3807,7 +3805,7 @@ BEGIN IDS_ERR_PULLREUQESTFAILED "Failed to create pull-request." END -STRINGTABLE +STRINGTABLE BEGIN IDS_PROC_REMOVEBRANCH "Remove &branch" IDS_PROGS_TITLE_EDITNOTES "Edit Notes" @@ -3830,7 +3828,7 @@ BEGIN IDS_PROC_SYNC_PUSH "Pus&h" END -STRINGTABLE +STRINGTABLE BEGIN IDS_PROC_BROWSEREFS_DELETETAGS "Delete %d tags" IDS_PROCS_TITLE_GITREMOTESETTINGS "Git Remote Settings" @@ -3856,7 +3854,7 @@ BEGIN IDS_PROC_STASHAPPLYSUCCESS "Stash Apply successful" END -STRINGTABLE +STRINGTABLE BEGIN IDS_PROC_STASHPOPFAILED "Stash POP failed!!!" IDS_PROC_STASHPOPFAILEDCONFLICTS @@ -3884,7 +3882,7 @@ BEGIN "List a renamed file as ""long/path/{to => for}/file.txt"" instead of ""long/path/for/file.txt (from long/path/to/file.txt)""." END -STRINGTABLE +STRINGTABLE BEGIN IDS_PROC_PUSHFETCH_ALLREMOTES "- all -" IDS_PROC_SYNC_NOFASTFORWARD @@ -3910,7 +3908,7 @@ BEGIN IDS_PROC_LOG_JUMPNOTFOUND "No more revisions found." END -STRINGTABLE +STRINGTABLE BEGIN IDS_RECURSE_SUBMODULES_CHECK "Check" IDS_RECURSE_SUBMODULES_ONDEMAND "On demand" @@ -3920,7 +3918,7 @@ BEGIN IDS_ERR_EMPTYDIFF "No differences found!" IDS_PROC_TAG_FF "Tag (FF)" IDS_GITVER_REQUIRED "%s requires msysgit >= %s" - IDS_SETTINGS_SYMBOLIZEREFNAMES_TT + IDS_SETTINGS_SYMBOLIZEREFNAMES_TT "Show symbols on ref labels to substitute part of the ref names" END @@ -3932,9 +3930,8 @@ END // German (Switzerland) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DES) -#ifdef _WIN32 LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_SWISS -#endif //_WIN32 +#pragma code_page(1252) #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// @@ -3949,7 +3946,7 @@ END 2 TEXTINCLUDE BEGIN - "#include ""afxres.h""\r\n" + "#include \r\n" "\0" END @@ -3964,10 +3961,10 @@ BEGIN "LANGUAGE 9, 1\r\n" "#pragma code_page(1252)\r\n" "#include ""TortoiseProc.rc2"" // non-Microsoft Visual C++ edited resources\r\n" - "#include ""afxres.rc"" // Standard components\r\n" - "#include ""afxprint.rc"" // printing/print preview resources\r\n" - "#include ""afxribbon.rc"" // ribbon and control bar resources\r\n" - "#include ""afxolecl.rc"" // OLE container resources\r\n" + "#include // Standard components\r\n" + "#include // printing/print preview resources\r\n" + "#include // ribbon and control bar resources\r\n" + "#include // OLE container resources\r\n" "#endif\r\n" "\0" END @@ -3993,13 +3990,12 @@ END LANGUAGE 9, 1 #pragma code_page(1252) #include "TortoiseProc.rc2" // non-Microsoft Visual C++ edited resources -#include "afxres.rc" // Standard components -#include "afxprint.rc" // printing/print preview resources -#include "afxribbon.rc" // ribbon and control bar resources -#include "afxolecl.rc" // OLE container resources +#include // Standard components +#include // printing/print preview resources +#include // ribbon and control bar resources +#include // OLE container resources #endif ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED - diff --git a/src/SshAskPass/SshAskPass.rc b/src/SshAskPass/SshAskPass.rc index 2cb0f59f5..cec10e0c2 100644 --- a/src/SshAskPass/SshAskPass.rc +++ b/src/SshAskPass/SshAskPass.rc @@ -11,7 +11,7 @@ #include "targetver.h" #endif #define APSTUDIO_HIDDEN_SYMBOLS -#include +#include #undef APSTUDIO_HIDDEN_SYMBOLS ///////////////////////////////////////////////////////////////////////////// @@ -21,10 +21,8 @@ // English (U.S.) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #pragma code_page(1252) -#endif //_WIN32 ///////////////////////////////////////////////////////////////////////////// // @@ -58,7 +56,7 @@ END // #ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO +GUIDELINES DESIGNINFO BEGIN IDD_ASK_PASSWORD, DIALOG BEGIN @@ -88,7 +86,7 @@ BEGIN "#include ""targetver.h""\r\n" "#endif\r\n" "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""windows.h""\r\n" + "#include \r\n" "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" "\0" END @@ -108,7 +106,7 @@ END // String Table // -STRINGTABLE +STRINGTABLE BEGIN IDS_APP_TITLE "SshAskPass" IDC_SSHASKPASS "SSHASKPASS" diff --git a/src/TortoiseIDiff/TortoiseIDiff.rc b/src/TortoiseIDiff/TortoiseIDiff.rc index 59445d40d..f4255fb3b 100644 --- a/src/TortoiseIDiff/TortoiseIDiff.rc +++ b/src/TortoiseIDiff/TortoiseIDiff.rc @@ -8,7 +8,7 @@ // Generated from the TEXTINCLUDE 2 resource. // #define APSTUDIO_HIDDEN_SYMBOLS -#include +#include #undef APSTUDIO_HIDDEN_SYMBOLS #ifndef APSTUDIO_INVOKED #include "TortoiseIDiff.rc2" @@ -69,7 +69,7 @@ END 2 TEXTINCLUDE BEGIN "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""windows.h""\r\n" + "#include \r\n" "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" "#ifndef APSTUDIO_INVOKED\r\n" "#include ""TortoiseIDiff.rc2""\r\n" @@ -154,7 +154,7 @@ CAPTION "TortoiseGitIDiff" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "OK",IDOK,201,65,50,14 - ICON IDI_TORTOISEIDIFF,IDC_STATIC,15,15,21,20 + ICON IDI_TORTOISEIDIFF,IDC_STATIC,15,15,20,20 LTEXT "TortoiseGitIDiff - An image diff tool, part of TortoiseGit",IDC_STATIC,53,15,198,21 LTEXT "Version",IDC_ABOUTVERSION,53,42,198,8 LTEXT "Based on TortoiseIDiff of TortoiseSVN",IDC_WEBLINK,53,71,140,8 diff --git a/src/TortoiseShell/resourceshell.rc b/src/TortoiseShell/resourceshell.rc index 8a955dd38..bf3840bff 100644 --- a/src/TortoiseShell/resourceshell.rc +++ b/src/TortoiseShell/resourceshell.rc @@ -16,10 +16,8 @@ // Neutral resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU) -#ifdef _WIN32 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #pragma code_page(1252) -#endif //_WIN32 ///////////////////////////////////////////////////////////////////////////// // @@ -87,10 +85,8 @@ IDI_REVISIONGRAPH ICON "..\\Resources\\menurevisiongrap // Englisch (USA) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #pragma code_page(1252) -#endif //_WIN32 ///////////////////////////////////////////////////////////////////////////// // @@ -176,7 +172,7 @@ END // #ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO +GUIDELINES DESIGNINFO BEGIN IDD_PROPPAGE, DIALOG BEGIN @@ -196,11 +192,10 @@ END // String Table // -STRINGTABLE +STRINGTABLE BEGIN IDS_MENUUPDATE "Submodule &Update" IDS_MENUCOMMIT "&Commit..." - IDS_MENUCOMMITSUBMODULE "&Commit submodule..." IDS_MENUCREATEREPOS "Create repositor&y here..." IDS_MENUADD "&Add..." IDS_MENUREVERT "Re&vert..." @@ -208,7 +203,18 @@ BEGIN IDS_MENURESOLVE "Res&olve..." END -STRINGTABLE +STRINGTABLE +BEGIN + IDS_MENUDELETEIGNOREMULTIPLEMASK + "Delete and ignore %d items by &extension" + IDS_MENUDELETEIGNORE "Delete and add to &ignore list" + IDS_MENUDESCDELETEIGNORE + "Deletes and adds the selected file(s) or the filemask to the 'ignore' list" + IDS_MENUCOMMITSUBMODULE "&Commit submodule..." + IDS_MENUREVISIONGRAPH "Revision &graph" +END + +STRINGTABLE BEGIN IDS_MENUSWITCH "S&witch/Checkout..." IDS_MENUMERGE "&Merge..." @@ -228,7 +234,7 @@ BEGIN IDS_MENUDESCSWITCH "Switch/Checkout working tree to another branch/tag" END -STRINGTABLE +STRINGTABLE BEGIN IDS_MENUASSUMEVALID "Assume Unchanged" IDS_MENUDESCEXPORT "Exports a revision to a zip file" @@ -238,9 +244,6 @@ BEGIN IDS_MENUDESCMERGE "Merges another branch" IDS_MENUDESCSETTINGS "Tweak TortoiseGit" IDS_MENUDESCDEFAULT "no description for this command is available" - IDS_MENUREVISIONGRAPH "Revision &graph" - IDS_MENUDESCREVISIONGRAPH - "Shows a graphical representation of copies/tags/branches" IDS_STATUSNONE " " IDS_STATUSUNVERSIONED "non-versioned" IDS_STATUSNORMAL "normal" @@ -251,7 +254,13 @@ BEGIN IDS_STATUSMODIFIED "modified" END -STRINGTABLE +STRINGTABLE +BEGIN + IDS_MENUDESCREVISIONGRAPH + "Shows a graphical representation of copies/tags/branches" +END + +STRINGTABLE BEGIN IDS_git_DEPTH_UNKNOWN "Unknown depth" IDS_git_DEPTH_WORKING "Working Tree" @@ -269,7 +278,7 @@ BEGIN IDS_MENUSTASHLIST "Stash List" END -STRINGTABLE +STRINGTABLE BEGIN IDS_MENUSVNREBASE_DESC "Git SVN Rebase" IDS_MENUSVNDCOMMIT "SVN DCommit..." @@ -289,7 +298,7 @@ BEGIN IDS_MENUDELETEIGNOREMULTIPLE "Delete and &ignore %d items by name" END -STRINGTABLE +STRINGTABLE BEGIN IDS_REFLOG_DEL "Delete Ref..." IDS_MENUSENDMAIL "Send Mail..." @@ -299,7 +308,7 @@ BEGIN IDS_MENUSVNREBASE "SVN Rebase..." END -STRINGTABLE +STRINGTABLE BEGIN IDS_STATUSMERGED "merged" IDS_STATUSCONFLICTED "conflicted" @@ -319,7 +328,7 @@ BEGIN IDS_COLDESCREV "Last saved revision of item" END -STRINGTABLE +STRINGTABLE BEGIN IDS_MENUSHOWCHANGED "Check for modi&fications" IDS_MENUDESCSHOWCHANGED "Shows all files which were changed since the last update, locally and in the repository" @@ -339,7 +348,7 @@ BEGIN IDS_MENUAPPLYPATCH "Review/apply single &patch..." END -STRINGTABLE +STRINGTABLE BEGIN IDS_MENUCLIPPASTE "&Paste" IDS_MENUDESCCLIPPASTE "Pastes the svn path from the clipboard, resulting in a move (cut) or copy operation" @@ -351,7 +360,7 @@ BEGIN IDS_MENUDESCUNIGNORE "Removes the file or filemask from the list of ignored items" END -STRINGTABLE +STRINGTABLE BEGIN IDS_MENUDIFF "&Diff" IDS_MENUDESCDIFF "Compares the file with the last committed revision to show you the changes you made" @@ -371,7 +380,7 @@ BEGIN IDS_MENUDESCHELP "Read the 'Daily Use Guide' before you are stuck..." END -STRINGTABLE +STRINGTABLE BEGIN IDS_MENUDESCCREATEPATCH "Creates a unified diff file with all changes you made" IDS_MENUDESCAPPLYPATCH "Review/apply a unified diff file with TortoiseGitMerge" @@ -389,22 +398,13 @@ BEGIN IDS_MENUCLONE "Clone..." END -STRINGTABLE -BEGIN - IDS_MENUDELETEIGNOREMULTIPLEMASK - "Delete and ignore %d items by &extension" - IDS_MENUDELETEIGNORE "Delete and add to &ignore list" - IDS_MENUDESCDELETEIGNORE - "Deletes and adds the selected file(s) or the filemask to the 'ignore' list" -END - -STRINGTABLE +STRINGTABLE BEGIN IDS_DROPMOVERENAMEMENU "Git Move and rename versioned item here" IDS_MENUREMOVEKEEP "&Delete (keep local)" END -STRINGTABLE +STRINGTABLE BEGIN IDS_DROPCOPYRENAMEMENU "Git Copy and rename versioned item here" IDS_COLTITLEAUTHOR "Git Author" @@ -413,14 +413,14 @@ BEGIN IDS_PROPSNOTSAVED "You have modified properties without saving them first.\nDo you want to save them now?" END -STRINGTABLE +STRINGTABLE BEGIN IDS_MENUDESCREMOVEKEEP "Deletes files/folders from version control but keeps the file" IDS_YES "yes" IDS_NO "no" END -STRINGTABLE +STRINGTABLE BEGIN IDS_git_DEPTH_INFINITE "Fully recursive" IDS_git_DEPTH_IMMEDIATE "Immediate children, including folders" diff --git a/src/TortoiseUDiff/TortoiseUDiff.rc b/src/TortoiseUDiff/TortoiseUDiff.rc index 4cf451cb3..d11c6c14b 100644 --- a/src/TortoiseUDiff/TortoiseUDiff.rc +++ b/src/TortoiseUDiff/TortoiseUDiff.rc @@ -8,7 +8,7 @@ // Generated from the TEXTINCLUDE 2 resource. // #define APSTUDIO_HIDDEN_SYMBOLS -#include +#include #ifndef APSTUDIO_INVOKED #include "TortoiseUDiff.rc2" #endif @@ -147,7 +147,7 @@ END 2 TEXTINCLUDE BEGIN "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""windows.h""\r\n" + "#include \r\n" "#ifndef APSTUDIO_INVOKED\r\n" "#include ""TortoiseUDiff.rc2""\r\n" "#endif\r\n" diff --git a/src/touch/touch.rc b/src/touch/touch.rc index 598bf9ce2..793aa31a0 100644 --- a/src/touch/touch.rc +++ b/src/touch/touch.rc @@ -1,4 +1,4 @@ -//Microsoft Visual C++ generated resource script. +// Microsoft Visual C++ generated resource script. // #include "resource.h" @@ -11,8 +11,9 @@ #include "targetver.h" #endif #define APSTUDIO_HIDDEN_SYMBOLS -#include +#include #undef APSTUDIO_HIDDEN_SYMBOLS + ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -100,30 +101,32 @@ END // // TEXTINCLUDE // -1 TEXTINCLUDE + +1 TEXTINCLUDE BEGIN "resource.h\0" END -2 TEXTINCLUDE +2 TEXTINCLUDE BEGIN - "#ifndef APSTUDIO_INVOKED\r\n" + "#ifndef APSTUDIO_INVOKED\r\n" "#include ""targetver.h""\r\n" "#endif\r\n" "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""windows.h""\r\n" + "#include \r\n" "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" "\0" END -3 TEXTINCLUDE +3 TEXTINCLUDE BEGIN "\r\n" - "#include ""touch.rc2"" // non-Microsoft Visual C++ edited resources\r\n" + "#include ""touch.rc2"" // non-Microsoft Visual C++ edited resources\r\0" END #endif // APSTUDIO_INVOKED +#endif // Englisch (USA) resources ///////////////////////////////////////////////////////////////////////////// // // String Table @@ -150,3 +153,4 @@ END ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + -- 2.11.4.GIT