diff --git a/gui/cppcheck_de.ts b/gui/cppcheck_de.ts
index 1e8c4fcbd..d5e4650c8 100644
--- a/gui/cppcheck_de.ts
+++ b/gui/cppcheck_de.ts
@@ -182,11 +182,12 @@ Parameter: -l(line) (file)
-
-
-
-
-
+
+
+
+
+
+
Cppcheck
@@ -596,27 +597,27 @@ Do you want to proceed checking without using any of these project files?
-
+
Lizenz
-
+
Autoren
-
+
XML-Dateien Version 2 (*.xml);;XML-Dateien Version 1 (*.xml);;Textdateien (*.txt);;CSV-Dateien (*.csv)
-
+
Speichert die Berichtdatei
-
+
XML-Dateien (*.xml)
@@ -636,11 +637,18 @@ Dies wurde vermutlich durch einen Wechsel der Cppcheck-Version hervorgerufen. Bi
+
+
+
+
+
Berichtdatei öffnen
-
+
@@ -649,32 +657,32 @@ Do you want to stop the checking and exit Cppcheck?.
Möchten Sie die Prüfung abbrechen und Cppcheck beenden?
-
+
XML-Dateien Version 1 (*.xml)
-
+
XML-Dateien Version 2 (*.xml)
-
+
Textdateien (*.txt)
-
+
CSV-Dateien (*.csv)
-
+
Cppcheck - %1
-
+
-
-
+
+
Projektdateien (*.cppcheck);;Alle Dateien(*.*)
-
+
Projektdatei auswählen
-
-
+
+
Projekt:
-
+
Projektnamen auswählen
-
+
Keine Projektdatei geladen
-
+
-
-
-
-
-
+
+
+
+
+
+
Cppcheck
@@ -573,17 +574,17 @@ This is probably because the settings were changed between the Cppcheck versions
Selecciona una carpeta para comprobar
-
+
Ficheros XML(*.xml)
-
+
Abrir informe
-
+
@@ -592,22 +593,22 @@ Do you want to stop the checking and exit Cppcheck?.
¿Quieres parar la comprobación y salir del Cppcheck?.
-
+
Licencia
-
+
Autores
-
+
-
+
-
+
Guardar informe
@@ -640,59 +641,66 @@ Do you want to proceed checking without using any of these project files?
-
+
+
+
+
+
+
-
+
-
+
Ficheros de texto (*.txt)
-
+
Ficheros CVS (*.cvs)
-
+
Cppcheck - %1
-
-
+
+
Ficheros de proyecto (*.cppcheck;;Todos los ficheros (*.*)
-
+
Selecciona proyecto
-
-
+
+
Proyecto:
-
+
Selecciona el nombre del proyecto
-
+
No hay ningún proyecto cargado
-
+
-
-
-
-
-
+
+
+
+
+
+
Cppcheck
@@ -583,28 +584,28 @@ Do you want to proceed checking without using any of these project files?
-
+
Lisenssi
-
+
Tekijät
-
+
XML files (*.xml);;Text files (*.txt);;CSV files (*.csv)
XML-tiedostot (*.xml);;Tekstitiedostot (*.txt);;CSV-tiedostot (*.csv)
-
+
Tallenna raportti
-
+
XML-tiedostot (*xml)
@@ -622,43 +623,50 @@ This is probably because the settings were changed between the Cppcheck versions
+
+
+
+
+
-
+
-
+
-
+
-
+
Tekstitiedostot (*.txt)
-
+
-
+
Cppcheck - %1
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
+
-
+
+
+
+
+
Platforms
diff --git a/gui/cppcheck_ja.ts b/gui/cppcheck_ja.ts
index 447efbc81..ce7cd5750 100644
--- a/gui/cppcheck_ja.ts
+++ b/gui/cppcheck_ja.ts
@@ -170,11 +170,12 @@ Parameters: -l(line) (file)
-
-
-
-
-
+
+
+
+
+
+
Cppcheck
@@ -592,17 +593,24 @@ Do you want to proceed checking without using any of these project files?
-
+
+
+
+
+
+
XML ファイル (*.xml)
-
+
レポートを開く
-
+
@@ -611,53 +619,53 @@ Do you want to stop the checking and exit Cppcheck?.
解析を停止してCppcheckを終了しますか?.
-
+
ライセンス
-
+
作者
-
+
XML files (*.xml);;Text files (*.txt);;CSV files (*.csv)
XML ファイル (*.xml);;テキストファイル (*.txt);;CSV形式ファイル (*.csv)
-
+
レポートを保存
-
+
XMLファイルのバージョン1
-
+
XMLファイルのバージョン2
-
+
テキストファイル (*.txt)
-
+
CSV形式ファイル (*.csv)
-
+
Cppcheck - %1
-
+
-
-
+
+
プロジェクトファイル (*.cppcheck);;すべてのファイル(*.*)
-
+
プロジェクトファイルを選択
-
-
+
+
プロジェクト:
-
+
プロジェクトファイル名を選択
-
+
プロジェクトファイルが読み込まれていません
-
+
스웨덴어
+
+
+
+
Platforms
diff --git a/gui/cppcheck_nl.ts b/gui/cppcheck_nl.ts
index e4ff086f8..212187cf4 100644
--- a/gui/cppcheck_nl.ts
+++ b/gui/cppcheck_nl.ts
@@ -173,11 +173,12 @@ Parameters: -l(line) (file)
-
-
-
-
-
+
+
+
+
+
+
Cppcheck
@@ -583,28 +584,28 @@ Do you want to proceed checking without using any of these project files?
-
+
Licentie
-
+
Auteurs
-
+
XML files (*.xml);;Text files (*.txt);;CSV files (*.csv)
XML bestanden (*.xml);;Tekst bestanden (*.txt);;CSV bestanden (*.csv)
-
+
Rapport opslaan
-
+
XML bestanden (*.xml)
@@ -622,43 +623,50 @@ This is probably because the settings were changed between the Cppcheck versions
+
+
+
+
+
-
+
-
+
-
+
-
+
Tekst bestanden (*.txt)
-
+
-
+
Cppcheck - %1
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
+
-
+
-
-
-
-
-
+
+
+
+
+
+
Cppcheck
@@ -583,28 +584,28 @@ Do you want to proceed checking without using any of these project files?
-
+
Лицензия
-
+
Авторы
-
+
XML files (*.xml);;Text files (*.txt);;CSV files (*.csv)
-
+
-
+
@@ -622,43 +623,50 @@ This is probably because the settings were changed between the Cppcheck versions
+
+
+
+
+
-
+
-
+
-
+
-
+
Текстовые файлы (*.txt)
-
+
-
+
Cppcheck - %1
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
+
-
+
-
-
-
-
-
+
+
+
+
+
+
Cppcheck
@@ -581,27 +582,27 @@ Do you want to proceed checking without using any of these project files?
-
+
License
-
+
Authors
-
+
XML files (*.xml);;Text files (*.txt);;CSV files (*.csv)
-
+
Save the report file
-
+
XML files (*.xml)
@@ -619,43 +620,50 @@ This is probably because the settings were changed between the Cppcheck versions
+
+
+
+
+
-
+
-
+
-
+
-
+
Text files (*.txt)
-
+
-
+
Cppcheck - %1
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
+
-
+
@@ -594,28 +595,28 @@ Do you want to proceed checking without using any of these project files?
-
+
License
Licens
-
+
Authors
Utvecklare
-
+
XML files version 2 (*.xml);;XML files version 1 (*.xml);;Text files (*.txt);;CSV files (*.csv)
XML files (*.xml);;Text files (*.txt);;CSV files (*.csv)
XML filer version 2 (*.xml);;XML filer version 1 (*.xml);;Text filer (*.txt);;CSV filer (*.csv)
-
+
Save the report file
Spara rapport
-
+
XML files (*.xml)
XML filer (*.xml)
@@ -635,11 +636,18 @@ En trolig orsak är att inställningarna ändrats för olika Cppcheck versioner.
+ Current results will be cleared.
+
+Opening a new XML file will clear current results.Do you want to proceed?
+
+
+
+
Open the report file
Öppna rapportfilen
-
+
Checking is running.
Do you want to stop the checking and exit Cppcheck?.
@@ -648,32 +656,32 @@ Do you want to stop the checking and exit Cppcheck?.
Vill du stoppa analysen och avsluta Cppcheck?
-
+
XML files version 1 (*.xml)
XML filer version 1 (*.xml)
-
+
XML files version 2 (*.xml)
XML filer version 2 (*.xml)
-
+
Text files (*.txt)
Text filer (*.txt)
-
+
CSV files (*.csv)
CSV filer (*.csv)
-
+
Cppcheck - %1
Cppcheck - %1
-
+
Failed to change the user interface language:
%1
@@ -686,34 +694,34 @@ The user interface language has been reset to English. Open the Preferences-dial
Språket har nollställts till Engelska. Öppna Preferences och välj något av de tillgängliga språken.
-
-
+
+
Project files (*.cppcheck);;All files(*.*)
Projektfiler (*.cppcheck);;Alla filer(*.*)
-
+
Select Project File
Välj projektfil
-
-
+
+
Project:
Projekt:
-
+
Select Project Filename
Välj Projektfil
-
+
No project file loaded
Inget projekt laddat
-
+
The project file
%1
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index 1c9a061b7..1530bbad9 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -608,6 +608,23 @@ void MainWindow::ClearResults()
void MainWindow::OpenXML()
{
+ if (mUI.mResults->HasResults()) {
+ QMessageBox msgBox(this);
+ msgBox.setWindowTitle(tr("Cppcheck"));
+ const QString msg(tr("Current results will be cleared.\n\n"
+ "Opening a new XML file will clear current results."
+ "Do you want to proceed?"));
+ msgBox.setText(msg);
+ msgBox.setIcon(QMessageBox::Warning);
+ msgBox.addButton(QMessageBox::Yes);
+ msgBox.addButton(QMessageBox::No);
+ msgBox.setDefaultButton(QMessageBox::Yes);
+ int dlgResult = msgBox.exec();
+ if (dlgResult == QMessageBox::No) {
+ return;
+ }
+ }
+
QString selectedFilter;
const QString filter(tr("XML files (*.xml)"));
QString selectedFile = QFileDialog::getOpenFileName(this,
@@ -617,6 +634,7 @@ void MainWindow::OpenXML()
&selectedFilter);
if (!selectedFile.isEmpty()) {
+ mUI.mResults->Clear();
mUI.mResults->ReadErrorsXml(selectedFile);
}
}