From 57a74cbc89fa4de4cecfc6c4be05b122327d19fa Mon Sep 17 00:00:00 2001
From: Davide Pesavento <davidepesa@gmail.com>
Date: Mon, 31 Mar 2008 19:37:45 +0200
Subject: [PATCH] More translatable strings.

---
 src/gui/MainWindow.cpp          |  6 +++-
 src/gui/ui/MainWindow.ui        | 10 +++----
 src/translations/gomoku3d_en.ts | 61 +++++++++++++++++++++------------------
 src/translations/gomoku3d_it.ts | 63 ++++++++++++++++++++++-------------------
 4 files changed, 77 insertions(+), 63 deletions(-)

diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index cbe46fc..cf766fd 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -57,7 +57,10 @@ MainWindow::MainWindow() : QMainWindow(), Ui_MainWindow(*this)
     _timerDuration = 0;
 
     setupUi(this);
-    menuHelp->addAction(QWhatsThis::createAction(this));
+
+    QAction *whatsThis = QWhatsThis::createAction(this);
+    whatsThis->setText(tr("What's This?"));
+    menuHelp->addAction(whatsThis);
 
     _render = new RenderWidget(this);
     setCentralWidget(_render);
@@ -834,6 +837,7 @@ void MainWindow::saveGame()
     }
 
     QXmlStreamWriter xml(&f);
+    xml.setAutoFormatting(true);
     xml.writeStartDocument();
     xml.writeDefaultNamespace("http://www.itworks.org/GoMoku3D/SavedGame");
     xml.writeStartElement("game");
diff --git a/src/gui/ui/MainWindow.ui b/src/gui/ui/MainWindow.ui
index f3ad4ec..5609521 100644
--- a/src/gui/ui/MainWindow.ui
+++ b/src/gui/ui/MainWindow.ui
@@ -41,7 +41,7 @@
      <height>26</height>
     </rect>
    </property>
-   <widget class="QMenu" name="menuFile" >
+   <widget class="QMenu" name="menuGame" >
     <property name="title" >
      <string>Game</string>
     </property>
@@ -62,7 +62,7 @@
     <addaction name="separator" />
     <addaction name="actionQuit" />
    </widget>
-   <widget class="QMenu" name="menuPreferences" >
+   <widget class="QMenu" name="menuMoves" >
     <property name="title" >
      <string>Moves</string>
     </property>
@@ -81,8 +81,8 @@
     <addaction name="actionAbout_Qt" />
     <addaction name="separator" />
    </widget>
-   <addaction name="menuFile" />
-   <addaction name="menuPreferences" />
+   <addaction name="menuGame" />
+   <addaction name="menuMoves" />
    <addaction name="menuHelp" />
   </widget>
   <widget class="QStatusBar" name="statusbar" />
@@ -128,7 +128,7 @@
   </action>
   <action name="actionAbout" >
    <property name="text" >
-    <string>About</string>
+    <string>About GoMoku3D</string>
    </property>
   </action>
   <action name="actionTake_back_move" >
diff --git a/src/translations/gomoku3d_en.ts b/src/translations/gomoku3d_en.ts
index d469141..5234632 100644
--- a/src/translations/gomoku3d_en.ts
+++ b/src/translations/gomoku3d_en.ts
@@ -145,43 +145,43 @@ is using an incompatible protocol version.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="69"/>
+        <location filename="../gui/MainWindow.cpp" line="72"/>
         <source>Players&apos; Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="70"/>
+        <location filename="../gui/MainWindow.cpp" line="73"/>
         <source>History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="71"/>
+        <location filename="../gui/MainWindow.cpp" line="74"/>
         <source>Timer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="72"/>
+        <location filename="../gui/MainWindow.cpp" line="75"/>
         <source>Chat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="593"/>
+        <location filename="../gui/MainWindow.cpp" line="596"/>
         <source>Game Ended</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="178"/>
+        <location filename="../gui/MainWindow.cpp" line="181"/>
         <source>Timer expired:
 %1 lost the game.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="206"/>
+        <location filename="../gui/MainWindow.cpp" line="209"/>
         <source>Abandon Game?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="207"/>
+        <location filename="../gui/MainWindow.cpp" line="210"/>
         <source>If you continue, the current
 game will be lost.
 
