updated Japanese translation, minor changes to the code

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

diff --git a/samples/internat/fr/internat.mo b/samples/internat/fr/internat.mo
index 2632931826d88374f584ab7f253af1ab6f3c955f..24359ff70496d69959bbdfbaa427bae667890b27 100644 (file)
Binary files a/samples/internat/fr/internat.mo and b/samples/internat/fr/internat.mo differ

diff --git a/samples/internat/internat.cpp b/samples/internat/internat.cpp
index a37ba73596035b6658333c36f793c1e2acd28a2c..3856f2ebfce176d32208a42bfc6407cbdad4c6a2 100644 (file)
--- a/samples/internat/internat.cpp
+++ b/samples/internat/internat.cpp
@@ -134,7 +134,7 @@ bool MyApp::OnInit()
             _T("French"),
             _T("German"),
             _T("Russian"),
-            _T("Japanese"),
+            _T("Japanese"),         // this will only work in Unicode build
             _T("English"),
             _T("English (U.S.)")
         };
@@ -226,36 +226,64 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
     wxString sysname = m_locale.GetSysName();
     wxString canname = m_locale.GetCanonicalName();
 
-    localeInfo.Printf( _("Language: %s\nSystem locale name: %s\nCanonical locale name: %s\n"),
+    localeInfo.Printf(_("Language: %s\nSystem locale name: %s\nCanonical locale name: %s\n"),
         locale.c_str(), sysname.c_str(), canname.c_str() );
 
-    wxMessageDialog(this, wxString(_("I18n sample\n(c) 1998, 1999 Vadim Zeitlin and Julian Smart"))
-        + wxT("\n\n") + localeInfo,
-        _("About Internat"), wxOK | wxICON_INFORMATION).ShowModal();
+    wxMessageDialog
+    (
+        this,
+        wxString(_("I18n sample\n(c) 1998, 1999 Vadim Zeitlin and Julian Smart"))
+            + wxT("\n\n")
+            + localeInfo,
+        _("About Internat"), 
+        wxOK | wxICON_INFORMATION
+    ).ShowModal();
 }
 
 void MyFrame::OnPlay(wxCommandEvent& WXUNUSED(event))
 {
-    wxString str = wxGetTextFromUser(_("Enter your number:"),
-        _("Try to guess my number!"), wxEmptyString, this);
-
-    if ( str.IsEmpty() ) return;
+    wxString str = wxGetTextFromUser
+                   (
+                    _("Enter your number:"),
+                    _("Try to guess my number!"),
+                    wxEmptyString,
+                    this
+                   );
+
+    if ( str.empty() )
+    {
+        // cancelled
+        return;
+    }
 
-    int num;
-    wxSscanf(str, wxT("%d"), &num);
-    if ( num == 0 )
+    long num;
+    if ( !str.ToLong(&num) || num < 0 )
+    {
         str = _("You've probably entered an invalid number.");
-    else if ( num == 9 )  // this message is not translated (not in catalog)
+    }
+    else if ( num == 9 )
+    {
+        // this message is not translated (not in catalog) because we used _T()
+        // and not _() around it
         str = _T("You've found a bug in this program!");
-    else if ( num != 17 ) // a more implicit way to write _()
-        str = wxGetTranslation(wxT("Bad luck! try again..."));
-    else
+    }
+    else if ( num == 17 )
     {
-        str.Empty();
-        // string must be split in two -- otherwise the translation won't be found
+        str.clear();
+
+        // string must be split in two -- otherwise the translation would't be
+        // found
         str << _("Congratulations! you've won. Here is the magic phrase:")
             << _("cannot create fifo `%s'");
     }
+    else
+    {
+        // this is a more implicit way to write _() but note that if you use it
+        // you must ensure that the strings get extracted in the message
+        // catalog as by default xgettext won't do it (it only knows of _(),
+        // not wxGetTranslation())
+        str = wxGetTranslation(_T("Bad luck! try again..."));
+    }
 
     wxMessageBox(str, _("Result"), wxOK | wxICON_INFORMATION);
 }
@@ -266,3 +294,4 @@ void MyFrame::OnOpen(wxCommandEvent&)
     // got wxstd.mo somewhere in the search path
     wxFile file(wxT("NOTEXIST.ING"));
 }
+

