Merge branch 'master' of https://github.com/qelectrotech/qelectrotech-source-mirror

ELEMENTS.LICENSE

@@ -175,3 +175,15 @@ Dette værk er licenseret under Creative Commons Attribution 3.0 License.
 For at se en kopi af denne licens, besøg
 http://creativecommons.org/licenses/by/3.0/ or send a letter to Creative
 Commons, 171 Second Street, Suite 300, San Francisco, California, 94105, USA.
+
+[ja]
+QElectroTech と一緒に提供される要素コレクションは現状のまま提供され、
+あなたの目的や作業に適合することを保証するものではありません。
+回路図での要素の利用、変更、統合は、回路図の最終的なライセンスに関わらず
+無条件で許可されます。
+回路図とは別に QElectroTech コレクションの全部または一部を
+変更の有無に関わらず再配布する場合は CC-BY ライセンスを尊重しなければなりません:
+この作品は Creative Commons Attribution 3.0 の下でライセンスされます。
+ライセンスのコピーを見るには http://creativecommons.org/licenses/by/3.0/ にアクセスするか、
+「Creative Commons, 171 Second Street, Suite 300, San Francisco, California, 94105, USA.」に
+手紙を送ってください。

INSTALL

@@ -140,3 +140,14 @@ $ qmake (qmake-qt5 for Debian baserede systemer)
 $ make
 # umask 0022
 # make install
+
+[ja]
+必要条件 :
+libQt5 (パッケージ libqt5* を参照)
+cupsys-bsd 印刷用
+
+コンパイルの方法 :
+$ qmake (Debian ベースのシステムでは qmake-qt5)
+$ make
+# umask 0022
+# make install

README

@@ -50,3 +50,7 @@ QET gebruikt XML voor de elementen en schema's en omvat een schematische editor,
 [da]
 QElectroTech er et Qt5 program til at redigere elektriske diagrammer.
 Det bruger XML filer for symboler og diagrammer og inkluderer diagram, symbol og titelblok redigering.
+
+[ja]
+QElectroTech は電気回路図を作成する Qt5 アプリケーションです。
+QET は要素と回路図に XML 形式を利用し、回路図エディタ、要素エディタ、表題欄エディタを含みます。

build-aux/linux/fedora/README.elements

@@ -36,3 +36,6 @@ Elementen collectie voor QElectroTech.
 
 [da]
 Symbol samling for QElectroTech.
+
+[ja]
+QElectroTech の要素コレクション。

misc/qelectrotech.appdata.xml

@@ -20,6 +20,7 @@
  <summary xml:lang="nl">Elektrische schema bewerker</summary>
  <summary xml:lang="be">Elektrische schema editor</summary>
  <summary xml:lang="da">Elektrisk diagram redigering</summary>
+ <summary xml:lang="ja">電気回路図エディタ</summary>
  <description>
   <p>
    QElectroTech is a Qt5 application to design electric diagrams.
@@ -69,6 +70,10 @@
    QElectroTech er et Qt5 program til at redigere elektriske diagrammer.
    Det bruger XML filer for symboler og diagrammer og inkluderer diagram, symbol og titelblok redigering.
    </p>
+  <p xml:lang="ja">
+   QElectroTech は電気回路図を作成する Qt5 アプリケーションです。
+   QET は要素と回路図に XML 形式を利用し、回路図エディタ、要素エディタ、表題欄エディタを含みます。
+   </p>
  </description>
  <url type="homepage">http://qelectrotech.org</url>
  <screenshots>

misc/qelectrotech.desktop

@@ -24,6 +24,7 @@ Comment[el]=Επεξεργασία ηλεκτρικών διαγραμμάτων
 Comment[nl]=Bewerken bedradingsdiagrammen.
 Comment[be]=Bewerken elektrisch schema.
 Comment[da]=Rediger elektriske diagrammer.
+Comment[ja]=電気回路図の編集。
 GenericName=Electrical diagram editor
 GenericName[de]=Schaltplaneditor
 GenericName[fr]=Éditeur de schémas électriques
@@ -39,3 +40,4 @@ GenericName[el]=Επεξεργαστής ηλεκτρικών διαγραμμά
 GenericName[nl]=Elektrische schema editor
 GenericName[be]=Elektrische schema editor
 GenericName[da]=Elektrisk diagram redigering
+GenericName[ja]=電気回路図エディタ

misc/qelectrotech.xml

