Attachment #279045 for bug #548549

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

View | Details | Raw Unified | Return to bug 548549
Collapse All | Expand All




DateFormatPreferencePage_keywords = git egit date format commit time zone
GitDecoratorPreferencePage_keywords = git egit label decoration colors fonts icon
GlobalConfigurationPreferencePage_keywords = git egit configuration user system repository
CommittingPreferencePage_keywords = git egit committing staging index stage untracked track message history signed warning error
StagingViewPreferencePage_keywords = git egit staging stage index
DialogsPreferencePage_keywords = git egit confirmation dialog configuration rebase checkout detached launch branch clone lfs fetch push log home
SynchronizePreferencePage_keywords = git egit synchronize fetch commit models merge
HistoryPreferencePage_keywords = git egit history branches tags refs notes rename revision comment date author committer diff

GitPreferences_DateFormatPreferencePage_name=Date Format
GitPreferences_DecoratorPreferencePage_name=Label Decorations
GitPreferences_CommittingPreferencePage_name=Committing
GitPreferences_StagingViewPreferencePage_name=Status View
GitPreferences_ProjectPreferencePage_name=Projects

ShareProjectCommand_name=Share with Git


ShareProjectCommandParameter_name = Project
GitRepositoriesView_name = Git Repositories
GitStagingView_name = Git Status
GitCategory_name = Git
GitRepositoryPerspective_name = Git
GitRepositoryPerspective_description = Perspective for managing git repositories with views for committing, browsing history, interactive rebase and other git operations.




RebaseResultDialog_NextStepsDoNothing=- resolve the conflicts\n- then run "Rebase > Continue"\n- or "Rebase > Abort"
RebaseResultDialog_NothingToCommit=No changes detected.\n\nIf there is nothing left to stage, chances are that something else\nalready introduced the same changes; you might want to skip this patch using "Rebase > Skip commit and continue".
RebaseResultDialog_notInWorkspace=<not in workspace>
RebaseResultDialog_notInWorkspaceMessage=Some conflicting files are not part of the workspace. Open Status View and launch a text editor to edit each conflicting file.
RebaseResultDialog_notShared=<not shared>
RebaseResultDialog_notSharedMessage=Some conflicting files reside in projects not shared with Git. Please share the related projects with Git.
RebaseResultDialog_SkipCommitButton=&Skip this commit and continue rebasing the next commits

CommitDialog_Files=Files ({0}/{1})
CommitDialog_Message=Enter commit message.
CommitDialog_MessageNoFilesSelected=Select one or more files to commit
CommitDialog_OpenStagingViewError=Could not open the Git Status view
CommitDialog_OpenStagingViewLink=Open <a>Git Status</a> view
CommitDialog_OpenStagingViewToolTip=For comparing and committing while still being able to navigate and use the editor, try the Git Status view by clicking the link. The view will be opened with your repository and commit message.
CommitDialog_Path=Path
CommitDialog_Title=Commit Changes to Git Repository
CommitDialog_IgnoreErrors=Ignore warnings and errors

CommittingPreferencePage_WarnBlock_WarningsAndErrors=Warnings and errors
CommittingPreferencePage_BlockCommit=Block commit button
CommittingPreferencePage_BlockCommitCombo=Block if there are:
CommittingPreferencePage_AlwaysUseStagingView=Use Status View to commit instead of Commit Dialog
CommittingPreferencePage_autoStageDeletion=Automatically stage files being deleted
CommittingPreferencePage_autoStageMoves=Automatically stage files being moved
CommittingPreferencePage_AutoStageOnCommit=Automatically stage selected resources on commit

GitCompareFileRevisionEditorInput_CompareInputTitle={0}
GitCompareFileRevisionEditorInput_CompareTooltip=Compare {0} {1} and {2}
GitCompareFileRevisionEditorInput_CurrentTitle=Current
GitCompareFileRevisionEditorInput_LocalLabel=Local, Working Tree: {0}
GitCompareFileRevisionEditorInput_IndexLabel=Index: {0}
GitCompareFileRevisionEditorInput_IndexEditableLabel=Index: {0} (editable)
GitCompareFileRevisionEditorInput_RevisionLabel={0} {1} ({2})

