mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-01-08 15:09:39 +07:00
vcs: update bundled strings - prefer 'Could not'
GitOrigin-RevId: 9998bc7370457115ce45b63a7cb312f649ef55ac
This commit is contained in:
Aleksey Pivovarov
committed by
intellij-monorepo-bot
intellij-monorepo-bot
parent
cc42fae71a
commit
b2990261c2
@@ -6,7 +6,7 @@ clone.destination.directory.browser.description=Select a parent directory for th
|
||||
clone.destination.directory.error.not.directory=Destination is not a directory
|
||||
clone.destination.directory.error.invalid=Invalid directory path
|
||||
clone.destination.directory.error.exists=The directory already exists and it is not empty
|
||||
clone.destination.directory.error.access=Couldn't create destination directory<br/>Check your access rights
|
||||
clone.destination.directory.error.access=Could not create destination directory<br/>Check your access rights
|
||||
clone.repository=Cloning repository\u2026
|
||||
clone.repository.failed=Clone failed
|
||||
clone.repository.canceled=Clone canceled
|
||||
|
||||
@@ -312,7 +312,7 @@ amend.commit.tree.node.loading=Loading amended commit\u2026
|
||||
amend.commit.load.details.task.title=Loading Commit Details
|
||||
amend.commit.load.message.task.title=Loading Commit Message
|
||||
amend.commit.load.message.error.title=Commit Message Not Loaded
|
||||
amend.commit.load.message.error.text=Couldn't load commit message of the commit to amend.
|
||||
amend.commit.load.message.error.text=Could not load commit message of the commit to amend.
|
||||
checkbox.amend=A_mend
|
||||
label.by.author=By
|
||||
label.at.date.leading=At {0}
|
||||
@@ -955,7 +955,7 @@ button.remove=Remove
|
||||
checkbox.remember.my.choice=&Remember my choice
|
||||
action.ChangesViewToolWindowPanel.text=View Options
|
||||
action.vcs.log.show.separator=Show
|
||||
notification.title.couldn.t.save.uncommitted.changes=Couldn't save uncommitted changes.
|
||||
notification.title.couldn.t.save.uncommitted.changes=Could not save uncommitted changes.
|
||||
dialog.title.ignored.files=Ignored Files
|
||||
dialog.title.unversioned.files=Unversioned Files
|
||||
button.skip=Skip
|
||||
@@ -1094,7 +1094,7 @@ changes.ignore.file=ignore file
|
||||
impl.notification.content.vcs.plugin.not.found.for.mapping.to=VCS plugin not found for mapping to : ''{0}''
|
||||
impl.progress.title.installing.plugin=Installing Plugin\u2026
|
||||
impl.notification.title.failed.to.install.plugin=Failed to Install Plugin
|
||||
impl.notification.content.could.not.find.plugin=Couldn''t find the plugin {0}
|
||||
impl.notification.content.could.not.find.plugin=Could not find the plugin {0}
|
||||
impl.notification.content.plugin.was.unbundled.needs.to.be.installed.manually=The {0} plugin was unbundled and needs to be installed manually
|
||||
impl.show.all.affected.files.for.path.at.revision.failed=Show all affected files for {0} at {1} failed
|
||||
merge.loading.merge.details=Loading merge details\u2026
|
||||
|
||||
@@ -175,7 +175,7 @@ rebase.confirmation.dialog.published.commits.title=Rebasing Published Commit
|
||||
rebase.conflict.diff.dialog.left.title=Rebasing {0} from {1}
|
||||
rebase.conflict.diff.dialog.right.simple.title=Already rebased commits
|
||||
rebase.conflict.diff.dialog.right.with.branch.title=Already rebased commits and commits from {0}
|
||||
rebase.couldnt.resolve.file=Couldn''t resolve {0}
|
||||
rebase.couldnt.resolve.file=Could not resolve {0}
|
||||
rebase.dialog.error.upstream.not.selected=Select an upstream
|
||||
rebase.dialog.error.base.not.selected=Select a new base
|
||||
rebase.dialog.error.branch.or.tag.not.exist=There is no such branch or tag
|
||||
@@ -246,7 +246,7 @@ rebase.log.drop.action.confirmation.title=Drop {0,choice,1#Commit|2#Commits}
|
||||
rebase.log.drop.action.confirmation.message=Do you want to drop {0} {0,choice,1#commit|2#commits}?
|
||||
rebase.log.drop.action.confirmation.yes=Drop
|
||||
rebase.log.drop.action.custom.text=Drop {0,choice,1#Commit|2#Commits}
|
||||
rebase.log.drop.action.failure.title=Couldn't Drop Commits
|
||||
rebase.log.drop.action.failure.title=Could not Drop Commits
|
||||
rebase.log.drop.progress.indicator.title=Dropping {0,choice,1#commit|2#commits}\u2026
|
||||
rebase.log.drop.success.notification.title=Dropped {0} {0,choice,1#commit|2#commits}
|
||||
rebase.log.drop.undo.failed.title=Undo drop failed
|
||||
@@ -259,14 +259,14 @@ rebase.log.multiple.commit.editing.action.specific.commit.root.or.merge=Commit {
|
||||
rebase.log.create.fixup.commit.action.failure.title=Cannot Create Fixup Commit
|
||||
rebase.log.create.squash.commit.action.failure.title=Cannot Create Squash Commit
|
||||
rebase.log.interactive.action.failure.title=Cannot Start Rebase
|
||||
rebase.log.reword.action.failure.title=Couldn't Edit Commit Message
|
||||
rebase.log.action.loading.commit.message.failed.message=Couldn''t load changes of {0,choice,1#commit|2#commits}
|
||||
rebase.log.reword.action.failure.title=Could not Edit Commit Message
|
||||
rebase.log.action.loading.commit.message.failed.message=Could not load changes of {0,choice,1#commit|2#commits}
|
||||
rebase.log.reword.action.notification.successful.title=Commit Message Changed
|
||||
rebase.log.reword.action.notification.undo.failed.title=Undo Commit Message Edit Failed
|
||||
rebase.log.reword.action.notification.undo.not.allowed.repository.changed.message=Repository has already been changed
|
||||
rebase.log.reword.action.notification.undo.not.allowed.title=Cannot Undo Commit Message Edit
|
||||
rebase.log.action.progress.indicator.loading.commit.message.title=Loading {0,choice,1#commit|2#commits} details\u2026
|
||||
rebase.log.squash.action.failure.title=Couldn't Squash Commits
|
||||
rebase.log.squash.action.failure.title=Could not Squash Commits
|
||||
rebase.log.squash.new.message.dialog.label=Edit message for squashed commit
|
||||
rebase.log.squash.new.message.dialog.title=Squashed Commit Message
|
||||
rebase.log.squash.progress.indicator.title=Squashing\u2026
|
||||
@@ -289,8 +289,8 @@ rebase.notification.conflict.title=Rebase stopped due to conflicts
|
||||
rebase.notification.editing.title=Rebase stopped for editing
|
||||
rebase.notification.failed.continue.title=Continue rebase failed
|
||||
rebase.notification.failed.rebase.title=Rebase failed
|
||||
rebase.notification.failed.shelf.text=Couldn't shelve local uncommitted changes:
|
||||
rebase.notification.failed.stash.text=Couldn't stash local uncommitted changes:
|
||||
rebase.notification.failed.shelf.text=Could not shelve local uncommitted changes:
|
||||
rebase.notification.failed.stash.text=Could not stash local uncommitted changes:
|
||||
rebase.notification.no.rebase.in.progress.abort.title=Cannot abort rebase
|
||||
rebase.notification.no.rebase.in.progress.continue.title=Cannot continue rebase
|
||||
rebase.notification.no.rebase.in.progress.message=No rebase in progress
|
||||
@@ -329,7 +329,7 @@ rebase.update.project.conflict.error.notification.title=Cannot continue rebase
|
||||
rebase.update.project.conflict.merge.description.label=Merge conflicts detected. Resolve them before continuing rebase.
|
||||
rebase.update.project.notification.abort.error.message=Error aborting rebase
|
||||
rebase.update.project.notification.abort.success.message=Rebase aborted
|
||||
rebase.update.project.notification.failed.message=Couldn''t proceed with rebase. {0}
|
||||
rebase.update.project.notification.failed.message=Could not proceed with rebase. {0}
|
||||
rebase.update.project.notification.failed.title=Rebase Error
|
||||
rebase.using.log.couldnt.start.error=Cannot perform the rebase because the IDE generated an invalid 'git-rebase-todo' file. Do you want to retry the rebase using Git native file generation?
|
||||
merge.update.project.generic.error.title=Cannot complete update
|
||||
@@ -366,7 +366,7 @@ save.load.conflict.dialog.diff.left.title=Your uncommitted changes
|
||||
save.load.conflict.dialog.diff.right.title=Changes from remote
|
||||
save.notification.failed.shelf.text=Tried to save uncommitted changes in shelf before {0}, but failed with an error.<br/>{1}
|
||||
save.notification.failed.stash.text=Tried to save uncommitted changes in stash before {0}, but failed with an error.<br/>{1}
|
||||
save.notification.failed.title=Couldn't save uncommitted changes
|
||||
save.notification.failed.title=Could not save uncommitted changes
|
||||
|
||||
smart.operation.dialog.north.panel.label.shelf.text=<html>Your local changes to the following files would be overwritten by {0}.<br/> {1} can shelve the changes, {0} and unshelve them after that.</html>
|
||||
smart.operation.dialog.north.panel.label.stash.text=<html>Your local changes to the following files would be overwritten by {0}.<br/> {1} can stash the changes, {0} and unstash them after that.</html>
|
||||
@@ -462,7 +462,7 @@ unstash.conflict.dialog.description.label.text=Conflicts during unstashing {0}
|
||||
unstash.conflict.diff.dialog.left.title=Local changes
|
||||
unstash.conflict.diff.dialog.right.title=Changes from stash
|
||||
unstash.dialog.remove.stash.progress.indicator.title=Removing Stash {0}\u2026
|
||||
unstash.dialog.show.stashes.error.dialog.title=Couldn't Show the List of Stashes
|
||||
unstash.dialog.show.stashes.error.dialog.title=Could not Show the List of Stashes
|
||||
unstash.dialog.stash.list.load.progress.indicator.title=Loading list of stashes\u2026
|
||||
unstash.dialog.unresolved.conflict.warning.notification.message=Unstash is not complete, you have unresolved merges in your working tree<br/><a href='resolve'>Resolve</a> conflicts.
|
||||
unstash.dialog.unresolved.conflict.warning.notification.title=Conflicts were not resolved during unstash
|
||||
@@ -478,7 +478,7 @@ unstash.view=&View
|
||||
unstash.view.dialog.title=Paths Affected by {0}
|
||||
unstash.error.can.not.unstash.changes.now=Cannot Unstash Changes Now
|
||||
unstash.unstashed.with.conflicts.error.title=Unstashed with conflicts
|
||||
stash.load.changes.error=Couldn''t load changes in root {0} in stash resolved to {1}
|
||||
stash.load.changes.error=Could not load changes in root {0} in stash resolved to {1}
|
||||
|
||||
update.options.display.name=Git Update Settings
|
||||
update.notification.update.error=Cannot update
|
||||
@@ -731,7 +731,7 @@ push.dialog.push.tags.combo.current.branch=Current Branch
|
||||
push.dialog.push.tags.combo.all=All
|
||||
push.dialog.target.panel.define.remote=Define remote
|
||||
push.dialog.target.panel.add.remote=Add Remote
|
||||
push.dialog.target.panel.couldnt.add.remote=Couldn''t add remote: {0}
|
||||
push.dialog.target.panel.couldnt.add.remote=Could not add remote: {0}
|
||||
push.dialog.target.panel.adding.remote=Adding Remote\u2026
|
||||
push.dialog.target.panel.can.t.push=Cannot push
|
||||
push.dialog.target.panel.empty.repository=Empty repository
|
||||
@@ -790,8 +790,8 @@ install.download.and.install.action=Download and Install
|
||||
install.installing.progress=Installing\u2026
|
||||
install.downloading.progress=Downloading\u2026
|
||||
install.success.message=Git has been installed
|
||||
install.general.error=Couldn't install Git
|
||||
install.mac.error.couldnt.start.command.line.tools=Couldn't start Command Line Tools installation
|
||||
install.general.error=Could not install Git
|
||||
install.mac.error.couldnt.start.command.line.tools=Could not start Command Line Tools installation
|
||||
install.mac.requesting.command.line.tools=Requesting XCode Command Line Developer Tools
|
||||
git.status.not.changed=Not Changed
|
||||
git.status.renamed=Renamed
|
||||
@@ -1021,7 +1021,7 @@ git.undo.action.description=The selected commit is not the last in the current b
|
||||
git.undo.action.select.target.changelist.title=Select Target Changelist
|
||||
git.undo.action.undoing.last.commit.process=Undoing Last Commit\u2026
|
||||
git.undo.action.refreshing.changes.process=Refreshing Changes\u2026
|
||||
git.undo.action.could.not.load.changes.of.commit=Couldn''t load changes of {0}
|
||||
git.undo.action.could.not.load.changes.of.commit=Could not load changes of {0}
|
||||
git.new.tag.dialog.title=Create New Tag On {0}
|
||||
git.new.tag.dialog.tag.name.label=Enter the name of new tag
|
||||
git.compare.with.tag.modal.progress.loading.tags=Loading Tags\u2026
|
||||
@@ -1035,7 +1035,7 @@ git.log.external.loading.process=Loading Git Log\u2026
|
||||
|
||||
git.log.cherry.picked.highlighter.select.branch.popup=Select Source Branch
|
||||
git.log.cherry.picked.highlighter.process=Comparing Branches\u2026
|
||||
git.log.cherry.picked.highlighter.error.message=Couldn''t compare with branch {0}
|
||||
git.log.cherry.picked.highlighter.error.message=Could not compare with branch {0}
|
||||
git.log.cherry.picked.highlighter.cancelled.message=Highlighting of non-picked commits in ''{0}'' has been cancelled, \
|
||||
as branch filter was changed.
|
||||
|
||||
@@ -1102,16 +1102,16 @@ git.update.skipped.repositories=Skipped {0} repositories:
|
||||
git.update.repo.was.skipped={0} was skipped ({1})
|
||||
|
||||
git.integration.created.git.repository.in=Created Git repository in {0}
|
||||
git.integration.could.not.git.init=Couldn''t git init {0}
|
||||
git.integration.could.not.git.init=Could not git init {0}
|
||||
|
||||
git.tag.could.not.create.tag=Couldn't create tag
|
||||
git.tag.could.not.create.tag=Could not create tag
|
||||
git.tag.created.tag.successfully=Created tag {0} successfully.
|
||||
|
||||
rename.branch.operation.name=rename
|
||||
git.rename.branch.rollback.successful=Rollback successful
|
||||
git.rename.branch.renamed.back.to=Renamed back to {0}
|
||||
git.rename.branch.rollback.failed=Rollback failed
|
||||
git.rename.branch.could.not.rename.from.to=Couldn''t rename {0} to {1}
|
||||
git.rename.branch.could.not.rename.from.to=Could not rename {0} to {1}
|
||||
git.rename.branch.was.renamed.to=Branch {0} was renamed to {1}
|
||||
git.rename.branch.you.may.rename.branch.back=You may rollback (rename branch back to {0}) not to let branches diverge.
|
||||
git.rename.branch.has.succeeded.for.the.following.repositories=However, rename has succeeded for the following {0,choice,1#repository|2#repositories}:
|
||||
@@ -1125,10 +1125,10 @@ update.process.error.additional.description.unfinished.rebase=Then you may <b>co
|
||||
update.process.nothing.to.update=Nothing to update
|
||||
update.process.error.notification.title=Cannot set an upstream branch
|
||||
|
||||
checkout.operation.could.not.checkout.error=Couldn''t checkout {0}
|
||||
checkout.operation.could.not.checkout.error=Could not checkout {0}
|
||||
checkout.operation.revision.not.found=Revision not found{0,choice,0#|1# in {1}}
|
||||
checkout.operation.rollback=Rollback
|
||||
checkout.operation.could.not.checkout.error.title=Couldn''t checkout {0}
|
||||
checkout.operation.could.not.checkout.error.title=Could not checkout {0}
|
||||
checkout.operation.checked.out=Checked out {0}
|
||||
checkout.operation.checked.out.new.branch.from=Checked out new branch {0} from {1}
|
||||
checkout.operation.in={0}{1,choice,0#|1# in {2}}
|
||||
@@ -1144,7 +1144,7 @@ checkout.operation.however.checkout.has.succeeded.for.the.following=However, che
|
||||
delete.branch.operation.collecting.unmerged.commits.process=Collecting unmerged commits\u2026
|
||||
delete.branch.operation.restoring.branch.process=Restoring Branch {0}\u2026
|
||||
delete.branch.operation.error.during.rollback.of.branch.deletion=Error during rollback of branch deletion
|
||||
delete.branch.operation.could.not.restore.branch.error=Couldn''t Restore {0}
|
||||
delete.branch.operation.could.not.restore.branch.error=Could not Restore {0}
|
||||
delete.branch.operation.branch.was.not.deleted.error=Branch {0} wasn''t deleted
|
||||
delete.branch.operation.deleted.branch=Deleted branch {0}
|
||||
delete.branch.operation.deleted.branch.bold=<b>Deleted Branch:</b> {0}
|
||||
@@ -1152,10 +1152,10 @@ delete.branch.operation.unmerged.commits.were.discarded=Unmerged commits were di
|
||||
delete.branch.operation.however.branch.deletion.has.succeeded.for.the.following=However, branch deletion has succeeded for the following {0,choice,1#repository|2#repositories}:
|
||||
delete.branch.operation.you.may.rollback.not.to.let.branches.diverge=You may rollback (recreate {0} in these roots) not to let branches diverge.
|
||||
|
||||
branch.operation.could.not.0.operation.name.1.reference=Couldn''t {0} {1}
|
||||
branch.operation.could.not.0.operation.name.1.reference=Could not {0} {1}
|
||||
branch.operation.in={0} (in {1})
|
||||
|
||||
checkout.new.branch.operation.could.not.create.new.branch=Couldn''t create new branch {0}
|
||||
checkout.new.branch.operation.could.not.create.new.branch=Could not create new branch {0}
|
||||
checkout.new.branch.operation.error.during.rollback=Error during rollback
|
||||
checkout.new.branch.operation.errors.during.deleting=Errors during deleting {0}:
|
||||
checkout.new.branch.operation.errors.during.checkout=Errors during checkout:
|
||||
@@ -1170,7 +1170,7 @@ delete.remote.branch.operation.deleting.process=Deleting {0}
|
||||
delete.remote.branch.operation.deleted.remote.branch=Deleted remote branch {0}
|
||||
delete.remote.branch.operation.also.deleted.local.branches=Also deleted local {0,choice,1#branch|2#branches}: {1}
|
||||
delete.remote.branch.operation.failed.to.delete.remote.branch=Failed to delete remote branch {0}
|
||||
delete.remote.branch.operation.couldn.t.find.remote.by.name=Couldn''t find remote by name: {0}
|
||||
delete.remote.branch.operation.couldn.t.find.remote.by.name=Could not find remote by name: {0}
|
||||
|
||||
delete.remote.tag.operation.deleted.tag.on.remotes=<b>Deleted Tag on {0,choice,1#Remote|2#Remotes}:</b> {1}
|
||||
delete.remote.tag.operation.tag.does.not.exist.on.remotes=<b>Tag Doesn''t Exist on {0,choice,1#Remote|2#Remotes}:</b> {1}
|
||||
@@ -1209,7 +1209,7 @@ merge.unresolved.conflicts.remaining.notification.title=Pending Unresolved confl
|
||||
merge.unresolved.conflicts.remaining.notification.body=There are pending unresolved conflicts.
|
||||
|
||||
create.branch.operation.name=create branch
|
||||
create.branch.operation.could.not.create.new.branch=Couldn''t create new branch {0}
|
||||
create.branch.operation.could.not.create.new.branch=Could not create new branch {0}
|
||||
create.branch.operation.rollback.successful=Rollback successful
|
||||
create.branch.operation.deleted.branch=Deleted {0}
|
||||
create.branch.operation.error.during.rollback=Error during rollback
|
||||
@@ -1230,15 +1230,15 @@ branch.ui.handler.delete.remote.branches.question=Delete remote {0,choice,1#bran
|
||||
branch.ui.handler.delete.tracking.local.branch.as.well=Delete tracking local branch {0} as well
|
||||
branch.ui.handler.delete.tracking.local.branches=Delete tracking local branches:
|
||||
|
||||
delete.tag.operation.could.not.restore.tag=Couldn''t Restore {0}
|
||||
delete.tag.operation.could.not.restore.tag=Could not Restore {0}
|
||||
delete.tag.operation.error.during.rollback.of.tag.deletion=Error during rollback of tag deletion
|
||||
delete.tag.operation.restored.tag=Restored tag {0}
|
||||
delete.tag.operation.rollback.successful=Rollback Successful
|
||||
delete.tag.operation.restoring.tag.process=Restoring Tag {0}\u2026
|
||||
delete.tag.operation.deleted.tag=<b>Deleted Tag:</b> {0}
|
||||
delete.tag.operation.delete.on.remote=Delete on {0,choice,1#Remote|2#Remotes}
|
||||
delete.tag.operation.could.not.find.tag=Couldn''t find tag {0}
|
||||
delete.tag.operation.could.not.find.tag.in=Couldn''t find tag in {0}
|
||||
delete.tag.operation.could.not.find.tag=Could not find tag {0}
|
||||
delete.tag.operation.could.not.find.tag.in=Could not find tag in {0}
|
||||
delete.tag.operation.tag.was.not.deleted=Tag {0} wasn''t deleted
|
||||
delete.tag.operation.however.tag.deletion.has.succeeded.for.the.following=However, tag deletion has succeeded for the following {0,choice,1#repository|2#repositories}:
|
||||
delete.tag.operation.you.may.rollback.not.to.let.tags.diverge=You may rollback (recreate {0} in these roots) not to let tags diverge.
|
||||
@@ -1266,7 +1266,7 @@ merge.dialog.customizer.filter.by.conflicted.file.checkbox=Filter by conflicted
|
||||
merge.dialog.customizer.show.details.link.label=Show Details
|
||||
merge.dialog.customizer.collecting.details.progress=Collecting Commits Details\u2026
|
||||
|
||||
branch.worker.could.not.create.tag=Couldn''t create tag {0}{1,choice,0#|1#|2# in {2}}
|
||||
branch.worker.could.not.create.tag=Could not create tag {0}{1,choice,0#|1#|2# in {2}}
|
||||
|
||||
commit.options.sign.off.commit.checkbox=Si&gn-off commit
|
||||
commit.options.sign.off.commit.message.line=Adds the following line at the end of the commit message:<br/>Signed-off by: {0}
|
||||
@@ -1274,7 +1274,7 @@ commit.options.create.extra.commit.with.file.movements=Create extra commit with
|
||||
|
||||
show.diff.between.dialog.title=Changes Between {0} and Current Working Tree
|
||||
show.diff.between.dialog.no.differences.empty.text=No differences
|
||||
show.diff.between.dialog.could.not.load.diff.with.branch.error=Couldn''t load diff with {0}: {1}
|
||||
show.diff.between.dialog.could.not.load.diff.with.branch.error=Could not load diff with {0}: {1}
|
||||
annotations.options.detect.movements.across.files=Detect Movements Across Files
|
||||
annotations.options.detect.movements.within.file=Detect Movements Within File
|
||||
annotations.options.ignore.whitespaces=Ignore Whitespaces
|
||||
@@ -1384,7 +1384,7 @@ button.set.name.and.commit=Set and Commit
|
||||
validation.warning.set.name.email.for.git=You have to specify username and email for Git
|
||||
validation.error.email.no.at=The email address must contain the '@' symbol
|
||||
label.name.email.not.defined.in.n.roots=Git user.name and user.email properties are not defined in {0,choice,1#root|2#roots}
|
||||
error.cant.set.user.name.email=Couldn't set user.name and user.email
|
||||
error.cant.set.user.name.email=Could not set user.name and user.email
|
||||
commit.check.warning.user.name.email.not.set=Git user.name and user.email are not set
|
||||
progress.setting.user.name.email=Setting Git user name\u2026
|
||||
progress.setting.config.value=Updating Git config\u2026
|
||||
@@ -1403,7 +1403,7 @@ error.commit.cant.collect.partial.changes=Cannot collect partial changes to comm
|
||||
error.commit.cant.commit.multiple.changelists=Cannot commit changes from multiple changelists at once
|
||||
error.commit.cant.commit.with.unmerged.paths=Committing is not possible because you have unmerged files.
|
||||
error.commit.cant.create.message.file=Creation of commit message file failed
|
||||
post.commit.check.load.changes.error=Couldn''t load changes in root {0} for {1}
|
||||
post.commit.check.load.changes.error=Could not load changes in root {0} for {1}
|
||||
|
||||
label.credential.store.key.http.password=Git HTTP
|
||||
error.cannot.delete.file=Cannot delete file: {0}
|
||||
@@ -1449,8 +1449,8 @@ rebasing.merge.commits.button.rebase=Rebase
|
||||
rebasing.merge.commits.button.cancel=Cancel
|
||||
progress.details.refreshing.files.for.root=Refreshing files for the root {0}
|
||||
activity.name.update=VCS Update
|
||||
notification.title.couldnt.collect.updated.files.info=Couldn't collect the updated files info
|
||||
notification.content.couldnt.collect.updated.files.info=Update of {0} was successful, but we couldn''t collect the updated changes because of an error
|
||||
notification.title.couldnt.collect.updated.files.info=Could not collect the updated files info
|
||||
notification.content.couldnt.collect.updated.files.info=Update of {0} was successful, but we could not collect the updated changes because of an error
|
||||
notification.title.update.failed=Update failed
|
||||
notification.title.can.t.update.no.current.branch=Cannot Update: No Current Branch
|
||||
notification.content.detached.state.in.root.checkout.branch=You are in the ''detached HEAD'' state, which means that you''re not on any branch{0}<br/>Checkout a branch to be able to update the project.
|
||||
|
||||
@@ -84,7 +84,7 @@ class GitBranchWorkerTest : GitPlatformTest() {
|
||||
|
||||
checkoutNewBranch("feature", TestUiHandler(project))
|
||||
|
||||
assertErrorNotification("Couldn't create new branch feature", "unknown error")
|
||||
assertErrorNotification("Could not create new branch feature", "unknown error")
|
||||
}
|
||||
|
||||
fun `test if create new branch fails with error in second repo, then we should propose to rollback`() {
|
||||
@@ -216,7 +216,7 @@ class GitBranchWorkerTest : GitPlatformTest() {
|
||||
|
||||
assertCurrentBranch("master")
|
||||
assertCurrentRevision("master")
|
||||
assertErrorNotification("Couldn't checkout unknown_ref",
|
||||
assertErrorNotification("Could not checkout unknown_ref",
|
||||
"Revision not found in community, contrib and ${project.stateStore.projectBasePath.fileName}")
|
||||
}
|
||||
|
||||
|
||||
@@ -73,7 +73,7 @@ hg4idea.revert.failed.msg=Revert failed due to uncommitted merge.<br>\
|
||||
Would you like to discard all changes for repository <it><b>{0}</b></it>?
|
||||
hg4idea.commit=Commit
|
||||
hg4idea.commit.auth.error={0} <a href=''authenticate''>Enter Password & Refresh</a>
|
||||
hg4idea.commit.cmd.execute.error=Couldn''t execute hg outgoing command for {0}
|
||||
hg4idea.commit.cmd.execute.error=Could not execute hg outgoing command for {0}
|
||||
hg4idea.commit.path.empty.error=Hg push path could not be empty.
|
||||
hg4idea.commit.merge.error=Exception during merge commit with {0}
|
||||
|
||||
@@ -182,7 +182,7 @@ hg4idea.init.already.under.hg.option.create.repo.here=Create new repository here
|
||||
hg4idea.init.created.notification.title=Mercurial repository created
|
||||
hg4idea.init.created.notification.description=Repository was created in {0}
|
||||
hg4idea.init.error.title=Error creating Mercurial repository
|
||||
hg4idea.init.error.description=Couldn''t create a Mercurial repository in {0}
|
||||
hg4idea.init.error.description=Could not create a Mercurial repository in {0}
|
||||
|
||||
hg4idea.move.progress=Moving files in the VCS\u2026
|
||||
|
||||
@@ -192,7 +192,7 @@ hg4idea.remove.multiple.title=Remove files from Mercurial
|
||||
hg4idea.remove.progress=Removing files from the VCS\u2026
|
||||
|
||||
hg4idea.rename.error=Rename failed
|
||||
hg4idea.rename.error.msg=Couldn't mark some files as renamed
|
||||
hg4idea.rename.error.msg=Could not mark some files as renamed
|
||||
hg4idea.rename.error.title=Failed to Rename
|
||||
|
||||
hg4idea.update.error.uncommittedMerge=outstanding uncommitted merge in repository {0}, not updating or merging
|
||||
@@ -203,7 +203,7 @@ hg4idea.update.warning.merge.conflicts=Merged with conflicts in repository {0}.
|
||||
hg4idea.update.warning.multipleHeadsBeforeUpdate=Multiple heads in this branch in repository {0} before the update (use \"hg heads .\" and \"hg merge\" to merge)
|
||||
hg4idea.update.progress.updating.to.pulled.head=Updating to pulled head
|
||||
hg4idea.update.progress.merging=Merging with pulled head
|
||||
hg4idea.update.unable.to.merge=Your uncommitted changes couldn't be merged into the requested changeset.<br>\
|
||||
hg4idea.update.unable.to.merge=Your uncommitted changes could not be merged into the requested changeset.<br>\
|
||||
Would you like to perform force update and discard them?
|
||||
hg4idea.update.uncommitted.problem=Uncommitted Changes Problem
|
||||
hg4idea.update.failed=Update failed
|
||||
@@ -229,7 +229,7 @@ hg4idea.progress.checking.ignored=Checking for ignoring files
|
||||
hg4idea.warning.no-default-update-path=Skipped \"{0}\". No default update path.
|
||||
hg4idea.error.log.command.execution=Error during log command execution
|
||||
hg4idea.error.debugancestor.command.execution=Error during debugancestor command execution
|
||||
hg4idea.error.debugancestor.command.description=Couldn't collect information about ancestor
|
||||
hg4idea.error.debugancestor.command.description=Could not collect information about ancestor
|
||||
|
||||
hg4idea.dialog.login.password.required=Login and password required
|
||||
hg4idea.dialog.login.description=Login to {0}
|
||||
@@ -296,21 +296,21 @@ action.hg4idea.CreateNewTag.description=Create new tag pointing to this commit
|
||||
action.hg4idea.CreateTag.error.msg=Tag creation [{0}] failed
|
||||
action.hg4idea.UpdateToRevision.text=Update to Revision
|
||||
action.hg4idea.mq.ShowUnAppliedPatches.text=Show Mq Unapplied Patches\u2026
|
||||
action.hg4idea.Rebase.error=Couldn't rebase repository.
|
||||
action.hg4idea.Rebase.error=Could not rebase repository.
|
||||
action.hg4idea.Rebase.Continue.text=Continue Rebasing
|
||||
action.hg4idea.Rebase.Continue.progress=Continue rebasing\u2026
|
||||
action.hg4idea.Rebase.Continue.error=Couldn't continue rebasing
|
||||
action.hg4idea.Rebase.Continue.error=Could not continue rebasing
|
||||
action.hg4idea.Rebase.Abort.text=Abort Rebasing
|
||||
action.hg4idea.Rebase.Abort.error=Couldn't abort rebasing
|
||||
action.hg4idea.Rebase.Abort.error=Could not abort rebasing
|
||||
action.hg4idea.Rebase.Abort.progress=Abort rebasing\u2026
|
||||
action.hg4idea.Graft.Continue.text=Continue Grafting
|
||||
action.hg4idea.Graft.Continue.progress=Continue grafting\u2026
|
||||
action.hg4idea.Graft.error=Couldn't graft.
|
||||
action.hg4idea.Graft.continue.error=Couldn't continue grafting
|
||||
action.hg4idea.Graft.error=Could not graft.
|
||||
action.hg4idea.Graft.continue.error=Could not continue grafting
|
||||
action.hg4idea.branches.text=_Branches\u2026
|
||||
action.hg4idea.CompareWithBranch.cannot.detect.commit=Couldn''t detect commit related to {0} name for {1}.
|
||||
action.hg4idea.CompareWithBranch.cannot.detect.commit=Could not detect commit related to {0} name for {1}.
|
||||
action.hg4idea.CompareWithBranch.text=Compare with Branch/Bookmark\u2026
|
||||
action.hg4idea.Commit.cant.prepare.commit.message.file=Couldn't prepare commit message
|
||||
action.hg4idea.Commit.cant.prepare.commit.message.file=Could not prepare commit message
|
||||
action.hg4idea.add.text=Add
|
||||
action.hg4idea.status.error=Could not execute hg status command
|
||||
action.Hg.Init.text=Create Mercurial Repository
|
||||
@@ -332,10 +332,10 @@ hg4idea.validation.name.no.colons=Name could not contain colons
|
||||
hg4idea.validation.name.invalid=Invalid name for hg reference
|
||||
hg4idea.validation.name.reserved=The name ''{0}'' is reserved.
|
||||
|
||||
error.history.cant.get.commit.details.log.command.error=Couldn't get commit details: log command execution error
|
||||
error.cannot.find.repository.for.file=Couldn''t find Hg repository for {0}
|
||||
error.history.cant.get.commit.details.log.command.error=Could not get commit details: log command execution error
|
||||
error.cannot.find.repository.for.file=Could not find Hg repository for {0}
|
||||
error.cannot.delete.file=Unable to delete file: {0}
|
||||
error.cannot.execute.command=Couldn't execute Mercurial command
|
||||
error.cannot.execute.command=Could not execute Mercurial command
|
||||
|
||||
hg4idea.version.unsupported=Unsupported Hg version
|
||||
hg4idea.version.update=The <a href=''{0}''>configured</a> version of Hg is not supported: {1}.<br/>\
|
||||
|
||||
@@ -509,7 +509,7 @@ compare.with.branch.progress.loading.content=Loading Content
|
||||
compare.with.branch.diff.title=Compare with Branch
|
||||
compare.with.branch.error.title=Compare with Branch
|
||||
compare.with.branch.popup.title=Compare with Branch
|
||||
compare.with.branch.location.error=Couldn''t find repository location for file ''{0}'' under branch ''{1}''\nPlease check your branch configuration.
|
||||
compare.with.branch.location.error=Could not find repository location for file ''{0}'' under branch ''{1}''\nPlease check your branch configuration.
|
||||
action.name.switch=Switch
|
||||
import.dialog.title=Import into Subversion
|
||||
import.dialog.button=Import
|
||||
|
||||
Reference in New Issue
Block a user