From 6a2a235ba96e858e86d1f05c5c2a4d89faa490db Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Sat, 28 Aug 1999 16:50:39 +0000 Subject: [PATCH] Added German translation to internat sample. Fixed recursion in wxLogGui::Flush() git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3511 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- configure | 2 + configure.in | 1 + samples/internat/.cvsignore | 1 - samples/internat/Makefile.am | 9 --- samples/internat/Makefile.in | 28 +++++++ samples/internat/de/internat.mo | Bin 0 -> 1105 bytes samples/internat/de/internat.po | 79 +++++++++++++++++++ samples/internat/de/wxstd.mo | Bin 0 -> 1515 bytes samples/internat/de/wxstd.po | 136 ++++++++++++++++++++++++++++++++ samples/internat/internat.cpp | 6 +- samples/internat/makefile.unx | 17 ---- samples/internat/readme.txt | 4 +- src/common/log.cpp | 3 + 13 files changed, 254 insertions(+), 32 deletions(-) delete mode 100644 samples/internat/Makefile.am create mode 100644 samples/internat/Makefile.in create mode 100644 samples/internat/de/internat.mo create mode 100644 samples/internat/de/internat.po create mode 100644 samples/internat/de/wxstd.mo create mode 100644 samples/internat/de/wxstd.po delete mode 100644 samples/internat/makefile.unx diff --git a/configure b/configure index d9ab6ce490..8f344173c4 100755 --- a/configure +++ b/configure @@ -11924,6 +11924,7 @@ trap 'rm -fr `echo " samples/drawing/Makefile samples/dynamic/Makefile samples/image/Makefile + samples/internat/Makefile samples/layout/Makefile samples/listctrl/Makefile samples/mdi/Makefile @@ -12125,6 +12126,7 @@ CONFIG_FILES=\${CONFIG_FILES-"wx-config samples/drawing/Makefile samples/dynamic/Makefile samples/image/Makefile + samples/internat/Makefile samples/layout/Makefile samples/listctrl/Makefile samples/mdi/Makefile diff --git a/configure.in b/configure.in index 824dbb9050..7d556f41b7 100644 --- a/configure.in +++ b/configure.in @@ -2783,6 +2783,7 @@ AC_OUTPUT([ samples/drawing/Makefile samples/dynamic/Makefile samples/image/Makefile + samples/internat/Makefile samples/layout/Makefile samples/listctrl/Makefile samples/mdi/Makefile diff --git a/samples/internat/.cvsignore b/samples/internat/.cvsignore index f5eaa1a859..8b13789179 100644 --- a/samples/internat/.cvsignore +++ b/samples/internat/.cvsignore @@ -1,2 +1 @@ -Makefile.in diff --git a/samples/internat/Makefile.am b/samples/internat/Makefile.am deleted file mode 100644 index afef5a1203..0000000000 --- a/samples/internat/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -AUTOMAKE_OPTIONS = 1.3 no-dependencies - -SUFFIXES = .cpp - -DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE) - -noinst_PROGRAMS = internat - -internat_SOURCES = internat.cpp diff --git a/samples/internat/Makefile.in b/samples/internat/Makefile.in new file mode 100644 index 0000000000..4350957280 --- /dev/null +++ b/samples/internat/Makefile.in @@ -0,0 +1,28 @@ +# +# File: Makefile +# Author: Julian Smart +# Created: 1998 +# Updated: +# Copyright: (c) 1998 Julian Smart +# +# "%W% %G%" +# +# Makefile for internat example (UNIX). + +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 + +DATADIRS=fr de + +PROGRAM=internat + +OBJECTS=$(PROGRAM).o + +include ../../src/makeprog.env + diff --git a/samples/internat/de/internat.mo b/samples/internat/de/internat.mo new file mode 100644 index 0000000000000000000000000000000000000000..c5adfd9059dd7b623ef45f4655aaa8ac617ada90 GIT binary patch literal 1105 zcmbV~ziSjh6vs!6zhe9q3qdVj1UC@QgCJ-wT{J(8hzVYdXyx4QyWJtPv&+nEE|>qn zUIoF%Qmm}(tZZ#8tVBU9#L8Ao;dd^Z#M*(`&(53o=6&b8`((hY=2^^< zeL@@sGw>j2!BgM{I08PdZA- zO0$TTN;cFf(#lbH5Lni-Pm)rZV|Rs}7lRU7G@h-IUfd{5YNfBV^r|p!jQT}2zRuJu zOp|W1Wm1lO#+1uc#Z+ciI-VAD(T4J3E}Rl7ESW0ru$>l*lT(JA%uCI~uV}K>nreh+ zi&kZ#a(c+hYh_59gl<(@Nki>iS}%44L4?%Q+qkbxQuG|nl%=@KuF_tt*gpA!(u$p< zykEB*6A!i(m$vB0j_wl&Rh*y)DYGuMO6t_6h@~-wr`WRe42!x2J-Xz^#pej(MKp`3 z5}%@O*D&2PP8oA~JJv20YbJ*Db`;)gHwT4#Zo;rlt>O${VL@-jYrV?2IBQT_F=euY zaLRDja4=WFJLNnjU~m_iOl|2mr$y9`Gp+b58?nHlEF6I5On0h0M?T(budlOmLD2uZ z&F&w+mu-RnADeKf(_e}E0b<% kuhQK*?52#, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"POT-Creation-Date: 1999-08-28 16:46+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: ENCODING\n" + +#: ../internat.cpp:120 +msgid "International wxWindows App" +msgstr "Internationales wxWindows Programm" + +#: ../internat.cpp:128 +msgid "&About..." +msgstr "Ü&ber" + +#: ../internat.cpp:130 +msgid "E&xit" +msgstr "&Schließen" + +#: ../internat.cpp:133 +msgid "&Open bogus file" +msgstr "Ö&ffne Unsinn-Datei" + +#: ../internat.cpp:134 +msgid "&Play a game" +msgstr "Spiele ein S&piel" + +#: ../internat.cpp:137 +msgid "&File" +msgstr "&Datei" + +#: ../internat.cpp:138 +msgid "&Test" +msgstr "&Test" + +#: ../internat.cpp:161 +msgid "" +"I18n sample\n" +"© 1998, 1999 Vadim Zeitlin and Julian Smart" +msgstr "I18n Beispiel\n" +"© 1998, 1999 Vadim Zeitlin and Julian Smart" + +#: ../internat.cpp:163 +msgid "About Internat" +msgstr "Ü&ber Internat" + +#: ../internat.cpp:168 +msgid "Enter your number:" +msgstr "Geben Sie eine Nummer ein:" + +#: ../internat.cpp:169 +msgid "Try to guess my number!" +msgstr "Versuchen Sie, die Nummer zu raten" + +#: ../internat.cpp:177 +msgid "You've probably entered an invalid number." +msgstr "Sie haben wahrscheinlich eine ungültige Nummer eingegeben" + +#: ../internat.cpp:185 +msgid "Congratulations! you've won. Here is the magic phrase:" +msgstr "Herzlichen Glückwunsch, Sie haben gewonnen. Hier ist der magische Satz:" + +#: ../internat.cpp:186 +#, c-format +msgid "cannot create fifo `%s'" +msgstr "Der Fifo `%s' kan nicht erzeugt werden" + +#: ../internat.cpp:189 +msgid "Result" +msgstr "Ergebnis" diff --git a/samples/internat/de/wxstd.mo b/samples/internat/de/wxstd.mo new file mode 100644 index 0000000000000000000000000000000000000000..a33dc0a888047cbdb052fd60dba1e9f3611e9655 GIT binary patch literal 1515 zcmaKqJ8Km|6vrnTUy0ACD83kl5F_LgMVl0gdQFp{0SSU&F}r(q?{N3dgqc|*>BQDj zt!(oRL`dfc5XDBsLM<%(1OXw1|Fe&q2)P+{_^~r{&iS9mkFnv`0_!;TIqY}X=dtI9 zgg6R*0QZ7lzigaAnRTQ;X=Fz$G|m^b$tX`$5-$c zI6N%GO|T7e{1@OPxC&kcKZDcY&>kVKfY-n?;1h5Wd6bc3L0&K~b#kp( z#|U<_STD@}Tb$dG`h@jEW?BD(_1WQ?oFgxJnVhpuj_1jY9QTvrt}-#@qD@he%}8;N zZ^2m=R4&W6_PZz@7bt0sh)2p9ZP+MQW+KQqx1MCGbCL=9*y*Lffs*<< z%?sZde4SB{o~SFAtk*$XBk>J%W|yeGof!8Mbp%H$k*Tx2!FFYYog6Pa9Y_Ydor~PY z3dwOqiIkz&T~0 z2qkT+Kzgc8zT0n~G&=5}H*qJ|^pi|Wl&`y_4flY%I(3IqXp`xN8|Xz9KHccJzI~!e zE;Oyiyi}p(W@wMmsbhD@vAKrsCOn&$V(ZeD8rRblnreZS?5CK9?UKsL_h0Uucr%Zh zHpN%Ixr+m8hH5#|5r=3)>AdasC#TD`t{mXL2rEG@ldCf0n#%hM#+(m)&sDQjd3j7Y wCDWyV5iJKNL6h6I_ZwE#AaMf*$IB?i^ucWtaM47>dIJ13&G5>k%499^58>g7qW}N^ literal 0 HcmV?d00001 diff --git a/samples/internat/de/wxstd.po b/samples/internat/de/wxstd.po new file mode 100644 index 0000000000..febe2807c8 --- /dev/null +++ b/samples/internat/de/wxstd.po @@ -0,0 +1,136 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR Free Software Foundation, Inc. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"POT-Creation-Date: 1997-12-19 17:46+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: ENCODING\n" + +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR Free Software Foundation, Inc. +# FIRST AUTHOR , YEAR. +# +#: file.cpp:182 hello.cpp:38 +#, fuzzy, c-format +msgid "can't create file '%s'" +msgstr "Kann die Datei '%s' nicht erzeugen." + +#: file.cpp:213 +#, c-format +msgid "can't open file '%s'" +msgstr "Kann die Datei '%s' nicht öffnen." + +#: file.cpp:227 +#, c-format +msgid "can't close file descriptor %d" +msgstr "Kann den Datei-Deskriptor %d nicht schließen." + +#: file.cpp:244 +#, c-format +msgid "can't read from file descriptor %d" +msgstr "Kann nicht vom Datei-Deskriptor %d lesen." + +#: file.cpp:258 +#, c-format +msgid "can't write to file descriptor %d" +msgstr "Kann nicht in den Datei-Deskriptor %d schreiben." + +#: file.cpp:271 +#, c-format +msgid "can't flush file descriptor %d" +msgstr "Kann keinen flush-Befehl für den Datei-Deskriptor %d ausführen." + +#: file.cpp:308 +#, c-format +msgid "can't seek on file descriptor %d" +msgstr "Kann den Datei-Deskriptor %d nicht positionieren." + +#: file.cpp:322 +#, c-format +msgid "can't get seek position on file descriptor %d" +msgstr "Kann die Position des Datei Deskriptors %d nicht herausfinden." + +#: file.cpp:355 +#, c-format +msgid "can't find length of file on file descriptor %d" +msgstr "" + +#: intl.cpp:139 +#, c-format +msgid "catalog file for domain '%s' not found." +msgstr "" + +#: intl.cpp:177 +#, c-format +msgid "'%s' is not a valid message catalog." +msgstr "" + +#: intl.cpp:330 intl.cpp:334 +#, c-format +msgid "locale '%s' can not be set." +msgstr "Die Lokale '%s' kann nicht benutzt werden." + +#: intl.cpp:431 intl.cpp:435 +#, c-format +msgid "string '%s' not found in domain '%s' for locale '%s'." +msgstr "Die Zeichenkette '%s' der Domäne '%s' für die Lokale '%s' kann nicht gefunden werden." + +#: intl.cpp:434 intl.cpp:438 +#, c-format +msgid "string '%s' not found in locale '%s'." +msgstr "" + +#: log.cpp:104 +#, c-format +msgid " (error %ld: %s)" +msgstr " (Fehler %ld: %s)" + +#: log.cpp:165 +msgid "Debug: " +msgstr "Debug: " + +#: log.cpp:171 +msgid "Fatal error: " +msgstr "Fataler Fehler: " + +#: log.cpp:172 +msgid "Program aborted.\n" +msgstr "Programm beendet.\n" + +#: log.cpp:177 +msgid "Error: " +msgstr "Fehler: " + +#: log.cpp:181 +msgid "Warning: " +msgstr "Warnung: " + +#: log.cpp:268 +#, c-format +msgid "Assert failed in file %s at line %d" +msgstr "" + +#: file.cpp:303 +msgid "unknown seek origin" +msgstr "Unbekannter Positionsanfang." + +msgid "looking for catalog '%s' in path '%s'." +msgstr "" + +#: intl.cpp:378 +msgid "no message catalog list" +msgstr "Keine Nachrichten Katalog." + +msgid "OK" +msgstr "OK" + +msgid "Cancel" +msgstr "Abbruch" diff --git a/samples/internat/internat.cpp b/samples/internat/internat.cpp index c191d76410..437d7d7b61 100644 --- a/samples/internat/internat.cpp +++ b/samples/internat/internat.cpp @@ -61,7 +61,7 @@ public: // ID for the menu commands enum { - MINIMAL_QUIT, + MINIMAL_QUIT = 1, MINIMAL_TEXT, MINIMAL_ABOUT, MINIMAL_TEST, @@ -114,11 +114,11 @@ bool MyApp::OnInit() /* this catalog is installed in standard location on Linux systems, it might not be installed on yours - just ignore the errrors or comment out this line then */ - m_locale.AddCatalog("fileutils"); // 3) and another just for testing +// m_locale.AddCatalog("fileutils"); // 3) and another just for testing // Create the main frame window MyFrame *frame = new MyFrame((wxFrame *) NULL, _("International wxWindows App"), - 50, 50, 250, 40); + 50, 50, 350, 60); // Give it an icon frame->SetIcon(wxICON(mondrian)); diff --git a/samples/internat/makefile.unx b/samples/internat/makefile.unx deleted file mode 100644 index f5db8b1f46..0000000000 --- a/samples/internat/makefile.unx +++ /dev/null @@ -1,17 +0,0 @@ -# -# File: makefile.unx -# Author: Julian Smart -# Created: 1998 -# Updated: -# Copyright: (c) 1998 Julian Smart -# -# "%W% %G%" -# -# Makefile for internat example (UNIX). - -PROGRAM=internat - -OBJECTS=$(PROGRAM).o - -include ../../src/makeprog.env - diff --git a/samples/internat/readme.txt b/samples/internat/readme.txt index 1e5f58b0e3..a08085c4bc 100644 --- a/samples/internat/readme.txt +++ b/samples/internat/readme.txt @@ -44,7 +44,7 @@ A. First of all, you will need the GNU gettext tools (see the next question). # generate the .po file for the program itself # see `xgettext --help' for options, "-C" is important! - xgettext -C -o internat.po ../internat.cpp + xgettext -C -n -k_ -o internat.po ../internat.cpp # .po file for wxWindows might be generated in the same way, but for now just # take this one... @@ -60,7 +60,7 @@ A. First of all, you will need the GNU gettext tools (see the next question). # run the sample to test it cd .. - ./$OSTYPE/internat + ./internat Q. How to get the gettext tools? A. For Unix, you should be able to get the source distribution of any GNU mirror diff --git a/src/common/log.cpp b/src/common/log.cpp index b29f583649..34391202ed 100644 --- a/src/common/log.cpp +++ b/src/common/log.cpp @@ -507,6 +507,9 @@ void wxLogGui::Flush() // no undisplayed messages whatsoever Clear(); + + // do it here again + m_bHasMessages = FALSE; } // the default behaviour is to discard all informational messages if there