MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

git4idea: Changed text for merge and rebase strategies in update option panel

Browse Source
This commit is contained in:
Constantine Plotnikov
2010-04-05 17:06:31 +04:00
parent c0cb520f99
commit 4b1849ba21
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/i18n/GitBundle.properties
+5 -5
View File
@@ -437,11 +437,11 @@ update.options.save.shelve.tooltip=Use IDEA Shelve (the files will be restored w
update.options.save.stash=Using S&tash
update.options.save.stash.tooltip=Use 'git stash' to save changes (the files will be restored when update finishes)
update.options.type.default=Branch &Default
update.options.type.default.tooltip=Use branch default update type for all updated vcs roots
update.options.type.merge=Force &Merge
update.options.type.merge.tooltip=Force merge update strategy
update.options.type.rebase=Force &Rebase
update.options.type.rebase.tooltip=Force rebase update strategy
update.options.type.default.tooltip=Use branch default update strategy for all updated git vcs roots
update.options.type.merge=&Merge
update.options.type.merge.tooltip=Use merge update strategy for all git vcs roots
update.options.type.rebase=&Rebase
update.options.type.rebase.tooltip=Use rebase update strategy for all git vcs roots
update.options.type=Update Type
update.rebase.no.change.cancel=Cancel Update
update.rebase.no.change.retry=Retry Continue