diff options
author | Mathias Kinzler | 2010-09-08 07:45:33 +0000 |
---|---|---|
committer | Code Review | 2010-09-08 07:45:33 +0000 |
commit | fd50173b0086785c5e7338c2962310e5f5a3e918 (patch) | |
tree | b4676a1116b4bf11cffdeac8381df7d172fa873e | |
parent | 2ed5980924ff87406019d8f9a781f41a24346a11 (diff) | |
parent | 08a27d9a19eafe260f610b27dc9387da9cc66a72 (diff) | |
download | egit-fd50173b0086785c5e7338c2962310e5f5a3e918.tar.gz egit-fd50173b0086785c5e7338c2962310e5f5a3e918.tar.xz egit-fd50173b0086785c5e7338c2962310e5f5a3e918.zip |
Merge "Remove unused and duplicate message keys and messages"
-rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java | 207 | ||||
-rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties | 70 |
2 files changed, 0 insertions, 277 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java index 21c5631014..546624c368 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java @@ -73,12 +73,6 @@ public class UIText extends NLS { public static String AddToIndexAction_addingFiles; /** */ - public static String AddToIndexAction_addingFilesFailed; - - /** */ - public static String AddToIndexAction_indexesWithUnmergedEntries; - - /** */ public static String AssumeUnchanged_assumeUnchanged; /** */ @@ -142,9 +136,6 @@ public class UIText extends NLS { public static String SelectRemoteNamePage_RemoteNameTitle; /** */ - public static String SelectRemoteNamePage_SelectRemoteNameMessage; - - /** */ public static String SelectResetTypePage_PageMessage; /** */ @@ -304,9 +295,6 @@ public class UIText extends NLS { public static String GitHistoryPage_errorReadingHeadCommit; /** */ - public static String GitHistoryPage_Date; - - /** */ public static String GitHistoryPage_FileNotInCommit; /** */ @@ -331,9 +319,6 @@ public class UIText extends NLS { public static String GitHistoryPage_openFailed; /** */ - public static String GitHistoryPage_From; - - /** */ public static String GitHistoryPage_MultiResourcesType; /** */ @@ -373,9 +358,6 @@ public class UIText extends NLS { public static String GitHistoryPage_ShowAllBranchesMenuLabel; /** */ - public static String GitHistoryPage_Subject; - - /** */ public static String GitProjectPropertyPage_LabelBranch; /** */ @@ -400,9 +382,6 @@ public class UIText extends NLS { public static String GitProjectsImportPage_NoProjectsMessage; /** */ - public static String RepositoryPropertySource_ConfigureKeysAction; - - /** */ public static String RepositoryPropertySource_EditConfigButton; /** */ @@ -433,9 +412,6 @@ public class UIText extends NLS { public static String RepositoryPropertySource_RepositoryConfigurationCategory; /** */ - public static String RepositoryPropertySource_RestoreStandardAction; - - /** */ public static String RepositoryPropertySource_SelectModeTooltip; /** */ @@ -445,9 +421,6 @@ public class UIText extends NLS { public static String RepositoryPropertySource_SuppressMultipleValueTooltip; /** */ - public static String RepositoryPropertySource_WrongFormatMessage; - - /** */ public static String RepositoryRemotePropertySource_ErrorHeader; /** */ @@ -520,9 +493,6 @@ public class UIText extends NLS { public static String RepositoryAction_multiRepoSelectionTitle; /** */ - public static String RepositoryActionHandler_CouldNotGetSelection_message; - - /** */ public static String RepositorySearchDialog_browse; /** */ @@ -541,9 +511,6 @@ public class UIText extends NLS { public static String RepositorySearchDialog_NothingFoundMessage; /** */ - public static String RepositorySearchDialog_search; - - /** */ public static String RepositorySearchDialog_searchRepositoriesMessage; /** */ @@ -613,9 +580,6 @@ public class UIText extends NLS { public static String RepositorySelectionPage_errorValidating; /** */ - public static String RepositorySelectionPage_ShowPreviousURIs_HoverText; - - /** */ public static String RepositorySelectionPage_tip_file; /** */ @@ -1144,18 +1108,9 @@ public class UIText extends NLS { public static String CommitAction_errorComputingDiffs; /** */ - public static String CommitAction_errorDuringCommit; - - /** */ - public static String CommitAction_errorOnCommit; - - /** */ public static String CommitAction_errorRetrievingCommit; /** */ - public static String CommitAction_InternalError; - - /** */ public static String CommitAction_noFilesToCommit; /** */ @@ -1321,24 +1276,6 @@ public class UIText extends NLS { public static String ConfigurationEditorComponent_WrongNumberOfTokensMessage; /** */ - public static String ConfigureKeysDialog_AddStandardButton; - - /** */ - public static String ConfigureKeysDialog_AlreadyThere_Message; - - /** */ - public static String ConfigureKeysDialog_DeleteButton; - - /** */ - public static String ConfigureKeysDialog_DialogTitle; - - /** */ - public static String ConfigureKeysDialog_NewButton; - - /** */ - public static String ConfigureKeysDialog_NewKeyLabel; - - /** */ public static String ConfigureRemoteWizard_WizardTitle_Change; /** */ @@ -1840,21 +1777,6 @@ public class UIText extends NLS { public static String IgnoreActionHandler_addToGitignore; /** */ - public static String RepositoriesView_ActionCanceled_Message; - - /** */ - public static String RepositoriesView_Add_Button; - - /** */ - public static String RepositoriesView_AddRepository_MenuItem; - - /** */ - public static String RepositoriesView_AddRepository_Tooltip; - - /** */ - public static String RepositoriesView_BranchCreationFailureMessage; - - /** */ public static String RepositoriesView_BranchDeletionFailureMessage; /** */ @@ -1864,30 +1786,12 @@ public class UIText extends NLS { public static String RepositoriesView_CheckingOutMessage; /** */ - public static String RepositoriesView_Synchronize_MenuItem; - - /** */ - public static String RepositoriesView_CheckOut_MenuItem; - - /** */ public static String RepositoriesView_ClipboardContentNoGitRepoMessage; /** */ public static String RepositoriesView_ClipboardContentNotDirectoryMessage; /** */ - public static String RepositoriesView_Clone_Tooltip; - - /** */ - public static String RepositoriesView_CollapseAllMenu; - - /** */ - public static String RepositoriesView_ConfigureFetchMenu; - - /** */ - public static String RepositoriesView_ConfigurePushMenu; - - /** */ public static String RepositoriesView_ConfirmBranchDeletionMessage; /** */ @@ -1906,96 +1810,27 @@ public class UIText extends NLS { public static String RepositoriesView_ConfirmProjectDeletion_WindowTitle; /** */ - public static String RepositoriesView_CopyPathToClipboardMenu; - - /** */ - public static String RepositoriesView_CreateFetch_menu; - - /** */ - public static String RepositoriesView_CreatePush_menu; - - /** */ public static String RepositoriesView_DeleteBranchMenu; /** */ public static String RepositoriesView_DeleteRepoDeterminProjectsMessage; /** */ - public static String RepositoriesView_DoFetchMenu; - - /** */ - public static String RepositoriesView_DoPushMenuItem; - - /** */ public static String RepositoriesView_Error_WindowTitle; /** */ public static String RepositoriesView_ErrorHeader; /** */ - public static String RepositoriesView_FetchMenu; - - /** */ - public static String RepositoriesView_Import_Button; - - /** */ - public static String RepositoriesView_ImportProjectsMenu; - - /** */ - public static String RepositoriesView_ImportRepository_MenuItem; - - /** */ - public static String RepositoriesView_LinkWithSelection_action; - - /** */ - public static String RepositoriesView_NewBranchMenu; - - /** */ - public static String RepositoriesView_NewBranchTitle; - - /** */ - public static String RepositoriesView_NewRemoteMenu; - - /** */ public static String RepositoriesView_NothingToPasteMessage; /** */ - public static String RepositoriesView_OpenInTextEditor_menu; - - /** */ - public static String RepositoriesView_OpenPropertiesMenu; - - /** */ - public static String RepositoriesView_PasteFailureTitle; - - /** */ - public static String RepositoriesView_PasteMenu; - - /** */ public static String RepositoriesView_PasteRepoAlreadyThere; /** */ - public static String RepositoriesView_PushMenu; - - /** */ - public static String RepositoriesView_Refresh_Button; - - /** */ public static String RepositoriesView_RemotesNodeText; /** */ - public static String RepositoriesView_Remove_MenuItem; - - /** */ - public static String RepositoriesView_RemoveFetch_menu; - - /** */ - public static String RepositoriesView_RemovePush_menu; - - /** */ - public static String RepositoriesView_RemoveRemoteMenu; - - /** */ public static String RepositoriesView_RenameBranchFailure; /** */ @@ -2194,9 +2029,6 @@ public class UIText extends NLS { public static String GitSelectWizardPage_UseNewProjectsWizardButton; /** */ - public static String GitSelectWizardPage_WizardTitle; - - /** */ public static String GitShareProjectsPage_AbortedMessage; /** */ @@ -2227,12 +2059,6 @@ public class UIText extends NLS { public static String MergeAction_CannotMerge; /** */ - public static String MergeAction_ChangedFiles; - - /** */ - public static String MergeAction_ErrorMergeEnabling; - - /** */ public static String MergeAction_HeadIsNoBranch; /** */ @@ -2248,12 +2074,6 @@ public class UIText extends NLS { public static String MergeAction_MergeResultTitle; /** */ - public static String MergeAction_ProblemMerge; - - /** */ - public static String MergeAction_UnableMerge; - - /** */ public static String MergeAction_WrongRepositoryState; /** */ @@ -2305,9 +2125,6 @@ public class UIText extends NLS { public static String Untrack_untrack; /** */ - public static String Update_update; - - /** */ public static String TagAction_cannotCheckout; /** */ @@ -2317,18 +2134,12 @@ public class UIText extends NLS { public static String TagAction_repositoryState; /** */ - public static String TagAction_errorDuringTagging; - - /** */ public static String TagAction_errorWhileGettingRevCommits; /** */ public static String TagAction_unableToResolveHeadObjectId; /** */ - public static String TagAction_errorWhileMappingRevTag; - - /** */ public static String TagAction_creating; /** */ @@ -2402,24 +2213,6 @@ public class UIText extends NLS { public static String CommitAction_MergeHeadErrorTitle; /** */ - public static String CommitAction_messagepart1; - - /** */ - public static String CommitAction_messagepart2; - - /** */ - public static String CommitAction_messagepart3; - - /** */ - public static String CommitAction_messagepart4; - - /** */ - public static String CommitAction_messagepart5; - - /** */ - public static String CommitAction_messagepart6; - - /** */ public static String CommitFileDiffViewer_notContainedInCommit; /** */ diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties index be349db0ef..5237062e31 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties @@ -23,9 +23,7 @@ AddConfigEntryDialog_KeyComponentsMessage=The key must have two or three compone AddConfigEntryDialog_KeyLabel=&Key AddConfigEntryDialog_MustEnterKeyMessage=Please enter a key AddConfigEntryDialog_ValueLabel=&Value -AddToIndexAction_indexesWithUnmergedEntries=The indexes of the following files contain unmerged entries: AddToIndexAction_addingFiles=Adding files to Git Index -AddToIndexAction_addingFilesFailed=Adding Files to the Git Index failed AssumeUnchanged_assumeUnchanged=Assume unchanged WizardProjectsImportPage_projectLabel={0} ({1}) WizardProjectsImportPage_ImportProjectsTitle=Import Projects @@ -49,7 +47,6 @@ SelectRemoteNamePage_NameMustNotBeEmptyMessage=The remote name must not be empty SelectRemoteNamePage_RemoteNameLabel=&Remote name: SelectRemoteNamePage_RemoteNameMessage=Please select a remote name and indicate whether to configure fetch, push, or both SelectRemoteNamePage_RemoteNameTitle=Remote Name -SelectRemoteNamePage_SelectRemoteNameMessage=Select a remote name SelectResetTypePage_PageMessage=The content of {0} will be replaced with the content of {1} SelectResetTypePage_PageTitle=Reset {0} SharingWizard_windowTitle=Configure Git Repository @@ -86,7 +83,6 @@ GitHistoryPage_AllChangesInFolderHint=All changes of this resource's parent fold GitHistoryPage_AllChangesInProjectHint=All changes of this resource's project and its children GitHistoryPage_AllChangesInRepoHint=All changes in the Repository containing this resource GitHistoryPage_AllChangesOfResourceHint=Changes of this resource and its children only -GitHistoryPage_AllChangesOfResourceHint=Changes of this resource and its children only GitHistoryPage_AllInParentMenuLabel=All Changes in Parent &Folder GitHistoryPage_AllInParentTooltip=Show all changes in parent folder of the selected Resource GitHistoryPage_AllInProjectMenuLabel=All Changes in &Project @@ -110,13 +106,11 @@ GitHistoryPage_errorReadingHeadCommit=Cannot read HEAD commit {0} in: {1} GitHistoryPage_fileNotFound=File not found GitHistoryPage_notContainedInCommits=File {0} is not contained in the commits: {1} GitHistoryPage_openFailed=Opening Editor failed -GitHistoryPage_Date=Date GitHistoryPage_FileNotInCommit={0} not in {1} GitHistoryPage_FileType=File GitHistoryPage_FindMenuLabel=Show Find &Toolbar GitHistoryPage_FindTooltip=Show Find Toolbar GitHistoryPage_FolderType=Folder -GitHistoryPage_From=From GitHistoryPage_MultiResourcesType=Multiple Resources GitHistoryPage_OpenMenuLabel=&Open GitHistoryPage_ProjectType=Project @@ -130,7 +124,6 @@ GitHistoryPage_ResetMixedMenuLabel=&Mixed GitHistoryPage_ResetSoftMenuLabel=&Soft GitHistoryPage_SetAsBaselineMenuLabel=&Set as Baseline GitHistoryPage_ShowAllBranchesMenuLabel=Show all &Branches -GitHistoryPage_Subject=Subject GitProjectPropertyPage_LabelBranch=Branch: GitProjectPropertyPage_LabelGitDir=Git directory: GitProjectPropertyPage_LabelId=Id: @@ -148,9 +141,7 @@ RepositoryAction_errorFindingRepo=Could not find a repository associated with th RepositoryAction_errorFindingRepoTitle=Cannot Find Repository RepositoryAction_multiRepoSelection=Cannot perform reset on multiple repositories simultaneously.\n\nPlease select items from only one repository. RepositoryAction_multiRepoSelectionTitle=Multiple Repositories Selection -RepositoryActionHandler_CouldNotGetSelection_message=Could not obtain selection -RepositoryPropertySource_ConfigureKeysAction=Configure Keys... RepositoryPropertySource_EditConfigurationTitle=Git Configuration Editor RepositoryPropertySource_EffectiveConfigurationAction=Effective Configuration RepositoryPropertySource_EffectiveConfigurationCategory=Effective configuration @@ -161,11 +152,9 @@ RepositoryPropertySource_EditConfigButton=Edit... RepositoryPropertySource_EditorMessage=Edit the Git Configuration RepositoryPropertySource_RepositoryConfigurationButton=Repository configuration RepositoryPropertySource_RepositoryConfigurationCategory=Repository configuration {0} -RepositoryPropertySource_RestoreStandardAction=Restore standard keys RepositoryPropertySource_SelectModeTooltip=Select a configuration to display RepositoryPropertySource_SingleValueButton=Single value RepositoryPropertySource_SuppressMultipleValueTooltip=Suppress display of multiple values -RepositoryPropertySource_WrongFormatMessage=Wrong format for key RepositoryRemotePropertySource_ErrorHeader=Error RepositoryRemotePropertySource_FetchLabel=Remote Fetch Specification @@ -191,7 +180,6 @@ RepositorySearchDialog_EnterDirectoryToolTip=Enter a local file system directory RepositorySearchDialog_errorOccurred=Error occurred RepositorySearchDialog_NoSearchAvailableMessage=No search results available for current search criteria, click Search button to update the list RepositorySearchDialog_NothingFoundMessage=No Git Repositories found -RepositorySearchDialog_search=Search RepositorySearchDialog_searchRepositoriesMessage=Search for local Git repositories on the file system RepositorySearchDialog_ToggleSelectionButton=&Toggle Selection RepositorySelectionPage_BrowseLocalFile=Local file... @@ -216,7 +204,6 @@ RepositorySelectionPage_fieldRequired={0} required for {1} protocol. RepositorySelectionPage_fieldNotSupported={0} not supported on {1} protocol. RepositorySelectionPage_fileNotFound={0} does not exist. RepositorySelectionPage_internalError=Internal error; consult Eclipse error log. -RepositorySelectionPage_ShowPreviousURIs_HoverText=Start typing to see previously used URIs (use "*" as wildcard) RepositorySelectionPage_tip_file=Local repository RepositorySelectionPage_tip_ftp=FTP RepositorySelectionPage_tip_git=Git native transfer @@ -403,10 +390,7 @@ CommitAction_cannotCommit=Cannot commit now CommitAction_CommittingChanges=Committing changes CommitAction_CommittingFailed=Committing failed CommitAction_errorComputingDiffs=Error occurred computing diffs -CommitAction_errorDuringCommit=Error during commit -CommitAction_errorOnCommit=Error occurred while committing CommitAction_errorRetrievingCommit=Error occurred retrieving last commit -CommitAction_InternalError=An internal error occurred CommitAction_noFilesToCommit=No files to commit CommitAction_repositoryState=Repository state: {0} CommitDialog_AddFileOnDiskToIndex=Add file on &disk to index @@ -443,12 +427,6 @@ CommitDialog_StatusUntracked=Untracked CommitDialog_AddChangeIdLabel=Compute Change-Id for Gerrit Code Review CommitDialog_AddChangeIdTooltip=Inserts the final id when you press Commit -ConfigureKeysDialog_AddStandardButton=Add standard keys -ConfigureKeysDialog_AlreadyThere_Message=Key {0} is alredy in the list -ConfigureKeysDialog_DeleteButton=Delete -ConfigureKeysDialog_DialogTitle=Select Git configuration keys to display in the Properties view -ConfigureKeysDialog_NewButton=New... -ConfigureKeysDialog_NewKeyLabel=New key ConfigureRemoteWizard_WizardTitle_Change=Change remote configuration {0} ConfigureRemoteWizard_WizardTitle_New=Create a new remote configuration ConfigureUriPage_Add_button=&Add... @@ -599,15 +577,11 @@ BranchSelectionDialog_Refs=Select a branch or tag to checkout. BranchSelectionDialog_Rename=&Rename MergeAction_CannotMerge=Cannot merge now -MergeAction_ChangedFiles=There are changed files. Merging is currently not supported in this case. -MergeAction_ErrorMergeEnabling=Error during Action enabling MergeAction_HeadIsNoBranch=HEAD is not pointing to a branch MergeAction_JobNameMerge=Merging with {0} MergeAction_MergeCanceledMessage=The merge operation was canceled MergeAction_MergeCanceledTitle=Merge Canceled MergeAction_MergeResultTitle=Merge Result -MergeAction_ProblemMerge=Problem during merge -MergeAction_UnableMerge=Unable to merge. MergeAction_WrongRepositoryState=The Repository State {0} does not allow to merge MergeResultDialog_couldNotFindCommit=Could not find commit MergeResultDialog_description=Description @@ -652,22 +626,11 @@ Decorator_exceptionMessage=Errors occurred while applying Git decorations to res IgnoreActionHandler_addToGitignore=Add to gitignore -RepositoriesView_ActionCanceled_Message=Action was canceled -RepositoriesView_Add_Button=Add... -RepositoriesView_AddRepository_MenuItem=&Add Git Repository... -RepositoriesView_AddRepository_Tooltip=Add an existing Git Repository -RepositoriesView_BranchCreationFailureMessage=Branch creation failed RepositoriesView_BranchDeletionFailureMessage=Branch deletion failed RepositoriesView_Branches_Nodetext=Branches RepositoriesView_CheckingOutMessage=Checking out {0} -RepositoriesView_Synchronize_MenuItem=&Synchronize -RepositoriesView_CheckOut_MenuItem=&Check out RepositoriesView_ClipboardContentNoGitRepoMessage=Path {0} does not appear to be a Git Repository location RepositoriesView_ClipboardContentNotDirectoryMessage=Clipboard content is not a directory path -RepositoriesView_Clone_Tooltip=Clone a Git Repository -RepositoriesView_CollapseAllMenu=Collapse all -RepositoriesView_ConfigureFetchMenu=&Configure Fetch... -RepositoriesView_ConfigurePushMenu=&Configure Push... RepositoriesView_ConfirmBranchDeletionMessage=Are you sure you want to forcefully delete the following branches?\n\n\ No check will be done if all its commits have been merged to the currently checked out branch. RepositoriesView_ConfirmDeleteRemoteHeader=Confirm deletion of remote configuration @@ -675,36 +638,13 @@ RepositoriesView_ConfirmDeleteRemoteMessage=This will remove remote configuratio RepositoriesView_ConfirmDeleteTitle=Confirm Branch Deletion RepositoriesView_ConfirmProjectDeletion_Question=There are {0} projects that belong to the removed repositories, do you want to remove them from the workspace? RepositoriesView_ConfirmProjectDeletion_WindowTitle=Confirm project deletion -RepositoriesView_CopyPathToClipboardMenu=&Copy path to clipboard -RepositoriesView_CreateFetch_menu=Create &Fetch... -RepositoriesView_CreatePush_menu=Create &Push... RepositoriesView_DeleteBranchMenu=&Delete Branch... RepositoriesView_DeleteRepoDeterminProjectsMessage=Determining projects that must be deleted -RepositoriesView_DoFetchMenu=&Fetch -RepositoriesView_DoPushMenuItem=&Push RepositoriesView_Error_WindowTitle=Error RepositoriesView_ErrorHeader=Error -RepositoriesView_FetchMenu=&Fetch... -RepositoriesView_Import_Button=Import... -RepositoriesView_ImportProjectsMenu=&Import projects... -RepositoriesView_ImportRepository_MenuItem=&Import Git Repository... -RepositoriesView_LinkWithSelection_action=Link with selection -RepositoriesView_NewBranchMenu=Create a new &local branch... -RepositoriesView_NewBranchTitle=Create Branch -RepositoriesView_NewRemoteMenu=&New remote... RepositoriesView_NothingToPasteMessage=Clipboard contains no data to paste -RepositoriesView_OpenInTextEditor_menu=Open in text editor -RepositoriesView_OpenPropertiesMenu=&Open Properties view -RepositoriesView_PasteFailureTitle=Paste failure -RepositoriesView_PasteMenu=&Paste a Git Repository Location RepositoriesView_PasteRepoAlreadyThere=Repository at location {0} is already in the list -RepositoriesView_PushMenu=&Push... -RepositoriesView_Refresh_Button=&Refresh RepositoriesView_RemotesNodeText=Remotes -RepositoriesView_Remove_MenuItem=&Remove -RepositoriesView_RemoveFetch_menu=Remove &Fetch -RepositoriesView_RemovePush_menu=Remove &Push -RepositoriesView_RemoveRemoteMenu=&Remove remote... RepositoriesView_RenameBranchFailure=Branch renaming failed RepositoriesView_RenameBranchMessage=Branch {0} is renamed to the provided name. If it has a corresponding reflog, the reflog is renamed to match the new branch name and a new reflog entry is created to remember the branch renaming. RepositoriesView_RenameBranchTitle=Rename Branch @@ -773,7 +713,6 @@ GitSelectWizardPage_NoShareButton=Do n&ot share new projects GitSelectWizardPage_ProjectCreationHeader=Method for project creation GitSelectWizardPage_SharingProjectsHeader=Method for sharing projects after project creation GitSelectWizardPage_UseNewProjectsWizardButton=Use the New &Projects wizard -GitSelectWizardPage_WizardTitle=Choose how to import and share projects from at Git Repository GitShareProjectsPage_AbortedMessage=Action was aborted GitShareProjectsPage_NoNewProjectMessage=No new projects found GitShareProjectsPage_NoRepoForProjectMessage=No Git repository for project {0} @@ -810,13 +749,10 @@ UIIcons_errorLoadingPluginImage=Can't load plugin image. UIUtils_PressShortcutMessage=Press {0} or begin typing to see a filtered list of previously used values (use "*" as wildcard) UIUtils_StartTypingForPreviousValuesMessage=Start typing to see a filtered list of previously used values (use "*" as wildcard) Untrack_untrack=Untrack -Update_update=Update TagAction_cannotCheckout=Cannot checkout now TagAction_cannotGetBranchName=Cannot get actual branch name TagAction_repositoryState=Cannot checkout repository because it is in state: {0} -TagAction_errorDuringTagging=Error during tagging -TagAction_errorWhileMappingRevTag=Unable to get information about {0} tag. TagAction_errorWhileGettingRevCommits=An error occurred while getting list of commits. TagAction_unableToResolveHeadObjectId=Unable to resolve object id associated with current HEAD. TagAction_creating=Creating {0} tag. @@ -844,12 +780,6 @@ CommitAction_commit=Commit... CommitAction_ErrorReadingMergeMsg=Error reading from file .git/MERGE_MSG CommitAction_MergeHeadErrorMessage=The file .git/MERGE_MSG was not found although being in state Merged. CommitAction_MergeHeadErrorTitle=Inconsistent Merge state -CommitAction_messagepart1=It looks like you may be committing a MERGE. -CommitAction_messagepart2=If this is not correct, please remove the file -CommitAction_messagepart3=.git/MERGE_HEAD -CommitAction_messagepart4=and try again. -CommitAction_messagepart5=Please enter the commit message for your changes. Lines starting -CommitAction_messagepart6=with '\#' will be ignored, and an empty message aborts the commit. CommitFileDiffViewer_notContainedInCommit=File {0} is not contained in commit {1} |