added russian translations and an additional cmd line parameter to set the

encoding to use


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@8016 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

samples/internat/Makefile.in

@@ -13,12 +13,12 @@ top_srcdir = @top_srcdir@/..
 top_builddir = ../..
 program_dir = samples/internat
 
-DATAFILES=fr/internat.po fr/internat.mo \
+DATAFILES=\
-	de/internat.po de/internat.mo \
+    fr/internat.mo fr/wxstd.mo \
-	fr/wxstd.po fr/wxstd.mo \
+	de/internat.mo de/wxstd.mo \
-	de/wxstd.po de/wxstd.mo
+	ru/internat.mo ru/wxstd.mo
 
-DATADIRS=fr de
+DATADIRS=fr de ru
 
 PROGRAM=internat
 

samples/internat/internat.cpp

@@ -28,6 +28,7 @@
 #include "wx/intl.h"
 #include "wx/file.h"
 #include "wx/log.h"
+#include "wx/fontmap.h"
 
 #if defined(__WXGTK__) || defined(__WXMOTIF__)
 #include "mondrian.xpm"
@@ -49,12 +50,14 @@ class MyFrame: public wxFrame
 public:
   MyFrame(wxFrame *frame, const char *title, int x, int y, int w, int h);
 
-public:
+protected:
   void OnQuit(wxCommandEvent& event);
   void OnAbout(wxCommandEvent& event);
   void OnPlay(wxCommandEvent& event);
   void OnOpen(wxCommandEvent& event);
+  void OnPaint(wxPaintEvent& event);
 
+private:
   DECLARE_EVENT_TABLE()
 };
 
@@ -73,6 +76,8 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
   EVT_MENU(MINIMAL_ABOUT, MyFrame::OnAbout)
   EVT_MENU(MINIMAL_TEST, MyFrame::OnPlay)
   EVT_MENU(MINIMAL_OPEN, MyFrame::OnOpen)
+
+  EVT_PAINT(MyFrame::OnPaint)
 END_EVENT_TABLE()
 
 IMPLEMENT_APP(MyApp)
@@ -86,8 +91,14 @@ bool MyApp::OnInit()
   const char *langid = NULL;
   switch ( argc )
   {
-      default:
+      case 4:
-          // ignore the other args, fall through
+          {
+              wxFontEncoding enc = wxTheFontMapper->CharsetToEncoding(argv[3]);
+              if ( enc != wxFONTENCODING_SYSTEM )
+                wxFont::SetDefaultEncoding(enc);
+          }
+
+          // fall through
 
       case 3:
           language = argv[1];
@@ -203,3 +214,11 @@ void MyFrame::OnOpen(wxCommandEvent&)
   // got wxstd.mo somewhere in the search path
   wxFile file("NOTEXIST.ING");
 }
+
+void MyFrame::OnPaint(wxPaintEvent&)
+{
+    wxPaintDC dc(this);
+    wxFont font(12, wxDEFAULT, wxNORMAL, wxNORMAL);
+    dc.SetFont(font);
+    dc.DrawText(_("International wxWindows App"), 10, 10);
+}

samples/internat/ru/internat.po

