\r
// Icon with lowest ID value placed first to ensure application icon\r
// remains consistent on all systems.\r
+IDI_PULL ICON "..\\resources\\update1.ico"\r
IDI_APP ICON "..\\Resources\\Tortoise.ico"\r
IDI_CHECKOUT ICON "..\\Resources\\menucheckout.ico"\r
IDI_UPDATE ICON "..\\Resources\\menuupdate.ico"\r
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_CLONE ICON "..\\resources\\checkout.ico"\r
#endif // Neutral resources\r
/////////////////////////////////////////////////////////////////////////////\r
\r
\r
/////////////////////////////////////////////////////////////////////////////\r
//\r
+// Icon\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
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
// Dialog\r
//\r
\r
IDS_MENUEXPORT "E&xport..."\r
IDS_MENUSETTINGS "&Settings"\r
IDS_MENUABOUT "A&bout"\r
- IDS_MENUSUBMENU "&TortoiseSVN"\r
+ IDS_MENUSUBMENU "&TortoiseGit"\r
IDS_MENUDESCCHECKOUT "Check out a working copy from a repository"\r
IDS_MENUDESCUPDATE "Updates the working copy to the current revision"\r
IDS_MENUDESCCOMMIT "Commits your changes to the repository"\r
BEGIN\r
IDS_MENUDESCIMPORT "Imports the directory to a repository"\r
IDS_MENUDESCEXPORT "Exports a repository to a clean working copy without the svn administrative folders"\r
- IDS_MENUDESCABOUT "Shows information about TortoiseSVN"\r
+ IDS_MENUDESCABOUT "Shows information about TortoiseGit"\r
IDS_MENUDESCCREATEREPOS "Creates a repository database at the current location"\r
IDS_MENUDESCCOPY "Creates a 'cheap' copy inside the repository used for branches or tagging"\r
IDS_MENUDESCMERGE "Merges a branch into the main trunk"\r
- IDS_MENUDESCSETTINGS "Tweak TortoiseSVN"\r
+ IDS_MENUDESCSETTINGS "Tweak TortoiseGit"\r
IDS_MENUDESCDEFAULT "no description for this command is available"\r
IDS_STATUSNONE " "\r
IDS_STATUSUNVERSIONED "non-versioned"\r
IDS_MENUDESCREMOVE "Deletes files / folders from version control"\r
IDS_MENUUPDATEEXT "&Update to revision..."\r
IDS_MENUDESCUPDATEEXT "Updates the working copy to a specific revision"\r
- IDS_COLTITLESTATUS "SVN Status"\r
- IDS_COLDESCSTATUS "Status of item in SVN"\r
- IDS_COLTITLEREV "SVN Revision"\r
+ IDS_COLTITLESTATUS "Git Status"\r
+ IDS_COLDESCSTATUS "Status of item in Git"\r
+ IDS_COLTITLEREV "Git Revision"\r
IDS_COLDESCREV "Last saved revision of item"\r
END\r
\r
IDS_MENUDESCIGNORE "Adds the selected file(s) or the filemask to the 'ignore' list"\r
IDS_STATUSINCOMPLETE "incomplete"\r
IDS_STATUSIGNORED "ignored"\r
- IDS_DROPCOPYMENU "SVN Copy versioned item(s) here"\r
+ IDS_DROPCOPYMENU "Git Copy versioned item(s) here"\r
IDS_PROPWAITCANCEL "Please wait while cancelling..."\r
IDS_SETPROPTITLE "Setting properties..."\r
IDS_MENUREPOBROWSE "&Repo-browser"\r
BEGIN\r
IDS_MENUDIFF "&Diff"\r
IDS_MENUDESCDIFF "Compares the file with the last committed revision to show you the changes you made"\r
- IDS_DROPCOPYADDMENU "SVN Copy and add files to this WC"\r
- IDS_DROPMOVEMENU "SVN Move versioned item(s) here"\r
+ IDS_DROPCOPYADDMENU "Git Copy and add files to this WC"\r
+ IDS_DROPMOVEMENU "Git Move versioned item(s) here"\r
IDS_MENULOG "Show &log"\r
IDS_MENUDESCLOG "Shows the log for the selected file / folder"\r
- IDS_COLTITLEURL "SVN URL"\r
- IDS_COLDESCURL "URL of Subversion items"\r
- IDS_COLTITLESHORTURL "SVN short URL"\r
- IDS_COLDESCSHORTURL "Short URL of Subversion items"\r
+ IDS_COLTITLEURL "Git URL"\r
+ IDS_COLDESCURL "URL of Git items"\r
+ IDS_COLTITLESHORTURL "Git short URL"\r
+ IDS_COLDESCSHORTURL "Short URL of Git items"\r
IDS_MENUCONFLICT "&Edit conflicts"\r
IDS_MENUDESCCONFLICT "Launches the external diff / merge program to solve the conflicts"\r
IDS_MENURELOCATE "Relo&cate..."\r
IDS_MENUDESCUNDOADD "Reverts an addition to version control"\r
IDS_MENUPREVDIFF "&Diff with previous version"\r
IDS_MENUDESCPREVDIFF "Diffs the working copy file with the one before the last commit."\r
- IDS_COLTITLEMIMETYPE "SVN mime-type"\r
+ IDS_COLTITLEMIMETYPE "Git mime-type"\r
IDS_COLDESCMIMETYPE "Shows the mime type of the versioned file"\r
- IDS_DROPEXPORTMENU "SVN Export versioned items here"\r
- IDS_DROPEXPORTEXTENDEDMENU "SVN Export all items here"\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
END\r
\r
STRINGTABLE \r
\r
STRINGTABLE \r
BEGIN\r
- IDS_DROPMOVERENAMEMENU "SVN Move and rename versioned item here"\r
+ IDS_DROPMOVERENAMEMENU "Git Move and rename versioned item here"\r
IDS_MENUPROPERTIES "Properties"\r
IDS_MENUDESCPROPERTIES "Manage Subversion properties"\r
- IDS_COLTITLEEOLSTYLE "SVN eol-style"\r
+ IDS_COLTITLEEOLSTYLE "Git eol-style"\r
IDS_COLDESCEOLSTYLE "Shows the eol-style property value"\r
IDS_MENUURLDIFF "&Diff with URL"\r
IDS_MENUDESCURLDIFF "Compares the selected file with a file in the repository"\r
IDS_MENUDESC_UNLOCKFORCE \r
"Releases locks even if you're not the owner of the locks (breaks them)."\r
IDS_MENU_LOCKFORCE "Steal loc&k"\r
- IDS_COLTITLEOWNER "SVN Local lock owner"\r
+ IDS_COLTITLEOWNER "Git Local lock owner"\r
IDS_COLDESCOWNER "The user who owns the lock of the file"\r
- IDS_DROPCOPYRENAMEMENU "SVN Copy and rename versioned item here"\r
- IDS_COLTITLEAUTHOR "SVN Author"\r
+ IDS_DROPCOPYRENAMEMENU "Git Copy and rename versioned item here"\r
+ IDS_COLTITLEAUTHOR "Git Author"\r
IDS_COLDESCAUTHOR "The user who did the last commit"\r
IDS_FILEPROPONFOLDER "You can't set this property on folders, only on files!\nIf you want to set it on all files within that folder,\nyou must activate the 'recursive' checkbox."\r
IDS_PROPSNOTSAVED "You have modified properties without saving them first.\nDo you want to save them now?"\r