Merge branch 'master' into release

Conflicts: Carcasum/static.h
TripleWhy · May 10, 2014 · f4ad2c1 · f4ad2c1
2 parents 7e47bd4 + 3db8dcb
commit f4ad2c1
Show file tree

Hide file tree

Showing 12 changed files with 371 additions and 142 deletions.
diff --git a/Carcasum/Carcasum.pro b/Carcasum/Carcasum.pro
@@ -139,3 +139,20 @@ QMAKE_CXXFLAGS_WARN_ON += -Wextra -Werror=switch -Werror=return-type -Werror=del
 #DEFINES += QT_FORCE_ASSERTS
 #QMAKE_CXXFLAGS_RELEASE += -g
 #QMAKE_CFLAGS_RELEASE += -g
+
+
+##This builds qm files. TODO: It also deletes them again on make clean.
+#isEmpty(QMAKE_LRELEASE) {
+#	win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe
+#	else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
+##	else:QMAKE_LRELEASE = lrelease-qt4 # Yaay, fedora!
+#}
+#updateqm.input = TRANSLATIONS
+##updateqm.output = $$OUT_PWD/${QMAKE_FILE_BASE}.qm
+##updateqm.commands = $$QMAKE_LRELEASE ${QMAKE_FILE_IN} -qm $$OUT_PWD/${QMAKE_FILE_BASE}.qm
+#updateqm.output = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.qm
+#updateqm.commands = $$QMAKE_LRELEASE ${QMAKE_FILE_IN} -qm ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.qm
+#updateqm.CONFIG += no_link
+#
+#QMAKE_EXTRA_COMPILERS += updateqm
+#PRE_TARGETDEPS += compiler_updateqm_make_all
diff --git a/Carcasum/carcasum_de.ts b/Carcasum/carcasum_de.ts
@@ -12,170 +12,246 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="gui/mainwindow.ui" line="57"/>
-        <location filename="gui/mainwindow.ui" line="301"/>
+        <location filename="gui/mainwindow.ui" line="48"/>
+        <location filename="gui/mainwindow.ui" line="281"/>
         <source>New Game</source>
         <translation>Neues Spiel</translation>
     </message>
     <message>
-        <location filename="gui/mainwindow.ui" line="67"/>
+        <location filename="gui/mainwindow.ui" line="58"/>
         <source>Color</source>
         <translation>Farbe</translation>
     </message>
     <message>
-        <location filename="gui/mainwindow.ui" line="74"/>
+        <location filename="gui/mainwindow.ui" line="65"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="gui/mainwindow.ui" line="81"/>
+        <location filename="gui/mainwindow.ui" line="72"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
-        <location filename="gui/mainwindow.ui" line="88"/>
+        <location filename="gui/mainwindow.ui" line="79"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="gui/mainwindow.ui" line="98"/>
+        <location filename="gui/mainwindow.ui" line="89"/>
         <source>More Options</source>
         <translation>Mehr Optionen</translation>
     </message>
     <message>
-        <location filename="gui/mainwindow.ui" line="108"/>
+        <location filename="gui/mainwindow.ui" line="99"/>
         <source>Load board file:</source>
         <translation>Spielfeld laden:</translation>
     </message>
     <message>
-        <location filename="gui/mainwindow.ui" line="118"/>
+        <location filename="gui/mainwindow.ui" line="109"/>
         <source>Browse...</source>
         <translation>Durchsuchen...</translation>
     </message>
     <message>
-        <location filename="gui/mainwindow.ui" line="209"/>
+        <location filename="gui/mainwindow.ui" line="191"/>
         <source>Log</source>
         <translation>Log</translation>
     </message>
     <message>
-        <location filename="gui/mainwindow.ui" line="252"/>
+        <location filename="gui/mainwindow.ui" line="225"/>
         <source>File</source>
         <translation>Datei</translation>
     </message>
     <message>
-        <location filename="gui/mainwindow.ui" line="262"/>
+        <location filename="gui/mainwindow.ui" line="235"/>
         <source>Game</source>
         <translation>Spiel</translation>
     </message>
     <message>
