# HG changeset patch
# User unc0rr
# Date 1153921451 0
# Node ID 6740a1c4edc9835c96d2eaa825f2f6ef611c86db
# Parent  ff213e443336cf30b7ce19ca6bd5ac1d40cf68ce
 - Fix internationalization issues
 - Full Russian translation

diff -r ff213e443336 -r 6740a1c4edc9 QTfrontend/binds.h
--- a/QTfrontend/binds.h	Wed Jul 26 12:25:48 2006 +0000
+++ b/QTfrontend/binds.h	Wed Jul 26 13:44:11 2006 +0000
@@ -35,6 +35,7 @@
 #define BINDS_H
 
 #include <QString>
+#include <QtGlobal>
 
 #define BINDS_NUMBER 24
 
@@ -48,30 +49,30 @@
 
 const BindAction cbinds[BINDS_NUMBER] =
 {
-	{"+up",	"up",	QT_TR_NOOP("up"),	false},
-	{"+left",	"left",	QT_TR_NOOP("left"),	false},
-	{"+right",	"right",	QT_TR_NOOP("right"),	false},
-	{"+down",	"down",	QT_TR_NOOP("down"),	false},
-	{"ljump",	"return",	QT_TR_NOOP("jump"),	false},
-	{"hjump",	"backspace",	QT_TR_NOOP("jump"),	false},
-	{"+attack",	"space",	QT_TR_NOOP("attack"),	false},
-	{"put",	"mousel",	QT_TR_NOOP("put"),	false},
-	{"switch",	"tab",	QT_TR_NOOP("switch"),	true},
-	{"slot 1",	"f1",	QT_TR_NOOP("slot 1"),	false},
-	{"slot 2",	"f2",	QT_TR_NOOP("slot 2"),	false},
-	{"slot 3",	"f3",	QT_TR_NOOP("slot 3"),	false},
-	{"slot 4",	"f4",	QT_TR_NOOP("slot 4"),	false},
-	{"slot 5",	"f5",	QT_TR_NOOP("slot 5"),	false},
-	{"slot 6",	"f6",	QT_TR_NOOP("slot 6"),	false},
-	{"slot 7",	"f7",	QT_TR_NOOP("slot 7"),	false},
-	{"slot 8",	"f8",	QT_TR_NOOP("slot 8"),	true},
-	{"timer 1",	"1",	QT_TR_NOOP("timer 1 sec"),	false},
-	{"timer 2",	"2",	QT_TR_NOOP("timer 2 sec"),	false},
-	{"timer 3",	"3",	QT_TR_NOOP("timer 3 sec"),	false},
-	{"timer 4",	"4",	QT_TR_NOOP("timer 4 sec"),	false},
-	{"timer 5",	"5",	QT_TR_NOOP("timer 5 sec"),	true},
-	{"capture",	"f11",	QT_TR_NOOP("capture"),	false},
-	{"quit",	"f10",	QT_TR_NOOP("quit"),	false}
+	{"+up",	"up",	QT_TRANSLATE_NOOP("binds", "up"),	false},
+	{"+left",	"left",	QT_TRANSLATE_NOOP("binds", "left"),	false},
+	{"+right",	"right",	QT_TRANSLATE_NOOP("binds", "right"),	false},
+	{"+down",	"down",	QT_TRANSLATE_NOOP("binds", "down"),	false},
+	{"ljump",	"return",	QT_TRANSLATE_NOOP("binds", "jump"),	false},
+	{"hjump",	"backspace",	QT_TRANSLATE_NOOP("binds", "jump"),	false},
+	{"+attack",	"space",	QT_TRANSLATE_NOOP("binds", "attack"),	false},
+	{"put",	"mousel",	QT_TRANSLATE_NOOP("binds", "put"),	false},
+	{"switch",	"tab",	QT_TRANSLATE_NOOP("binds", "switch"),	true},
+	{"slot 1",	"f1",	QT_TRANSLATE_NOOP("binds", "slot 1"),	false},
+	{"slot 2",	"f2",	QT_TRANSLATE_NOOP("binds", "slot 2"),	false},
+	{"slot 3",	"f3",	QT_TRANSLATE_NOOP("binds", "slot 3"),	false},
+	{"slot 4",	"f4",	QT_TRANSLATE_NOOP("binds", "slot 4"),	false},
+	{"slot 5",	"f5",	QT_TRANSLATE_NOOP("binds", "slot 5"),	false},
+	{"slot 6",	"f6",	QT_TRANSLATE_NOOP("binds", "slot 6"),	false},
+	{"slot 7",	"f7",	QT_TRANSLATE_NOOP("binds", "slot 7"),	false},
+	{"slot 8",	"f8",	QT_TRANSLATE_NOOP("binds", "slot 8"),	true},
+	{"timer 1",	"1",	QT_TRANSLATE_NOOP("binds", "timer 1 sec"),	false},
+	{"timer 2",	"2",	QT_TRANSLATE_NOOP("binds", "timer 2 sec"),	false},
+	{"timer 3",	"3",	QT_TRANSLATE_NOOP("binds", "timer 3 sec"),	false},
+	{"timer 4",	"4",	QT_TRANSLATE_NOOP("binds", "timer 4 sec"),	false},
+	{"timer 5",	"5",	QT_TRANSLATE_NOOP("binds", "timer 5 sec"),	true},
+	{"capture",	"f11",	QT_TRANSLATE_NOOP("binds", "capture"),	false},
+	{"quit",	"f10",	QT_TRANSLATE_NOOP("binds", "quit"),	false}
 };
 
 #endif // BINDS_H
