Revert back merge error 4h ago

I nearly lost my mind
This commit is contained in:
adrienmalin
2018-08-06 23:00:06 +02:00
committed by GitHub
parent f2b5a32b35
commit a264f0cae0
15 changed files with 2411 additions and 1023 deletions

View File

@ -1,323 +1,323 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS><TS version="2.0">
<context>
<name>Frames</name>
<message>
<location filename="../game_gui.py" line="930"/>
<source>New game</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../game_gui.py" line="917"/>
<source>A game is in progress.
Do you want to abord it?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../game_gui.py" line="930"/>
<source>Start level:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../game_gui.py" line="1048"/>
<source>High score</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../game_gui.py" line="1037"/>
<source>Game over</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../game_gui.py" line="1040"/>
<source>Congratulations!
You have the high score: {}</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../game_gui.py" line="1050"/>
<source>Score: {}
High score: {}</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Matrix</name>
<message>
<location filename="../game_gui.py" line="135"/>
<source>Level
</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../game_gui.py" line="418"/>
<source>PAUSE
Press %s
to resume</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../game_gui.py" line="426"/>
<source>GAME
OVER</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SettingStrings</name>
<message>
<location filename="../game_gui.py" line="1177"/>
<source>Keyboard settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../game_gui.py" line="1178"/>
<source>Move left</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../game_gui.py" line="1179"/>
<source>Move right</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../game_gui.py" line="1180"/>
<source>Rotate clockwise</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../game_gui.py" line="1181"/>
<source>Rotate counterclockwise</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../game_gui.py" line="1182"/>
<source>Soft drop</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../game_gui.py" line="1183"/>
<source>Hard drop</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../game_gui.py" line="1184"/>
<source>Hold</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../game_gui.py" line="1185"/>
<source>Pause</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../game_gui.py" line="1186"/>
<source>Other settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../game_gui.py" line="1188"/>
<source>Delays</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../game_gui.py" line="1189"/>
<source>Auto-shift delay</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../game_gui.py" line="1190"/>
<source>Auto-repeat rate</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../game_gui.py" line="1192"/>
<source>Sound</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../game_gui.py" line="1193"/>
<source>Music volume</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../game_gui.py" line="1194"/>
<source>Effects volume</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../game_gui.py" line="1196"/>
<source>Show ghost piece</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../game_gui.py" line="1197"/>
<source>Show next queue</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../game_gui.py" line="1198"/>
<source>Hold enabled</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SettingsDialog</name>
<message>
<location filename="../game_gui.py" line="1113"/>
<source>Settings</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Stats</name>
<message>
<location filename="../game_gui.py" line="533"/>
<source>High score</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../game_gui.py" line="616"/>
<source>COMBO x{:n}
{:n}</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../game_gui.py" line="648"/>
<source>BACK TO BACK
{:n}</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../game_gui.py" line="679"/>
<source>Score: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../game_gui.py" line="679"/>
<source>High score: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../game_gui.py" line="679"/>
<source>Time: {}
</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../game_gui.py" line="679"/>
<source>Level: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../game_gui.py" line="679"/>
<source>Goal: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../game_gui.py" line="679"/>
<source>Lines: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../game_gui.py" line="679"/>
<source>Mini T-Spins: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../game_gui.py" line="679"/>
<source>T-Spins: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../game_gui.py" line="679"/>
<source>Back-to-back: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../game_gui.py" line="679"/>
<source>Max combo: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../game_gui.py" line="679"/>
<source>Combos: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../game_gui.py" line="718"/>
<source>Lines per minute: {:.1f}</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../game_gui.py" line="718"/>
<source>Tetrominos locked down: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../game_gui.py" line="718"/>
<source>Tetrominos per minute: {:.1f}</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../game_gui.py" line="733"/>
<source>: </source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Window</name>
<message>
<location filename="../game_gui.py" line="1411"/>
<source>&amp;New game</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../game_gui.py" line="1415"/>
<source>&amp;Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../game_gui.py" line="1419"/>
<source>&amp;About</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../game_gui.py" line="1457"/>
<source>Quit game?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../game_gui.py" line="1457"/>
<source>A game is in progress.
Do you want to abord it?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../game_gui.py" line="1472"/>
<source>High score</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../game_gui.py" line="1430"/>
<source>Tetris® clone by Adrien Malingrey
Tetris Game Design by Alekseï Pajitnov
Graphism inspired by Tetris Effect
Window style sheet: qdarkstyle by Colin Duquesnoy
Fonts by Markus Koellmann, Peter Wiegel
Images from:
OpenGameArt.org by beren77, Duion
Pexels.com by Min An, Jaymantri, Felix Mittermeier
Pixabay.com by LoganArt
Pixnio.com by Adrian Pelletier
Unsplash.com by Aron, Patrick Fore, Ilnur Kalimullin, Gabriel Garcia Marengo, Adnanta Raharja
StockSnap.io by Nathan Anderson, José Ignacio Pompé
Musics from ocremix.org by:
CheDDer Nardz, djpretzel, MkVaff, Sir_NutS, R3FORGED, Sir_NutS
Sound effects made with voc-one by Simple-Media</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS><TS version="2.0">
<context>
<name>Frames</name>
<message>
<location filename="../frames.py" line="205"/>
<source>New game</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../frames.py" line="192"/>
<source>A game is in progress.
Do you want to abord it?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../frames.py" line="205"/>
<source>Start level:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../frames.py" line="323"/>
<source>High score</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../frames.py" line="312"/>
<source>Game over</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../frames.py" line="315"/>
<source>Congratulations!
You have the high score: {}</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../frames.py" line="325"/>
<source>Score: {}
High score: {}</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Matrix</name>
<message>
<location filename="../matrix.py" line="73"/>
<source>Level
</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../matrix.py" line="356"/>
<source>PAUSE
Press %s
to resume</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../matrix.py" line="364"/>
<source>GAME
OVER</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SettingStrings</name>
<message>
<location filename="../settings.py" line="20"/>
<source>Keyboard settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings.py" line="21"/>
<source>Move left</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings.py" line="22"/>
<source>Move right</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings.py" line="23"/>
<source>Rotate clockwise</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings.py" line="24"/>
<source>Rotate counterclockwise</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings.py" line="25"/>
<source>Soft drop</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings.py" line="26"/>
<source>Hard drop</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings.py" line="27"/>
<source>Hold</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings.py" line="28"/>
<source>Pause</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings.py" line="29"/>
<source>Other settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings.py" line="31"/>
<source>Delays</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings.py" line="32"/>
<source>Auto-shift delay</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings.py" line="33"/>
<source>Auto-repeat rate</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings.py" line="35"/>
<source>Sound</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings.py" line="36"/>
<source>Music volume</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings.py" line="37"/>
<source>Effects volume</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings.py" line="39"/>
<source>Show ghost piece</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings.py" line="40"/>
<source>Show next queue</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings.py" line="41"/>
<source>Hold enabled</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SettingsDialog</name>
<message>
<location filename="../settings.py" line="95"/>
<source>Settings</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Stats</name>
<message>
<location filename="../stats.py" line="43"/>
<source>High score</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../stats.py" line="126"/>
<source>COMBO x{:n}
{:n}</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../stats.py" line="158"/>
<source>BACK TO BACK
{:n}</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../stats.py" line="189"/>
<source>Score: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../stats.py" line="189"/>
<source>High score: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../stats.py" line="189"/>
<source>Time: {}
</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../stats.py" line="189"/>
<source>Level: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../stats.py" line="189"/>
<source>Goal: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../stats.py" line="189"/>
<source>Lines: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../stats.py" line="189"/>
<source>Mini T-Spins: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../stats.py" line="189"/>
<source>T-Spins: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../stats.py" line="189"/>
<source>Back-to-back: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../stats.py" line="189"/>
<source>Max combo: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../stats.py" line="189"/>
<source>Combos: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../stats.py" line="228"/>
<source>Lines per minute: {:.1f}</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../stats.py" line="228"/>
<source>Tetrominos locked down: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../stats.py" line="228"/>
<source>Tetrominos per minute: {:.1f}</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../stats.py" line="243"/>
<source>: </source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Window</name>
<message>
<location filename="../window.py" line="93"/>
<source>&amp;New game</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../window.py" line="97"/>
<source>&amp;Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../window.py" line="101"/>
<source>&amp;About</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../window.py" line="139"/>
<source>Quit game?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../window.py" line="139"/>
<source>A game is in progress.
Do you want to abord it?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../window.py" line="154"/>
<source>High score</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../window.py" line="112"/>
<source>Tetris® clone by Adrien Malingrey
Tetris Game Design by Alekseï Pajitnov
Graphism inspired by Tetris Effect
Window style sheet: qdarkstyle by Colin Duquesnoy
Fonts by Markus Koellmann, Peter Wiegel
Images from:
OpenGameArt.org by beren77, Duion
Pexels.com by Min An, Jaymantri, Felix Mittermeier
Pixabay.com by LoganArt
Pixnio.com by Adrian Pelletier
Unsplash.com by Aron, Patrick Fore, Ilnur Kalimullin, Gabriel Garcia Marengo, Adnanta Raharja
StockSnap.io by Nathan Anderson, José Ignacio Pompé
Musics from ocremix.org by:
CheDDer Nardz, djpretzel, MkVaff, Sir_NutS, R3FORGED, Sir_NutS
Sound effects made with voc-one by Simple-Media</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>