-        <location filename="gui/mainwindow.ui" line="288"/>
+        <location filename="gui/mainwindow.ui" line="243"/>
+        <source>Help</source>
+        <translation>Hilfe</translation>
+    </message>
+    <message>
+        <location filename="gui/mainwindow.ui" line="268"/>
         <source>Random Tiles</source>
         <translation>Zufällige Landschaftskarten</translation>
     </message>
     <message>
-        <location filename="gui/mainwindow.ui" line="296"/>
+        <location filename="gui/mainwindow.ui" line="276"/>
         <source>Choose Tiles</source>
         <translation>Landschaftskarten auswählen</translation>
     </message>
     <message>
-        <location filename="gui/mainwindow.ui" line="306"/>
+        <location filename="gui/mainwindow.ui" line="286"/>
         <source>Store board...</source>
         <translation>Spielfeld speichern...</translation>
     </message>
     <message>
-        <location filename="gui/mainwindow.ui" line="311"/>
+        <location filename="gui/mainwindow.ui" line="291"/>
         <source>Exit</source>
         <translation>Beenden</translation>
     </message>
     <message>
-        <location filename="gui/mainwindow.cpp" line="51"/>
+        <location filename="gui/mainwindow.ui" line="296"/>
+        <location filename="gui/mainwindow.cpp" line="538"/>
+        <source>Controls</source>
+        <translation>Steuerung</translation>
+    </message>
+    <message>
+        <location filename="gui/mainwindow.cpp" line="53"/>
         <source>Player</source>
         <translation>Spieler</translation>
     </message>
     <message>
-        <location filename="gui/mainwindow.cpp" line="51"/>
+        <location filename="gui/mainwindow.cpp" line="53"/>
         <source>Computer</source>
         <translation>Computer</translation>
     </message>
     <message>
-        <location filename="gui/mainwindow.cpp" line="114"/>
+        <location filename="gui/mainwindow.cpp" line="117"/>
         <source>Player %1</source>
         <translation>Spieler %1</translation>
     </message>
     <message>
-        <location filename="gui/mainwindow.cpp" line="123"/>
+        <location filename="gui/mainwindow.cpp" line="127"/>
         <source>New game started</source>
         <translation>Neues Spiel beginnt</translation>
     </message>
     <message>
-        <location filename="gui/mainwindow.cpp" line="160"/>
+        <location filename="gui/mainwindow.cpp" line="164"/>
         <source>A non-suitable tile was drawn and discarded.</source>
         <oldsource>An impossible tile was drawn and discarded.</oldsource>
         <translation>Eine nicht-passende Landschaftskarte wurde gezogen aus dem Spiel genommen.</translation>
     </message>
     <message>
-        <location filename="gui/mainwindow.cpp" line="162"/>
+        <location filename="gui/mainwindow.cpp" line="166"/>
         <source>Player %1 moved.</source>
         <translation>Spieler %1 hat gezogen.</translation>
     </message>
     <message>
-        <location filename="gui/mainwindow.cpp" line="214"/>
+        <location filename="gui/mainwindow.cpp" line="218"/>
         <source>Game ended.</source>
         <translation>Spiel beendet.</translation>
     </message>
     <message>
-        <location filename="gui/mainwindow.cpp" line="258"/>
+        <location filename="gui/mainwindow.cpp" line="262"/>
         <source>Field</source>
         <translation>Wiese</translation>
     </message>
     <message>
-        <location filename="gui/mainwindow.cpp" line="261"/>
+        <location filename="gui/mainwindow.cpp" line="265"/>
         <source>City</source>
         <translation>Stadt</translation>
     </message>
     <message>
-        <location filename="gui/mainwindow.cpp" line="264"/>
+        <location filename="gui/mainwindow.cpp" line="268"/>
         <source>Road</source>
         <translation>Straße</translation>
     </message>
     <message>
-        <location filename="gui/mainwindow.cpp" line="267"/>
+        <location filename="gui/mainwindow.cpp" line="271"/>
         <source>Cloister</source>
         <translation>Kloster</translation>
     </message>
     <message>
-        <location filename="gui/mainwindow.cpp" line="271"/>
+        <location filename="gui/mainwindow.cpp" line="275"/>
         <source>[Unknown]</source>
         <translation>[Unbekannt]</translation>
     </message>
     <message numerus="yes">
