From 4a11862e0bafa4100d34528439d9ef71f241b0db Mon Sep 17 00:00:00 2001 From: Kenta Yonekura Date: Sun, 16 Jan 2011 18:11:26 +0100 Subject: [PATCH] commit patch from Kenta Yonekura (adding Japanese language) and add Kenta Yonekura to translator list in about dialog --- bitmaps/CMakeLists.txt | 1 + common/dialog_about/AboutDialog_main.cpp | 3 +++ common/edaappl.cpp | 12 ++++++++++-- include/bitmaps.h | 1 + include/id.h | 1 + 5 files changed, 16 insertions(+), 2 deletions(-) diff --git a/bitmaps/CMakeLists.txt b/bitmaps/CMakeLists.txt index 9481193f7f..5a138f72c3 100644 --- a/bitmaps/CMakeLists.txt +++ b/bitmaps/CMakeLists.txt @@ -189,6 +189,7 @@ set(BITMAP_SRCS Lang_Fi.xpm Lang_Hu.xpm Lang_It.xpm + Lang_Jp.xpm Lang_Ko.xpm Lang_Nl.xpm Lang_Pl.xpm diff --git a/common/dialog_about/AboutDialog_main.cpp b/common/dialog_about/AboutDialog_main.cpp index 2cc4306872..62b5194f5b 100644 --- a/common/dialog_about/AboutDialog_main.cpp +++ b/common/dialog_about/AboutDialog_main.cpp @@ -249,6 +249,9 @@ static void InitKiCadAboutNew( AboutAppInfo& info ) info.AddTranslator( new Contributor( wxT( "Rafael Sokolowski" ), wxT( "rafael.sokolowski@web.de" ), wxT( "German (DE)" ), new wxBitmap( lang_de_xpm ) ) ); + info.AddTranslator( new Contributor( wxT( "Kenta Yonekura" ), + wxT( "midpika@hotmail.com" ), wxT( "Japanese (JP)" ), + new wxBitmap( lang_jp_xpm ) ) ); /* TODO: are these all russian translators, placed them here now, or else align them below other language maintainer with mail adress */ info.AddTranslator( new Contributor( wxT( "Remy Halvick" ), wxEmptyString, wxT( "Others" ) ) ); diff --git a/common/edaappl.cpp b/common/edaappl.cpp index 916201fa8b..d898d0aedd 100644 --- a/common/edaappl.cpp +++ b/common/edaappl.cpp @@ -212,13 +212,21 @@ static struct LANGUAGE_DESCR s_Language_List[] = _( "Catalan" ) }, - /* Dutch language */ + // Dutch language { wxLANGUAGE_DUTCH, ID_LANGUAGE_DUTCH, lang_nl_xpm, _( "Dutch" ) - } + }, + + // Japanese language + { + wxLANGUAGE_JAPANESE, + ID_LANGUAGE_JAPANESE, + lang_jp_xpm, + _( "Japanese" ) + } }; diff --git a/include/bitmaps.h b/include/bitmaps.h index 640da02608..ccb3a2efcc 100644 --- a/include/bitmaps.h +++ b/include/bitmaps.h @@ -182,6 +182,7 @@ extern const char* lang_fr_xpm[]; extern const char* lang_fi_xpm[]; extern const char* lang_hu_xpm[]; extern const char* lang_it_xpm[]; +extern const char* lang_jp_xpm[]; extern const char* lang_ko_xpm[]; extern const char* lang_nl_xpm[]; extern const char* lang_pl_xpm[]; diff --git a/include/id.h b/include/id.h index 40ce926cd1..ef95edb486 100644 --- a/include/id.h +++ b/include/id.h @@ -99,6 +99,7 @@ enum main_id ID_LANGUAGE_CATALAN, ID_LANGUAGE_CHINESE_SIMPLIFIED, ID_LANGUAGE_DUTCH, + ID_LANGUAGE_JAPANESE, ID_LANGUAGE_CHOICE_END, ID_SET_REPEAT_OPTION,