merge
authorunc0rr
Mon, 22 Aug 2011 17:46:16 +0400
changeset 5649 60d8ce82fa85
parent 5645 b434ba5d064e (current diff)
parent 5648 e61e36bb22a8 (diff)
child 5650 cda8ca932708
merge
--- a/QTfrontend/about.cpp	Mon Aug 22 17:44:30 2011 +0400
+++ b/QTfrontend/about.cpp	Mon Aug 22 17:46:16 2011 +0400
@@ -26,17 +26,17 @@
   QWidget(parent)
 {
     QGridLayout *mainLayout = new QGridLayout(this);
-        QLabel *imageLabel = new QLabel;
-        QImage image(":/res/Hedgehog.png");
-
-        imageLabel->setPixmap(QPixmap::fromImage(image));
-        imageLabel->setScaledContents(true);
 
-        imageLabel->setMinimumWidth(2.8);
-        imageLabel->setMaximumWidth(280);
-        imageLabel->setMinimumHeight(30);
-        imageLabel->setMaximumHeight(300);
-        mainLayout->addWidget(imageLabel, 0, 0, 2, 1);
+    QLabel *imageLabel = new QLabel;
+    QImage image(":/res/Hedgehog.png");
+    imageLabel->setPixmap(QPixmap::fromImage(image));
+    imageLabel->setScaledContents(true);
+    imageLabel->setMinimumWidth(2.8);
+    imageLabel->setMaximumWidth(280);
+    imageLabel->setMinimumHeight(30);
+    imageLabel->setMaximumHeight(300);
+
+    mainLayout->addWidget(imageLabel, 0, 0, 2, 1);
 
     QLabel *lbl1 = new QLabel(this);
 
@@ -80,6 +80,7 @@
             "Maze maps: Henning K&uuml;hn &lt;<a href=\"mailto:prg@cooco.de\">prg@cooco.de</a>&gt;<br>"
             "Engine and frontend improvements: Henrik Rostedt &lt;<a href=\"mailto:henrik.rostedt@gmail.com\">henrik.rostedt@gmail.com</a>&gt;<br>"
             "Lua game modes and missions: John Lambert &lt;<a href=\"mailto:redgrinner@gmail.com\">redgrinner@gmail.com</a>&gt;<br>"
+            "Frontend improvements: Mayur Pawashe &lt;<a href=\"mailto:zorgiepoo@gmail.com\">zorgiepoo@gmail.com</a>&gt;<br>"
             "Android port: Richard Deurwaarder &lt;<a href=\"mailto:xeli@xelification.com\">xeli@xelification.com</a>&gt;<br>"
             "</p><h2>" +
 
--- a/QTfrontend/pagemain.cpp	Mon Aug 22 17:44:30 2011 +0400
+++ b/QTfrontend/pagemain.cpp	Mon Aug 22 17:46:16 2011 +0400
@@ -104,14 +104,12 @@
         Tips << tr("Really want to wear a specific hat? Donate to us and receive an exclusive hat of your choice!", "Tips");
         // The following tip will require links to app store entries first.
         //Tips << tr("Want to play Hedgewars any time? Grab the Mobile version for %1 and %2.", "Tips").arg("").arg("");
+        // the ios version is located here: http://itunes.apple.com/us/app/hedgewars/id391234866
         Tips << tr("Keep your video card drivers up to date to avoid issues playing the game.", "Tips");
-        //Tips << tr("", "Tips");
-#ifndef __APPLE__
         Tips << tr("You're able to associate Hedgewars related files (savegames and demo recordings) with the game to launch them right from your favorite file or internet browser.", "Tips");
-#endif
 #ifdef _WIN32
         Tips << tr("You can find your Hedgewars configuration files under \"My Documents\\Hedgewars\". Create backups or take the files with you, but don't edit them by hand.", "Tips");
-#elif defined __APPLE__                                                                                                                     
+#elif defined __APPLE__
         Tips << tr("You can find your Hedgewars configuration files under \"Library/Application Support/Hedgewars\" in your home directory. Create backups or take the files with you, but don't edit them by hand.", "Tips");
 #else  
         Tips << tr("You can find your Hedgewars configuration files under \".hedgewars\" in your home directory. Create backups or take the files with you, but don't edit them by hand.", "Tips");
--- a/share/hedgewars/Data/Locale/ru.txt	Mon Aug 22 17:44:30 2011 +0400
+++ b/share/hedgewars/Data/Locale/ru.txt	Mon Aug 22 17:46:16 2011 +0400
@@ -72,6 +72,12 @@
 01:12=Последний раунд до потопа!
 01:13=%1 раундов до потопа!
 01:14=Приготовься, %1!
+01:15=Незначительный
+01:16=Низкий
+01:17=Нормальный
+01:18=Высокий
+01:19=Экстремальный
+01:20=%1 отскочили
 
 ; Event messages
 ; Hog (%1) died