[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Eliot-dev] eliot Makefile.am po/LINGUAS po/eliot.pot po/fr...
|
From: |
eliot-dev |
|
Subject: |
[Eliot-dev] eliot Makefile.am po/LINGUAS po/eliot.pot po/fr... |
|
Date: |
Sat, 12 Jan 2008 20:42:26 +0000 |
CVSROOT: /cvsroot/eliot
Module name: eliot
Changes by: Olivier Teulière <ipkiss> 08/01/12 20:42:26
Modified files:
. : Makefile.am
po : LINGUAS eliot.pot fr.po
wxwin : auxframes.cc auxframes.h ewx.h main.cc
mainframe.cc
Log message:
- Fixed language detection on Windows
- Slightly improved the translation
- Added the 'package-win32-zip' target to ease win32 deliveries
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/eliot/Makefile.am?cvsroot=eliot&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/eliot/po/LINGUAS?cvsroot=eliot&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/eliot/po/eliot.pot?cvsroot=eliot&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/eliot/po/fr.po?cvsroot=eliot&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/eliot/wxwin/auxframes.cc?cvsroot=eliot&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/eliot/wxwin/auxframes.h?cvsroot=eliot&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/eliot/wxwin/ewx.h?cvsroot=eliot&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/eliot/wxwin/main.cc?cvsroot=eliot&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/eliot/wxwin/mainframe.cc?cvsroot=eliot&r1=1.24&r2=1.25
Patches:
Index: Makefile.am
===================================================================
RCS file: /cvsroot/eliot/eliot/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- Makefile.am 8 Jan 2008 16:33:55 -0000 1.4
+++ Makefile.am 12 Jan 2008 20:42:25 -0000 1.5
@@ -1,3 +1,41 @@
SUBDIRS = intl dic game utils wxwin po
ACLOCAL_AMFLAGS = -I m4
+
+# Prepare the win32 package
+WIN32_PACKAGE_DIR = $(top_builddir)/eliot-$(VERSION)
+
+.PHONY: package-win32-zip
+
+package-win32-zip:
+# Check that the working directory is not already there
+ @if test -e $(WIN32_PACKAGE_DIR); then \
+ echo '$(WIN32_PACKAGE_DIR) is in the way'; \
+ false; \
+ fi
+
+ rm -f eliot-$(VERSION)-win32.zip
+ mkdir -p $(WIN32_PACKAGE_DIR)
+
+# Copy the binaries and strip them
+ cp $(top_builddir)/wxwin/eliot$(EXEEXT)
$(top_builddir)/dic/compdic$(EXEEXT) $(top_builddir)/dic/listdic$(EXEEXT)
$(WIN32_PACKAGE_DIR)
+ $(STRIP) $(WIN32_PACKAGE_DIR)/*
+
+# Copy the i18n files
+ cat $(top_srcdir)/po/LINGUAS | while read lang; do \
+ mkdir -p $(WIN32_PACKAGE_DIR)/locale/$${lang}/LC_MESSAGES; \
+ cp $(top_srcdir)/po/$${lang}.gmo
$(WIN32_PACKAGE_DIR)/locale/$${lang}/LC_MESSAGES/eliot.mo; \
+ done
+
+# Copy relevant text files
+ for i in AUTHORS COPYING; do \
+ cp $(top_srcdir)/$$i $(WIN32_PACKAGE_DIR)/$$i.txt; \
+ unix2dos $(WIN32_PACKAGE_DIR)/$$i.txt; \
+ done
+
+# Copy the mingw DLL
+ gunzip -c /usr/share/doc/mingw32-runtime/mingwm10.dll.gz >
$(WIN32_PACKAGE_DIR)/mingwm10.dll
+
+# Zip the temporary dir and remove it
+ zip -r -9 eliot-$(VERSION)-win32.zip $(WIN32_PACKAGE_DIR)
+ rm -rf $(WIN32_PACKAGE_DIR)
Index: po/LINGUAS
===================================================================
RCS file: /cvsroot/eliot/eliot/po/LINGUAS,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- po/LINGUAS 8 Jan 2008 13:52:40 -0000 1.2
+++ po/LINGUAS 12 Jan 2008 20:42:25 -0000 1.3
@@ -1 +1,3 @@
-fr address@hidden address@hidden
+fr
address@hidden
address@hidden
Index: po/eliot.pot
===================================================================
RCS file: /cvsroot/eliot/eliot/po/eliot.pot,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- po/eliot.pot 8 Jan 2008 16:09:08 -0000 1.8
+++ po/eliot.pot 12 Jan 2008 20:42:25 -0000 1.9
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-08 16:59+0100\n"
+"POT-Creation-Date: 2008-01-12 21:14+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"
@@ -569,15 +569,27 @@
msgid "No result"
msgstr ""
-#: wxwin/auxframes.cc:409
+#: wxwin/auxframes.cc:373
+msgid "Rack + 1"
+msgstr ""
+
+#: wxwin/auxframes.cc:415
msgid "Rack: "
msgstr ""
-#: wxwin/auxframes.cc:525 wxwin/mainframe.cc:325
+#: wxwin/auxframes.cc:436
+msgid "Benjamins"
+msgstr ""
+
+#: wxwin/auxframes.cc:477
+msgid "Extensions"
+msgstr ""
+
+#: wxwin/auxframes.cc:543 wxwin/mainframe.cc:325
msgid "Game history"
msgstr ""
-#: wxwin/auxframes.cc:557 wxwin/mainframe.cc:327
+#: wxwin/auxframes.cc:575 wxwin/mainframe.cc:327
msgid "Results"
msgstr ""
@@ -725,48 +737,48 @@
msgid "Results of the search"
msgstr ""
-#: wxwin/mainframe.cc:206
+#: wxwin/mainframe.cc:188
msgid " Rack "
msgstr ""
-#: wxwin/mainframe.cc:207
+#: wxwin/mainframe.cc:189
msgid " Complement "
msgstr ""
-#: wxwin/mainframe.cc:208
+#: wxwin/mainframe.cc:190
msgid " Search "
msgstr ""
-#: wxwin/mainframe.cc:209
+#: wxwin/mainframe.cc:191
msgid " Back "
msgstr ""
-#: wxwin/mainframe.cc:210
+#: wxwin/mainframe.cc:192
msgid " Play "
msgstr ""
-#: wxwin/mainframe.cc:212
+#: wxwin/mainframe.cc:194
msgid "Random rack"
msgstr ""
-#: wxwin/mainframe.cc:214
+#: wxwin/mainframe.cc:196
msgid "Random complement of the rack"
msgstr ""
-#: wxwin/mainframe.cc:216
+#: wxwin/mainframe.cc:198
msgid "Search with the current rack"
msgstr ""
-#: wxwin/mainframe.cc:218
+#: wxwin/mainframe.cc:200
msgid "Go back one turn"
msgstr ""
-#: wxwin/mainframe.cc:220
+#: wxwin/mainframe.cc:202
msgid "Play the selected word"
msgstr ""
#: wxwin/mainframe.cc:272
-msgid "&New game\tctrl+n"
+msgid "&New game\tCtrl+N"
msgstr ""
#: wxwin/mainframe.cc:272
@@ -774,7 +786,7 @@
msgstr ""
#: wxwin/mainframe.cc:273
-msgid "New &joker game\tctrl+j"
+msgid "New &joker game\tCtrl+J"
msgstr ""
#: wxwin/mainframe.cc:273
@@ -782,11 +794,11 @@
msgstr ""
#: wxwin/mainframe.cc:275
-msgid "&Load...\tctrl+l"
+msgid "&Load...\tCtrl+L"
msgstr ""
#: wxwin/mainframe.cc:276
-msgid "&Save as...\tctrl+s"
+msgid "&Save as...\tCtrl+S"
msgstr ""
#: wxwin/mainframe.cc:276
@@ -794,7 +806,7 @@
msgstr ""
#: wxwin/mainframe.cc:278
-msgid "&Print...\tctrl+p"
+msgid "&Print...\tCtrl+P"
msgstr ""
#: wxwin/mainframe.cc:278
@@ -818,7 +830,7 @@
msgstr ""
#: wxwin/mainframe.cc:284
-msgid "&Quit"
+msgid "&Quit\tCtrl+Q"
msgstr ""
#: wxwin/mainframe.cc:284
@@ -826,7 +838,7 @@
msgstr ""
#: wxwin/mainframe.cc:287
-msgid "&Dictionary..."
+msgid "&Dictionary...\tCtrl+D"
msgstr ""
#: wxwin/mainframe.cc:287 wxwin/mainframe.cc:604
@@ -978,7 +990,7 @@
msgstr ""
#: wxwin/mainframe.cc:317
-msgid "Ba&g"
+msgid "Ba&g\tCtrl+B"
msgstr ""
#: wxwin/mainframe.cc:317
@@ -1010,11 +1022,11 @@
msgstr ""
#: wxwin/mainframe.cc:322
-msgid "R&accords"
+msgid "&Extensions"
msgstr ""
#: wxwin/mainframe.cc:322
-msgid "Raccords on a word of the search"
+msgid "One-letter extensions on a word of the search"
msgstr ""
#: wxwin/mainframe.cc:323
@@ -1022,11 +1034,11 @@
msgstr ""
#: wxwin/mainframe.cc:323
-msgid "Benjamins on a word of the search"
+msgid "Benjamins (3-letter extensions) on a word of the search"
msgstr ""
#: wxwin/mainframe.cc:325
-msgid "Game &history"
+msgid "Game &history\tCtrl+H"
msgstr ""
#: wxwin/mainframe.cc:327
Index: po/fr.po
===================================================================
RCS file: /cvsroot/eliot/eliot/po/fr.po,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- po/fr.po 8 Jan 2008 16:09:08 -0000 1.8
+++ po/fr.po 12 Jan 2008 20:42:26 -0000 1.9
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: eliot 1.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-08 16:59+0100\n"
+"POT-Creation-Date: 2008-01-12 21:14+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"
@@ -590,15 +590,27 @@
msgid "No result"
msgstr "Pas de résultat"
-#: wxwin/auxframes.cc:409
+#: wxwin/auxframes.cc:373
+msgid "Rack + 1"
+msgstr "Tirage + 1"
+
+#: wxwin/auxframes.cc:415
msgid "Rack: "
msgstr "Tirage :"
-#: wxwin/auxframes.cc:525 wxwin/mainframe.cc:325
+#: wxwin/auxframes.cc:436
+msgid "Benjamins"
+msgstr "Benjamins"
+
+#: wxwin/auxframes.cc:477
+msgid "Extensions"
+msgstr "Raccords"
+
+#: wxwin/auxframes.cc:543 wxwin/mainframe.cc:325
msgid "Game history"
msgstr "Historique de la partie"
-#: wxwin/auxframes.cc:557 wxwin/mainframe.cc:327
+#: wxwin/auxframes.cc:575 wxwin/mainframe.cc:327
msgid "Results"
msgstr "Résultats"
@@ -746,77 +758,77 @@
msgid "Results of the search"
msgstr "Résultats de la recherche"
-#: wxwin/mainframe.cc:206
+#: wxwin/mainframe.cc:188
msgid " Rack "
msgstr " Tirage "
-#: wxwin/mainframe.cc:207
+#: wxwin/mainframe.cc:189
msgid " Complement "
msgstr " Complément "
-#: wxwin/mainframe.cc:208
+#: wxwin/mainframe.cc:190
msgid " Search "
msgstr " Rechercher "
-#: wxwin/mainframe.cc:209
+#: wxwin/mainframe.cc:191
msgid " Back "
msgstr " Arrière "
-#: wxwin/mainframe.cc:210
+#: wxwin/mainframe.cc:192
msgid " Play "
msgstr " Jouer "
-#: wxwin/mainframe.cc:212
+#: wxwin/mainframe.cc:194
msgid "Random rack"
msgstr "Tirage aléatoire"
-#: wxwin/mainframe.cc:214
+#: wxwin/mainframe.cc:196
msgid "Random complement of the rack"
msgstr "Complément aléatoire du tirage"
-#: wxwin/mainframe.cc:216
+#: wxwin/mainframe.cc:198
msgid "Search with the current rack"
msgstr "Recherche sur le tirage courant"
-#: wxwin/mainframe.cc:218
+#: wxwin/mainframe.cc:200
msgid "Go back one turn"
msgstr "Revenir un coup en arrière"
-#: wxwin/mainframe.cc:220
+#: wxwin/mainframe.cc:202
msgid "Play the selected word"
msgstr "Jouer le mot selectionné"
#: wxwin/mainframe.cc:272
-msgid "&New game\tctrl+n"
-msgstr "&Nouvelle partie\tctrl+n"
+msgid "&New game\tCtrl+N"
+msgstr "&Nouvelle partie\tCtrl+N"
#: wxwin/mainframe.cc:272
msgid "Start a new game"
msgstr "Démarrer une nouvelle partie"
#: wxwin/mainframe.cc:273
-msgid "New &joker game\tctrl+j"
-msgstr "Nouvelle partie &joker\tctrl+j"
+msgid "New &joker game\tCtrl+J"
+msgstr "Nouvelle partie &joker\tCtrl+J"
#: wxwin/mainframe.cc:273
msgid "Start a new joker game"
msgstr "Démarrer une nouvelle partie joker"
#: wxwin/mainframe.cc:275
-msgid "&Load...\tctrl+l"
-msgstr "&Charger...\tctrl+l"
+msgid "&Load...\tCtrl+L"
+msgstr "&Charger...\tCtrl+O"
#: wxwin/mainframe.cc:276
-msgid "&Save as...\tctrl+s"
-msgstr "&Enregistrer sous...\tctrl+s"
+msgid "&Save as...\tCtrl+S"
+msgstr "&Enregistrer sous...\tCtrl+S"
#: wxwin/mainframe.cc:276
msgid "Save the current game"
msgstr "Sauvegarder la partie en cours"
#: wxwin/mainframe.cc:278
-msgid "&Print...\tctrl+p"
-msgstr "&Imprimer...\tctrl+p"
+msgid "&Print...\tCtrl+P"
+msgstr "&Imprimer...\tCtrl+P"
#: wxwin/mainframe.cc:278
msgid "Print this game"
@@ -839,16 +851,16 @@
msgstr "Imprimer dans un fichier PostScript"
#: wxwin/mainframe.cc:284
-msgid "&Quit"
-msgstr "&Quitter"
+msgid "&Quit\tCtrl+Q"
+msgstr "&Quitter\tCtrl+Q"
#: wxwin/mainframe.cc:284
msgid "Quit Eliot"
msgstr "Quitter Eliot"
#: wxwin/mainframe.cc:287
-msgid "&Dictionary..."
-msgstr "&Dictionnaire..."
+msgid "&Dictionary...\tCtrl+D"
+msgstr "&Dictionnaire...\tCtrl+D"
#: wxwin/mainframe.cc:287 wxwin/mainframe.cc:604
msgid "Choose a dictionary"
@@ -999,8 +1011,8 @@
msgstr "Plateau de jeu"
#: wxwin/mainframe.cc:317
-msgid "Ba&g"
-msgstr "&Sac"
+msgid "Ba&g\tCtrl+B"
+msgstr "&Sac\tCtrl-B"
#: wxwin/mainframe.cc:317
msgid "Remaining letters in the bag"
@@ -1031,24 +1043,24 @@
msgstr "Lettres du tirage plus une"
#: wxwin/mainframe.cc:322
-msgid "R&accords"
-msgstr "R&accords"
+msgid "&Extensions"
+msgstr "&Raccords"
#: wxwin/mainframe.cc:322
-msgid "Raccords on a word of the search"
-msgstr "Raccords sur un mot de la recherche"
+msgid "One-letter extensions on a word of the search"
+msgstr "Raccords d'une lettre sur un mot de la recherche"
#: wxwin/mainframe.cc:323
msgid "&Benjamins"
msgstr "&Benjamins"
#: wxwin/mainframe.cc:323
-msgid "Benjamins on a word of the search"
-msgstr "Benjamins sur un mot de la recherche"
+msgid "Benjamins (3-letter extensions) on a word of the search"
+msgstr "Benjamins (préfixes de 3 lettres) sur un mot de la recherche"
#: wxwin/mainframe.cc:325
-msgid "Game &history"
-msgstr "&Historique de la partie"
+msgid "Game &history\tCtrl+H"
+msgstr "&Historique de la partie\tCtrl+H"
#: wxwin/mainframe.cc:327
msgid "R&esults"
@@ -1205,6 +1217,18 @@
msgid "Regular expressions"
msgstr "Expressions régulières"
+#~ msgid "R&accords"
+#~ msgstr "R&accords"
+
+#~ msgid "Raccords on a word of the search"
+#~ msgstr "Raccords sur un mot de la recherche"
+
+#~ msgid "&Quit"
+#~ msgstr "&Quitter"
+
+#~ msgid "Ba&g"
+#~ msgstr "&Sac"
+
#~ msgid " Racks "
#~ msgstr " Tirages "
Index: wxwin/auxframes.cc
===================================================================
RCS file: /cvsroot/eliot/eliot/wxwin/auxframes.cc,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- wxwin/auxframes.cc 8 Jan 2008 13:52:43 -0000 1.24
+++ wxwin/auxframes.cc 12 Jan 2008 20:42:26 -0000 1.25
@@ -369,6 +369,12 @@
/* PLUS1 FRAME */
/****************************************************************/
+Plus1Frame::Plus1Frame(wxFrame* p, Game* g)
+ : AuxFrameList(p, ID_Frame_Plus1, _("Rack + 1"), FRAMEPLUS1, g)
+{
+}
+
+
void
Plus1Frame::refresh()
{
@@ -426,6 +432,12 @@
/* BENJAMINS */
/****************************************************************/
+BenjFrame::BenjFrame(wxFrame* p, Game* g)
+ : AuxFrameList(p, ID_Frame_Benj, _("Benjamins"), FRAMEBENJ, g)
+{
+}
+
+
void
BenjFrame::refresh()
{
@@ -461,6 +473,12 @@
/* RACC FRAME */
/****************************************************************/
+RaccFrame::RaccFrame(wxFrame* p, Game* g)
+ : AuxFrameList(p, ID_Frame_Racc, _("Extensions"), FRAMERACC, g)
+{
+}
+
+
void
RaccFrame::refresh()
{
Index: wxwin/auxframes.h
===================================================================
RCS file: /cvsroot/eliot/eliot/wxwin/auxframes.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- wxwin/auxframes.h 8 Jan 2008 13:52:43 -0000 1.9
+++ wxwin/auxframes.h 12 Jan 2008 20:42:26 -0000 1.10
@@ -191,7 +191,7 @@
protected:
virtual void refresh();
public:
- Plus1Frame(wxFrame* p, Game* g) : AuxFrameList(p, ID_Frame_Plus1,
wxT("Tirage + 1"), FRAMEPLUS1, g) {};
+ Plus1Frame(wxFrame* p, Game* g);
};
/**
@@ -203,7 +203,7 @@
protected:
virtual void refresh();
public:
- BenjFrame(wxFrame* p, Game* g) : AuxFrameList(p, ID_Frame_Benj,
wxT("benjamins"), FRAMEBENJ, g) {};
+ BenjFrame(wxFrame* p, Game* g);
};
/**
@@ -215,7 +215,7 @@
protected:
virtual void refresh();
public:
- RaccFrame(wxFrame* p, Game* g) : AuxFrameList(p, ID_Frame_Racc,
wxT("raccords"), FRAMERACC, g) {};
+ RaccFrame(wxFrame* p, Game* g);
};
/**
Index: wxwin/ewx.h
===================================================================
RCS file: /cvsroot/eliot/eliot/wxwin/ewx.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- wxwin/ewx.h 4 Aug 2007 20:01:27 -0000 1.11
+++ wxwin/ewx.h 12 Jan 2008 20:42:26 -0000 1.12
@@ -51,7 +51,6 @@
# define INCOMPLETE
#else
# define ENABLE_SAVE_POSTSCRIPT
-# define ENABLE_LOCALE
# define ENABLE_RESLIST_IN_MAIN
# define INCOMPLETE { std::cerr << "incomplete " << __FILE__ << " " <<
__LINE__ << "\n"; }
#endif
Index: wxwin/main.cc
===================================================================
RCS file: /cvsroot/eliot/eliot/wxwin/main.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- wxwin/main.cc 8 Jan 2008 13:52:43 -0000 1.11
+++ wxwin/main.cc 12 Jan 2008 20:42:26 -0000 1.12
@@ -45,10 +45,9 @@
class EliotApp : public wxApp
{
private:
+ MainFrame *m_mainFrame;
protected:
-#ifdef ENABLE_LOCALE
wxLocale locale;
-#endif
public:
virtual bool OnInit();
virtual int OnExit();
@@ -59,20 +58,33 @@
bool
EliotApp::OnInit()
{
+ wxApp::OnInit();
srand(time(NULL));
SetVendorName(wxT("Afrab"));
SetAppName(wxString(wxT("eliot")) + wxT("-") + wxT(VERSION));
SetClassName(wxT("eliot"));
- wxConfigBase* config = wxConfigBase::Get();
- config = NULL;
-#ifdef ENABLE_LOCALE
+ wxConfigBase::Get();
+
locale.Init();
+ // Search for translations in the installation directory
+ wxString catalogPath;
+#ifdef WIN32
+ // Get the absolute path, as returned by GetFullPathName()
+ wchar_t path[MAX_PATH];
+ GetFullPathName(wstring(argv[0]).c_str(), MAX_PATH, path, NULL);
+ wchar_t *pos = wcsrchr(path, L'\\');
+ if (pos)
+ *pos = '\0';
+ catalogPath = wxU(path) + wxT("/locale");
+#else
+ catalogPath = wxT(LOCALEDIR);
+#endif
+
+ wxLocale::AddCatalogLookupPathPrefix(catalogPath);
// 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__
{
@@ -80,7 +92,6 @@
locale.AddCatalog(wxT("fileutils"));
}
#endif
-#endif
ConfigDB configdb;
configdb.setFirstDefault();
@@ -97,7 +108,7 @@
{
GameFactory::Destroy();
delete wxConfigBase::Set(NULL);
- return 0;
+ return wxApp::OnExit();
}
Index: wxwin/mainframe.cc
===================================================================
RCS file: /cvsroot/eliot/eliot/wxwin/mainframe.cc,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- wxwin/mainframe.cc 10 Jan 2008 10:23:36 -0000 1.24
+++ wxwin/mainframe.cc 12 Jan 2008 20:42:26 -0000 1.25
@@ -269,22 +269,22 @@
{
// menus
wxMenu *menu_game = new wxMenu;
- 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->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_Open, _("&Load...\tctrl+l"), _("Load a game"));
- menu_game->Append(Menu_Game_Save, _("&Save as...\tctrl+s"), _("Save the
current game"));
+ 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_Print, _("&Print...\tctrl+p"), _("Print this
game"));
+ 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"));
+ menu_game->Append(wxID_EXIT, _("&Quit\tCtrl+Q"), _("Quit Eliot"));
//
wxMenu *menu_conf_game = new wxMenu;
- menu_conf_game->Append(Menu_Conf_Game_Dic, _("&Dictionary..."), _("Choose
a dictionary"));
+ menu_conf_game->Append(Menu_Conf_Game_Dic, _("&Dictionary...\tCtrl+D"),
_("Choose a dictionary"));
menu_conf_game->Append(Menu_Conf_Game_Search, _("&Search..."), _("Search
options"));
//
wxMenu *menu_conf_board_colour = new wxMenu;
@@ -314,15 +314,15 @@
//
wxMenu *menu_frame = new wxMenu;
menu_frame->AppendCheckItem(Menu_ShowBoard, _("&Board"), _("Game board"));
- menu_frame->AppendCheckItem(Menu_ShowBag, _("Ba&g"), _("Remaining letters
in the bag"));
+ menu_frame->AppendCheckItem(Menu_ShowBag, _("Ba&g\tCtrl+B"), _("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->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->AppendCheckItem(Menu_ShowRacc, _("&Extensions"), _("One-letter
extensions on a word of the search"));
+ menu_frame->AppendCheckItem(Menu_ShowBenj, _("&Benjamins"), _("Benjamins
(3-letter extensions) on a word of the search"));
menu_frame->AppendSeparator();
- menu_frame->AppendCheckItem(Menu_ShowGame, _("Game &history"), _("Game
history"));
+ menu_frame->AppendCheckItem(Menu_ShowGame, _("Game &history\tCtrl+H"),
_("Game history"));
#ifndef ENABLE_RESLIST_IN_MAIN
menu_frame->Append(Menu_ShowResult, _("R&esults"), _("Results"));
#endif
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Eliot-dev] eliot Makefile.am po/LINGUAS po/eliot.pot po/fr...,
eliot-dev <=