# HG changeset patch
# User Henek
# Date 1293401923 -3600
# Node ID c224bfb5d41cd8b350d7a49e298facc5ceb193ae
# Parent  aa1da6339eb3152c58af60f397676d2520257ef0
fixed strange config on room join and untranslated "Normal" gameplay option

diff -r aa1da6339eb3 -r c224bfb5d41c QTfrontend/gamecfgwidget.cpp
--- a/QTfrontend/gamecfgwidget.cpp	Sun Dec 26 16:56:33 2010 -0500
+++ b/QTfrontend/gamecfgwidget.cpp	Sun Dec 26 23:18:43 2010 +0100
@@ -52,7 +52,7 @@
     Scripts = new QComboBox(GBoxOptions);
     GBoxOptionsLayout->addWidget(Scripts, 0, 1);
 
-    Scripts->addItem(QComboBox::tr("Normal"));
+    Scripts->addItem("Normal");
     Scripts->insertSeparator(1);
 
     for (int i = 0; i < scriptList->size(); ++i) {
@@ -383,7 +383,7 @@
 
 void GameCFGWidget::mapChanged(const QString & value)
 {
-    if(pMapContainer->getCurrentIsMission())
+    if(isEnabled() && pMapContainer->getCurrentIsMission())
     {
         Scripts->setEnabled(false);
         Scripts->setCurrentIndex(0);
@@ -458,7 +458,7 @@
 
     emit paramChanged("SCHEME", sl);
 
-    if (bindEntries->isEnabled() && bindEntries->isChecked()) {
+    if (isEnabled() && bindEntries->isEnabled() && bindEntries->isChecked()) {
         QString schemeName = GameSchemes->itemText(index);
         for (int i = 0; i < WeaponsName->count(); i++) {
              QString weapName = WeaponsName->itemText(i);
@@ -474,7 +474,7 @@
 
 void GameCFGWidget::scriptChanged(int index)
 {
-    if(index > 0)
+    if(isEnabled() && index > 0)
     {
         QString scheme = Scripts->itemData(Scripts->currentIndex()).toList()[1].toString();
         QString weapons = Scripts->itemData(Scripts->currentIndex()).toList()[2].toString();
diff -r aa1da6339eb3 -r c224bfb5d41c share/hedgewars/Data/Locale/hedgewars_ar.ts
--- a/share/hedgewars/Data/Locale/hedgewars_ar.ts	Sun Dec 26 16:56:33 2010 -0500
+++ b/share/hedgewars/Data/Locale/hedgewars_ar.ts	Sun Dec 26 23:18:43 2010 +0100
@@ -1254,10 +1254,6 @@
         <translation type="obsolete">التلقائي</translation>
     </message>
     <message>
-        <source>Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>hand drawn map...</source>
         <translation type="unfinished"></translation>
     </message>
diff -r aa1da6339eb3 -r c224bfb5d41c share/hedgewars/Data/Locale/hedgewars_bg.ts
--- a/share/hedgewars/Data/Locale/hedgewars_bg.ts	Sun Dec 26 16:56:33 2010 -0500
+++ b/share/hedgewars/Data/Locale/hedgewars_bg.ts	Sun Dec 26 23:18:43 2010 +0100
@@ -1200,10 +1200,6 @@
         <translation type="obsolete">По подразбиране</translation>
     </message>
     <message>
-        <source>Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>hand drawn map...</source>
         <translation type="unfinished"></translation>
     </message>
diff -r aa1da6339eb3 -r c224bfb5d41c share/hedgewars/Data/Locale/hedgewars_cs.ts
--- a/share/hedgewars/Data/Locale/hedgewars_cs.ts	Sun Dec 26 16:56:33 2010 -0500
+++ b/share/hedgewars/Data/Locale/hedgewars_cs.ts	Sun Dec 26 23:18:43 2010 +0100
@@ -1209,10 +1209,6 @@
         <translation type="obsolete">Základní</translation>
     </message>
     <message>
-        <source>Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>hand drawn map...</source>
         <translation type="unfinished"></translation>
     </message>
diff -r aa1da6339eb3 -r c224bfb5d41c share/hedgewars/Data/Locale/hedgewars_de.ts
--- a/share/hedgewars/Data/Locale/hedgewars_de.ts	Sun Dec 26 16:56:33 2010 -0500
+++ b/share/hedgewars/Data/Locale/hedgewars_de.ts	Sun Dec 26 23:18:43 2010 +0100
@@ -1278,10 +1278,6 @@
         <translation type="obsolete">Standard</translation>
     </message>
     <message>
-        <source>Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>hand drawn map...</source>
         <translation type="unfinished"></translation>
     </message>
diff -r aa1da6339eb3 -r c224bfb5d41c share/hedgewars/Data/Locale/hedgewars_en.ts
--- a/share/hedgewars/Data/Locale/hedgewars_en.ts	Sun Dec 26 16:56:33 2010 -0500
+++ b/share/hedgewars/Data/Locale/hedgewars_en.ts	Sun Dec 26 23:18:43 2010 +0100
@@ -1262,10 +1262,6 @@
         <translation type="obsolete">Default</translation>
     </message>
     <message>
-        <source>Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>hand drawn map...</source>
         <translation type="unfinished"></translation>
     </message>
diff -r aa1da6339eb3 -r c224bfb5d41c share/hedgewars/Data/Locale/hedgewars_es.ts
--- a/share/hedgewars/Data/Locale/hedgewars_es.ts	Sun Dec 26 16:56:33 2010 -0500
+++ b/share/hedgewars/Data/Locale/hedgewars_es.ts	Sun Dec 26 23:18:43 2010 +0100
@@ -1309,7 +1309,7 @@
     </message>
     <message>
         <source>Normal</source>
-        <translation>Normal</translation>
+        <translation type="obsolete">Normal</translation>
     </message>
     <message>
         <source>hand drawn map...</source>
diff -r aa1da6339eb3 -r c224bfb5d41c share/hedgewars/Data/Locale/hedgewars_fi.ts
--- a/share/hedgewars/Data/Locale/hedgewars_fi.ts	Sun Dec 26 16:56:33 2010 -0500
+++ b/share/hedgewars/Data/Locale/hedgewars_fi.ts	Sun Dec 26 23:18:43 2010 +0100
@@ -1300,10 +1300,6 @@
         <translation type="obsolete">Sekopäinen</translation>
     </message>
     <message>
-        <source>Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>hand drawn map...</source>
         <translation type="unfinished"></translation>
     </message>
diff -r aa1da6339eb3 -r c224bfb5d41c share/hedgewars/Data/Locale/hedgewars_fr.ts
--- a/share/hedgewars/Data/Locale/hedgewars_fr.ts	Sun Dec 26 16:56:33 2010 -0500
+++ b/share/hedgewars/Data/Locale/hedgewars_fr.ts	Sun Dec 26 23:18:43 2010 +0100
@@ -1242,10 +1242,6 @@
         <translation type="obsolete">Défaut</translation>
     </message>
     <message>
-        <source>Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>hand drawn map...</source>
         <translation type="unfinished"></translation>
     </message>
diff -r aa1da6339eb3 -r c224bfb5d41c share/hedgewars/Data/Locale/hedgewars_hu.ts
--- a/share/hedgewars/Data/Locale/hedgewars_hu.ts	Sun Dec 26 16:56:33 2010 -0500
+++ b/share/hedgewars/Data/Locale/hedgewars_hu.ts	Sun Dec 26 23:18:43 2010 +0100
@@ -1243,10 +1243,6 @@
         <translation type="obsolete">Default</translation>
     </message>
     <message>
-        <source>Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>hand drawn map...</source>
         <translation type="unfinished"></translation>
     </message>
diff -r aa1da6339eb3 -r c224bfb5d41c share/hedgewars/Data/Locale/hedgewars_it.ts
--- a/share/hedgewars/Data/Locale/hedgewars_it.ts	Sun Dec 26 16:56:33 2010 -0500
+++ b/share/hedgewars/Data/Locale/hedgewars_it.ts	Sun Dec 26 23:18:43 2010 +0100
@@ -1258,10 +1258,6 @@
         <translation type="obsolete">Default</translation>
     </message>
     <message>
-        <source>Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>hand drawn map...</source>
         <translation type="unfinished"></translation>
     </message>
diff -r aa1da6339eb3 -r c224bfb5d41c share/hedgewars/Data/Locale/hedgewars_ja.ts
--- a/share/hedgewars/Data/Locale/hedgewars_ja.ts	Sun Dec 26 16:56:33 2010 -0500
+++ b/share/hedgewars/Data/Locale/hedgewars_ja.ts	Sun Dec 26 23:18:43 2010 +0100
@@ -1191,10 +1191,6 @@
         <translation type="obsolete">デフォールト</translation>
     </message>
     <message>
-        <source>Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>hand drawn map...</source>
         <translation type="unfinished"></translation>
     </message>
diff -r aa1da6339eb3 -r c224bfb5d41c share/hedgewars/Data/Locale/hedgewars_ko.ts
--- a/share/hedgewars/Data/Locale/hedgewars_ko.ts	Sun Dec 26 16:56:33 2010 -0500
+++ b/share/hedgewars/Data/Locale/hedgewars_ko.ts	Sun Dec 26 23:18:43 2010 +0100
@@ -1179,10 +1179,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>hand drawn map...</source>
         <translation type="unfinished"></translation>
     </message>
diff -r aa1da6339eb3 -r c224bfb5d41c share/hedgewars/Data/Locale/hedgewars_nl.ts
--- a/share/hedgewars/Data/Locale/hedgewars_nl.ts	Sun Dec 26 16:56:33 2010 -0500
+++ b/share/hedgewars/Data/Locale/hedgewars_nl.ts	Sun Dec 26 23:18:43 2010 +0100
@@ -1198,10 +1198,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>hand drawn map...</source>
         <translation type="unfinished"></translation>
     </message>
diff -r aa1da6339eb3 -r c224bfb5d41c share/hedgewars/Data/Locale/hedgewars_pl.ts
--- a/share/hedgewars/Data/Locale/hedgewars_pl.ts	Sun Dec 26 16:56:33 2010 -0500
+++ b/share/hedgewars/Data/Locale/hedgewars_pl.ts	Sun Dec 26 23:18:43 2010 +0100
@@ -1350,7 +1350,7 @@
     </message>
     <message>
         <source>Normal</source>
-        <translation>Normalna</translation>
+        <translation type="obsolete">Normalna</translation>
     </message>
     <message>
         <source>hand drawn map...</source>
diff -r aa1da6339eb3 -r c224bfb5d41c share/hedgewars/Data/Locale/hedgewars_pt_BR.ts
--- a/share/hedgewars/Data/Locale/hedgewars_pt_BR.ts	Sun Dec 26 16:56:33 2010 -0500
+++ b/share/hedgewars/Data/Locale/hedgewars_pt_BR.ts	Sun Dec 26 23:18:43 2010 +0100
@@ -1360,7 +1360,7 @@
     </message>
     <message>
         <source>Normal</source>
-        <translation type="unfinished">Normal</translation>
+        <translation type="obsolete">Normal</translation>
     </message>
     <message>
         <source>hand drawn map...</source>
diff -r aa1da6339eb3 -r c224bfb5d41c share/hedgewars/Data/Locale/hedgewars_pt_PT.ts
--- a/share/hedgewars/Data/Locale/hedgewars_pt_PT.ts	Sun Dec 26 16:56:33 2010 -0500
+++ b/share/hedgewars/Data/Locale/hedgewars_pt_PT.ts	Sun Dec 26 23:18:43 2010 +0100
@@ -1272,10 +1272,6 @@
         <translation type="obsolete">Predefinido</translation>
     </message>
     <message>
-        <source>Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>hand drawn map...</source>
         <translation type="unfinished"></translation>
     </message>
diff -r aa1da6339eb3 -r c224bfb5d41c share/hedgewars/Data/Locale/hedgewars_ru.ts
--- a/share/hedgewars/Data/Locale/hedgewars_ru.ts	Sun Dec 26 16:56:33 2010 -0500
+++ b/share/hedgewars/Data/Locale/hedgewars_ru.ts	Sun Dec 26 23:18:43 2010 +0100
@@ -1273,10 +1273,6 @@
         <translation type="obsolete">По умолчанию</translation>
     </message>
     <message>
-        <source>Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>hand drawn map...</source>
         <translation type="unfinished"></translation>
     </message>
diff -r aa1da6339eb3 -r c224bfb5d41c share/hedgewars/Data/Locale/hedgewars_sk.ts
--- a/share/hedgewars/Data/Locale/hedgewars_sk.ts	Sun Dec 26 16:56:33 2010 -0500
+++ b/share/hedgewars/Data/Locale/hedgewars_sk.ts	Sun Dec 26 23:18:43 2010 +0100
@@ -1323,7 +1323,7 @@
     </message>
     <message>
         <source>Normal</source>
-        <translation>Normálna</translation>
+        <translation type="obsolete">Normálna</translation>
     </message>
     <message>
         <source>hand drawn map...</source>
diff -r aa1da6339eb3 -r c224bfb5d41c share/hedgewars/Data/Locale/hedgewars_sv.ts
--- a/share/hedgewars/Data/Locale/hedgewars_sv.ts	Sun Dec 26 16:56:33 2010 -0500
+++ b/share/hedgewars/Data/Locale/hedgewars_sv.ts	Sun Dec 26 23:18:43 2010 +0100
@@ -1301,7 +1301,7 @@
     </message>
     <message>
         <source>Normal</source>
-        <translation>Vanligt</translation>
+        <translation type="obsolete">Vanligt</translation>
     </message>
     <message>
         <source>hand drawn map...</source>
diff -r aa1da6339eb3 -r c224bfb5d41c share/hedgewars/Data/Locale/hedgewars_tr_TR.ts
--- a/share/hedgewars/Data/Locale/hedgewars_tr_TR.ts	Sun Dec 26 16:56:33 2010 -0500
+++ b/share/hedgewars/Data/Locale/hedgewars_tr_TR.ts	Sun Dec 26 23:18:43 2010 +0100
@@ -1203,10 +1203,6 @@
         <translation type="obsolete">Öntanımlı</translation>
     </message>
     <message>
-        <source>Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>hand drawn map...</source>
         <translation type="unfinished"></translation>
     </message>
diff -r aa1da6339eb3 -r c224bfb5d41c share/hedgewars/Data/Locale/hedgewars_uk.ts
--- a/share/hedgewars/Data/Locale/hedgewars_uk.ts	Sun Dec 26 16:56:33 2010 -0500
+++ b/share/hedgewars/Data/Locale/hedgewars_uk.ts	Sun Dec 26 23:18:43 2010 +0100
@@ -1273,10 +1273,6 @@
         <translation type="obsolete">За замовчуванням</translation>
     </message>
     <message>
-        <source>Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>hand drawn map...</source>
         <translation type="unfinished"></translation>
     </message>
diff -r aa1da6339eb3 -r c224bfb5d41c share/hedgewars/Data/Locale/hedgewars_zh_CN.ts
--- a/share/hedgewars/Data/Locale/hedgewars_zh_CN.ts	Sun Dec 26 16:56:33 2010 -0500
+++ b/share/hedgewars/Data/Locale/hedgewars_zh_CN.ts	Sun Dec 26 23:18:43 2010 +0100
@@ -1309,10 +1309,6 @@
         <translation type="obsolete">疯狂刺猬</translation>
     </message>
     <message>
-        <source>Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>hand drawn map...</source>
         <translation type="unfinished"></translation>
     </message>
diff -r aa1da6339eb3 -r c224bfb5d41c share/hedgewars/Data/Locale/hedgewars_zh_TW.ts
--- a/share/hedgewars/Data/Locale/hedgewars_zh_TW.ts	Sun Dec 26 16:56:33 2010 -0500
+++ b/share/hedgewars/Data/Locale/hedgewars_zh_TW.ts	Sun Dec 26 23:18:43 2010 +0100
@@ -1231,10 +1231,6 @@
         <translation type="obsolete">默認</translation>
     </message>
     <message>
-        <source>Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>hand drawn map...</source>
         <translation type="unfinished"></translation>
     </message>