diff --git a/samples/internat/internat.dsp b/samples/internat/internat.dsp
index 7e2c9dda436276311114bceddf898a4dd1b50c1a..df983ea61c6b5c3f650f81035c24aafa80fe782a 100644 (file)
--- a/samples/internat/internat.dsp
+++ b/samples/internat/internat.dsp
@@ -19,6 +19,7 @@ CFG=internat - Win32 Debug
 !MESSAGE 
 !MESSAGE "internat - Win32 Release Unicode DLL" (based on "Win32 (x86) Application")
 !MESSAGE "internat - Win32 Debug Unicode DLL" (based on "Win32 (x86) Application")
+!MESSAGE "internat - Win32 Release Unicode" (based on "Win32 (x86) Application")
 !MESSAGE "internat - Win32 Debug Unicode" (based on "Win32 (x86) Application")
 !MESSAGE "internat - Win32 Release DLL" (based on "Win32 (x86) Application")
 !MESSAGE "internat - Win32 Debug DLL" (based on "Win32 (x86) Application")
@@ -59,7 +60,7 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233u.lib
 
-!IF "$(CFG)" == "internat - Win32 Debug Unicode DLL"
+!ELSEIF "$(CFG)" == "internat - Win32 Debug Unicode DLL"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -85,7 +86,7 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233ud.lib
 
-!IF "$(CFG)" == "internat - Win32 Release Unicode"
+!ELSEIF "$(CFG)" == "internat - Win32 Release Unicode"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -111,7 +112,7 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386 ..\..\lib\zlib.lib ..\..\lib\regex.lib ..\..\lib\png.lib ..\..\lib\jpeg.lib ..\..\lib\tiff.lib ..\..\lib\wxmswu.lib
 
-!IF "$(CFG)" == "internat - Win32 Debug Unicode"
+!ELSEIF "$(CFG)" == "internat - Win32 Debug Unicode"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -137,7 +138,7 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\zlibd.lib ..\..\lib\regexd.lib ..\..\lib\pngd.lib ..\..\lib\jpegd.lib ..\..\lib\tiffd.lib ..\..\lib\wxmswud.lib
 
-!IF "$(CFG)" == "internat - Win32 Release DLL"
+!ELSEIF "$(CFG)" == "internat - Win32 Release DLL"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -163,7 +164,7 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.lib
 
-!IF "$(CFG)" == "internat - Win32 Debug DLL"
+!ELSEIF "$(CFG)" == "internat - Win32 Debug DLL"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -189,7 +190,7 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.lib
 
-!IF "$(CFG)" == "internat - Win32 Release"
+!ELSEIF "$(CFG)" == "internat - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -215,7 +216,7 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386 ..\..\lib\zlib.lib ..\..\lib\regex.lib ..\..\lib\png.lib ..\..\lib\jpeg.lib ..\..\lib\tiff.lib ..\..\lib\wxmsw.lib
 
-!IF "$(CFG)" == "internat - Win32 Debug"
+!ELSEIF "$(CFG)" == "internat - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -247,6 +248,7 @@ LINK32=link.exe
 
 # Name "internat - Win32 Release Unicode DLL"
 # Name "internat - Win32 Debug Unicode DLL"
+# Name "internat - Win32 Release Unicode"
 # Name "internat - Win32 Debug Unicode"
 # Name "internat - Win32 Release DLL"
 # Name "internat - Win32 Debug DLL"

diff --git a/samples/internat/ja/internat.mo b/samples/internat/ja/internat.mo
index c390a7e3f9624f6a3bfe4622306d60f268521282..ab7ad3a947371baef7b2d538c639add5eb04295f 100644 (file)
Binary files a/samples/internat/ja/internat.mo and b/samples/internat/ja/internat.mo differ

diff --git a/samples/internat/ja/internat.po b/samples/internat/ja/internat.po
index 4846ed56f54a8cacd9de928f7c715878aaa1eda6..5b4b90cf6cc105de3dc80ff494f4a1fccb3e0e35 100644 (file)
--- a/samples/internat/ja/internat.po
+++ b/samples/internat/ja/internat.po
@@ -1,3 +1,4 @@
+#
 # Message catalog file template for the wxWindows i18n sample
 # Copyright (C) 2003 wxWindows development team
 #
@@ -7,80 +8,83 @@ msgstr ""
 "Project-Id-Version: wxWindows 2.5 internat sample\n"
 "POT-Creation-Date: 2003-02-03 23:45+0100\n"
 "PO-Revision-Date: 2003-02-03 23:45+0100\n"
