[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Eliot-dev] eliot bootstrap configure.in dic/Makefile.am ga...
|
From: |
eliot-dev |
|
Subject: |
[Eliot-dev] eliot bootstrap configure.in dic/Makefile.am ga... |
|
Date: |
Tue, 08 Jan 2008 16:09:09 +0000 |
CVSROOT: /cvsroot/eliot
Module name: eliot
Changes by: Olivier Teulière <ipkiss> 08/01/08 16:09:09
Modified files:
. : bootstrap configure.in
dic : Makefile.am
game : Makefile.am
po : eliot.pot fr.po
utils : Makefile.am
wxwin : Makefile.am
Log message:
- Bumped version number to 1.6
- Used the -Wall option of automake, and fixed the reported warnings
- Updated french translation
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/eliot/bootstrap?cvsroot=eliot&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/eliot/configure.in?cvsroot=eliot&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/eliot/dic/Makefile.am?cvsroot=eliot&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/eliot/game/Makefile.am?cvsroot=eliot&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/eliot/po/eliot.pot?cvsroot=eliot&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/eliot/po/fr.po?cvsroot=eliot&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/eliot/utils/Makefile.am?cvsroot=eliot&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/eliot/wxwin/Makefile.am?cvsroot=eliot&r1=1.11&r2=1.12
Patches:
Index: bootstrap
===================================================================
RCS file: /cvsroot/eliot/eliot/bootstrap,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- bootstrap 3 Apr 2005 21:12:03 -0000 1.1
+++ bootstrap 8 Jan 2008 16:09:08 -0000 1.2
@@ -3,5 +3,5 @@
autopoint -f
aclocal -I m4
autoheader
-automake --add-missing --foreign --copy
+automake --add-missing --foreign --copy -Wall
autoconf
Index: configure.in
===================================================================
RCS file: /cvsroot/eliot/eliot/configure.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- configure.in 8 Jan 2008 13:52:33 -0000 1.21
+++ configure.in 8 Jan 2008 16:09:08 -0000 1.22
@@ -3,7 +3,7 @@
dnl --------------------------------------------------------------
dnl configure.in for Eliot
dnl --------------------------------------------------------------
-AC_INIT(eliot, 1.5)
+AC_INIT(eliot, 1.6)
AC_CONFIG_SRCDIR(wxwin/main.cc)
AM_INIT_AUTOMAKE
AM_CONFIG_HEADER(config.h)
Index: dic/Makefile.am
===================================================================
RCS file: /cvsroot/eliot/eliot/dic/Makefile.am,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- dic/Makefile.am 8 Jan 2008 13:52:33 -0000 1.16
+++ dic/Makefile.am 8 Jan 2008 16:09:08 -0000 1.17
@@ -20,9 +20,7 @@
noinst_LIBRARIES = libdic.a
localedir = $(datadir)/locale
-AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\"
-
-INCLUDES = -I$(top_srcdir) -I../intl -I$(top_srcdir)/intl $(INCICONV)
+AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir) -I../intl
-I$(top_srcdir)/intl $(INCICONV)
libdic_a_CFLAGS=
libdic_a_YFLAGS=-d
Index: game/Makefile.am
===================================================================
RCS file: /cvsroot/eliot/eliot/game/Makefile.am,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- game/Makefile.am 8 Jan 2008 13:52:36 -0000 1.14
+++ game/Makefile.am 8 Jan 2008 16:09:08 -0000 1.15
@@ -19,7 +19,7 @@
noinst_LIBRARIES = libgame.a
-INCLUDES = -I$(top_srcdir)/dic
+AM_CPPFLAGS = -I$(top_srcdir)/dic
libgame_a_SOURCES= \
ai_percent.cpp ai_percent.h \
Index: po/eliot.pot
===================================================================
RCS file: /cvsroot/eliot/eliot/po/eliot.pot,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- po/eliot.pot 8 Jan 2008 13:52:40 -0000 1.7
+++ po/eliot.pot 8 Jan 2008 16:09:08 -0000 1.8
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-23 23:08+0100\n"
+"POT-Creation-Date: 2008-01-08 16:59+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,247 +16,247 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: dic/header.cpp:317 dic/header.cpp:318
+#: dic/header.cpp:318 dic/header.cpp:319
msgid "Unknown (old format)"
msgstr ""
-#: dic/header.cpp:492
+#: dic/header.cpp:493
#, c-format
msgid "dictionary name: %s\n"
msgstr ""
-#: dic/header.cpp:497
+#: dic/header.cpp:498
#, c-format
msgid "compressed on: %s\n"
msgstr ""
-#: dic/header.cpp:501
+#: dic/header.cpp:502
#, c-format
msgid "compressed on: Unknown date (old format)\n"
msgstr ""
-#: dic/header.cpp:503
+#: dic/header.cpp:504
#, c-format
msgid "compressed using a binary compiled by: %s\n"
msgstr ""
-#: dic/header.cpp:504
+#: dic/header.cpp:505
#, c-format
msgid "dictionary type: %s\n"
msgstr ""
-#: dic/header.cpp:505
+#: dic/header.cpp:506
#, c-format
msgid "letters: %s\n"
msgstr ""
-#: dic/header.cpp:506
+#: dic/header.cpp:507
#, c-format
-msgid "number of letters: %d\n"
+msgid "number of letters: %lu\n"
msgstr ""
-#: dic/header.cpp:507
+#: dic/header.cpp:508
#, c-format
msgid "number of words: %d\n"
msgstr ""
-#: dic/header.cpp:508
+#: dic/header.cpp:511
#, c-format
-msgid "header size: %u bytes\n"
+msgid "header size: %lu bytes\n"
msgstr ""
-#: dic/header.cpp:510
+#: dic/header.cpp:512
#, c-format
msgid "root: %d (edge)\n"
msgstr ""
-#: dic/header.cpp:511
+#: dic/header.cpp:513
#, c-format
msgid "nodes: %d used + %d saved\n"
msgstr ""
-#: dic/header.cpp:512
+#: dic/header.cpp:514
#, c-format
msgid "edges: %d used + %d saved\n"
msgstr ""
-#: dic/header.cpp:514
+#: dic/header.cpp:516
#, c-format
msgid "letter | points | frequency | vowel | consonant\n"
msgstr ""
-#: dic/compdic.cpp:392
+#: dic/compdic.cpp:393
msgid "Mandatory options:"
msgstr ""
-#: dic/compdic.cpp:393
+#: dic/compdic.cpp:394
msgid " -d, --dicname <string> Set the dictionary name and version"
msgstr ""
-#: dic/compdic.cpp:394
+#: dic/compdic.cpp:395
msgid ""
" -l, --letters <string> Path to the file containing the letters (see below)"
msgstr ""
-#: dic/compdic.cpp:395
+#: dic/compdic.cpp:396
msgid ""
" -i, --input <string> Path to the uncompressed dictionary file (encoded "
"in UTF-8)"
msgstr ""
-#: dic/compdic.cpp:396
+#: dic/compdic.cpp:397
msgid ""
" -o, --output <string Path to the generated compressed dictionary file"
msgstr ""
-#: dic/compdic.cpp:397
+#: dic/compdic.cpp:398
msgid "Other options:"
msgstr ""
-#: dic/compdic.cpp:398
+#: dic/compdic.cpp:399
msgid " -h, --help Print this help and exit"
msgstr ""
-#: dic/compdic.cpp:399
+#: dic/compdic.cpp:400
msgid "Example:"
msgstr ""
-#: dic/compdic.cpp:400
+#: dic/compdic.cpp:401
msgid " -d 'ODS 5.0' -l letters.txt -i ods5.txt -o ods5.dawg"
msgstr ""
-#: dic/compdic.cpp:402
+#: dic/compdic.cpp:403
msgid ""
"The file containing the letters (--letters switch) must be UTF-8 encoded."
msgstr ""
-#: dic/compdic.cpp:403
+#: dic/compdic.cpp:404
msgid ""
"Each line corresponds to one letter, and must contain 5 fields separated "
"with "
msgstr ""
-#: dic/compdic.cpp:404
+#: dic/compdic.cpp:405
msgid "one or more space(s)."
msgstr ""
-#: dic/compdic.cpp:405
+#: dic/compdic.cpp:406
msgid " - 1st field: the letter itself"
msgstr ""
-#: dic/compdic.cpp:406
+#: dic/compdic.cpp:407
msgid " - 2nd field: the points of the letter"
msgstr ""
-#: dic/compdic.cpp:407
+#: dic/compdic.cpp:408
msgid ""
" - 3rd field: the frequency of the letter (how many letters of this kind in "
"the game)"
msgstr ""
-#: dic/compdic.cpp:408
+#: dic/compdic.cpp:409
msgid ""
" - 4th field: 1 if the letter is considered as a vowel in Scrabble game, 0 "
"otherwise"
msgstr ""
-#: dic/compdic.cpp:409
+#: dic/compdic.cpp:410
msgid ""
" - 5th field: 1 if the letter is considered as a consonant in Scrabble game, "
"0 otherwise"
msgstr ""
-#: dic/compdic.cpp:410
+#: dic/compdic.cpp:411
msgid "Example for french:"
msgstr ""
-#: dic/compdic.cpp:411
+#: dic/compdic.cpp:412
msgid "A 1 9 1 0"
msgstr ""
-#: dic/compdic.cpp:412
+#: dic/compdic.cpp:413
msgid "[...]"
msgstr ""
-#: dic/compdic.cpp:413
+#: dic/compdic.cpp:414
msgid "Z 10 1 0 1"
msgstr ""
-#: dic/compdic.cpp:414
+#: dic/compdic.cpp:415
msgid "? 0 2 1 1"
msgstr ""
-#: dic/compdic.cpp:484
+#: dic/compdic.cpp:485
msgid "A mandatory option is missing"
msgstr ""
-#: dic/compdic.cpp:492
+#: dic/compdic.cpp:493
msgid "Cannot stat uncompressed dictionary "
msgstr ""
-#: dic/compdic.cpp:500
+#: dic/compdic.cpp:501
msgid "Cannot open output file "
msgstr ""
-#: dic/compdic.cpp:548
+#: dic/compdic.cpp:549
#, c-format
msgid " Load time: %.3f s\n"
msgstr ""
-#: dic/compdic.cpp:549
+#: dic/compdic.cpp:550
#, c-format
msgid " Compression time: %.3f s\n"
msgstr ""
-#: dic/compdic.cpp:551
+#: dic/compdic.cpp:552
#, c-format
msgid " Maximum recursion level reached: %d\n"
msgstr ""
-#: dic/listdic.cpp:100
+#: dic/listdic.cpp:102
#, c-format
msgid "offset binary | structure\n"
msgstr ""
-#: dic/listdic.cpp:109
+#: dic/listdic.cpp:111
#, c-format
msgid "usage: %s [-a|-h|-l|-x] dictionary\n"
msgstr ""
-#: dic/listdic.cpp:110
+#: dic/listdic.cpp:112
#, c-format
msgid " -a: print all\n"
msgstr ""
-#: dic/listdic.cpp:111
+#: dic/listdic.cpp:113
#, c-format
msgid " -h: print header\n"
msgstr ""
-#: dic/listdic.cpp:112
+#: dic/listdic.cpp:114
#, c-format
msgid " -l: print dictionary word list\n"
msgstr ""
-#: dic/listdic.cpp:113
+#: dic/listdic.cpp:115
#, c-format
msgid " -x: print dictionary in hex\n"
msgstr ""
-#: dic/regexpmain.cpp:100
+#: dic/regexpmain.cpp:101
#, c-format
msgid "usage: %s dictionary"
msgstr ""
-#: dic/regexpmain.cpp:101
+#: dic/regexpmain.cpp:102
msgid " dictionary: path to eliot dawg dictionary"
msgstr ""
-#: dic/regexpmain.cpp:136
+#: dic/regexpmain.cpp:137
msgid "enter a regular expression:"
msgstr ""
-#: dic/regexpmain.cpp:148
+#: dic/regexpmain.cpp:149
msgid "result:"
msgstr ""
@@ -446,7 +446,7 @@
msgid "The word '%ls' does not exist"
msgstr ""
-#: utils/ncurses.cpp:578 wxwin/mainframe.cc:460 wxwin/mainframe.cc:468
+#: utils/ncurses.cpp:578 wxwin/mainframe.cc:475 wxwin/mainframe.cc:483
msgid "Save the game"
msgstr ""
@@ -464,8 +464,8 @@
msgid "Game saved in '%ls'"
msgstr ""
-#: utils/ncurses.cpp:608 wxwin/mainframe.cc:269 wxwin/mainframe.cc:390
-#: wxwin/mainframe.cc:414
+#: utils/ncurses.cpp:608 wxwin/mainframe.cc:275 wxwin/mainframe.cc:405
+#: wxwin/mainframe.cc:429
msgid "Load a game"
msgstr ""
@@ -560,8 +560,8 @@
msgid "Copy"
msgstr ""
-#: wxwin/auxframes.cc:348 wxwin/mainframe.cc:487 wxwin/mainframe.cc:507
-#: wxwin/mainframe.cc:538
+#: wxwin/auxframes.cc:348 wxwin/mainframe.cc:502 wxwin/mainframe.cc:522
+#: wxwin/mainframe.cc:553
msgid "No on going game"
msgstr ""
@@ -573,11 +573,11 @@
msgid "Rack: "
msgstr ""
-#: wxwin/auxframes.cc:525 wxwin/mainframe.cc:319
+#: wxwin/auxframes.cc:525 wxwin/mainframe.cc:325
msgid "Game history"
msgstr ""
-#: wxwin/auxframes.cc:557 wxwin/mainframe.cc:321
+#: wxwin/auxframes.cc:557 wxwin/mainframe.cc:327
msgid "Results"
msgstr ""
@@ -725,396 +725,396 @@
msgid "Results of the search"
msgstr ""
-#: wxwin/mainframe.cc:205
+#: wxwin/mainframe.cc:206
msgid " Rack "
msgstr ""
-#: wxwin/mainframe.cc:206
+#: wxwin/mainframe.cc:207
msgid " Complement "
msgstr ""
-#: wxwin/mainframe.cc:207
+#: wxwin/mainframe.cc:208
msgid " Search "
msgstr ""
-#: wxwin/mainframe.cc:208
+#: wxwin/mainframe.cc:209
msgid " Back "
msgstr ""
-#: wxwin/mainframe.cc:209
+#: wxwin/mainframe.cc:210
msgid " Play "
msgstr ""
-#: wxwin/mainframe.cc:211
+#: wxwin/mainframe.cc:212
msgid "Random rack"
msgstr ""
-#: wxwin/mainframe.cc:212
+#: wxwin/mainframe.cc:214
msgid "Random complement of the rack"
msgstr ""
-#: wxwin/mainframe.cc:213
+#: wxwin/mainframe.cc:216
msgid "Search with the current rack"
msgstr ""
-#: wxwin/mainframe.cc:214
+#: wxwin/mainframe.cc:218
msgid "Go back one turn"
msgstr ""
-#: wxwin/mainframe.cc:215
+#: wxwin/mainframe.cc:220
msgid "Play the selected word"
msgstr ""
-#: wxwin/mainframe.cc:266
+#: wxwin/mainframe.cc:272
msgid "&New game\tctrl+n"
msgstr ""
-#: wxwin/mainframe.cc:266
+#: wxwin/mainframe.cc:272
msgid "Start a new game"
msgstr ""
-#: wxwin/mainframe.cc:267
+#: wxwin/mainframe.cc:273
msgid "New &joker game\tctrl+j"
msgstr ""
-#: wxwin/mainframe.cc:267
+#: wxwin/mainframe.cc:273
msgid "Start a new joker game"
msgstr ""
-#: wxwin/mainframe.cc:269
+#: wxwin/mainframe.cc:275
msgid "&Load...\tctrl+l"
msgstr ""
-#: wxwin/mainframe.cc:270
+#: wxwin/mainframe.cc:276
msgid "&Save as...\tctrl+s"
msgstr ""
-#: wxwin/mainframe.cc:270
+#: wxwin/mainframe.cc:276
msgid "Save the current game"
msgstr ""
-#: wxwin/mainframe.cc:272
+#: wxwin/mainframe.cc:278
msgid "&Print...\tctrl+p"
msgstr ""
-#: wxwin/mainframe.cc:272
+#: wxwin/mainframe.cc:278
msgid "Print this game"
msgstr ""
-#: wxwin/mainframe.cc:273
+#: wxwin/mainframe.cc:279
msgid "Print pre&view..."
msgstr ""
-#: wxwin/mainframe.cc:273
+#: wxwin/mainframe.cc:279
msgid "Print preview of the game"
msgstr ""
-#: wxwin/mainframe.cc:275
+#: wxwin/mainframe.cc:281
msgid "Print in PostS&cript..."
msgstr ""
-#: wxwin/mainframe.cc:275
+#: wxwin/mainframe.cc:281
msgid "Print in a PostScript file"
msgstr ""
-#: wxwin/mainframe.cc:278
+#: wxwin/mainframe.cc:284
msgid "&Quit"
msgstr ""
-#: wxwin/mainframe.cc:278
+#: wxwin/mainframe.cc:284
msgid "Quit Eliot"
msgstr ""
-#: wxwin/mainframe.cc:281
+#: wxwin/mainframe.cc:287
msgid "&Dictionary..."
msgstr ""
-#: wxwin/mainframe.cc:281 wxwin/mainframe.cc:589
+#: wxwin/mainframe.cc:287 wxwin/mainframe.cc:604
msgid "Choose a dictionary"
msgstr ""
-#: wxwin/mainframe.cc:282
+#: wxwin/mainframe.cc:288
msgid "&Search..."
msgstr ""
-#: wxwin/mainframe.cc:282
+#: wxwin/mainframe.cc:288
msgid "Search options"
msgstr ""
-#: wxwin/mainframe.cc:285
+#: wxwin/mainframe.cc:291
msgid "&Background..."
msgstr ""
-#: wxwin/mainframe.cc:285
+#: wxwin/mainframe.cc:291
msgid "Background color"
msgstr ""
-#: wxwin/mainframe.cc:286
+#: wxwin/mainframe.cc:292
msgid "L&ines..."
msgstr ""
-#: wxwin/mainframe.cc:286
+#: wxwin/mainframe.cc:292
msgid "Color of the lines"
msgstr ""
-#: wxwin/mainframe.cc:288
+#: wxwin/mainframe.cc:294
msgid "&Played letters..."
msgstr ""
-#: wxwin/mainframe.cc:288
+#: wxwin/mainframe.cc:294
msgid "Color of the letters played on the board"
msgstr ""
-#: wxwin/mainframe.cc:289
+#: wxwin/mainframe.cc:295
msgid "&Temporary letters..."
msgstr ""
-#: wxwin/mainframe.cc:289
+#: wxwin/mainframe.cc:295
msgid "Color of the letters of the temporary word"
msgstr ""
-#: wxwin/mainframe.cc:290
+#: wxwin/mainframe.cc:296
msgid "B&ackground of played letters..."
msgstr ""
-#: wxwin/mainframe.cc:290
+#: wxwin/mainframe.cc:296
msgid "Background color of the letters played on the board"
msgstr ""
-#: wxwin/mainframe.cc:291
+#: wxwin/mainframe.cc:297
msgid "Ba&ckground of temporary letters..."
msgstr ""
-#: wxwin/mainframe.cc:291
+#: wxwin/mainframe.cc:297
msgid "Background color of the temporary letters on the board"
msgstr ""
-#: wxwin/mainframe.cc:293
+#: wxwin/mainframe.cc:299
msgid "Double &letter..."
msgstr ""
-#: wxwin/mainframe.cc:293
+#: wxwin/mainframe.cc:299
msgid "Color of the \"double letter\" squares"
msgstr ""
-#: wxwin/mainframe.cc:294
+#: wxwin/mainframe.cc:300
msgid "Triple l&etter..."
msgstr ""
-#: wxwin/mainframe.cc:294
+#: wxwin/mainframe.cc:300
msgid "Color of the \"triple letter\" squares"
msgstr ""
-#: wxwin/mainframe.cc:295
+#: wxwin/mainframe.cc:301
msgid "Double &word..."
msgstr ""
-#: wxwin/mainframe.cc:295
+#: wxwin/mainframe.cc:301
msgid "Color of the \"double word\" squares"
msgstr ""
-#: wxwin/mainframe.cc:296
+#: wxwin/mainframe.cc:302
msgid "Triple w&ord..."
msgstr ""
-#: wxwin/mainframe.cc:296
+#: wxwin/mainframe.cc:302
msgid "Color of the \"triple word\" squares"
msgstr ""
-#: wxwin/mainframe.cc:298
+#: wxwin/mainframe.cc:304
msgid "&Default colors"
msgstr ""
-#: wxwin/mainframe.cc:298
+#: wxwin/mainframe.cc:304
msgid "Restore the default colors"
msgstr ""
-#: wxwin/mainframe.cc:301
+#: wxwin/mainframe.cc:307
msgid "&Search letters..."
msgstr ""
-#: wxwin/mainframe.cc:301
+#: wxwin/mainframe.cc:307
msgid "Font for the search"
msgstr ""
-#: wxwin/mainframe.cc:304 wxwin/mainframe.cc:328
+#: wxwin/mainframe.cc:310 wxwin/mainframe.cc:334
msgid "&Game"
msgstr ""
-#: wxwin/mainframe.cc:304
+#: wxwin/mainframe.cc:310
msgid "Configuration of the game"
msgstr ""
-#: wxwin/mainframe.cc:305
+#: wxwin/mainframe.cc:311
msgid "&Fonts"
msgstr ""
-#: wxwin/mainframe.cc:305
+#: wxwin/mainframe.cc:311
msgid "Configuration of the fonts"
msgstr ""
-#: wxwin/mainframe.cc:306
+#: wxwin/mainframe.cc:312
msgid "&Colors"
msgstr ""
-#: wxwin/mainframe.cc:306
+#: wxwin/mainframe.cc:312
msgid "Configuration of the colors"
msgstr ""
-#: wxwin/mainframe.cc:307
+#: wxwin/mainframe.cc:313
msgid "&Printing..."
msgstr ""
-#: wxwin/mainframe.cc:307
+#: wxwin/mainframe.cc:313
msgid "Configuration of the printing parameters"
msgstr ""
-#: wxwin/mainframe.cc:310
+#: wxwin/mainframe.cc:316
msgid "&Board"
msgstr ""
-#: wxwin/mainframe.cc:310
+#: wxwin/mainframe.cc:316
msgid "Game board"
msgstr ""
-#: wxwin/mainframe.cc:311
+#: wxwin/mainframe.cc:317
msgid "Ba&g"
msgstr ""
-#: wxwin/mainframe.cc:311
+#: wxwin/mainframe.cc:317
msgid "Remaining letters in the bag"
msgstr ""
-#: wxwin/mainframe.cc:312
+#: wxwin/mainframe.cc:318
msgid "&Check"
msgstr ""
-#: wxwin/mainframe.cc:312
+#: wxwin/mainframe.cc:318
msgid "Check a word in the dictionary"
msgstr ""
-#: wxwin/mainframe.cc:313
+#: wxwin/mainframe.cc:319
msgid "&Search"
msgstr ""
-#: wxwin/mainframe.cc:313
+#: wxwin/mainframe.cc:319
msgid "Search in the dictionary"
msgstr ""
-#: wxwin/mainframe.cc:315
+#: wxwin/mainframe.cc:321
msgid "&Rack + 1"
msgstr ""
-#: wxwin/mainframe.cc:315
+#: wxwin/mainframe.cc:321
msgid "Letters of the rack plus one"
msgstr ""
-#: wxwin/mainframe.cc:316
+#: wxwin/mainframe.cc:322
msgid "R&accords"
msgstr ""
-#: wxwin/mainframe.cc:316
+#: wxwin/mainframe.cc:322
msgid "Raccords on a word of the search"
msgstr ""
-#: wxwin/mainframe.cc:317
+#: wxwin/mainframe.cc:323
msgid "&Benjamins"
msgstr ""
-#: wxwin/mainframe.cc:317
+#: wxwin/mainframe.cc:323
msgid "Benjamins on a word of the search"
msgstr ""
-#: wxwin/mainframe.cc:319
+#: wxwin/mainframe.cc:325
msgid "Game &history"
msgstr ""
-#: wxwin/mainframe.cc:321
+#: wxwin/mainframe.cc:327
msgid "R&esults"
msgstr ""
-#: wxwin/mainframe.cc:325
+#: wxwin/mainframe.cc:331
msgid "&About..."
msgstr ""
-#: wxwin/mainframe.cc:325 wxwin/mainframe.cc:718
+#: wxwin/mainframe.cc:331 wxwin/mainframe.cc:733
msgid "About Eliot"
msgstr ""
-#: wxwin/mainframe.cc:329
+#: wxwin/mainframe.cc:335
msgid "&Settings"
msgstr ""
-#: wxwin/mainframe.cc:330
+#: wxwin/mainframe.cc:336
msgid "&Windows"
msgstr ""
-#: wxwin/mainframe.cc:331
+#: wxwin/mainframe.cc:337
msgid "&Help"
msgstr ""
-#: wxwin/mainframe.cc:355 wxwin/mainframe.cc:393
+#: wxwin/mainframe.cc:361 wxwin/mainframe.cc:408
msgid "No dictionary selected"
msgstr ""
-#: wxwin/mainframe.cc:355 wxwin/mainframe.cc:393 wxwin/mainframe.cc:487
-#: wxwin/mainframe.cc:507 wxwin/mainframe.cc:538
+#: wxwin/mainframe.cc:361 wxwin/mainframe.cc:408 wxwin/mainframe.cc:502
+#: wxwin/mainframe.cc:522 wxwin/mainframe.cc:553
msgid "Eliot: error"
msgstr ""
-#: wxwin/mainframe.cc:413
+#: wxwin/mainframe.cc:428
msgid "Cannot open "
msgstr ""
-#: wxwin/mainframe.cc:425 wxwin/mainframe.cc:434
+#: wxwin/mainframe.cc:440 wxwin/mainframe.cc:449
msgid "Error while loading the game"
msgstr ""
-#: wxwin/mainframe.cc:426
+#: wxwin/mainframe.cc:441
msgid "Invalid game"
msgstr ""
-#: wxwin/mainframe.cc:435
+#: wxwin/mainframe.cc:450
msgid "The game is empty"
msgstr ""
-#: wxwin/mainframe.cc:467
+#: wxwin/mainframe.cc:482
msgid "Cannot create "
msgstr ""
-#: wxwin/mainframe.cc:496 wxwin/mainframe.cc:560
+#: wxwin/mainframe.cc:511 wxwin/mainframe.cc:575
msgid "Printing not done"
msgstr ""
-#: wxwin/mainframe.cc:496 wxwin/mainframe.cc:524
+#: wxwin/mainframe.cc:511 wxwin/mainframe.cc:539
msgid "Printing"
msgstr ""
-#: wxwin/mainframe.cc:519
+#: wxwin/mainframe.cc:534
msgid "Print preview problem.\n"
msgstr ""
-#: wxwin/mainframe.cc:520
+#: wxwin/mainframe.cc:535
msgid "The printer may not be correctly initialized"
msgstr ""
-#: wxwin/mainframe.cc:521
+#: wxwin/mainframe.cc:536
msgid "Print preview"
msgstr ""
-#: wxwin/mainframe.cc:542
+#: wxwin/mainframe.cc:557
msgid "Print to a PostScript file"
msgstr ""
-#: wxwin/mainframe.cc:561 wxwin/mainframe.cc:567
+#: wxwin/mainframe.cc:576 wxwin/mainframe.cc:582
msgid "PostScript printing"
msgstr ""
-#: wxwin/mainframe.cc:566
+#: wxwin/mainframe.cc:581
msgid "Cannot initialize PostScript printer"
msgstr ""
-#: wxwin/mainframe.cc:714
+#: wxwin/mainframe.cc:729
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 "
@@ -1122,33 +1122,33 @@
"any later version."
msgstr ""
-#: wxwin/mainframe.cc:912
+#: wxwin/mainframe.cc:927
msgid "turn:"
msgstr ""
-#: wxwin/mainframe.cc:913
+#: wxwin/mainframe.cc:928
msgid "points:"
msgstr ""
-#: wxwin/mainframe.cc:948
+#: wxwin/mainframe.cc:963
msgid ""
"The bag doesn't contain enough letters\n"
"for a new rack."
msgstr ""
-#: wxwin/mainframe.cc:949 wxwin/mainframe.cc:953 wxwin/mainframe.cc:957
+#: wxwin/mainframe.cc:964 wxwin/mainframe.cc:968 wxwin/mainframe.cc:972
msgid "Rack validation"
msgstr ""
-#: wxwin/mainframe.cc:952
+#: wxwin/mainframe.cc:967
msgid "The rack must contain at least 2 consonants and 2 vowels."
msgstr ""
-#: wxwin/mainframe.cc:956
+#: wxwin/mainframe.cc:971
msgid "The rack contains invalid letters for the current dictionary"
msgstr ""
-#: wxwin/mainframe.cc:960
+#: wxwin/mainframe.cc:975
msgid "The rack has been modified manually"
msgstr ""
Index: po/fr.po
===================================================================
RCS file: /cvsroot/eliot/eliot/po/fr.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- po/fr.po 8 Jan 2008 13:52:40 -0000 1.7
+++ po/fr.po 8 Jan 2008 16:09:08 -0000 1.8
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: eliot 1.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-23 23:08+0100\n"
+"POT-Creation-Date: 2008-01-08 16:59+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,91 +17,91 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: dic/header.cpp:317 dic/header.cpp:318
+#: dic/header.cpp:318 dic/header.cpp:319
msgid "Unknown (old format)"
msgstr "Inconnu (vieux format)"
-#: dic/header.cpp:492
+#: dic/header.cpp:493
#, c-format
msgid "dictionary name: %s\n"
msgstr "Nom du dictionnaire : %s\n"
-#: dic/header.cpp:497
+#: dic/header.cpp:498
#, c-format
msgid "compressed on: %s\n"
msgstr "Compressé le : %s\n"
-#: dic/header.cpp:501
+#: dic/header.cpp:502
#, c-format
msgid "compressed on: Unknown date (old format)\n"
msgstr "Compressé le : Date inconnue (vieux format)\n"
-#: dic/header.cpp:503
+#: dic/header.cpp:504
#, c-format
msgid "compressed using a binary compiled by: %s\n"
msgstr "Compressé avec un binaire compilé par : %s\n"
-#: dic/header.cpp:504
+#: dic/header.cpp:505
#, c-format
msgid "dictionary type: %s\n"
msgstr "Type de dictionnaire : %s\n"
-#: dic/header.cpp:505
+#: dic/header.cpp:506
#, c-format
msgid "letters: %s\n"
msgstr "Lettres : %s\n"
-#: dic/header.cpp:506
+#: dic/header.cpp:507
#, c-format
-msgid "number of letters: %d\n"
-msgstr "Nombre de lettres : %d\n"
+msgid "number of letters: %lu\n"
+msgstr "Nombre de lettres : %lu\n"
-#: dic/header.cpp:507
+#: dic/header.cpp:508
#, c-format
msgid "number of words: %d\n"
msgstr "Nombre de mots : %d\n"
-#: dic/header.cpp:508
+#: dic/header.cpp:511
#, c-format
-msgid "header size: %u bytes\n"
-msgstr "Taille du header : %u octets\n"
+msgid "header size: %lu bytes\n"
+msgstr "Taille du header : %lu octets\n"
-#: dic/header.cpp:510
+#: dic/header.cpp:512
#, c-format
msgid "root: %d (edge)\n"
msgstr "Racine : %d (arcs)\n"
-#: dic/header.cpp:511
+#: dic/header.cpp:513
#, c-format
msgid "nodes: %d used + %d saved\n"
msgstr "Noeuds : %d utilisés + %d évités\n"
-#: dic/header.cpp:512
+#: dic/header.cpp:514
#, c-format
msgid "edges: %d used + %d saved\n"
msgstr "Arcs : %d utilisés + %d évités\n"
-#: dic/header.cpp:514
+#: dic/header.cpp:516
#, c-format
msgid "letter | points | frequency | vowel | consonant\n"
msgstr "lettre | points | frequence | voye. | consonne\n"
-#: dic/compdic.cpp:392
+#: dic/compdic.cpp:393
msgid "Mandatory options:"
msgstr "Options obligatoires :"
-#: dic/compdic.cpp:393
+#: dic/compdic.cpp:394
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:394
+#: dic/compdic.cpp:395
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:395
+#: dic/compdic.cpp:396
msgid ""
" -i, --input <string> Path to the uncompressed dictionary file (encoded "
"in UTF-8)"
@@ -109,56 +109,56 @@
" -i, --input <string> Chemin vers le fichier de dictionnaire non "
"compressé (encodé en UTF-8)"
-#: dic/compdic.cpp:396
+#: dic/compdic.cpp:397
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:397
+#: dic/compdic.cpp:398
msgid "Other options:"
msgstr "Autres options :"
-#: dic/compdic.cpp:398
+#: dic/compdic.cpp:399
msgid " -h, --help Print this help and exit"
msgstr " -h, --help Affiche cette aide et quitte"
-#: dic/compdic.cpp:399
+#: dic/compdic.cpp:400
msgid "Example:"
msgstr "Exemple :"
-#: dic/compdic.cpp:400
+#: dic/compdic.cpp:401
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:402
+#: dic/compdic.cpp:403
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:403
+#: dic/compdic.cpp:404
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:404
+#: dic/compdic.cpp:405
msgid "one or more space(s)."
msgstr "un ou plusieurs espace(s)."
-#: dic/compdic.cpp:405
+#: dic/compdic.cpp:406
msgid " - 1st field: the letter itself"
msgstr " - 1er champ : la lettre elle-même"
-#: dic/compdic.cpp:406
+#: dic/compdic.cpp:407
msgid " - 2nd field: the points of the letter"
msgstr " - 2e champ : les points de cette lettre"
-#: dic/compdic.cpp:407
+#: dic/compdic.cpp:408
msgid ""
" - 3rd field: the frequency of the letter (how many letters of this kind in "
"the game)"
@@ -166,7 +166,7 @@
" - 3e champ : la fréquance de la lettre (nombre de lettres de ce genre dans "
"le jeu)"
-#: dic/compdic.cpp:408
+#: dic/compdic.cpp:409
msgid ""
" - 4th field: 1 if the letter is considered as a vowel in Scrabble game, 0 "
"otherwise"
@@ -174,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:409
+#: dic/compdic.cpp:410
msgid ""
" - 5th field: 1 if the letter is considered as a consonant in Scrabble game, "
"0 otherwise"
@@ -182,97 +182,97 @@
" - 5e champ : 1 si la lettre est considérée comme une consonne au jeu de "
"Scrabble, 0 sinon"
-#: dic/compdic.cpp:410
+#: dic/compdic.cpp:411
msgid "Example for french:"
msgstr "Exemple pour le Français :"
-#: dic/compdic.cpp:411
+#: dic/compdic.cpp:412
msgid "A 1 9 1 0"
msgstr "A 1 9 1 0"
-#: dic/compdic.cpp:412
+#: dic/compdic.cpp:413
msgid "[...]"
msgstr "[...]"
-#: dic/compdic.cpp:413
+#: dic/compdic.cpp:414
msgid "Z 10 1 0 1"
msgstr "Z 10 1 0 1"
-#: dic/compdic.cpp:414
+#: dic/compdic.cpp:415
msgid "? 0 2 1 1"
msgstr "? 0 2 1 1"
-#: dic/compdic.cpp:484
+#: dic/compdic.cpp:485
msgid "A mandatory option is missing"
msgstr "Une option obligatoire est manquante"
-#: dic/compdic.cpp:492
+#: dic/compdic.cpp:493
msgid "Cannot stat uncompressed dictionary "
msgstr "Impossible de trouver le dictionnaire non compressé "
-#: dic/compdic.cpp:500
+#: dic/compdic.cpp:501
msgid "Cannot open output file "
msgstr "Impossible d'ouvrir le fichier d'output "
-#: dic/compdic.cpp:548
+#: dic/compdic.cpp:549
#, c-format
msgid " Load time: %.3f s\n"
msgstr " Temps de chargement : %.3f s\n"
-#: dic/compdic.cpp:549
+#: dic/compdic.cpp:550
#, c-format
msgid " Compression time: %.3f s\n"
msgstr " Temps de compression : %.3f s\n"
-#: dic/compdic.cpp:551
+#: dic/compdic.cpp:552
#, c-format
msgid " Maximum recursion level reached: %d\n"
msgstr " Niveau maximum de rcursion atteint : %d\n"
-#: dic/listdic.cpp:100
+#: dic/listdic.cpp:102
#, c-format
msgid "offset binary | structure\n"
msgstr "offset binaire | structure\n"
-#: dic/listdic.cpp:109
+#: dic/listdic.cpp:111
#, c-format
msgid "usage: %s [-a|-h|-l|-x] dictionary\n"
msgstr "Usage : %s [-a|-h|-l|-x] dictionnaire\n"
-#: dic/listdic.cpp:110
+#: dic/listdic.cpp:112
#, c-format
msgid " -a: print all\n"
msgstr " -a : affiche tout\n"
-#: dic/listdic.cpp:111
+#: dic/listdic.cpp:113
#, c-format
msgid " -h: print header\n"
msgstr " -h : affiche l'en-tête\n"
-#: dic/listdic.cpp:112
+#: dic/listdic.cpp:114
#, c-format
msgid " -l: print dictionary word list\n"
msgstr " -l : affiche la liste de mots du dictionnaire\n"
-#: dic/listdic.cpp:113
+#: dic/listdic.cpp:115
#, c-format
msgid " -x: print dictionary in hex\n"
msgstr " -x : affiche le dictionnaire en hexadécimal\n"
-#: dic/regexpmain.cpp:100
+#: dic/regexpmain.cpp:101
#, c-format
msgid "usage: %s dictionary"
msgstr "Usage : %s dictionnaire"
-#: dic/regexpmain.cpp:101
+#: dic/regexpmain.cpp:102
msgid " dictionary: path to eliot dawg dictionary"
msgstr " dictionnaire : chemin vers un dictionnaire de type dawg pour Eliot"
-#: dic/regexpmain.cpp:136
+#: dic/regexpmain.cpp:137
msgid "enter a regular expression:"
msgstr "Entrer une expression régulière :"
-#: dic/regexpmain.cpp:148
+#: dic/regexpmain.cpp:149
msgid "result:"
msgstr "résultat :"
@@ -467,7 +467,7 @@
msgid "The word '%ls' does not exist"
msgstr "Le mot '%ls' n'existe pas"
-#: utils/ncurses.cpp:578 wxwin/mainframe.cc:460 wxwin/mainframe.cc:468
+#: utils/ncurses.cpp:578 wxwin/mainframe.cc:475 wxwin/mainframe.cc:483
msgid "Save the game"
msgstr "Sauvegarder la partie"
@@ -485,8 +485,8 @@
msgid "Game saved in '%ls'"
msgstr "Partie sauvée dans '%ls'"
-#: utils/ncurses.cpp:608 wxwin/mainframe.cc:269 wxwin/mainframe.cc:390
-#: wxwin/mainframe.cc:414
+#: utils/ncurses.cpp:608 wxwin/mainframe.cc:275 wxwin/mainframe.cc:405
+#: wxwin/mainframe.cc:429
msgid "Load a game"
msgstr "Charger une partie"
@@ -581,8 +581,8 @@
msgid "Copy"
msgstr "Copier"
-#: wxwin/auxframes.cc:348 wxwin/mainframe.cc:487 wxwin/mainframe.cc:507
-#: wxwin/mainframe.cc:538
+#: wxwin/auxframes.cc:348 wxwin/mainframe.cc:502 wxwin/mainframe.cc:522
+#: wxwin/mainframe.cc:553
msgid "No on going game"
msgstr "Pas de partie en cours"
@@ -594,11 +594,11 @@
msgid "Rack: "
msgstr "Tirage :"
-#: wxwin/auxframes.cc:525 wxwin/mainframe.cc:319
+#: wxwin/auxframes.cc:525 wxwin/mainframe.cc:325
msgid "Game history"
msgstr "Historique de la partie"
-#: wxwin/auxframes.cc:557 wxwin/mainframe.cc:321
+#: wxwin/auxframes.cc:557 wxwin/mainframe.cc:327
msgid "Results"
msgstr "Résultats"
@@ -746,396 +746,396 @@
msgid "Results of the search"
msgstr "Résultats de la recherche"
-#: wxwin/mainframe.cc:205
+#: wxwin/mainframe.cc:206
msgid " Rack "
msgstr " Tirage "
-#: wxwin/mainframe.cc:206
+#: wxwin/mainframe.cc:207
msgid " Complement "
msgstr " Complément "
-#: wxwin/mainframe.cc:207
+#: wxwin/mainframe.cc:208
msgid " Search "
msgstr " Rechercher "
-#: wxwin/mainframe.cc:208
+#: wxwin/mainframe.cc:209
msgid " Back "
msgstr " Arrière "
-#: wxwin/mainframe.cc:209
+#: wxwin/mainframe.cc:210
msgid " Play "
msgstr " Jouer "
-#: wxwin/mainframe.cc:211
+#: wxwin/mainframe.cc:212
msgid "Random rack"
msgstr "Tirage aléatoire"
-#: wxwin/mainframe.cc:212
+#: wxwin/mainframe.cc:214
msgid "Random complement of the rack"
msgstr "Complément aléatoire du tirage"
-#: wxwin/mainframe.cc:213
+#: wxwin/mainframe.cc:216
msgid "Search with the current rack"
msgstr "Recherche sur le tirage courant"
-#: wxwin/mainframe.cc:214
+#: wxwin/mainframe.cc:218
msgid "Go back one turn"
msgstr "Revenir un coup en arrière"
-#: wxwin/mainframe.cc:215
+#: wxwin/mainframe.cc:220
msgid "Play the selected word"
msgstr "Jouer le mot selectionné"
-#: wxwin/mainframe.cc:266
+#: wxwin/mainframe.cc:272
msgid "&New game\tctrl+n"
msgstr "&Nouvelle partie\tctrl+n"
-#: wxwin/mainframe.cc:266
+#: wxwin/mainframe.cc:272
msgid "Start a new game"
msgstr "Démarrer une nouvelle partie"
-#: wxwin/mainframe.cc:267
+#: wxwin/mainframe.cc:273
msgid "New &joker game\tctrl+j"
msgstr "Nouvelle partie &joker\tctrl+j"
-#: wxwin/mainframe.cc:267
+#: wxwin/mainframe.cc:273
msgid "Start a new joker game"
msgstr "Démarrer une nouvelle partie joker"
-#: wxwin/mainframe.cc:269
+#: wxwin/mainframe.cc:275
msgid "&Load...\tctrl+l"
msgstr "&Charger...\tctrl+l"
-#: wxwin/mainframe.cc:270
+#: wxwin/mainframe.cc:276
msgid "&Save as...\tctrl+s"
msgstr "&Enregistrer sous...\tctrl+s"
-#: wxwin/mainframe.cc:270
+#: wxwin/mainframe.cc:276
msgid "Save the current game"
msgstr "Sauvegarder la partie en cours"
-#: wxwin/mainframe.cc:272
+#: wxwin/mainframe.cc:278
msgid "&Print...\tctrl+p"
msgstr "&Imprimer...\tctrl+p"
-#: wxwin/mainframe.cc:272
+#: wxwin/mainframe.cc:278
msgid "Print this game"
msgstr "Imprimer la partie en cours"
-#: wxwin/mainframe.cc:273
+#: wxwin/mainframe.cc:279
msgid "Print pre&view..."
msgstr "&Aperçu avant impression..."
-#: wxwin/mainframe.cc:273
+#: wxwin/mainframe.cc:279
msgid "Print preview of the game"
msgstr "Aperçu avant impression de la partie"
-#: wxwin/mainframe.cc:275
+#: wxwin/mainframe.cc:281
msgid "Print in PostS&cript..."
msgstr "Imprimer au format &PostScript..."
-#: wxwin/mainframe.cc:275
+#: wxwin/mainframe.cc:281
msgid "Print in a PostScript file"
msgstr "Imprimer dans un fichier PostScript"
-#: wxwin/mainframe.cc:278
+#: wxwin/mainframe.cc:284
msgid "&Quit"
msgstr "&Quitter"
-#: wxwin/mainframe.cc:278
+#: wxwin/mainframe.cc:284
msgid "Quit Eliot"
msgstr "Quitter Eliot"
-#: wxwin/mainframe.cc:281
+#: wxwin/mainframe.cc:287
msgid "&Dictionary..."
msgstr "&Dictionnaire..."
-#: wxwin/mainframe.cc:281 wxwin/mainframe.cc:589
+#: wxwin/mainframe.cc:287 wxwin/mainframe.cc:604
msgid "Choose a dictionary"
msgstr "Choisir un dictionnaire"
-#: wxwin/mainframe.cc:282
+#: wxwin/mainframe.cc:288
msgid "&Search..."
msgstr "&Recherche..."
-#: wxwin/mainframe.cc:282
+#: wxwin/mainframe.cc:288
msgid "Search options"
msgstr "Options de recherche"
-#: wxwin/mainframe.cc:285
+#: wxwin/mainframe.cc:291
msgid "&Background..."
msgstr "&Fond..."
-#: wxwin/mainframe.cc:285
+#: wxwin/mainframe.cc:291
msgid "Background color"
msgstr "Couleur de fond"
-#: wxwin/mainframe.cc:286
+#: wxwin/mainframe.cc:292
msgid "L&ines..."
msgstr "L&ignes..."
-#: wxwin/mainframe.cc:286
+#: wxwin/mainframe.cc:292
msgid "Color of the lines"
msgstr "Couleur des lignes"
-#: wxwin/mainframe.cc:288
+#: wxwin/mainframe.cc:294
msgid "&Played letters..."
msgstr "Lettres &jouées..."
-#: wxwin/mainframe.cc:288
+#: wxwin/mainframe.cc:294
msgid "Color of the letters played on the board"
msgstr "Couleur des lettres jouées sur la grille"
-#: wxwin/mainframe.cc:289
+#: wxwin/mainframe.cc:295
msgid "&Temporary letters..."
msgstr "Lettres &temporaires..."
-#: wxwin/mainframe.cc:289
+#: wxwin/mainframe.cc:295
msgid "Color of the letters of the temporary word"
msgstr "Couleur des lettres du mot temporaire"
-#: wxwin/mainframe.cc:290
+#: wxwin/mainframe.cc:296
msgid "B&ackground of played letters..."
msgstr "Fo&nd des lettres jouées..."
-#: wxwin/mainframe.cc:290
+#: wxwin/mainframe.cc:296
msgid "Background color of the letters played on the board"
msgstr "Couleur de fond des lettres jouées sur la grille"
-#: wxwin/mainframe.cc:291
+#: wxwin/mainframe.cc:297
msgid "Ba&ckground of temporary letters..."
msgstr "Fon&d des lettres temporaires..."
-#: wxwin/mainframe.cc:291
+#: wxwin/mainframe.cc:297
msgid "Background color of the temporary letters on the board"
msgstr "Couleur de fond des lettres temporaires sur la grille"
-#: wxwin/mainframe.cc:293
+#: wxwin/mainframe.cc:299
msgid "Double &letter..."
msgstr "&Lettre compte double..."
-#: wxwin/mainframe.cc:293
+#: wxwin/mainframe.cc:299
msgid "Color of the \"double letter\" squares"
msgstr "Couleur des cases \"mot compte double\""
-#: wxwin/mainframe.cc:294
+#: wxwin/mainframe.cc:300
msgid "Triple l&etter..."
msgstr "L&ettre compte triple..."
-#: wxwin/mainframe.cc:294
+#: wxwin/mainframe.cc:300
msgid "Color of the \"triple letter\" squares"
msgstr "Couleur des cases \"mot compte triple\""
-#: wxwin/mainframe.cc:295
+#: wxwin/mainframe.cc:301
msgid "Double &word..."
msgstr "&Mot compte double..."
-#: wxwin/mainframe.cc:295
+#: wxwin/mainframe.cc:301
msgid "Color of the \"double word\" squares"
msgstr "Couleur des cases \"mot compte double\""
-#: wxwin/mainframe.cc:296
+#: wxwin/mainframe.cc:302
msgid "Triple w&ord..."
msgstr "M&ot compte triple..."
-#: wxwin/mainframe.cc:296
+#: wxwin/mainframe.cc:302
msgid "Color of the \"triple word\" squares"
msgstr "Couleur des cases \"mot compte triple\""
-#: wxwin/mainframe.cc:298
+#: wxwin/mainframe.cc:304
msgid "&Default colors"
msgstr "&Couleurs d'origine"
-#: wxwin/mainframe.cc:298
+#: wxwin/mainframe.cc:304
msgid "Restore the default colors"
msgstr "Restaurer les couleurs d'origine"
-#: wxwin/mainframe.cc:301
+#: wxwin/mainframe.cc:307
msgid "&Search letters..."
msgstr "&Lettres de recherche..."
-#: wxwin/mainframe.cc:301
+#: wxwin/mainframe.cc:307
msgid "Font for the search"
msgstr "Police de caractères pour la recherche"
-#: wxwin/mainframe.cc:304 wxwin/mainframe.cc:328
+#: wxwin/mainframe.cc:310 wxwin/mainframe.cc:334
msgid "&Game"
msgstr "&Partie"
-#: wxwin/mainframe.cc:304
+#: wxwin/mainframe.cc:310
msgid "Configuration of the game"
msgstr "Configuration de la partie"
-#: wxwin/mainframe.cc:305
+#: wxwin/mainframe.cc:311
msgid "&Fonts"
msgstr "P&olices de caractères"
-#: wxwin/mainframe.cc:305
+#: wxwin/mainframe.cc:311
msgid "Configuration of the fonts"
msgstr "Configuration des polices de caractères"
-#: wxwin/mainframe.cc:306
+#: wxwin/mainframe.cc:312
msgid "&Colors"
msgstr "&Couleurs"
-#: wxwin/mainframe.cc:306
+#: wxwin/mainframe.cc:312
msgid "Configuration of the colors"
msgstr "Configuration des couleurs"
-#: wxwin/mainframe.cc:307
+#: wxwin/mainframe.cc:313
msgid "&Printing..."
msgstr "&Impression..."
-#: wxwin/mainframe.cc:307
+#: wxwin/mainframe.cc:313
msgid "Configuration of the printing parameters"
msgstr "Configuration des paramètres d'impression"
-#: wxwin/mainframe.cc:310
+#: wxwin/mainframe.cc:316
msgid "&Board"
msgstr "&Grille"
-#: wxwin/mainframe.cc:310
+#: wxwin/mainframe.cc:316
msgid "Game board"
msgstr "Plateau de jeu"
-#: wxwin/mainframe.cc:311
+#: wxwin/mainframe.cc:317
msgid "Ba&g"
msgstr "&Sac"
-#: wxwin/mainframe.cc:311
+#: wxwin/mainframe.cc:317
msgid "Remaining letters in the bag"
msgstr "Lettres restantes dans le sac"
-#: wxwin/mainframe.cc:312
+#: wxwin/mainframe.cc:318
msgid "&Check"
msgstr "&Vérification"
-#: wxwin/mainframe.cc:312
+#: wxwin/mainframe.cc:318
msgid "Check a word in the dictionary"
msgstr "Vérifier l'existence d'un mot dans le dictionnaire"
-#: wxwin/mainframe.cc:313
+#: wxwin/mainframe.cc:319
msgid "&Search"
msgstr "&Recherche"
-#: wxwin/mainframe.cc:313
+#: wxwin/mainframe.cc:319
msgid "Search in the dictionary"
msgstr "Recherche dans le dictionnaire"
-#: wxwin/mainframe.cc:315
+#: wxwin/mainframe.cc:321
msgid "&Rack + 1"
msgstr "&Tirage + 1"
-#: wxwin/mainframe.cc:315
+#: wxwin/mainframe.cc:321
msgid "Letters of the rack plus one"
msgstr "Lettres du tirage plus une"
-#: wxwin/mainframe.cc:316
+#: wxwin/mainframe.cc:322
msgid "R&accords"
msgstr "R&accords"
-#: wxwin/mainframe.cc:316
+#: wxwin/mainframe.cc:322
msgid "Raccords on a word of the search"
msgstr "Raccords sur un mot de la recherche"
-#: wxwin/mainframe.cc:317
+#: wxwin/mainframe.cc:323
msgid "&Benjamins"
msgstr "&Benjamins"
-#: wxwin/mainframe.cc:317
+#: wxwin/mainframe.cc:323
msgid "Benjamins on a word of the search"
msgstr "Benjamins sur un mot de la recherche"
-#: wxwin/mainframe.cc:319
+#: wxwin/mainframe.cc:325
msgid "Game &history"
msgstr "&Historique de la partie"
-#: wxwin/mainframe.cc:321
+#: wxwin/mainframe.cc:327
msgid "R&esults"
msgstr "Ré&sultats"
-#: wxwin/mainframe.cc:325
+#: wxwin/mainframe.cc:331
msgid "&About..."
msgstr "Ã &propos..."
-#: wxwin/mainframe.cc:325 wxwin/mainframe.cc:718
+#: wxwin/mainframe.cc:331 wxwin/mainframe.cc:733
msgid "About Eliot"
msgstr "Ã propos d'Eliot"
-#: wxwin/mainframe.cc:329
+#: wxwin/mainframe.cc:335
msgid "&Settings"
msgstr "&Paramètres"
-#: wxwin/mainframe.cc:330
+#: wxwin/mainframe.cc:336
msgid "&Windows"
msgstr "&Fenêtres"
-#: wxwin/mainframe.cc:331
+#: wxwin/mainframe.cc:337
msgid "&Help"
msgstr "&Aide"
-#: wxwin/mainframe.cc:355 wxwin/mainframe.cc:393
+#: wxwin/mainframe.cc:361 wxwin/mainframe.cc:408
msgid "No dictionary selected"
msgstr "Pas de dictionnaire sélectionné"
-#: wxwin/mainframe.cc:355 wxwin/mainframe.cc:393 wxwin/mainframe.cc:487
-#: wxwin/mainframe.cc:507 wxwin/mainframe.cc:538
+#: wxwin/mainframe.cc:361 wxwin/mainframe.cc:408 wxwin/mainframe.cc:502
+#: wxwin/mainframe.cc:522 wxwin/mainframe.cc:553
msgid "Eliot: error"
msgstr "Eliot : erreur"
-#: wxwin/mainframe.cc:413
+#: wxwin/mainframe.cc:428
msgid "Cannot open "
msgstr "Impossible d'ouvrir "
-#: wxwin/mainframe.cc:425 wxwin/mainframe.cc:434
+#: wxwin/mainframe.cc:440 wxwin/mainframe.cc:449
msgid "Error while loading the game"
msgstr "Erreur pendant le chargement de la partie"
-#: wxwin/mainframe.cc:426
+#: wxwin/mainframe.cc:441
msgid "Invalid game"
msgstr "Partie invalide"
-#: wxwin/mainframe.cc:435
+#: wxwin/mainframe.cc:450
msgid "The game is empty"
msgstr "La partie est vide"
-#: wxwin/mainframe.cc:467
+#: wxwin/mainframe.cc:482
msgid "Cannot create "
msgstr "Impossible de créer "
-#: wxwin/mainframe.cc:496 wxwin/mainframe.cc:560
+#: wxwin/mainframe.cc:511 wxwin/mainframe.cc:575
msgid "Printing not done"
msgstr "Impression non effectuée"
-#: wxwin/mainframe.cc:496 wxwin/mainframe.cc:524
+#: wxwin/mainframe.cc:511 wxwin/mainframe.cc:539
msgid "Printing"
msgstr "Impression"
-#: wxwin/mainframe.cc:519
+#: wxwin/mainframe.cc:534
msgid "Print preview problem.\n"
msgstr "Problème avec l'aperçu avant impression.\n"
-#: wxwin/mainframe.cc:520
+#: wxwin/mainframe.cc:535
msgid "The printer may not be correctly initialized"
msgstr "Il se peut que l'imprimante soit mal initialisée"
-#: wxwin/mainframe.cc:521
+#: wxwin/mainframe.cc:536
msgid "Print preview"
msgstr "Aperçu avant impression"
-#: wxwin/mainframe.cc:542
+#: wxwin/mainframe.cc:557
msgid "Print to a PostScript file"
msgstr "Imprimer dans un fichier PostScript"
-#: wxwin/mainframe.cc:561 wxwin/mainframe.cc:567
+#: wxwin/mainframe.cc:576 wxwin/mainframe.cc:582
msgid "PostScript printing"
msgstr "Impression PostScript"
-#: wxwin/mainframe.cc:566
+#: wxwin/mainframe.cc:581
msgid "Cannot initialize PostScript printer"
msgstr "Impossible d'initialiser l'impression PostScript"
-#: wxwin/mainframe.cc:714
+#: wxwin/mainframe.cc:729
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 "
@@ -1147,15 +1147,15 @@
"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:912
+#: wxwin/mainframe.cc:927
msgid "turn:"
msgstr "coup :"
-#: wxwin/mainframe.cc:913
+#: wxwin/mainframe.cc:928
msgid "points:"
msgstr "points :"
-#: wxwin/mainframe.cc:948
+#: wxwin/mainframe.cc:963
msgid ""
"The bag doesn't contain enough letters\n"
"for a new rack."
@@ -1163,20 +1163,20 @@
"Le sac ne contient pas assez de lettres\n"
"pour un nouveau tirage."
-#: wxwin/mainframe.cc:949 wxwin/mainframe.cc:953 wxwin/mainframe.cc:957
+#: wxwin/mainframe.cc:964 wxwin/mainframe.cc:968 wxwin/mainframe.cc:972
msgid "Rack validation"
msgstr "Validation du tirage"
-#: wxwin/mainframe.cc:952
+#: wxwin/mainframe.cc:967
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:956
+#: wxwin/mainframe.cc:971
msgid "The rack contains invalid letters for the current dictionary"
msgstr ""
"Le tirage contient des lettres incorrectes pour le dictionnaire courant"
-#: wxwin/mainframe.cc:960
+#: wxwin/mainframe.cc:975
msgid "The rack has been modified manually"
msgstr "Le tirage a été modifié manuellement"
Index: utils/Makefile.am
===================================================================
RCS file: /cvsroot/eliot/eliot/utils/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- utils/Makefile.am 8 Jan 2008 13:52:42 -0000 1.10
+++ utils/Makefile.am 8 Jan 2008 16:09:09 -0000 1.11
@@ -17,9 +17,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
localedir = $(datadir)/locale
-AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\"
-
-INCLUDES = -I$(top_srcdir)/dic -I$(top_srcdir)/game -I../intl
-I$(top_srcdir)/intl
+AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/dic
-I$(top_srcdir)/game -I../intl -I$(top_srcdir)/intl
noinst_PROGRAMS =
bin_PROGRAMS =
Index: wxwin/Makefile.am
===================================================================
RCS file: /cvsroot/eliot/eliot/wxwin/Makefile.am,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- wxwin/Makefile.am 8 Jan 2008 13:52:43 -0000 1.11
+++ wxwin/Makefile.am 8 Jan 2008 16:09:09 -0000 1.12
@@ -22,9 +22,7 @@
bin_PROGRAMS = eliot
-AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" @WX_CPPFLAGS@ ##
-Wno-strict-aliasing
-
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/dic -I$(top_srcdir)/game
+AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" @WX_CPPFLAGS@ -I$(top_srcdir)
-I$(top_srcdir)/dic -I$(top_srcdir)/game
eliot_SOURCES = \
configdb.cc configdb.h \
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Eliot-dev] eliot bootstrap configure.in dic/Makefile.am ga...,
eliot-dev <=