Commit 0f275314 authored by Petr Prikryl's avatar Petr Prikryl
Browse files

Merge branch 'master' of https://github.com/doxygen/doxygen.git 

Conflicts:
	doc/language.doc
parents e31402cb 1e373422

Makefile.in

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ docs: FORCE 
pdf: docs

	cd latex ; $(MAKE)



DISTFILES =  Doxyfile libmd5 addon tmake doc examples bin lib objects \

DISTFILES =  Doxyfile libmd5 addon tmake doc examples bin lib objects testing \

             qtools src configure configure.bin Makefile.in Makefile.win_nmake.in \

             Makefile.win_make.in INSTALL LANGUAGE.HOWTO LICENSE PLATFORMS \

             VERSION README.md packages winbuild jquery

addon/doxywizard/doxywizard.cpp

+6 −2
Original line number Diff line number Diff line
@@ -224,9 +224,13 @@ void MainWindow::updateConfigFileName(const QString &fileName) 


void MainWindow::loadConfigFromFile(const QString & fileName)

{

  m_expert->loadConfig(fileName);

  m_wizard->refresh();

  // save full path info of original file

  QString absFileName = QFileInfo(fileName).absoluteFilePath();

  // updates the current directory

  updateConfigFileName(fileName);

  // open the specified configuration file

  m_expert->loadConfig(absFileName);

  m_wizard->refresh();

  updateLaunchButtonState();

  m_modified = false;

  updateTitle();

doc/language.doc

+6 −5
Original line number Diff line number Diff line
@@ -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 \\

doc/maintainers.txt

+2 −1
Original line number Diff line number Diff line
@@ -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

src/bufstr.h

+6 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ class BufStr 
    BufStr(int size) 

      : m_size(size), m_writeOffset(0), m_spareRoom(10240), m_buf(0) 

    {

      m_buf = (char *)malloc(size);

      m_buf = (char *)calloc(size,1);

    }

    ~BufStr()

    {
@@ -62,12 +62,17 @@ class BufStr 
    }

    void resize( uint newlen )

    {

      uint oldsize = m_size;

      m_size=newlen;

      if (m_writeOffset>=m_size) // offset out of range -> enlarge

      {

        m_size=m_writeOffset+m_spareRoom;

      }

      m_buf = (char *)realloc(m_buf,m_size);

      if (m_size>oldsize)

      {

        memset(m_buf+oldsize,0,m_size-oldsize);

      }

    }

    int size() const

    {