diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-08-19 22:27:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-19 21:25:05 +0000 |
| commit | 4ca751c002784c4bfd349cc5240b045b62277c80 (patch) | |
| tree | dfc17b31990e2429535609b85f6d080c4fa0d9fe /plugins/git4idea/src/git4idea/i18n/GitBundle.properties | |
| parent | 890d9a2952301682ffecaed4495f5f65c84c3642 (diff) | |
| parent | 060e58b3afea3ea39f5ba1cb5a443ca3ebda28c8 (diff) | |
| download | idea-4ca751c002784c4bfd349cc5240b045b62277c80.tar.gz | |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'plugins/git4idea/src/git4idea/i18n/GitBundle.properties')
| -rw-r--r-- | plugins/git4idea/src/git4idea/i18n/GitBundle.properties | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/git4idea/src/git4idea/i18n/GitBundle.properties b/plugins/git4idea/src/git4idea/i18n/GitBundle.properties index 79e7f70df250..03803fbf985c 100644 --- a/plugins/git4idea/src/git4idea/i18n/GitBundle.properties +++ b/plugins/git4idea/src/git4idea/i18n/GitBundle.properties @@ -491,9 +491,9 @@ git.executable.filechooser.description=Specify the full path to Git executable git.push.active.close=Close git.unstash.clear.confirmation.message=Remove all stashes? This cannot be undone. -git.unstash.clear.confirmation.title=Remove all stashes? +git.unstash.clear.confirmation.title=Remove All Stashes? git.unstash.drop.confirmation.message=<html>Do you want to remove {0}?<br/>"{1}"</html> -git.unstash.drop.confirmation.title=Remove stash {0}? +git.unstash.drop.confirmation.title=Remove Stash {0}? branch.delete.not_fully_merged.description=The branch <code><b>{0}</b></code> is not fully merged to the branch <code><b>{1}</b></code>.<br/>Below is the list of unmerged commits. branch.delete.not_fully_merged.description.not_on_branch=You are currently not on the branch (<code>{1}</code>). <br>\ |