diff options
author | Thomas Wolf | 2017-03-30 09:05:55 +0000 |
---|---|---|
committer | Thomas Wolf | 2017-04-20 12:53:11 +0000 |
commit | 9d4b324571d1c25a20648bd20cba9e1f89e4e1db (patch) | |
tree | 6668e970b09807fa6edb3a28e8a5480cc1bbc7ee /org.eclipse.egit.ui/src/org | |
parent | 791c561bd4805b2003b4ab949686f52fa898bfd8 (diff) | |
download | egit-9d4b324571d1c25a20648bd20cba9e1f89e4e1db.tar.gz egit-9d4b324571d1c25a20648bd20cba9e1f89e4e1db.tar.xz egit-9d4b324571d1c25a20648bd20cba9e1f89e4e1db.zip |
Fix "checkout" used as a verb to "check out"
There is no verb "to checkout" in English. If there was, we could
write things like "the file has been checkouted" or "checkouting
branch X failed". Clearly that's not English :-) The verb is simply
"to check out", a file has been "checked out", and "checking out" a
branch might fail.
Change-Id: I69d0becac28fd144e2e16d59720975950e3b062a
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Diffstat (limited to 'org.eclipse.egit.ui/src/org')
-rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties | 40 |
1 files changed, 20 insertions, 20 deletions
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 a231b6542b..4ae434d9e9 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 @@ -14,7 +14,7 @@ # Daniel Megert <daniel_megert@ch.ibm.com> - Use correct syntax when a single ref was updated # Gunnar Wagenknecht <gunnar@wagenknecht.org> # Marc Khouzam <marc.khouzam@ericsson.com> - Added CompareTreeView Compare Mode tooltip -# Marc Khouzam <marc.khouzam@ericsson.com> - Add option not to checkout new branch from Gerrit +# Marc Khouzam <marc.khouzam@ericsson.com> - Add option not to check out new branch from Gerrit # Mickael Istria (Red Hat Inc.) - 463339 Simple push wizard improvements # Axel Richard <axel.richard@obeo.fr> - handle symlink decorator in staging view # Christian Georgi <christian.georgi@sap.com> - Check for empty second line is configurable @@ -167,8 +167,8 @@ GitHistoryPage_AllInRepoMenuLabel=All Changes in &Repository GitHistoryPage_AllInRepoTooltip=Show all changes in repository containing the selected resource GitHistoryPage_AllOfResourceMenuLabel=All &Changes of Resource GitHistoryPage_AllOfResourceTooltip=Show all changes of selected resource and its children -GitHistoryPage_CheckoutMenuLabel=&Checkout -GitHistoryPage_CheckoutMenuLabel2=&Checkout... +GitHistoryPage_CheckoutMenuLabel=&Check Out +GitHistoryPage_CheckoutMenuLabel2=&Check Out... GitHistoryPage_CompareModeMenuLabel=Compare &Mode GitHistoryPage_ReuseCompareEditorMenuLabel=Reuse Compare &Editor GitHistoryPage_CompareWithCurrentHeadMenu=Compare with &HEAD @@ -272,12 +272,12 @@ CleanRepositoryPage_SelectFilesToClean=Select files to be deleted CleanRepositoryPage_title=Clean Repository CleanWizard_title=Clean ''{0}'' ClearCredentialsCommand_clearingCredentialsFailed=Clearing credentials failed. -CheckoutCommand_CheckoutLabel=&Checkout -CheckoutCommand_CheckoutLabelWithQuestion=&Checkout... +CheckoutCommand_CheckoutLabel=&Check Out +CheckoutCommand_CheckoutLabelWithQuestion=&Check Out... CheckoutConflictDialog_conflictMessage=The files shown below have uncommitted changes which would be lost by the selected operation.\n\nEither commit the changes to the repository or discard the changes by resetting the current branch. -CheckoutDialog_Title=Checkout a ref or work with branches -CheckoutDialog_OkCheckout=&Checkout -CheckoutDialog_OkCheckoutWithQuestion=&Checkout... +CheckoutDialog_Title=Check out a ref or work with branches +CheckoutDialog_OkCheckout=&Check Out +CheckoutDialog_OkCheckoutWithQuestion=&Check Out... CheckoutHandler_SelectBranchMessage=There is more than one branch for this commit. Please select the branch you want to check out. CheckoutHandler_SelectBranchTitle=Select a Branch for Checkout CherryPickHandler_JobName=Cherry-Picking {0} Commits @@ -873,7 +873,7 @@ ConfirmationPage_title=Push Confirmation CreateBranchPage_BranchNameLabel=&Branch name: CreateBranchPage_BranchNameToolTip=The name of the new local branch to create CreateBranchPage_CheckingOutMessage=Checking out new branch... -CreateBranchPage_CheckoutButton=&Checkout new branch +CreateBranchPage_CheckoutButton=&Check out new branch CreateBranchPage_ChooseBranchAndNameMessage=Please choose a source branch and a name for the new branch CreateBranchPage_ChooseNameMessage=Please choose a name for the new branch CreateBranchPage_CreateBranchNameProviderFailed=Failed to create branch name provider @@ -953,7 +953,7 @@ FetchGerritChangePage_BranchEditButton=Edit Branches... FetchGerritChangePage_BranchNameText=Branch &name: FetchGerritChangePage_ChangeLabel=&Change: FetchGerritChangePage_CheckingOutTaskName=Checking out change -FetchGerritChangePage_CheckoutRadio=Check&out FETCH_HEAD +FetchGerritChangePage_CheckoutRadio=Check &out FETCH_HEAD FetchGerritChangePage_ContentAssistDescription=Patch set {0} of change {1} FetchGerritChangePage_ContentAssistTooltip=Press {0} to see a filtered list of changes FetchGerritChangePage_CreatingBranchTaskName=Creating branch @@ -962,14 +962,14 @@ FetchGerritChangePage_FetchingTaskName=Fetching change {0} FetchGerritChangePage_GeneratedTagMessage=Generated for Gerrit change {0} FetchGerritChangePage_GetChangeTaskName=Get change from Gerrit FetchGerritChangePage_LocalBranchRadio=Create a &local branch -FetchGerritChangePage_LocalBranchCheckout=Checkout new branch +FetchGerritChangePage_LocalBranchCheckout=Check out new branch FetchGerritChangePage_MissingChangeMessage=Please provide a change FetchGerritChangePage_PageMessage=Please select a Gerrit URI and change to fetch FetchGerritChangePage_PageTitle=Fetch a change from Gerrit into repository {0} FetchGerritChangePage_RunInBackground=&Run in background FetchGerritChangePage_SuggestedRefNamePattern=change/{0}/{1} FetchGerritChangePage_TagNameText=Tag &name: -FetchGerritChangePage_TagRadio=Create and checkout a &tag +FetchGerritChangePage_TagRadio=Create and check out a &tag FetchGerritChangePage_UpdateRadio=U&pdate FETCH_HEAD only FetchGerritChangePage_UriLabel=&URI: FetchGerritChangeWizard_WizardTitle=Fetch a change from Gerrit @@ -1091,7 +1091,7 @@ BasicConfigurationDialog_UserEmailLabel=&E-mail: BasicConfigurationDialog_UserNameLabel=Full &name: BasicConfigurationDialog_WindowTitle=Identify Yourself BranchAction_branchFailed=Branch failed -BranchAction_cannotCheckout=Cannot checkout now +BranchAction_cannotCheckout=Cannot check out now BranchAction_checkingOut=Checking out {0} - {1} BranchAction_repositoryState=Repository state: {0} BranchConfigurationDialog_BranchConfigurationTitle=Git Branch Configuration @@ -1100,13 +1100,13 @@ BranchConfigurationDialog_ExceptionGettingRefs=Exception getting Refs BranchConfigurationDialog_RemoteLabel=Rem&ote: BranchConfigurationDialog_SaveBranchConfigFailed=Could not save branch configuration BranchConfigurationDialog_UpstreamBranchLabel=Upstream &Branch: -BranchOperationUI_CheckoutRemoteTrackingAsLocal=Checkout as New Local Branch -BranchOperationUI_CheckoutRemoteTrackingCommit=Checkout Commit +BranchOperationUI_CheckoutRemoteTrackingAsLocal=Check out as New Local Branch +BranchOperationUI_CheckoutRemoteTrackingCommit=Check out Commit BranchOperationUI_CheckoutRemoteTrackingQuestion=If you want to work on the branch, a new local branch has to be created and checked out.\n\nIf you just want to have a look at the state of the branch, the commit of the remote-tracking branch can be checked out. BranchOperationUI_CheckoutRemoteTrackingTitle=Check out remote-tracking branch BranchOperationUI_Continue=&Continue BranchOperationUI_DetachedHeadTitle=Detached HEAD -BranchOperationUI_DetachedHeadMessage=You are in the 'detached HEAD' state. This means that you don't have a local branch checked out.\n\nYou can look around, but it's not recommended to commit changes. The reason is that these commits would not be on any branch and would not be visible after checking out another branch.\n\nIf you want to make changes, create or checkout a local branch first. +BranchOperationUI_DetachedHeadMessage=You are in the 'detached HEAD' state. This means that you don't have a local branch checked out.\n\nYou can look around, but it's not recommended to commit changes. The reason is that these commits would not be on any branch and would not be visible after checking out another branch.\n\nIf you want to make changes, create or check out a local branch first. LaunchFinder_RunningLaunchDontShowAgain=Don't show this warning again LaunchFinder_RunningLaunchMessage=The launch configuration ''{0}'' is currently running and uses a project of this repository. LaunchFinder_RunningLaunchTitle=Running Launch @@ -1257,8 +1257,8 @@ IgnoreActionHandler_manyFilesToBeIgnoredQuestion=Adding many files to .gitignore RepositoriesView_BranchDeletionFailureMessage=Branch deletion failed RepositoriesView_Branches_Nodetext=Branches -RepositoriesView_CheckoutConfirmationMessage=Do you really want to checkout ''{0}''? -RepositoriesView_CheckoutConfirmationTitle=Checkout Branch +RepositoriesView_CheckoutConfirmationMessage=Do you really want to check out ''{0}''? +RepositoriesView_CheckoutConfirmationTitle=Check Out Branch RepositoriesView_CheckoutConfirmationToggleMessage=Don't show this confirmation dialog again RepositoriesView_ClipboardContentNoGitRepoMessage=Path {0} does not appear to be a Git repository location RepositoriesView_ClipboardContentNotDirectoryOrURIMessage=Clipboard content is neither a directory path nor a valid git URI @@ -1440,9 +1440,9 @@ UpstreamConfigComponent_ConfigureUpstreamCheck=Configure &upstream for push and UpstreamConfigComponent_ConfigureUpstreamToolTip=This will connect the local branch with its remote branch for pushing and pulling. BranchRebaseModeCombo_RebaseModeLabel=When pulling: -TagAction_cannotCheckout=Cannot checkout now +TagAction_cannotCheckout=Cannot check out now TagAction_cannotGetBranchName=Cannot get actual branch name -TagAction_repositoryState=Cannot checkout repository because it is in state: {0} +TagAction_repositoryState=Cannot check out repository because it is in state: {0} 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. |