diff --git a/plugins/git4idea/resources/messages/GitBundle.properties b/plugins/git4idea/resources/messages/GitBundle.properties index 7e5929aac708..5da315e15722 100644 --- a/plugins/git4idea/resources/messages/GitBundle.properties +++ b/plugins/git4idea/resources/messages/GitBundle.properties @@ -1,11 +1,9 @@ add.action.name=Add add.adding=Adding files... -annotate.action.name=Annotate apply.conflict.dialog.description.label.text=Conflicts during {0} of commit {1} made by {2}{3} changes.retrieving=Retrieving Changes for Revision {0} -checking.out=Checkout {0} commit.action.commit.and.rebase.text=Commit and Rebase... commit.action.name=Comm&it commit.author.diffs=Author differs from default @@ -64,19 +62,12 @@ init.warning.title=Git Init initializing.title=Initializing repository... merge.action.name=Merge merge.action.operation.failed=Git {0} failed -merge.add.log.information.tooltip=Add log information to the commit message (\"--log\" option) -merge.add.log.information=Add &log information -merge.branch.button=Merge merge.branch.title=Merge Changes merge.branch.into.current.title=Merge into {0} merge.branch.loading.branches.progress=Loading unmerged branches\u2026 -merge.branches.tooltip=The chooser for branches. Select one or more branches to merge (already merged branches are not shown). merge.no.branch.selected.error=The merge branch should be selected. merge.no.matching.branch.error=There is no matching branch. -merge.nothing.to.merge.error=There is no branch to merge. merge.branches=&Branches to merge: -merge.commit.message.tooltip=The message for the merge commit in case one is created (\"-m\" option). -merge.commit.message=Commit &Message merge.commit.message.label=Commit message: merge.default.strategy= merge.options.modify=Modify options @@ -89,19 +80,7 @@ merge.option.msg=Specify a message for the merge commit merge.option.no.commit=Do not commit the merge result merge.option.no.verify=Bypass the pre-merge and commit message hooks merge.branch.popup.empty.text=No branches -merge.no.commit.tooltip=Force no commit for merge (the \"--no-commit\" option) -merge.no.commit=No &commit -merge.no.fast.forward.tooltip=Disable fast forward (\"--no-ff\" option) -merge.no.fast.forward=No &fast forward -merge.retrieving.branches=Retrieving unmerged branches -merge.preparing.branches.list=Preparing a list of branches -merge.failed.title=Merge failed -merge.retrieving.branches.error=Unable to retrieve unmerged branches -merge.squash.commit=S&quash commit merge.branch.field.placeholder=Specify branch -merge.squash.tooltip=Squash all changes into the single commit (\"--squash\" option) -merge.strategy.tooltip=The merge strategy to use (\"-s\" option) -merge.strategy=&Strategy: merge.tool.column.status.deleted=Deleted merge.tool.column.status.modified=Modified merge.tool.column.theirs.status=Theirs @@ -110,11 +89,6 @@ merging.title=Merging changes to {0} paths.affected.title=Paths affected in commit {0} pull.action.name=Pull pull.button=Pull -pull.get.branches.tooltip=Get branch names from remote repository. Otherwise a locally cached information is used. -pull.getting.remote.branches=Getting Remote Branches... -pull.remote.tooltip=Registered remote name or URL. -pull.remote=Re&mote: -pull.title=Pull Changes pulling.title=Pulling changes from {0} pull.branch.not.selected.error=The branch to pull from should be selected. pull.branch.no.matching.error=There is no matching branch. @@ -122,7 +96,6 @@ pull.branch.nothing.to.pull=No branches pull.branch.no.matching.remotes=No remotes pull.branch.field.placeholder=Specify branch pull.options.modify.popup.title=Add Pull Options -pull.option.remove=Remove option pull.option.ff.only=Merge only if it can be fast-forwarded pull.option.no.ff=Create a merge commit even if it can be fast-forwarded pull.option.squash.commit=Create a single commit for all pulled changes @@ -133,7 +106,6 @@ pull.dialog.title=Pull pull.dialog.with.branch.title=Pull to {0} pull.dialog.git.root=Git Root: pull.dialog.from=From: -pull.dialog.update.tracking.info=Update local branch tracking info pull.dialog.fetch.shortcuts.hint=Press {0} to update branches operation.action.message=Multiple Git roots have unfinished {0} process, please select root to perform action on. @@ -165,8 +137,6 @@ rebase.dialog.error.branch.or.tag.not.exist=There is no such branch or tag. rebase.dialog.error.branch.not.selected=Select a branch to switch to. rebase.dialog.error.branch.invalid=Branch ''{0}'' does not exist. rebase.dialog.error.rebase.in.progress=Interactive rebase is already in progress for this Git root. -rebase.dialog.label.branch.text=&Branch: -rebase.dialog.label.from.text=&From: rebase.dialog.progress.loading.branch.info=Loading branch configuration... rebase.dialog.progress.loading.tags=Loading tags\u2026 rebase.dialog.start.rebase=Rebase @@ -419,15 +389,10 @@ unstash.error.can.not.unstash.changes.now=Can not unstash changes now unstash.unstashed.with.conflicts.error.title=Unstashed with conflicts update.options.display.name=Git Update Settings -update.options.type.default=Branch &Default -update.options.type.merge=&Merge -update.options.type=Update Type update.notification.update.error=Can't update update.notification.choose.upstream.branch=Choose upstream branch -update.process.text=Update Project util.remote.renderer.none=None -util.remote.renderer.self=Current repository vfs.listener.add.single.prompt=Do you want to add the following file to Git?\n{0}\n\nIf you choose Cancel, you can still add it later manually. vfs.listener.add.single.title=Add File to Git vfs.listener.add.title=Add Files to Git @@ -484,7 +449,6 @@ action.CopyPathFromRepositoryRootProvider.text=Path From Repository Root action.git4idea.commands.TestGitHttpLoginDialogAction.text=Test Git Login Dialog action.Git.Log.DeepCompare.text=Not Cherry-Picked Commits action.Git.Log.DeepCompare.description=Highlights commits which have not been cherry-picked to the current branch -group.Git.RepositoryContextMenu.text=_Repository group.Git.ContextMenu.text=_Git group.Git.Menu.text=_Git group.Git.MainMenu.text=_Git