OpenWorkingFileAction_text=&Open
OpenWorkingFileAction_tooltip=Open working file
OpenWorkingFileAction_openWorkingFileShellTitle=Problems Opening Working File
StagingView_UnstagedChanges=Changes in Working Tree ({0})
StagingView_UnstagedChangesTooltip=Changes not in the git index; not in the commit
StagingView_ShowFileNamesFirst=Show File Names First
StagingView_StagedChanges=Changes in Index ({0})
StagingView_StagedChangesTooltip=Staged chnages for inclusion in the commit
StagingView_CommitMessage=Commit Message
StagingView_Committer=Committer:
StagingView_Author=Author:

StagingView_RemoveJob=Removing files from index...
StagingView_ResetJob=Unstaging files...
StagingView_MessageErrors=Fix warnings/errors before you commit changes or explicitly ignore them
StagingView_LoadJob=Status View Loader
StagingView_IgnoreErrors=Ignore warnings and errors
StagingView_CopyPaths=&Copy {0,choice,1#Path|1<Paths}
StashApplyCommand_applyFailed=Applying stashed commit ''{0}'' failed due to ''{1}''

EditHandler_Error_Title=Error Editing Commit
EditHandler_ErrorCheckingIfCommitIsOnCurrentBranch=Error checking if commit is on current branch
EditHandler_JobName=Editing Commit {0}
EditHandler_OpenStagingAndRebaseInteractiveViews=Open Status and Interactive Rebase Views

GitModelSynchronizeParticipant_initialScopeName=Git
GitModelSynchronizeParticipant_noCachedSourceVariant=Could not locate cached source variant for resource: {0}


DiffStyleRangeFormatter_diffTruncated=[...] diff truncated after {0} lines.

StagingViewPreferencePage_title=Status View
StagingViewPreferencePage_maxLimitListMode=Switch to compact mode if files number exceeds:

CommandConfirmationHardResetDialog_resetButtonLabel=&Reset
- 

Return to bug 548549

Lines 78-85 WindowCachePreferencePage_keywords = git egit window cache Link Here

(-)a/org.eclipse.egit.ui/plugin.properties (-4 / +4 lines)
78	DateFormatPreferencePage_keywords = git egit date format commit time zone	78	DateFormatPreferencePage_keywords = git egit date format commit time zone
79	GitDecoratorPreferencePage_keywords = git egit label decoration colors fonts icon	79	GitDecoratorPreferencePage_keywords = git egit label decoration colors fonts icon
80	GlobalConfigurationPreferencePage_keywords = git egit configuration user system repository	80	GlobalConfigurationPreferencePage_keywords = git egit configuration user system repository
81	CommittingPreferencePage_keywords = git egit committing staging stage untracked track message history signed warning error	81	CommittingPreferencePage_keywords = git egit committing staging index stage untracked track message history signed warning error
82	StagingViewPreferencePage_keywords = git egit staging stage	82	StagingViewPreferencePage_keywords = git egit staging stage index
83	DialogsPreferencePage_keywords = git egit confirmation dialog configuration rebase checkout detached launch branch clone lfs fetch push log home	83	DialogsPreferencePage_keywords = git egit confirmation dialog configuration rebase checkout detached launch branch clone lfs fetch push log home
84	SynchronizePreferencePage_keywords = git egit synchronize fetch commit models merge	84	SynchronizePreferencePage_keywords = git egit synchronize fetch commit models merge
85	HistoryPreferencePage_keywords = git egit history branches tags refs notes rename revision comment date author committer diff	85	HistoryPreferencePage_keywords = git egit history branches tags refs notes rename revision comment date author committer diff
Lines 136-142 GitPreferences_WindowCachePreferencePage_name=Window Cache Link Here
136	GitPreferences_DateFormatPreferencePage_name=Date Format	136	GitPreferences_DateFormatPreferencePage_name=Date Format
137	GitPreferences_DecoratorPreferencePage_name=Label Decorations	137	GitPreferences_DecoratorPreferencePage_name=Label Decorations
138	GitPreferences_CommittingPreferencePage_name=Committing	138	GitPreferences_CommittingPreferencePage_name=Committing
139	GitPreferences_StagingViewPreferencePage_name=Staging View	139	GitPreferences_StagingViewPreferencePage_name=Status View
140	GitPreferences_ProjectPreferencePage_name=Projects	140	GitPreferences_ProjectPreferencePage_name=Projects
141		141
142	ShareProjectCommand_name=Share with Git	142	ShareProjectCommand_name=Share with Git
Lines 144-150 ShareProjectCommand_desc=Share the project using Git Link Here
144		144
145	ShareProjectCommandParameter_name = Project	145	ShareProjectCommandParameter_name = Project
146	GitRepositoriesView_name = Git Repositories	146	GitRepositoriesView_name = Git Repositories
147	GitStagingView_name = Git Staging	147	GitStagingView_name = Git Status
148	GitCategory_name = Git	148	GitCategory_name = Git
149	GitRepositoryPerspective_name = Git	149	GitRepositoryPerspective_name = Git
150	GitRepositoryPerspective_description = Perspective for managing git repositories with views for committing, browsing history, interactive rebase and other git operations.	150	GitRepositoryPerspective_description = Perspective for managing git repositories with views for committing, browsing history, interactive rebase and other git operations.

Lines 394-400 RebaseResultDialog_NextStepsAfterResolveConflicts=When you have resolved the con Link Here

(-)a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties (-13 / +12 lines)
394	RebaseResultDialog_NextStepsDoNothing=- resolve the conflicts\n- then run "Rebase > Continue"\n- or "Rebase > Abort"	394	RebaseResultDialog_NextStepsDoNothing=- resolve the conflicts\n- then run "Rebase > Continue"\n- or "Rebase > Abort"
395	RebaseResultDialog_NothingToCommit=No changes detected.\n\nIf there is nothing left to stage, chances are that something else\nalready introduced the same changes; you might want to skip this patch using "Rebase > Skip commit and continue".	395	RebaseResultDialog_NothingToCommit=No changes detected.\n\nIf there is nothing left to stage, chances are that something else\nalready introduced the same changes; you might want to skip this patch using "Rebase > Skip commit and continue".
396	RebaseResultDialog_notInWorkspace=<not in workspace>	396	RebaseResultDialog_notInWorkspace=<not in workspace>
397	RebaseResultDialog_notInWorkspaceMessage=Some conflicting files are not part of the workspace. Open Staging View and launch a text editor to edit each conflicting file.	397	RebaseResultDialog_notInWorkspaceMessage=Some conflicting files are not part of the workspace. Open Status View and launch a text editor to edit each conflicting file.
398	RebaseResultDialog_notShared=<not shared>	398	RebaseResultDialog_notShared=<not shared>
399	RebaseResultDialog_notSharedMessage=Some conflicting files reside in projects not shared with Git. Please share the related projects with Git.	399	RebaseResultDialog_notSharedMessage=Some conflicting files reside in projects not shared with Git. Please share the related projects with Git.
400	RebaseResultDialog_SkipCommitButton=&Skip this commit and continue rebasing the next commits	400	RebaseResultDialog_SkipCommitButton=&Skip this commit and continue rebasing the next commits
Lines 851-859 CommitDialog_ContentAssist=Content assist available for previous commit messages Link Here
851	CommitDialog_Files=Files ({0}/{1})	851	CommitDialog_Files=Files ({0}/{1})
852	CommitDialog_Message=Enter commit message.	852	CommitDialog_Message=Enter commit message.
853	CommitDialog_MessageNoFilesSelected=Select one or more files to commit	853	CommitDialog_MessageNoFilesSelected=Select one or more files to commit
854	CommitDialog_OpenStagingViewError=Could not open the Git Staging view	854	CommitDialog_OpenStagingViewError=Could not open the Git Status view
855	CommitDialog_OpenStagingViewLink=Open <a>Git Staging</a> view	855	CommitDialog_OpenStagingViewLink=Open <a>Git Status</a> view
856	CommitDialog_OpenStagingViewToolTip=For comparing and committing while still being able to navigate and use the editor, try the Git Staging view by clicking the link. The view will be opened with your repository and commit message.	856	CommitDialog_OpenStagingViewToolTip=For comparing and committing while still being able to navigate and use the editor, try the Git Status view by clicking the link. The view will be opened with your repository and commit message.
857	CommitDialog_Path=Path	857	CommitDialog_Path=Path
858	CommitDialog_Title=Commit Changes to Git Repository	858	CommitDialog_Title=Commit Changes to Git Repository
859	CommitDialog_IgnoreErrors=Ignore warnings and errors	859	CommitDialog_IgnoreErrors=Ignore warnings and errors
Lines 1089-1095 CommittingPreferencePage_WarnBlock_Errors=Errors Link Here
1089	CommittingPreferencePage_WarnBlock_WarningsAndErrors=Warnings and errors	1089	CommittingPreferencePage_WarnBlock_WarningsAndErrors=Warnings and errors
1090	CommittingPreferencePage_BlockCommit=Block commit button	1090	CommittingPreferencePage_BlockCommit=Block commit button
1091	CommittingPreferencePage_BlockCommitCombo=Block if there are:	1091	CommittingPreferencePage_BlockCommitCombo=Block if there are:
1092	CommittingPreferencePage_AlwaysUseStagingView=Use Staging View to commit instead of Commit Dialog	1092	CommittingPreferencePage_AlwaysUseStagingView=Use Status View to commit instead of Commit Dialog
1093	CommittingPreferencePage_autoStageDeletion=Automatically stage files being deleted	1093	CommittingPreferencePage_autoStageDeletion=Automatically stage files being deleted
1094	CommittingPreferencePage_autoStageMoves=Automatically stage files being moved	1094	CommittingPreferencePage_autoStageMoves=Automatically stage files being moved
1095	CommittingPreferencePage_AutoStageOnCommit=Automatically stage selected resources on commit	1095	CommittingPreferencePage_AutoStageOnCommit=Automatically stage selected resources on commit
Lines 1372-1378 GitCompareEditorInput_ResourcesInDifferentReposMessagge=Resources belong to diff Link Here
1372	GitCompareFileRevisionEditorInput_CompareInputTitle={0}	1372	GitCompareFileRevisionEditorInput_CompareInputTitle={0}
1373	GitCompareFileRevisionEditorInput_CompareTooltip=Compare {0} {1} and {2}	1373	GitCompareFileRevisionEditorInput_CompareTooltip=Compare {0} {1} and {2}
1374	GitCompareFileRevisionEditorInput_CurrentTitle=Current	1374	GitCompareFileRevisionEditorInput_CurrentTitle=Current
1375	GitCompareFileRevisionEditorInput_LocalLabel=Local: {0}	1375	GitCompareFileRevisionEditorInput_LocalLabel=Local, Working Tree: {0}
1376	GitCompareFileRevisionEditorInput_IndexLabel=Index: {0}	1376	GitCompareFileRevisionEditorInput_IndexLabel=Index: {0}
1377	GitCompareFileRevisionEditorInput_IndexEditableLabel=Index: {0} (editable)	1377	GitCompareFileRevisionEditorInput_IndexEditableLabel=Index: {0} (editable)
1378	GitCompareFileRevisionEditorInput_RevisionLabel={0} {1} ({2})	1378	GitCompareFileRevisionEditorInput_RevisionLabel={0} {1} ({2})
Lines 1879-1889 Examples:\ Link Here
1879	OpenWorkingFileAction_text=&Open	1879	OpenWorkingFileAction_text=&Open
1880	OpenWorkingFileAction_tooltip=Open working file	1880	OpenWorkingFileAction_tooltip=Open working file
1881	OpenWorkingFileAction_openWorkingFileShellTitle=Problems Opening Working File	1881	OpenWorkingFileAction_openWorkingFileShellTitle=Problems Opening Working File
1882	StagingView_UnstagedChanges=Unstaged Changes ({0})	1882	StagingView_UnstagedChanges=Changes in Working Tree ({0})
1883	StagingView_UnstagedChangesTooltip=Changes not in the git index; not in the commit	1883	StagingView_UnstagedChangesTooltip=Changes not in the git index; not in the commit
1884	StagingView_ShowFileNamesFirst=Show File Names First	1884	StagingView_ShowFileNamesFirst=Show File Names First
1885	StagingView_StagedChanges=Staged Changes ({0})	1885	StagingView_StagedChanges=Changes in Index ({0})
1886	StagingView_StagedChangesTooltip=Changes in the git index; included in the commit	1886	StagingView_StagedChangesTooltip=Staged chnages for inclusion in the commit
1887	StagingView_CommitMessage=Commit Message	1887	StagingView_CommitMessage=Commit Message
1888	StagingView_Committer=Committer:	1888	StagingView_Committer=Committer:
1889	StagingView_Author=Author:	1889	StagingView_Author=Author:
Lines 1940-1946 StagingView_AddJob=Adding files to index... Link Here
1940	StagingView_RemoveJob=Removing files from index...	1940	StagingView_RemoveJob=Removing files from index...
1941	StagingView_ResetJob=Unstaging files...	1941	StagingView_ResetJob=Unstaging files...
1942	StagingView_MessageErrors=Fix warnings/errors before you commit changes or explicitly ignore them	1942	StagingView_MessageErrors=Fix warnings/errors before you commit changes or explicitly ignore them
1943	StagingView_LoadJob=Staging View Loader	1943	StagingView_LoadJob=Status View Loader
1944	StagingView_IgnoreErrors=Ignore warnings and errors	1944	StagingView_IgnoreErrors=Ignore warnings and errors
1945	StagingView_CopyPaths=&Copy {0,choice,1#Path\|1<Paths}	1945	StagingView_CopyPaths=&Copy {0,choice,1#Path\|1<Paths}
1946	StashApplyCommand_applyFailed=Applying stashed commit ''{0}'' failed due to ''{1}''	1946	StashApplyCommand_applyFailed=Applying stashed commit ''{0}'' failed due to ''{1}''
Lines 2018-2024 EditHandler_CommitNotOnCurrentBranch=The selected commit cannot be edited becaus Link Here
2018	EditHandler_Error_Title=Error Editing Commit	2018	EditHandler_Error_Title=Error Editing Commit
2019	EditHandler_ErrorCheckingIfCommitIsOnCurrentBranch=Error checking if commit is on current branch	2019	EditHandler_ErrorCheckingIfCommitIsOnCurrentBranch=Error checking if commit is on current branch
2020	EditHandler_JobName=Editing Commit {0}	2020	EditHandler_JobName=Editing Commit {0}
2021	EditHandler_OpenStagingAndRebaseInteractiveViews=Open Staging and Interactive Rebase Views	2021	EditHandler_OpenStagingAndRebaseInteractiveViews=Open Status and Interactive Rebase Views
2022		2022
2023	GitModelSynchronizeParticipant_initialScopeName=Git	2023	GitModelSynchronizeParticipant_initialScopeName=Git
2024	GitModelSynchronizeParticipant_noCachedSourceVariant=Could not locate cached source variant for resource: {0}	2024	GitModelSynchronizeParticipant_noCachedSourceVariant=Could not locate cached source variant for resource: {0}
Lines 2038-2044 PushMenu_PushBranch=Push &Branch ''{0}''... Link Here
2038		2038
2039	DiffStyleRangeFormatter_diffTruncated=[...] diff truncated after {0} lines.	2039	DiffStyleRangeFormatter_diffTruncated=[...] diff truncated after {0} lines.
2040		2040
2041	StagingViewPreferencePage_title=Staging View	2041	StagingViewPreferencePage_title=Status View
2042	StagingViewPreferencePage_maxLimitListMode=Switch to compact mode if files number exceeds:	2042	StagingViewPreferencePage_maxLimitListMode=Switch to compact mode if files number exceeds:
2043		2043
2044	CommandConfirmationHardResetDialog_resetButtonLabel=&Reset	2044	CommandConfirmationHardResetDialog_resetButtonLabel=&Reset
2045	-