diff --git a/po/eliot.pot b/po/eliot.pot index ec8c516..3c407c9 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: 2005-02-06 23:21+0100\n" +"POT-Creation-Date: 2005-02-07 23:20+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -47,7 +47,7 @@ msgid " History of the game " msgstr "" #: utils/ncurses.cpp:250 -msgid " N RACK SOLUTION REF PTS P BONUS" +msgid " N | RACK | SOLUTION | REF | PTS | P | BONUS" msgstr "" #: utils/ncurses.cpp:281 @@ -162,39 +162,53 @@ msgstr "" msgid "Enter the word to check:" msgstr "" -#: utils/ncurses.cpp:363 +#: utils/ncurses.cpp:355 +#, c-format +msgid "The word '%s' exists" +msgstr "" + +#: utils/ncurses.cpp:357 +#, c-format +msgid "The word '%s' does not exist" +msgstr "" + +#: utils/ncurses.cpp:367 msgid " Pass your turn " msgstr "" -#: utils/ncurses.cpp:364 +#: utils/ncurses.cpp:368 msgid "Enter the letters to change:" msgstr "" -#: utils/ncurses.cpp:373 +#: utils/ncurses.cpp:377 msgid "Cannot pass the turn" msgstr "" -#: utils/ncurses.cpp:383 +#: utils/ncurses.cpp:387 msgid " Set rack " msgstr "" -#: utils/ncurses.cpp:384 +#: utils/ncurses.cpp:388 msgid "Enter the new letters:" msgstr "" -#: utils/ncurses.cpp:673 -msgid "Training" -msgstr "" - -#: utils/ncurses.cpp:675 -msgid "Free game" -msgstr "" - #: utils/ncurses.cpp:677 -msgid "Duplicate" +msgid "Training mode" msgstr "" -#: utils/ncurses.cpp:733 +#: utils/ncurses.cpp:679 +msgid "Free game mode" +msgstr "" + +#: utils/ncurses.cpp:681 +msgid "Duplicate mode" +msgstr "" + +#: utils/ncurses.cpp:682 +msgid "[h for help]" +msgstr "" + +#: utils/ncurses.cpp:737 #, c-format msgid "Usage: eliotcurses /path/to/ods4.dawg\n" msgstr "" diff --git a/po/fr.po b/po/fr.po index 44545df..4e278e0 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: eliot 1.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-02-06 23:21+0100\n" +"POT-Creation-Date: 2005-02-07 23:20+0100\n" "PO-Revision-Date: 2005-02-06 20:03+0100\n" "Last-Translator: Olivier Teuliere \n" "Language-Team: French \n" @@ -48,8 +48,8 @@ msgid " History of the game " msgstr " Historique de la partie " #: utils/ncurses.cpp:250 -msgid " N RACK SOLUTION REF PTS P BONUS" -msgstr " N TIRAGE SOLUTION REF PTS J BONUS" +msgid " N | RACK | SOLUTION | REF | PTS | P | BONUS" +msgstr " N | TIRAGE | SOLUTION | REF | PTS | J | BONUS" #: utils/ncurses.cpp:281 msgid " Help " @@ -57,7 +57,7 @@ msgstr " Aide " #: utils/ncurses.cpp:286 msgid "[Global]" -msgstr "[General]" +msgstr "[Général]" #: utils/ncurses.cpp:287 msgid " h, H, ? Show/hide help box" @@ -119,7 +119,7 @@ msgstr " n, N Passer au joueur humain suivant" #: utils/ncurses.cpp:307 msgid "[Free game mode]" -msgstr "[Mode partir libre]" +msgstr "[Mode partie libre]" #: utils/ncurses.cpp:308 msgid " p, P Pass your turn (with or without changing letters)" @@ -140,7 +140,7 @@ msgstr " , Naviguer dans une bo #: utils/ncurses.cpp:314 msgid " Ctrl-l Refresh the screen" -msgstr " Ctrl-l Rafraîchr l'écran" +msgstr " Ctrl-l Rafraîchir l'écran" #: utils/ncurses.cpp:322 msgid " Play a word " @@ -166,39 +166,62 @@ msgstr " Dictionnaire " msgid "Enter the word to check:" msgstr "Entrer le mot à vérifier:" -#: utils/ncurses.cpp:363 +#: utils/ncurses.cpp:355 +#, c-format +msgid "The word '%s' exists" +msgstr "Le mot '%s' existe" + +#: utils/ncurses.cpp:357 +#, c-format +msgid "The word '%s' does not exist" +msgstr "Le mot '%s' n'existe pas" + +#: utils/ncurses.cpp:367 msgid " Pass your turn " msgstr " Passer son tour " -#: utils/ncurses.cpp:364 +#: utils/ncurses.cpp:368 msgid "Enter the letters to change:" msgstr "Entrer les lettres à changer:" -#: utils/ncurses.cpp:373 +#: utils/ncurses.cpp:377 msgid "Cannot pass the turn" msgstr "Impossible de passer le tour" -#: utils/ncurses.cpp:383 +#: utils/ncurses.cpp:387 msgid " Set rack " msgstr " Choix du tirage " -#: utils/ncurses.cpp:384 +#: utils/ncurses.cpp:388 msgid "Enter the new letters:" msgstr "Entrer les nouvelles lettres:" -#: utils/ncurses.cpp:673 -msgid "Training" -msgstr "Entrainement" - -#: utils/ncurses.cpp:675 -msgid "Free game" -msgstr "Partie libre" - #: utils/ncurses.cpp:677 -msgid "Duplicate" -msgstr "Duplicate" +msgid "Training mode" +msgstr "Mode entraînement" -#: utils/ncurses.cpp:733 +#: utils/ncurses.cpp:679 +msgid "Free game mode" +msgstr "Mode partie libre" + +#: utils/ncurses.cpp:681 +msgid "Duplicate mode" +msgstr "Mode duplicate" + +#: utils/ncurses.cpp:682 +msgid "[h for help]" +msgstr "[h pour l'aide]" + +#: utils/ncurses.cpp:737 #, c-format msgid "Usage: eliotcurses /path/to/ods4.dawg\n" msgstr "Usage: eliotcurses /chemin vers/ods4.dawg\n" + +#~ msgid "Training" +#~ msgstr "Entraînement" + +#~ msgid "Free game" +#~ msgstr "Partie libre" + +#~ msgid "Duplicate" +#~ msgstr "Duplicate" diff --git a/utils/ncurses.cpp b/utils/ncurses.cpp index aee41b9..76e4dfd 100644 --- a/utils/ncurses.cpp +++ b/utils/ncurses.cpp @@ -2,7 +2,7 @@ * Copyright (C) 2005 Eliot * Authors: Olivier Teuliere * - * $Id: ncurses.cpp,v 1.2 2005/02/06 22:18:11 ipkiss Exp $ + * $Id: ncurses.cpp,v 1.3 2005/02/07 22:20:32 ipkiss Exp $ * * 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 @@ -247,7 +247,7 @@ void CursesIntf::drawHistory(WINDOW *win, int y, int x) // Heading boxPrint(win, m_boxStart, x + 2, - _(" N RACK SOLUTION REF PTS P BONUS")); + _(" N | RACK | SOLUTION | REF | PTS | P | BONUS")); mvwhline(win, y + 2, x + 2, ACS_HLINE, 55); int i; @@ -350,8 +350,12 @@ void CursesIntf::checkWord(WINDOW *win, int y, int x) if (readString(win, y + 2, x + 2, 15, word)) { int res = Dic_search_word(m_game.getDic(), word.c_str()); - drawStatus(win, LINES - 1, 0, string("The word '") + word + - (res ? "' exists" : "' does not exist")); + char s[100]; + if (res) + snprintf(s, 100, _("The word '%s' exists"), word.c_str()); + else + snprintf(s, 100, _("The word '%s' does not exist"), word.c_str()); + drawStatus(win, LINES - 1, 0, s); } m_state = DEFAULT; clearRect(win, y, x, 4, 32); @@ -670,12 +674,12 @@ void CursesIntf::redraw(WINDOW *win) attron(A_REVERSE); string mode; if (m_game.getMode() == Game::kTRAINING) - mode = _("Training"); + mode = _("Training mode"); else if (m_game.getMode() == Game::kFREEGAME) - mode = _("Free game"); + mode = _("Free game mode"); else if (m_game.getMode() == Game::kDUPLICATE) - mode = _("Duplicate"); - string title = "Eliot (" + mode + " mode) [h for help]"; + mode = _("Duplicate mode"); + string title = "Eliot (" + mode + ") " + _("[h for help]"); mvwprintw(win, 0, 0, title.c_str()); whline(win, ' ', COLS - title.size()); attroff(A_REVERSE);