diff options
| author | Christian Kamm <christian.d.kamm@nokia.com> | 2010-10-11 14:16:33 +0200 |
|---|---|---|
| committer | Christian Kamm <christian.d.kamm@nokia.com> | 2010-10-11 14:16:33 +0200 |
| commit | b78c1ef6da940f7de362d0b2d232d6d4e7ed6cd7 (patch) | |
| tree | 82e927715756d60fec030cb7b45117f87a372323 /src/plugins/subversion | |
| parent | 5f9b05762e8a22fe5c25c8597f75972e435953cc (diff) | |
| parent | 4661e874f4a7535c12e610dbaee7c2471dda1e8d (diff) | |
| download | qt-creator-b78c1ef6da940f7de362d0b2d232d6d4e7ed6cd7.tar.gz | |
Merge remote branch 'origin/2.1'
Conflicts:
README
doc/qt-html-templates.qdocconf
doc/qtcreator.qdoc
doc/qtcreator.qdocconf
share/qtcreator/templates/wizards/qtcreatorplugin/MyPlugin.pluginspec
src/app/Info.plist
src/plugins/bineditor/BinEditor.pluginspec
src/plugins/bookmarks/Bookmarks.pluginspec
src/plugins/classview/ClassView.pluginspec
src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
src/plugins/coreplugin/Core.pluginspec
src/plugins/coreplugin/coreconstants.h
src/plugins/cpaster/CodePaster.pluginspec
src/plugins/cppeditor/CppEditor.pluginspec
src/plugins/cpptools/CppTools.pluginspec
src/plugins/cvs/CVS.pluginspec
src/plugins/debugger/Debugger.pluginspec
src/plugins/debugger/breakhandler.cpp
src/plugins/designer/Designer.pluginspec
src/plugins/fakevim/FakeVim.pluginspec
src/plugins/find/Find.pluginspec
src/plugins/genericprojectmanager/GenericProjectManager.pluginspec
src/plugins/git/ScmGit.pluginspec
src/plugins/helloworld/HelloWorld.pluginspec
src/plugins/help/Help.pluginspec
src/plugins/imageviewer/ImageViewer.pluginspec
src/plugins/locator/Locator.pluginspec
src/plugins/mercurial/Mercurial.pluginspec
src/plugins/perforce/Perforce.pluginspec
src/plugins/projectexplorer/ProjectExplorer.pluginspec
src/plugins/qmldesigner/QmlDesigner.pluginspec
src/plugins/qmljseditor/QmlJSEditor.pluginspec
src/plugins/qmljsinspector/QmlJSInspector.pluginspec
src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
src/plugins/regexp/RegExp.pluginspec
src/plugins/resourceeditor/ResourceEditor.pluginspec
src/plugins/snippets/Snippets.pluginspec
src/plugins/subversion/Subversion.pluginspec
src/plugins/tasklist/TaskList.pluginspec
src/plugins/texteditor/TextEditor.pluginspec
src/plugins/vcsbase/VCSBase.pluginspec
src/plugins/welcome/Welcome.pluginspec
tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp
tests/manual/fakevim/fakevim.pro
tests/manual/ssh/errorhandling/main.cpp
Diffstat (limited to 'src/plugins/subversion')
| -rw-r--r-- | src/plugins/subversion/subversionplugin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp index 5e47b9d07a..05841df112 100644 --- a/src/plugins/subversion/subversionplugin.cpp +++ b/src/plugins/subversion/subversionplugin.cpp @@ -632,7 +632,7 @@ void SubversionPlugin::revertAll() const VCSBase::VCSBasePluginState state = currentState(); QTC_ASSERT(state.hasTopLevel(), return) const QString title = tr("Revert repository"); - if (QMessageBox::warning(0, title, tr("Would you like to revert all changes to the repository?"), + if (QMessageBox::warning(0, title, tr("Revert all pending changes to the repository?"), QMessageBox::Yes, QMessageBox::No) == QMessageBox::No) return; // NoteL: Svn "revert ." doesn not work. |