10 files changed, 40 insertions, 5 deletions

diff --git a/INSTALL b/INSTALL
index 8f9c150..88c5e3c 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,7 +1,7 @@
-DOXYGEN Version 1.8.0-20120408
+DOXYGEN Version 1.8.0-20120409
 
 Please read the installation section of the manual 
 (http://www.doxygen.org/install.html) for instructions.
 
 --------
-Dimitri van Heesch (08 April 2012)
+Dimitri van Heesch (09 April 2012)
diff --git a/README b/README
index 34ff4fd..5db83db 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-DOXYGEN Version 1.8.0_20120408
+DOXYGEN Version 1.8.0_20120409
 
 Please read INSTALL for compilation instructions.
 
@@ -26,4 +26,4 @@ forum.
 
 Enjoy,
 
-Dimitri van Heesch (dimitri@stack.nl) (08 April 2012)
+Dimitri van Heesch (dimitri@stack.nl) (09 April 2012)
diff --git a/configure b/configure
index 72b6019..27c7e17 100755
--- a/configure
+++ b/configure
@@ -20,7 +20,7 @@ doxygen_version_minor=8
 doxygen_version_revision=0
 
 #NOTE: Setting version_mmn to "NO" will omit mmn info from the package.
-doxygen_version_mmn=20120408
+doxygen_version_mmn=20120409
 
 bin_dirs=`echo $PATH | sed -e "s/:/ /g"`
 
diff --git a/src/doxygen.css b/src/doxygen.css
index 78c5106..33d8516 100644
--- a/src/doxygen.css
+++ b/src/doxygen.css
@@ -572,6 +572,7 @@ td.mlabels-left {
 td.mlabels-right {
 	vertical-align: bottom;
 	padding: 0px;
+	white-space: nowrap;
 }
 
 span.mlabels {
diff --git a/src/doxygen_css.h b/src/doxygen_css.h
index ab6b4ba..9443298 100644
--- a/src/doxygen_css.h
+++ b/src/doxygen_css.h
@@ -572,6 +572,7 @@
 "td.mlabels-right {\n"
 "	vertical-align: bottom;\n"
 "	padding: 0px;\n"
+"	white-space: nowrap;\n"
 "}\n"
 "\n"
 "span.mlabels {\n"
diff --git a/src/translator.h b/src/translator.h
index 8ad0e56..784ad93 100644
--- a/src/translator.h
+++ b/src/translator.h
@@ -514,6 +514,8 @@ class Translator
     virtual QCString trAndMore(const QCString &number) = 0;
     virtual QCString trEnumGeneratedFromFiles(bool single) = 0;
     virtual QCString trEnumReference(const char *name) = 0;
+    virtual QCString trInheritedFrom(const char *members,const char *what) = 0;
+    virtual QCString trAdditionalInheritedMembers() = 0;
 
 };
 
diff --git a/src/translator_adapter.h b/src/translator_adapter.h
index 519566c..5955c33 100644
--- a/src/translator_adapter.h
+++ b/src/translator_adapter.h
@@ -60,6 +60,13 @@ class TranslatorAdapter_1_8_0 : public TranslatorAdapterBase
 
     virtual QCString trEnumReference(const char *name)
     { return english.trEnumReference(name); }
+
+    virtual QCString trInheritedFrom(const char *members,const char *what)
+    { return english.trInheritedFrom(members,what); }
+
+    virtual QCString trAdditionalInheritedMembers()
+    { return english.trAdditionalInheritedMembers(); }
+
 };
 
 class TranslatorAdapter_1_7_5 : public TranslatorAdapter_1_8_0
diff --git a/src/translator_en.h b/src/translator_en.h
index 6c46913..3ec8a49 100644
--- a/src/translator_en.h
+++ b/src/translator_en.h
@@ -1914,6 +1914,16 @@ class TranslatorEnglish : public Translator
     virtual QCString trEnumReference(const char *name)
     { return QCString(name)+" Enum Reference"; }
 
+    /*! Used for a section containing inherited members */
+    virtual QCString trInheritedFrom(const char *members,const char *what)
+    { return QCString(members)+" inherited from "+what; }
+
+    /*! Header of the sections with inherited members specific for the 
+     *  base class(es) 
+     */
+    virtual QCString trAdditionalInheritedMembers()
+    { return "Additional Inherited Members"; }
+
 //////////////////////////////////////////////////////////////////////////
 
 };
diff --git a/src/translator_nl.h b/src/translator_nl.h
index 3e7819d..f88c942 100644
--- a/src/translator_nl.h
+++ b/src/translator_nl.h
@@ -1497,6 +1497,15 @@ class TranslatorDutch : public Translator
     virtual QCString trEnumReference(const char *name)
     { return QCString(name)+" Enum Referentie"; }
 
+    /*! Used for a section containing inherited members */
+    virtual QCString trInheritedFrom(const char *members,const char *what)
+    { return QCString(members)+" overgeërfd van "+what; }
+
+    /*! Header of the sections with inherited members specific for the 
+     *  base class(es) 
+     */
+    virtual QCString trAdditionalInheritedMembers()
+    { return "Additionele Overgeërfde Members"; }
 
 };
 
diff --git a/src/translatordecoder.h b/src/translatordecoder.h
index bb59e4f..70bc474 100644
--- a/src/translatordecoder.h
+++ b/src/translatordecoder.h
@@ -763,6 +763,11 @@ class TranslatorDecoder : public Translator
     { return toUtf8(m_translator->trEnumGeneratedFromFiles(single)); }
     QCString trEnumReference(const char *name)
     { return toUtf8(m_translator->trEnumReference(fromUtf8(name))); }
+    QCString trInheritedFrom(const char *members,const char *what)
+    { return toUtf8(m_translator->trInheritedFrom(fromUtf8(members),fromUtf8(what))); }
+    QCString trAdditionalInheritedMembers()
+    { return toUtf8(m_translator->trAdditionalInheritedMembers()); }
+
 
 //////////////////////////////////////////////////////////////////////////
   private: