From 6a40611b52a2a3bef2682652946f3109e27f1319 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 10 Aug 2000 15:05:21 +0000
Subject: [PATCH] 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    |  10 +--
 samples/internat/internat.cpp   |  25 ++++++-
 samples/internat/ru/internat.mo | Bin 0 -> 1618 bytes
 samples/internat/ru/internat.po |  81 ++++++++++++++++++++
 samples/internat/ru/wxstd.mo    | Bin 0 -> 2461 bytes
 samples/internat/ru/wxstd.po    | 127 ++++++++++++++++++++++++++++++++
 6 files changed, 235 insertions(+), 8 deletions(-)
 create mode 100644 samples/internat/ru/internat.mo
 create mode 100644 samples/internat/ru/internat.po
 create mode 100644 samples/internat/ru/wxstd.mo
 create mode 100644 samples/internat/ru/wxstd.po

diff --git a/samples/internat/Makefile.in b/samples/internat/Makefile.in
index 0143f6d797..0b9b80827a 100644
--- a/samples/internat/Makefile.in
+++ b/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 \
-	de/internat.po de/internat.mo \
-	fr/wxstd.po fr/wxstd.mo \
-	de/wxstd.po de/wxstd.mo
+DATAFILES=\
+    fr/internat.mo fr/wxstd.mo \
+	de/internat.mo de/wxstd.mo \
+	ru/internat.mo ru/wxstd.mo
 
-DATADIRS=fr de
+DATADIRS=fr de ru
 
 PROGRAM=internat
 
diff --git a/samples/internat/internat.cpp b/samples/internat/internat.cpp
index e46910a920..f920b4cd31 100644
--- a/samples/internat/internat.cpp
+++ b/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:
-          // ignore the other args, fall through
+      case 4:
+          {
+              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);
+}
diff --git a/samples/internat/ru/internat.mo b/samples/internat/ru/internat.mo
new file mode 100644
index 0000000000000000000000000000000000000000..504fce0a19f01ddf31a6acfaacbc0afa4fe7d76e
GIT binary patch
literal 1618
zcmaKrL2MgE6ov;VP)sSP7eIh`Ip8ANUF=A$lBHCQN}z#OiHg+%C&u=~nX;a>cE_>J
z?a>n_PFxTd!~t>Wl@kXHHIZAVrXe9|geoB+L@!WLBm^h^S#OgnNUSyc?R)d)z5l&k
zU*EUuLxJlNtS7NP#(LB}--R2lHuwP80q+IRgD&=ca1Z!V=Kl=b3;P0i82mEx-val+
z{u>OyJ$DQ71o#SgA6Nlhy>sAm;Cq>U0X%^-J@9e(_wE|$couvN_Bi+y_*&-I;KQ&J
z@D1=h_#pTr_%!%y=HHDbreI6Z>G~8L2fxVtH^4mX0}zMuY43o@VL?iIx&B?R2u*uP
zowz-Obq|)C3(9R>PM6c-uKTfeyNCQ#Ici$p_eK6?9V(HZZ74(KsMbtqK6T86vO|(;
zvX0%7N~}na(2TJvHqwgYk*USfHbZH3WRfxJM9uw+idvEJ>4b_E>4fZpqPnc<3N;pD
znW#Wa=iAzfX_v*Fh{-hTWfccvrZ{0Jk@ZHXavyxcpHp#ia^j%7PtqA#)pdGHX&Y)o
z(p2fyW~im1*XuI2;<hH}kRi3&XSJzDt%Rl;4RKl}&CrTc+#wrLt*MfP>Yc3Wn0Rv}
zx)DcZSq?j-oG?{I4bo;&hPs-C`l2F@i7ZuOC9T4g<|BIhnPk71i=%U@V!fHFcSgkt
zL<Dze821aL?`Umqw&WdmDG=wqgiHaA7YYThFyR#oR6G<MI((o2Pi}73JFOPA%lE%=
zCuL&2QY=k^Hxb3bj$s{ncQmzQ)rPH0yO8+GBwj^U7Nqg#<D<Eg($t!=ro57p^?;7F
z+MeCYmK<xfTcc_EQCvHkJ2i7^db`b{U&!G*u$Y=x>NL=cRc-rxBb3^_KqwI>%D(tc
zq$j+1JJ4mHSFty3Dp6INT0j$JZF3^ezY~AQD?H>S+`GJtUoZVg`4^a%c;I4ql`mua
z8n{9H?bgOkoa<*N)2(&N>@^(wlY9I<uL{2D3T%JIu!p?K7t@04Jm9PR)fn+#e2sV=
zMQ&#taNj5X$vKC-N>J8Ctv+8*^InE^)roPkH@O=SN+Jg|uX11DaUF3Nxla(`GV};1
z`!EJP3`U~*u3KJ7zn1^}1CXKX&hs+yKL~SqA&IY`N8+FP2VP6<uJhbV)vdU0Z}1gF
zA}!eEZ*XFmJ`H#SOm(=4_ni(T>A~5DxUK(?;6LEpOtWtwQ+G7NVfLQB#>OSWZ7G$9
zUH49wcQiOA_&4mk5jY(~LRdOp=NS-OZZ<CGntMl3urq@%T+k@<60f-_j^5g+;`X2M
EU(rZH!~g&Q

literal 0
HcmV?d00001

diff --git a/samples/internat/ru/internat.po b/samples/internat/ru/internat.po
new file mode 100644
index 0000000000..4cdb1f48b5
--- /dev/null
+++ b/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 "│И│н│т│е│р│н│а│ц│и│о│н│а│л│ь│н│о│е │п│р│и│л│о│ж│е│н│и│е wxWindows"
+
+#: /home/harms.user1/rolinsky/wxGTK-2.2.0/samples/internat/internat.cpp:136
+msgid "&About..."
+msgstr "&│О │п│р│о│г│р│а│м│м│е..."
+
+#: /home/harms.user1/rolinsky/wxGTK-2.2.0/samples/internat/internat.cpp:138
+msgid "E&xit"
+msgstr "&│В│ы│й│т│и"
+
+#: /home/harms.user1/rolinsky/wxGTK-2.2.0/samples/internat/internat.cpp:141
+msgid "&Open bogus file"
+msgstr "&│О│т│к│р│ы│т│ь │ф│а│й│л"
+
+#: /home/harms.user1/rolinsky/wxGTK-2.2.0/samples/internat/internat.cpp:142
+msgid "&Play a game"
+msgstr "&│П│о│и│г│р│а│т│ь │в │и│г│р│у"
+
+#: /home/harms.user1/rolinsky/wxGTK-2.2.0/samples/internat/internat.cpp:145
+msgid "&File"
+msgstr "&│Ф│а│й│л"
+
+#: /home/harms.user1/rolinsky/wxGTK-2.2.0/samples/internat/internat.cpp:146
+msgid "&Test"
+msgstr "&│Т│е│с│т"
+
+#: /home/harms.user1/rolinsky/wxGTK-2.2.0/samples/internat/internat.cpp:169
+msgid ""
+"I18n sample\n"
+"▐║│╘ 1998, 1999 Vadim Zeitlin and Julian Smart"
+msgstr ""
+"│П│р│и│м│е│р i18n\n"
+"▐║│╘ 1998, 1999 │В│а│д│и│м │З│е│й│т│л│и│н │и │Д│ж│у│л│и│а│н │С│м│а│р│т"
+
+#: /home/harms.user1/rolinsky/wxGTK-2.2.0/samples/internat/internat.cpp:171
+msgid "About Internat"
+msgstr "│П│р│о Internat"
+
+#: /home/harms.user1/rolinsky/wxGTK-2.2.0/samples/internat/internat.cpp:176
+msgid "Enter your number:"
+msgstr "│В│в│е│д│и │с│в│о│е │ч│и│с│л│о:"
+
+#: /home/harms.user1/rolinsky/wxGTK-2.2.0/samples/internat/internat.cpp:177
+msgid "Try to guess my number!"
+msgstr "│П│о│п│р│о│б│у│й │у│г│а│д│а│т│ь │м│о│е │ч│и│с│л│о!"
+
+#: /home/harms.user1/rolinsky/wxGTK-2.2.0/samples/internat/internat.cpp:185
+msgid "You've probably entered an invalid number."
+msgstr "│Н│а│в│е│р│н│о │т│ы │в│в│е│л │н│е│д│о│п│у│с│т│и│м│о│е │ч│и│с│л│о."
+
+#: /home/harms.user1/rolinsky/wxGTK-2.2.0/samples/internat/internat.cpp:193
+msgid "Congratulations! you've won. Here is the magic phrase:"
+msgstr "│П│о│з│д│р│а│в│л│я│ю! │В│ы │в│ы│и│г│р│а│л│и. │А │в│о│т │м│а│г│и│ч│е│с│к│а│я │ф│р│а│з│а: "
+
+#: /home/harms.user1/rolinsky/wxGTK-2.2.0/samples/internat/internat.cpp:194
+#, c-format
+msgid "cannot create fifo `%s'"
+msgstr "│н│е │м│о│г│у │с│о│з│д│а│т│ь fifo `%s'"
+
+#: /home/harms.user1/rolinsky/wxGTK-2.2.0/samples/internat/internat.cpp:197
+msgid "Result"
+msgstr "│Р│е│з│у│л│ь│т│а│т"
+
+#~ msgid "Bad luck! try again..."
+#~ msgstr "│Н│е │в│е│з│е│т! │П│о│п│р│о│б│у│й │с│н│о│в│а..."
diff --git a/samples/internat/ru/wxstd.mo b/samples/internat/ru/wxstd.mo
new file mode 100644
index 0000000000000000000000000000000000000000..7b2436560e48313d7d56288f5e7bb579399706cd
GIT binary patch
literal 2461
zcma)+Ymd}q6vrPGFAR7CuV~2evMfYfW-)8l0SSalBtjqtAu-1I?DUzT?o2zjU1rsn
z`Uy;o#`qzOFZG3VnL@fVJDr{BFtUb?iHV7t2qx-V{hzkW4#;k3=IO7~p3DE7^R!Ew
z)_o>$Jcac%)?Zj7Sgkv7!tw5%LOcXY@OjVyp94P!?*YF9?*(Tw&Vl#ie;340{DjlP
z;LqTC@NaM{_%HYvxb-d}c7o#|-&ddpegZxMegi%WUIYpJ4SWXNuuh0kPy<=}o8UI^
zeeiMc3ve9#8svI@0XKsi?-t@U)J7odGEoG9AAy|bD-b{NJx;9m0(c+T0a?#w5YojT
zAm{lL<o>Kj6Sjd{K<?vy@Fnmaa1{I$+zoyU^7DT{*0mYI+3pqaMX(BP2fqaQ`FW7Q
zUqS9q4x)B}J3!9&Huxm?F^IAf?LeZD_3|uGdQuBYPI{FCpTOFJ#WP_4;RC6Xnl^&m
zGwu@~4`Ol6d_ca~fVBzh0jx){Fq;1#v|Txl?a)ZYDA0(zLyV5Nqhz{d*&azcD=Vf!
zRpq*}tf(kGS+UEy*zdZ^@u(!tiZaNwsDul+lk})!TDUaC0cjOgMI2O<)8zt*L!1UY
z%rPiQihsvn7bhIM?8qv~N!#(1q36VD=~$-4PDN>rdQ_~~u1ZrF$}Ku(&11#J@?%Fy
zFMH1Fv)d)pGN_`gvUi5;QtEDJN^cdWRGD_qte&N;JaUzqqMGfRo{30n1+!}^OEshj
zIt?m0c6IeENrtro*BukJdiJeDB;!dRmCz!?u1X9i87a@RWKUa$E-H3WVqD2>bT}FH
zq(XHbKeMOMdzd=Q<4z3`rzX)#_R@uA-@GX>ch?iH=dkyU8F_;YOX1i<8uZn@Zm^oR
zrYyT|rBkpSvus+tdEQe+Pdj30r<CJjECs61oW|(wx=XwCJegw?aFNwoMdeN$KdBwy
z-2yx9AT~{bcIESVEkB`+<!NlZF#hrjdE9}a_J%rZa=bO|j!M_lPCC+ZD-wIMK&PZ(
zR_QHedUy?J&xh&7KBMMU(L7gIma7$I@r<<elCw8=R9fX}yjj{wC94J6Q=iei>(ShO
z^_hBFiEcaPy}4sYjvZPlb4<_Y4%n8bEJ*mEhFUx|<L#_fF!J4m6b=UZ>XdCxXwHfu
zM=vQyJ7g7YBYDXtCQUCVXnXWyINS7Z`Vh2(LC|eqo};E8`>p6A^`dC@O3)7Hba6Fx
zkm<KzKo|VER=^*DUfhj1k|D0f^FiAOT7IMH<AqLraPfOLjKig%*Yp=C&76J>u63h}
zU4MSwr>GbE?P$<K0DKd!b%RE~(+w^)kUW4bltqj4(WQ1oi+;0vIsSnf2-gieanwz;
zBnpPideLIThZ*ZkcIa@72(cSME95Y(u-(rh^oD{)^IXz!z{ETWx29buYW0^mavU`K
zSNi9u6D@}4!*jQjBZ|}7RzzoWT8hz#h1&_y3A(|2(2Jp<w}9M<PoLJ5yy$nr9yco;
z>n)5ELD{bG(X$0=L_F;D-ERlf_UAAwU9_TRkTsle8zT#1n&o-*uTNMPoha-zmv>nf
zWI&yM9A;mfHoSTeg^iVEjRq^b5o5^``perd`34PARY9sMm6Ar+S9eLxQXe)87YAq`
PzXeg;TY`>6tS|lpk%NU#

literal 0
HcmV?d00001

diff --git a/samples/internat/ru/wxstd.po b/samples/internat/ru/wxstd.po
new file mode 100644
index 0000000000..0383d18a57
--- /dev/null
+++ b/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 "невозможно создать файл '%s'"
+
+#: file.cpp:213
+#, c-format
+msgid "can't open file '%s'"
+msgstr "невозможно открыть файл '%s'"
+
+#: file.cpp:227
+#, c-format
+msgid "can't close file descriptor %d"
+msgstr "невозможно закрыть дескриптор файла %d"
+
+#: file.cpp:244
+#, c-format
+msgid "can't read from file descriptor %d"
+msgstr "ошибка чтения файла с дескриптором %d"
+
+#: file.cpp:258
+#, c-format
+msgid "can't write to file descriptor %d"
+msgstr "невозможно записать в файл с дескриптором %d"
+
+#: file.cpp:271
+#, c-format
+msgid "can't flush file descriptor %d"
+msgstr "невозможно слить файл с дескриптором %d"
+
+#: file.cpp:308
+#, c-format
+msgid "can't seek on file descriptor %d"
+msgstr "невозможно переместиться по файлу с дескриптором %d"
+
+#: file.cpp:322
+#, c-format
+msgid "can't get seek position on file descriptor %d"
+msgstr "невозможно получить текущую позицию файла с дескриптором %d"
+
+#: file.cpp:355
+#, c-format
+msgid "can't find length of file on file descriptor %d"
+msgstr "невозможно определить длину файла с дескриптором %d"
+
+#: intl.cpp:139
+#, c-format
+msgid "catalog file for domain '%s' not found."
+msgstr "файл каталога для домена '%s' не найден."
+
+#: intl.cpp:177
+#, c-format
+msgid "'%s' is not a valid message catalog."
+msgstr "'%s' неверный каталог сообщений."
+
+#: intl.cpp:330 intl.cpp:334
+#, c-format
+msgid "locale '%s' can not be set."
+msgstr "локейл '%s' не может быть установлен."
+
+#: intl.cpp:431 intl.cpp:435
+#, c-format
+msgid "string '%s' not found in domain '%s' for locale '%s'."
+msgstr "не найдена строка '%s' в домене '%s' локейла '%s'."
+
+#: intl.cpp:434 intl.cpp:438
+#, c-format
+msgid "string '%s' not found in locale '%s'."
+msgstr "не найдена строка '%s' в локейле '%s'."
+
+#: log.cpp:104
+#, c-format
+msgid " (error %ld: %s)"
+msgstr " (ошибка %ld: %s)"
+
+#: log.cpp:165
+msgid "Debug: "
+msgstr "Отладка: "
+
+#: log.cpp:171
+msgid "Fatal error: "
+msgstr "Критическая ошибка: "
+
+#: log.cpp:172
+msgid "Program aborted.\n"
+msgstr "Программа остановлена.\n"
+
+#: log.cpp:177
+msgid "Error: "
+msgstr "Ошибка: "
+
+#: log.cpp:181
+msgid "Warning: "
+msgstr "Предупреждение: "
+
+#: log.cpp:268
+#, c-format
+msgid "Assert failed in file %s at line %d"
+msgstr "Ошибка assert в файле %s строка %d"
+
+#: file.cpp:303
+msgid "unknown seek origin"
+msgstr "неизвестный отсчет поиска"
+
+msgid "looking for catalog '%s' in path '%s'."
+msgstr "поиск каталога '%s' в пути '%s'."
+
+#: intl.cpp:378
+msgid "no message catalog list"
+msgstr "нет списка каталогов сообщений"
+
+msgid "OK"
+msgstr "OK"
+
+msgid "Cancel"
+msgstr "Отмена"