@@ -0,0 +1,81 @@
+# Message catalog file template for the wxWindows i18n sample
+# Copyright (C) 1999 wxWindows development team
+# Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
+msgid ""
+msgstr ""
+"Project-Id-Version: wxWindows 2.0 i18n sample\n"
+"POT-Creation-Date: 2000-08-10 15:56+0200\n"
+"PO-Revision-Date: 2000-08-10 15:56+0200\n"
+"Last-Translator: Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>\n"
+"Language-Team: <wx-translators@wxwindows.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=koi8-r\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: /home/harms.user1/rolinsky/wxGTK-2.2.0/samples/internat/internat.cpp:128
+msgid "International wxWindows App"
+msgstr "<22><><EFBFBD>΁ԁŁҁ΁<D281><CE81>ÁɁρ΁<CF81><CE81>́؁΁ρ<CE81> <20>ЁҁɁ́ρցŁ΁Ɂ<CE81> wxWindows"
+
+#: /home/harms.user1/rolinsky/wxGTK-2.2.0/samples/internat/internat.cpp:136
+msgid "&About..."
+msgstr "&<26><> <20>Ёҁρǁҁ<C781><D281>́́<CD81>..."
+
+#: /home/harms.user1/rolinsky/wxGTK-2.2.0/samples/internat/internat.cpp:138
+msgid "E&xit"
+msgstr "&<26><><EFBFBD>فʁԁ<CA81>"
+
+#: /home/harms.user1/rolinsky/wxGTK-2.2.0/samples/internat/internat.cpp:141
+msgid "&Open bogus file"
+msgstr "&<26><><EFBFBD>ԁˁҁفԁ<D981> <20>Ɓ<EFBFBD><C681>ʁ<EFBFBD>"
+
+#: /home/harms.user1/rolinsky/wxGTK-2.2.0/samples/internat/internat.cpp:142
+msgid "&Play a game"
+msgstr "&<26><><EFBFBD>ρɁǁҁ<C781><D281>ԁ<EFBFBD> <20><> <20>Ɂǁҁ<C781>"
+
+#: /home/harms.user1/rolinsky/wxGTK-2.2.0/samples/internat/internat.cpp:145
+msgid "&File"
+msgstr "&<26><><EFBFBD><EFBFBD><EFBFBD>ʁ<EFBFBD>"
+
+#: /home/harms.user1/rolinsky/wxGTK-2.2.0/samples/internat/internat.cpp:146
+msgid "&Test"
+msgstr "&<26><><EFBFBD>ŁӁ<C581>"
+
+#: /home/harms.user1/rolinsky/wxGTK-2.2.0/samples/internat/internat.cpp:169
+msgid ""
+"I18n sample\n"
+"<22><><EFBFBD><EFBFBD> 1998, 1999 Vadim Zeitlin and Julian Smart"
+msgstr ""
+"<22><><EFBFBD>ҁɁ́Ł<CD81> i18n\n"
+"<22><><EFBFBD><EFBFBD> 1998, 1999 <20><><EFBFBD><EFBFBD><EFBFBD>āɁ<C481> <20><><EFBFBD>Łʁԁ́Ɂ<CC81> <20><> <20><><EFBFBD>ցՁ́Ɂ<CC81><C981><EFBFBD> <20><><EFBFBD>́<EFBFBD><CD81>ҁ<EFBFBD>"
+
+#: /home/harms.user1/rolinsky/wxGTK-2.2.0/samples/internat/internat.cpp:171
+msgid "About Internat"
+msgstr "<22><><EFBFBD>ҁ<EFBFBD> Internat"
+
+#: /home/harms.user1/rolinsky/wxGTK-2.2.0/samples/internat/internat.cpp:176
+msgid "Enter your number:"
+msgstr "<22><><EFBFBD>ׁŁā<C581> <20>Ӂׁρ<D781> <20>ށɁӁ́<D381>:"
+
+#: /home/harms.user1/rolinsky/wxGTK-2.2.0/samples/internat/internat.cpp:177
+msgid "Try to guess my number!"
+msgstr "<22><><EFBFBD>ρЁҁρՁ<C281> <20>Ձǁ<D581><C781>ā<EFBFBD><C481>ԁ<EFBFBD> <20>́ρ<CD81> <20>ށɁӁ́<D381>!"
+
+#: /home/harms.user1/rolinsky/wxGTK-2.2.0/samples/internat/internat.cpp:185
+msgid "You've probably entered an invalid number."
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>ׁŁҁ΁<D281> <20>ԁ<EFBFBD> <20>ׁׁŁ<D781> <20>΁ŁāρЁՁӁԁɁ́ρ<CD81> <20>ށɁӁ́<D381>."
+
+#: /home/harms.user1/rolinsky/wxGTK-2.2.0/samples/internat/internat.cpp:193
+msgid "Congratulations! you've won. Here is the magic phrase:"
+msgstr "<22><><EFBFBD>ρځāҁ<C481><D281>ׁ́с<CC81>! <20><><EFBFBD><EFBFBD> <20>ׁفɁǁҁ<C781><D281>́<EFBFBD>. <20><> <20>ׁρ<D781> <20>́<EFBFBD><CD81>ǁɁށŁӁˁ<D381><CB81><EFBFBD> <20>Ɓҁ<C681><D281>ځ<EFBFBD>: "
+
+#: /home/harms.user1/rolinsky/wxGTK-2.2.0/samples/internat/internat.cpp:194
+#, c-format
+msgid "cannot create fifo `%s'"
+msgstr "<22>΁<EFBFBD> <20>́ρǁ<CF81> <20>Ӂρځā<DA81><C481>ԁ<EFBFBD> fifo `%s'"
+
+#: /home/harms.user1/rolinsky/wxGTK-2.2.0/samples/internat/internat.cpp:197
+msgid "Result"
+msgstr "<22><><EFBFBD>ŁځՁ́؁ԁ<D881><D481><EFBFBD>"
+
+#~ msgid "Bad luck! try again..."
+#~ msgstr "<22><><EFBFBD><EFBFBD> <20>ׁŁځŁ<DA81>! <20><><EFBFBD>ρЁҁρՁ<C281> <20>Ӂ΁ρׁ<CF81>..."

