IDI_DELUNVERSIONED ICON "..\\Resources\\menudelunversioned.ico"\r
IDI_APPSMALL ICON "..\\Resources\\TortoiseSmall.ico"\r
IDI_CLIPPASTE ICON "..\\Resources\\clippaste.ico"\r
-IDI_PUSH ICON "..\\resources\\pull1.ico"\r
+IDI_PUSH ICON "..\\resources\\Push.ico"\r
IDI_CLONE ICON "..\\resources\\checkout.ico"\r
+IDI_TAG ICON "..\\resources\\Tag.ico"\r
+IDI_REBASE ICON "..\\resources\\menurebase.ico"\r
+IDI_COMBINE ICON "..\\resources\\menucombine.ico"\r
+IDI_SKIP ICON "..\\resources\\menuskip.ico"\r
+IDI_SQUASH ICON "..\\resources\\menusquash.ico"\r
+IDI_EDIT ICON "..\\resources\\menuedit.ico"\r
+IDI_PICK ICON "..\\resources\\menupick.ico"\r
+IDI_MENUSYNC ICON "..\\resources\\menusync.ico"\r
#endif // Neutral resources\r
/////////////////////////////////////////////////////////////////////////////\r
\r
\r
// Icon with lowest ID value placed first to ensure application icon\r
// remains consistent on all systems.\r
-IDI_ICON1 ICON "..\\resources\\icon1.ico"\r
+IDI_MENUSENDMAIL ICON "..\\resources\\menusendmail.ico"\r
\r
/////////////////////////////////////////////////////////////////////////////\r
//\r
CAPTION "Property Page"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
BEGIN\r
- LTEXT "URL:",IDC_STATIC,4,5,26,8\r
- EDITTEXT IDC_REPOURL,30,5,213,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,WS_EX_TRANSPARENT\r
- LTEXT "URL:",IDC_ESCAPEDURLLABEL,4,17,26,8\r
- EDITTEXT IDC_REPOURLUNESCAPED,29,17,214,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER\r
- LTEXT "Revision / Author:",IDC_STATIC,4,31,76,8\r
- EDITTEXT IDC_REVISION,80,31,40,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,WS_EX_TRANSPARENT\r
- EDITTEXT IDC_AUTHOR,120,31,94,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,WS_EX_TRANSPARENT\r
- LTEXT "Last commit revision:",IDC_STATIC,4,43,76,8\r
- EDITTEXT IDC_CREVISION,80,43,40,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,WS_EX_TRANSPARENT\r
- EDITTEXT IDC_CDATE,120,43,123,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,WS_EX_TRANSPARENT\r
- LTEXT "Text Status:",IDC_STATIC,4,55,76,8\r
- EDITTEXT IDC_TEXTSTATUS,80,55,40,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,WS_EX_TRANSPARENT\r
- EDITTEXT IDC_TEXTDATE,120,55,123,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,WS_EX_TRANSPARENT\r
- LTEXT "Property Status:",IDC_STATIC,4,67,76,8\r
- EDITTEXT IDC_PROPSTATUS,80,67,40,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,WS_EX_TRANSPARENT\r
- EDITTEXT IDC_PROPDATE,120,67,123,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,WS_EX_TRANSPARENT\r
- LTEXT "Lock owner:",IDC_STATIC,4,79,76,8\r
- EDITTEXT IDC_LOCKOWNER,80,79,163,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER\r
- LTEXT "Lock creation date:",IDC_STATIC,4,91,76,8\r
- EDITTEXT IDC_LOCKDATE,80,90,163,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER\r
- LTEXT "Repository UUID:",IDC_STATIC,4,103,76,8\r
- EDITTEXT IDC_REPOUUID,80,102,163,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER\r
- LTEXT "Changelist:",IDC_STATIC,4,115,76,8\r
- EDITTEXT IDC_CHANGELIST,80,114,163,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER\r
- LTEXT "Depth:",IDC_STATIC,4,127,76,8\r
- EDITTEXT IDC_DEPTHEDIT,80,126,163,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER\r
- LTEXT "Checksum:",IDC_STATIC,4,139,76,8\r
- EDITTEXT IDC_CHECKSUM,80,138,163,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER\r
- LTEXT "locked:",IDC_STATIC,4,151,76,8\r
- LTEXT "yes",IDC_LOCKED,80,150,163,8\r
- LTEXT "switched:",IDC_STATIC,4,163,76,8\r
- LTEXT "yes",IDC_SWITCHED,80,162,163,8\r
- LTEXT "copied:",IDC_STATIC,4,175,76,8\r
- LTEXT "yes",IDC_COPIED,80,174,163,8\r
- PUSHBUTTON "&Properties...",IDC_EDITPROPERTIES,4,191,107,14\r
- PUSHBUTTON "Show &log",IDC_SHOWLOG,120,191,123,14\r
+ LTEXT "Current Branch:",IDC_STATIC,4,9,59,8\r
+ EDITTEXT IDC_CURRENT_BRANCH,91,9,142,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,WS_EX_TRANSPARENT\r
+ LTEXT "Tracked Remote Branch:",IDC_ESCAPEDURLLABEL,4,21,85,8\r
+ EDITTEXT IDC_REMOTE_BRANCH,91,21,139,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER\r
+ LTEXT "HEAD:",IDC_STATIC,4,35,76,8\r
+ EDITTEXT IDC_HEAD_HASH,80,35,163,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,WS_EX_TRANSPARENT\r
+ EDITTEXT IDC_HEAD_SUBJECT,80,47,163,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,WS_EX_TRANSPARENT\r
+ EDITTEXT IDC_HEAD_AUTHOR,80,59,163,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,WS_EX_TRANSPARENT\r
+ EDITTEXT IDC_HEAD_DATE,79,71,163,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,WS_EX_TRANSPARENT\r
+ LTEXT "Auto Crlf:",IDC_STATIC,13,171,76,8\r
+ EDITTEXT IDC_CONFIG_AUTOCRLF,71,171,163,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER\r
+ LTEXT "Safe Crlf:",IDC_STATIC,13,183,76,8\r
+ EDITTEXT IDC_CONFIG_SAFECRLF,71,183,163,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER\r
+ LTEXT "User Name:",IDC_STATIC,13,195,76,8\r
+ EDITTEXT IDC_CONFIG_USERNAME,71,195,163,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER\r
+ LTEXT "User Email:",IDC_STATIC,13,207,76,8\r
+ EDITTEXT IDC_CONFIG_USEREMAIL,71,207,163,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER\r
+ PUSHBUTTON "Show &log",IDC_SHOWLOG,120,238,123,14\r
+ GROUPBOX "Config",IDC_STATIC,4,159,239,66\r
+ LTEXT "Last Modified:",IDC_STATIC,4,97,76,8\r
+ EDITTEXT IDC_LAST_HASH,80,97,163,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,WS_EX_TRANSPARENT\r
+ EDITTEXT IDC_LAST_SUBJECT,80,108,163,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,WS_EX_TRANSPARENT\r
+ EDITTEXT IDC_LAST_AUTHOR,80,121,163,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,WS_EX_TRANSPARENT\r
+ EDITTEXT IDC_LAST_DATE,80,132,163,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,WS_EX_TRANSPARENT\r
END\r
\r
\r
BEGIN\r
"LANGUAGE 9, 1\r\n"\r
"#pragma code_page(1252)\r\n"\r
- "#include ""resource.rc2"" // non-Microsoft Visual C++ edited resources\r\n"\r
+ "#include ""resourceshell.rc2"" // non-Microsoft Visual C++ edited resources\r\n"\r
"\0"\r
END\r
\r
STRINGTABLE \r
BEGIN\r
IDS_MENUCHECKOUT "Switch/Chec&kout..."\r
- IDS_MENUUPDATE "&Update"\r
+ IDS_MENUUPDATE "Submodule &Update"\r
IDS_MENUCOMMIT "&Commit..."\r
IDS_MENUCREATEREPOS "Create repositor&y here"\r
IDS_MENUADD "&Add..."\r
IDS_MENUREVERT "Re&vert..."\r
- IDS_MENUCLEANUP "&Clean up"\r
+ IDS_MENUCLEANUP "&Clean up..."\r
IDS_MENURESOLVE "Res&olved..."\r
- IDS_MENUSWITCH_HERE "Switch/Checkout to here"\r
- IDS_MENUSWITCH "Switch/Checkout"\r
- IDS_MENUCHERRYPICK_HERE "Cherry Pick This Version" \r
- IDS_MENUCHERRYPICK "Cherry Pick"\r
END\r
\r
STRINGTABLE \r
BEGIN\r
- IDS_MENUSWITCH "S&witch..."\r
+ IDS_MENUSWITCH "S&witch/Checkout..."\r
IDS_MENUMERGE "&Merge..."\r
- IDS_MENUBRANCH "Create Branch"\r
- IDS_MENUBRANCH_HERE "Create Branch at here"\r
- IDS_MENUTAG "Create Tag"\r
- IDS_MENUTAG_HERE "Create Tag at here"\r
+ IDS_MENUBRANCH "Create Branch..."\r
IDS_MENUIMPORT "&Import..."\r
IDS_MENUEXPORT "E&xport..."\r
- IDS_MENUEXPORT_HERE "Export at here"\r
IDS_MENUSETTINGS "&Settings"\r
IDS_MENUABOUT "A&bout"\r
IDS_MENUSUBMENU "&TortoiseGit"\r
IDS_MENUDESCREVERT "Reverts all changes you made since the last update"\r
IDS_MENUDESCCLEANUP "Cleanup interrupted operations, locked files, ..."\r
IDS_MENUDESCRESOLVE "Resolves conflicted files"\r
- IDS_MENUDESCSWITCH "Switch working copy to another branch / tag"\r
+ IDS_MENUDESCSWITCH "Switch/Checkout working copy to another branch / tag"\r
END\r
\r
STRINGTABLE \r
\r
STRINGTABLE \r
BEGIN\r
+ IDS_git_DEPTH_UNKNOWN "Unknown depth"\r
+ IDS_git_DEPTH_WORKING "Working copy"\r
+ IDS_MENUTAG "Create Tag..."\r
+ IDS_MENUFORMATPATCH "Create Patch Serial..."\r
+ IDS_MENUIMPORTPATCH "Apply Patch Serial..."\r
+ IDS_MENUCHERRYPICK "Cherry Pick..."\r
+ IDS_MENUFETCH "Fetch..."\r
+ IDS_MENUREBASE "*Rebase..."\r
+ IDS_MENUSTASHSAVE "Stash Save"\r
+ IDS_MENUSTASHAPPLY "Stash Apply"\r
+ IDS_MENUSUBADD "Submodule Add"\r
+ IDS_MENUSUBSYNC "Submodule Sync"\r
+ IDS_MENUREFLOG "Show &Reflog"\r
+ IDS_MENUDESCREFLOG "Shows reference log"\r
+ IDS_MENUSTASHLIST "Stash List"\r
+END\r
+\r
+STRINGTABLE \r
+BEGIN\r
+ IDS_REFLOG_DEL "Delete Ref..."\r
+ IDS_MENUSENDMAIL "Send Mail..."\r
+ IDS_MENUDESSENDMAIL "Send Patch by Email"\r
+ IDS_MENUREFBROWSE "Browse Reference"\r
+ IDS_MENUDESCREFBROWSE "Browse reference"\r
+ IDS_MENUSVNREBASE "SVN Rebase..."\r
+END\r
+\r
+STRINGTABLE \r
+BEGIN\r
IDS_STATUSMERGED "merged"\r
IDS_STATUSCONFLICTED "conflicted"\r
IDS_STATUSOBSTRUCTED "obstructed"\r
IDS_MENUDESCRENAME "Renames files / folders inside version control"\r
IDS_MENUREMOVE "&Delete"\r
IDS_MENUDESCREMOVE "Deletes files / folders from version control"\r
- IDS_MENUUPDATEEXT "&Update to revision..."\r
+ IDS_MENUUPDATEEXT "Submodule &Update"\r
IDS_MENUDESCUPDATEEXT "Updates the working copy to a specific revision"\r
IDS_COLTITLESTATUS "Git Status"\r
IDS_COLDESCSTATUS "Status of item in Git"\r
IDS_STATUSEXTERNAL "external"\r
IDS_MENUDESCBLAME "Blames each line of a file on an author"\r
IDS_MENUCREATEPATCH "Create &patch..."\r
- IDS_MENUAPPLYPATCH "Apply &patch..."\r
+ IDS_MENUAPPLYPATCH "Review &patch..."\r
END\r
\r
STRINGTABLE \r
STRINGTABLE \r
BEGIN\r
IDS_MENUDESCCREATEPATCH "Creates a unified diff file with all changes you made"\r
- IDS_MENUDESCAPPLYPATCH "Applies a unified diff file to the working copy"\r
+ IDS_MENUDESCAPPLYPATCH "Review unified diff file with tortoisemerge"\r
IDS_MENUMERGEALL "Merge reintegrate..."\r
IDS_MENUDESCMERGEALL "Merges all missing revisions back into the working copy using merge-tracking information"\r
IDS_MENUUNDOADD "Undo Add.."\r
IDS_DROPEXPORTMENU "Git Export versioned items here"\r
IDS_DROPEXPORTEXTENDEDMENU "Git Export all items here"\r
IDS_MENUIGNOREMULTIPLEMASK "Ignore items by &extension"\r
- IDS_MENUPULL "Pull"\r
- IDS_MENUPUSH "Push"\r
- IDS_MENUCLONE "Clone"\r
+ IDS_MENUPULL "Pull..."\r
+ IDS_MENUPUSH "Push..."\r
+ IDS_MENUCLONE "Clone..."\r
END\r
\r
STRINGTABLE \r
\r
STRINGTABLE \r
BEGIN\r
- IDS_git_DEPTH_UNKNOWN "Unknown depth"\r
- IDS_git_DEPTH_WORKING "Working copy"\r
+ IDS_MENUSVNREBASE_DESC "Git SVN Rebase"\r
+ IDS_MENUSVNDCOMMIT "SVN DCommit"\r
+ IDS_MENUSVNDCOMMIT_DESC "Git SVN DCommit"\r
+ IDS_MENUSYNC "Sync..."\r
+ IDS_MENUDESCSYNC "Sync remote Remote Repostory, include pull, push,email patch and so on"\r
+ IDS_MENUSTASHPOP "Stash Pop"\r
+ IDS_MENUSVNIGNORE "Import SVN Ignore ..."\r
+ IDS_MENUSVNIGNORE_DESC "Import SVN Ignore"\r
END\r
\r
#endif // English (U.S.) resources\r
OSDN Git Service
