[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Eliot-dev] eliot TODO po/POTFILES.in po/eliot.pot po/fr.po... [cppdic]
|
From: |
eliot-dev |
|
Subject: |
[Eliot-dev] eliot TODO po/POTFILES.in po/eliot.pot po/fr.po... [cppdic] |
|
Date: |
Tue, 11 Dec 2007 14:07:16 +0000 |
CVSROOT: /cvsroot/eliot
Module name: eliot
Branch: cppdic
Changes by: Olivier Teulière <ipkiss> 07/12/11 14:07:16
Modified files:
. : TODO
po : POTFILES.in eliot.pot fr.po
wxwin : Makefile.am auxframes.cc confdimdlg.cc
configdb.cc confsearch.cc gfxresult.cc main.cc
mainframe.cc mainframe.h searchpanel.cc
Log message:
- The wxwidgets interface is now in english by default
- French translation of the wxwidgets interface
- Several improvements in the menus: accelerators, hotkeys, check marks
- Added support for joker games in the interface
- Updated the TODO file
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/eliot/TODO?cvsroot=eliot&only_with_tag=cppdic&r1=1.6&r2=1.6.2.1
http://cvs.savannah.gnu.org/viewcvs/eliot/po/POTFILES.in?cvsroot=eliot&only_with_tag=cppdic&r1=1.3.2.3&r2=1.3.2.4
http://cvs.savannah.gnu.org/viewcvs/eliot/po/eliot.pot?cvsroot=eliot&only_with_tag=cppdic&r1=1.6.6.2&r2=1.6.6.3
http://cvs.savannah.gnu.org/viewcvs/eliot/po/fr.po?cvsroot=eliot&only_with_tag=cppdic&r1=1.6.6.2&r2=1.6.6.3
http://cvs.savannah.gnu.org/viewcvs/eliot/wxwin/Makefile.am?cvsroot=eliot&only_with_tag=cppdic&r1=1.9.2.4&r2=1.9.2.5
http://cvs.savannah.gnu.org/viewcvs/eliot/wxwin/auxframes.cc?cvsroot=eliot&only_with_tag=cppdic&r1=1.22.2.4&r2=1.22.2.5
http://cvs.savannah.gnu.org/viewcvs/eliot/wxwin/confdimdlg.cc?cvsroot=eliot&only_with_tag=cppdic&r1=1.8.4.1&r2=1.8.4.2
http://cvs.savannah.gnu.org/viewcvs/eliot/wxwin/configdb.cc?cvsroot=eliot&only_with_tag=cppdic&r1=1.7.4.1&r2=1.7.4.2
http://cvs.savannah.gnu.org/viewcvs/eliot/wxwin/confsearch.cc?cvsroot=eliot&only_with_tag=cppdic&r1=1.9&r2=1.9.4.1
http://cvs.savannah.gnu.org/viewcvs/eliot/wxwin/gfxresult.cc?cvsroot=eliot&only_with_tag=cppdic&r1=1.5.2.2&r2=1.5.2.3
http://cvs.savannah.gnu.org/viewcvs/eliot/wxwin/main.cc?cvsroot=eliot&only_with_tag=cppdic&r1=1.10.2.1&r2=1.10.2.2
http://cvs.savannah.gnu.org/viewcvs/eliot/wxwin/mainframe.cc?cvsroot=eliot&only_with_tag=cppdic&r1=1.21.2.5&r2=1.21.2.6
http://cvs.savannah.gnu.org/viewcvs/eliot/wxwin/mainframe.h?cvsroot=eliot&only_with_tag=cppdic&r1=1.7.2.1&r2=1.7.2.2
http://cvs.savannah.gnu.org/viewcvs/eliot/wxwin/searchpanel.cc?cvsroot=eliot&only_with_tag=cppdic&r1=1.15.2.3&r2=1.15.2.4
Patches:
Index: TODO
===================================================================
RCS file: /cvsroot/eliot/eliot/TODO,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -b -r1.6 -r1.6.2.1
--- TODO 22 Jan 2006 12:23:52 -0000 1.6
+++ TODO 11 Dec 2007 14:07:14 -0000 1.6.2.1
@@ -3,31 +3,21 @@
* TODO Current version
* ====================
- - Correct game save/load functions : Advanced format
+ - Correct game save/load functions: Advanced format
file saving for freegames and duplicate need a serious
- rewrite. We need to specifie a file format that can handle
+ rewrite. We need to specify a file format that can handle
all the information contained in a multiplayer game.
- - Add "joker" type games in wxwin version of Eliot, Freegame
- and Duplicate will follow
-
- - full French i18n interface and error messages for wxwin.
-
-
* ==================
* Next Eliot version
* ==================
- - new dictionnary format that includes tiles
- - number
- - points
- - printable equivalent
- - other languages support using the new dictionary
- - new wxWidgets interface
+ - rack shuffling
+ - new wxWidgets or QT interface
- support of the different modes
- ability to choose the number and type of the players
- ability to display the history and score of all the players
- -- partly done : history is now a separate class
+ -- partly done: history is now a separate class
- detection of blocked positions?
- getopt support for all the interfaces (only ncurses is done)
Index: po/POTFILES.in
===================================================================
RCS file: /cvsroot/eliot/eliot/po/POTFILES.in,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -u -b -r1.3.2.3 -r1.3.2.4
--- po/POTFILES.in 9 Dec 2007 16:29:55 -0000 1.3.2.3
+++ po/POTFILES.in 11 Dec 2007 14:07:14 -0000 1.3.2.4
@@ -45,29 +45,28 @@
./game/round.h
./game/training.cpp
./game/training.h
-./utils/eliottxt.cpp
+#./utils/eliottxt.cpp
./utils/game_io.h
./utils/game_io.cpp
./utils/ncurses.cpp
./utils/ncurses.h
-#./wxwin/auxframes.h
-#./wxwin/auxframes.cc
-#./wxwin/confdimdlg.h
-#./wxwin/confdimdlg.cc
-#./wxwin/configdb.h
-#./wxwin/configdb.cc
-#./wxwin/confsearch.h
-#./wxwin/confsearch.cc
-#./wxwin/ewx.h
-#./wxwin/gfxboard.h
-#./wxwin/gfxboard.cc
-#./wxwin/gfxresult.h
-#./wxwin/gfxresult.cc
-#./wxwin/main.cc
-#./wxwin/mainframe.h
-#./wxwin/mainframe.cc
-#./wxwin/printout.h
-#./wxwin/printout.cc
-#./wxwin/searchpanel.h
-#./wxwin/searchpanel.cc
-#./config.h
+./wxwin/auxframes.h
+./wxwin/auxframes.cc
+./wxwin/confdimdlg.h
+./wxwin/confdimdlg.cc
+./wxwin/configdb.h
+./wxwin/configdb.cc
+./wxwin/confsearch.h
+./wxwin/confsearch.cc
+./wxwin/ewx.h
+./wxwin/gfxboard.h
+./wxwin/gfxboard.cc
+./wxwin/gfxresult.h
+./wxwin/gfxresult.cc
+./wxwin/main.cc
+./wxwin/mainframe.h
+./wxwin/mainframe.cc
+./wxwin/printout.h
+./wxwin/printout.cc
+./wxwin/searchpanel.h
+./wxwin/searchpanel.cc
Index: po/eliot.pot
===================================================================
RCS file: /cvsroot/eliot/eliot/po/eliot.pot,v
retrieving revision 1.6.6.2
retrieving revision 1.6.6.3
diff -u -b -r1.6.6.2 -r1.6.6.3
--- po/eliot.pot 8 Dec 2007 13:56:10 -0000 1.6.6.2
+++ po/eliot.pot 11 Dec 2007 14:07:14 -0000 1.6.6.3
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-05 14:49+0100\n"
+"POT-Creation-Date: 2007-12-11 15:06+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"
@@ -16,203 +16,203 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: dic/compdic.cpp:405
+#: dic/header.cpp:317 dic/header.cpp:318
+msgid "Unknown (old format)"
+msgstr ""
+
+#: dic/header.cpp:492
+#, c-format
+msgid "dictionary name: %s\n"
+msgstr ""
+
+#: dic/header.cpp:497
+#, c-format
+msgid "compressed on: %s\n"
+msgstr ""
+
+#: dic/header.cpp:501
+#, c-format
+msgid "compressed on: Unknown date (old format)\n"
+msgstr ""
+
+#: dic/header.cpp:503
+#, c-format
+msgid "compressed using a binary compiled by: %s\n"
+msgstr ""
+
+#: dic/header.cpp:504
+#, c-format
+msgid "dictionary type: %s\n"
+msgstr ""
+
+#: dic/header.cpp:505
+#, c-format
+msgid "letters: %s\n"
+msgstr ""
+
+#: dic/header.cpp:506
+#, c-format
+msgid "number of letters: %d\n"
+msgstr ""
+
+#: dic/header.cpp:507
+#, c-format
+msgid "number of words: %d\n"
+msgstr ""
+
+#: dic/header.cpp:508
+#, c-format
+msgid "header size: %u bytes\n"
+msgstr ""
+
+#: dic/header.cpp:510
+#, c-format
+msgid "root: %d (edge)\n"
+msgstr ""
+
+#: dic/header.cpp:511
+#, c-format
+msgid "nodes: %d used + %d saved\n"
+msgstr ""
+
+#: dic/header.cpp:512
+#, c-format
+msgid "edges: %d used + %d saved\n"
+msgstr ""
+
+#: dic/header.cpp:514
+#, c-format
+msgid "letter | points | frequency | vowel | consonant\n"
+msgstr ""
+
+#: dic/compdic.cpp:387
msgid "Mandatory options:"
msgstr ""
-#: dic/compdic.cpp:406
+#: dic/compdic.cpp:388
msgid " -d, --dicname <string> Set the dictionary name and version"
msgstr ""
-#: dic/compdic.cpp:407
+#: dic/compdic.cpp:389
msgid ""
" -l, --letters <string> Path to the file containing the letters (see below)"
msgstr ""
-#: dic/compdic.cpp:408
+#: dic/compdic.cpp:390
msgid ""
" -i, --input <string> Path to the uncompressed dictionary file (encoded "
"in UTF-8)"
msgstr ""
-#: dic/compdic.cpp:409
+#: dic/compdic.cpp:391
msgid ""
" -o, --output <string Path to the generated compressed dictionary file"
msgstr ""
-#: dic/compdic.cpp:410
+#: dic/compdic.cpp:392
msgid "Other options:"
msgstr ""
-#: dic/compdic.cpp:411
+#: dic/compdic.cpp:393
msgid " -h, --help Print this help and exit"
msgstr ""
-#: dic/compdic.cpp:412
+#: dic/compdic.cpp:394
msgid "Example:"
msgstr ""
-#: dic/compdic.cpp:413
+#: dic/compdic.cpp:395
msgid " -d 'ODS 5.0' -l letters.txt -i ods5.txt -o ods5.dawg"
msgstr ""
-#: dic/compdic.cpp:415
+#: dic/compdic.cpp:397
msgid ""
"The file containing the letters (--letters switch) must be UTF-8 encoded."
msgstr ""
-#: dic/compdic.cpp:416
+#: dic/compdic.cpp:398
msgid ""
"Each line corresponds to one letter, and must contain 5 fields separated "
"with "
msgstr ""
-#: dic/compdic.cpp:417
+#: dic/compdic.cpp:399
msgid "one or more space(s)."
msgstr ""
-#: dic/compdic.cpp:418
+#: dic/compdic.cpp:400
msgid " - 1st field: the letter itself"
msgstr ""
-#: dic/compdic.cpp:419
+#: dic/compdic.cpp:401
msgid " - 2nd field: the points of the letter"
msgstr ""
-#: dic/compdic.cpp:420
+#: dic/compdic.cpp:402
msgid ""
" - 3rd field: the frequency of the letter (how many letters of this kind in "
"the game)"
msgstr ""
-#: dic/compdic.cpp:421
+#: dic/compdic.cpp:403
msgid ""
" - 4th field: 1 if the letter is considered as a vowel in Scrabble game, 0 "
"otherwise"
msgstr ""
-#: dic/compdic.cpp:422
+#: dic/compdic.cpp:404
msgid ""
" - 5th field: 1 if the letter is considered as a consonant in Scrabble game, "
"0 otherwise"
msgstr ""
-#: dic/compdic.cpp:423
+#: dic/compdic.cpp:405
msgid "Example for french:"
msgstr ""
-#: dic/compdic.cpp:424
+#: dic/compdic.cpp:406
msgid "A 1 9 1 0"
msgstr ""
-#: dic/compdic.cpp:425
+#: dic/compdic.cpp:407
msgid "[...]"
msgstr ""
-#: dic/compdic.cpp:426
+#: dic/compdic.cpp:408
msgid "Z 10 1 0 1"
msgstr ""
-#: dic/compdic.cpp:427
+#: dic/compdic.cpp:409
msgid "? 0 2 1 1"
msgstr ""
-#: dic/compdic.cpp:495
+#: dic/compdic.cpp:479
msgid "A mandatory option is missing"
msgstr ""
-#: dic/compdic.cpp:503
+#: dic/compdic.cpp:487
msgid "Cannot stat uncompressed dictionary "
msgstr ""
-#: dic/compdic.cpp:511
+#: dic/compdic.cpp:495
msgid "Cannot open output file "
msgstr ""
-#: dic/compdic.cpp:561
+#: dic/compdic.cpp:543
#, c-format
msgid " Load time: %.3f s\n"
msgstr ""
-#: dic/compdic.cpp:562
+#: dic/compdic.cpp:544
#, c-format
msgid " Compression time: %.3f s\n"
msgstr ""
-#: dic/compdic.cpp:564
+#: dic/compdic.cpp:546
#, c-format
msgid " Maximum recursion level reached: %d\n"
msgstr ""
-#: dic/header.cpp:306 dic/header.cpp:307
-msgid "Unknown (old format)"
-msgstr ""
-
-#: dic/header.cpp:537
-#, c-format
-msgid "dictionary name: %s\n"
-msgstr ""
-
-#: dic/header.cpp:538
-#, c-format
-msgid "dictionary type: %s\n"
-msgstr ""
-
-#: dic/header.cpp:543
-#, c-format
-msgid "compressed on: %s\n"
-msgstr ""
-
-#: dic/header.cpp:547
-#, c-format
-msgid "compressed on: Unknown date (old format)\n"
-msgstr ""
-
-#: dic/header.cpp:549
-#, c-format
-msgid "compressed using a binary compiled by: %ls\n"
-msgstr ""
-
-#: dic/header.cpp:550
-#, c-format
-msgid "letters: %ls\n"
-msgstr ""
-
-#: dic/header.cpp:551
-#, c-format
-msgid "number of letters: %d\n"
-msgstr ""
-
-#: dic/header.cpp:552
-#, c-format
-msgid "number of words: %d\n"
-msgstr ""
-
-#: dic/header.cpp:553
-#, c-format
-msgid "header size: %u bytes\n"
-msgstr ""
-
-#: dic/header.cpp:555
-#, c-format
-msgid "root: %d (edge)\n"
-msgstr ""
-
-#: dic/header.cpp:556
-#, c-format
-msgid "nodes: %d used + %d saved\n"
-msgstr ""
-
-#: dic/header.cpp:557
-#, c-format
-msgid "edges: %d used + %d saved\n"
-msgstr ""
-
-#: dic/header.cpp:559
-#, c-format
-msgid "letter | points | frequency | vowel | consonant\n"
-msgstr ""
-
#: dic/listdic.cpp:100
#, c-format
msgid "offset binary | structure\n"
@@ -504,3 +504,663 @@
#: utils/ncurses.cpp:818
msgid "[h for help]"
msgstr ""
+
+#: wxwin/auxframes.cc:123
+msgid "Grid"
+msgstr ""
+
+#: wxwin/auxframes.cc:148
+msgid "Bag"
+msgstr ""
+
+#: wxwin/auxframes.cc:203
+msgid "Search"
+msgstr ""
+
+#: wxwin/auxframes.cc:234
+msgid "Check"
+msgstr ""
+
+#: wxwin/auxframes.cc:239
+msgid "Word to check"
+msgstr ""
+
+#: wxwin/auxframes.cc:257 wxwin/configdb.cc:203 wxwin/searchpanel.cc:107
+msgid "No dictionary"
+msgstr ""
+
+#: wxwin/auxframes.cc:261
+msgid "exists"
+msgstr ""
+
+#: wxwin/auxframes.cc:263
+msgid "doesn't exist"
+msgstr ""
+
+#: wxwin/auxframes.cc:304
+msgid "Copy"
+msgstr ""
+
+#: wxwin/auxframes.cc:348 wxwin/mainframe.cc:491 wxwin/mainframe.cc:511
+#: wxwin/mainframe.cc:542
+msgid "No on going game"
+msgstr ""
+
+#: wxwin/auxframes.cc:363 wxwin/searchpanel.cc:119
+msgid "No result"
+msgstr ""
+
+#: wxwin/auxframes.cc:409
+msgid "Rack: "
+msgstr ""
+
+#: wxwin/auxframes.cc:525 wxwin/mainframe.cc:318
+msgid "Game history"
+msgstr ""
+
+#: wxwin/auxframes.cc:557 wxwin/mainframe.cc:320
+msgid "Results"
+msgstr ""
+
+#: wxwin/confdimdlg.cc:62
+msgid "left"
+msgstr ""
+
+#: wxwin/confdimdlg.cc:63
+msgid "centered"
+msgstr ""
+
+#: wxwin/confdimdlg.cc:64
+msgid "right"
+msgstr ""
+
+#: wxwin/confdimdlg.cc:118
+msgid "Alignment"
+msgstr ""
+
+#: wxwin/confdimdlg.cc:120
+msgid "Spacing"
+msgstr ""
+
+#: wxwin/confdimdlg.cc:124 wxwin/confdimdlg.cc:135
+msgid "Font..."
+msgstr ""
+
+#: wxwin/confdimdlg.cc:129
+msgid "Title column "
+msgstr ""
+
+#: wxwin/confdimdlg.cc:140
+msgid "Text column "
+msgstr ""
+
+#: wxwin/confdimdlg.cc:150
+msgid "Column heading"
+msgstr ""
+
+#: wxwin/confdimdlg.cc:154
+msgid "Alignment of the column heading"
+msgstr ""
+
+#: wxwin/confdimdlg.cc:158
+msgid "Spacing of the heading characters"
+msgstr ""
+
+#: wxwin/confdimdlg.cc:167
+msgid "Inner dimension of the column (in mm)"
+msgstr ""
+
+#: wxwin/confdimdlg.cc:176
+msgid "Alignment of the column text"
+msgstr ""
+
+#: wxwin/confdimdlg.cc:180
+msgid "Characters spacing"
+msgstr ""
+
+#: wxwin/confdimdlg.cc:231
+msgid "Title spc. top"
+msgstr ""
+
+#: wxwin/confdimdlg.cc:233
+msgid "Text spc. top"
+msgstr ""
+
+#: wxwin/confdimdlg.cc:235
+msgid "Text spc. left"
+msgstr ""
+
+#: wxwin/confdimdlg.cc:252
+msgid "Title spc. bot."
+msgstr ""
+
+#: wxwin/confdimdlg.cc:254
+msgid "Text spc. bot."
+msgstr ""
+
+#: wxwin/confdimdlg.cc:256
+msgid "Text spc. right"
+msgstr ""
+
+#: wxwin/confdimdlg.cc:286
+msgid "Printer"
+msgstr ""
+
+#: wxwin/confdimdlg.cc:288
+msgid "Configure the printer"
+msgstr ""
+
+#: wxwin/confdimdlg.cc:290
+msgid "Page"
+msgstr ""
+
+#: wxwin/confdimdlg.cc:292
+msgid "Configure the dimensions of the page"
+msgstr ""
+
+#: wxwin/confdimdlg.cc:298
+msgid "Cancel the last changes"
+msgstr ""
+
+#: wxwin/confdimdlg.cc:304 wxwin/confsearch.cc:42
+msgid "Save the changes"
+msgstr ""
+
+#: wxwin/configdb.cc:322
+msgid "Nb"
+msgstr ""
+
+#: wxwin/configdb.cc:323 wxwin/mainframe.cc:173
+msgid "Rack"
+msgstr ""
+
+#: wxwin/configdb.cc:324
+msgid "Solution"
+msgstr ""
+
+#: wxwin/configdb.cc:325 wxwin/gfxresult.cc:69
+msgid "Pos"
+msgstr ""
+
+#: wxwin/configdb.cc:326 wxwin/gfxresult.cc:70
+msgid "Pts"
+msgstr ""
+
+#: wxwin/confsearch.cc:36
+msgid "Search on joker in 7+1 panel"
+msgstr ""
+
+#: wxwin/confsearch.cc:37
+msgid "Check rack validity"
+msgstr ""
+
+#: wxwin/confsearch.cc:40
+msgid "Cancel last changes"
+msgstr ""
+
+#: wxwin/gfxresult.cc:67
+msgid "Word"
+msgstr ""
+
+#: wxwin/gfxresult.cc:71
+msgid "Results of the search"
+msgstr ""
+
+#: wxwin/mainframe.cc:204
+msgid " Rack "
+msgstr ""
+
+#: wxwin/mainframe.cc:205
+msgid " Complement "
+msgstr ""
+
+#: wxwin/mainframe.cc:206
+msgid " Search "
+msgstr ""
+
+#: wxwin/mainframe.cc:207
+msgid " Back "
+msgstr ""
+
+#: wxwin/mainframe.cc:208
+msgid " Play "
+msgstr ""
+
+#: wxwin/mainframe.cc:210
+msgid "Random rack"
+msgstr ""
+
+#: wxwin/mainframe.cc:211
+msgid "Random complement of the rack"
+msgstr ""
+
+#: wxwin/mainframe.cc:212
+msgid "Search with the current rack"
+msgstr ""
+
+#: wxwin/mainframe.cc:213
+msgid "Go back one turn"
+msgstr ""
+
+#: wxwin/mainframe.cc:214
+msgid "Play the selected word"
+msgstr ""
+
+#: wxwin/mainframe.cc:265
+msgid "&New game\tctrl+n"
+msgstr ""
+
+#: wxwin/mainframe.cc:265
+msgid "Start a new game"
+msgstr ""
+
+#: wxwin/mainframe.cc:266
+msgid "New &joker game\tctrl+j"
+msgstr ""
+
+#: wxwin/mainframe.cc:266
+msgid "Start a new joker game"
+msgstr ""
+
+#: wxwin/mainframe.cc:268
+msgid "&Load...\tctrl+l"
+msgstr ""
+
+#: wxwin/mainframe.cc:268 wxwin/mainframe.cc:389 wxwin/mainframe.cc:413
+msgid "Load a game"
+msgstr ""
+
+#: wxwin/mainframe.cc:269
+msgid "&Save as...\tctrl+s"
+msgstr ""
+
+#: wxwin/mainframe.cc:269
+msgid "Save the current game"
+msgstr ""
+
+#: wxwin/mainframe.cc:271
+msgid "&Print...\tctrl+p"
+msgstr ""
+
+#: wxwin/mainframe.cc:271
+msgid "Print this game"
+msgstr ""
+
+#: wxwin/mainframe.cc:272
+msgid "Print pre&view..."
+msgstr ""
+
+#: wxwin/mainframe.cc:272
+msgid "Print preview of the game"
+msgstr ""
+
+#: wxwin/mainframe.cc:274
+msgid "Print in PostS&cript..."
+msgstr ""
+
+#: wxwin/mainframe.cc:274
+msgid "Print in a PostScript file"
+msgstr ""
+
+#: wxwin/mainframe.cc:277
+msgid "&Quit"
+msgstr ""
+
+#: wxwin/mainframe.cc:277
+msgid "Quit Eliot"
+msgstr ""
+
+#: wxwin/mainframe.cc:280
+msgid "&Dictionary..."
+msgstr ""
+
+#: wxwin/mainframe.cc:280 wxwin/mainframe.cc:593
+msgid "Choose a dictionary"
+msgstr ""
+
+#: wxwin/mainframe.cc:281
+msgid "&Search..."
+msgstr ""
+
+#: wxwin/mainframe.cc:281
+msgid "Search options"
+msgstr ""
+
+#: wxwin/mainframe.cc:284
+msgid "&Background..."
+msgstr ""
+
+#: wxwin/mainframe.cc:284
+msgid "Background color"
+msgstr ""
+
+#: wxwin/mainframe.cc:285
+msgid "L&ines..."
+msgstr ""
+
+#: wxwin/mainframe.cc:285
+msgid "Color of the lines"
+msgstr ""
+
+#: wxwin/mainframe.cc:287
+msgid "&Played letters..."
+msgstr ""
+
+#: wxwin/mainframe.cc:287
+msgid "Color of the letters played on the board"
+msgstr ""
+
+#: wxwin/mainframe.cc:288
+msgid "&Temporary letters..."
+msgstr ""
+
+#: wxwin/mainframe.cc:288
+msgid "Color of the letters of the temporary word"
+msgstr ""
+
+#: wxwin/mainframe.cc:289
+msgid "B&ackground of played letters..."
+msgstr ""
+
+#: wxwin/mainframe.cc:289
+msgid "Background color of the letters played on the board"
+msgstr ""
+
+#: wxwin/mainframe.cc:290
+msgid "Ba&ckground of temporary letters..."
+msgstr ""
+
+#: wxwin/mainframe.cc:290
+msgid "Background color of the temporary letters on the board"
+msgstr ""
+
+#: wxwin/mainframe.cc:292
+msgid "Double &letter..."
+msgstr ""
+
+#: wxwin/mainframe.cc:292
+msgid "Color of the \"double letter\" squares"
+msgstr ""
+
+#: wxwin/mainframe.cc:293
+msgid "Triple l&etter..."
+msgstr ""
+
+#: wxwin/mainframe.cc:293
+msgid "Color of the \"triple letter\" squares"
+msgstr ""
+
+#: wxwin/mainframe.cc:294
+msgid "Double &word..."
+msgstr ""
+
+#: wxwin/mainframe.cc:294
+msgid "Color of the \"double word\" squares"
+msgstr ""
+
+#: wxwin/mainframe.cc:295
+msgid "Triple w&ord..."
+msgstr ""
+
+#: wxwin/mainframe.cc:295
+msgid "Color of the \"triple word\" squares"
+msgstr ""
+
+#: wxwin/mainframe.cc:297
+msgid "&Default colors"
+msgstr ""
+
+#: wxwin/mainframe.cc:297
+msgid "Restore the default colors"
+msgstr ""
+
+#: wxwin/mainframe.cc:300
+msgid "&Search letters..."
+msgstr ""
+
+#: wxwin/mainframe.cc:300
+msgid "Font for the search"
+msgstr ""
+
+#: wxwin/mainframe.cc:303 wxwin/mainframe.cc:327
+msgid "&Game"
+msgstr ""
+
+#: wxwin/mainframe.cc:303
+msgid "Configuration of the game"
+msgstr ""
+
+#: wxwin/mainframe.cc:304
+msgid "&Fonts"
+msgstr ""
+
+#: wxwin/mainframe.cc:304
+msgid "Configuration of the fonts"
+msgstr ""
+
+#: wxwin/mainframe.cc:305
+msgid "&Colors"
+msgstr ""
+
+#: wxwin/mainframe.cc:305
+msgid "Configuration of the colors"
+msgstr ""
+
+#: wxwin/mainframe.cc:306
+msgid "&Printing..."
+msgstr ""
+
+#: wxwin/mainframe.cc:306
+msgid "Configuration of the printing parameters"
+msgstr ""
+
+#: wxwin/mainframe.cc:309
+msgid "&Board"
+msgstr ""
+
+#: wxwin/mainframe.cc:309
+msgid "Game board"
+msgstr ""
+
+#: wxwin/mainframe.cc:310
+msgid "Ba&g"
+msgstr ""
+
+#: wxwin/mainframe.cc:310
+msgid "Remaining letters in the bag"
+msgstr ""
+
+#: wxwin/mainframe.cc:311
+msgid "&Check"
+msgstr ""
+
+#: wxwin/mainframe.cc:311
+msgid "Check a word in the dictionary"
+msgstr ""
+
+#: wxwin/mainframe.cc:312
+msgid "&Search"
+msgstr ""
+
+#: wxwin/mainframe.cc:312
+msgid "Search in the dictionary"
+msgstr ""
+
+#: wxwin/mainframe.cc:314
+msgid "&Rack + 1"
+msgstr ""
+
+#: wxwin/mainframe.cc:314
+msgid "Letters of the rack plus one"
+msgstr ""
+
+#: wxwin/mainframe.cc:315
+msgid "R&accords"
+msgstr ""
+
+#: wxwin/mainframe.cc:315
+msgid "Raccords on a word of the search"
+msgstr ""
+
+#: wxwin/mainframe.cc:316
+msgid "&Benjamins"
+msgstr ""
+
+#: wxwin/mainframe.cc:316
+msgid "Benjamins on a word of the search"
+msgstr ""
+
+#: wxwin/mainframe.cc:318
+msgid "Game &history"
+msgstr ""
+
+#: wxwin/mainframe.cc:320
+msgid "R&esults"
+msgstr ""
+
+#: wxwin/mainframe.cc:324
+msgid "&About..."
+msgstr ""
+
+#: wxwin/mainframe.cc:324 wxwin/mainframe.cc:722
+msgid "About Eliot"
+msgstr ""
+
+#: wxwin/mainframe.cc:328
+msgid "&Settings"
+msgstr ""
+
+#: wxwin/mainframe.cc:329
+msgid "&Windows"
+msgstr ""
+
+#: wxwin/mainframe.cc:330
+msgid "&Help"
+msgstr ""
+
+#: wxwin/mainframe.cc:354 wxwin/mainframe.cc:392
+msgid "No dictionary selected"
+msgstr ""
+
+#: wxwin/mainframe.cc:354 wxwin/mainframe.cc:392 wxwin/mainframe.cc:491
+#: wxwin/mainframe.cc:511 wxwin/mainframe.cc:542
+msgid "Eliot: error"
+msgstr ""
+
+#: wxwin/mainframe.cc:412
+msgid "Cannot open "
+msgstr ""
+
+#: wxwin/mainframe.cc:424 wxwin/mainframe.cc:433
+msgid "Error while loading the game"
+msgstr ""
+
+#: wxwin/mainframe.cc:425
+msgid "Invalid game"
+msgstr ""
+
+#: wxwin/mainframe.cc:434
+msgid "The game is empty"
+msgstr ""
+
+#: wxwin/mainframe.cc:464 wxwin/mainframe.cc:472
+msgid "Save the game"
+msgstr ""
+
+#: wxwin/mainframe.cc:471
+msgid "Cannot create "
+msgstr ""
+
+#: wxwin/mainframe.cc:500 wxwin/mainframe.cc:564
+msgid "Printing not done"
+msgstr ""
+
+#: wxwin/mainframe.cc:500 wxwin/mainframe.cc:528
+msgid "Printing"
+msgstr ""
+
+#: wxwin/mainframe.cc:523
+msgid "Print preview problem.\n"
+msgstr ""
+
+#: wxwin/mainframe.cc:524
+msgid "The printer may not be correctly initialized"
+msgstr ""
+
+#: wxwin/mainframe.cc:525
+msgid "Print preview"
+msgstr ""
+
+#: wxwin/mainframe.cc:546
+msgid "Print to a PostScript file"
+msgstr ""
+
+#: wxwin/mainframe.cc:565 wxwin/mainframe.cc:571
+msgid "PostScript printing"
+msgstr ""
+
+#: wxwin/mainframe.cc:570
+msgid "Cannot initialize PostScript printer"
+msgstr ""
+
+#: wxwin/mainframe.cc:718
+msgid ""
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version."
+msgstr ""
+
+#: wxwin/mainframe.cc:916
+msgid "turn:"
+msgstr ""
+
+#: wxwin/mainframe.cc:917
+msgid "points:"
+msgstr ""
+
+#: wxwin/mainframe.cc:954
+msgid ""
+"The bag doesn't contain enough letters\n"
+"for a new rack."
+msgstr ""
+
+#: wxwin/mainframe.cc:955 wxwin/mainframe.cc:959 wxwin/mainframe.cc:964
+msgid "Rack validation"
+msgstr ""
+
+#: wxwin/mainframe.cc:958
+msgid "The rack must contain at least 2 consonants and 2 vowels."
+msgstr ""
+
+#: wxwin/mainframe.cc:962
+msgid "The rack must contain at least 2 consonants and 2 vowels\n"
+msgstr ""
+
+#: wxwin/mainframe.cc:963
+msgid "but the bag doesn't contain enough letters.\n"
+msgstr ""
+
+#: wxwin/mainframe.cc:967
+msgid "The rack has been modified manually"
+msgstr ""
+
+#: wxwin/searchpanel.cc:303
+msgid "Minimum length"
+msgstr ""
+
+#: wxwin/searchpanel.cc:305
+msgid "Maximum length"
+msgstr ""
+
+#: wxwin/searchpanel.cc:368
+msgid "Cross words"
+msgstr ""
+
+#: wxwin/searchpanel.cc:369
+msgid "Plus 1"
+msgstr ""
+
+#: wxwin/searchpanel.cc:370
+msgid "Regular expressions"
+msgstr ""
Index: po/fr.po
===================================================================
RCS file: /cvsroot/eliot/eliot/po/fr.po,v
retrieving revision 1.6.6.2
retrieving revision 1.6.6.3
diff -u -b -r1.6.6.2 -r1.6.6.3
--- po/fr.po 8 Dec 2007 13:56:10 -0000 1.6.6.2
+++ po/fr.po 11 Dec 2007 14:07:14 -0000 1.6.6.3
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: eliot 1.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-05 14:49+0100\n"
+"POT-Creation-Date: 2007-12-11 15:06+0100\n"
"PO-Revision-Date: 2005-02-06 20:03+0100\n"
"Last-Translator: Olivier Teuliere <address@hidden>\n"
"Language-Team: French <address@hidden>\n"
@@ -17,22 +17,91 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: dic/compdic.cpp:405
+#: dic/header.cpp:317 dic/header.cpp:318
+msgid "Unknown (old format)"
+msgstr "Inconnu (vieux format)"
+
+#: dic/header.cpp:492
+#, c-format
+msgid "dictionary name: %s\n"
+msgstr "Nom du dictionnaire : %s\n"
+
+#: dic/header.cpp:497
+#, c-format
+msgid "compressed on: %s\n"
+msgstr "Compressé le : %s\n"
+
+#: dic/header.cpp:501
+#, c-format
+msgid "compressed on: Unknown date (old format)\n"
+msgstr "Compressé le : Date inconnue (vieux format)\n"
+
+#: dic/header.cpp:503
+#, c-format
+msgid "compressed using a binary compiled by: %s\n"
+msgstr "Compressé avec un binaire compilé par : %s\n"
+
+#: dic/header.cpp:504
+#, c-format
+msgid "dictionary type: %s\n"
+msgstr "Type de dictionnaire : %s\n"
+
+#: dic/header.cpp:505
+#, c-format
+msgid "letters: %s\n"
+msgstr "Lettres : %s\n"
+
+#: dic/header.cpp:506
+#, c-format
+msgid "number of letters: %d\n"
+msgstr "Nombre de lettres : %d\n"
+
+#: dic/header.cpp:507
+#, c-format
+msgid "number of words: %d\n"
+msgstr "Nombre de mots : %d\n"
+
+#: dic/header.cpp:508
+#, c-format
+msgid "header size: %u bytes\n"
+msgstr "Taille du header : %u octets\n"
+
+#: dic/header.cpp:510
+#, c-format
+msgid "root: %d (edge)\n"
+msgstr "Racine : %d (arcs)\n"
+
+#: dic/header.cpp:511
+#, c-format
+msgid "nodes: %d used + %d saved\n"
+msgstr "Noeuds : %d utilisés + %d évités\n"
+
+#: dic/header.cpp:512
+#, c-format
+msgid "edges: %d used + %d saved\n"
+msgstr "Arcs : %d utilisés + %d évités\n"
+
+#: dic/header.cpp:514
+#, c-format
+msgid "letter | points | frequency | vowel | consonant\n"
+msgstr "lettre | points | frequence | voye. | consonne\n"
+
+#: dic/compdic.cpp:387
msgid "Mandatory options:"
msgstr "Options obligatoires :"
-#: dic/compdic.cpp:406
+#: dic/compdic.cpp:388
msgid " -d, --dicname <string> Set the dictionary name and version"
msgstr " -d, --dicname <string> Choisir le nom et la version du dictionnaire"
-#: dic/compdic.cpp:407
+#: dic/compdic.cpp:389
msgid ""
" -l, --letters <string> Path to the file containing the letters (see below)"
msgstr ""
" -l, --letters <string> Chemin vers un fichier contenant les lettres (voir "
"ci-dessous)"
-#: dic/compdic.cpp:408
+#: dic/compdic.cpp:390
msgid ""
" -i, --input <string> Path to the uncompressed dictionary file (encoded "
"in UTF-8)"
@@ -40,56 +109,56 @@
" -i, --input <string> Chemin vers le fichier de dictionnaire non "
"compressé (encodé en UTF-8)"
-#: dic/compdic.cpp:409
+#: dic/compdic.cpp:391
msgid ""
" -o, --output <string Path to the generated compressed dictionary file"
msgstr ""
" -o, --output <string Chemin vers le fichier de dictionnaire compressé "
"généré"
-#: dic/compdic.cpp:410
+#: dic/compdic.cpp:392
msgid "Other options:"
msgstr "Autres options :"
-#: dic/compdic.cpp:411
+#: dic/compdic.cpp:393
msgid " -h, --help Print this help and exit"
msgstr " -h, --help Affiche cette aide et quitte"
-#: dic/compdic.cpp:412
+#: dic/compdic.cpp:394
msgid "Example:"
msgstr "Exemple :"
-#: dic/compdic.cpp:413
+#: dic/compdic.cpp:395
msgid " -d 'ODS 5.0' -l letters.txt -i ods5.txt -o ods5.dawg"
msgstr " -d 'ODS 5.0' -l lettres.txt -i ods5.txt -o ods5.dawg"
-#: dic/compdic.cpp:415
+#: dic/compdic.cpp:397
msgid ""
"The file containing the letters (--letters switch) must be UTF-8 encoded."
msgstr ""
"Le fichier contenant les lettres (option --letters) doit être encodé en UTF-"
"8."
-#: dic/compdic.cpp:416
+#: dic/compdic.cpp:398
msgid ""
"Each line corresponds to one letter, and must contain 5 fields separated "
"with "
msgstr ""
"Chaque ligne correspond à une lettre, et doit contenir 5 champs séparés par "
-#: dic/compdic.cpp:417
+#: dic/compdic.cpp:399
msgid "one or more space(s)."
msgstr "un ou plusieurs espace(s)."
-#: dic/compdic.cpp:418
+#: dic/compdic.cpp:400
msgid " - 1st field: the letter itself"
msgstr " - 1er champ : la lettre elle-même"
-#: dic/compdic.cpp:419
+#: dic/compdic.cpp:401
msgid " - 2nd field: the points of the letter"
msgstr " - 2e champ : les points de cette lettre"
-#: dic/compdic.cpp:420
+#: dic/compdic.cpp:402
msgid ""
" - 3rd field: the frequency of the letter (how many letters of this kind in "
"the game)"
@@ -97,7 +166,7 @@
" - 3e champ : la fréquance de la lettre (nombre de lettres de ce genre dans "
"le jeu)"
-#: dic/compdic.cpp:421
+#: dic/compdic.cpp:403
msgid ""
" - 4th field: 1 if the letter is considered as a vowel in Scrabble game, 0 "
"otherwise"
@@ -105,7 +174,7 @@
" - 4e champ : 1 si la lettre est considérée comme une voyelle au jeu de "
"Scrabble, 0 sinon"
-#: dic/compdic.cpp:422
+#: dic/compdic.cpp:404
msgid ""
" - 5th field: 1 if the letter is considered as a consonant in Scrabble game, "
"0 otherwise"
@@ -113,122 +182,53 @@
" - 5e champ : 1 si la lettre est considérée comme une consonne au jeu de "
"Scrabble, 0 sinon"
-#: dic/compdic.cpp:423
+#: dic/compdic.cpp:405
msgid "Example for french:"
msgstr "Exemple pour le Français :"
-#: dic/compdic.cpp:424
+#: dic/compdic.cpp:406
msgid "A 1 9 1 0"
msgstr "A 1 9 1 0"
-#: dic/compdic.cpp:425
+#: dic/compdic.cpp:407
msgid "[...]"
msgstr "[...]"
-#: dic/compdic.cpp:426
+#: dic/compdic.cpp:408
msgid "Z 10 1 0 1"
msgstr "Z 10 1 0 1"
-#: dic/compdic.cpp:427
+#: dic/compdic.cpp:409
msgid "? 0 2 1 1"
msgstr "? 0 2 1 1"
-#: dic/compdic.cpp:495
+#: dic/compdic.cpp:479
msgid "A mandatory option is missing"
msgstr "Une option obligatoire est manquante"
-#: dic/compdic.cpp:503
+#: dic/compdic.cpp:487
msgid "Cannot stat uncompressed dictionary "
msgstr "Impossible de trouver le dictionnaire non compressé "
-#: dic/compdic.cpp:511
+#: dic/compdic.cpp:495
msgid "Cannot open output file "
msgstr "Impossible d'ouvrir le fichier d'output "
-#: dic/compdic.cpp:561
+#: dic/compdic.cpp:543
#, c-format
msgid " Load time: %.3f s\n"
msgstr " Temps de chargement : %.3f s\n"
-#: dic/compdic.cpp:562
+#: dic/compdic.cpp:544
#, c-format
msgid " Compression time: %.3f s\n"
msgstr " Temps de compression : %.3f s\n"
-#: dic/compdic.cpp:564
+#: dic/compdic.cpp:546
#, c-format
msgid " Maximum recursion level reached: %d\n"
msgstr " Niveau maximum de rcursion atteint : %d\n"
-#: dic/header.cpp:306 dic/header.cpp:307
-msgid "Unknown (old format)"
-msgstr "Inconnu (vieux format)"
-
-#: dic/header.cpp:537
-#, c-format
-msgid "dictionary name: %s\n"
-msgstr "Nom du dictionnaire : %s\n"
-
-#: dic/header.cpp:538
-#, c-format
-msgid "dictionary type: %s\n"
-msgstr "Type de dictionnaire : %s\n"
-
-#: dic/header.cpp:543
-#, c-format
-msgid "compressed on: %s\n"
-msgstr "Compressé le : %s\n"
-
-#: dic/header.cpp:547
-#, c-format
-msgid "compressed on: Unknown date (old format)\n"
-msgstr "Compressé le : Date inconnue (vieux format)\n"
-
-#: dic/header.cpp:549
-#, c-format
-msgid "compressed using a binary compiled by: %ls\n"
-msgstr "Compressé avec un binaire compilé par : %ls\n"
-
-#: dic/header.cpp:550
-#, c-format
-msgid "letters: %ls\n"
-msgstr "Lettres : %ls\n"
-
-#: dic/header.cpp:551
-#, c-format
-msgid "number of letters: %d\n"
-msgstr "Nombre de lettres : %d\n"
-
-#: dic/header.cpp:552
-#, c-format
-msgid "number of words: %d\n"
-msgstr "Nombre de mots : %d\n"
-
-#: dic/header.cpp:553
-#, c-format
-msgid "header size: %u bytes\n"
-msgstr "Taille du header : %u octets\n"
-
-#: dic/header.cpp:555
-#, c-format
-msgid "root: %d (edge)\n"
-msgstr "Racine : %d (arcs)\n"
-
-#: dic/header.cpp:556
-#, c-format
-msgid "nodes: %d used + %d saved\n"
-msgstr "Noeuds : %d utilisés + %d évités\n"
-
-#: dic/header.cpp:557
-#, c-format
-msgid "edges: %d used + %d saved\n"
-msgstr "Arcs : %d utilisés + %d évités\n"
-
-#: dic/header.cpp:559
-#, c-format
-msgid "letter | points | frequency | vowel | consonant\n"
-msgstr "lettre | points | frequence | voye. | consonne\n"
-
#: dic/listdic.cpp:100
#, c-format
msgid "offset binary | structure\n"
@@ -342,7 +342,7 @@
#: utils/ncurses.cpp:318
msgid " s, S Save the game"
-msgstr " s, S Sauver la partie"
+msgstr " s, S Sauvegarder la partie"
#: utils/ncurses.cpp:319
msgid " l, L Load a game"
@@ -449,7 +449,7 @@
#: utils/ncurses.cpp:406
msgid " Save the game "
-msgstr " Sauver la partie "
+msgstr " Sauvegarder la partie "
#: utils/ncurses.cpp:407 utils/ncurses.cpp:436
msgid "Enter the file name:"
@@ -524,14 +524,716 @@
msgid "[h for help]"
msgstr "[h pour l'aide]"
+#: wxwin/auxframes.cc:123
+msgid "Grid"
+msgstr "Grille"
+
+#: wxwin/auxframes.cc:148
+msgid "Bag"
+msgstr "Sac"
+
+#: wxwin/auxframes.cc:203
+msgid "Search"
+msgstr "Recherche"
+
+#: wxwin/auxframes.cc:234
+msgid "Check"
+msgstr "Vérification"
+
+#: wxwin/auxframes.cc:239
+msgid "Word to check"
+msgstr "Mot à vérifier"
+
+#: wxwin/auxframes.cc:257 wxwin/configdb.cc:203 wxwin/searchpanel.cc:107
+msgid "No dictionary"
+msgstr "Pas de dictionnaire"
+
+#: wxwin/auxframes.cc:261
+msgid "exists"
+msgstr "existe"
+
+#: wxwin/auxframes.cc:263
+msgid "doesn't exist"
+msgstr "n'existe pas"
+
+#: wxwin/auxframes.cc:304
+msgid "Copy"
+msgstr "Copier"
+
+#: wxwin/auxframes.cc:348 wxwin/mainframe.cc:491 wxwin/mainframe.cc:511
+#: wxwin/mainframe.cc:542
+msgid "No on going game"
+msgstr "Pas de partie en cours"
+
+#: wxwin/auxframes.cc:363 wxwin/searchpanel.cc:119
+msgid "No result"
+msgstr "Pas de résultat"
+
+#: wxwin/auxframes.cc:409
+msgid "Rack: "
+msgstr "Tirage :"
+
+#: wxwin/auxframes.cc:525 wxwin/mainframe.cc:318
+msgid "Game history"
+msgstr "Historique de la partie"
+
+#: wxwin/auxframes.cc:557 wxwin/mainframe.cc:320
+msgid "Results"
+msgstr "Résultats"
+
+#: wxwin/confdimdlg.cc:62
+msgid "left"
+msgstr "gauche"
+
+#: wxwin/confdimdlg.cc:63
+msgid "centered"
+msgstr "centré"
+
+#: wxwin/confdimdlg.cc:64
+msgid "right"
+msgstr "droite"
+
+#: wxwin/confdimdlg.cc:118
+msgid "Alignment"
+msgstr "Justification"
+
+#: wxwin/confdimdlg.cc:120
+msgid "Spacing"
+msgstr "Espacement"
+
+#: wxwin/confdimdlg.cc:124 wxwin/confdimdlg.cc:135
+msgid "Font..."
+msgstr "Police..."
+
+#: wxwin/confdimdlg.cc:129
+msgid "Title column "
+msgstr "titre colomne "
+
+#: wxwin/confdimdlg.cc:140
+msgid "Text column "
+msgstr "Texte colomne "
+
+#: wxwin/confdimdlg.cc:150
+msgid "Column heading"
+msgstr "Titre de la colomne"
+
+#: wxwin/confdimdlg.cc:154
+msgid "Alignment of the column heading"
+msgstr "Justification du titre de la colomne"
+
+#: wxwin/confdimdlg.cc:158
+msgid "Spacing of the heading characters"
+msgstr "Espacement des caractères du titre"
+
+#: wxwin/confdimdlg.cc:167
+msgid "Inner dimension of the column (in mm)"
+msgstr "Dimension interne de la colomne (en mm)"
+
+#: wxwin/confdimdlg.cc:176
+msgid "Alignment of the column text"
+msgstr "Justification du texte de la colomne"
+
+#: wxwin/confdimdlg.cc:180
+msgid "Characters spacing"
+msgstr "Espacement des caractères"
+
+#: wxwin/confdimdlg.cc:231
+msgid "Title spc. top"
+msgstr "Titre esp. haut"
+
+#: wxwin/confdimdlg.cc:233
+msgid "Text spc. top"
+msgstr "Texte esp. haut"
+
+#: wxwin/confdimdlg.cc:235
+msgid "Text spc. left"
+msgstr "Texte esp. gauche"
+
+#: wxwin/confdimdlg.cc:252
+msgid "Title spc. bot."
+msgstr "Titre esp. bas"
+
+#: wxwin/confdimdlg.cc:254
+msgid "Text spc. bot."
+msgstr "Texte esp. bas"
+
+#: wxwin/confdimdlg.cc:256
+msgid "Text spc. right"
+msgstr "Text esp. droite"
+
+#: wxwin/confdimdlg.cc:286
+msgid "Printer"
+msgstr "Imprimante"
+
+#: wxwin/confdimdlg.cc:288
+msgid "Configure the printer"
+msgstr "Configuration de l'imprimante"
+
+#: wxwin/confdimdlg.cc:290
+msgid "Page"
+msgstr "Page"
+
+#: wxwin/confdimdlg.cc:292
+msgid "Configure the dimensions of the page"
+msgstr "Configuration des dimensions de la page"
+
+#: wxwin/confdimdlg.cc:298
+msgid "Cancel the last changes"
+msgstr "Annuler les derniers changements"
+
+#: wxwin/confdimdlg.cc:304 wxwin/confsearch.cc:42
+msgid "Save the changes"
+msgstr "Sauvegarder les changements"
+
+#: wxwin/configdb.cc:322
+msgid "Nb"
+msgstr "Num"
+
+#: wxwin/configdb.cc:323 wxwin/mainframe.cc:173
+msgid "Rack"
+msgstr "Tirage"
+
+#: wxwin/configdb.cc:324
+msgid "Solution"
+msgstr "Solution"
+
+#: wxwin/configdb.cc:325 wxwin/gfxresult.cc:69
+msgid "Pos"
+msgstr "Pos"
+
+#: wxwin/configdb.cc:326 wxwin/gfxresult.cc:70
+msgid "Pts"
+msgstr "Pts"
+
+#: wxwin/confsearch.cc:36
+msgid "Search on joker in 7+1 panel"
+msgstr "Rechercher sur joker dans la fenêtre 7+1"
+
+#: wxwin/confsearch.cc:37
+msgid "Check rack validity"
+msgstr "Vérifier la validité du tirage"
+
+#: wxwin/confsearch.cc:40
+msgid "Cancel last changes"
+msgstr "Annuler les derniers changements"
+
+#: wxwin/gfxresult.cc:67
+msgid "Word"
+msgstr "Mot"
+
+#: wxwin/gfxresult.cc:71
+msgid "Results of the search"
+msgstr "Résultats de la recherche"
+
+#: wxwin/mainframe.cc:204
+msgid " Rack "
+msgstr " Tirage "
+
+#: wxwin/mainframe.cc:205
+msgid " Complement "
+msgstr " Complément "
+
+#: wxwin/mainframe.cc:206
+msgid " Search "
+msgstr " Rechercher "
+
+#: wxwin/mainframe.cc:207
+msgid " Back "
+msgstr " Arrière "
+
+#: wxwin/mainframe.cc:208
+msgid " Play "
+msgstr " Jouer "
+
+#: wxwin/mainframe.cc:210
+msgid "Random rack"
+msgstr "Tirage aléatoire"
+
+#: wxwin/mainframe.cc:211
+msgid "Random complement of the rack"
+msgstr "Complément aléatoire du tirage"
+
+#: wxwin/mainframe.cc:212
+msgid "Search with the current rack"
+msgstr "Recherche sur le tirage courant"
+
+#: wxwin/mainframe.cc:213
+msgid "Go back one turn"
+msgstr "Revenir un coup en arrière"
+
+#: wxwin/mainframe.cc:214
+msgid "Play the selected word"
+msgstr "Jouer le mot selectionné"
+
+#: wxwin/mainframe.cc:265
+msgid "&New game\tctrl+n"
+msgstr "&Nouvelle partie\tctrl+n"
+
+#: wxwin/mainframe.cc:265
+msgid "Start a new game"
+msgstr "Démarrer une nouvelle partie"
+
+#: wxwin/mainframe.cc:266
+msgid "New &joker game\tctrl+j"
+msgstr "Nouvelle partie &joker\tctrl+j"
+
+#: wxwin/mainframe.cc:266
+msgid "Start a new joker game"
+msgstr "Démarrer une nouvelle partie joker"
+
+#: wxwin/mainframe.cc:268
+msgid "&Load...\tctrl+l"
+msgstr "&Charger...\tctrl+l"
+
+#: wxwin/mainframe.cc:268 wxwin/mainframe.cc:389 wxwin/mainframe.cc:413
+msgid "Load a game"
+msgstr "Charger une partie"
+
+#: wxwin/mainframe.cc:269
+msgid "&Save as...\tctrl+s"
+msgstr "&Enregistrer sous...\tctrl+s"
+
+#: wxwin/mainframe.cc:269
+msgid "Save the current game"
+msgstr "Sauvegarder la partie en cours"
+
+#: wxwin/mainframe.cc:271
+msgid "&Print...\tctrl+p"
+msgstr "&Imprimer...\tctrl+p"
+
+#: wxwin/mainframe.cc:271
+msgid "Print this game"
+msgstr "Imprimer la partie en cours"
+
+#: wxwin/mainframe.cc:272
+msgid "Print pre&view..."
+msgstr "&Aperçu avant impression..."
+
+#: wxwin/mainframe.cc:272
+msgid "Print preview of the game"
+msgstr "Aperçu avant impression de la partie"
+
+#: wxwin/mainframe.cc:274
+msgid "Print in PostS&cript..."
+msgstr "Imprimer au format &PostScript..."
+
+#: wxwin/mainframe.cc:274
+msgid "Print in a PostScript file"
+msgstr "Imprimer dans un fichier PostScript"
+
+#: wxwin/mainframe.cc:277
+msgid "&Quit"
+msgstr "&Quitter"
+
+#: wxwin/mainframe.cc:277
+msgid "Quit Eliot"
+msgstr "Quitter Eliot"
+
+#: wxwin/mainframe.cc:280
+msgid "&Dictionary..."
+msgstr "&Dictionnaire..."
+
+#: wxwin/mainframe.cc:280 wxwin/mainframe.cc:593
+msgid "Choose a dictionary"
+msgstr "Choisir un dictionnaire"
+
+#: wxwin/mainframe.cc:281
+msgid "&Search..."
+msgstr "&Recherche..."
+
+#: wxwin/mainframe.cc:281
+msgid "Search options"
+msgstr "Options de recherche"
+
+#: wxwin/mainframe.cc:284
+msgid "&Background..."
+msgstr "&Fond..."
+
+#: wxwin/mainframe.cc:284
+msgid "Background color"
+msgstr "Couleur de fond"
+
+#: wxwin/mainframe.cc:285
+msgid "L&ines..."
+msgstr "L&ignes..."
+
+#: wxwin/mainframe.cc:285
+msgid "Color of the lines"
+msgstr "Couleur des lignes"
+
+#: wxwin/mainframe.cc:287
+msgid "&Played letters..."
+msgstr "Lettres &jouées..."
+
+#: wxwin/mainframe.cc:287
+msgid "Color of the letters played on the board"
+msgstr "Couleur des lettres jouées sur la grille"
+
+#: wxwin/mainframe.cc:288
+msgid "&Temporary letters..."
+msgstr "Lettres &temporaires..."
+
+#: wxwin/mainframe.cc:288
+msgid "Color of the letters of the temporary word"
+msgstr "Couleur des lettres du mot temporaire"
+
+#: wxwin/mainframe.cc:289
+msgid "B&ackground of played letters..."
+msgstr "Fo&nd des lettres jouées..."
+
+#: wxwin/mainframe.cc:289
+msgid "Background color of the letters played on the board"
+msgstr "Couleur de fond des lettres jouées sur la grille"
+
+#: wxwin/mainframe.cc:290
+msgid "Ba&ckground of temporary letters..."
+msgstr "Fon&d des lettres temporaires..."
+
+#: wxwin/mainframe.cc:290
+msgid "Background color of the temporary letters on the board"
+msgstr "Couleur de fond des lettres temporaires sur la grille"
+
+#: wxwin/mainframe.cc:292
+msgid "Double &letter..."
+msgstr "&Lettre compte double..."
+
+#: wxwin/mainframe.cc:292
+msgid "Color of the \"double letter\" squares"
+msgstr "Couleur des cases \"mot compte double\""
+
+#: wxwin/mainframe.cc:293
+msgid "Triple l&etter..."
+msgstr "L&ettre compte triple..."
+
+#: wxwin/mainframe.cc:293
+msgid "Color of the \"triple letter\" squares"
+msgstr "Couleur des cases \"mot compte triple\""
+
+#: wxwin/mainframe.cc:294
+msgid "Double &word..."
+msgstr "&Mot compte double..."
+
+#: wxwin/mainframe.cc:294
+msgid "Color of the \"double word\" squares"
+msgstr "Couleur des cases \"mot compte double\""
+
+#: wxwin/mainframe.cc:295
+msgid "Triple w&ord..."
+msgstr "M&ot compte triple..."
+
+#: wxwin/mainframe.cc:295
+msgid "Color of the \"triple word\" squares"
+msgstr "Couleur des cases \"mot compte triple\""
+
+#: wxwin/mainframe.cc:297
+msgid "&Default colors"
+msgstr "&Couleurs d'origine"
+
+#: wxwin/mainframe.cc:297
+msgid "Restore the default colors"
+msgstr "Restaurer les couleurs d'origine"
+
+#: wxwin/mainframe.cc:300
+msgid "&Search letters..."
+msgstr "&Lettres de recherche..."
+
+#: wxwin/mainframe.cc:300
+msgid "Font for the search"
+msgstr "Police de caractères pour la recherche"
+
+#: wxwin/mainframe.cc:303 wxwin/mainframe.cc:327
+msgid "&Game"
+msgstr "&Partie"
+
+#: wxwin/mainframe.cc:303
+msgid "Configuration of the game"
+msgstr "Configuration de la partie"
+
+#: wxwin/mainframe.cc:304
+msgid "&Fonts"
+msgstr "P&olices de caractères"
+
+#: wxwin/mainframe.cc:304
+msgid "Configuration of the fonts"
+msgstr "Configuration des polices de caractères"
+
+#: wxwin/mainframe.cc:305
+msgid "&Colors"
+msgstr "&Couleurs"
+
+#: wxwin/mainframe.cc:305
+msgid "Configuration of the colors"
+msgstr "Configuration des couleurs"
+
+#: wxwin/mainframe.cc:306
+msgid "&Printing..."
+msgstr "&Impression..."
+
+#: wxwin/mainframe.cc:306
+msgid "Configuration of the printing parameters"
+msgstr "Configuration des paramètres d'impression"
+
+#: wxwin/mainframe.cc:309
+msgid "&Board"
+msgstr "&Grille"
+
+#: wxwin/mainframe.cc:309
+msgid "Game board"
+msgstr "Plateau de jeu"
+
+#: wxwin/mainframe.cc:310
+msgid "Ba&g"
+msgstr "&Sac"
+
+#: wxwin/mainframe.cc:310
+msgid "Remaining letters in the bag"
+msgstr "Lettres restantes dans le sac"
+
+#: wxwin/mainframe.cc:311
+msgid "&Check"
+msgstr "&Vérification"
+
+#: wxwin/mainframe.cc:311
+msgid "Check a word in the dictionary"
+msgstr "Vérifier l'existence d'un mot dans le dictionnaire"
+
+#: wxwin/mainframe.cc:312
+msgid "&Search"
+msgstr "&Recherche"
+
+#: wxwin/mainframe.cc:312
+msgid "Search in the dictionary"
+msgstr "Recherche dans le dictionnaire"
+
+#: wxwin/mainframe.cc:314
+msgid "&Rack + 1"
+msgstr "&Tirage + 1"
+
+#: wxwin/mainframe.cc:314
+msgid "Letters of the rack plus one"
+msgstr "Lettres du tirage plus une"
+
+#: wxwin/mainframe.cc:315
+msgid "R&accords"
+msgstr "R&accords"
+
+#: wxwin/mainframe.cc:315
+msgid "Raccords on a word of the search"
+msgstr "Raccords sur un mot de la recherche"
+
+#: wxwin/mainframe.cc:316
+msgid "&Benjamins"
+msgstr "&Benjamins"
+
+#: wxwin/mainframe.cc:316
+msgid "Benjamins on a word of the search"
+msgstr "Benjamins sur un mot de la recherche"
+
+#: wxwin/mainframe.cc:318
+msgid "Game &history"
+msgstr "&Historique de la partie"
+
+#: wxwin/mainframe.cc:320
+msgid "R&esults"
+msgstr "Ré&sultats"
+
+#: wxwin/mainframe.cc:324
+msgid "&About..."
+msgstr "À &propos..."
+
+#: wxwin/mainframe.cc:324 wxwin/mainframe.cc:722
+msgid "About Eliot"
+msgstr "À propos d'Eliot"
+
+#: wxwin/mainframe.cc:328
+msgid "&Settings"
+msgstr "&Paramètres"
+
+#: wxwin/mainframe.cc:329
+msgid "&Windows"
+msgstr "&Fenêtres"
+
+#: wxwin/mainframe.cc:330
+msgid "&Help"
+msgstr "&Aide"
+
+#: wxwin/mainframe.cc:354 wxwin/mainframe.cc:392
+msgid "No dictionary selected"
+msgstr "Pas de dictionnaire sélectionné"
+
+#: wxwin/mainframe.cc:354 wxwin/mainframe.cc:392 wxwin/mainframe.cc:491
+#: wxwin/mainframe.cc:511 wxwin/mainframe.cc:542
+msgid "Eliot: error"
+msgstr "Eliot : erreur"
+
+#: wxwin/mainframe.cc:412
+msgid "Cannot open "
+msgstr "Impossible d'ouvrir "
+
+#: wxwin/mainframe.cc:424 wxwin/mainframe.cc:433
+msgid "Error while loading the game"
+msgstr "Erreur pendant le chargement de la partie"
+
+#: wxwin/mainframe.cc:425
+msgid "Invalid game"
+msgstr "Partie invalide"
+
+#: wxwin/mainframe.cc:434
+msgid "The game is empty"
+msgstr "La partie est vide"
+
+#: wxwin/mainframe.cc:464 wxwin/mainframe.cc:472
+msgid "Save the game"
+msgstr "Sauvegarder la partie"
+
+#: wxwin/mainframe.cc:471
+msgid "Cannot create "
+msgstr "Impossible de créer "
+
+#: wxwin/mainframe.cc:500 wxwin/mainframe.cc:564
+msgid "Printing not done"
+msgstr "Impression non effectuée"
+
+#: wxwin/mainframe.cc:500 wxwin/mainframe.cc:528
+msgid "Printing"
+msgstr "Impression"
+
+#: wxwin/mainframe.cc:523
+msgid "Print preview problem.\n"
+msgstr "Problème avec l'aperçu avant impression.\n"
+
+#: wxwin/mainframe.cc:524
+msgid "The printer may not be correctly initialized"
+msgstr "Il se peut que l'imprimante soit mal initialisée"
+
+#: wxwin/mainframe.cc:525
+msgid "Print preview"
+msgstr "Aperçu avant impression"
+
+#: wxwin/mainframe.cc:546
+msgid "Print to a PostScript file"
+msgstr "Imprimer dans un fichier PostScript"
+
+#: wxwin/mainframe.cc:565 wxwin/mainframe.cc:571
+msgid "PostScript printing"
+msgstr "Impression PostScript"
+
+#: wxwin/mainframe.cc:570
+msgid "Cannot initialize PostScript printer"
+msgstr "Impossible d'initialiser l'impression PostScript"
+
+#: wxwin/mainframe.cc:718
+msgid ""
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version."
+msgstr ""
+"Ce programme est un logiciel libre ; vous pouvez le redistribuer et/ou le "
+"modifier selon les termes de la licence \"GNU General Public License\" "
+"publiée par la Free Software Fundation ; soit la version 2 de la Licence, "
+"soit (comme vous le préférez), n'importe quelle version ultérieure."
+
+#: wxwin/mainframe.cc:916
+msgid "turn:"
+msgstr "coup :"
+
+#: wxwin/mainframe.cc:917
+msgid "points:"
+msgstr "points :"
+
+#: wxwin/mainframe.cc:954
+msgid ""
+"The bag doesn't contain enough letters\n"
+"for a new rack."
+msgstr ""
+"Le sac ne contient pas assez de lettres\n"
+"pour un nouveau tirage."
+
+#: wxwin/mainframe.cc:955 wxwin/mainframe.cc:959 wxwin/mainframe.cc:964
+msgid "Rack validation"
+msgstr "Validation du tirage"
+
+#: wxwin/mainframe.cc:958
+msgid "The rack must contain at least 2 consonants and 2 vowels."
+msgstr "Le tirage doit contenir au moins 2 consonnes et 2 voyelles."
+
+#: wxwin/mainframe.cc:962
+msgid "The rack must contain at least 2 consonants and 2 vowels\n"
+msgstr "Le tirage doit contenir au moins 2 consonnes et 2 voyelles\n"
+
+#: wxwin/mainframe.cc:963
+msgid "but the bag doesn't contain enough letters.\n"
+msgstr "mais le sac ne contient plus assez de lettres.\n"
+
+#: wxwin/mainframe.cc:967
+msgid "The rack has been modified manually"
+msgstr "Le tirage a été modifié manuellement"
+
+#: wxwin/searchpanel.cc:303
+msgid "Minimum length"
+msgstr "Longueur minimum"
+
+#: wxwin/searchpanel.cc:305
+msgid "Maximum length"
+msgstr "Longueur maximum"
+
+#: wxwin/searchpanel.cc:368
+msgid "Cross words"
+msgstr "Mots croisés"
+
+#: wxwin/searchpanel.cc:369
+msgid "Plus 1"
+msgstr "Plus 1"
+
+#: wxwin/searchpanel.cc:370
+msgid "Regular expressions"
+msgstr "Expressions régulières"
+
+#~ msgid "&Configuration"
+#~ msgstr "&Configuration"
+
+#~ msgid "Game"
+#~ msgstr "Partie"
+
+#~ msgid "Word counts double..."
+#~ msgstr "Mot compte double..."
+
+#~ msgid "Word counts triple..."
+#~ msgstr "Mot compte triple..."
+
+#~ msgid "Letter counts double..."
+#~ msgstr "Lettre compte double..."
+
+#~ msgid "Color of the \"letter counts double\" squares"
+#~ msgstr "Couleur des cases \"lettre compte double\""
+
+#~ msgid "Letter counts triple..."
+#~ msgstr "Lettre compte triple..."
+
+#~ msgid "Color of the \"letter counts triple\" squares"
+#~ msgstr "Couleur des cases \"lettre compte triple\""
+
+#, fuzzy
+#~ msgid "Fonte des lettres"
+#~ msgstr "Entrer les nouvelles lettres:"
+
+#~ msgid "Game..."
+#~ msgstr "Partie..."
+
+#, fuzzy
+#~ msgid "Results..."
+#~ msgstr "Résultat"
+
+#, fuzzy
+#~ msgid "Dictionnaire"
+#~ msgstr " Dictionnaire "
+
#~ msgid "Usage: eliotcurses /path/to/ods4.dawg\n"
#~ msgstr "Usage: eliotcurses /chemin vers/ods4.dawg\n"
#~ msgid "Played word: "
#~ msgstr "Mot joué :"
-#~ msgid "Training"
-#~ msgstr "Entraînement"
-
#~ msgid "Duplicate"
#~ msgstr "Duplicate"
Index: wxwin/Makefile.am
===================================================================
RCS file: /cvsroot/eliot/eliot/wxwin/Makefile.am,v
retrieving revision 1.9.2.4
retrieving revision 1.9.2.5
diff -u -b -r1.9.2.4 -r1.9.2.5
--- wxwin/Makefile.am 6 Dec 2007 13:24:49 -0000 1.9.2.4
+++ wxwin/Makefile.am 11 Dec 2007 14:07:14 -0000 1.9.2.5
@@ -16,13 +16,15 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+localedir = $(datadir)/locale
+
if BUILD_WXWIDGETS
bin_PROGRAMS = eliot
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/dic -I$(top_srcdir)/game
+AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" @WX_CPPFLAGS@ ##
-Wno-strict-aliasing
-AM_CPPFLAGS = @WX_CPPFLAGS@ ## -Wno-strict-aliasing
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/dic -I$(top_srcdir)/game
eliot_SOURCES = \
configdb.cc configdb.h \
Index: wxwin/auxframes.cc
===================================================================
RCS file: /cvsroot/eliot/eliot/wxwin/auxframes.cc,v
retrieving revision 1.22.2.4
retrieving revision 1.22.2.5
diff -u -b -r1.22.2.4 -r1.22.2.5
--- wxwin/auxframes.cc 5 Dec 2007 10:36:01 -0000 1.22.2.4
+++ wxwin/auxframes.cc 11 Dec 2007 14:07:15 -0000 1.22.2.5
@@ -120,7 +120,7 @@
/****************************************************************/
BoardFrame::BoardFrame(wxFrame* parent, Game& iGame):
- AuxFrame(parent, ID_Frame_Board, _("Grille"), FRAMEBOARD)
+ AuxFrame(parent, ID_Frame_Board, _("Grid"), FRAMEBOARD)
{
board = new GfxBoard(this, iGame);
wxBoxSizer *sizer = new wxBoxSizer( wxHORIZONTAL );
@@ -145,7 +145,7 @@
/****************************************************************/
BagFrame::BagFrame(wxFrame* parent, Game& iGame):
- AuxFrame(parent, ID_Frame_Bag, _("sac"), FRAMEBAG),
+ AuxFrame(parent, ID_Frame_Bag, _("Bag"), FRAMEBAG),
m_game(iGame)
{
tiles = new wxListCtrl(this, -1);
@@ -200,7 +200,7 @@
/****************************************************************/
SearchFrame::SearchFrame(wxFrame *parent, const Dictionary &_dic):
- AuxFrame(parent, ID_Frame_Search, _("recherche"), FRAMESEARCH)
+ AuxFrame(parent, ID_Frame_Search, _("Search"), FRAMESEARCH)
{
panel = new SearchPanel(this, _dic);
wxBoxSizer *sizer = new wxBoxSizer( wxHORIZONTAL );
@@ -231,12 +231,12 @@
END_EVENT_TABLE()
VerifFrame::VerifFrame(wxFrame* parent, const Dictionary &_dic):
- AuxFrame(parent, ID_Frame_Verif, _("verification"), FRAMEVERIF)
+ AuxFrame(parent, ID_Frame_Verif, _("Check"), FRAMEVERIF)
{
dic = &_dic;
word = new wxTextCtrl(this, Word_Id, wxT(""));
word->SetFont(config.getFont(LISTFONT));
- word->SetToolTip(_("Mot a verifier"));
+ word->SetToolTip(_("Word to check"));
result = new wxStaticText(this, Result_Id, wxT(""));
result->SetFont(config.getFont(LISTFONT));
wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
@@ -254,13 +254,13 @@
{
if (dic == NULL)
{
- result->SetLabel(_("pas de dictionnaire"));
+ result->SetLabel(_("No dictionary"));
return;
}
if (dic->searchWord(word->GetValue().wc_str()))
- result->SetLabel(_("existe"));
+ result->SetLabel(_("exists"));
else
- result->SetLabel(_("n'existe pas"));
+ result->SetLabel(_("doesn't exist"));
}
void
@@ -301,7 +301,7 @@
listbox->SetToolTip(name);
sizer_v->Add(listbox, 1, wxEXPAND | wxALL, 1);
- button = new wxButton(this, ButtonCopyID, _("Copier"), wxPoint(0, 0),
wxSize(-1, -1));
+ button = new wxButton(this, ButtonCopyID, _("Copy"), wxPoint(0, 0),
wxSize(-1, -1));
sizer_v->Add(button, 0, wxEXPAND | wxALL, 1);
wxBoxSizer *sizer = new wxBoxSizer( wxHORIZONTAL );
@@ -345,20 +345,10 @@
if (game == NULL)
{
listbox->Clear();
- listbox->Append(_("Pas de partie en cours"));
+ listbox->Append(_("No on going game"));
//debug(" %s : Refresh end - no game\n",(const
char*)name.mb_str());
return;
}
- // Should never happen, since a game always has a dictionary
- /*
- if (game->getDic() == NULL)
- {
- listbox->Clear();
- listbox->Append(_("Pas de dictionnaire"));
- //debug(" %s : Refresh end - no dictionnary\n",(const
char*)name.mb_str());
- return;
- }
- */
if (show == 0)
{
//debug(" %s : Refresh end - no window\n",(const
char*)name.mb_str());
@@ -370,7 +360,7 @@
{
//debug(" %s : noresult == true\n",(const char*)name.mb_str());
listbox->Clear();
- listbox->Append(_("Aucun resultat"));
+ listbox->Append(_("No result"));
}
//debug(" %s : Refresh end\n",(const char*)name.mb_str());
}
@@ -416,7 +406,7 @@
wxString *res = new wxString[sum];
int resnum = 0;
- res[resnum++] = wxString(_("Tirage: ")) + wxString(wxU(rack.c_str()));
+ res[resnum++] = wxString(_("Rack: ")) + wxString(wxU(rack.c_str()));
for (it = wordList.begin(); it != wordList.end(); it++)
{
if (it->first)
@@ -532,7 +522,7 @@
/****************************************************************/
GameFrame::GameFrame(wxFrame* parent, Game& iGame):
- AuxFrameText(parent, ID_Frame_Game, _("partie"), FRAMEGAME, wxTE_MULTILINE
| wxTE_READONLY | wxTE_DONTWRAP),
+ AuxFrameText(parent, ID_Frame_Game, _("Game history"), FRAMEGAME,
wxTE_MULTILINE | wxTE_READONLY | wxTE_DONTWRAP),
m_game(iGame)
{
textbox->Clear();
@@ -564,7 +554,7 @@
END_EVENT_TABLE()
ResultFrame::ResultFrame(wxFrame* parent, Game* iGame):
- AuxFrame(parent, ID_Frame_Result, _("results"), FRAMERESULT)
+ AuxFrame(parent, ID_Frame_Result, _("Results"), FRAMERESULT)
{
reslist = new GfxResult(this, (MainFrame*)parent, iGame);
Index: wxwin/confdimdlg.cc
===================================================================
RCS file: /cvsroot/eliot/eliot/wxwin/confdimdlg.cc,v
retrieving revision 1.8.4.1
retrieving revision 1.8.4.2
diff -u -b -r1.8.4.1 -r1.8.4.2
--- wxwin/confdimdlg.cc 11 Nov 2007 19:57:00 -0000 1.8.4.1
+++ wxwin/confdimdlg.cc 11 Dec 2007 14:07:15 -0000 1.8.4.2
@@ -28,8 +28,6 @@
#include "confdimdlg.h"
enum {
- Button_Ok,
- Button_Cancel,
Button_Printer,
Button_Page,
Button_Save,
@@ -39,10 +37,9 @@
BEGIN_EVENT_TABLE(ConfDimDlg,wxDialog)
EVT_CLOSE (ConfDimDlg::OnCloseWindow)
- EVT_BUTTON(Button_Ok, ConfDimDlg::OnButtonOk)
+ EVT_BUTTON(wxID_OK, ConfDimDlg::OnButtonOk)
+ EVT_BUTTON(wxID_CANCEL, ConfDimDlg::OnButtonCancel)
EVT_BUTTON(Button_Save, ConfDimDlg::OnButtonSave)
- EVT_BUTTON(Button_Ok, ConfDimDlg::OnButtonOk)
- EVT_BUTTON(Button_Cancel, ConfDimDlg::OnButtonCancel)
EVT_BUTTON(Button_Printer, ConfDimDlg::OnConfPrinter)
EVT_BUTTON(Button_Page, ConfDimDlg::OnConfPage)
EVT_BUTTON(Button_FontHeader, ConfDimDlg::OnConfFontHead)
@@ -58,14 +55,13 @@
ConfDimDlg::ConfDimDlg(wxWindow* parent, wxPrintData pd, wxPageSetupData psd)
- : wxDialog(parent, -1, wxString(wxT("Eliot : Impression")))
+ : wxDialog(parent, -1, wxString(wxT("Eliot: Printing")))
{
int i;
wxString choices[3];
- choices[0] = wxT("gauche");
-// XXX: choices[1] = wxT("centré");
- choices[1] = wxT("centre");
- choices[2] = wxT("droite");
+ choices[0] = _("left");
+ choices[1] = _("centered");
+ choices[2] = _("right");
wxStaticText* Hcomment[5];
wxRect Hcommentrect[5];
wxRect Htitlerect[5];
@@ -119,31 +115,29 @@
#define ESPSIZE wxSize(spacerect.GetRight() - spacerect.GetLeft(),-1)
- wxStaticText* justif = new
wxStaticText(this,-1,wxT("Justification"),wxPoint(0,0));
+ wxStaticText* justif = new wxStaticText(this,-1,_("Alignment"),wxPoint(0,0));
wxRect justifrect = justif->GetRect();
- wxStaticText* space = new
wxStaticText(this,-1,wxT("Espacement"),wxPoint(0,0));
+ wxStaticText* space = new wxStaticText(this,-1,_("Spacing"),wxPoint(0,0));
wxRect spacerect = space->GetRect();
// heading, first part
-// XXX: bfontheader = new
wxButton(this,Button_FontHeader,wxT("Caractères"),HFONT);
- bfontheader = new wxButton(this,Button_FontHeader,wxT("Caracteres"),HFONT);
+ bfontheader = new wxButton(this,Button_FontHeader,_("Font..."),HFONT);
wxRect bfontheadrect = bfontheader->GetRect();
for(i=0; i<5; i++)
{
wxString txt;
- txt << wxT("Titre colonne ") << (i+1);
+ txt << _("Title column ") << (i+1);
Hcomment[i] = new wxStaticText(this,-1,txt,HCOMMENT(i));
Hcommentrect[i] = Hcomment[i]->GetRect();
}
// text, first part
-// XXX: bfonttext = new
wxButton(this,Button_FontText,wxT("Caractères"),TFONT);
- bfonttext = new wxButton(this,Button_FontText,wxT("Caracteres"),TFONT);
+ bfonttext = new wxButton(this,Button_FontText,_("Font..."),TFONT);
wxRect bfonttextrect = bfonttext->GetRect();
for(i=0; i<5; i++)
{
wxString txt;
- txt << wxT("Texte colonne ") << (i+1);
+ txt << _("Text column ") << (i+1);
Tcomment[i] = new wxStaticText(this,-1,txt,TCOMMENT(i),wxSize(-1,-1));
Tcommentrect[i] = Tcomment[i]->GetRect();
}
@@ -153,16 +147,15 @@
{
Htitle[i] = new wxTextCtrl(this,-1,wxT(""),HTITLE(i),wxSize(100,-1));
Htitlerect[i] = Htitle[i]->GetRect();
- Htitle[i]->SetToolTip(wxT("Texte du titre de la colonne"));
+ Htitle[i]->SetToolTip(_("Column heading"));
Hjust[i] = new wxChoice(this,-1,HJUST(i),wxSize(-1,-1),3,choices);
Hjustrect[i] = Hjust[i]->GetRect();
- Hjust[i]->SetToolTip(wxT("Justification du titre de la colonne"));
+ Hjust[i]->SetToolTip(_("Alignment of the column heading"));
Hspaces[i] = new wxTextCtrl(this,-1,wxT("00"),HSPACES(i),ESPSIZE);
Hspacesrect[i] = Hspaces[i]->GetRect();
-// XXX: Hspaces[i]->SetToolTip(wxT("Espacement des caractères du titre"));
- Hspaces[i]->SetToolTip(wxT("Espacement des caracteres du titre"));
+ Hspaces[i]->SetToolTip(_("Spacing of the heading characters"));
}
@@ -171,8 +164,7 @@
{
Tdim[i] = new wxTextCtrl(this,-1,wxT(""),TDIM(i),wxSize(50,-1));
Tdimrect[i] = Tdim[i]->GetRect();
-// XXX: Tdim[i]->SetToolTip(wxT("Dimension intérieure de la colonne (en
mm)"));
- Tdim[i]->SetToolTip(wxT("Dimension interieure de la colonne (en mm)"));
+ Tdim[i]->SetToolTip(_("Inner dimension of the column (in mm)"));
Tunit[i] = new wxStaticText(this,-1,wxT("mm"),
wxPoint(Tdimrect[i].GetRight()+
@@ -181,12 +173,11 @@
Tjust[i] = new wxChoice(this,-1,TJUST(i),wxSize(-1,-1),3,choices);
Tjustrect[i] = Tjust[i]->GetRect();
- Tjust[i]->SetToolTip(wxT("Justification du texte de la colonne"));
+ Tjust[i]->SetToolTip(_("Alignment of the column text"));
Tspaces[i] = new wxTextCtrl(this,-1,wxT(""),TSPACES(i),ESPSIZE);
Tspacesrect[i] = Tspaces[i]->GetRect();
-// XXX: Tspaces[i]->SetToolTip(wxT("Espacement des caractères"));
- Tspaces[i]->SetToolTip(wxT("Espacement des caracteres"));
+ Tspaces[i]->SetToolTip(_("Characters spacing"));
}
justif->Move(wxPoint(Tjustrect[0].GetLeft(),bfontheadrect.GetBottom()
@@ -237,11 +228,11 @@
#define DIM wxSize(30,-1)
// Left part
- wxStaticText* dyh1text = new wxStaticText(this,-1,wxT("Titre esp.
sup."),DYH1COMMENT,wxSize(-1,-1));
+ wxStaticText* dyh1text = new wxStaticText(this,-1,_("Title spc.
top"),DYH1COMMENT,wxSize(-1,-1));
wxRect dyh1textrect = dyh1text->GetRect();
- wxStaticText* dyt1text = new wxStaticText(this,-1,wxT("Texte esp.
sup."),DYT1COMMENT,wxSize(-1,-1));
+ wxStaticText* dyt1text = new wxStaticText(this,-1,_("Text spc.
top"),DYT1COMMENT,wxSize(-1,-1));
wxRect dyt1textrect = dyt1text->GetRect();
- wxStaticText* dxbegintext = new wxStaticText(this,-1,wxT("Texte esp.
gauche."),DXBEGINCOMMENT,wxSize(-1,-1));
+ wxStaticText* dxbegintext = new wxStaticText(this,-1,_("Text spc.
left"),DXBEGINCOMMENT,wxSize(-1,-1));
wxRect dxbegintextrect = dxbegintext->GetRect();
dyh1 = new wxTextCtrl(this,-1,wxT("00"),DYH1TEXT,DIM);
@@ -258,11 +249,11 @@
wxRect dxbeginmmrect = dxbeginmm->GetRect();
// Right part
- wxStaticText* dyh2text = new wxStaticText(this,-1,wxT("Titre esp.
inf."),DYH2COMMENT,wxSize(-1,-1));
+ wxStaticText* dyh2text = new wxStaticText(this,-1,_("Title spc.
bot."),DYH2COMMENT,wxSize(-1,-1));
wxRect dyh2textrect = dyh2text->GetRect();
- wxStaticText* dyt2text = new wxStaticText(this,-1,wxT("Texte esp.
inf."),DYT2COMMENT,wxSize(-1,-1));
+ wxStaticText* dyt2text = new wxStaticText(this,-1,_("Text spc.
bot."),DYT2COMMENT,wxSize(-1,-1));
wxRect dyt2textrect = dyt2text->GetRect();
- wxStaticText* dxendtext = new wxStaticText(this,-1,wxT("Texte esp.
droit."),DXENDCOMMENT,wxSize(-1,-1));
+ wxStaticText* dxendtext = new wxStaticText(this,-1,_("Text spc.
right"),DXENDCOMMENT,wxSize(-1,-1));
wxRect dxendtextrect = dxendtext->GetRect();
dyh2 = new wxTextCtrl(this,-1,wxT("00"),DYH2TEXT,DIM);
@@ -292,25 +283,25 @@
#define BCANCELPOINT wxPoint(Tspacesrect[0].GetRight() - CANCELWIDTH,BPOS)
//#define BCANCELPOINT wxPoint(dxendmmrect.GetRight() - CANCELWIDTH,BPOS)
- bprinter = new wxButton(this,Button_Printer,wxT("Imprimante"),BPRINTERPOINT);
+ bprinter = new wxButton(this,Button_Printer,_("Printer"),BPRINTERPOINT);
wxRect bprinterrect = bprinter->GetRect();
- bprinter->SetToolTip(wxT("Configurer l'imprimante"));
+ bprinter->SetToolTip(_("Configure the printer"));
- bpage = new wxButton(this,Button_Page,wxT("Page"),BPAGEPOINT);
+ bpage = new wxButton(this,Button_Page,_("Page"),BPAGEPOINT);
// wxRect bpagerect = bpage->GetRect();
- bpage->SetToolTip(wxT("Configurer la taille de page"));
+ bpage->SetToolTip(_("Configure the dimensions of the page"));
- bcancel = new wxButton(this,Button_Cancel,wxT("Annuler"));
+ bcancel = new wxButton(this,wxID_CANCEL);
wxRect bcancelrect = bcancel->GetRect();
bcancel->Move(BCANCELPOINT);
bcancelrect = bcancel->GetRect();
- bcancel->SetToolTip(wxT("Annuler les dernier changements et quitter"));
+ bcancel->SetToolTip(_("Cancel the last changes"));
- bok = new wxButton(this,Button_Ok,wxT("OK"));
+ bok = new wxButton(this,wxID_OK);
wxRect bokrect = bok->GetRect();
bok->Move(BOKPOINT);
bokrect = bok->GetRect();
- bok->SetToolTip(wxT("Enregistrer les changements et quitter"));
+ bok->SetToolTip(_("Save the changes"));
#define DLGWIDTH (bcancelrect.GetRight() + HSPACE)
#define DLGHEIGHT (bokrect.GetBottom() + VSPACE)
Index: wxwin/configdb.cc
===================================================================
RCS file: /cvsroot/eliot/eliot/wxwin/configdb.cc,v
retrieving revision 1.7.4.1
retrieving revision 1.7.4.2
diff -u -b -r1.7.4.1 -r1.7.4.2
--- wxwin/configdb.cc 11 Nov 2007 19:57:00 -0000 1.7.4.1
+++ wxwin/configdb.cc 11 Dec 2007 14:07:15 -0000 1.7.4.2
@@ -25,6 +25,7 @@
*/
#include <iostream>
+#include "wx/wx.h"
#include "ewx.h"
#include "configdb.h"
#include "wx/colordlg.h"
@@ -199,7 +200,7 @@
wxString ConfigDB::getDicName()
{
- return ReadStr(DICNAME,wxT("Aucun Dictionnaire"));
+ return ReadStr(DICNAME,_("No dictionary"));
}
wxString ConfigDB::getTilePath()
@@ -318,11 +319,11 @@
wxString res;
switch (i)
{
- case 0: res = ReadStr(wxString(HNAME) + wxT("1"), wxT("Num")); break;
- case 1: res = ReadStr(wxString(HNAME) + wxT("2"), wxT("Tirage")); break;
- case 2: res = ReadStr(wxString(HNAME) + wxT("3"), wxT("Solution")); break;
- case 3: res = ReadStr(wxString(HNAME) + wxT("4"), wxT("Pos")); break;
- case 4: res = ReadStr(wxString(HNAME) + wxT("5"), wxT("Pts")); break;
+ case 0: res = ReadStr(wxString(HNAME) + wxT("1"), _("Nb")); break;
+ case 1: res = ReadStr(wxString(HNAME) + wxT("2"), _("Rack")); break;
+ case 2: res = ReadStr(wxString(HNAME) + wxT("3"), _("Solution")); break;
+ case 3: res = ReadStr(wxString(HNAME) + wxT("4"), _("Pos")); break;
+ case 4: res = ReadStr(wxString(HNAME) + wxT("5"), _("Pts")); break;
default: res = wxT(""); break;
}
return res;
Index: wxwin/confsearch.cc
===================================================================
RCS file: /cvsroot/eliot/eliot/wxwin/confsearch.cc,v
retrieving revision 1.9
retrieving revision 1.9.4.1
diff -u -b -r1.9 -r1.9.4.1
--- wxwin/confsearch.cc 5 Nov 2005 17:33:06 -0000 1.9
+++ wxwin/confsearch.cc 11 Dec 2007 14:07:15 -0000 1.9.4.1
@@ -17,20 +17,15 @@
/* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "ewx.h"
+#include "wx/wx.h"
#include "wx/sizer.h"
#include "confsearch.h"
-enum {
- Button_Ok,
- Button_Cancel,
- CheckBox_Joker,
- CheckBox_Rack
-};
-BEGIN_EVENT_TABLE(ConfSearchDlg,wxDialog)
+BEGIN_EVENT_TABLE(ConfSearchDlg, wxDialog)
EVT_CLOSE (ConfSearchDlg::OnCloseWindow)
- EVT_BUTTON (Button_Ok, ConfSearchDlg::OnButtonOk)
- EVT_BUTTON (Button_Cancel, ConfSearchDlg::OnButtonCancel)
+ EVT_BUTTON (wxID_OK, ConfSearchDlg::OnButtonOk)
+ EVT_BUTTON (wxID_CANCEL, ConfSearchDlg::OnButtonCancel)
END_EVENT_TABLE()
@@ -38,14 +33,13 @@
: wxDialog(parent, -1, wxString(wxT("Configuration recherche")))
{
- joker_searching = new wxCheckBox(this,CheckBox_Joker,wxT("Recherche sur
joker dans 7+1"));
-// XXX: rack_checking = new wxCheckBox(this,CheckBox_Rack,wxT("Vérification
de la validité des tirages"));
- rack_checking = new wxCheckBox(this,CheckBox_Rack,wxT("Verification de la
validite des tirages"));
-
- bcancel = new wxButton(this,Button_Cancel,wxT("Annuler"),wxPoint(-1,-1));
- bcancel->SetToolTip(wxT("Annuler les dernier changements et quitter"));
- bok = new wxButton(this,Button_Ok,wxT("OK"),wxPoint(-1,-1));
- bok->SetToolTip(wxT("Enregistrer les changements et quitter"));
+ joker_searching = new wxCheckBox(this, wxID_ANY, _("Search on joker in 7+1
panel"));
+ rack_checking = new wxCheckBox(this, wxID_ANY, _("Check rack validity"));
+
+ bcancel = new wxButton(this, wxID_CANCEL);
+ bcancel->SetToolTip(_("Cancel last changes"));
+ bok = new wxButton(this, wxID_OK);
+ bok->SetToolTip(_("Save the changes"));
wxBoxSizer *bsizer = new wxBoxSizer( wxHORIZONTAL);
bsizer->Add(bok, 1, wxALL, 1);
@@ -63,21 +57,21 @@
readconf();
}
-void
+ void
ConfSearchDlg::readconf()
{
joker_searching->SetValue(config.getJokerPlus1());
rack_checking->SetValue(config.getRackChecking());
}
-void
+ void
ConfSearchDlg::writeconf()
{
config.setJokerPlus1(joker_searching->GetValue());
config.setRackChecking(rack_checking->GetValue());
}
-void
+ void
ConfSearchDlg::OnCloseWindow(wxCloseEvent&)
{
if (IsModal() == TRUE)
@@ -86,7 +80,7 @@
this->Destroy();
}
-void
+ void
ConfSearchDlg::OnButtonOk(wxCommandEvent&)
{
writeconf();
@@ -96,7 +90,7 @@
this->Destroy();
}
-void
+ void
ConfSearchDlg::OnButtonCancel(wxCommandEvent&)
{
if (IsModal() == TRUE)
Index: wxwin/gfxresult.cc
===================================================================
RCS file: /cvsroot/eliot/eliot/wxwin/gfxresult.cc,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -b -r1.5.2.2 -r1.5.2.3
--- wxwin/gfxresult.cc 11 Nov 2007 19:57:00 -0000 1.5.2.2
+++ wxwin/gfxresult.cc 11 Dec 2007 14:07:15 -0000 1.5.2.3
@@ -64,11 +64,11 @@
#else
results->SetSingleStyle(wxLC_REPORT | wxLC_SINGLE_SEL);
#endif
- results->InsertColumn(0, wxT("Sol"));
+ results->InsertColumn(0, _("Word"));
results->InsertColumn(1, wxT("*"));
- results->InsertColumn(2, wxT("Pos"));
- results->InsertColumn(3, wxT("Pts"));
- results->SetToolTip(wxT("Resultats de la recherche"));
+ results->InsertColumn(2, _("Pos"));
+ results->InsertColumn(3, _("Pts"));
+ results->SetToolTip(_("Results of the search"));
wxBoxSizer *sizer_v = new wxBoxSizer(wxVERTICAL);
wxBoxSizer *sizer_h = new wxBoxSizer(wxHORIZONTAL);
Index: wxwin/main.cc
===================================================================
RCS file: /cvsroot/eliot/eliot/wxwin/main.cc,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -b -r1.10.2.1 -r1.10.2.2
--- wxwin/main.cc 6 Dec 2007 15:06:06 -0000 1.10.2.1
+++ wxwin/main.cc 11 Dec 2007 14:07:15 -0000 1.10.2.2
@@ -67,22 +67,21 @@
wxConfigBase* config = wxConfigBase::Get();
config = NULL;
#ifdef ENABLE_LOCALE
-// XXX: This line seems to create problems with the display of the game history
-// (in GameFrame::Refresh()). As usual, wxWidgets does some black magic behind
-// our back...
-// locale.Init(wxLocale::GetSystemLanguage(),
-// wxLOCALE_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING);
+ locale.Init();
- wxLocale::AddCatalogLookupPathPrefix(wxT("."));
- wxLocale::AddCatalogLookupPathPrefix(wxT(".."));
+ // No need to search in the current directory, it is already done by
default
+ // wxLocale::AddCatalogLookupPathPrefix(wxT("."));
+ // Search for translations in the installation directory
+ wxLocale::AddCatalogLookupPathPrefix(wxT(LOCALEDIR));
locale.AddCatalog(wxT("eliot"));
#ifdef __LINUX__
{
wxLogNull noLog;
- locale.AddCatalog(_T("fileutils"));
+ locale.AddCatalog(wxT("fileutils"));
}
#endif
#endif
+
ConfigDB configdb;
configdb.setFirstDefault();
MainFrame *mainframe = new MainFrame(configdb.getFramePos(wxT(APPNAME)),
@@ -97,7 +96,7 @@
EliotApp::OnExit()
{
GameFactory::Destroy();
- delete wxConfigBase::Set((wxConfigBase *) NULL);
+ delete wxConfigBase::Set(NULL);
return 0;
}
Index: wxwin/mainframe.cc
===================================================================
RCS file: /cvsroot/eliot/eliot/wxwin/mainframe.cc,v
retrieving revision 1.21.2.5
retrieving revision 1.21.2.6
diff -u -b -r1.21.2.5 -r1.21.2.6
--- wxwin/mainframe.cc 9 Dec 2007 15:41:06 -0000 1.21.2.5
+++ wxwin/mainframe.cc 11 Dec 2007 14:07:15 -0000 1.21.2.6
@@ -24,6 +24,8 @@
* \date 2005
*/
+#include "config.h"
+
#include <stdlib.h>
#include <stdio.h>
#include <iostream>
@@ -59,6 +61,7 @@
enum
{
Menu_Game_New = 1000,
+ Menu_Game_NewJoker,
Menu_Game_Open,
Menu_Game_Save,
Menu_Game_Print,
@@ -101,9 +104,6 @@
Menu_ShowGame = (IDBASE + ID_Frame_Game),
Menu_ShowResult = (IDBASE + ID_Frame_Result),
- Menu_Quit_Apropos = 4000,
- Menu_Quit_Confirm,
-
Button_SetRack = 10000,
Button_SetNew,
Button_SetManual,
@@ -119,11 +119,13 @@
BEGIN_EVENT_TABLE(MainFrame, wxFrame)
//
EVT_MENU(Menu_Game_New, MainFrame::OnMenuGameNew)
+ EVT_MENU(Menu_Game_NewJoker, MainFrame::OnMenuGameNew)
EVT_MENU(Menu_Game_Open, MainFrame::OnMenuGameOpen)
EVT_MENU(Menu_Game_Save, MainFrame::OnMenuGameSave)
EVT_MENU(Menu_Game_Print, MainFrame::OnMenuGamePrint)
EVT_MENU(Menu_Game_PrintPreview, MainFrame::OnMenuGamePrintPreview)
EVT_MENU(Menu_Game_PrintPS, MainFrame::OnMenuGamePrintPS)
+ EVT_MENU(wxID_EXIT, MainFrame::OnMenuGameQuit)
//
EVT_MENU(Menu_Conf_Game_Dic, MainFrame::OnMenuConfGameDic)
EVT_MENU(Menu_Conf_Game_Search, MainFrame::OnMenuConfGameSearch)
@@ -134,8 +136,7 @@
EVT_MENU_RANGE(Menu_Conf_Aspect_BoardColour_Lines,
Menu_Conf_Aspect_BoardColour_Default, MainFrame::OnMenuConfAspectBoardColour)
EVT_MENU_RANGE(Menu_ShowVerif, Menu_ShowResult, MainFrame::OnMenuShowFrame)
//
- EVT_MENU(Menu_Quit_Apropos, MainFrame::OnMenuQuitApropos)
- EVT_MENU(Menu_Quit_Confirm, MainFrame::OnMenuQuitConfirm)
+ EVT_MENU(wxID_ABOUT, MainFrame::OnMenuHelpAbout)
//
EVT_BUTTON(Button_Play, MainFrame::OnPlay)
EVT_BUTTON(Button_SetRack, MainFrame::OnSetRack)
@@ -169,7 +170,7 @@
wxBoxSizer *listsizer = new wxBoxSizer(wxVERTICAL);
rack = new wxTextCtrl(this, Rack_ID, wxU(""), wxPoint(-1, -1), wxSize(-1,
-1), wxTE_PROCESS_ENTER);
listsizer->Add(rack, 0, wxEXPAND | wxALL, 1);
- rack->SetToolTip(_("Tirage"));
+ rack->SetToolTip(_("Rack"));
#ifdef ENABLE_RESLIST_IN_MAIN
reslist = new GfxResult(this,(MainFrame*)this,m_game);
listsizer->Add(reslist, 1, wxEXPAND | wxLEFT | wxRIGHT, 1);
@@ -200,17 +201,17 @@
statusbar->SetStatusWidths(2, ww);
UpdateStatusBar();
- b_rackrandomset = new wxButton(this, Button_SetRack, _(" Tirage "));
+ b_rackrandomset = new wxButton(this, Button_SetRack, _(" Rack "));
b_rackrandomnew = new wxButton(this, Button_SetNew, _(" Complement "));
- b_search = new wxButton(this, Button_Search, _(" Rechercher "));
- b_back = new wxButton(this, Button_PlayBack, _(" Arriere "));
- b_play = new wxButton(this, Button_Play, _(" Jouer "));
-
- b_rackrandomset->SetToolTip(_("Tirage aleatoire"));
- b_rackrandomnew->SetToolTip(_("Complement aleatoire du tirage"));
- b_search->SetToolTip( _("Recherche sur le tirage courant"));
- b_back->SetToolTip( _("Revenir un coup en arriere"));
- b_play->SetToolTip( _("Jouer le mot selectionne"));
+ b_search = new wxButton(this, Button_Search, _(" Search "));
+ b_back = new wxButton(this, Button_PlayBack, _(" Back "));
+ b_play = new wxButton(this, Button_Play, _(" Play "));
+
+ b_rackrandomset->SetToolTip(_("Random rack"));
+ b_rackrandomnew->SetToolTip(_("Random complement of the rack"));
+ b_search->SetToolTip( _("Search with the current rack"));
+ b_back->SetToolTip( _("Go back one turn"));
+ b_play->SetToolTip( _("Play the selected word"));
wxBoxSizer *buttonsizer = new wxBoxSizer(wxHORIZONTAL);
buttonsizer->Add(b_rackrandomset, 1, wxEXPAND | wxTOP | wxBOTTOM | wxLEFT
, 1);
@@ -261,82 +262,72 @@
{
// menus
wxMenu *menu_game = new wxMenu;
- menu_game->Append(Menu_Game_New, _("Nouvelle"), _("Demarrer une nouvelle
partie"));
- menu_game->Append(Menu_Game_Open, _("Charger..."), _("Charger une
partie"));
- menu_game->Append(Menu_Game_Save, _("Sauver..."), _("Sauver cette
partie"));
+ menu_game->Append(Menu_Game_New, _("&New game\tctrl+n"), _("Start a new
game"));
+ menu_game->Append(Menu_Game_NewJoker, _("New &joker game\tctrl+j"),
_("Start a new joker game"));
menu_game->AppendSeparator();
- menu_game->Append(Menu_Game_Print, _("Imprimer..."), _("Imprimer cette
partie"));
- menu_game->Append(Menu_Game_PrintPreview, _("Preimpression"),
_("Preimpression de la partie"));
-#ifdef ENABLE_SAVE_POSTSCRIPT
+ menu_game->Append(Menu_Game_Open, _("&Load...\tctrl+l"), _("Load a game"));
+ menu_game->Append(Menu_Game_Save, _("&Save as...\tctrl+s"), _("Save the
current game"));
menu_game->AppendSeparator();
- menu_game->Append(Menu_Game_PrintPS, _("Imprimer du PostScript"),
_("Imprimer dans un fichier PostScript"));
+ menu_game->Append(Menu_Game_Print, _("&Print...\tctrl+p"), _("Print this
game"));
+ menu_game->Append(Menu_Game_PrintPreview, _("Print pre&view..."), _("Print
preview of the game"));
+#ifdef ENABLE_SAVE_POSTSCRIPT
+ menu_game->Append(Menu_Game_PrintPS, _("Print in PostS&cript..."),
_("Print in a PostScript file"));
#endif
+ menu_game->AppendSeparator();
+ menu_game->Append(wxID_EXIT, _("&Quit"), _("Quit Eliot"));
//
wxMenu *menu_conf_game = new wxMenu;
- menu_conf_game->Append(Menu_Conf_Game_Dic, _("Dictionnaire"), _("Choix du
dictionnaire"));
- menu_conf_game->Append(Menu_Conf_Game_Search, _("Recherche"), _("Options
de recherche"));
- //
- wxMenu *menu_tileback = new wxMenu;
- menu_tileback->Append(Menu_Conf_Aspect_BoardColour_Letters ,
_("Lettres jouees"), _("Lettres jouees sur la grille"));
- menu_tileback->Append(Menu_Conf_Aspect_BoardColour_TestLetters ,
_("Lettres provisoires"), _("Lettres du mot a jouer"));
- menu_tileback->AppendSeparator();
- menu_tileback->Append(Menu_Conf_Aspect_BoardColour_TileBack , _("Fonds
lettres jouees"), _("Fonds des pions sur la grille"));
- menu_tileback->Append(Menu_Conf_Aspect_BoardColour_TestTileBack, _("Fonds
lettres provisoires"), _("Fonds des pions sur la grille"));
+ menu_conf_game->Append(Menu_Conf_Game_Dic, _("&Dictionary..."), _("Choose
a dictionary"));
+ menu_conf_game->Append(Menu_Conf_Game_Search, _("&Search..."), _("Search
options"));
//
wxMenu *menu_conf_board_colour = new wxMenu;
- menu_conf_board_colour->Append(Menu_Conf_Aspect_BoardColour_Background,
_("Fond"), _("Couleur du fond"));
- menu_conf_board_colour->Append(Menu_Conf_Aspect_BoardColour_Lines,
_("Lignes"), _("Couleur des lignes"));
- menu_conf_board_colour->Append(Menu_Conf_Tile, _("Pions et lettres"),
menu_tileback, _("Pions et lettres"));
+ menu_conf_board_colour->Append(Menu_Conf_Aspect_BoardColour_Background,
_("&Background..."), _("Background color"));
+ menu_conf_board_colour->Append(Menu_Conf_Aspect_BoardColour_Lines,
_("L&ines..."), _("Color of the lines"));
menu_conf_board_colour->AppendSeparator();
- menu_conf_board_colour->Append(Menu_Conf_Aspect_BoardColour_Letters,
_("Lettres jouees"), _("Lettres jouees sur la grille"));
- menu_conf_board_colour->Append(Menu_Conf_Aspect_BoardColour_TestLetters,
_("Lettres provisoires"), _("Lettres du mot a jouer"));
+ menu_conf_board_colour->Append(Menu_Conf_Aspect_BoardColour_Letters,
_("&Played letters..."), _("Color of the letters played on the board"));
+ menu_conf_board_colour->Append(Menu_Conf_Aspect_BoardColour_TestLetters,
_("&Temporary letters..."), _("Color of the letters of the temporary word"));
+ menu_conf_board_colour->Append(Menu_Conf_Aspect_BoardColour_TileBack ,
_("B&ackground of played letters..."), _("Background color of the letters
played on the board"));
+ menu_conf_board_colour->Append(Menu_Conf_Aspect_BoardColour_TestTileBack,
_("Ba&ckground of temporary letters..."), _("Background color of the temporary
letters on the board"));
menu_conf_board_colour->AppendSeparator();
- menu_conf_board_colour->Append(Menu_Conf_Aspect_BoardColour_Wx2, _("Mot
compte double"), _("Mot compte double"));
- menu_conf_board_colour->Append(Menu_Conf_Aspect_BoardColour_Wx3, _("Mot
compte triple"), _("Mot compte triple"));
- menu_conf_board_colour->Append(Menu_Conf_Aspect_BoardColour_Lx2, _("Lettre
compte double"), _("Lettre compte double"));
- menu_conf_board_colour->Append(Menu_Conf_Aspect_BoardColour_Lx3, _("Lettre
compte triple"), _("Lettre compte triple"));
+ menu_conf_board_colour->Append(Menu_Conf_Aspect_BoardColour_Wx2, _("Double
&letter..."), _("Color of the \"double letter\" squares"));
+ menu_conf_board_colour->Append(Menu_Conf_Aspect_BoardColour_Wx3, _("Triple
l&etter..."), _("Color of the \"triple letter\" squares"));
+ menu_conf_board_colour->Append(Menu_Conf_Aspect_BoardColour_Lx2, _("Double
&word..."), _("Color of the \"double word\" squares"));
+ menu_conf_board_colour->Append(Menu_Conf_Aspect_BoardColour_Lx3, _("Triple
w&ord..."), _("Color of the \"triple word\" squares"));
menu_conf_board_colour->AppendSeparator();
- menu_conf_board_colour->Append(Menu_Conf_Aspect_BoardColour_Default,
_("Couleurs d'origine"), _("Retrouver les couleurs d'origine"));
+ menu_conf_board_colour->Append(Menu_Conf_Aspect_BoardColour_Default,
_("&Default colors"), _("Restore the default colors"));
//
wxMenu *menu_conf_board_font = new wxMenu;
-// XXX: menu_conf_board_font->Append(Menu_Conf_Aspect_Font_Search,
_("Lettres de recherche"), _("Police de caractères pour les recherches"));
- menu_conf_board_font->Append(Menu_Conf_Aspect_Font_Search, _("Lettres de
recherche"), _("Police de caracteres pour les recherches"));
-// XXX: menu_conf_board_font->Append(Menu_Conf_Aspect_Font_Board,
_("Lettres de la grille"), _("Police de caractères de la grille"));
- menu_conf_board_font->Append(Menu_Conf_Aspect_Font_Board, _("Lettres de la
grille"), _("Police de caracteres de la grille"));
+ menu_conf_board_font->Append(Menu_Conf_Aspect_Font_Search, _("&Search
letters..."), _("Font for the search"));
//
wxMenu *menu_conf = new wxMenu;
- menu_conf->Append(Menu_Conf_Game, _("Jeu"), menu_conf_game,
_("Configuration du jeu"));
- menu_conf->Append(Menu_Conf_Aspect_Font, _("Fonte des lettres"),
menu_conf_board_font, _("Modification des fontes"));
- menu_conf->Append(Menu_Conf_Aspect_BoardColour, _("Couleurs de la
grille"), menu_conf_board_colour, _("Modification des couleurs"));
- menu_conf->Append(Menu_Conf_Print, _("Impression"), _("Dimensions de la
partie"));
+ menu_conf->Append(Menu_Conf_Game, _("&Game"), menu_conf_game,
_("Configuration of the game"));
+ menu_conf->Append(Menu_Conf_Aspect_Font, _("&Fonts"),
menu_conf_board_font, _("Configuration of the fonts"));
+ menu_conf->Append(Menu_Conf_Aspect_BoardColour, _("&Colors"),
menu_conf_board_colour, _("Configuration of the colors"));
+ menu_conf->Append(Menu_Conf_Print, _("&Printing..."), _("Configuration of
the printing parameters"));
//
wxMenu *menu_frame = new wxMenu;
- menu_frame->Append(Menu_ShowBoard, _("Grille"), _("Grille de jeu"));
-// XXX: menu_frame->Append(Menu_ShowVerif, _("Vérification"),
_("Vérification d'un mot dans le dictionnaire"));
- menu_frame->Append(Menu_ShowVerif, _("Verification"), _("Verification d'un
mot dans le dictionnaire"));
- menu_frame->Append(Menu_ShowSearch, _("Recherche"), _("Recherche dans le
dictionnaire"));
+ menu_frame->AppendCheckItem(Menu_ShowBoard, _("&Board"), _("Game board"));
+ menu_frame->AppendCheckItem(Menu_ShowBag, _("Ba&g"), _("Remaining letters
in the bag"));
+ menu_frame->AppendCheckItem(Menu_ShowVerif, _("&Check"), _("Check a word
in the dictionary"));
+ menu_frame->AppendCheckItem(Menu_ShowSearch, _("&Search"), _("Search in
the dictionary"));
menu_frame->AppendSeparator();
- menu_frame->Append(Menu_ShowPlus1, _("Tirage + 1"), _("Lettres du tirage
plus une"));
- menu_frame->Append(Menu_ShowRacc, _("Raccords"), _("Raccords sur un mot de
la recherche"));
- menu_frame->Append(Menu_ShowBenj, _("Benjamins"), _("Benjamins sur un mot
de la recherche"));
+ menu_frame->AppendCheckItem(Menu_ShowPlus1, _("&Rack + 1"), _("Letters of
the rack plus one"));
+ menu_frame->AppendCheckItem(Menu_ShowRacc, _("R&accords"), _("Raccords on
a word of the search"));
+ menu_frame->AppendCheckItem(Menu_ShowBenj, _("&Benjamins"), _("Benjamins
on a word of the search"));
menu_frame->AppendSeparator();
- menu_frame->Append(Menu_ShowBag, _("Sac"), _("Lettres restantes dans le
sac"));
- menu_frame->AppendSeparator();
- menu_frame->Append(Menu_ShowGame, _("Partie"), _("Partie"));
+ menu_frame->AppendCheckItem(Menu_ShowGame, _("Game &history"), _("Game
history"));
#ifndef ENABLE_RESLIST_IN_MAIN
- menu_frame->Append(Menu_ShowResult, _("Resultats"), _("Resultats"));
+ menu_frame->Append(Menu_ShowResult, _("R&esults"), _("Results"));
#endif
//
- wxMenu *menu_quit = new wxMenu;
- menu_quit->Append(Menu_Quit_Apropos, _("A propos..."), _("A propos
d'Eliot"));
- menu_quit->Append(Menu_Quit_Confirm, _("Quitter"), _("Quitter"));
+ wxMenu *menu_help = new wxMenu;
+ menu_help->Append(wxID_ABOUT, _("&About..."), _("About Eliot"));
//
wxMenuBar *menu_bar = new wxMenuBar;
- menu_bar->Append(menu_game, _("Partie"));
- menu_bar->Append(menu_conf, _("Configuration"));
-// XXX: menu_bar->Append(menu_frame, _("Fenêtres"));
- menu_bar->Append(menu_frame, _("Fenetres"));
- menu_bar->Append(menu_quit, _("Quitter"));
+ menu_bar->Append(menu_game, _("&Game"));
+ menu_bar->Append(menu_conf, _("&Settings"));
+ menu_bar->Append(menu_frame, _("&Windows"));
+ menu_bar->Append(menu_help, _("&Help"));
SetMenuBar(menu_bar);
}
@@ -356,11 +347,11 @@
// *******************
void
-MainFrame::OnMenuGameNew(wxCommandEvent&)
+MainFrame::OnMenuGameNew(wxCommandEvent& event)
{
if (m_dic == NULL)
{
- wxMessageBox(_("Il n'y a pas de dictionnaire selectionne"), _("Eliot:
erreur"),
+ wxMessageBox(_("No dictionary selected"), _("Eliot: error"),
wxICON_INFORMATION | wxOK);
return;
}
@@ -374,6 +365,10 @@
}
m_game = GameFactory::Instance()->createTraining(*m_dic);
+ // Joker game?
+ if (event.GetId() == Menu_Game_NewJoker)
+ m_game->setVariant(Game::kJOKER);
+
m_game->start();
rack->SetValue(wxT(""));
InitFrames();
@@ -391,10 +386,10 @@
void
MainFrame::OnMenuGameOpen(wxCommandEvent&)
{
- wxFileDialog dialog(this, _("Ouvrir une partie"), wxT(""), wxT(""),
wxT("*"), wxOPEN);
+ wxFileDialog dialog(this, _("Load a game"), wxT(""), wxT(""), wxT("*"),
wxOPEN);
if (m_dic == NULL)
{
- wxMessageBox(_("Il n'y a pas de dictionnaire selectionne"), _("Eliot:
erreur"),
+ wxMessageBox(_("No dictionary selected"), _("Eliot: error"),
wxICON_INFORMATION | wxOK);
return;
}
@@ -414,8 +409,8 @@
if ((fin = fopen(dialog.GetPath().mb_str(), "rb")) == NULL)
{
wxString txt;
- txt << _("Impossible d'ouvrir") << dialog.GetPath();
- wxMessageDialog msg(this, txt, _("Ouverture d'une partie"));
+ txt << _("Cannot open ") << dialog.GetPath();
+ wxMessageDialog msg(this, txt, _("Load a game"));
msg.ShowModal();
return ;
}
@@ -426,8 +421,8 @@
if (m_game == NULL)
{
wxMessageDialog msg(this,
- _("Erreur pendant la lecture de la partie"),
- _("chargement de partie"));
+ _("Error while loading the game"),
+ _("Invalid game"));
msg.ShowModal();
return;
}
@@ -435,8 +430,8 @@
if (m_game->getHistory().getSize() == 0)
{
wxMessageDialog msg(this,
- _("Erreur pendant la lecture de la partie"),
- _("La partie est vide"));
+ _("Error while loading the game"),
+ _("The game is empty"));
msg.ShowModal();
return;
}
@@ -466,16 +461,15 @@
void
MainFrame::OnMenuGameSave(wxCommandEvent& WXUNUSED(event))
{
- wxFileDialog dialog(this, _("Sauver une partie"), wxT(""), wxT(""),
wxT("*"), wxSAVE|wxOVERWRITE_PROMPT);
+ wxFileDialog dialog(this, _("Save the game"), wxT(""), wxT(""), wxT("*"),
wxSAVE|wxOVERWRITE_PROMPT);
if (dialog.ShowModal() == wxID_OK)
{
ofstream fout(dialog.GetPath().mb_str());
if (fout.rdstate() == ios::failbit)
{
wxString txt;
-// XXX: txt << _("Impossible de créer ") << dialog.GetPath();
- txt << _("Impossible de creer ") << dialog.GetPath();
- wxMessageDialog msg(this, txt, _("Sauvegarde de la partie"));
+ txt << _("Cannot create ") << dialog.GetPath();
+ wxMessageDialog msg(this, txt, _("Save the game"));
msg.ShowModal();
return ;
}
@@ -494,7 +488,7 @@
// TODO: gray out the menu instead...
if (m_game == NULL)
{
- wxMessageBox(_("Pas de partie en cours"), _("Eliot: erreur"),
+ wxMessageBox(_("No on going game"), _("Eliot: error"),
wxICON_INFORMATION | wxOK);
return;
}
@@ -502,8 +496,10 @@
wxPrinter printer(&printDialogData);
GamePrintout printout(*m_game);
if (!printer.Print(this, &printout, TRUE))
-// XXX: wxMessageBox(wxT("Impression non effectuée."));
- wxMessageBox(_("Impression non effectuee."));
+ {
+ wxMessageBox(_("Printing not done"), _("Printing"),
+ wxOK | wxICON_ERROR);
+ }
}
void
@@ -512,7 +508,7 @@
// TODO: gray out the menu instead...
if (m_game == NULL)
{
- wxMessageBox(_("Pas de partie en cours"), _("Eliot: erreur"),
+ wxMessageBox(_("No on going game"), _("Eliot: error"),
wxICON_INFORMATION | wxOK);
return;
}
@@ -524,15 +520,12 @@
if (!preview->Ok())
{
delete preview;
-// XXX: msg << _("Problème de prévisualisation.\n")
- msg << _("Probleme de previsualisation.\n")
-// XXX: << _("Il se peut que l'imprimante par défaut soit mal
initialisée");
- << _("Il se peut que l'imprimante par defaut soit mal
initialisee");
-// XXX: wxMessageBox(msg, _("Impression (prévisualisation)"), wxOK);
- wxMessageBox(msg, _("Impression (previsualisation)"), wxOK);
+ msg << _("Print preview problem.\n")
+ << _("The printer may not be correctly initialized");
+ wxMessageBox(msg, _("Print preview"), wxOK);
return;
}
- wxPreviewFrame *frame = new wxPreviewFrame(preview, this, _("Impression"),
+ wxPreviewFrame *frame = new wxPreviewFrame(preview, this, _("Printing"),
wxPoint(-1, -1), wxSize(600,
550));
frame->Centre(wxBOTH);
frame->Initialize();
@@ -546,11 +539,11 @@
// TODO: gray out the menu instead...
if (m_game == NULL)
{
- wxMessageBox(_("Pas de partie en cours"), _("Eliot: erreur"),
+ wxMessageBox(_("No on going game"), _("Eliot: error"),
wxICON_INFORMATION | wxOK);
return;
}
- wxFileDialog dialog(this, _("Imprimer dans un fichier PostScript"),
wxT(""), wxT(""), wxT("*.ps"), wxSAVE|wxOVERWRITE_PROMPT);
+ wxFileDialog dialog(this, _("Print to a PostScript file"), wxT(""),
wxT(""), wxT("*.ps"), wxSAVE|wxOVERWRITE_PROMPT);
if (dialog.ShowModal() == wxID_OK)
{
wxPrintData printdataPS;
@@ -568,28 +561,28 @@
GamePrintout printout(*m_game);
if (!printer.Print(this, &printout, FALSE))
{
-// XXX: wxMessageBox(_("Impression non effectuée."));
- wxMessageBox(_("Impression non effectuee."));
- }
- else
- {
- wxString msg;
-// XXX: msg << _("Dessin effectué dans ") << dialog.GetPath()
<< _("\n");
- msg << _("Dessin effectue dans ") << dialog.GetPath() <<
_("\n");
- wxMessageBox(msg, _("Sauvegarde PostScript"), wxOK);
+ wxMessageBox(_("Printing not done"),
+ _("PostScript printing"), wxOK | wxICON_ERROR);
}
}
else
{
- wxString msg;
- msg << _("impossible d'initialiser le traitement PostScript.\n");
- wxMessageBox(msg, _("Sauvegarde PostScript"), wxOK);
+ wxMessageBox(_("Cannot initialize PostScript printer"),
+ _("PostScript printing"), wxOK | wxICON_ERROR);
}
}
#endif
}
+void
+MainFrame::OnMenuGameQuit(wxCommandEvent& WXUNUSED(event))
+{
+ Close(TRUE);
+}
+
+
+
// *******************
// Dictionary Loading
// *******************
@@ -597,7 +590,7 @@
void
MainFrame::OnMenuConfGameDic(wxCommandEvent& WXUNUSED(event))
{
- wxFileDialog dialog(this, _("Choisir un dictionnaire"), wxT(""),
wxT("*.dawg"), wxT("*.dawg"), wxOPEN);
+ wxFileDialog dialog(this, _("Choose a dictionary"), wxT(""),
wxT("*.dawg"), wxT("*.dawg"), wxOPEN);
if (dialog.ShowModal() == wxID_OK)
{
wxString dicpath = dialog.GetPath();
@@ -713,30 +706,22 @@
}
//**************************************************************************************
-// MENU QUIT
+// MENU HELP
//**************************************************************************************
void
-MainFrame::OnMenuQuitApropos(wxCommandEvent& WXUNUSED(event))
+MainFrame::OnMenuHelpAbout(wxCommandEvent& WXUNUSED(event))
{
wxString msg;
- // XXX: msg << wxT("Eliot\n© Antoine Fraboulet 1999-2004\n\n");
- msg << wxT("Eliot\nCopyright Antoine Fraboulet 1999-2006\n\n");
- msg << wxT("This program is free software; you can redistribute it and/or
modify\n");
- msg << wxT("it under the terms of the GNU General Public License as
published by\n");
- msg << wxT("the Free Software Foundation; either version 2 of the License,
or\n");
- msg << wxT("(at your option) any later version.\n\n");
- msg << wxT("Version ") << wxT(VERSION) << wxT("\n");
- wxMessageBox(msg, _("A propos d'Eliot"), wxICON_INFORMATION | wxOK);
+ msg.Printf(wxT("Eliot %s\n\n"), wxT(VERSION));
+ msg << wxT("Copyright (C) 1999-2007 - Antoine Fraboulet & Olivier
Teuliere\n\n");
+ msg << _("This program is free software; you can redistribute it and/or
modify " \
+ "it under the terms of the GNU General Public License as
published by " \
+ "the Free Software Foundation; either version 2 of the License,
or " \
+ "(at your option) any later version.");
+ wxMessageBox(msg, _("About Eliot"), wxICON_INFORMATION | wxOK);
}
-void
-MainFrame::OnMenuQuitConfirm(wxCommandEvent& WXUNUSED(event))
-{
- Close(TRUE);
-}
-
-
//**************************************************************************************
// BUTTONS
//**************************************************************************************
@@ -824,24 +809,24 @@
delete auxframes_ptr[i];
}
- auxframes_ptr[ ID_Frame_Verif ] = new VerifFrame (this, m_game->getDic());
+ auxframes_ptr[ID_Frame_Verif] = new VerifFrame (this, m_game->getDic());
debug("0 : Verif\n");
- auxframes_ptr[ ID_Frame_Search ] = new SearchFrame(this, m_game->getDic());
+ auxframes_ptr[ID_Frame_Search] = new SearchFrame(this, m_game->getDic());
debug("1 : Search\n");
- auxframes_ptr[ ID_Frame_Plus1 ] = new Plus1Frame (this, m_game);
+ auxframes_ptr[ID_Frame_Plus1] = new Plus1Frame (this, m_game);
debug("2 : Plus1\n");
- auxframes_ptr[ ID_Frame_Racc ] = new RaccFrame (this, m_game);
+ auxframes_ptr[ID_Frame_Racc] = new RaccFrame (this, m_game);
debug("3 : Racc\n");
- auxframes_ptr[ ID_Frame_Benj ] = new BenjFrame (this, m_game);
+ auxframes_ptr[ID_Frame_Benj] = new BenjFrame (this, m_game);
debug("4 : Benj\n");
- auxframes_ptr[ ID_Frame_Bag ] = new BagFrame (this, *m_game);
+ auxframes_ptr[ID_Frame_Bag] = new BagFrame (this, *m_game);
debug("5 : Bag\n");
- auxframes_ptr[ ID_Frame_Board ] = new BoardFrame (this, *m_game);
+ auxframes_ptr[ID_Frame_Board] = new BoardFrame (this, *m_game);
debug("6 : Board\n");
- auxframes_ptr[ ID_Frame_Game ] = new GameFrame (this, *m_game);
+ auxframes_ptr[ID_Frame_Game] = new GameFrame (this, *m_game);
debug("7 : Game\n");
#ifndef ENABLE_RESLIST_IN_MAIN
- auxframes_ptr[ ID_Frame_Result ] = new ResultFrame(this, m_game);
+ auxframes_ptr[ID_Frame_Result] = new ResultFrame(this, m_game);
debug("8 : Result\n");
#endif
@@ -853,6 +838,19 @@
debug("reload %d\n",i);
}
}
+
+ // Check the corresponding menu item if the window is visible
+ GetMenuBar()->Check(Menu_ShowVerif,
auxframes_ptr[ID_Frame_Verif]->IsShown());
+ GetMenuBar()->Check(Menu_ShowSearch,
auxframes_ptr[ID_Frame_Search]->IsShown());
+ GetMenuBar()->Check(Menu_ShowPlus1,
auxframes_ptr[ID_Frame_Plus1]->IsShown());
+ GetMenuBar()->Check(Menu_ShowRacc,
auxframes_ptr[ID_Frame_Racc]->IsShown());
+ GetMenuBar()->Check(Menu_ShowBenj,
auxframes_ptr[ID_Frame_Benj]->IsShown());
+ GetMenuBar()->Check(Menu_ShowBag, auxframes_ptr[ID_Frame_Bag]->IsShown());
+ GetMenuBar()->Check(Menu_ShowBoard,
auxframes_ptr[ID_Frame_Board]->IsShown());
+ GetMenuBar()->Check(Menu_ShowGame,
auxframes_ptr[ID_Frame_Game]->IsShown());
+#ifndef ENABLE_RESLIST_IN_MAIN
+ GetMenuBar()->Check(Menu_ShowResult,
auxframes_ptr[ID_Frame_Result]->IsShown());
+#endif
debug("InitFrames end ok.\n");
}
@@ -915,8 +913,8 @@
if (m_game)
{
text = wxT("");
- text << _("coup:") << (m_game->getHistory().getSize() + 1) <<
wxT(" ");
- text << _("points:") << (m_game->getCurrentPlayer().getPoints());
+ text << _("turn:") << wxT(" ") << (m_game->getHistory().getSize()
+ 1) << wxT(" ");
+ text << _("points:") << wxT(" ") <<
(m_game->getCurrentPlayer().getPoints());
statusbar->SetStatusText(text, 1);
}
}
@@ -953,20 +951,20 @@
debug("SetRack Ok :: ");
break;
case 0x01:
- msg = _("Le sac ne contient pas assez de lettres\npour assurer le
tirage.");
- wxMessageBox(msg, _("Correction du tirage"), wxICON_INFORMATION |
wxOK);
+ msg = _("The bag doesn't contain enough letters\nfor a new rack.");
+ wxMessageBox(msg, _("Rack validation"), wxICON_INFORMATION | wxOK);
return;
case 0x02:
- msg = _("Le tirage doit contenir au moins 2 consonnes et 2
voyelles.\n");
- wxMessageBox(msg, _("Correction du tirage"), wxICON_INFORMATION |
wxOK);
+ msg = _("The rack must contain at least 2 consonants and 2
vowels.");
+ wxMessageBox(msg, _("Rack validation"), wxICON_INFORMATION | wxOK);
return;
case 0x03:
- msg = _("Le tirage doit contenir au moins 2 consonnes et 2
voyelles\n");
- msg += _("mais le sac ne contient plus assez de lettres.\n\n");
- wxMessageBox(msg, _("Correction du tirage"), wxICON_INFORMATION |
wxOK);
+ msg = _("The rack must contain at least 2 consonants and 2
vowels\n");
+ msg += _("but the bag doesn't contain enough letters.\n");
+ wxMessageBox(msg, _("Rack validation"), wxICON_INFORMATION | wxOK);
break;
default:
- statusbar->SetStatusText(_("Le tirage a ete modifie
manuellement"), 0);
+ statusbar->SetStatusText(_("The rack has been modified manually"),
0);
break;
}
Index: wxwin/mainframe.h
===================================================================
RCS file: /cvsroot/eliot/eliot/wxwin/mainframe.h,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -b -r1.7.2.1 -r1.7.2.2
--- wxwin/mainframe.h 15 Oct 2006 11:07:55 -0000 1.7.2.1
+++ wxwin/mainframe.h 11 Dec 2007 14:07:15 -0000 1.7.2.2
@@ -1,4 +1,4 @@
-/* Eliot */
+// Joker game?* Eliot
*/
/* Copyright (C) 1999 Antoine Fraboulet */
/* address@hidden */
/* */
@@ -79,6 +79,7 @@
void OnMenuGamePrint (wxCommandEvent& event);
void OnMenuGamePrintPreview (wxCommandEvent& event);
void OnMenuGamePrintPS (wxCommandEvent& event);
+ void OnMenuGameQuit (wxCommandEvent& event);
void OnMenuConfGameDic (wxCommandEvent& event);
void OnMenuConfGameSearch (wxCommandEvent& event);
@@ -90,8 +91,7 @@
void OnMenuShowFrame (wxCommandEvent& event);
- void OnMenuQuitApropos (wxCommandEvent& event);
- void OnMenuQuitConfirm (wxCommandEvent& event);
+ void OnMenuHelpAbout (wxCommandEvent& event);
// *******
// Buttons
Index: wxwin/searchpanel.cc
===================================================================
RCS file: /cvsroot/eliot/eliot/wxwin/searchpanel.cc,v
retrieving revision 1.15.2.3
retrieving revision 1.15.2.4
diff -u -b -r1.15.2.3 -r1.15.2.4
--- wxwin/searchpanel.cc 5 Dec 2007 10:36:01 -0000 1.15.2.3
+++ wxwin/searchpanel.cc 11 Dec 2007 14:07:16 -0000 1.15.2.4
@@ -104,7 +104,7 @@
if (dic == NULL)
{
l->Clear();
- msg << wxT("Pas de dictionnaire");
+ msg << _("No dictionary");
l->Append(msg);
return 0;
}
@@ -116,7 +116,7 @@
{
if (l->GetCount() == 0)
{
- l->Append(wxT("Aucun resultat"));
+ l->Append(_("No result"));
}
}
@@ -300,9 +300,9 @@
wxStaticText *otmin;
wxStaticText *otmax;
- otmin = new wxStaticText(this,wxID_ANY,wxT("Longueur min."));
- omin = new wxTextCtrl(this,ID_OPTION1,wxT(
"1"),wxDefaultPosition,wxDefaultSize,wxTE_PROCESS_ENTER);
- otmax = new wxStaticText(this,wxID_ANY,wxT("max."));
+ otmin = new wxStaticText(this,wxID_ANY,_("Minimum length"));
+ omin = new
wxTextCtrl(this,ID_OPTION1,wxT("1"),wxDefaultPosition,wxDefaultSize,wxTE_PROCESS_ENTER);
+ otmax = new wxStaticText(this,wxID_ANY,_("Maximum length"));
omax = new
wxTextCtrl(this,ID_OPTION2,wxT("15"),wxDefaultPosition,wxDefaultSize,wxTE_PROCESS_ENTER);
wxBoxSizer *s = new wxBoxSizer( wxHORIZONTAL );
@@ -365,9 +365,9 @@
SearchPanel::SearchPanel(wxFrame *parent, const Dictionary &dic) :
wxNotebook(parent, -1)
{
- AddPage(new PCross (this,ID_PANEL_CROSS ,dic),wxT("Mots croises"));
- AddPage(new PPlus1 (this,ID_PANEL_PLUS1 ,dic),wxT("Plus 1"));
- AddPage(new PRegExp(this,ID_PANEL_REGEXP,dic),wxT("Exp. Rationnelle"));
+ AddPage(new PCross (this,ID_PANEL_CROSS ,dic), _("Cross words"));
+ AddPage(new PPlus1 (this,ID_PANEL_PLUS1 ,dic), _("Plus 1"));
+ AddPage(new PRegExp(this,ID_PANEL_REGEXP,dic), _("Regular expressions"));
SetSelection(2);
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Eliot-dev] eliot TODO po/POTFILES.in po/eliot.pot po/fr.po... [cppdic],
eliot-dev <=