samples/internat/ru/wxstd.po

@@ -0,0 +1,127 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: wxWindows 2.0 i18n sample\n"
+"POT-Creation-Date: 2000-08-10 15:56+0200\n"
+"PO-Revision-Date: 2000-08-10 15:56+0200\n"
+"Last-Translator: Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>\n"
+"Language-Team: <wx-translators@wxwindows.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=koi8-r\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: file.cpp:182 hello.cpp:38
+#, c-format
+msgid "can't create file '%s'"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> '%s'"
+
+#: file.cpp:213
+#, c-format
+msgid "can't open file '%s'"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> '%s'"
+
+#: file.cpp:227
+#, c-format
+msgid "can't close file descriptor %d"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> %d"
+
+#: file.cpp:244
+#, c-format
+msgid "can't read from file descriptor %d"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %d"
+
+#: file.cpp:258
+#, c-format
+msgid "can't write to file descriptor %d"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %d"
+
+#: file.cpp:271
+#, c-format
+msgid "can't flush file descriptor %d"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %d"
+
+#: file.cpp:308
+#, c-format
+msgid "can't seek on file descriptor %d"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %d"
+
+#: file.cpp:322
+#, c-format
+msgid "can't get seek position on file descriptor %d"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %d"
+
+#: file.cpp:355
+#, c-format
+msgid "can't find length of file on file descriptor %d"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %d"
+
+#: intl.cpp:139
+#, c-format
+msgid "catalog file for domain '%s' not found."
+msgstr "<22><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%s' <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
+
+#: intl.cpp:177
+#, c-format
+msgid "'%s' is not a valid message catalog."
+msgstr "'%s' <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
+
+#: intl.cpp:330 intl.cpp:334
+#, c-format
+msgid "locale '%s' can not be set."
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%s' <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
+
+#: intl.cpp:431 intl.cpp:435
+#, c-format
+msgid "string '%s' not found in domain '%s' for locale '%s'."
+msgstr "<22><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%s' <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%s' <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%s'."
+
+#: intl.cpp:434 intl.cpp:438
+#, c-format
+msgid "string '%s' not found in locale '%s'."
+msgstr "<22><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%s' <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%s'."
+
+#: log.cpp:104
+#, c-format
+msgid " (error %ld: %s)"
+msgstr " (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld: %s)"
+
+#: log.cpp:165
+msgid "Debug: "
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: "
+
+#: log.cpp:171
+msgid "Fatal error: "
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: "
+
+#: log.cpp:172
+msgid "Program aborted.\n"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n"
+
+#: log.cpp:177
+msgid "Error: "
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: "
+
+#: log.cpp:181
+msgid "Warning: "
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: "
+
+#: log.cpp:268
+#, c-format
+msgid "Assert failed in file %s at line %d"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> assert <20> <20><><EFBFBD><EFBFBD><EFBFBD> %s <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %d"
+
+#: file.cpp:303
+msgid "unknown seek origin"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+
+msgid "looking for catalog '%s' in path '%s'."
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%s' <20> <20><><EFBFBD><EFBFBD> '%s'."
+
+#: intl.cpp:378
+msgid "no message catalog list"
+msgstr "<22><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+
+msgid "OK"
+msgstr "OK"
+
+msgid "Cancel"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"