Fixed some tr call messages to ease translation (#886)

src/AnalTask.cpp

@@ -23,7 +23,7 @@ void AnalTask::interrupt()
 
 void AnalTask::runTask()
 {
-    log(tr("Loading the file...\n"));
+    log(tr("Loading the file..."));
     openFailed = false;
 
     int perms = R_PERM_RX;
@@ -64,7 +64,7 @@ void AnalTask::runTask()
     }
 
     if (!options.pdbFile.isNull()) {
-        log(tr("Loading PDB file...\n"));
+        log(tr("Loading PDB file..."));
         Core()->loadPDB(options.pdbFile);
     }
 
@@ -73,7 +73,7 @@ void AnalTask::runTask()
     }
 
     if (!options.shellcode.isNull() && options.shellcode.size() / 2 > 0) {
-        log(tr("Loading shellcode...\n"));
+        log(tr("Loading shellcode..."));
         Core()->cmd("wx " + options.shellcode);
     }
 
@@ -86,7 +86,7 @@ void AnalTask::runTask()
     Core()->cmd("fs *");
 
     if (!options.script.isNull()) {
-        log(tr("Executing script...\n"));
+        log(tr("Executing script..."));
         Core()->loadScript(options.script);
     }
 
@@ -98,16 +98,16 @@ void AnalTask::runTask()
     Core()->setConfig("prj.simple", true);
 
     if (!options.analCmd.empty()) {
-        log(tr("Analyzing...\n"));
+        log(tr("Analyzing..."));
         for (QString cmd : options.analCmd) {
             if (isInterrupted()) {
                 return;
             }
-            log("  " + tr("Running") + " " + cmd + "\n");
+            log("  " + tr("Running") + " " + cmd);
             Core()->cmd(cmd);
         }
-        log(tr("Analysis complete!\n"));
+        log(tr("Analysis complete!"));
     } else {
-        log(tr("Skipping Analysis.\n"));
+        log(tr("Skipping Analysis."));
     }
 }

src/MainWindow.cpp

@@ -959,7 +959,7 @@ void MainWindow::on_actionExport_as_code_triggered()
 
 void MainWindow::projectSaved(const QString &name)
 {
-    core->message(tr("Project saved: ") + name);
+    core->message(tr("Project saved:") + " " + name);
 }
 
 void MainWindow::changeDebugView()

src/common/AsyncTask.cpp

@@ -60,7 +60,7 @@ void AsyncTask::run()
 
 void AsyncTask::log(QString s)
 {
-    logBuffer += s;
+    logBuffer += s + "\n";
     emit logChanged(logBuffer);
 }
 

src/dialogs/AboutDialog.cpp

@@ -23,30 +23,30 @@ AboutDialog::AboutDialog(QWidget *parent) :
     setWindowFlags(windowFlags() & (~Qt::WindowContextHelpButtonHint));
     ui->logoSvgWidget->load(Config()->getLogoFile());
 
-    ui->label->setText(tr("<h1>Cutter</h1>"
+    QString aboutString("<h1>Cutter</h1>"
-                          "Version " CUTTER_VERSION_FULL "<br/>"
+                          + tr("Version") + " " CUTTER_VERSION_FULL "<br/>"
-                          "Using r2-" R2_GITTAP
+                          + tr("Using r2-") + R2_GITTAP
-                          "<p><b>Optional Features:</b><br/>"
+                          + "<p><b>" + tr("Optional Features:") + "</b><br/>"
-                          "Jupyter: %1<br/>"
+                          + QString("Jupyter: %1<br/>").arg(
-                          "QtWebEngine: %2</p>"
-                          "<h2>License</h2>"
-                          "This Software is released under the GNU General Public License v3.0"
-                          "<h2>Authors</h2>"
-                          "xarkes, thestr4ng3r, ballessay<br/>"
-                          "Based on work by Hugo Teso &lt;hugo.teso@gmail.org&gt; (originally Iaito).")
-                       .arg(
 #ifdef CUTTER_ENABLE_JUPYTER
-                           "ON"
+                          "ON"
 #else
-                           "OFF"
+                          "OFF"
 #endif
-                           ,
+                           )
+                          + QString("QtWebEngine: %2</p>").arg(
 #ifdef CUTTER_ENABLE_QTWEBENGINE
-                           "ON"
+                          "ON"
 #else
-                           "OFF"
+                          "OFF"
 #endif
-                       ));
+                           )
+                          + "<h2>" + tr("License") + "</h2>"
+                          + tr("This Software is released under the GNU General Public License v3.0")
+                          + "<h2>" + tr("Authors") + "</h2>"
+                          "xarkes, thestr4ng3r, ballessay<br/>"
+                          "Based on work by Hugo Teso &lt;hugo.teso@gmail.org&gt; (originally Iaito).");
+    ui->label->setText(aboutString);
 }
 
 AboutDialog::~AboutDialog() {}
@@ -129,10 +129,10 @@ void AboutDialog::serveVersionCheckReply(QNetworkReply *reply)
         if (currVersion == CUTTER_VERSION_FULL) {
             mb.setText(tr("You have latest version and no need to update!"));
         } else {
-            mb.setText(tr("<b>Current version</b>: " CUTTER_VERSION_FULL "<br/>"
+            mb.setText("<b>" + tr("Current version:") + "</b>" CUTTER_VERSION_FULL "<br/>"
-                          "<b>Latest version</b>: %1<br/><br/>"
+                          + "<b>" + tr("Latest version:") + "</b> " + currVersion + "<br/><br/>"
-                          "For update, please check the link: <a href=\"%2\">%2</a>")
+                          + tr("For update, please check the link:")
-                       .arg(currVersion, "https://github.com/radareorg/cutter/releases"));
+                          + "<a href=\"https://github.com/radareorg/cutter/releases\">%2</a>");
         }
     }
     mb.exec();

src/widgets/VTablesWidget.cpp

@@ -59,7 +59,7 @@ QVariant VTableModel::data(const QModelIndex &index, int role) const
         case Qt::DisplayRole:
             switch (index.column()) {
             case NAME:
-                return tr("VTable ") + QString::number(index.row() + 1);
+                return tr("VTable") + " " + QString::number(index.row() + 1);
             case ADDRESS:
                 return RAddressString(vtables->at(index.row()).addr);
             }
@@ -86,6 +86,7 @@ QVariant VTableModel::headerData(int section, Qt::Orientation, int role) const
         default:
             break;
         }
+        break;
     default:
         break;
     }