@@ -189,65 +189,65 @@ Are you sure you want to continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="582"/>
+        <location filename="../gui/MainWindow.cpp" line="585"/>
         <source>And the winner is ...
 %1!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="593"/>
+        <location filename="../gui/MainWindow.cpp" line="596"/>
         <source>Game ended in a draw:%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="767"/>
+        <location filename="../gui/MainWindow.cpp" line="770"/>
         <source>Forbidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="767"/>
+        <location filename="../gui/MainWindow.cpp" line="770"/>
         <source>You can&apos;t go back when it&apos;s not your turn.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="771"/>
+        <location filename="../gui/MainWindow.cpp" line="774"/>
         <source>Are you sure?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="771"/>
+        <location filename="../gui/MainWindow.cpp" line="774"/>
         <source>Do you really want to bring the game in a past situation?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="977"/>
+        <location filename="../gui/MainWindow.cpp" line="980"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="816"/>
+        <location filename="../gui/MainWindow.cpp" line="819"/>
         <source>%1
 Quitting current game.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="823"/>
+        <location filename="../gui/MainWindow.cpp" line="826"/>
         <source>Save Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="895"/>
+        <location filename="../gui/MainWindow.cpp" line="898"/>
         <source>Open Saved Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="977"/>
+        <location filename="../gui/MainWindow.cpp" line="980"/>
         <source>Saved game file is corrupted.
 Cannot load game.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="981"/>
+        <location filename="../gui/MainWindow.cpp" line="984"/>
         <source>Load Settings?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -322,11 +322,6 @@ Cannot load game.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ui/MainWindow.ui" line="131"/>
-        <source>About</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../gui/ui/MainWindow.ui" line="139"/>
         <source>Undo Move</source>
         <translation type="unfinished"></translation>
@@ -387,21 +382,31 @@ Cannot load game.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="902"/>
+        <location filename="../gui/MainWindow.cpp" line="905"/>
         <source>Cannot open selected file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="917"/>
+        <location filename="../gui/MainWindow.cpp" line="920"/>
         <source>File is corrupted.
 Cannot load game.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="982"/>
+        <location filename="../gui/MainWindow.cpp" line="985"/>
         <source>Load color settings from the saved game?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/MainWindow.cpp" line="62"/>
+        <source>What&apos;s This?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/ui/MainWindow.ui" line="131"/>
+        <source>About GoMoku3D</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OnlineDialog</name>
diff --git a/src/translations/gomoku3d_it.ts b/src/translations/gomoku3d_it.ts
index a5b7780..45833be 100644
--- a/src/translations/gomoku3d_it.ts
+++ b/src/translations/gomoku3d_it.ts
@@ -151,44 +151,44 @@ usa una versione incompatibile del protocollo.</translation>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="69"/>
+        <location filename="../gui/MainWindow.cpp" line="72"/>
         <source>Players&apos; Info</source>
         <translation>Informazioni sui giocatori</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="70"/>
+        <location filename="../gui/MainWindow.cpp" line="73"/>
         <source>History</source>
         <translation>Storico delle mosse</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="71"/>
+        <location filename="../gui/MainWindow.cpp" line="74"/>
         <source>Timer</source>
         <translation>Cronometro</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="72"/>
+        <location filename="../gui/MainWindow.cpp" line="75"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="593"/>
+        <location filename="../gui/MainWindow.cpp" line="596"/>
         <source>Game Ended</source>
         <translation>Partita terminata</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="178"/>
+        <location filename="../gui/MainWindow.cpp" line="181"/>
         <source>Timer expired:
 %1 lost the game.</source>
         <translation>Tempo scaduto:
 %1 ha perso la partita.</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="206"/>
+        <location filename="../gui/MainWindow.cpp" line="209"/>
         <source>Abandon Game?</source>
         <translation>Abbandonare la partita?</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="207"/>
+        <location filename="../gui/MainWindow.cpp" line="210"/>
         <source>If you continue, the current
 game will be lost.
 
@@ -199,68 +199,68 @@ corrente verranno persi.
 Sei sicuro di voler continuare?</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="582"/>