-        <location filename="gui/mainwindow.cpp" line="275"/>
+        <location filename="gui/mainwindow.cpp" line="279"/>
         <source>%1 scored %n point(s) for players: %2</source>
         <translation>
             <numerusform>%1 bringt %n Punkt für Spieler %2</numerusform>
             <numerusform>%1 bringt %n Punkte für Spieler %2</numerusform>
         </translation>
     </message>
     <message>
-        <location filename="gui/mainwindow.cpp" line="499"/>
+        <location filename="gui/mainwindow.cpp" line="525"/>
         <source>Save Board</source>
         <translation>Spielfeld speichern</translation>
     </message>
     <message>
-        <location filename="gui/mainwindow.cpp" line="506"/>
+        <location filename="gui/mainwindow.cpp" line="532"/>
         <source>Board File</source>
         <translation>Spielfeld laden</translation>
     </message>
+    <message>
+        <location filename="gui/mainwindow.cpp" line="539"/>
+        <source>Game Controls
+
+Place tile: left mouse button
+Rotate tile: right mouse button
+
+Place meeple: left mouse button
+Place no meeple: right mouse button
+
+Move board: middle mouse button
+Zoom: mouse wheel</source>
+        <oldsource>Game Controls
+
+Place tile: left mouse button
+Rotate tile: right mouse button
+
+Place meeple: left mouse button
+Place no meeple: right mouse button
+
+Move board: middle mouse button
+Zoom: mouse wheel
+
+</oldsource>
+        <translation>Spielsteuerung
+
+Landschaftskarte legen: linke Maustaste
+Landschaftskarte drehen: rechte Maustaste
+
+Meeple setzen: linke Maustaste
+Keinen Meeple setzen: rechte Maustaste
+
+Spielfeld bewegen: mittlere Maustaste
+Zoom: Mausrad</translation>
+    </message>
+    <message>
+        <location filename="gui/mainwindow.h" line="57"/>
+        <source>Red</source>
+        <translation>Rot</translation>
+    </message>
+    <message>
+        <location filename="gui/mainwindow.h" line="57"/>
+        <source>Blue</source>
+        <translation>Blau</translation>
+    </message>
+    <message>
+        <location filename="gui/mainwindow.h" line="57"/>
+        <source>Yellow</source>
+        <translation>Gelb</translation>
+    </message>
+    <message>
+        <location filename="gui/mainwindow.h" line="57"/>
+        <source>Green</source>
+        <translation>Grün</translation>
+    </message>
+    <message>
+        <location filename="gui/mainwindow.h" line="57"/>
+        <source>Black</source>
+        <translation>Schwarz</translation>
+    </message>
+    <message>
+        <location filename="gui/mainwindow.h" line="57"/>
+        <source>Gray</source>
+        <translation>Grau</translation>
+    </message>
 </context>
 <context>
     <name>PlayerInfoView</name>
     <message>
-        <location filename="gui/playerinfoview.ui" line="60"/>
+        <location filename="gui/playerinfoview.ui" line="37"/>
         <source>Points:</source>
         <translation>Punkte:</translation>
     </message>
     <message>
-        <location filename="gui/playerinfoview.ui" line="90"/>
+        <location filename="gui/playerinfoview.ui" line="67"/>
         <source>Meeples:</source>
         <translation>Meeples:</translation>
     </message>
@@ -251,12 +327,12 @@
 <context>
     <name>ZipDownload</name>
     <message>
-        <location filename="gui/main.cpp" line="43"/>
+        <location filename="gui/main.cpp" line="46"/>
         <source>Download File?</source>
         <translation>Datei herunterladen?</translation>
     </message>
     <message>
-        <location filename="gui/main.cpp" line="43"/>
+        <location filename="gui/main.cpp" line="46"/>
         <source>%1 was not found in the program directory.
 This file is needed for better looking tiles.
 Do you want me to download it for you now?</source>
@@ -265,7 +341,7 @@ Diese Datei wird benötigt, damit die Landschaftskarten schöner aussehen.
 Soll ich die Datei jetzt herunterladen?</translation>
     </message>
     <message>
-        <location filename="gui/main.cpp" line="49"/>
+        <location filename="gui/main.cpp" line="52"/>
         <source>Progress...</source>
         <translation>Fortschritt...</translation>
     </message>