feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

tr()-Fixes for ReadOnlyFilesDialog.

Browse Source 
Fix contexts, remove exclamation mark.

Change-Id: Icfd698e10d7e9e8c949919a102c7a482f007f91a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
Friedemann Kleint
2013-04-15 13:43:16 +02:00
parent d684c6779d
commit d1bf51161d
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp
View File

@@ -92,10 +92,10 @@ ReadOnlyFilesDialogPrivate::ReadOnlyFilesDialogPrivate(IDocument *document, bool
, useVCS(false) , useVCS(false)
, showWarnings(false) , showWarnings(false)
, document(document) , document(document)
, mixedText(QApplication::translate("ReadOnlyFilesDialog", "Mixed")) , mixedText(ReadOnlyFilesDialog::tr("Mixed"))
, makeWritableText(QApplication::translate("ReadOnlyFilesDialog", "Make Writable")) , makeWritableText(ReadOnlyFilesDialog::tr("Make Writable"))
, versionControlOpenText(QApplication::translate("ReadOnlyFilesDialog", "Open With VCS")) , versionControlOpenText(ReadOnlyFilesDialog::tr("Open With VCS"))
, saveAsText(QApplication::translate("ReadOnlyFilesDialog", "Save As")) , saveAsText(ReadOnlyFilesDialog::tr("Save As"))
{} {}
ReadOnlyFilesDialogPrivate::~ReadOnlyFilesDialogPrivate() ReadOnlyFilesDialogPrivate::~ReadOnlyFilesDialogPrivate()
@@ -220,12 +220,12 @@ void ReadOnlyFilesDialog::promptFailWarning(const QStringList &files, ReadOnlyRe
message += d->failWarning; message += d->failWarning;
break; break;
default: default:
title = tr("Canceled Changing Permissions!"); title = tr("Canceled Changing Permissions");
message = d->failWarning; message = d->failWarning;
break; break;
} }
} else { } else {
title = tr("Could Not Change Permissions On Some Files!"); title = tr("Could Not Change Permissions On Some Files");
message = d->failWarning; message = d->failWarning;
message += tr("\nSee details for a complete list of files."); message += tr("\nSee details for a complete list of files.");
details = files.join(QLatin1String("\n")); details = files.join(QLatin1String("\n"));

3
src/plugins/coreplugin/documentmanager.cpp
View File

@@ -653,8 +653,7 @@ static QList<IDocument *> saveModifiedFilesHelper(const QList<IDocument *> &docu
} }
if (!roDocuments.isEmpty()) { if (!roDocuments.isEmpty()) {
Core::Internal::ReadOnlyFilesDialog roDialog(roDocuments, d->m_mainWindow); Core::Internal::ReadOnlyFilesDialog roDialog(roDocuments, d->m_mainWindow);
roDialog.setShowFailWarning(true, QCoreApplication::translate( roDialog.setShowFailWarning(true, DocumentManager::tr(
"saveModifiedFilesHelper",
"Could not save the files.", "Could not save the files.",
"error message")); "error message"));
if (roDialog.exec() == Core::Internal::ReadOnlyFilesDialog::RO_Cancel) { if (roDialog.exec() == Core::Internal::ReadOnlyFilesDialog::RO_Cancel) {