+        <location filename="../gui/MainWindow.cpp" line="585"/>
         <source>And the winner is ...
 %1!</source>
         <translation>Il vincitore è ...
 %1!</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="593"/>
+        <location filename="../gui/MainWindow.cpp" line="596"/>
         <source>Game ended in a draw:%1</source>
         <translation>Partita terminata con un pareggio:%1</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="767"/>
+        <location filename="../gui/MainWindow.cpp" line="770"/>
         <source>Forbidden</source>
         <translation>Vietato</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="767"/>
+        <location filename="../gui/MainWindow.cpp" line="770"/>
         <source>You can&apos;t go back when it&apos;s not your turn.</source>
         <translation>Non puoi tornare indietro quando non è il tuo turno.</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="771"/>
+        <location filename="../gui/MainWindow.cpp" line="774"/>
         <source>Are you sure?</source>
         <translation>Sei sicuro?</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="771"/>
+        <location filename="../gui/MainWindow.cpp" line="774"/>
         <source>Do you really want to bring the game in a past situation?</source>
         <translation>Vuoi veramente ripristinare una situazione precedente della partita?</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="977"/>
+        <location filename="../gui/MainWindow.cpp" line="980"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="816"/>
+        <location filename="../gui/MainWindow.cpp" line="819"/>
         <source>%1
 Quitting current game.</source>
         <translation>%1
 Terminazione della partita corrente.</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="823"/>
+        <location filename="../gui/MainWindow.cpp" line="826"/>
         <source>Save Game</source>
         <translation>Salva partita</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="895"/>
+        <location filename="../gui/MainWindow.cpp" line="898"/>
         <source>Open Saved Game</source>
         <translation>Carica partita salvata</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="977"/>
+        <location filename="../gui/MainWindow.cpp" line="980"/>
         <source>Saved game file is corrupted.
 Cannot load game.</source>
         <translation>Il file della partita salvata è corrotto.
 Non è possibile caricare la partita.</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="981"/>
+        <location filename="../gui/MainWindow.cpp" line="984"/>
         <source>Load Settings?</source>
         <translation>Caricare le impostazioni?</translation>
     </message>
@@ -335,11 +335,6 @@ Non è possibile caricare la partita.</translation>
         <translation>Manuale d&apos;uso</translation>
     </message>
     <message>
-        <location filename="../gui/ui/MainWindow.ui" line="131"/>
-        <source>About</source>
-        <translation>Informazioni</translation>
-    </message>
-    <message>
         <location filename="../gui/ui/MainWindow.ui" line="139"/>
         <source>Undo Move</source>
         <translation>Annulla ultima mossa</translation>
@@ -362,7 +357,7 @@ Non è possibile caricare la partita.</translation>
     <message>
         <location filename="../gui/ui/MainWindow.ui" line="163"/>
         <source>About Qt</source>
-        <translation>Informazioni Qt</translation>
+        <translation>Informazioni su Qt</translation>
     </message>
     <message>
         <location filename="../gui/ui/MainWindow.ui" line="168"/>
@@ -400,22 +395,32 @@ Non è possibile caricare la partita.</translation>
         <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="902"/>
+        <location filename="../gui/MainWindow.cpp" line="905"/>
         <source>Cannot open selected file.</source>
         <translation>Impossibile aprire il file selezionato.</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="917"/>
+        <location filename="../gui/MainWindow.cpp" line="920"/>
         <source>File is corrupted.
 Cannot load game.</source>
         <translation>Il file è corrotto.
 Non è possibile caricare la partita.</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="982"/>
+        <location filename="../gui/MainWindow.cpp" line="985"/>
         <source>Load color settings from the saved game?</source>
         <translation>Caricare le impostazioni dei colori dalla partita salvata?</translation>
     </message>
+    <message>
+        <location filename="../gui/MainWindow.cpp" line="62"/>
+        <source>What&apos;s This?</source>
+        <translation>Che cos&apos;è?</translation>
+    </message>
+    <message>
+        <location filename="../gui/ui/MainWindow.ui" line="131"/>
+        <source>About GoMoku3D</source>
+        <translation>Informazioni su GoMoku3D</translation>
+    </message>
 </context>
 <context>
     <name>OnlineDialog</name>
-- 
2.11.4.GIT