diff options
| author | Petr Prikryl <prikryl@atlas.cz> | 2013-09-11 07:55:17 (GMT) |
|---|---|---|
| committer | Petr Prikryl <prikryl@atlas.cz> | 2013-09-11 07:55:17 (GMT) |
| commit | 0f275314f549c0fc3be4f8442573b7f10b999f1d (patch) | |
| tree | 7d69dbbcf6a9e4472e74fc5a28f4736392082059 /doc | |
| parent | e31402cb975d0a32c8d41deb593c9cfe289427b7 (diff) | |
| parent | 1e373422387e8c1131f887efb47cf3da6459e2ac (diff) | |
| download | Doxygen-0f275314f549c0fc3be4f8442573b7f10b999f1d.zip Doxygen-0f275314f549c0fc3be4f8442573b7f10b999f1d.tar.gz Doxygen-0f275314f549c0fc3be4f8442573b7f10b999f1d.tar.bz2 | |
Merge branch 'master' of https://github.com/doxygen/doxygen.git
Conflicts:
doc/language.doc
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/language.doc | 11 | ||||
| -rw-r--r-- | doc/maintainers.txt | 3 |
2 files changed, 8 insertions, 6 deletions
diff --git a/doc/language.doc b/doc/language.doc index 5f798ad..8fc8392 100644 --- a/doc/language.doc +++ b/doc/language.doc @@ -173,9 +173,9 @@ when the translator was updated. </tr> <tr bgcolor="#ffffff"> <td bgcolor="#ffffff">Japanese</td> - <td>Hiroki Iseri<br/>Ryunosuke Satoh<br/>Kenji Nagamatsu<br/>Iwasa Kazmi</td> - <td>goyoki at gmail dot com<br/>sun594 at hotmail dot com<br/>naga at joyful dot club dot ne dot jp<br/><span style="color: brown">[unreachable]</span></td> - <td bgcolor="#ffcccc">1.6.0</td> + <td>Suzumizaki-Kimikata<br/>Hiroki Iseri<br/>Ryunosuke Satoh<br/>Kenji Nagamatsu<br/>Iwasa Kazmi</td> + <td>szmml at h12u.com<br/>goyoki at gmail dot com<br/>sun594 at hotmail dot com<br/><span style="color: brown">[unreachable]</span><br/><span style="color: brown">[unreachable]</span></td> + <td bgcolor="#ccffcc">up-to-date</td> </tr> <tr bgcolor="#ffffff"> <td bgcolor="#ffffff">JapaneseEn</td> @@ -370,9 +370,10 @@ when the translator was updated. Italian & Alessandro Falappa & {\tt\tiny alessandro at falappa dot net} & 1.8.2 \\ ~ & Ahmed Aldo Faisal & {\tt\tiny aaf23 at cam dot ac dot uk} & ~ \\ \hline - Japanese & Hiroki Iseri & {\tt\tiny goyoki at gmail dot com} & 1.6.0 \\ + Japanese & Suzumizaki-Kimikata & {\tt\tiny szmml at h12u.com} & up-to-date \\ + ~ & Hiroki Iseri & {\tt\tiny goyoki at gmail dot com} & ~ \\ ~ & Ryunosuke Satoh & {\tt\tiny sun594 at hotmail dot com} & ~ \\ - ~ & Kenji Nagamatsu & {\tt\tiny naga at joyful dot club dot ne dot jp} & ~ \\ + ~ & Kenji Nagamatsu & {\tt\tiny [unreachable] naga at joyful dot club dot ne dot jp} & ~ \\ ~ & Iwasa Kazmi & {\tt\tiny [unreachable] iwasa at cosmo-system dot jp} & ~ \\ \hline JapaneseEn & see the Japanese language & {\tt\tiny ~} & English based \\ diff --git a/doc/maintainers.txt b/doc/maintainers.txt index 3016290..ab2c1a0 100644 --- a/doc/maintainers.txt +++ b/doc/maintainers.txt @@ -85,9 +85,10 @@ Alessandro Falappa: alessandro at falappa dot net Ahmed Aldo Faisal: aaf23 at cam dot ac dot uk TranslatorJapanese +Suzumizaki-Kimikata: szmml at h12u.com Hiroki Iseri: goyoki at gmail dot com Ryunosuke Satoh: sun594 at hotmail dot com -Kenji Nagamatsu: naga at joyful dot club dot ne dot jp +Kenji Nagamatsu: [unreachable] naga at joyful dot club dot ne dot jp Iwasa Kazmi: [unreachable] iwasa at cosmo-system dot jp TranslatorKorean |