fixed wrong usages of tr() like:

QString::toNumber(num) + ( num > 1 ? tr("parts") : tr("part")) or
tr("file ")+ filename +tr(" could not be loaded")
and commited scripts to find such errors

5 files changed, 9 insertions, 11 deletions

diff --git a/muse2/muse/widgets/filedialog.cpp b/muse2/muse/widgets/filedialog.cpp
index 0df0fa7f..4e3c1fb2 100644
--- a/muse2/muse/widgets/filedialog.cpp
+++ b/muse2/muse/widgets/filedialog.cpp
@@ -78,8 +78,7 @@ static bool testDirCreate(QWidget* parent, const QString& path)
       {
         if(QMessageBox::information(parent,
             QWidget::tr("MusE: get file name"),
-            QWidget::tr("The directory\n") + path
-              + QWidget::tr("\ndoes not exist.\nCreate it?"),
+            QWidget::tr("The directory\n%1\ndoes not exist.\nCreate it?").arg(path),
             QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Ok) != QMessageBox::Ok)
           return true;
         
@@ -483,7 +482,7 @@ FILE* fileOpen(QWidget* parent, QString name, const QString& ext,
             }
 
       if (strcmp(mode,"w") == 0 && overwriteWarning && info.exists()) {
-            QString s(QWidget::tr("File\n") + name + QWidget::tr("\nexists. Overwrite?"));
+            QString s(QWidget::tr("File\n%1\nexists. Overwrite?").arg(name));
             /*
             int rv = QMessageBox::warning(parent,
                QWidget::tr("MusE: write"),
@@ -516,8 +515,7 @@ FILE* fileOpen(QWidget* parent, QString name, const QString& ext,
             fp = fopen(name.toAscii().data(), mode);
             }
       if (fp == 0 && !noError) {
-            QString s(QWidget::tr("Open File\n") + name + QWidget::tr("\nfailed: ")
-               + QString(strerror(errno)));
+            QString s(QWidget::tr("Open File\n%1\nfailed: %2").arg(name).arg(strerror(errno)));
             QMessageBox::critical(parent, QWidget::tr("MusE: Open File"), s);
             return 0;
             }
diff --git a/muse2/muse/widgets/pastedialog.cpp b/muse2/muse/widgets/pastedialog.cpp
index 7c9c2248..bc031b30 100644
--- a/muse2/muse/widgets/pastedialog.cpp
+++ b/muse2/muse/widgets/pastedialog.cpp
@@ -85,9 +85,9 @@ QString PasteDialog::ticks_to_quarter_string(int ticks)
 		double quarters = (double) ticks/config.division;
 		bool one = ( quarters > 0.995 && quarters < 1.005 );
 		if (one)
-			return QString::number(quarters, 'f', 2) + " " + tr("quarter");
+			return tr("%1 quarter", "for floating-point arguments like 1.5").arg(quarters, 0, 'f', 2);
 		else
-			return QString::number(quarters, 'f', 2) + " " + tr("quarters");
+			return tr("%1 quarters", "for floating-point arguments like 1.5").arg(quarters, 0, 'f', 2);
 	}
 }
 
diff --git a/muse2/muse/widgets/pasteeventsdialog.cpp b/muse2/muse/widgets/pasteeventsdialog.cpp
index 04b7cbd7..e8436711 100644
--- a/muse2/muse/widgets/pasteeventsdialog.cpp
+++ b/muse2/muse/widgets/pasteeventsdialog.cpp
@@ -99,9 +99,9 @@ QString PasteEventsDialog::ticks_to_quarter_string(int ticks)
 		double quarters = (double) ticks/config.division;
 		bool one = ( quarters > 0.995 && quarters < 1.005 );
 		if (one)
-			return QString::number(quarters, 'f', 2) + " " + tr("quarter");
+			return tr("%1 quarter", "for floating-point arguments like 1.5").arg(quarters, 0, 'f', 2);
 		else
-			return QString::number(quarters, 'f', 2) + " " + tr("quarters");
+			return tr("%1 quarters", "for floating-point arguments like 1.5").arg(quarters, 0, 'f', 2);
 	}
 }
 
diff --git a/muse2/muse/widgets/routepopup.cpp b/muse2/muse/widgets/routepopup.cpp
index ec3f3ea0..0336f8ed 100644
--- a/muse2/muse/widgets/routepopup.cpp
+++ b/muse2/muse/widgets/routepopup.cpp
@@ -1152,7 +1152,7 @@ void RoutePopupMenu::prepare()
           continue;
         
         PopupMenu* subp = new PopupMenu(morep, true);
-        subp->setTitle(QString("%1:").arg(i) + tr("<none>")); 
+        subp->setTitle(QString("%1:%2").arg(i).arg(tr("<none>"))); 
         
         // MusE-2: Check this - needed with QMenu? Help says no. No - verified, it actually causes double triggers!
         //connect(subp, SIGNAL(triggered(QAction*)), pup, SIGNAL(triggered(QAction*)));
diff --git a/muse2/muse/widgets/shortcutcapturedialog.cpp b/muse2/muse/widgets/shortcutcapturedialog.cpp
index a470d698..26526f1e 100644
--- a/muse2/muse/widgets/shortcutcapturedialog.cpp
+++ b/muse2/muse/widgets/shortcutcapturedialog.cpp
@@ -105,7 +105,7 @@ void ShortcutCaptureDialog::keyPressEvent(QKeyEvent* e)
                       (( shortcuts[i].type  & (shortcuts[shortcutindex].type | INVIS_SHRT)) ||
                          shortcuts[i].type & GLOBAL_SHRT ||
                          shortcuts[shortcutindex].type & GLOBAL_SHRT)) { // affect the same scope
-                      msgString = tr("Shortcut conflicts with ") + QString(shortcuts[i].descr);
+                      msgString = tr("Shortcut conflicts with %1").arg(shortcuts[i].descr);
                       conflict = true;
                       break;
                       }