[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Eliot-dev] eliot po/eliot.pot po/fr.po qt/main_window.cpp ...
|
From: |
eliot-dev |
|
Subject: |
[Eliot-dev] eliot po/eliot.pot po/fr.po qt/main_window.cpp ... |
|
Date: |
Tue, 04 Nov 2008 21:31:20 +0000 |
CVSROOT: /cvsroot/eliot
Module name: eliot
Changes by: Olivier Teulière <ipkiss> 08/11/04 21:31:20
Modified files:
po : eliot.pot fr.po
qt : main_window.cpp player_widget.cpp
player_widget.h training_widget.cpp
training_widget.h
Log message:
Write a message in the status bar when a search is on going (training
mode)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/eliot/po/eliot.pot?cvsroot=eliot&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/eliot/po/fr.po?cvsroot=eliot&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/eliot/qt/main_window.cpp?cvsroot=eliot&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/eliot/qt/player_widget.cpp?cvsroot=eliot&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/eliot/qt/player_widget.h?cvsroot=eliot&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/eliot/qt/training_widget.cpp?cvsroot=eliot&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/eliot/qt/training_widget.h?cvsroot=eliot&r1=1.2&r2=1.3
Patches:
Index: po/eliot.pot
===================================================================
RCS file: /cvsroot/eliot/eliot/po/eliot.pot,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- po/eliot.pot 27 Sep 2008 20:38:33 -0000 1.17
+++ po/eliot.pot 4 Nov 2008 21:31:13 -0000 1.18
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-27 21:27+0200\n"
+"POT-Creation-Date: 2008-11-04 21:56+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <address@hidden>\n"
"Language-Team: LANGUAGE <address@hidden>\n"
@@ -309,7 +309,7 @@
msgid " N | RACK | SOLUTION | REF | PTS | P | BONUS"
msgstr ""
-#: utils/ncurses.cpp:414 qt/history_widget.cpp:143 qt/main_window.cpp:564
+#: utils/ncurses.cpp:414 qt/history_widget.cpp:143 qt/main_window.cpp:563
msgid "(PASS)"
msgstr ""
@@ -415,7 +415,7 @@
msgid " Ctrl-l Refresh the screen"
msgstr ""
-#: utils/ncurses.cpp:486 wxwin/auxframes.cc:147 qt/main_window.cpp:647
+#: utils/ncurses.cpp:486 wxwin/auxframes.cc:147 qt/main_window.cpp:646
#: qt/ui/main_window.ui:94
msgid "Bag"
msgstr ""
@@ -481,7 +481,7 @@
msgstr ""
#: utils/ncurses.cpp:632 wxwin/mainframe.cc:275 wxwin/mainframe.cc:405
-#: wxwin/mainframe.cc:429 qt/main_window.cpp:409
+#: wxwin/mainframe.cc:429 qt/main_window.cpp:408
msgid "Load a game"
msgstr ""
@@ -495,7 +495,7 @@
msgid "Invalid saved game"
msgstr ""
-#: utils/ncurses.cpp:656 qt/main_window.cpp:423
+#: utils/ncurses.cpp:656 qt/main_window.cpp:422
#, c-format
msgid "Game loaded"
msgstr ""
@@ -524,7 +524,7 @@
msgid "Cannot take these letters from the bag"
msgstr ""
-#: utils/ncurses.cpp:1095 qt/main_window.cpp:211 qt/ui/prefs_dialog.ui:181
+#: utils/ncurses.cpp:1095 qt/main_window.cpp:212 qt/ui/prefs_dialog.ui:181
msgid "Training mode"
msgstr ""
@@ -797,7 +797,7 @@
msgid "&New game\tCtrl+N"
msgstr ""
-#: wxwin/mainframe.cc:272 qt/main_window.cpp:327
+#: wxwin/mainframe.cc:272 qt/main_window.cpp:326
msgid "Start a new game"
msgstr ""
@@ -817,7 +817,7 @@
msgid "&Save as...\tCtrl+S"
msgstr ""
-#: wxwin/mainframe.cc:276 qt/main_window.cpp:332
+#: wxwin/mainframe.cc:276 qt/main_window.cpp:331
msgid "Save the current game"
msgstr ""
@@ -849,7 +849,7 @@
msgid "&Quit\tCtrl+Q"
msgstr ""
-#: wxwin/mainframe.cc:284 qt/main_window.cpp:338
+#: wxwin/mainframe.cc:284 qt/main_window.cpp:337
msgid "Quit Eliot"
msgstr ""
@@ -857,7 +857,7 @@
msgid "&Dictionary...\tCtrl+D"
msgstr ""
-#: wxwin/mainframe.cc:287 wxwin/mainframe.cc:604 qt/main_window.cpp:614
+#: wxwin/mainframe.cc:287 wxwin/mainframe.cc:604 qt/main_window.cpp:613
msgid "Choose a dictionary"
msgstr ""
@@ -966,7 +966,7 @@
msgstr ""
#: wxwin/mainframe.cc:310 wxwin/mainframe.cc:334 qt/history_widget.cpp:177
-#: qt/main_window.cpp:325
+#: qt/main_window.cpp:324
msgid "&Game"
msgstr ""
@@ -1062,24 +1062,24 @@
msgid "R&esults"
msgstr ""
-#: wxwin/mainframe.cc:331 qt/main_window.cpp:363
+#: wxwin/mainframe.cc:331 qt/main_window.cpp:362
msgid "&About..."
msgstr ""
-#: wxwin/mainframe.cc:331 wxwin/mainframe.cc:733 qt/main_window.cpp:364
-#: qt/main_window.cpp:725
+#: wxwin/mainframe.cc:331 wxwin/mainframe.cc:733 qt/main_window.cpp:363
+#: qt/main_window.cpp:724
msgid "About Eliot"
msgstr ""
-#: wxwin/mainframe.cc:335 qt/main_window.cpp:342
+#: wxwin/mainframe.cc:335 qt/main_window.cpp:341
msgid "&Settings"
msgstr ""
-#: wxwin/mainframe.cc:336 qt/main_window.cpp:350
+#: wxwin/mainframe.cc:336 qt/main_window.cpp:349
msgid "&Windows"
msgstr ""
-#: wxwin/mainframe.cc:337 qt/main_window.cpp:362
+#: wxwin/mainframe.cc:337 qt/main_window.cpp:361
msgid "&Help"
msgstr ""
@@ -1096,7 +1096,7 @@
msgid "Cannot open "
msgstr ""
-#: wxwin/mainframe.cc:440 wxwin/mainframe.cc:449 qt/main_window.cpp:416
+#: wxwin/mainframe.cc:440 wxwin/mainframe.cc:449 qt/main_window.cpp:415
msgid "Error while loading the game"
msgstr ""
@@ -1207,66 +1207,66 @@
msgid "Regular expressions"
msgstr ""
-#: qt/bag_widget.cpp:49 qt/dic_tools_widget.cpp:98
+#: qt/bag_widget.cpp:49 qt/dic_tools_widget.cpp:100
msgid "Letter"
msgstr ""
-#: qt/bag_widget.cpp:50 qt/dic_tools_widget.cpp:99 qt/history_widget.cpp:55
+#: qt/bag_widget.cpp:50 qt/dic_tools_widget.cpp:101 qt/history_widget.cpp:55
#: qt/training_widget.cpp:60
msgid "Points"
msgstr ""
-#: qt/dic_tools_widget.cpp:88 qt/dic_tools_widget.cpp:93
+#: qt/dic_tools_widget.cpp:90 qt/dic_tools_widget.cpp:95
#: qt/ui/player_widget.ui:16 qt/ui/training_widget.ui:21
msgid "Rack:"
msgstr ""
-#: qt/dic_tools_widget.cpp:100
+#: qt/dic_tools_widget.cpp:102
msgid "Frequency"
msgstr ""
-#: qt/dic_tools_widget.cpp:101
+#: qt/dic_tools_widget.cpp:103
msgid "Vowel?"
msgstr ""
-#: qt/dic_tools_widget.cpp:102
+#: qt/dic_tools_widget.cpp:104
msgid "Consonant?"
msgstr ""
-#: qt/dic_tools_widget.cpp:133 qt/dic_tools_widget.cpp:166
-#: qt/dic_tools_widget.cpp:219
+#: qt/dic_tools_widget.cpp:135 qt/dic_tools_widget.cpp:168
+#: qt/dic_tools_widget.cpp:221
msgid "Please select a dictionary"
msgstr ""
-#: qt/dic_tools_widget.cpp:144
+#: qt/dic_tools_widget.cpp:146
msgid "The word '%1' exists"
msgstr ""
-#: qt/dic_tools_widget.cpp:149
+#: qt/dic_tools_widget.cpp:151
msgid "The word '%1' does not exist"
msgstr ""
-#: qt/dic_tools_widget.cpp:173
+#: qt/dic_tools_widget.cpp:175
msgid "Rack: %1"
msgstr ""
-#: qt/dic_tools_widget.cpp:192
+#: qt/dic_tools_widget.cpp:194
msgid "Anagrams"
msgstr ""
-#: qt/dic_tools_widget.cpp:226
+#: qt/dic_tools_widget.cpp:228
msgid "Regular expression: %1"
msgstr ""
-#: qt/dic_tools_widget.cpp:249
+#: qt/dic_tools_widget.cpp:251
msgid "Invalid regular expression: %1"
msgstr ""
-#: qt/dic_tools_widget.cpp:298 qt/dic_tools_widget.cpp:300
+#: qt/dic_tools_widget.cpp:300 qt/dic_tools_widget.cpp:302
msgid "Yes"
msgstr ""
-#: qt/dic_tools_widget.cpp:298 qt/dic_tools_widget.cpp:300
+#: qt/dic_tools_widget.cpp:300 qt/dic_tools_widget.cpp:302
msgid "No"
msgstr ""
@@ -1282,15 +1282,15 @@
msgid "Player"
msgstr ""
-#: qt/main_window.cpp:109 qt/main_window.cpp:665 qt/ui/main_window.ui:40
+#: qt/main_window.cpp:108 qt/main_window.cpp:664 qt/ui/main_window.ui:40
msgid "Board"
msgstr ""
-#: qt/main_window.cpp:162
+#: qt/main_window.cpp:163
msgid "Cannot load dictionary '%1' indicated in the preferences"
msgstr ""
-#: qt/main_window.cpp:203
+#: qt/main_window.cpp:204
msgid "No game"
msgstr ""
@@ -1298,20 +1298,20 @@
msgid "Duplicate game"
msgstr ""
-#: qt/main_window.cpp:223 qt/new_game.cpp:99 qt/new_game.cpp:165
+#: qt/main_window.cpp:222 qt/new_game.cpp:99 qt/new_game.cpp:165
#: qt/ui/new_game.ui:41
msgid "Free game"
msgstr ""
-#: qt/main_window.cpp:237
+#: qt/main_window.cpp:236
msgid "Dictionary: %1"
msgstr ""
-#: qt/main_window.cpp:242
+#: qt/main_window.cpp:241
msgid "Dictionary: Unknown (old format)"
msgstr ""
-#: qt/main_window.cpp:243
+#: qt/main_window.cpp:242
msgid ""
"The dictionary name cannot be retrieved, because you are using an old "
"dictionary format.\n"
@@ -1319,189 +1319,189 @@
"nongnu.org/eliot/"
msgstr ""
-#: qt/main_window.cpp:256
+#: qt/main_window.cpp:255
msgid "Eliot - Error"
msgstr ""
-#: qt/main_window.cpp:326
+#: qt/main_window.cpp:325
msgid "&New..."
msgstr ""
-#: qt/main_window.cpp:326
+#: qt/main_window.cpp:325
msgid "Ctrl+N"
msgstr ""
-#: qt/main_window.cpp:329
+#: qt/main_window.cpp:328
msgid "&Load..."
msgstr ""
-#: qt/main_window.cpp:329
+#: qt/main_window.cpp:328
msgid "Ctrl+O"
msgstr ""
-#: qt/main_window.cpp:330
+#: qt/main_window.cpp:329
msgid "Load an existing game"
msgstr ""
-#: qt/main_window.cpp:331
+#: qt/main_window.cpp:330
msgid "&Save as..."
msgstr ""
-#: qt/main_window.cpp:331
+#: qt/main_window.cpp:330
msgid "Ctrl+S"
msgstr ""
-#: qt/main_window.cpp:334
+#: qt/main_window.cpp:333
msgid "&Print..."
msgstr ""
-#: qt/main_window.cpp:334
+#: qt/main_window.cpp:333
msgid "Ctrl+P"
msgstr ""
-#: qt/main_window.cpp:335
+#: qt/main_window.cpp:334
msgid "Print the current game"
msgstr ""
-#: qt/main_window.cpp:337
+#: qt/main_window.cpp:336
msgid "&Quit"
msgstr ""
-#: qt/main_window.cpp:337
+#: qt/main_window.cpp:336
msgid "Ctrl+Q"
msgstr ""
-#: qt/main_window.cpp:343
+#: qt/main_window.cpp:342
msgid "&Choose dictionary..."
msgstr ""
-#: qt/main_window.cpp:343
+#: qt/main_window.cpp:342
msgid "Ctrl+C"
msgstr ""
-#: qt/main_window.cpp:344
+#: qt/main_window.cpp:343
msgid "Select a new dictionary"
msgstr ""
-#: qt/main_window.cpp:345
+#: qt/main_window.cpp:344
msgid "&Preferences..."
msgstr ""
-#: qt/main_window.cpp:345
+#: qt/main_window.cpp:344
msgid "Ctrl+F"
msgstr ""
-#: qt/main_window.cpp:346
+#: qt/main_window.cpp:345
msgid "Edit the preferences"
msgstr ""
-#: qt/main_window.cpp:351
+#: qt/main_window.cpp:350
msgid "&Bag"
msgstr ""
-#: qt/main_window.cpp:351
+#: qt/main_window.cpp:350
msgid "Ctrl+B"
msgstr ""
-#: qt/main_window.cpp:352 qt/ui/main_window.ui:97
+#: qt/main_window.cpp:351 qt/ui/main_window.ui:97
msgid "Show/hide the remaining tiles in the bag"
msgstr ""
-#: qt/main_window.cpp:353
+#: qt/main_window.cpp:352
msgid "&External board"
msgstr ""
-#: qt/main_window.cpp:353
+#: qt/main_window.cpp:352
msgid "Ctrl+E"
msgstr ""
-#: qt/main_window.cpp:354 qt/ui/main_window.ui:111
+#: qt/main_window.cpp:353 qt/ui/main_window.ui:111
msgid "Show/hide the external board"
msgstr ""
-#: qt/main_window.cpp:355
+#: qt/main_window.cpp:354
msgid "&History"
msgstr ""
-#: qt/main_window.cpp:355
+#: qt/main_window.cpp:354
msgid "Ctrl+H"
msgstr ""
-#: qt/main_window.cpp:356 qt/ui/main_window.ui:125
+#: qt/main_window.cpp:355 qt/ui/main_window.ui:125
msgid "Show/hide the game history"
msgstr ""
-#: qt/main_window.cpp:357
+#: qt/main_window.cpp:356
msgid "&Dictionary tools"
msgstr ""
-#: qt/main_window.cpp:357
+#: qt/main_window.cpp:356
msgid "Ctrl+D"
msgstr ""
-#: qt/main_window.cpp:358 qt/ui/main_window.ui:139
+#: qt/main_window.cpp:357 qt/ui/main_window.ui:139
msgid "Show/hide the dictionary tools"
msgstr ""
-#: qt/main_window.cpp:363
+#: qt/main_window.cpp:362
msgid "Ctrl+A"
msgstr ""
-#: qt/main_window.cpp:372 qt/main_window.cpp:405
+#: qt/main_window.cpp:371 qt/main_window.cpp:404
msgid "You have to select a dictionary first!"
msgstr ""
-#: qt/main_window.cpp:397
+#: qt/main_window.cpp:396
msgid "Game started"
msgstr ""
-#: qt/main_window.cpp:433
+#: qt/main_window.cpp:432
msgid "Save a game"
msgstr ""
-#: qt/main_window.cpp:438
+#: qt/main_window.cpp:437
msgid "Game saved"
msgstr ""
-#: qt/main_window.cpp:472
+#: qt/main_window.cpp:471
msgid "N."
msgstr ""
-#: qt/main_window.cpp:472
+#: qt/main_window.cpp:471
msgid "RACK"
msgstr ""
-#: qt/main_window.cpp:472
+#: qt/main_window.cpp:471
msgid "SOLUTION"
msgstr ""
-#: qt/main_window.cpp:472
+#: qt/main_window.cpp:471
msgid "REF"
msgstr ""
-#: qt/main_window.cpp:472
+#: qt/main_window.cpp:471
msgid "PTS"
msgstr ""
-#: qt/main_window.cpp:605
+#: qt/main_window.cpp:604
msgid "Stop current game?"
msgstr ""
-#: qt/main_window.cpp:606
+#: qt/main_window.cpp:605
msgid ""
"Loading a dictionary will stop the current game. Do you want to continue?"
msgstr ""
-#: qt/main_window.cpp:683 qt/ui/main_window.ui:53 qt/ui/main_window.ui:122
+#: qt/main_window.cpp:682 qt/ui/main_window.ui:53 qt/ui/main_window.ui:122
msgid "History"
msgstr ""
-#: qt/main_window.cpp:700 qt/ui/dic_tools_widget.ui:13
+#: qt/main_window.cpp:699 qt/ui/dic_tools_widget.ui:13
#: qt/ui/main_window.ui:136
msgid "Dictionary tools"
msgstr ""
-#: qt/main_window.cpp:717
+#: qt/main_window.cpp:716
msgid ""
"Copyright (C) 1999-2008 - Antoine Fraboulet & Olivier Teuliere\n"
"\n"
@@ -1631,10 +1631,18 @@
msgid "Score"
msgstr ""
-#: qt/training_widget.cpp:194
+#: qt/training_widget.cpp:199
msgid "Warning: Cannot set the rack to '%1'"
msgstr ""
+#: qt/training_widget.cpp:224
+msgid "Searching with rack '%1'..."
+msgstr ""
+
+#: qt/training_widget.cpp:226
+msgid "Search done"
+msgstr ""
+
#: qt/ui/dic_tools_widget.ui:105
msgid "Minimum length:"
msgstr ""
Index: po/fr.po
===================================================================
RCS file: /cvsroot/eliot/eliot/po/fr.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- po/fr.po 27 Sep 2008 20:38:33 -0000 1.18
+++ po/fr.po 4 Nov 2008 21:31:14 -0000 1.19
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: eliot 1.7\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-27 21:27+0200\n"
+"POT-Creation-Date: 2008-11-04 21:56+0100\n"
"PO-Revision-Date: 2008-08-31 10:43+0100\n"
"Last-Translator: Olivier Teuliere <address@hidden>\n"
"Language-Team: French <address@hidden>\n"
@@ -327,7 +327,7 @@
msgid " N | RACK | SOLUTION | REF | PTS | P | BONUS"
msgstr " N | TIRAGE | SOLUTION | REF | PTS | J | BONUS"
-#: utils/ncurses.cpp:414 qt/history_widget.cpp:143 qt/main_window.cpp:564
+#: utils/ncurses.cpp:414 qt/history_widget.cpp:143 qt/main_window.cpp:563
msgid "(PASS)"
msgstr "(PASSE)"
@@ -438,7 +438,7 @@
msgid " Ctrl-l Refresh the screen"
msgstr " Ctrl-l Rafraîchir l'écran"
-#: utils/ncurses.cpp:486 wxwin/auxframes.cc:147 qt/main_window.cpp:647
+#: utils/ncurses.cpp:486 wxwin/auxframes.cc:147 qt/main_window.cpp:646
#: qt/ui/main_window.ui:94
msgid "Bag"
msgstr "Sac"
@@ -504,7 +504,7 @@
msgstr "Partie sauvée dans '%ls'"
#: utils/ncurses.cpp:632 wxwin/mainframe.cc:275 wxwin/mainframe.cc:405
-#: wxwin/mainframe.cc:429 qt/main_window.cpp:409
+#: wxwin/mainframe.cc:429 qt/main_window.cpp:408
msgid "Load a game"
msgstr "Charger une partie"
@@ -518,7 +518,7 @@
msgid "Invalid saved game"
msgstr "Partie sauvée invalide"
-#: utils/ncurses.cpp:656 qt/main_window.cpp:423
+#: utils/ncurses.cpp:656 qt/main_window.cpp:422
#, c-format
msgid "Game loaded"
msgstr "Partie chargée"
@@ -547,7 +547,7 @@
msgid "Cannot take these letters from the bag"
msgstr "Impossible de retirer ces lettres du sac"
-#: utils/ncurses.cpp:1095 qt/main_window.cpp:211 qt/ui/prefs_dialog.ui:181
+#: utils/ncurses.cpp:1095 qt/main_window.cpp:212 qt/ui/prefs_dialog.ui:181
msgid "Training mode"
msgstr "Mode entraînement"
@@ -820,7 +820,7 @@
msgid "&New game\tCtrl+N"
msgstr "&Nouvelle partie\tCtrl+N"
-#: wxwin/mainframe.cc:272 qt/main_window.cpp:327
+#: wxwin/mainframe.cc:272 qt/main_window.cpp:326
msgid "Start a new game"
msgstr "Démarrer une nouvelle partie"
@@ -840,7 +840,7 @@
msgid "&Save as...\tCtrl+S"
msgstr "&Enregistrer sous...\tCtrl+S"
-#: wxwin/mainframe.cc:276 qt/main_window.cpp:332
+#: wxwin/mainframe.cc:276 qt/main_window.cpp:331
msgid "Save the current game"
msgstr "Sauvegarder la partie en cours"
@@ -872,7 +872,7 @@
msgid "&Quit\tCtrl+Q"
msgstr "&Quitter\tCtrl+Q"
-#: wxwin/mainframe.cc:284 qt/main_window.cpp:338
+#: wxwin/mainframe.cc:284 qt/main_window.cpp:337
msgid "Quit Eliot"
msgstr "Quitter Eliot"
@@ -880,7 +880,7 @@
msgid "&Dictionary...\tCtrl+D"
msgstr "&Dictionnaire...\tCtrl+D"
-#: wxwin/mainframe.cc:287 wxwin/mainframe.cc:604 qt/main_window.cpp:614
+#: wxwin/mainframe.cc:287 wxwin/mainframe.cc:604 qt/main_window.cpp:613
msgid "Choose a dictionary"
msgstr "Choisir un dictionnaire"
@@ -989,7 +989,7 @@
msgstr "Police de caractères pour la recherche"
#: wxwin/mainframe.cc:310 wxwin/mainframe.cc:334 qt/history_widget.cpp:177
-#: qt/main_window.cpp:325
+#: qt/main_window.cpp:324
msgid "&Game"
msgstr "&Partie"
@@ -1085,24 +1085,24 @@
msgid "R&esults"
msgstr "Ré&sultats"
-#: wxwin/mainframe.cc:331 qt/main_window.cpp:363
+#: wxwin/mainframe.cc:331 qt/main_window.cpp:362
msgid "&About..."
msgstr "Ã &propos..."
-#: wxwin/mainframe.cc:331 wxwin/mainframe.cc:733 qt/main_window.cpp:364
-#: qt/main_window.cpp:725
+#: wxwin/mainframe.cc:331 wxwin/mainframe.cc:733 qt/main_window.cpp:363
+#: qt/main_window.cpp:724
msgid "About Eliot"
msgstr "Ã propos d'Eliot"
-#: wxwin/mainframe.cc:335 qt/main_window.cpp:342
+#: wxwin/mainframe.cc:335 qt/main_window.cpp:341
msgid "&Settings"
msgstr "Para&mètres"
-#: wxwin/mainframe.cc:336 qt/main_window.cpp:350
+#: wxwin/mainframe.cc:336 qt/main_window.cpp:349
msgid "&Windows"
msgstr "&Fenêtres"
-#: wxwin/mainframe.cc:337 qt/main_window.cpp:362
+#: wxwin/mainframe.cc:337 qt/main_window.cpp:361
msgid "&Help"
msgstr "&Aide"
@@ -1119,7 +1119,7 @@
msgid "Cannot open "
msgstr "Impossible d'ouvrir "
-#: wxwin/mainframe.cc:440 wxwin/mainframe.cc:449 qt/main_window.cpp:416
+#: wxwin/mainframe.cc:440 wxwin/mainframe.cc:449 qt/main_window.cpp:415
msgid "Error while loading the game"
msgstr "Erreur pendant le chargement de la partie"
@@ -1237,66 +1237,66 @@
msgid "Regular expressions"
msgstr "Expressions régulières"
-#: qt/bag_widget.cpp:49 qt/dic_tools_widget.cpp:98
+#: qt/bag_widget.cpp:49 qt/dic_tools_widget.cpp:100
msgid "Letter"
msgstr "Lettre"
-#: qt/bag_widget.cpp:50 qt/dic_tools_widget.cpp:99 qt/history_widget.cpp:55
+#: qt/bag_widget.cpp:50 qt/dic_tools_widget.cpp:101 qt/history_widget.cpp:55
#: qt/training_widget.cpp:60
msgid "Points"
msgstr "Points"
-#: qt/dic_tools_widget.cpp:88 qt/dic_tools_widget.cpp:93
+#: qt/dic_tools_widget.cpp:90 qt/dic_tools_widget.cpp:95
#: qt/ui/player_widget.ui:16 qt/ui/training_widget.ui:21
msgid "Rack:"
msgstr "Tirage :"
-#: qt/dic_tools_widget.cpp:100
+#: qt/dic_tools_widget.cpp:102
msgid "Frequency"
msgstr "Fréquence"
-#: qt/dic_tools_widget.cpp:101
+#: qt/dic_tools_widget.cpp:103
msgid "Vowel?"
msgstr "Voyelle ?"
-#: qt/dic_tools_widget.cpp:102
+#: qt/dic_tools_widget.cpp:104
msgid "Consonant?"
msgstr "Consonne ?"
-#: qt/dic_tools_widget.cpp:133 qt/dic_tools_widget.cpp:166
-#: qt/dic_tools_widget.cpp:219
+#: qt/dic_tools_widget.cpp:135 qt/dic_tools_widget.cpp:168
+#: qt/dic_tools_widget.cpp:221
msgid "Please select a dictionary"
msgstr "Choisir un dictionnaire"
-#: qt/dic_tools_widget.cpp:144
+#: qt/dic_tools_widget.cpp:146
msgid "The word '%1' exists"
msgstr "Le mot '%1' existe"
-#: qt/dic_tools_widget.cpp:149
+#: qt/dic_tools_widget.cpp:151
msgid "The word '%1' does not exist"
msgstr "Le mot '%1' n'existe pas"
-#: qt/dic_tools_widget.cpp:173
+#: qt/dic_tools_widget.cpp:175
msgid "Rack: %1"
msgstr "Tirage : %1"
-#: qt/dic_tools_widget.cpp:192
+#: qt/dic_tools_widget.cpp:194
msgid "Anagrams"
msgstr "Anagrammes"
-#: qt/dic_tools_widget.cpp:226
+#: qt/dic_tools_widget.cpp:228
msgid "Regular expression: %1"
msgstr "Expression régulière : %1"
-#: qt/dic_tools_widget.cpp:249
+#: qt/dic_tools_widget.cpp:251
msgid "Invalid regular expression: %1"
msgstr "Expression régulière invalide : %1"
-#: qt/dic_tools_widget.cpp:298 qt/dic_tools_widget.cpp:300
+#: qt/dic_tools_widget.cpp:300 qt/dic_tools_widget.cpp:302
msgid "Yes"
msgstr "Oui"
-#: qt/dic_tools_widget.cpp:298 qt/dic_tools_widget.cpp:300
+#: qt/dic_tools_widget.cpp:300 qt/dic_tools_widget.cpp:302
msgid "No"
msgstr "Non"
@@ -1312,16 +1312,16 @@
msgid "Player"
msgstr "Joueur"
-#: qt/main_window.cpp:109 qt/main_window.cpp:665 qt/ui/main_window.ui:40
+#: qt/main_window.cpp:108 qt/main_window.cpp:664 qt/ui/main_window.ui:40
msgid "Board"
msgstr "Grille"
-#: qt/main_window.cpp:162
+#: qt/main_window.cpp:163
msgid "Cannot load dictionary '%1' indicated in the preferences"
msgstr ""
"Impossible de charger le dictionnaire '%1' indiqué dans les préférences"
-#: qt/main_window.cpp:203
+#: qt/main_window.cpp:204
msgid "No game"
msgstr "Pas de partie en cours"
@@ -1329,20 +1329,20 @@
msgid "Duplicate game"
msgstr "Partie duplicate"
-#: qt/main_window.cpp:223 qt/new_game.cpp:99 qt/new_game.cpp:165
+#: qt/main_window.cpp:222 qt/new_game.cpp:99 qt/new_game.cpp:165
#: qt/ui/new_game.ui:41
msgid "Free game"
msgstr "Partie libre"
-#: qt/main_window.cpp:237
+#: qt/main_window.cpp:236
msgid "Dictionary: %1"
msgstr "Dictionnaire : %1"
-#: qt/main_window.cpp:242
+#: qt/main_window.cpp:241
msgid "Dictionary: Unknown (old format)"
msgstr "Dictionnaire : Inconnu (vieux format)"
-#: qt/main_window.cpp:243
+#: qt/main_window.cpp:242
msgid ""
"The dictionary name cannot be retrieved, because you are using an old "
"dictionary format.\n"
@@ -1354,190 +1354,190 @@
"Vous ouvez probablement télécharger une nouvelle version du dictionnaire
sur "
"http://www.nongnu.org/eliot/";
-#: qt/main_window.cpp:256
+#: qt/main_window.cpp:255
msgid "Eliot - Error"
msgstr "Eliot - erreur"
-#: qt/main_window.cpp:326
+#: qt/main_window.cpp:325
msgid "&New..."
msgstr "&Nouvelle partie..."
-#: qt/main_window.cpp:326
+#: qt/main_window.cpp:325
msgid "Ctrl+N"
msgstr "Ctrl+N"
-#: qt/main_window.cpp:329
+#: qt/main_window.cpp:328
msgid "&Load..."
msgstr "&Charger..."
-#: qt/main_window.cpp:329
+#: qt/main_window.cpp:328
msgid "Ctrl+O"
msgstr "Ctrl+O"
-#: qt/main_window.cpp:330
+#: qt/main_window.cpp:329
msgid "Load an existing game"
msgstr "Charger une partie existante"
-#: qt/main_window.cpp:331
+#: qt/main_window.cpp:330
msgid "&Save as..."
msgstr "&Enregistrer sous..."
-#: qt/main_window.cpp:331
+#: qt/main_window.cpp:330
msgid "Ctrl+S"
msgstr "Ctrl+S"
-#: qt/main_window.cpp:334
+#: qt/main_window.cpp:333
msgid "&Print..."
msgstr "Im&primer..."
-#: qt/main_window.cpp:334
+#: qt/main_window.cpp:333
msgid "Ctrl+P"
msgstr "Ctrl+P"
-#: qt/main_window.cpp:335
+#: qt/main_window.cpp:334
msgid "Print the current game"
msgstr "Imprimer la partie en cours"
-#: qt/main_window.cpp:337
+#: qt/main_window.cpp:336
msgid "&Quit"
msgstr "&Quitter"
-#: qt/main_window.cpp:337
+#: qt/main_window.cpp:336
msgid "Ctrl+Q"
msgstr "Ctrl+Q"
-#: qt/main_window.cpp:343
+#: qt/main_window.cpp:342
msgid "&Choose dictionary..."
msgstr "Choisir un &dictionnaire..."
-#: qt/main_window.cpp:343
+#: qt/main_window.cpp:342
msgid "Ctrl+C"
msgstr "Ctrl+C"
-#: qt/main_window.cpp:344
+#: qt/main_window.cpp:343
msgid "Select a new dictionary"
msgstr "Choisir un nouveau dictionnaire"
-#: qt/main_window.cpp:345
+#: qt/main_window.cpp:344
msgid "&Preferences..."
msgstr "&Préférences..."
-#: qt/main_window.cpp:345
+#: qt/main_window.cpp:344
msgid "Ctrl+F"
msgstr "Ctrl+F"
-#: qt/main_window.cpp:346
+#: qt/main_window.cpp:345
msgid "Edit the preferences"
msgstr "Modifier les préférences"
-#: qt/main_window.cpp:351
+#: qt/main_window.cpp:350
msgid "&Bag"
msgstr "&Sac"
-#: qt/main_window.cpp:351
+#: qt/main_window.cpp:350
msgid "Ctrl+B"
msgstr "Ctrl+B"
-#: qt/main_window.cpp:352 qt/ui/main_window.ui:97
+#: qt/main_window.cpp:351 qt/ui/main_window.ui:97
msgid "Show/hide the remaining tiles in the bag"
msgstr "Afficher/cacher les lettres restantes dans le sac"
-#: qt/main_window.cpp:353
+#: qt/main_window.cpp:352
msgid "&External board"
msgstr "&Plateau de jeu externe"
-#: qt/main_window.cpp:353
+#: qt/main_window.cpp:352
msgid "Ctrl+E"
msgstr "Ctrl+E"
-#: qt/main_window.cpp:354 qt/ui/main_window.ui:111
+#: qt/main_window.cpp:353 qt/ui/main_window.ui:111
msgid "Show/hide the external board"
msgstr "Afficher/cacher le plateau de jeu externe"
-#: qt/main_window.cpp:355
+#: qt/main_window.cpp:354
msgid "&History"
msgstr "&Historique"
-#: qt/main_window.cpp:355
+#: qt/main_window.cpp:354
msgid "Ctrl+H"
msgstr "Ctrl+H"
-#: qt/main_window.cpp:356 qt/ui/main_window.ui:125
+#: qt/main_window.cpp:355 qt/ui/main_window.ui:125
msgid "Show/hide the game history"
msgstr "Afficher/cacher l'historique de la partie"
-#: qt/main_window.cpp:357
+#: qt/main_window.cpp:356
msgid "&Dictionary tools"
msgstr "Outils du &dictionnaire"
-#: qt/main_window.cpp:357
+#: qt/main_window.cpp:356
msgid "Ctrl+D"
msgstr "Ctrl+D"
-#: qt/main_window.cpp:358 qt/ui/main_window.ui:139
+#: qt/main_window.cpp:357 qt/ui/main_window.ui:139
msgid "Show/hide the dictionary tools"
msgstr "Afficher/cacher les outils de recherche dans le dictionnaire"
-#: qt/main_window.cpp:363
+#: qt/main_window.cpp:362
msgid "Ctrl+A"
msgstr "Ctrl+A"
-#: qt/main_window.cpp:372 qt/main_window.cpp:405
+#: qt/main_window.cpp:371 qt/main_window.cpp:404
msgid "You have to select a dictionary first!"
msgstr "Vous devez d'abord choisir un dictionnaire !"
-#: qt/main_window.cpp:397
+#: qt/main_window.cpp:396
msgid "Game started"
msgstr "Partie démarrée"
-#: qt/main_window.cpp:433
+#: qt/main_window.cpp:432
msgid "Save a game"
msgstr "Sauvegarder la partie"
-#: qt/main_window.cpp:438
+#: qt/main_window.cpp:437
msgid "Game saved"
msgstr "Partie enregistrée"
-#: qt/main_window.cpp:472
+#: qt/main_window.cpp:471
msgid "N."
msgstr "N."
-#: qt/main_window.cpp:472
+#: qt/main_window.cpp:471
msgid "RACK"
msgstr "TIRAGE"
-#: qt/main_window.cpp:472
+#: qt/main_window.cpp:471
msgid "SOLUTION"
msgstr "SOLUTION"
-#: qt/main_window.cpp:472
+#: qt/main_window.cpp:471
msgid "REF"
msgstr "REF"
-#: qt/main_window.cpp:472
+#: qt/main_window.cpp:471
msgid "PTS"
msgstr "PTS"
-#: qt/main_window.cpp:605
+#: qt/main_window.cpp:604
msgid "Stop current game?"
msgstr "Arrêter la partie en cours ?"
-#: qt/main_window.cpp:606
+#: qt/main_window.cpp:605
msgid ""
"Loading a dictionary will stop the current game. Do you want to continue?"
msgstr ""
"Charger un dictionnaire arrêtera la partie en cours. Voulez-vous continuer ?"
-#: qt/main_window.cpp:683 qt/ui/main_window.ui:53 qt/ui/main_window.ui:122
+#: qt/main_window.cpp:682 qt/ui/main_window.ui:53 qt/ui/main_window.ui:122
msgid "History"
msgstr "Historique"
-#: qt/main_window.cpp:700 qt/ui/dic_tools_widget.ui:13
+#: qt/main_window.cpp:699 qt/ui/dic_tools_widget.ui:13
#: qt/ui/main_window.ui:136
msgid "Dictionary tools"
msgstr "Outils du dictionnaire"
-#: qt/main_window.cpp:717
+#: qt/main_window.cpp:716
msgid ""
"Copyright (C) 1999-2008 - Antoine Fraboulet & Olivier Teuliere\n"
"\n"
@@ -1681,10 +1681,18 @@
msgid "Score"
msgstr "Score"
-#: qt/training_widget.cpp:194
+#: qt/training_widget.cpp:199
msgid "Warning: Cannot set the rack to '%1'"
msgstr "Attention : Impossible de choisir le tirage '%1'"
+#: qt/training_widget.cpp:224
+msgid "Searching with rack '%1'..."
+msgstr "Recherche en cours pour le tirage '%1'..."
+
+#: qt/training_widget.cpp:226
+msgid "Search done"
+msgstr "Recherche terminée"
+
#: qt/ui/dic_tools_widget.ui:105
msgid "Minimum length:"
msgstr "Longueur minimum :"
Index: qt/main_window.cpp
===================================================================
RCS file: /cvsroot/eliot/eliot/qt/main_window.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- qt/main_window.cpp 27 Sep 2008 20:38:34 -0000 1.14
+++ qt/main_window.cpp 4 Nov 2008 21:31:14 -0000 1.15
@@ -52,7 +52,6 @@
#include "player_widget.h"
#include "history_widget.h"
#include "dic_tools_widget.h"
-#include "training_widget.h"
#include "aux_window.h"
#include "qtcommon.h"
@@ -136,6 +135,8 @@
QObject::connect(players, SIGNAL(gameUpdated()), this,
SIGNAL(gameUpdated()));
QObject::connect(players, SIGNAL(notifyProblem(QString)),
this, SLOT(displayErrorMsg(QString)));
+ QObject::connect(players, SIGNAL(notifyInfo(QString)),
+ this, SLOT(displayInfoMsg(QString)));
// Players score
ScoreWidget *scores = new ScoreWidget;
Index: qt/player_widget.cpp
===================================================================
RCS file: /cvsroot/eliot/eliot/qt/player_widget.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- qt/player_widget.cpp 14 Sep 2008 17:56:18 -0000 1.9
+++ qt/player_widget.cpp 4 Nov 2008 21:31:14 -0000 1.10
@@ -406,6 +406,8 @@
// Forward signals to the outside
QObject::connect(trWidget, SIGNAL(notifyProblem(QString)),
this, SIGNAL(notifyProblem(QString)));
+ QObject::connect(trWidget, SIGNAL(notifyInfo(QString)),
+ this, SIGNAL(notifyInfo(QString)));
QObject::connect(trWidget, SIGNAL(gameUpdated()),
this, SIGNAL(gameUpdated()));
addTab(trWidget, qfw(player.getName()));
Index: qt/player_widget.h
===================================================================
RCS file: /cvsroot/eliot/eliot/qt/player_widget.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- qt/player_widget.h 14 Sep 2008 17:56:19 -0000 1.6
+++ qt/player_widget.h 4 Nov 2008 21:31:14 -0000 1.7
@@ -41,6 +41,7 @@
signals:
void gameUpdated();
void notifyProblem(QString iMsg);
+ void notifyInfo(QString iMsg);
public slots:
void refresh();
@@ -85,6 +86,7 @@
void refreshSignal();
void gameUpdated();
void notifyProblem(QString iMsg);
+ void notifyInfo(QString iMsg);
private slots:
void changeCurrentPlayer(int);
Index: qt/training_widget.cpp
===================================================================
RCS file: /cvsroot/eliot/eliot/qt/training_widget.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- qt/training_widget.cpp 15 Oct 2008 19:43:24 -0000 1.3
+++ qt/training_widget.cpp 4 Nov 2008 21:31:16 -0000 1.4
@@ -108,7 +108,7 @@
else
{
wstring rack =
m_game->getPlayer(0).getCurrentRack().toString(PlayedRack::RACK_SIMPLE);
- // Update the rack only if it needed, to avoid losing cursor position
+ // Update the rack only if it is needed, to avoid losing cursor
position
if (qfw(rack) != lineEditRack->text())
lineEditRack->setText(qfw(rack));
lineEditRack->setEnabled(true);
@@ -149,6 +149,11 @@
// Hidden data, used to handle proper sorting in the tree view
m_model->setData(m_model->index(rowNum, 5), i);
}
+
+ // Clear the status bar when there is no search result
+ if (m_model->rowCount() == 0)
+ emit notifyInfo("");
+
treeViewResults->resizeColumnToContents(0);
treeViewResults->resizeColumnToContents(1);
treeViewResults->resizeColumnToContents(2);
@@ -216,7 +221,9 @@
void TrainingWidget::on_pushButtonSearch_clicked()
{
m_game->removeTestPlay();
+ emit notifyInfo(_q("Searching with rack
'%1'...").arg(lineEditRack->text()));
m_game->search();
+ emit notifyInfo(_q("Search done"));
emit gameUpdated();
}
Index: qt/training_widget.h
===================================================================
RCS file: /cvsroot/eliot/eliot/qt/training_widget.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- qt/training_widget.h 26 Jan 2008 23:03:35 -0000 1.2
+++ qt/training_widget.h 4 Nov 2008 21:31:18 -0000 1.3
@@ -45,6 +45,7 @@
signals:
void gameUpdated();
void notifyProblem(QString iMsg);
+ void notifyInfo(QString iMsg);
protected:
/// Define a default size
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Eliot-dev] eliot po/eliot.pot po/fr.po qt/main_window.cpp ...,
eliot-dev <=