diff --git a/bootstrap b/bootstrap index 43e15e2..bc0380c 100755 --- a/bootstrap +++ b/bootstrap @@ -3,5 +3,5 @@ autopoint -f aclocal -I m4 autoheader -automake --add-missing --foreign --copy +automake --add-missing --foreign --copy -Wall autoconf diff --git a/configure.in b/configure.in index b10ec68..ce098b9 100644 --- a/configure.in +++ b/configure.in @@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script. 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) diff --git a/dic/Makefile.am b/dic/Makefile.am index 513bcd9..5c28856 100644 --- a/dic/Makefile.am +++ b/dic/Makefile.am @@ -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 diff --git a/game/Makefile.am b/game/Makefile.am index 6284d99..fa5dacb 100644 --- a/game/Makefile.am +++ b/game/Makefile.am @@ -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 \ diff --git a/po/eliot.pot b/po/eliot.pot index a533479..05939bb 100644 --- a/po/eliot.pot +++ b/po/eliot.pot @@ -8,7 +8,7 @@ msgid "" 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 \n" "Language-Team: LANGUAGE \n" @@ -16,247 +16,247 @@ msgstr "" "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 -#, c-format -msgid "number of letters: %d\n" -msgstr "" - #: dic/header.cpp:507 #, c-format -msgid "number of words: %d\n" +msgid "number of letters: %lu\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" +msgid "number of words: %d\n" msgstr "" #: dic/header.cpp:511 #, c-format -msgid "nodes: %d used + %d saved\n" +msgid "header size: %lu bytes\n" msgstr "" #: dic/header.cpp:512 #, c-format -msgid "edges: %d used + %d saved\n" +msgid "root: %d (edge)\n" +msgstr "" + +#: dic/header.cpp:513 +#, c-format +msgid "nodes: %d used + %d saved\n" msgstr "" #: dic/header.cpp:514 #, c-format +msgid "edges: %d used + %d saved\n" +msgstr "" + +#: 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 Set the dictionary name and version" msgstr "" -#: dic/compdic.cpp:394 +#: dic/compdic.cpp:395 msgid "" " -l, --letters Path to the file containing the letters (see below)" msgstr "" -#: dic/compdic.cpp:395 +#: dic/compdic.cpp:396 msgid "" " -i, --input Path to the uncompressed dictionary file (encoded " "in UTF-8)" msgstr "" -#: dic/compdic.cpp:396 +#: dic/compdic.cpp:397 msgid "" " -o, --output \n" "Language-Team: French \n" @@ -17,91 +17,91 @@ msgstr "" "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 -#, c-format -msgid "number of letters: %d\n" -msgstr "Nombre de lettres : %d\n" - #: dic/header.cpp:507 #, c-format +msgid "number of letters: %lu\n" +msgstr "Nombre de lettres : %lu\n" + +#: 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 Set the dictionary name and version" msgstr " -d, --dicname Choisir le nom et la version du dictionnaire" -#: dic/compdic.cpp:394 +#: dic/compdic.cpp:395 msgid "" " -l, --letters Path to the file containing the letters (see below)" msgstr "" " -l, --letters Chemin vers un fichier contenant les lettres (voir " "ci-dessous)" -#: dic/compdic.cpp:395 +#: dic/compdic.cpp:396 msgid "" " -i, --input Path to the uncompressed dictionary file (encoded " "in UTF-8)" @@ -109,56 +109,56 @@ msgstr "" " -i, --input Chemin vers le fichier de dictionnaire non " "compressé (encodé en UTF-8)" -#: dic/compdic.cpp:396 +#: dic/compdic.cpp:397 msgid "" " -o, --output