diff options
Diffstat (limited to 'plugins/git4idea/src/git4idea/i18n/GitBundle.properties')
| -rw-r--r-- | plugins/git4idea/src/git4idea/i18n/GitBundle.properties | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/plugins/git4idea/src/git4idea/i18n/GitBundle.properties b/plugins/git4idea/src/git4idea/i18n/GitBundle.properties index 03803fbf985c..f89657535f8a 100644 --- a/plugins/git4idea/src/git4idea/i18n/GitBundle.properties +++ b/plugins/git4idea/src/git4idea/i18n/GitBundle.properties @@ -416,20 +416,6 @@ unstash.unstashing=Unstashing... unstash.view.tooltip=View selected stash unstash.view=&View unstashing.title=UnStashing changes... -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><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 update.options.display.name=Git Update Settings update.options.no.commit=No &Commit update.options.save.before.update=Clean working tree before update |