# HG changeset patch
# User unc0rr
# Date 1402863866 -14400
# Node ID 22f541fbde3202faca1ac23a625be45d471b5434
# Parent  e338ccbbe1006151211969c7101efc5c2dfc9f9f
Revert all recent sheepluva's work

diff -r e338ccbbe100 -r 22f541fbde32 QTfrontend/game.cpp
--- a/QTfrontend/game.cpp	Sun Jun 15 13:42:34 2014 +0200
+++ b/QTfrontend/game.cpp	Mon Jun 16 00:24:26 2014 +0400
@@ -249,11 +249,12 @@
         {
             int size = msg.size();
             emit ErrorMessage(
-                QString("A Fatal ERROR occured! - The game engine had to stop.")
-                + "\n\n " + tr("We are very sorry for the inconvenience :(")
-                + "\n\n" + tr("If this keeps happening, please click the '%1' button in the main menu!")
-                .arg("Feedback") + "\n\n"
-                "Last two engine messages:\n" + QString().append(msg.mid(2)).left(size - 4));
+                tr("A Fatal ERROR occured! - The game engine had to stop.\n\n"
+                "We are very sorry for the inconvenience :(\n\n"
+                "If this keeps happening, please click the '%1' button in the main menu!\n\n"
+                "Last two engine messages:\n%2")
+                .arg("Feedback")
+                .arg(QString::fromUtf8(msg.mid(2).left(size - 4))));
             return;
         }
         case 'i':
diff -r e338ccbbe100 -r 22f541fbde32 QTfrontend/model/ammoSchemeModel.cpp
--- a/QTfrontend/model/ammoSchemeModel.cpp	Sun Jun 15 13:42:34 2014 +0200
+++ b/QTfrontend/model/ammoSchemeModel.cpp	Mon Jun 16 00:24:26 2014 +0400
@@ -700,7 +700,7 @@
     else
     {
         QList<QVariant> newScheme = schemes[row];
-        newScheme[0] = QVariant(tr("copy of") + " " + newScheme[0].toString());
+        newScheme[0] = QVariant(tr("copy of %1").arg(newScheme[0].toString()));
         schemes.insert(schemes.size(), newScheme);
     }
 
diff -r e338ccbbe100 -r 22f541fbde32 QTfrontend/net/tcpBase.cpp
--- a/QTfrontend/net/tcpBase.cpp	Sun Jun 15 13:42:34 2014 +0200
+++ b/QTfrontend/net/tcpBase.cpp	Mon Jun 16 00:24:26 2014 +0400
@@ -234,10 +234,11 @@
     {
         // inform user that something bad happened
         MessageDialog::ShowFatalMessage(
-            tr("The game engine died unexpectedly!")
-            + QString("\n(exit code %1)").arg(exitCode)
-            + "\n\n " + tr("We are very sorry for the inconvenience :(") + "\n\n" +
-            tr("If this keeps happening, please click the '%1' button in the main menu!")
+            tr("The game engine died unexpectedly!\n"
+            "(exit code %1)\n\n"
+            "We are very sorry for the inconvenience :(\n\n"
+            "If this keeps happening, please click the '%2' button in the main menu!")
+            .arg(exitCode)
             .arg("Feedback"));
 
     }
diff -r e338ccbbe100 -r 22f541fbde32 QTfrontend/ui/widget/selectWeapon.cpp
--- a/QTfrontend/ui/widget/selectWeapon.cpp	Sun Jun 15 13:42:34 2014 +0200
+++ b/QTfrontend/ui/widget/selectWeapon.cpp	Mon Jun 16 00:24:26 2014 +0400
@@ -322,12 +322,12 @@
     if(wconf->contains(curWeaponsName))
     {
         QString ammo = getWeaponsString(curWeaponsName);
-        QString newName = tr("copy of") + " " + curWeaponsName;
+        QString newName = tr("copy of %1").arg(curWeaponsName);
         if(wconf->contains(newName))
         {
             //name already used -> look for an appropriate name:
             int i=2;
-            while(wconf->contains(newName = tr("copy of") + " " + curWeaponsName+QString::number(i++))) ;
+            while(wconf->contains(newName = tr("copy of %1").arg(curWeaponsName+QString::number(i++))));
         }
         setWeaponsName(newName);
         setWeapons(ammo);