diff -r ff213e443336 -r 6740a1c4edc9 QTfrontend/pages.cpp
--- a/QTfrontend/pages.cpp	Wed Jul 26 12:25:48 2006 +0000
+++ b/QTfrontend/pages.cpp	Wed Jul 26 13:44:11 2006 +0000
@@ -40,6 +40,7 @@
 #include <QToolBox>
 #include <QLineEdit>
 #include <QListWidget>
+#include <QApplication>
 
 #include "pages.h"
 #include "sdlkeys.h"
@@ -184,7 +185,7 @@
 	{
 		LBind[i] = new QLabel(BindsBox->widget(widind));
 		LBind[i]->setGeometry(QRect(10, top + 3, 70, 20));
-		LBind[i]->setText(tr(cbinds[i].name));
+		LBind[i]->setText(QApplication::translate("binds", cbinds[i].name));
 		LBind[i]->setAlignment(Qt::AlignRight);
 		CBBind[i] = new QComboBox(BindsBox->widget(widind));
 		CBBind[i]->setGeometry(QRect(90, top, 80, 20));
diff -r ff213e443336 -r 6740a1c4edc9 QTfrontend/predefteams.h
--- a/QTfrontend/predefteams.h	Wed Jul 26 12:25:48 2006 +0000
+++ b/QTfrontend/predefteams.h	Wed Jul 26 13:44:11 2006 +0000
@@ -57,19 +57,27 @@
 const PredefinedTeam pteams[PREDEFTEAMS_COUNT] =
 {
 	{
-		QT_TR_NOOP("Hedgehogs"),
-		QT_TR_NOOP("hedgehog 1"), QT_TR_NOOP("hedgehog 2"),
-		QT_TR_NOOP("hedgehog 3"), QT_TR_NOOP("hedgehog 4"),
-		QT_TR_NOOP("hedgehog 5"), QT_TR_NOOP("hedgehog 6"),
-		QT_TR_NOOP("hedgehog 7"), QT_TR_NOOP("hedgehog 8"),
+		QT_TRANSLATE_NOOP("teams", "Hedgehogs"),
+		QT_TRANSLATE_NOOP("teams", "hedgehog 1"),
+		QT_TRANSLATE_NOOP("teams", "hedgehog 2"),
+		QT_TRANSLATE_NOOP("teams", "hedgehog 3"),
+		QT_TRANSLATE_NOOP("teams", "hedgehog 4"),
+		QT_TRANSLATE_NOOP("teams", "hedgehog 5"),
+		QT_TRANSLATE_NOOP("teams", "hedgehog 6"),
+		QT_TRANSLATE_NOOP("teams", "hedgehog 7"),
+		QT_TRANSLATE_NOOP("teams", "hedgehog 8"),
 		"Simple", "Island"
 	},
 	{
-		QT_TR_NOOP("Goddess"),
-		QT_TR_NOOP("Isis"), QT_TR_NOOP("Astarte"),
-		QT_TR_NOOP("Diana"), QT_TR_NOOP("Aphrodite"),
-		QT_TR_NOOP("Hecate"), QT_TR_NOOP("Demeter"),
-		QT_TR_NOOP("Kali"), QT_TR_NOOP("Inanna"),
+		QT_TRANSLATE_NOOP("teams", "Goddess"),
+		QT_TRANSLATE_NOOP("teams", "Isis"),
+		QT_TRANSLATE_NOOP("teams", "Astarte"),
+		QT_TRANSLATE_NOOP("teams", "Diana"),
+		QT_TRANSLATE_NOOP("teams", "Aphrodite"),
+		QT_TRANSLATE_NOOP("teams", "Hecate"),
+		QT_TRANSLATE_NOOP("teams", "Demeter"),
+		QT_TRANSLATE_NOOP("teams", "Kali"),
+		QT_TRANSLATE_NOOP("teams", "Inanna"),
 		"Bone", "Island"
 	}
 };
diff -r ff213e443336 -r 6740a1c4edc9 QTfrontend/team.cpp
--- a/QTfrontend/team.cpp	Wed Jul 26 12:25:48 2006 +0000
+++ b/QTfrontend/team.cpp	Wed Jul 26 13:44:11 2006 +0000
@@ -33,6 +33,7 @@
 
 #include <QFile>
 #include <QTextStream>
+#include <QApplication>
 #include "team.h"
 #include "hwform.h"
 #include "gameuiconfig.h"
@@ -57,15 +58,15 @@
 {
 	this->config = config;
 	num %= PREDEFTEAMS_COUNT;
-	TeamName = QObject::tr(pteams[num].TeamName);
-	HHName[0] = QObject::tr(pteams[num].hh0name);
-	HHName[1] = QObject::tr(pteams[num].hh1name);
-	HHName[2] = QObject::tr(pteams[num].hh2name);
-	HHName[3] = QObject::tr(pteams[num].hh3name);
-	HHName[4] = QObject::tr(pteams[num].hh4name);
-	HHName[5] = QObject::tr(pteams[num].hh5name);
-	HHName[6] = QObject::tr(pteams[num].hh6name);
-	HHName[7] = QObject::tr(pteams[num].hh7name);
+	TeamName = QApplication::translate("teams", pteams[num].TeamName);
+	HHName[0] = QApplication::translate("teams", pteams[num].hh0name);
+	HHName[1] = QApplication::translate("teams", pteams[num].hh1name);
+	HHName[2] = QApplication::translate("teams", pteams[num].hh2name);
+	HHName[3] = QApplication::translate("teams", pteams[num].hh3name);
+	HHName[4] = QApplication::translate("teams", pteams[num].hh4name);
+	HHName[5] = QApplication::translate("teams", pteams[num].hh5name);
+	HHName[6] = QApplication::translate("teams", pteams[num].hh6name);
+	HHName[7] = QApplication::translate("teams", pteams[num].hh7name);
 	Grave = pteams[num].Grave;
 	Fort = pteams[num].Fort;
 	for(int i = 0; i < BINDS_NUMBER; i++)
diff -r ff213e443336 -r 6740a1c4edc9 QTfrontend/translations/hedgewars_ru.qm
Binary file QTfrontend/translations/hedgewars_ru.qm has changed
diff -r ff213e443336 -r 6740a1c4edc9 QTfrontend/translations/hedgewars_ru.ts
Binary file QTfrontend/translations/hedgewars_ru.ts has changed