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

IDEA-50604: Made the text in "Locally Modified Files Are Detected" dialog more comprehensive.

Browse Source
This commit is contained in:
Kirill Likhodedov
2010-11-15 11:45:29 +03:00
parent f937963a76
commit 15bab057de
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/i18n/GitBundle.properties
+9 -3
View File
@@ -421,11 +421,17 @@ unstash.unstashing=Unstashing...
unstash.view.tooltip=View selected stash
unstash.view=&View
unstashing.title=UnStashing changes...
update.locally.modified.files.tooltip=The list of files that are considered to be locally modified.
update.locally.modified.files.tooltip=Locally modified files.
update.locally.modified.files=&Files:
update.locally.modified.git.root=Git Root:
update.locally.modified.message=<html>The following files under this root are locally modified. The following might have happened:<ul><li>Either you have not selected, auto-stash option, and rebase process will likely fail in this case<br/>(use cancell in this case).</li><li>There is a problem with crlf conversion (use revert in this case)</li><li>{0} managed to save a configuration file (use revert in this case).</html>
update.locally.modified.rescan.tooltip=<html>Rescan directory to check if there are still locally modified files.<br/>Use this button if you have resolved problem manually.</html>
update.locally.modified.message=<html><p>The following files under this root are locally modified. <br/>\
Possible reasons: uncommitted changes; a problem with crlf conversion; {0} configuration file auto-save.</p>\
<p><ul>\
<li>Press <b>Revert Files</b> to discard these local changes and continue the update process.</li>\
<li>Press <b>Cancel</b> to cancel the update process. <br/> Use Auto-Stash option to stash local changes before update and restore them after it.</li>\
</ul></p> \
</html>
update.locally.modified.rescan.tooltip=<html>Rescan the repository to check for locally modified files again.<br/>Use this button if you have resolved the problem manually.</html>
update.locally.modified.rescan=Re&scan
update.locally.modified.revert=Revert Files
update.locally.modified.title=Locally modified files are detected