diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/TestUtils.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/TestUtils.java
index 926c1e1..c3c19cb 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/TestUtils.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/TestUtils.java
@@ -146,7 +146,7 @@
 	 *            the contents
 	 * @return the file
 	 * @throws CoreException
-	 *             if the file can not be created
+	 *             if the file cannot be created
 	 * @throws UnsupportedEncodingException
 	 */
 	public IFile addFileToProject(IProject project, String path, String content) throws CoreException, UnsupportedEncodingException {
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/PushOperationTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/PushOperationTest.java
index 743cdd6..b119065 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/PushOperationTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/PushOperationTest.java
@@ -148,7 +148,7 @@
 		assertEquals(Status.OK, getStatus(pop.getOperationResult()));
 
 		try {
-			// assert that we can not run this again
+			// assert that we cannot run this again
 			pop.run(null);
 			fail("Expected Exception not thrown");
 		} catch (IllegalStateException e) {
@@ -319,7 +319,7 @@
 
 	private PushOperation createPushOperation() throws Exception {
 		// set up push from repository1 to repository2
-		// we can not re-use the RemoteRefUpdate!!!
+		// we cannot re-use the RemoteRefUpdate!!!
 		PushOperationSpecification spec = new PushOperationSpecification();
 		// the remote is repo2
 		URIish remote = new URIish("file:///"
diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/coretext.properties b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/coretext.properties
index d8baa8f..e7007cd 100644
--- a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/coretext.properties
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/coretext.properties
@@ -131,16 +131,16 @@
 GitResourceVariantTree_fetchingVariant=Fetching variant for: {0}
 
 GitBranchResourceVariantTreeSubscriber_gitRepository=Git without local changes
-OperationAlreadyExecuted=Operation has already been executed and can not be executed again
-OperationNotYetExecuted=Operation has not yet been executed and can not return a result
-RemoteRefUpdateCantBeReused=The RemoteRefUpdate instance can not be re-used
+OperationAlreadyExecuted=Operation has already been executed and cannot be executed again
+OperationNotYetExecuted=Operation has not yet been executed and cannot return a result
+RemoteRefUpdateCantBeReused=The RemoteRefUpdate instance cannot be re-used
 RenameBranchOperation_TaskName=Renaming branch {0} to {1}
 RevertCommitOperation_reverting=Reverting commit {0}
 RewordCommitOperation_rewording=Rewording commit {0}
 EditCommitOperation_editing=Editing commit {0}
 
 IgnoreOperation_error=Unable to ignore resources
-IgnoreOperation_parentOutsideRepo=Can not add to gitignore. The parent of {0} is outside the Git repository {1}
+IgnoreOperation_parentOutsideRepo=Cannot add to gitignore. The parent of {0} is outside the Git repository {1}
 IgnoreOperation_creatingFailed=creating {0} failed
 IgnoreOperation_taskName=Adding resources to gitignore
 IgnoreOperation_updatingFailed=updating {0} failed
diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/DeleteBranchOperation.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/DeleteBranchOperation.java
index c553de2..5669b39 100644
--- a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/DeleteBranchOperation.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/DeleteBranchOperation.java
@@ -40,7 +40,7 @@
 	/** Operation was performed */
 	public final static int OK = 0;
 
-	/** Current branch can not be deleted */
+	/** Current branch cannot be deleted */
 	public final static int REJECTED_CURRENT = 1;
 
 	/**
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/RebaseActionHandler.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/RebaseActionHandler.java
index b84e474..b867161 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/RebaseActionHandler.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/RebaseActionHandler.java
@@ -45,7 +45,7 @@
 		// Either we want this to be enabled because a new rebase can be started
 		// (main action) or an active rebase can be continued, skipped or
 		// aborted (menu items). Even when the main action is not enabled we
-		// must enable this because otherwise the menu items can not be opened.
+		// must enable this because otherwise the menu items cannot be opened.
 		RepositoryState state = repo.getRepositoryState();
 		return state.isRebasing()
 				|| RebaseCurrentRefCommand.isEnabledForState(repo, state);
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/GitHistoryPage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/GitHistoryPage.java
index c3bac36..636cba1 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/GitHistoryPage.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/GitHistoryPage.java
@@ -1384,7 +1384,7 @@
 					repositoryName });
 		} else {
 			// user has selected multiple resources and then hits Team->Show in
-			// History (the generic history view can not deal with multiple
+			// History (the generic history view cannot deal with multiple
 			// selection)
 			int count = 0;
 			StringBuilder b = new StringBuilder();
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
index 29957a9..7a58ed2 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
@@ -62,7 +62,7 @@
 WizardProjectsImportPage_deselectAll = &Deselect All
 WizardProjectsImportPage_SearchingMessage = Searching for projects
 WizardProjectsImportPage_ProcessingMessage = Processing results
-WizardProjectsImportPage_projectsInWorkspace = Some or all projects can not be imported because they already exist in the workspace
+WizardProjectsImportPage_projectsInWorkspace = Some or all projects cannot be imported because they already exist in the workspace
 WizardProjectsImportPage_CreateProjectsTask = Creating Projects
 WizardProjectsImportPage_filterText = type filter text to filter unselected projects
 
@@ -111,14 +111,14 @@
 ExistingOrNewPage_ErrorFailedToCreateRepository=Failed to create repository {0}
 ExistingOrNewPage_ErrorFailedToRefreshRepository=Failed to refresh project after creating repository at {0}
 ExistingOrNewPage_ExistingRepositoryLabel=&Repository:
-ExistingOrNewPage_ExistingTargetErrorMessage=Target location for project {0} already exists, can not move project
+ExistingOrNewPage_ExistingTargetErrorMessage=Target location for project {0} already exists, cannot move project
 ExistingOrNewPage_FailedToDetectRepositoryMessage=Failed to detect which repository to use
 ExistingOrNewPage_FolderWillBeCreatedMessage=Folder {0} does not exist in working directory, will be created
 ExistingOrNewPage_HeaderLocation=Location
 ExistingOrNewPage_HeaderProject=Project
 ExistingOrNewPage_HeaderRepository=Repository
 ExistingOrNewPage_InternalModeCheckbox=&Use or create repository in parent folder of project
-ExistingOrNewPage_NestedProjectErrorMessage=Can not move project {0} to target location {1}, as this location overlaps with location {2}, which contains a .project file
+ExistingOrNewPage_NestedProjectErrorMessage=Cannot move project {0} to target location {1}, as this location overlaps with location {2}, which contains a .project file
 ExistingOrNewPage_NewLocationTargetHeader=Target Location
 ExistingOrNewPage_NoRepositorySelectedMessage=No repository selected
 ExistingOrNewPage_ProjectNameColumnHeader=Project
@@ -788,7 +788,7 @@
 CommitMessageViewer_MoreBranches=\ and {0} more branches
 CommitMessageViewer_BuildDiffListTaskName=Building diffs for the selected files
 CommitMessageViewer_BuildDiffTaskName=Building diff for file {0}
-CommitMessageViewer_CanNotRenderDiffMessage=Can not render diff, as the current commit has multiple parents
+CommitMessageViewer_CanNotRenderDiffMessage=Cannot render diff, as the current commit has multiple parents
 CommitMessageViewer_tags=Tags
 CommitMessageViewer_follows=Follows
 CommitMessageViewer_precedes=Precedes
@@ -1008,7 +1008,7 @@
 BranchRenameDialog_RenameExceptionMessage=Could not rename branch
 BranchRenameDialog_Title=Rename Branch
 BranchRenameDialog_WindowTitle=Rename Branch
-BranchRenameDialog_WrongPrefixErrorMessage=Can not rename Ref with name {0}
+BranchRenameDialog_WrongPrefixErrorMessage=Cannot rename Ref with name {0}
 BranchPropertySource_RebaseDescriptor=Rebase
 BranchPropertySource_RemoteDescriptor=Remote
 BranchPropertySource_UpstreamBranchDescriptor=Upstream Branch
@@ -1114,7 +1114,7 @@
 DecoratorPreferencesPage_bindingChangeSetShortMessage=First line of commit message text;
 
 Decorator_exceptionMessage=Errors occurred while applying Git decorations to resources.
-DeleteBranchCommand_CannotDeleteCheckedOutBranch=Can not delete the currently checked out branch
+DeleteBranchCommand_CannotDeleteCheckedOutBranch=Cannot delete the currently checked out branch
 DeleteBranchCommand_DeletingBranchesProgress=Deleting branches
 DeleteBranchDialog_DialogMessage=Select a branch to delete
 DeleteBranchDialog_DialogTitle=Delete a branch
@@ -1123,7 +1123,7 @@
 DeleteBranchOnCommitHandler_SelectBranchDialogTitle=Delete Branches
 DeleteRepositoryConfirmDialog_DeleteGitDirCheckbox=Delete Git repository data and history:
 DeleteRepositoryConfirmDialog_DeleteRepositoryConfirmMessage=Confirm deletion of repository.
-DeleteRepositoryConfirmDialog_DeleteRepositoryNoUndoWarning=Repository deletion can not be undone.
+DeleteRepositoryConfirmDialog_DeleteRepositoryNoUndoWarning=Repository deletion cannot be undone.
 DeleteRepositoryConfirmDialog_DeleteRepositoryTitle=Delete Repository ''{0}''
 DeleteRepositoryConfirmDialog_DeleteRepositoryWindowTitle=Delete Repository
 DeleteRepositoryConfirmDialog_DeleteWorkingDirectoryCheckbox=Also delete &working directory:
@@ -1353,7 +1353,7 @@
 CreateTagDialog_CreateTagOnCommitTitle=Create a New Tag on Commit {0}
 CreateTagDialog_ExceptionRetrievingTagsMessage=Exception while retrieving existing tags
 CreateTagDialog_GetTagJobName=Get existing tags for the Create Tag Dialog
-CreateTagDialog_LightweightTagMessage=This is a lightweight tag which can not be edited
+CreateTagDialog_LightweightTagMessage=This is a lightweight tag which cannot be edited
 CreateTagDialog_LoadingMessageText=Loading...
 CreateTagDialog_Message=Create a new tag or replace an existing one
 CreateTagDialog_NewTag=Create New Tag
@@ -1410,7 +1410,7 @@
 MultiPullResultDialog_UpdateStatusColumnHeader=Update Status
 MultiPullResultDialog_WindowTitle=Pull Result for Multiple Repositories
 
-CommitFileDiffViewer_CanNotOpenCompareEditorTitle=Can not Open Compare Editor
+CommitFileDiffViewer_CanNotOpenCompareEditorTitle=Cannot Open Compare Editor
 CommitFileDiffViewer_CompareMenuLabel=Compare with &Version in Ancestor
 CommitFileDiffViewer_CompareWorkingDirectoryMenuLabel=Compare with &Workspace
 CommitFileDiffViewer_FileDoesNotExist=File {0} does not exist in the workspace
@@ -1600,7 +1600,7 @@
 SkipRebaseCommand_CancelDialogMessage=The skip operation was canceled
 SkipRebaseCommand_JobName=Skipping commit during Rebase
 
-ValidationUtils_CanNotResolveRefMessage=Can not resolve {0}
+ValidationUtils_CanNotResolveRefMessage=Cannot resolve {0}
 ValidationUtils_InvalidRefNameMessage={0} is not a valid name for a ref
 ValidationUtils_RefAlreadyExistsMessage=Ref {0} already exists
 ValidationUtils_RefNameConflictsWithExistingMessage=Name conflicts with existing refs: {0}
@@ -1644,10 +1644,10 @@
 SimpleConfigureFetchDialog_SaveButton=Save
 SimpleConfigureFetchDialog_UriLabel=&URI:
 SimpleConfigureFetchDialog_WindowTitle=Configure Fetch
-SimpleFetchActionHandler_NothingToFetchDialogMessage=Can not fetch anything: the currently checked-out branch is based on a local branch
+SimpleFetchActionHandler_NothingToFetchDialogMessage=Cannot fetch anything: the currently checked-out branch is based on a local branch
 SimpleFetchActionHandler_NothingToFetchDialogTitle=Nothing to Fetch
 SimpleFetchRefSpecWizard_WizardTitle=Adding a Refspec for Fetch
-SimplePushActionHandler_NothingToPushDialogMessage=Can not push anything: the currently checked-out branch is based on a local branch
+SimplePushActionHandler_NothingToPushDialogMessage=Cannot push anything: the currently checked-out branch is based on a local branch
 SimplePushActionHandler_NothingToPushDialogTitle=Nothing to Push
 SimplePushSpecPage_message=Select target to push {0} to
 SimplePushSpecPage_pushAheadInfo={0} is {1} commits ahead of {2}