Attachment 279045 Details for Bug 548549 – Patch (while Gerrit seems in a bad mood)

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

[patch] Patch (while Gerrit seems in a bad mood)

0001-Bug-548549-Rework-labels-for-Git-Staging-view.patch (text/plain), 8.83 KB, created by Mickael Istria

on 2019-06-22 17:55:56 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Mickael Istria

Created: 2019-06-22 17:55:56 EDT

Size: 8.83 KB

patch

obsolete

>From 3dd55b1faef74ee1b4c87e8435260f72e3e825aa Mon Sep 17 00:00:00 2001
>From: Mickael Istria <mistria@redhat.com>
>Date: Sat, 22 Jun 2019 23:51:54 +0200
>Subject: [PATCH] Bug 548549 - Rework labels for "Git Staging" view
>
>Change-Id: I6a83f580e63279d624c3aa7e2104f525addef128
>Signed-off-by: Mickael Istria <mistria@redhat.com>
>---
> org.eclipse.egit.ui/plugin.properties         |  8 +++----
> .../egit/ui/internal/uitext.properties        | 24 +++++++++----------
> 2 files changed, 16 insertions(+), 16 deletions(-)
>
>diff --git a/org.eclipse.egit.ui/plugin.properties b/org.eclipse.egit.ui/plugin.properties
>index 85bf51770..ce034adef 100644
>--- a/org.eclipse.egit.ui/plugin.properties
>+++ b/org.eclipse.egit.ui/plugin.properties
>@@ -78,8 +78,8 @@ WindowCachePreferencePage_keywords = git egit window cache
> 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 stage untracked track message history signed warning error
>-StagingViewPreferencePage_keywords = git egit staging stage
>+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
>@@ -136,7 +136,7 @@ GitPreferences_WindowCachePreferencePage_name=Window Cache
> GitPreferences_DateFormatPreferencePage_name=Date Format
> GitPreferences_DecoratorPreferencePage_name=Label Decorations
> GitPreferences_CommittingPreferencePage_name=Committing
>-GitPreferences_StagingViewPreferencePage_name=Staging View
>+GitPreferences_StagingViewPreferencePage_name=Status View
> GitPreferences_ProjectPreferencePage_name=Projects
> 
> ShareProjectCommand_name=Share with Git
>@@ -144,7 +144,7 @@ ShareProjectCommand_desc=Share the project using Git
> 
> ShareProjectCommandParameter_name = Project
> GitRepositoriesView_name = Git Repositories
>-GitStagingView_name = Git Staging
>+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.
>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 f2bd449b3..69c468767 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
>@@ -394,7 +394,7 @@ RebaseResultDialog_NextStepsAfterResolveConflicts=When you have resolved the con
> 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 Staging View and launch a text editor to edit each conflicting file.
>+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
>@@ -851,9 +851,9 @@ CommitDialog_ContentAssist=Content assist available for previous commit messages
> 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 Staging view
>-CommitDialog_OpenStagingViewLink=Open <a>Git Staging</a> view
>-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.
>+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
>@@ -1089,7 +1089,7 @@ CommittingPreferencePage_WarnBlock_Errors=Errors
> CommittingPreferencePage_WarnBlock_WarningsAndErrors=Warnings and errors
> CommittingPreferencePage_BlockCommit=Block commit button
> CommittingPreferencePage_BlockCommitCombo=Block if there are:
>-CommittingPreferencePage_AlwaysUseStagingView=Use Staging View to commit instead of Commit Dialog
>+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
>@@ -1372,7 +1372,7 @@ GitCompareEditorInput_ResourcesInDifferentReposMessagge=Resources belong to diff
> GitCompareFileRevisionEditorInput_CompareInputTitle={0}
> GitCompareFileRevisionEditorInput_CompareTooltip=Compare {0} {1} and {2}
> GitCompareFileRevisionEditorInput_CurrentTitle=Current
>-GitCompareFileRevisionEditorInput_LocalLabel=Local: {0}
>+GitCompareFileRevisionEditorInput_LocalLabel=Local, Working Tree: {0}
> GitCompareFileRevisionEditorInput_IndexLabel=Index: {0}
> GitCompareFileRevisionEditorInput_IndexEditableLabel=Index: {0} (editable)
> GitCompareFileRevisionEditorInput_RevisionLabel={0} {1} ({2})
>@@ -1879,11 +1879,11 @@ Examples:\
> OpenWorkingFileAction_text=&Open
> OpenWorkingFileAction_tooltip=Open working file
> OpenWorkingFileAction_openWorkingFileShellTitle=Problems Opening Working File
>-StagingView_UnstagedChanges=Unstaged Changes ({0})
>+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=Staged Changes ({0})
>-StagingView_StagedChangesTooltip=Changes in the git index; included in the commit
>+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:
>@@ -1940,7 +1940,7 @@ StagingView_AddJob=Adding files to index...
> 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=Staging View Loader
>+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}''
>@@ -2018,7 +2018,7 @@ EditHandler_CommitNotOnCurrentBranch=The selected commit cannot be edited becaus
> EditHandler_Error_Title=Error Editing Commit
> EditHandler_ErrorCheckingIfCommitIsOnCurrentBranch=Error checking if commit is on current branch
> EditHandler_JobName=Editing Commit {0}
>-EditHandler_OpenStagingAndRebaseInteractiveViews=Open Staging and Interactive Rebase Views
>+EditHandler_OpenStagingAndRebaseInteractiveViews=Open Status and Interactive Rebase Views
> 
> GitModelSynchronizeParticipant_initialScopeName=Git
> GitModelSynchronizeParticipant_noCachedSourceVariant=Could not locate cached source variant for resource: {0}
>@@ -2038,7 +2038,7 @@ PushMenu_PushBranch=Push &Branch ''{0}''...
> 
> DiffStyleRangeFormatter_diffTruncated=[...] diff truncated after {0} lines.
> 
>-StagingViewPreferencePage_title=Staging View
>+StagingViewPreferencePage_title=Status View
> StagingViewPreferencePage_maxLimitListMode=Switch to compact mode if files number exceeds:
> 
> CommandConfirmationHardResetDialog_resetButtonLabel=&Reset
>-- 
>2.21.0
>

Actions: View | Diff

Attachments on bug 548549: 279045