@@ -17,6 +17,7 @@
 		<comment xml:lang="nl">QElectroTech project bestand</comment>
 		<comment xml:lang="be">QElectroTech project bestand</comment>
 		<comment xml:lang="da">QElectroTech projekt fil</comment>
+		<comment xml:lang="ja">QElectroTech プロジェクト・ファイル</comment>
 		<glob pattern="*.qet" />
 	</mime-type>
 	<mime-type type="application/x-qet-element">
@@ -36,6 +37,7 @@
 		<comment xml:lang="nl">QElectroTech element bestand</comment>
 		<comment xml:lang="be">QElectroTech element bestand</comment>
 		<comment xml:lang="da">QElectroTech symbol fil</comment>
+		<comment xml:lang="ja">QElectroTech 要素ファイル</comment>
 		<glob pattern="*.elmt" />
 	</mime-type>
 	<mime-type type="application/x-qet-titleblock">
@@ -54,6 +56,7 @@
 		<comment xml:lang="nl">QElectroTech titel bloksjabloon</comment>
 		<comment xml:lang="be">QElectroTech titel bloksjabloon</comment>
 		<comment xml:lang="da">QElectroTech titelblok skabelon</comment>
+		<comment xml:lang="ja">QElectroTech 表題欄テンプレート</comment>
 		<glob pattern="*.titleblock" />
 	</mime-type>
 </mime-info>

misc/translations_stat.pl

@@ -35,8 +35,8 @@ my $todo = 'TODO';
 our $default_language = 'fr';
 our @misc_desktop_files = qw(misc/qelectrotech.desktop misc/x-qet-element.desktop misc/x-qet-project.desktop misc/x-qet-titleblock.desktop);
 our @misc_xml_files     = qw(misc/qelectrotech.xml     misc/x-qet-element.xml     misc/x-qet-project.xml     misc/x-qet-titleblock.xml);