-"Last-Translator: Yasuhiro Horiuchi\n"
+"Last-Translator: James Bishop\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CP932\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ..\internat.cpp:180
 msgid "&About..."
-msgstr "wxWindows\82É\82Â\82¢\82Ä"
+msgstr "wxウィンドウズについて"
 
 #: ..\internat.cpp:182
 msgid "E&xit"
-msgstr "\8fI\97¹"
+msgstr "終了"
 
 #: ..\internat.cpp:189
 msgid "&File"
-msgstr "\83t\83@\83C\83\8b"
+msgstr "ファイル"
 
 #: ..\internat.cpp:233
 msgid "About Internat"
-msgstr "Internat\82É\82Â\82¢\82Ä"
+msgstr "インターナットについて"
 
 #: ..\internat.cpp:185
 msgid "&Open bogus file"
-msgstr ""
+msgstr "ボーガス ファイルを開く"
 
 #: ..\internat.cpp:186
 msgid "&Play a game"
-msgstr ""
+msgstr "ゲームをする"
 
 #: ..\internat.cpp:190
 msgid "&Test"
-msgstr ""
+msgstr "テスト"
 
 #: ..\internat.cpp:208
 msgid "International wxWindows App"
-msgstr ""
+msgstr "国際 wxウィンドウズ アプリケーション"
 
 #: ..\internat.cpp:228
 #, c-format
-msgid ""
+msgid "c-フォーマット"
 "Language: %s\n"
 "System locale name: %s\n"
 "Canonical locale name: %s\n"
-msgstr ""
+msgstr "言語: %s\n"
+       "システム ローカル名: %s\n"
+       "一般的名: %s\n"
 
 #: ..\internat.cpp:231
-msgid ""
+msgid "インターナット.cpp:231"
 "I18n sample\n"
 "(c) 1998, 1999 Vadim Zeitlin and Julian Smart"
-msgstr ""
-
+msgstr "I18n サンプル\n"
+       "(c) 1998, 1999 Vadim Zeitlin and Julian Smart"
 #: ..\internat.cpp:238
 msgid "Enter your number:"
-msgstr ""
+msgstr "数字を入力して下さい。"
 
 #: ..\internat.cpp:239
 msgid "Try to guess my number!"
-msgstr ""
+msgstr "私の数字を当ててみて下さい！"
 
 #: ..\internat.cpp:246
 msgid "You've probably entered an invalid number."
-msgstr ""
+msgstr "入力した数字は多分無効です。"
 
 #: ..\internat.cpp:255
 msgid "Congratulations! you've won. Here is the magic phrase:"
-msgstr ""
+msgstr "おめでとうございます！ あなたの勝。 これが魔法の言葉です。："
 
 #: ..\internat.cpp:256
 #, c-format
 msgid "cannot create fifo `%s'"
-msgstr ""
+msgstr "fifo は作れませんでした。"
 
 #: ..\internat.cpp:259
 msgid "Result"
-msgstr ""
-
+msgstr "結果"
 
+msgid "Bad luck! try again..."
+msgstr ""

diff --git a/samples/internat/ru/internat.mo b/samples/internat/ru/internat.mo
index 605915ad2400a18f234037c572b3962f2433f697..41820d32f4a52068e5e17651a834c4fbe5129633 100644 (file)
Binary files a/samples/internat/ru/internat.mo and b/samples/internat/ru/internat.mo differ

diff --git a/samples/internat/ru/internat.po b/samples/internat/ru/internat.po
index 77d4501a8f3dd34fd187bb9871c0fb67d7e4114b..7a2cc33e06fe37043b0ae07b8817c77012940a28 100644 (file)
--- a/samples/internat/ru/internat.po
+++ b/samples/internat/ru/internat.po
@@ -77,5 +77,6 @@ msgstr "
 msgid "Result"
 msgstr "òÅÚÕÌØÔÁÔ"
 
-#~ msgid "Bad luck! try again..."
-#~ msgstr "îÅ ×ÅÚÅÔ! ðÏÐÒÏÂÕÊ ÓÎÏ×Á..."
+msgid "Bad luck! try again..."
+msgstr "îÅ ×ÅÚÅÔ! ðÏÐÒÏÂÕÊ ÓÎÏ×Á..."
+