View File

@ -1,352 +1,352 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="fr_FR">
<context>
<name>Frames</name>
<message>
<location filename="../game_gui.py" line="930"/>
<source>New game</source>
<translation>Nouvelle partie</translation>
</message>
<message>
<location filename="../game_gui.py" line="917"/>
<source>A game is in progress.
Do you want to abord it?</source>
<translation>Une partie est en cours.
Voulez-vous l&apos;abandonner ?</translation>
</message>
<message>
<location filename="../game_gui.py" line="930"/>
<source>Start level:</source>
<translation>Commencer au niveau :</translation>
</message>
<message>
<location filename="../game_gui.py" line="1048"/>
<source>High score</source>
<translation>Meilleur score</translation>
</message>
<message>
<location filename="../game_gui.py" line="1037"/>
<source>Game over</source>
<translation>Partie terminée</translation>
</message>
<message>
<location filename="../game_gui.py" line="1040"/>
<source>Congratulations!
You have the high score: {}</source>
<translation>Bravo !
Vous avez atteint le meilleur score : {}</translation>
</message>
<message>
<location filename="../game_gui.py" line="1050"/>
<source>Score: {}
High score: {}</source>
<translation>Score : {}
Meilleur score : {}</translation>
</message>
</context>
<context>
<name>Matrix</name>
<message>
<location filename="../game_gui.py" line="135"/>
<source>Level
</source>
<translation>Niveau
</translation>
</message>
<message>
<location filename="../game_gui.py" line="418"/>
<source>PAUSE
Press %s
to resume</source>
<translation>PAUSE
Appuyez sur
%s
pour reprendre</translation>
</message>
<message>
<location filename="../game_gui.py" line="426"/>
<source>GAME
OVER</source>
<translation>PARTIE
TERMINÉE</translation>
</message>
</context>
<context>
<name>SettingStrings</name>
<message>
<location filename="../game_gui.py" line="1177"/>
<source>Keyboard settings</source>
<translation>Configuration du clavier</translation>
</message>
<message>
<location filename="../game_gui.py" line="1178"/>
<source>Move left</source>
<translation>Déplacer à gauche</translation>
</message>
<message>
<location filename="../game_gui.py" line="1179"/>
<source>Move right</source>
<translation>Déplacer à droite</translation>
</message>
<message>
<location filename="../game_gui.py" line="1180"/>
<source>Rotate clockwise</source>
<translation>Tourner dans le sens horaire</translation>
</message>
<message>
<location filename="../game_gui.py" line="1181"/>
<source>Rotate counterclockwise</source>
<translation>Tourner dans le sens anti-horaire</translation>
</message>
<message>
<location filename="../game_gui.py" line="1182"/>
<source>Soft drop</source>
<translation>Chute lente</translation>
</message>
<message>
<location filename="../game_gui.py" line="1183"/>
<source>Hard drop</source>
<translation>Chute rapide</translation>
</message>
<message>
<location filename="../game_gui.py" line="1184"/>
<source>Hold</source>
<translation>Réserve</translation>
</message>
<message>
<location filename="../game_gui.py" line="1185"/>
<source>Pause</source>
<translation>Pause</translation>
</message>
<message>
<location filename="../game_gui.py" line="1186"/>
<source>Other settings</source>
<translation>Autres paramètres</translation>
</message>
<message>
<location filename="../game_gui.py" line="1188"/>
<source>Delays</source>
<translation>Temporisation</translation>
</message>
<message>
<location filename="../game_gui.py" line="1189"/>
<source>Auto-shift delay</source>
<translation>Délai avant répétition</translation>
</message>
<message>
<location filename="../game_gui.py" line="1190"/>
<source>Auto-repeat rate</source>
<translation>Vitesse de répétition</translation>
</message>
<message>
<location filename="../game_gui.py" line="1192"/>
<source>Sound</source>
<translation>Son</translation>
</message>
<message>
<location filename="../game_gui.py" line="1193"/>
<source>Music volume</source>
<translation>Volume de la musique</translation>
</message>
<message>
<location filename="../game_gui.py" line="1194"/>
<source>Effects volume</source>
<translation>Volume des effets sonores</translation>
</message>
<message>
<location filename="../game_gui.py" line="1196"/>
<source>Show ghost piece</source>
<translation>Afficher la pièce fantôme</translation>
</message>
<message>
<location filename="../game_gui.py" line="1197"/>
<source>Show next queue</source>
<translation>Afficher les 6 prochaines pièces</translation>
</message>
<message>
<location filename="../game_gui.py" line="1198"/>
<source>Hold enabled</source>
<translation>Activer la réserve</translation>
</message>
</context>
<context>
<name>SettingsDialog</name>
<message>
<location filename="../game_gui.py" line="1113"/>
<source>Settings</source>
<translation>Préférences</translation>
</message>
</context>
<context>
<name>Stats</name>
<message>
<location filename="../game_gui.py" line="533"/>
<source>High score</source>
<translation>Meilleur score</translation>
</message>
<message>
<location filename="../game_gui.py" line="616"/>
<source>COMBO x{:n}
{:n}</source>
<translation>COMBO x{:n}
{:n}</translation>
</message>
<message>
<location filename="../game_gui.py" line="648"/>
<source>BACK TO BACK
{:n}</source>
<translation>BACK TO BACK
{:n}</translation>
</message>
<message>
<location filename="../game_gui.py" line="679"/>
<source>Time: {}
</source>
<translation>Temps : {}
</translation>
</message>
<message>
<location filename="../game_gui.py" line="718"/>
<source>Lines per minute: {:.1f}</source>
<translation>Lignes par minute : {:.1f}</translation>
</message>
<message>
<location filename="../game_gui.py" line="718"/>
<source>Tetrominos per minute: {:.1f}</source>
<translation>Tétrominos par minute : {:.1f}</translation>
</message>
<message>
<location filename="../game_gui.py" line="679"/>
<source>Score: </source>
<translation>Score : </translation>
</message>
<message>
<location filename="../game_gui.py" line="679"/>
<source>High score: </source>
<translation>Meilleur score : </translation>
</message>
<message>
<location filename="../game_gui.py" line="679"/>
<source>Level: </source>
<translation>Niveau : </translation>
</message>
<message>
<location filename="../game_gui.py" line="679"/>
<source>Goal: </source>
<translation>Objectif : </translation>
</message>
<message>
<location filename="../game_gui.py" line="679"/>
<source>Lines: </source>
<translation>Lignes : </translation>
</message>
<message>
<location filename="../game_gui.py" line="679"/>
<source>Mini T-Spins: </source>
<translation>Mini T-Spins : </translation>
</message>
<message>
<location filename="../game_gui.py" line="679"/>
<source>T-Spins: </source>
<translation>T-Spins : </translation>
</message>
<message>
<location filename="../game_gui.py" line="679"/>
<source>Back-to-back: </source>
<translation>Back-to-back : </translation>
</message>
<message>
<location filename="../game_gui.py" line="679"/>
<source>Max combo: </source>
<translation>Combo max : </translation>
</message>
<message>
<location filename="../game_gui.py" line="679"/>
<source>Combos: </source>
<translation>Combos : </translation>
</message>
<message>
<location filename="../game_gui.py" line="718"/>
<source>Tetrominos locked down: </source>
<translation>Tétrominos bloqués : </translation>
</message>
<message>
<location filename="../game_gui.py" line="733"/>
<source>: </source>
<translation> : </translation>
</message>
</context>
<context>
<name>Window</name>
<message>
<location filename="../game_gui.py" line="1472"/>
<source>High score</source>
<translation>Meilleur score</translation>
</message>
<message>
<location filename="../game_gui.py" line="1411"/>
<source>&amp;New game</source>
<translation>&amp;Nouvelle partie</translation>
</message>
<message>
<location filename="../game_gui.py" line="1415"/>
<source>&amp;Settings</source>
<translation>&amp;Préférences</translation>
</message>
<message>
<location filename="../game_gui.py" line="1419"/>
<source>&amp;About</source>
<translation>&amp;À propos</translation>
</message>
<message>
<location filename="../game_gui.py" line="1457"/>
<source>A game is in progress.
Do you want to abord it?</source>
<translation>Une partie est en cours.
Voulez-vous l&apos;abandonner ?</translation>
</message>
<message>
<location filename="../game_gui.py" line="1457"/>
<source>Quit game?</source>
<translation>Quitter la partie ?</translation>
</message>
<message>
<location filename="../game_gui.py" line="1430"/>
<source>Tetris® clone by Adrien Malingrey
Tetris Game Design by Alekseï Pajitnov
Graphism inspired by Tetris Effect
Window style sheet: qdarkstyle by Colin Duquesnoy
Fonts by Markus Koellmann, Peter Wiegel
Images from:
OpenGameArt.org by beren77, Duion
Pexels.com by Min An, Jaymantri, Felix Mittermeier
Pixabay.com by LoganArt
Pixnio.com by Adrian Pelletier
Unsplash.com by Aron, Patrick Fore, Ilnur Kalimullin, Gabriel Garcia Marengo, Adnanta Raharja
StockSnap.io by Nathan Anderson, José Ignacio Pompé
Musics from ocremix.org by:
CheDDer Nardz, djpretzel, MkVaff, Sir_NutS, R3FORGED, Sir_NutS
Sound effects made with voc-one by Simple-Media</source>
<translation>Clone de Tetris® par Adrien Malingrey
Conception du jeu : Alekseï Pajitnov
Graphismes inspirés de Tetris Effect
Style de fenêtre : qdarkstyle par Colin Duquesnoy
Polices par Markus Koellmann, Peter Wiegel
Images issues de :
OpenGameArt.org par beren77, Duion
Pexels.com par Min An, Jaymantri, Felix Mittermeier
Pixabay.com par LoganArt
Pixnio.com par Adrian Pelletier
Unsplash.com par Aron, Patrick Fore, Ilnur Kalimullin, Gabriel Garcia Marengo, Adnanta Raharja
StockSnap.io par Nathan Anderson, José Ignacio Pompé
Musiques issues de ocremix.org par :
CheDDer Nardz, djpretzel, MkVaff, Sir_NutS, R3FORGED, Sir_NutS
Effets sonores réalisés avec voc-one de Simple-Media</translation>
</message>
</context>
</TS>
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="fr_FR">
<context>
<name>Frames</name>
<message>
<location filename="../frames.py" line="205"/>
<source>New game</source>
<translation>Nouvelle partie</translation>
</message>
<message>
<location filename="../frames.py" line="192"/>
<source>A game is in progress.
Do you want to abord it?</source>
<translation>Une partie est en cours.
Voulez-vous l&apos;abandonner ?</translation>
</message>
<message>
<location filename="../frames.py" line="205"/>
<source>Start level:</source>
<translation>Commencer au niveau :</translation>
</message>
<message>
<location filename="../frames.py" line="323"/>
<source>High score</source>
<translation>Meilleur score</translation>
</message>
<message>
<location filename="../frames.py" line="312"/>
<source>Game over</source>
<translation>Partie terminée</translation>
</message>
<message>
<location filename="../frames.py" line="315"/>
<source>Congratulations!
You have the high score: {}</source>
<translation>Bravo !
Vous avez atteint le meilleur score : {}</translation>
</message>
<message>
<location filename="../frames.py" line="325"/>
<source>Score: {}
High score: {}</source>
<translation>Score : {}
Meilleur score : {}</translation>
</message>
</context>
<context>
<name>Matrix</name>
<message>
<location filename="../matrix.py" line="73"/>
<source>Level
</source>
<translation>Niveau
</translation>
</message>
<message>
<location filename="../matrix.py" line="356"/>
<source>PAUSE
Press %s
to resume</source>
<translation>PAUSE
Appuyez sur
%s
pour reprendre</translation>
</message>
<message>
<location filename="../matrix.py" line="364"/>
<source>GAME
OVER</source>
<translation>PARTIE
TERMINÉE</translation>
</message>
</context>
<context>
<name>SettingStrings</name>
<message>
<location filename="../settings.py" line="20"/>
<source>Keyboard settings</source>
<translation>Configuration du clavier</translation>
</message>
<message>
<location filename="../settings.py" line="21"/>
<source>Move left</source>
<translation>Déplacer à gauche</translation>
</message>
<message>
<location filename="../settings.py" line="22"/>
<source>Move right</source>
<translation>Déplacer à droite</translation>
</message>
<message>
<location filename="../settings.py" line="23"/>
<source>Rotate clockwise</source>
<translation>Tourner dans le sens horaire</translation>
</message>
<message>
<location filename="../settings.py" line="24"/>
<source>Rotate counterclockwise</source>
<translation>Tourner dans le sens anti-horaire</translation>
</message>
<message>
<location filename="../settings.py" line="25"/>
<source>Soft drop</source>
<translation>Chute lente</translation>
</message>
<message>
<location filename="../settings.py" line="26"/>
<source>Hard drop</source>
<translation>Chute rapide</translation>
</message>
<message>
<location filename="../settings.py" line="27"/>
<source>Hold</source>
<translation>Réserve</translation>
</message>
<message>
<location filename="../settings.py" line="28"/>
<source>Pause</source>
<translation>Pause</translation>
</message>
<message>
<location filename="../settings.py" line="29"/>
<source>Other settings</source>
<translation>Autres paramètres</translation>
</message>
<message>
<location filename="../settings.py" line="31"/>
<source>Delays</source>
<translation>Temporisation</translation>
</message>
<message>
<location filename="../settings.py" line="32"/>
<source>Auto-shift delay</source>
<translation>Délai avant répétition</translation>
</message>
<message>
<location filename="../settings.py" line="33"/>
<source>Auto-repeat rate</source>
<translation>Vitesse de répétition</translation>
</message>
<message>
<location filename="../settings.py" line="35"/>
<source>Sound</source>
<translation>Son</translation>
</message>
<message>
<location filename="../settings.py" line="36"/>
<source>Music volume</source>
<translation>Volume de la musique</translation>
</message>
<message>
<location filename="../settings.py" line="37"/>
<source>Effects volume</source>
<translation>Volume des effets sonores</translation>
</message>
<message>
<location filename="../settings.py" line="39"/>
<source>Show ghost piece</source>
<translation>Afficher la pièce fantôme</translation>
</message>
<message>
<location filename="../settings.py" line="40"/>
<source>Show next queue</source>
<translation>Afficher les 6 prochaines pièces</translation>
</message>
<message>
<location filename="../settings.py" line="41"/>
<source>Hold enabled</source>
<translation>Activer la réserve</translation>
</message>
</context>
<context>
<name>SettingsDialog</name>
<message>
<location filename="../settings.py" line="95"/>
<source>Settings</source>
<translation>Préférences</translation>
</message>
</context>
<context>
<name>Stats</name>
<message>
<location filename="../stats.py" line="43"/>
<source>High score</source>
<translation>Meilleur score</translation>
</message>
<message>
<location filename="../stats.py" line="126"/>
<source>COMBO x{:n}
{:n}</source>
<translation>COMBO x{:n}
{:n}</translation>
</message>
<message>
<location filename="../stats.py" line="158"/>
<source>BACK TO BACK
{:n}</source>
<translation>BACK TO BACK
{:n}</translation>
</message>
<message>
<location filename="../stats.py" line="189"/>
<source>Time: {}
</source>
<translation>Temps : {}
</translation>
</message>
<message>
<location filename="../stats.py" line="228"/>
<source>Lines per minute: {:.1f}</source>
<translation>Lignes par minute : {:.1f}</translation>
</message>
<message>
<location filename="../stats.py" line="228"/>
<source>Tetrominos per minute: {:.1f}</source>
<translation>Tétrominos par minute : {:.1f}</translation>
</message>
<message>
<location filename="../stats.py" line="189"/>
<source>Score: </source>
<translation>Score : </translation>
</message>
<message>
<location filename="../stats.py" line="189"/>
<source>High score: </source>
<translation>Meilleur score : </translation>
</message>
<message>
<location filename="../stats.py" line="189"/>
<source>Level: </source>
<translation>Niveau : </translation>
</message>
<message>
<location filename="../stats.py" line="189"/>
<source>Goal: </source>
<translation>Objectif : </translation>
</message>
<message>
<location filename="../stats.py" line="189"/>
<source>Lines: </source>
<translation>Lignes : </translation>
</message>
<message>
<location filename="../stats.py" line="189"/>
<source>Mini T-Spins: </source>
<translation>Mini T-Spins : </translation>
</message>
<message>
<location filename="../stats.py" line="189"/>
<source>T-Spins: </source>
<translation>T-Spins : </translation>
</message>
<message>
<location filename="../stats.py" line="189"/>
<source>Back-to-back: </source>
<translation>Back-to-back : </translation>
</message>
<message>
<location filename="../stats.py" line="189"/>
<source>Max combo: </source>
<translation>Combo max : </translation>
</message>
<message>
<location filename="../stats.py" line="189"/>
<source>Combos: </source>
<translation>Combos : </translation>
</message>
<message>
<location filename="../stats.py" line="228"/>
<source>Tetrominos locked down: </source>
<translation>Tétrominos bloqués : </translation>
</message>
<message>
<location filename="../stats.py" line="243"/>
<source>: </source>
<translation> : </translation>
</message>
</context>
<context>
<name>Window</name>
<message>
<location filename="../window.py" line="154"/>
<source>High score</source>
<translation>Meilleur score</translation>
</message>
<message>
<location filename="../window.py" line="93"/>
<source>&amp;New game</source>
<translation>&amp;Nouvelle partie</translation>
</message>
<message>
<location filename="../window.py" line="97"/>
<source>&amp;Settings</source>
<translation>&amp;Préférences</translation>
</message>
<message>
<location filename="../window.py" line="101"/>
<source>&amp;About</source>
<translation>&amp;À propos</translation>
</message>
<message>
<location filename="../window.py" line="139"/>
<source>A game is in progress.
Do you want to abord it?</source>
<translation>Une partie est en cours.
Voulez-vous l&apos;abandonner ?</translation>
</message>
<message>
<location filename="../window.py" line="139"/>
<source>Quit game?</source>
<translation>Quitter la partie ?</translation>
</message>
<message>
<location filename="../window.py" line="112"/>
<source>Tetris® clone by Adrien Malingrey
Tetris Game Design by Alekseï Pajitnov
Graphism inspired by Tetris Effect
Window style sheet: qdarkstyle by Colin Duquesnoy
Fonts by Markus Koellmann, Peter Wiegel
Images from:
OpenGameArt.org by beren77, Duion
Pexels.com by Min An, Jaymantri, Felix Mittermeier
Pixabay.com by LoganArt
Pixnio.com by Adrian Pelletier
Unsplash.com by Aron, Patrick Fore, Ilnur Kalimullin, Gabriel Garcia Marengo, Adnanta Raharja
StockSnap.io by Nathan Anderson, José Ignacio Pompé
Musics from ocremix.org by:
CheDDer Nardz, djpretzel, MkVaff, Sir_NutS, R3FORGED, Sir_NutS
Sound effects made with voc-one by Simple-Media</source>
<translation>Clone de Tetris® par Adrien Malingrey
Conception du jeu : Alekseï Pajitnov
Graphismes inspirés de Tetris Effect
Style de fenêtre : qdarkstyle par Colin Duquesnoy
Polices par Markus Koellmann, Peter Wiegel
Images issues de :
OpenGameArt.org par beren77, Duion
Pexels.com par Min An, Jaymantri, Felix Mittermeier
Pixabay.com par LoganArt
Pixnio.com par Adrian Pelletier
Unsplash.com par Aron, Patrick Fore, Ilnur Kalimullin, Gabriel Garcia Marengo, Adnanta Raharja
StockSnap.io par Nathan Anderson, José Ignacio Pompé
Musiques issues de ocremix.org par :
CheDDer Nardz, djpretzel, MkVaff, Sir_NutS, R3FORGED, Sir_NutS
Effets sonores réalisés avec voc-one de Simple-Media</translation>
</message>
</context>
</TS>

View File

@ -1,2 +1,3 @@
for /F %%n in ('dir /B *.ts') do pylupdate5 ..\game_gui.py -ts %%n
for /F %%n in ('dir /B *.ts') do pylupdate5 -verbose ..\window.py ..\settings.py ..\stats.py ..\matrix.py ..\frames.py -ts %%n
echo You may need to edit *.ts files with a text editor to correct special characters
pause

View File

@ -1,2 +1,3 @@
for /F %%n in ('dir /B *.ts') do pylupdate5 ..\game_gui.py -ts -noobsolete %%n
for /F %%n in ('dir /B *.ts') do pylupdate5 -verbose ..\window.py ..\settings.py ..\stats.py ..\matrix.py ..\frames.py -ts -noobsolete %%n
echo You may need to edit *.ts files with a text editor to correct special characters
pause