-our @readme_files       = qw(CREDIT README INSTALL ELEMENTS.LICENSE packaging/linux/fedora/README.elements);
+our @readme_files       = qw(CREDIT README INSTALL ELEMENTS.LICENSE build-aux/linux/fedora/README.elements);
-our @ordered_languages  = qw(fr en es pt cs pl ca de it ar sl hr el nl be ru ro);
+our @ordered_languages  = qw(fr en es pt cs pl ca de it ar sl hr el nl be ru ro da pt_br hu sr tr nb ja);
 our %languages = (
 	'fr' => {
 		'name'               => 'Français',
@@ -63,28 +63,28 @@ our %languages = (
 		'qt'                 => 1
 	},
 	'ru' => {
-		'name'               => 'Russe',
+		'name'               => 'Русский',
-		'french_name'        => 'Русский',
+		'french_name'        => 'Russe',
-		'translator_name'    => 'Yuriy Litkevich',
+		'translator_name'    => 'Yuriy Litkevich & Evgeny Kozlov',
-		'translator_mail_ml' => 'lit-uriy@yandex.ru',
+		'translator_mail_ml' => 'evgeny@qelectrotech.org',
 		'qt'                 => 1
 	},
 	'pt' => {
-		'name'               => 'Portugais',
+		'name'               => 'Português',
-		'french_name'        => 'Português',
+		'french_name'        => 'Portugais',
 		'translator_name'    => 'Jose Carlos Martins',
 		'translator_mail_ml' => 'jose@qelectrotech.org',
 		'qt'                 => 1
 	},
 	'cs' => {
-		'name'               => 'Czech',
+		'name'               => 'český',
 		'french_name'        => 'Tchèque',
 		'translator_name'    => 'Pavel Fric',
 		'translator_mail_ml' => 'pavelfric@seznam.cz',
 		'qt'                 => 1
 	},
 	'pl' => {
-		'name'               => 'Polska',
+		'name'               => 'Polski',
 		'french_name'        => 'Polonais',
 		'translator_name'    => 'Pawel Smiech',
 		'translator_mail_ml' => 'pawel32640@gmail.com',
@@ -95,12 +95,12 @@ our %languages = (
 		'french_name'        => 'Catalan',
 		'translator_name'    => 'Youssef Ouamalkran & Eduard Amoros',
 		'translator_mail_ml' => 'youssefsan@gmail.com',
-		'qt'                 => 0
+		'qt'                 => 1
 	},
 	'ro' => {
 		'name'               => 'Română',
 		'french_name'        => 'Roumain',
-		'translator_name'    => 'Gabi Mandoc',
+		'translator_name'    => 'Gabi Mandoc & Titus',
 		'translator_mail_ml' => 'gabriel.mandoc@gic.ro',
 		'qt'                 => 0
 	},
@@ -113,52 +113,103 @@ our %languages = (
 	},
 	'it' => {
 		'name'               => 'Italiano',
-		'french_name'        => 'Italiano',
+		'french_name'        => 'Italien',
 		'translator_name'    => 'Alessandro Conti & Silvio Brera',
 		'translator_mail_ml' => 'dr.slump@alexconti.it',
 		'qt'                 => 1
 	},
 	'ar' => {
-		'name'               => 'Arabic',
+		'name'               => 'العربية',
 		'french_name'        => 'Arabe',
 		'translator_name'    => 'Mohamed Souabni',
 		'translator_mail_ml' => 'souabnimohamed@yahoo.fr',
 		'qt'                 => 1
 	},
 	'sl' => {
-		'name'               => 'Slovenian',
+		'name'               => 'Slovenski',
 		'french_name'        => 'Slovene',
 		'translator_name'    => 'Uroš Platiše',
 		'translator_mail_ml' => 'uros.platise@energycon.eu',
 		'qt'                 => 1
 	},
 	'hr' => {
-		'name'               => 'Croatian',
+		'name'               => 'Hrvatski',
 		'french_name'        => 'Croate',
 		'translator_name'    => 'Antun Marakovic',
 		'translator_mail_ml' => 'antun.marakovic@lolaribar.hr',
 		'qt'                 => 1
 	},
 	'el' => {
-		'name'               => 'Greek',
+		'name'               => 'ελληνικά',
 		'french_name'        => 'Grec',
 		'translator_name'    => 'Nikos Papadopoylos &  Yannis Gyftomitros',
 		'translator_mail_ml' => '231036448@freemail.gr',
 		'qt'                 => 1
 	},
 	'nl' => {
-		'name'               => 'Netherlands',
+		'name'               => 'Nederlands',
-		'french_name'        => 'Pays-Bas',
+		'french_name'        => '‎Néerlandais',
 		'translator_name'    => 'Paul Van Deelen & Elbert',
 		'translator_mail_ml' => 'shooter@home.nl',
 		'qt'                 => 1
 	},
 	'be' => {
 		'name'               => 'Belgium-Flemish',
-		'french_name'        => 'Belgique-flamand',
+		'french_name'        => 'Belge-flamand',
 		'translator_name'    => 'Ronny Desmedt',
 		'translator_mail_ml' => 'r.desmedt@live.be',
 		'qt'                 => 1
+	},
+	'da' => {
+		'name'               => 'Dansk',
+		'french_name'        => 'Danois',
+		'translator_name'    => 'ossau2mation',
+		'translator_mail_ml' => '',
+		'qt'                 => 1
+	},
+	'pt_br' => {
+		'name'               => 'Brasileiro',
+		'french_name'        => 'Brésilien',
+		'translator_name'    => 'Hilario & Thiago Cruz',
+		'translator_mail_ml' => '',
+		'qt'                 => 1
+	},
+	'hu' => {
+		'name'               => 'Magyar',
+		'french_name'        => 'Hongrois',
+		'translator_name'    => 'Gábor Gubányi',
+		'translator_mail_ml' => 'gubanyig@gmail.com',
+		'qt'                 => 1
+	},
+	'sr' => {
+		'name'               => 'српски',
+		'french_name'        => 'Serbe',
+		'translator_name'    => '',
+		'translator_mail_ml' => '',
+		'qt'                 => 1
+	},
+	'tr' => {
+		'name'               => 'Türk',
+		'french_name'        => 'Turc',
+		'translator_name'    => 'Aziz & Emir',
+		'translator_mail_ml' => 'aziz.karabudak@argevi.com',
+		'qt'                 => 1
+	},
+	'nb' => {
+		'name'               => 'Norwegian',
+		'french_name'        => 'Norvege',
+		'translator_name'    => 'JoelAs',
+		'translator_mail_ml' => '',
+		'qt'                 => 1
+	},
+	'ja' => {
+		'name'               => '日本人',
+		'french_name'        => 'Japonais',
+		'translator_name'    => 'Yuki',
+		'translator_mail_ml' => 'yuki.atoh@gmail.com',
+		'qt'                 => 1,
+		'desktop_progress_summary' => $ok,
+		'xml_progress_summary' => $ok
 	}
 );
 

misc/x-qet-element.desktop

@@ -21,3 +21,4 @@ Comment[el]=Αρχείο στοιχείου QEletroTech
 Comment[nl]=QElectroTech element bestand
 Comment[be]=QElectroTech element bestand
 Comment[da]=QElectroTech symbol fil
+Comment[ja]=QElectroTech 要素ファイル

misc/x-qet-element.xml

@@ -15,5 +15,6 @@
 	<comment xml:lang="nl">QElectroTech element bestand</comment>
 	<comment xml:lang="be">QElectroTech element bestand</comment>
 	<comment xml:lang="da">QElectroTech symbol fil</comment>
+	<comment xml:lang="ja">QElectroTech 要素ファイル</comment>
 </mime-type>
 </mime-info>

misc/x-qet-project.desktop

@@ -21,3 +21,4 @@ Comment[el]=Αρχείο έργου QElectroTech
 Comment[nl]=QElectroTech project bestand
 Comment[be]=QElectroTech project bestand
 Comment[da]=QElectroTech projekt fil
+Comment[ja]=QElectroTech プロジェクト・ファイル

misc/x-qet-project.xml

@@ -15,5 +15,6 @@
 	<comment xml:lang="nl">QElectroTech project bestand</comment>
 	<comment xml:lang="be">QElectroTech project bestand</comment>
 	<comment xml:lang="da">QElectroTech projekt fil</comment>
+	<comment xml:lang="ja">QElectroTech プロジェクト・ファイル</comment>
 </mime-type>
 </mime-info>

misc/x-qet-titleblock.desktop

@@ -18,4 +18,5 @@ Comment[it]=Modello di cartiglio per QElectroTech
 Comment[nl]=QElectroTech titel bloksjabloon
 Comment[be]=QElectroTech titel bloksjabloon
 Comment[da]=QElectroTech titelblok skabelon
+Comment[ja]=QElectroTech 表題欄テンプレート
 

misc/x-qet-titleblock.xml

@@ -14,5 +14,6 @@
 	<comment xml:lang="nl">QElectroTech titel bloksjabloon</comment>
 	<comment xml:lang="be">QElectroTech titel bloksjabloon</comment>
 	<comment xml:lang="da">QElectroTech titelblok skabelon</comment>
+	<comment xml:lang="ja">QElectroTech 表題欄テンプレート</comment>
 </mime-type>
 </mime-info>

qelectrotech.pro

@@ -182,7 +182,7 @@ RESOURCES += qelectrotech.qrc
 #RC_FILE = ico/windows_icon/qelectrotech.rc
 
 # Fichiers de traduction qui seront installes
-TRANSLATIONS += lang/qet_ar.ts lang/qet_be.ts lang/qet_ca.ts lang/qet_cs.ts lang/qet_da.ts lang/qet_de.ts lang/qet_el.ts lang/qet_en.ts lang/qet_es.ts lang/qet_fi.ts lang/qet_fr.ts lang/qet_hr.ts lang/qet_hu.ts lang/qet_it.ts lang/qet_nl.ts lang/qet_no.ts lang/qet_pl.ts lang/qet_pt_br.ts lang/qet_pt.ts lang/qet_ro.ts lang/qet_ru.ts lang/qet_sl.ts lang/qet_sr.ts lang/qet_tr.ts lang/qet_zh.ts
+TRANSLATIONS += lang/qet_ar.ts lang/qet_be.ts lang/qet_ca.ts lang/qet_cs.ts lang/qet_da.ts lang/qet_de.ts lang/qet_el.ts lang/qet_en.ts lang/qet_es.ts lang/qet_fi.ts lang/qet_fr.ts lang/qet_hr.ts lang/qet_hu.ts lang/qet_it.ts lang/qet_ja.ts lang/qet_nl.ts lang/qet_no.ts lang/qet_pl.ts lang/qet_pt_br.ts lang/qet_pt.ts lang/qet_ro.ts lang/qet_ru.ts lang/qet_sl.ts lang/qet_sr.ts lang/qet_tr.ts lang/qet_zh.ts
 
 # Modules Qt utilises par l'application
 QT += xml svg network sql widgets printsupport concurrent KWidgetsAddons KCoreAddons

sources/main.cpp

@@ -109,8 +109,8 @@ void myMessageOutput(QtMsgType type,
 		txt+= context.function ? context.function : "";
 		txt+=")\n";
 	}
-	QFile outFile(QDir::homePath()
+	QFile outFile(QETApp::configDir()
-		      +"/.qet/"
+		      +"/"
 		      +QDate::currentDate().toString("yyyyMMdd")
 		      +".log");
 	if(outFile.open(QIODevice::WriteOnly | QIODevice::Append))
@@ -129,7 +129,7 @@ void myMessageOutput(QtMsgType type,
 void delete_old_log_files(int days)
 {
 	const QDate today = QDate::currentDate();
-	const QString path = QDir::homePath() + "/.qet/";
+	const QString path = QETApp::configDir() + "/";
 
 	QString filter("%1%1%1%1%1%1%1%1.log"); // pattern
 	filter = filter.arg("[0123456789]"); // valid characters

sources/qeticons.cpp

@@ -194,6 +194,7 @@ namespace QET {
 		QIcon hr;
 		QIcon hu;
 		QIcon it;
+		QIcon jp;
 		QIcon pl;
 		QIcon pt;
 		QIcon ro;
@@ -658,6 +659,7 @@ void QET::Icons::initIcons() {
 	hr                  .addFile(":/ico/24x16/hr.png");
 	hu                  .addFile(":/ico/24x16/hu.png");
 	it                  .addFile(":/ico/24x16/it.png");
+	jp                  .addFile(":/ico/24x16/jp.png");
 	pl                  .addFile(":/ico/24x16/pl.png");
 	pt                  .addFile(":/ico/24x16/pt.png");
 	ro                  .addFile(":/ico/24x16/ro.png");

sources/qeticons.h

@@ -202,6 +202,7 @@ namespace QET {
 		extern QIcon hr;
 		extern QIcon hu;
 		extern QIcon it;
+		extern QIcon jp;
 		extern QIcon pl;
 		extern QIcon pt;
 		extern QIcon ro;

sources/qetproject.cpp

@@ -1585,6 +1585,7 @@ NamesList QETProject::namesListForIntegrationCategory() {
 
 	const QChar russian_data[24] = { 0x0418, 0x043C, 0x043F, 0x043E, 0x0440, 0x0442, 0x0438, 0x0440, 0x043E, 0x0432, 0x0430, 0x043D, 0x043D, 0x044B, 0x0435, 0x0020, 0x044D, 0x043B, 0x0435, 0x043C, 0x0435, 0x043D, 0x0442, 0x044B };
 	const QChar greek_data[18] = { 0x0395, 0x03b9, 0x03c3, 0x03b7, 0x03b3, 0x03bc, 0x03ad, 0x03bd, 0x03b1, 0x0020, 0x03c3, 0x03c4, 0x03bf, 0x03b9, 0x03c7, 0x03b5, 0x03af, 0x03b1 };
+  const QChar japanese_data[10] = { 0x30A4, 0x30F3, 0x30D0, 0x30FC, 0x30C8, 0x3055, 0x308C, 0x305F, 0x8981, 0x7D20 };
 
 	names.addName("fr", "Éléments importés");
 	names.addName("en", "Imported elements");
@@ -1600,6 +1601,7 @@ NamesList QETProject::namesListForIntegrationCategory() {
 	names.addName("hr", "Uvezeni elementi");
 	names.addName("ca", "Elements importats");
 	names.addName("ro", "Elemente importate");
+	names.addName("ja", QString(japanese_data, 10));
 
 	return(names);
 }

sources/ui/configpage/generalconfigurationpage.cpp

@@ -268,6 +268,7 @@ void GeneralConfigurationPage::fillLang()
 	ui->m_lang_cb->addItem(QET::Icons::fr,           tr("Français"), "fr");
 	ui->m_lang_cb->addItem(QET::Icons::hr,           tr("Croate"), "hr");
 	ui->m_lang_cb->addItem(QET::Icons::it,           tr("Italien"), "it");
+	ui->m_lang_cb->addItem(QET::Icons::jp,           tr("Japonaise"), "ja");
 	ui->m_lang_cb->addItem(QET::Icons::pl,           tr("Polonais"), "pl");
 	ui->m_lang_cb->addItem(QET::Icons::pt,           tr("Portugais"), "pt");
 	ui->m_lang_cb->addItem(QET::Icons::ro,           tr("Roumains"), "ro");