Release-1.5.8-20090129

20 files changed, 614 insertions, 382 deletions

diff --git a/src/classdef.cpp b/src/classdef.cpp
index c62a7de..b20a222 100644
--- a/src/classdef.cpp
+++ b/src/classdef.cpp
@@ -133,7 +133,7 @@ class ClassDefImpl
     /*! The class this class is an instance of. */
     ClassDef *templateMaster;
 
-    /*! class name with outer class scope, but without namespace scope. */
+    /*! local class name which could be a typedef'ed alias name. */
     QCString className;
 
     /*! If this class is a Objective-C category, then this points to the
@@ -209,8 +209,8 @@ void ClassDefImpl::init(const char *defFileName, const char *name,
   membersMerged = FALSE;
   categoryOf = 0;
   usedOnly = FALSE;
-  QCString ns;
-  extractNamespaceName(name,className,ns);
+  //QCString ns;
+  //extractNamespaceName(name,className,ns);
   //printf("m_name=%s m_className=%s ns=%s\n",m_name.data(),m_className.data(),ns.data());
 
   if (((QCString)defFileName).right(5)!=".java" && 
@@ -3025,7 +3025,7 @@ QCString ClassDef::qualifiedNameWithTemplateParameters(
 
     if (!scName.isEmpty()) scName+=scopeSeparator;
   }
-  scName+=m_impl->className;
+  scName+=className();
   ArgumentList *al=0;
   bool isSpecialization = localName().find('<')!=-1;
   if (templateArguments())
@@ -3052,7 +3052,14 @@ QCString ClassDef::qualifiedNameWithTemplateParameters(
 
 QCString ClassDef::className() const
 {
-  return m_impl->className;
+  if (m_impl->className.isEmpty())
+  {
+    return localName();
+  }
+  else
+  {
+    return m_impl->className;
+  }
 };
 
 void ClassDef::setClassName(const char *name)
diff --git a/src/config.xml b/src/config.xml
index 90b77b2..83a3701 100644
--- a/src/config.xml
+++ b/src/config.xml
@@ -225,7 +225,8 @@ The format is ext=language, where ext is a file extension, and language is one o
 the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP, 
 Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat 
 .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran), 
-use: inc=Fortran f=C 
+use: inc=Fortran f=C. Note that for custom extensions you also need to set
+FILE_PATTERNS otherwise the files are not read by doxygen.
 '>
     </option>
     <option type='bool' id='BUILTIN_STL_SUPPORT' docs='
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index 5a33891..125cd99 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -8617,6 +8617,7 @@ static QCString resolveSymlink(QCString path)
   QDict<void> nonSymlinks;
   QDict<void> known;
   QCString result = path;
+  QCString oldPrefix = "/";
   do
   {
 #ifdef WIN32
@@ -8637,7 +8638,7 @@ static QCString resolveSymlink(QCString path)
         QString target = fi.readLink();
         if (QFileInfo(target).isRelative())
         {
-          target = QDir::cleanDirPath(prefix+"/"+target.data());
+          target = QDir::cleanDirPath(oldPrefix+"/"+target.data());
         }
         if (sepPos!=-1)
         {
@@ -8656,6 +8657,7 @@ static QCString resolveSymlink(QCString path)
       {
         nonSymlinks.insert(prefix,(void*)0x8);
       }
+      oldPrefix = prefix;
     }
   }
   while (sepPos!=-1);
@@ -8698,69 +8700,72 @@ int readDir(QFileInfo *fi,
   //printf("killDict=%p count=%d\n",killDict,killDict->count());
   
   const QFileInfoList *list = dir.entryInfoList();
-  QFileInfoListIterator it( *list );
-  QFileInfo *cfi;
-  
-  while ((cfi=it.current()))
+  if (list)
   {
-    if (exclDict==0 || exclDict->find(cfi->absFilePath())==0) 
-    { // file should not be excluded
-      //printf("killDict->find(%s)\n",cfi->absFilePath().data());
-      if (!cfi->exists() || !cfi->isReadable())
-      {
-        if (errorIfNotExist)
+    QFileInfoListIterator it( *list );
+    QFileInfo *cfi;
+
+    while ((cfi=it.current()))
+    {
+      if (exclDict==0 || exclDict->find(cfi->absFilePath())==0) 
+      { // file should not be excluded
+        //printf("killDict->find(%s)\n",cfi->absFilePath().data());
+        if (!cfi->exists() || !cfi->isReadable())
         {
-          err("Warning: source %s is not a readable file or directory... skipping.\n",cfi->absFilePath().data());
+          if (errorIfNotExist)
+          {
+            err("Warning: source %s is not a readable file or directory... skipping.\n",cfi->absFilePath().data());
+          }
         }
-      }
-      else if (cfi->isFile() && 
-          (!Config_getBool("EXCLUDE_SYMLINKS") || !cfi->isSymLink()) &&
-          (patList==0 || patternMatch(cfi,patList)) && 
-          !patternMatch(cfi,exclPatList) &&
-          (killDict==0 || killDict->find(cfi->absFilePath())==0)
-         )
-      {
-        totalSize+=cfi->size()+cfi->absFilePath().length()+4;
-        QCString name=convertToQCString(cfi->fileName());
-        //printf("New file %s\n",name.data());
-        if (fnDict)
+        else if (cfi->isFile() && 
+            (!Config_getBool("EXCLUDE_SYMLINKS") || !cfi->isSymLink()) &&
+            (patList==0 || patternMatch(cfi,patList)) && 
+            !patternMatch(cfi,exclPatList) &&
+            (killDict==0 || killDict->find(cfi->absFilePath())==0)
+            )
         {
-          FileDef  *fd=new FileDef(cfi->dirPath()+"/",name);
-          FileName *fn=0;
-          if (!name.isEmpty() && (fn=(*fnDict)[name]))
+          totalSize+=cfi->size()+cfi->absFilePath().length()+4;
+          QCString name=convertToQCString(cfi->fileName());
+          //printf("New file %s\n",name.data());
+          if (fnDict)
           {
-            fn->append(fd);
+            FileDef  *fd=new FileDef(cfi->dirPath()+"/",name);
+            FileName *fn=0;
+            if (!name.isEmpty() && (fn=(*fnDict)[name]))
+            {
+              fn->append(fd);
+            }
+            else
+            {
+              fn = new FileName(cfi->absFilePath(),name);
+              fn->append(fd);
+              if (fnList) fnList->inSort(fn);
+              fnDict->insert(name,fn);
+            }
           }
-          else
+          QCString *rs=0;
+          if (resultList || resultDict)
           {
-            fn = new FileName(cfi->absFilePath(),name);
-            fn->append(fd);
-            if (fnList) fnList->inSort(fn);
-            fnDict->insert(name,fn);
+            rs=new QCString(cfi->absFilePath());
           }
+          if (resultList) resultList->append(rs);
+          if (resultDict) resultDict->insert(cfi->absFilePath(),rs);
+          if (killDict) killDict->insert(cfi->absFilePath(),(void *)0x8);
         }
-        QCString *rs=0;
-        if (resultList || resultDict)
+        else if (recursive &&
+            (!Config_getBool("EXCLUDE_SYMLINKS") || !cfi->isSymLink()) &&
+            cfi->isDir() && cfi->fileName()!="." && 
+            !patternMatch(cfi,exclPatList) &&
+            cfi->fileName()!="..")
         {
-          rs=new QCString(cfi->absFilePath());
+          cfi->setFile(cfi->absFilePath());
+          totalSize+=readDir(cfi,fnList,fnDict,exclDict,
+              patList,exclPatList,resultList,resultDict,errorIfNotExist,
+              recursive,killDict);
         }
-        if (resultList) resultList->append(rs);
-        if (resultDict) resultDict->insert(cfi->absFilePath(),rs);
-        if (killDict) killDict->insert(cfi->absFilePath(),(void *)0x8);
-      }
-      else if (recursive &&
-          (!Config_getBool("EXCLUDE_SYMLINKS") || !cfi->isSymLink()) &&
-          cfi->isDir() && cfi->fileName()!="." && 
-          !patternMatch(cfi,exclPatList) &&
-          cfi->fileName()!="..")
-      {
-        cfi->setFile(cfi->absFilePath());
-        totalSize+=readDir(cfi,fnList,fnDict,exclDict,
-            patList,exclPatList,resultList,resultDict,errorIfNotExist,
-            recursive,killDict);
       }
+      ++it;
     }
-    ++it;
   }
   return totalSize;
 }
@@ -10472,7 +10477,7 @@ void generateOutput()
     QCString const qhpFileName = Qhp::getQhpFileName();
     QCString const qchFileName = getQchFileName();
 
-    QCString const args = QCString().sprintf("%s -o %s", qhpFileName.data(), qchFileName.data());
+    QCString const args = QCString().sprintf("%s -o \"%s\"", qhpFileName.data(), qchFileName.data());
     QString const oldDir = QDir::currentDirPath();
     QDir::setCurrent(Config_getString("HTML_OUTPUT"));
     if (portable_system(Config_getString("QHG_LOCATION"), args.data(), FALSE))
diff --git a/src/entry.h b/src/entry.h
index 10c3319..bf3ed40 100644
--- a/src/entry.h
+++ b/src/entry.h
@@ -191,17 +191,8 @@ class Entry
     /*! Kind of entries that are supported */
     enum Sections { 
       CLASS_SEC        = 0x00000001, 
-      //STRUCT_SEC       = 0x00000002,
-      //UNION_SEC        = 0x00000004, 
-      //EXCEPTION_SEC    = 0x00000008,
       NAMESPACE_SEC    = 0x00000010,
-      //INTERFACE_SEC    = 0x00000020,
-      //PROTOCOL_SEC     = 0x00000040,
-      //CATEGORY_SEC     = 0x00000080,
-      COMPOUND_MASK    = CLASS_SEC //| STRUCT_SEC | UNION_SEC | 
-                         //INTERFACE_SEC | EXCEPTION_SEC | 
-                         //PROTOCOL_SEC | CATEGORY_SEC
-                         ,
+      COMPOUND_MASK    = CLASS_SEC,
       SCOPE_MASK       = COMPOUND_MASK | NAMESPACE_SEC,
       
       CLASSDOC_SEC     = 0x00000800, 
diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp
index 9aa8174..12213f7 100644
--- a/src/htmlgen.cpp
+++ b/src/htmlgen.cpp
@@ -916,7 +916,7 @@ void HtmlGenerator::writeObjectLink(const char *ref,const char *f,
   t << "href=\"";
   if (ref)
   {
-    if ((dest=Doxygen::tagDestinationDict[ref])) t << relPath << *dest << "/";
+    if ((dest=Doxygen::tagDestinationDict[ref])) t << *dest << "/";
   }
   else
   {
diff --git a/src/htmlhelp.cpp b/src/htmlhelp.cpp
index 2a48662..d11d16d 100644
--- a/src/htmlhelp.cpp
+++ b/src/htmlhelp.cpp
@@ -372,6 +372,23 @@ void HtmlHelp::initialize()
      0x412 Korean
      0x804 Chinese (PRC)
      0x404 Chinese (Taiwan)
+
+     New LCIDs:
+	 0x421 Indonesian
+	 0x41A Croatian
+	 0x418 Romanian
+	 0x424 Slovenian
+	 0x41B Slovak
+	 0x422 Ukrainian
+	 0x81A Serbian (Serbia, Latin)
+	 0x403 Catalan
+	 0x427 Lithuanian
+	 0x436 Afrikaans
+	 0x42A Vietnamese
+	 0x429 Persian (Iran)
+	 0xC01 Arabic (Egypt) - I don't know which version of arabic is used inside translator_ar.h ,
+     so I have chosen Egypt at random
+
   */
   s_languageDict.setAutoDelete(TRUE);
   s_languageDict.clear();
@@ -381,22 +398,38 @@ void HtmlHelp::initialize()
   s_languageDict.insert("finnish",     new QCString("0x40B Finnish"));
   s_languageDict.insert("french",      new QCString("0x40C French"));
   s_languageDict.insert("german",      new QCString("0x407 German"));
-  s_languageDict.insert("greece",      new QCString("0x408 Greece"));
+  s_languageDict.insert("greek",       new QCString("0x408 Greece"));
   s_languageDict.insert("hungarian",   new QCString("0x40E Hungarian"));
   s_languageDict.insert("italian",     new QCString("0x410 Italian"));
   s_languageDict.insert("norwegian",   new QCString("0x814 Norwegian"));
   s_languageDict.insert("polish",      new QCString("0x415 Polish"));
-  s_languageDict.insert("portugese",   new QCString("0x816 Portuguese(Portugal)"));
+  s_languageDict.insert("portuguese",  new QCString("0x816 Portuguese(Portugal)"));
   s_languageDict.insert("brazil",      new QCString("0x416 Portuguese(Brazil)"));
   s_languageDict.insert("russian",     new QCString("0x419 Russian"));
-  s_languageDict.insert("spanish",     new QCString("0x40A Spannish(Traditional Sort)"));
+  s_languageDict.insert("spanish",     new QCString("0x40A Spanish(Traditional Sort)"));
   s_languageDict.insert("swedish",     new QCString("0x41D Swedish"));
-  s_languageDict.insert("turkey",      new QCString("0x41F Turkey"));
+  s_languageDict.insert("turkish",     new QCString("0x41F Turkey"));
   s_languageDict.insert("japanese",    new QCString("0x411 Japanese"));
   s_languageDict.insert("japanese-en", new QCString("0x411 Japanese"));
   s_languageDict.insert("korean",      new QCString("0x412 Korean"));
+  s_languageDict.insert("korean-en",   new QCString("0x412 Korean"));
   s_languageDict.insert("chinese",     new QCString("0x804 Chinese (PRC)"));
   s_languageDict.insert("chinese-traditional", new QCString("0x404 Chinese (Taiwan)"));
+
+  // new LCIDs
+  s_languageDict.insert("indonesian",  new QCString("0x412 Indonesian"));
+  s_languageDict.insert("croatian",    new QCString("0x41A Croatian"));
+  s_languageDict.insert("romanian",    new QCString("0x418 Romanian"));
+  s_languageDict.insert("slovene",     new QCString("0x424 Slovenian"));
+  s_languageDict.insert("slovak",      new QCString("0x41B Slovak"));
+  s_languageDict.insert("ukrainian",   new QCString("0x422 Ukrainian"));
+  s_languageDict.insert("serbian",     new QCString("0x81A Serbian (Serbia, Latin)"));
+  s_languageDict.insert("catalan",     new QCString("0x403 Catalan"));
+  s_languageDict.insert("lithuanian",  new QCString("0x427 Lithuanian"));
+  s_languageDict.insert("afrikaans",   new QCString("0x436 Afrikaans"));
+  s_languageDict.insert("vietnamese",  new QCString("0x42A Vietnamese"));
+  s_languageDict.insert("persian",     new QCString("0x429 Persian (Iran)"));
+  s_languageDict.insert("arabic",      new QCString("0xC01 Arabic (Egypt)"));
 }
 
 
diff --git a/src/memberlist.cpp b/src/memberlist.cpp
index 32bbfd6..8e8c93c 100644
--- a/src/memberlist.cpp
+++ b/src/memberlist.cpp
@@ -280,10 +280,12 @@ void MemberList::writePlainDeclarations(OutputList &ol,
           }
         case MemberDef::EnumValue: 
           {
-            if (!m_inGroup) return;
-            printf("EnumValue!\n");
-            if (first) ol.startMemberList(),first=FALSE;
-            md->writeDeclaration(ol,cd,nd,fd,gd,m_inGroup);
+            if (m_inGroup)
+            {
+              //printf("EnumValue!\n");
+              if (first) ol.startMemberList(),first=FALSE;
+              md->writeDeclaration(ol,cd,nd,fd,gd,m_inGroup);
+            }
           }
           break;
       }
diff --git a/src/portable.cpp b/src/portable.cpp
index 7bbe33f..03d5366 100644
--- a/src/portable.cpp
+++ b/src/portable.cpp
@@ -180,7 +180,7 @@ static char **last_environ;
 
 void portable_setenv(const char *name,const char *value)
 {
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__CYGWIN__)
     SetEnvironmentVariable(name,value);
 #else
     register char **ep = 0;
@@ -259,7 +259,7 @@ void portable_setenv(const char *name,const char *value)
 
 void portable_unsetenv(const char *variable)
 {
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__CYGWIN__)
     SetEnvironmentVariable(variable,0);
 #else
     /* Some systems don't have unsetenv(), so we do it ourselves */
diff --git a/src/rtfgen.cpp b/src/rtfgen.cpp
index 615d4d2..e97c041 100644
--- a/src/rtfgen.cpp
+++ b/src/rtfgen.cpp
@@ -2619,7 +2619,10 @@ void RTFGenerator::postProcess(QByteArray &a)
   for (i=0;i<a.size();i++)
   {
     unsigned char c = (unsigned char)a.at(i);
-    if (c>0x80 || mbFlag)
+    
+    // treat characters > 0x80 as multibyte characters, except when they
+    // are control characters 
+    if (c>0x80 || (mbFlag && c!='\\' && c!='{' && c!='}'))
     {
       char s[10];
       sprintf(s,"\\'%X",c);
diff --git a/src/scanner.l b/src/scanner.l
index dc36a8a..5ec6b54 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -3998,7 +3998,7 @@ TYPEDEFPREFIX (("typedef"{BN}+)?)((("volatile"|"const"){BN}+)?)
 					    int tempArg=current->name.find('<');
 					    QCString tempName;
 					    if (tempArg==-1) tempName=current->name; else tempName=current->name.left(tempArg);
-					    if (current->type.isEmpty() &&
+					    if (!current->type.isEmpty() &&
 						(current->type.find(re,0)!=-1 || current->type.left(8)=="typedef "))
 					    {
 					      //printf("Scanner.l: found in class variable: `%s' `%s' `%s'\n", current->type.data(),current->name.data(),current->args.data());
diff --git a/src/translator_de.h b/src/translator_de.h
index c3aa248..e9f55f6 100644
--- a/src/translator_de.h
+++ b/src/translator_de.h
@@ -114,6 +114,9 @@
 //   2008/02/04 Jens Seidel (jensseidel@users.sourceforge.net)
 //    - Updated for "new since 1.5.4" version
 //
+//   2009/01/09 Jens Seidel (jensseidel@users.sourceforge.net)
+//    - Resynced the trLegendDocs() method
+//
 //   Todo:
 //    - see FIXME
 
@@ -665,7 +668,7 @@ class TranslatorGerman : public Translator
                                  bool isTemplate)
     {
       QCString result=(QCString)clName+" ";
-      if (isTemplate) result+="Template ";
+      if (isTemplate) result+="Template-";
       switch(compType)
       {
         case ClassDef::Class:  result+="Klassen"; break;
@@ -831,8 +834,7 @@ class TranslatorGerman : public Translator
      */
     virtual QCString trGeneratedFromFiles(ClassDef::CompoundType compType,
         bool single)
-    { // here s is one of " Class", " Struct" or " Union"
-      // single is true implies a single file
+    { // single is true implies a single file
       QCString result=(QCString)"Die Dokumentation für diese";
       switch(compType)
       {
@@ -1117,7 +1119,7 @@ class TranslatorGerman : public Translator
         "class Undocumented { };\n\n"
         "/*! Mithilfe öffentlicher Vererbung vererbte Klasse */\n"
         "class PublicBase : public Truncated { };\n\n"
-        "/*! Eine Template Klasse */\n"
+        "/*! Eine Template-Klasse */\n"
         "template<class T> class Templ { };\n\n"
         "/*! Mithilfe geschützter Vererbung vererbte Klasse */\n"
         "class ProtectedBase { };\n\n"
@@ -1135,14 +1137,13 @@ class TranslatorGerman : public Translator
         "  private:\n"
         "    Used *m_usedClass;\n"
         "};\n"
-        "\\endcode\n\n"
-        "Setzen des Tags \\c MAX_DOT_GRAPH_HEIGHT in der Konfigurationsdatei "
-        "auf 240 liefert den folgenden Graphen:"
+        "\\endcode\n"
+        "Dies liefert den folgenden Graphen:"
         "<p><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n"
         "<p>\n"
         "Die Rechtecke in obigem Graphen bedeuten:\n"
         "<ul>\n"
-        "<li>Ein schwarz gefülltes Rechteck stellt die Struktur oder "
+        "<li>Ein grau gefülltes Rechteck stellt die Struktur oder "
         "Klasse dar, für die der Graph erzeugt wurde.\n"
         "<li>Ein Rechteck mit schwarzem Rahmen kennzeichnet eine dokumentierte "
         "Struktur oder Klasse.\n"
diff --git a/src/translator_en.h b/src/translator_en.h
index eeff2b6..72ff0c3 100644
--- a/src/translator_en.h
+++ b/src/translator_en.h
@@ -767,8 +767,7 @@ class TranslatorEnglish : public Translator
      */
     virtual QCString trGeneratedFromFiles(ClassDef::CompoundType compType,
         bool single)
-    { // here s is one of " Class", " Struct" or " Union"
-      // single is true implies a single file
+    { // single is true implies a single file
       QCString result=(QCString)"The documentation for this ";
       switch(compType)
       {
@@ -1731,7 +1730,7 @@ class TranslatorEnglish : public Translator
      */
     virtual QCString trGeneratedFromFilesFortran(ClassDef::CompoundType compType,
         bool single)
-    { // here s is one of " Module", " Struct" or " Union"
+    {
       // single is true implies a single file
       QCString result=(QCString)"The documentation for this ";
       switch(compType)
diff --git a/src/translator_fi.h b/src/translator_fi.h
index 118e6f8..4a11d4c 100644
--- a/src/translator_fi.h
+++ b/src/translator_fi.h
@@ -32,7 +32,12 @@ Antti Laine   (0.49-990425 -> )     <antti.a.laine@tut.fi>
 2008-08-26
 * MAX_DOT_GRAPH_HEIGHT poistettu, versio 1.5.6
 * Tekstit muutettu UTF-8:ksi
-*
+2009-01-17
+* versio 1.5.8
+* Kantaluokka vaihdettu TranslatorEnglishistÀ Translatoriksi
+* Enumeraatio -> luettelotyyppi
+* Paranneltu kieltÀ ja poistettu kirjoitusvirheitÀ
+
 * TehtÀvÀÀ: 
         - Termien kokoaminen listaksi ja suomennosten jÀrkevyyden tarkastelu. (lista on jo melko kattava)
                 Author          = TekijÀ
@@ -44,7 +49,7 @@ Antti Laine   (0.49-990425 -> )     <antti.a.laine@tut.fi>
                 Description     = Selite
                 Detailed        = Yksityiskohtainen
                 Diagram         = Kaavio
-                Enum            = Enumeraatio / Luettelotyyppi
+                Enum            = Luettelotyyppi
                 Exceptions      = Poikkeukset
                 File            = Tiedosto
                 Friends         = YstÀvÀt
@@ -81,7 +86,7 @@ positiiviset kommentit otetaan ilolla vastaan.
 #ifndef TRANSLATOR_FI_H
 #define TRANSLATOR_FI_H
 
-class TranslatorFinnish : public TranslatorEnglish
+class TranslatorFinnish : public Translator
 {
   public:
     /*! This method is used to generate a warning message to signal
@@ -152,7 +157,7 @@ class TranslatorFinnish : public TranslatorEnglish
 
     /*! header that is put before the list of enumerations. */
     virtual QCString trMemberEnumerationDocumentation()
-    { return "JĂ€senenumeraatioiden dokumentaatio"; } // "Member Enumeration Documentation"
+    { return "JĂ€senluettelotyyppien dokumentaatio"; } // "Member Enumeration Documentation"
 
     /*! header that is put before the list of member functions. */
     virtual QCString trMemberFunctionDocumentation()
@@ -185,7 +190,7 @@ class TranslatorFinnish : public TranslatorEnglish
 
     /*! this is the first part of a sentence that is followed by a class name */
     virtual QCString trThisIsTheListOfAllMembers()
-    { return "TÀmÀ on lista kaikista jÀsenistÀ"; } // "This is the complete list of members for "
+    { return "TÀmÀ on lista kaikista jÀsenistÀ luokassa "; } // "This is the complete list of members for "
 
     /*! this is the remainder of the sentence after the class name */
     virtual QCString trIncludingInheritedMembers()
@@ -195,7 +200,7 @@ class TranslatorFinnish : public TranslatorEnglish
      *  parameter s is name of the project name.
      */
     virtual QCString trGeneratedAutomatically(const char *s)
-    { QCString result=(QCString)"Automaattisesti generoitu Doxygenilla "
+    { QCString result=(QCString)"Automaattisesti luotu Doxygenilla "
                       "lÀhdekoodista projektille "+s; // "Generated automatically by Doxygen" ... "for" ... "from the sourcecode"
       //if (s) result+=(QCString)" voor "+s;
       // tÀssÀ on ongelma, kuinka taivuttaa parametria, esim. "Jcad"+"in"; "IFC2VRML konversio"+"n"
@@ -208,11 +213,11 @@ class TranslatorFinnish : public TranslatorEnglish
 
     /*! put after an enum name in the list of all members */
     virtual QCString trEnumName()
-    { return "enumeraation nimi"; } // "enum name"
+    { return "luettelotyypin nimi"; } // "enum name"
 
     /*! put after an enum value in the list of all members */
     virtual QCString trEnumValue()
-    { return "enumeraation arvo"; } // "enum value"
+    { return "luettelotyypin arvo"; } // "enum value"
 
     /*! put after an undocumented member in the list of all members */
     virtual QCString trDefinedIn()
@@ -296,7 +301,7 @@ class TranslatorFinnish : public TranslatorEnglish
     {
       QCString result="TÀssÀ on lista kaikista ";
       if (!extractAll) result+="dokumentoiduista "; // "documented "
-      result+="tiedostoista lyhyen selitteen kera:"; // "files with brief descriptions:"
+      result+="tiedostoista lyhyen selitteen kanssa:"; // "files with brief descriptions:"
       return result;
     }
     
@@ -306,12 +311,12 @@ class TranslatorFinnish : public TranslatorEnglish
     
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "TÀssÀ ovat tietueet lyhyen selitteen kera:"; // "Here are the data structures with brief descriptions:"
+        return "TÀssÀ ovat tietueet lyhyen selitteen kanssa:"; // "Here are the data structures with brief descriptions:"
       }
       else
       {
         return "TÀssÀ ovat luokat, tietueet ja " // "Here are the classes, structs and "
-             "yhdisteet lyhyen selitteen kera:"; // "unions with brief descriptions:"
+             "yhdisteet lyhyen selitteen kanssa:"; // "unions with brief descriptions:"
       }
     }
     
@@ -365,7 +370,7 @@ class TranslatorFinnish : public TranslatorEnglish
       
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        result+="funktioista, muuttujista, mÀÀrittelyistÀ, luetteloista ja tyyppimÀÀrittelyistÀ"; // "functions, variables, defines, enums, and typedefs"
+        result+="funktioista, muuttujista, mÀÀrittelyistÀ, luettelotyypeistÀ ja tyyppimÀÀrittelyistÀ"; // "functions, variables, defines, enums, and typedefs"
       }
       else
       {
@@ -373,7 +378,7 @@ class TranslatorFinnish : public TranslatorEnglish
       }
       result+=" linkitettyinÀ "; // " with links to "
       if (extractAll) 
-        result+="tiedostoon, johon ne kuuluvat:"; // "the files they belong to:"
+        result+="tiedostoihin, joihin ne kuuluvat:"; // "the files they belong to:"
       else 
         result+="dokumentaatioon:"; // "the documentation:"
       return result;
@@ -642,7 +647,7 @@ class TranslatorFinnish : public TranslatorEnglish
     {
       QCString result="TÀssÀ on lista kaikista "; // "Here is a list of all "
       if (!extractAll) result+="dokumentoiduista "; // "documented "
-      result+="nimiavaruuksista lyhyen selitteen kera:"; // "namespaces with brief descriptions:"
+      result+="nimiavaruuksista lyhyen selitteen kanssa:"; // "namespaces with brief descriptions:"
       return result;
     }
     
@@ -770,7 +775,7 @@ class TranslatorFinnish : public TranslatorEnglish
      */
     virtual QCString trReimplementedFromList(int numEntries)
     {
-      return (QCString)"Uudelleen toteuttaa "+(numEntries > 1 ? "luokat " : "luokan  ")+trWriteList(numEntries)+"."; // "Reimplemented from "
+      return (QCString)"Uudelleentoteuttaa "+(numEntries > 1 ? "luokat " : "luokan  ")+trWriteList(numEntries)+"."; // "Reimplemented from "
     }
     
     /*! used in member documentation blocks to produce a list of
@@ -778,7 +783,7 @@ class TranslatorFinnish : public TranslatorEnglish
      */
     virtual QCString trReimplementedInList(int numEntries)
     {
-      return (QCString)"Uudelleen toteutettu "+(numEntries > 1 ? "luokissa " : "luokassa ")+trWriteList(numEntries)+"."; // "Reimplemented in "
+      return (QCString)"Uudelleentoteutetaan "+(numEntries > 1 ? "luokissa " : "luokassa ")+trWriteList(numEntries)+"."; // "Reimplemented in "
     }
 
     /*! This is put above each page as a link to all members of namespaces. */
@@ -841,8 +846,8 @@ class TranslatorFinnish : public TranslatorEnglish
         case ClassDef::Category:   result+="kategorialle"; break; // "category"
         case ClassDef::Exception:  result+="poikkeukselle"; break; // "exception"
       }
-      if (single) result+=" generoitiin seuraavasta tiedostosta:"; // " was generated from the following file"
-      else result+=" generoitiin seuraavista tiedostoista:"; // ":" or "s:"
+      if (single) result+=" luotiin seuraavasta tiedostosta:"; // " was generated from the following file"
+      else result+=" luotiin seuraavista tiedostoista:"; // ":" or "s:"
       return result;
     }
 
@@ -920,7 +925,7 @@ class TranslatorFinnish : public TranslatorEnglish
     /*! Used in the file sources to point to the corresponding documentation. */
     virtual QCString trGotoDocumentation()
     {
-      return "Mene tÀmÀn tiedoston dokumentaatioon."; // "Go to the documentation of this file."
+      return "Siirry tÀmÀn tiedoston dokumentaatioon."; // "Go to the documentation of this file."
     }
     /*! Text for the \\pre command */
     virtual QCString trPrecondition()
@@ -1024,7 +1029,7 @@ class TranslatorFinnish : public TranslatorEnglish
     /*! Used as a marker that is put before a \\todo item */
     virtual QCString trTodo()
     {
-      return "VielÀ tehtÀvÀ"; // "Todo"
+      return "VielÀ tehtÀvÀnÀ"; // "Todo"
     }
     /*! Used as the header of the todo list */
     virtual QCString trTodoList()
@@ -1050,7 +1055,7 @@ class TranslatorFinnish : public TranslatorEnglish
     }
     virtual QCString trInclByDepGraph()
     {
-      return "TÀmÀ kaavio nÀyttÀÀ, mitkÀ tiedostot suorasti"
+      return "TÀmÀ kaavio nÀyttÀÀ, mitkÀ tiedostot suorasti "
              "tai epÀsuorasti sisÀllyttÀvÀt tÀmÀn tiedoston";
              // "This graph shows which files directly or "
              // "indirectly include this file:"
@@ -1076,7 +1081,7 @@ class TranslatorFinnish : public TranslatorEnglish
     virtual QCString trLegendDocs()
     {
       return 
-        "TÀmÀ sivu selittÀÀ, kuinka doxygenin generoimia kaavioita tulkitaan.<p>\n"
+        "TÀmÀ sivu selittÀÀ, kuinka doxygenin luomia kaavioita tulkitaan.<p>\n"
         // "This page explains how to interpret the graphs that are generated "
         // "by doxygen.<p>\n"
         "Ajattele seuraavaa esimerkkiÀ:\n"
@@ -1144,7 +1149,7 @@ class TranslatorFinnish : public TranslatorEnglish
         "<ul>\n"
         "<li>TÀytetty harmaa laatikko esittÀÀ tietuetta tai luokkaa, jolle "
         // "<li>%A filled gray box represents the struct or class for which the "
-        "kaavio on generoitu.\n"
+        "kaavio on luotu.\n"
         // "graph is generated.\n"
         "<li>Mustareunainen laatikko merkitsee dokumentoitua tietuetta tai luokkaa.\n"
         // "<li>%A box with a black border denotes a documented struct or class.\n"
@@ -1591,7 +1596,7 @@ class TranslatorFinnish : public TranslatorEnglish
       }
       else 
       {
-        return "Löytyi <b>$num dokumenttia, jotka vastasivat hakuasi. " // "Found <b>$num</b> documents matching your query. "
+        return "Löytyi <b>$num</b> dokumenttia, jotka vastasivat hakuasi. " // "Found <b>$num</b> documents matching your query. "
                 "Parhaat tulokset nÀytetÀÀn ensin."; // "Showing best matches first."
       }
     }
@@ -1673,7 +1678,7 @@ class TranslatorFinnish : public TranslatorEnglish
     {
        return "TÀmÀ on ylikuormitettu jÀsenfunktio, ja se tarjotaan "
               "kÀytön helpottamiseksi. Se eroaa yllÀolevasta "
-              "funktiosta ainoastaan hyvÀksymiltÀ parametreiltaan.";
+              "funktiosta ainoastaan hyvÀksymiltÀÀn parametreilta.";
               // "This is an overloaded member function, "
               // "provided for convenience. It differs from the above "
               // "function only in what argument(s) it accepts."
@@ -1713,7 +1718,7 @@ class TranslatorFinnish : public TranslatorEnglish
 
     /*! This is an introduction to the annotated compound list (Fortran). */
     virtual QCString trCompoundListDescriptionFortran()
-    { return "TÀssÀ ovat tietotyypit lyhyillÀ selityksillÀ:"; } // "Here are the data types with brief descriptions:"
+    { return "TÀssÀ ovat tietotyypit lyhyiden selitysten kanssa:"; } // "Here are the data types with brief descriptions:"
 
     /*! This is an introduction to the page with all data types (Fortran). */
     virtual QCString trCompoundMembersDescriptionFortran(bool extractAll)
@@ -1775,7 +1780,7 @@ class TranslatorFinnish : public TranslatorEnglish
     {
       QCString result="TÀssÀ on lista kaikista "; // "Here is a list of all "
       if (!extractAll) result+="dokumentoiduista "; // "documented "
-      result+="moduuleista lyhillÀ selityksillÀ:"; // "modules with brief descriptions:"
+      result+="moduuleista lyhyiden selitysten kanssa:"; // "modules with brief descriptions:"
       return result;
     }
 
@@ -1862,7 +1867,7 @@ class TranslatorFinnish : public TranslatorEnglish
         case ClassDef::Category:   result+="kategorialle"; break; // "category"
         case ClassDef::Exception:  result+="poikkeukselle"; break; // "exception"
       }
-      result+=" generoitiin "; // " was generated from the following file"
+      result+=" luotiin "; // " was generated from the following file"
       if (single) result+="seuraavasta tiedostosta:"; else result+="seuraavista tiedostoista:"; // ":" / "s:"
       return result;
     }
diff --git a/src/translator_hr.h b/src/translator_hr.h
index 84f38be..ac8ad7b 100644
--- a/src/translator_hr.h
+++ b/src/translator_hr.h
@@ -68,6 +68,9 @@
 // 2006/06/11
 // - Added strings for 1.4.6
 //
+// 2009/01/09
+// - Updated trLegendDocs
+//
 #ifndef TRANSLATOR_HR_H
 #define TRANSLATOR_HR_H
 
@@ -776,26 +779,29 @@ class TranslatorCroatian : public Translator
         "    Used *m_usedClass;\n"
         "};\n"
         "\\endcode\n"
-        "Ako je \\c MAX_DOT_GRAPH_HEIGHT tag u konfiguracijskoj datoteci "
-        "postavljen na  200 gornje veze æe rezultirati grafikonom:"
+        "To æe rezultirati grafikonom:"
         "<p><center><img src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n"
         "<p>\n"
         "Pravokutnici imaju slijedeæe znaèenje:\n"
         "<ul>\n"
-        "<li>Puni crni predstavlja klasu za koji je generiran graf.\n"
-        "<li>Pravokutnik s crnim rubom predstavlja dokumentiranu klasu.\n"
-        "<li>Pravokutnik s sivim rubom predstavlja nedokumentiranu klasu.\n"
-        "<li>Pravokutnik s crvenim rubom predstavlja dokumentiranu klasu\n"
+        "<li>%A Puni crni predstavlja klasu za koji je generiran graf.\n"
+        "<li>%A Pravokutnik s crnim rubom predstavlja dokumentiranu klasu.\n"
+        "<li>%A Pravokutnik s sivim rubom predstavlja nedokumentiranu klasu.\n"
+        "<li>%A Pravokutnik s crvenim rubom predstavlja dokumentiranu klasu\n"
         "Za koju nije prikazan graf naslijeđivanja. Graf je odrezan "
         "ako ne stane unutar određenih granica."
         "</ul>\n"
         "Strelice imaju slijedeæe znaèenje:\n"
         "<ul>\n"
-        "<li>Tamnoplava strelica oznaèava public naslijeđivanje.\n"
-        "<li>Tamnozelena strelica oznaèava protected naslijeđivanje.\n"
-        "<li>Tamnocrvena strelica oznaèava private naslijeđivanje.\n"
-        "<li>Ljubièasta isprekidana strelica se koristi za agregate vezu. "
+        "<li>%A Tamnoplava strelica oznaèava public naslijeđivanje.\n"
+        "<li>%A Tamnozelena strelica oznaèava protected naslijeđivanje.\n"
+        "<li>%A Tamnocrvena strelica oznaèava private naslijeđivanje.\n"
+        "<li>%A Ljubièasta isprekidana strelica se koristi ako je klasa dio "
+        "druge klase ili ako se klasa koristi u drugoj klasi. Natpis na "
+        "strelici je ime varijable u drugoj klasi\n"
         "Strelica je oznaèena imenom varijable.\n"
+        "<li>%A Žuta isprekidana strelica oznaèava relaciju između template instance "
+        "i template klase. Oznaèena je imenom template parametra\n"
         "</ul>\n");
     }
     /*! text for the link to the legend page */
diff --git a/src/translator_kr.h b/src/translator_kr.h
index 026dafd..e97cc7b 100644
--- a/src/translator_kr.h
+++ b/src/translator_kr.h
@@ -1064,8 +1064,7 @@ class TranslatorKorean : public Translator
         "    Used *m_usedClass;\n"
         "};\n"
         "\\endcode\n"
-        "žžŸà ŒłÁ€ÆÄÀÏżĄŒ­ \\c MAX_DOT_GRAPH_HEIGHT ƱŚ°Ą "
-        "240Àž·Î ŒłÁ€”ÇŸúŽÙžé, ŽÙÀœ°ú °°Àș ±Ś·ĄÇÁ°Ą Ăâ·Â”É °ÍÀÔŽÏŽÙ. :"
+        "ŽÙÀœ°ú °°Àș ±Ś·ĄÇÁ°Ą Ăâ·Â”É °ÍÀÔŽÏŽÙ. :"
         "<p><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n"
         "<p>\n"
         "À§ ±Ś·ĄÇÁÀÇ čÚœș”éÀș ŽÙÀœ°ú °°Àș ÀÇčÌžŠ °ĄÁęŽÏŽÙ. :\n"
@@ -1789,7 +1788,7 @@ class TranslatorKorean : public Translator
       return result; 
     }
 
-    /*! C# Type Contraint list */
+    /*! C# Type Constraint list */
     virtual QCString trTypeConstraints()
     {
       return "ĆžÀÔ ÇŃÁ€ÀÚ”é";
diff --git a/src/translator_ro.h b/src/translator_ro.h
index af26d05..dae3ae8 100644
--- a/src/translator_ro.h
+++ b/src/translator_ro.h
@@ -15,26 +15,20 @@
  *
  */
 
-/* The translation from English to Romanian by Alexandru Iosup [aiosup@yahoo.com].
- * Updated by Ionut Dumitrascu [reddumy@yahoo.com]
+/* Original translation from English to Romanian by Alexandru Iosup [aiosup@yahoo.com].
+ * Updated by Ionuƣ DumitraƟcu [reddumy@yahoo.com]
  *
- * Disclaimer: I hope I translated these to Romanian keeping
- * the meaning of the sentences intact. I used C-words were possible,
- * (e.g. the Romanian "definire de tip" for "typedef" is too long and 
- * unexpressive).
- *
- * If you have suggestions, please mail the comments and text proposals to the address 
- * shown aprox.10 lines above
- * 
  * -------------------------------------------
- * Project start                : 20.Sep.2k
- * Last Doxygen version covered : 1.4.1
- * Last revision                : 01.Mar.2k5
+ * Project start                : 20.09.2000
+ * Last Doxygen version covered : 1.5.8
+ * Last revision                : 15.01.2009
  * -------------------------------------------
  *
  * Revision history
  * ----------------
- * 28.07.2008 - Updated version - covering Doxygen 1.5.6 - and some minor changes
+ * 15.01.2009 - Updated Romanian translation to Doxygen 1.5.8 and modified strings to UTF-8, as well as some other changes (Ionuƣ DumitraƟcu)
+ * 28.07.2008 - Updated version - covering Doxygen 1.5.6 - and some minor changes  (Ionuƣ DumitraƟcu)
+ *
  * 01.Mar.2k5  Third revision, covering Doxygen 1.4.1
  *
  * 07.Mar.2k2  Second revision, covering Doxygen 1.2.14
@@ -47,7 +41,7 @@
 #define TRANSLATOR_RO_H
 
 
-class TranslatorRomanian : public TranslatorAdapter_1_4_1
+class TranslatorRomanian : public Translator
 {
   public:
 
@@ -83,45 +77,45 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
     /*! return the language charset. This will be used for the HTML output */
     virtual QCString idLanguageCharset()
     {
-      return "iso-8859-2";
+      return "utf-8";
     }
 
     // --- Language translation methods -------------------
 
     /*! used in the compound documentation before a list of related functions. */
     virtual QCString trRelatedFunctions()
-    { return "Funcții înrudite"; }
+    { return "FuncĆŁii Ăźnrudite"; }
 
     /*! subscript for the related functions. */
     virtual QCString trRelatedSubscript()
-    { return "(Atenție: NU sunt funcții membre.)"; }
+    { return "(AtenĆŁie: acestea nu sunt funcĆŁii membre.)"; }
 
     /*! header that is put before the detailed description of files, classes and namespaces. */
     virtual QCString trDetailedDescription()
-    { return "Descriere Detaliată"; }
+    { return "Descriere Detaliată"; }
 
     /*! header that is put before the list of typedefs. */
     virtual QCString trMemberTypedefDocumentation()
-    { return "Documentația Declarațiilor Typedef membre"; }
+    { return "DocumentaĆŁia DefiniĆŁiilor de Tipuri (typedef) Membre"; }
     
     /*! header that is put before the list of enumerations. */
     virtual QCString trMemberEnumerationDocumentation()
-    { return "Documentația membrilor Enum"; }
+    { return "Documentaƣia Enumerărilor Membre"; }
     
     /*! header that is put before the list of member functions. */
     virtual QCString trMemberFunctionDocumentation()
-    { return "Documentația Funcțiilor membre"; }
+    { return "DocumentaĆŁia FuncĆŁiilor Membre"; }
     
     /*! header that is put before the list of member attributes. */
     virtual QCString trMemberDataDocumentation()
     { 
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Documentația Câmpurilor"; 
+        return "DocumentaĆŁia CĂąmpurilor"; 
       }
       else
       {
-        return "Documentația Datelor membre"; 
+        return "DocumentaĆŁia Datelor Membre"; 
       }
 
     }
@@ -140,11 +134,11 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
 
     /*! this is the first part of a sentence that is followed by a class name */
     virtual QCString trThisIsTheListOfAllMembers()
-    { return "Lista completă a membrilor din "; }
+    { return "Lista completă a membrilor din "; }
 
     /*! this is the remainder of the sentence after the class name */
     virtual QCString trIncludingInheritedMembers()
-    { return ", inclusiv a tuturor membrilor moșteniți."; }
+    { return ", inclusiv a tuturor membrilor moƟteniƣi."; }
     
     /*! this is put at the author sections at the bottom of man pages.
      *  parameter s is name of the project name.
@@ -152,21 +146,21 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
     virtual QCString trGeneratedAutomatically(const char *s)
     { QCString result="Generat automat de Doxygen";
       if (s) result+=(QCString)" pentru "+s;
-      result+=" din codul sursă."; 
+      result+=" din codul sursă."; 
       return result;
     }
 
     /*! put after an enum name in the list of all members */
     virtual QCString trEnumName()
-    { return "nume enum"; }
+    { return "nume enumerare"; }
     
     /*! put after an enum value in the list of all members */
     virtual QCString trEnumValue()
-    { return "valoare enum"; }
+    { return "valoare enumerare"; }
     
     /*! put after an undocumented member in the list of all members */
     virtual QCString trDefinedIn()
-    { return "definit în"; }
+    { return "definit Ăźn"; }
 
     // quick reference sections
 
@@ -189,29 +183,25 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
       }
       else
       {
-        return "Lista Membrilor Componenți"; 
+        return "Lista Claselor"; 
       }
 
     }
     
     /*! This is put above each page as a link to the list of documented files */
     virtual QCString trFileList()
-    { return "Lista fișierelor"; }
-
-    /*! This is put above each page as a link to the list of all verbatim headers */
-    virtual QCString trHeaderFiles()
-    { return "Fișiere Header"; }
+    { return "Lista fiƟierelor"; }
 
     /*! This is put above each page as a link to all members of compounds. */
     virtual QCString trCompoundMembers()
     { 
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Câmpurile de Date"; 
+        return "CĂąmpurile de Date"; 
       }
       else
       {
-        return "Membrii Componenți"; //cu articol hotarat
+        return "Membrii ComponenĆŁi"; //cu articol hotarat
       }
 
     }
@@ -225,34 +215,34 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
       }
       else
       {
-        return "Membrii din Fișier"; //cu articol hotarat
+        return "Membrii din FiƟier"; //cu articol hotarat
       }
 
     }
 
     /*! This is put above each page as a link to all related pages. */
     virtual QCString trRelatedPages()
-    { return "Pagini înrudite"; }
+    { return "Pagini Ăźnrudite"; }
 
     /*! This is put above each page as a link to all examples. */
     virtual QCString trExamples()
-    { return "Exemples"; }
+    { return "Exemple"; }
 
     /*! This is put above each page as a link to the search engine. */
     virtual QCString trSearch()
-    { return "Caută"; }
+    { return "Caută"; }
 
     /*! This is an introduction to the class hierarchy. */
     virtual QCString trClassHierarchyDescription()
-    { return "Această listă de legături este sortată în general, "
-             "dar nu complet, în ordine alfabetică:";
+    { return "Această listă de moƟteniri este sortată ün general, "
+             "dar nu complet, ßn ordine alfabetică:";
     }
 
     /*! This is an introduction to the list with all files. */
     virtual QCString trFileListDescription(bool extractAll)
     {
       QCString result="Lista tuturor ";
-      result+="fișierelor";
+      result+="fiƟierelor";
 	  if (!extractAll) result+=" documentate";
 	  result+=", cu scurte descrieri:";
       return result;
@@ -267,7 +257,7 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
       }
       else
       {
-        return "Lista claselor, structurilor, uniunilor și interfețelor"
+        return "Lista claselor, structurilor, uniunilor Ɵi interfeƣelor"
 		", cu scurte descrieri:"; 
       }
 
@@ -280,37 +270,37 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
       
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        result+="câmpurilor ";
+        result+="cĂąmpurilor ";
         if (!extractAll) result+=" documentate ";
         result+="din structuri si uniuni ";
       }
       else
       {
         result+="membrilor ";
-	  if (!extractAll) result+="documentați ";
+	  if (!extractAll) result+="documentaĆŁi ";
         result+="din toate clasele ";
       }
-      result+=", cu legături către ";
+      result+=", cu legături către ";
       if (!extractAll) 
       {
         if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
         {
-          result+="documentația structurii/uniunii pentru fiecare câmp în parte:";
+          result+="documentaĆŁia structurii/uniunii pentru fiecare cĂąmp Ăźn parte:";
         }
         else
         {
-          result+="documentația clasei pentru fiecare membru în parte:";
+          result+="documentaĆŁia clasei pentru fiecare membru Ăźn parte:";
         }
       }
       else 
       {
         if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
         {
-          result+="structurile/uniunile de care aparțin:";
+          result+="structurile/uniunile de care aparĆŁin:";
         }
         else
         {
-          result+="clasele de care aparțin:";
+          result+="clasele de care aparĆŁin:";
         }
       }
      
@@ -323,52 +313,42 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
       QCString result="Lista tuturor ";
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        result+="funcțiilor, variabilelor, define-urilor, enum-urilor și typedef-urilor";
+        result+="funcƣiilor, variabilelor, definiƣiilor, enumerărilor Ɵi definiƣiilor de tip";
 	  if (!extractAll) result+=" documentate";
       }
       else
       {
         result+="membrilor ";
-	  if (!extractAll) result+="documentați ";
-	  result+="din toate fișierele";
+	  if (!extractAll) result+="documentaĆŁi ";
+	  result+="din toate fiƟierele";
       }
-      result+=", cu legături către ";
+      result+=", cu legături către ";
       if (extractAll) 
-        result+="fișierele de care aparțin:";
+        result+="fiƟierele de care aparƣin:";
       else 
-        result+="documentația aferentă:";
+        result+="documentaƣia aferentă:";
 
       return result;
     }
 
-    /*! This is an introduction to the page with the list of all header files. */
-    virtual QCString trHeaderFilesDescription()
-    { return "Lista fișierele Header care fac parte din API:"; }
-
     /*! This is an introduction to the page with the list of all examples */
     virtual QCString trExamplesDescription()
     { return "Lista tuturor exemplelor:"; }
 
     /*! This is an introduction to the page with the list of related pages */
     virtual QCString trRelatedPagesDescription()
-    { return "Lista tuturor documentațiilor înrudite:"; }
+    { return "Lista tuturor documentaĆŁiilor Ăźnrudite:"; }
 
     /*! This is an introduction to the page with the list of class/file groups */
     virtual QCString trModulesDescription()
     { return "Lista tuturor modulelor:"; }
 
-    /*! This sentences is used in the annotated class/file lists if no brief
-     * description is given. 
-     */
-    virtual QCString trNoDescriptionAvailable()
-    { return "Nici o descriere disponibilă"; }
-    
     // index titles (the project name is prepended for these) 
 
 
     /*! This is used in HTML as the title of index.html. */
     virtual QCString trDocumentation()
-    { return "Documentație"; }
+    { return "DocumentaĆŁie"; }
 
     /*! This is used in LaTeX as the title of the chapter with the 
      * index of all groups.
@@ -402,13 +382,13 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
      * list of all files.
      */
     virtual QCString trFileIndex() 
-    { return "Indexul Fișierelor"; }
+    { return "Indexul FiƟierelor"; }
 
     /*! This is used in LaTeX as the title of the chapter containing
      *  the documentation of all groups.
      */
     virtual QCString trModuleDocumentation()
-    { return "Documentația Modulelor"; }
+    { return "DocumentaĆŁia Modulelor"; }
 
     /*! This is used in LaTeX as the title of the chapter containing
      *  the documentation of all classes, structs and unions.
@@ -417,11 +397,11 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
     { 
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Documentația Structurilor de Date"; 
+        return "DocumentaĆŁia Structurilor de Date"; 
       }
       else
       {
-        return "Documentația Claselor"; 
+        return "DocumentaĆŁia Claselor"; 
       }
 
     }
@@ -430,19 +410,19 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
      *  the documentation of all files.
      */
     virtual QCString trFileDocumentation()
-    { return "Documentația Fișierelor"; }
+    { return "Documentaƣia FiƟierelor"; }
 
     /*! This is used in LaTeX as the title of the chapter containing
      *  the documentation of all examples.
      */
     virtual QCString trExampleDocumentation()
-    { return "Documentația Exemplelor"; }
+    { return "DocumentaĆŁia Exemplelor"; }
 
     /*! This is used in LaTeX as the title of the chapter containing
      *  the documentation of all related pages.
      */
     virtual QCString trPageDocumentation()
-    { return "Documentații înrudite"; }
+    { return "DocumentaĆŁii Ăźnrudite"; }
 
     /*! This is used in LaTeX as the title of the document */
     virtual QCString trReferenceManual()
@@ -452,31 +432,31 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
      *  list of defines
      */
     virtual QCString trDefines()
-    { return "Definiții"; }
+    { return "DefiniĆŁii"; }
 
     /*! This is used in the documentation of a file as a header before the 
      *  list of function prototypes
      */
     virtual QCString trFuncProtos()
-    { return "Prototipuri de funcții"; }
+    { return "Prototipuri de funcĆŁii"; }
 
     /*! This is used in the documentation of a file as a header before the 
      *  list of typedefs
      */
     virtual QCString trTypedefs()
-    { return "Declarații Typedef"; }
+    { return "DefiniĆŁii de tipuri"; }
 
     /*! This is used in the documentation of a file as a header before the 
      *  list of enumerations
      */
     virtual QCString trEnumerations()
-    { return "Enumerații"; }
+    { return "Enumerări"; }
 
     /*! This is used in the documentation of a file as a header before the 
      *  list of (global) functions
      */
     virtual QCString trFunctions()
-    { return "Funcții"; }
+    { return "FuncĆŁii"; }
 
     /*! This is used in the documentation of a file as a header before the 
      *  list of (global) variables
@@ -488,49 +468,43 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
      *  list of (global) variables
      */
     virtual QCString trEnumerationValues()
-    { return "Valori enum"; }
+    { return "Valori de enumerări"; }
     
     /*! This is used in the documentation of a file before the list of
      *  documentation blocks for defines
      */
     virtual QCString trDefineDocumentation()
-    { return "Documentația definițiilor"; }
+    { return "DocumentaĆŁia definiĆŁiilor"; }
 
     /*! This is used in the documentation of a file/namespace before the list 
      *  of documentation blocks for function prototypes
      */
     virtual QCString trFunctionPrototypeDocumentation()
-    { return "Documentația prototipurilor de funcții"; }
+    { return "DocumentaĆŁia prototipurilor de funcĆŁii"; }
 
     /*! This is used in the documentation of a file/namespace before the list 
      *  of documentation blocks for typedefs
      */
     virtual QCString trTypedefDocumentation()
-    { return "Documentația definițiilor Typedef"; }
+    { return "DocumentaĆŁia definiĆŁiilor de tipuri"; }
 
     /*! This is used in the documentation of a file/namespace before the list 
      *  of documentation blocks for enumeration types
      */
     virtual QCString trEnumerationTypeDocumentation()
-    { return "Documentația tipurilor enum"; }
-
-    /*! This is used in the documentation of a file/namespace before the list 
-     *  of documentation blocks for enumeration values
-     */
-    virtual QCString trEnumerationValueDocumentation()
-    { return "Documentația valorilor enum"; }
+    { return "Documentaƣia enumerărilor"; }
 
     /*! This is used in the documentation of a file/namespace before the list 
      *  of documentation blocks for functions
      */
     virtual QCString trFunctionDocumentation()
-    { return "Documentația funcțiilor"; }
+    { return "DocumentaĆŁia funcĆŁiilor"; }
 
     /*! This is used in the documentation of a file/namespace before the list 
      *  of documentation blocks for variables
      */
     virtual QCString trVariableDocumentation()
-    { return "Documentația variabilelor"; }
+    { return "DocumentaĆŁia variabilelor"; }
 
     /*! This is used in the documentation of a file/namespace/group before 
      *  the list of links to documented compounds
@@ -555,7 +529,7 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
     { 
       QCString result=(QCString)"Generat "+date;
       if (projName) result+=(QCString)" pentru "+projName;
-      result+=(QCString)" de către";
+      result+=(QCString)" de către";
       return result;
     }
     /*! This is part of the sentence used in the standard footer of each page.
@@ -568,24 +542,16 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
     /*! this text is put before a class diagram */
     virtual QCString trClassDiagram(const char *clName)
     {
-      return (QCString)"Diagrama de relații pentru "+clName;
+      return (QCString)"Diagrama de relaĆŁii pentru "+clName;
     }
     
     /*! this text is generated when the \\internal command is used. */
     virtual QCString trForInternalUseOnly()
     { return "Doar pentru uz intern."; }
 
-    /*! this text is generated when the \\reimp command is used. */
-    virtual QCString trReimplementedForInternalReasons()
-    { return "Reimplementat din motive interne; API-ul nu este afectat."; }
-
     /*! this text is generated when the \\warning command is used. */
     virtual QCString trWarning()
-    { return "Atenție"; }
-
-    /*! this text is generated when the \\bug command is used. */
-    virtual QCString trBugsAndLimitations()
-    { return "Buguri și limitări"; }
+    { return "AtenĆŁie"; }
 
     /*! this text is generated when the \\version command is used. */
     virtual QCString trVersion()
@@ -597,11 +563,11 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
 
     /*! this text is generated when the \\return command is used. */
     virtual QCString trReturns()
-    { return "Întoarce"; }
+    { return "Întoarce"; }
 
     /*! this text is generated when the \\sa command is used. */
     virtual QCString trSeeAlso()
-    { return "Vezi și"; }
+    { return "Vezi Ɵi"; }
 
     /*! this text is generated when the \\param command is used. */
     virtual QCString trParameters()
@@ -609,7 +575,7 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
 
     /*! this text is generated when the \\exception command is used. */
     virtual QCString trExceptions()
-    { return "Excepții"; }
+    { return "ExcepĆŁii"; }
     
     /*! this text is used in the title page of a LaTeX document. */
     virtual QCString trGeneratedBy()
@@ -619,7 +585,7 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
     
     /*! used as the title of page containing all the index of all namespaces. */
     virtual QCString trNamespaceList()
-    { return "Lista Namespace"; }
+    { return "Lista de Namespace-uri"; }
 
     /*! used as an introduction to the namespace list */
     virtual QCString trNamespaceListDescription(bool extractAll)
@@ -645,7 +611,7 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
      * related classes 
      */
     virtual QCString trRelatedFunctionDocumentation()
-    { return "Documentația funcțiilor prietene sau înrudite"; }
+    { return "DocumentaĆŁia funcĆŁiilor prietene sau Ăźnrudite"; }
     
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990425
@@ -656,16 +622,16 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
                                     ClassDef::CompoundType compType,
                                     bool isTemplate)
     {
-	  QCString result="Referință la ";
+	  QCString result="Referinƣă la ";
       switch(compType)
       {
         case ClassDef::Class:      result+="clasa "; break;
         case ClassDef::Struct:     result+="structura "; break;
         case ClassDef::Union:      result+="uniunea "; break;
-        case ClassDef::Interface:  result+="interfața "; break;
+        case ClassDef::Interface:  result+="interfaĆŁa "; break;
         case ClassDef::Protocol:   result+="protocolul "; break;
         case ClassDef::Category:   result+="categoria "; break;
-        case ClassDef::Exception:  result+="excepția "; break;
+        case ClassDef::Exception:  result+="excepĆŁia "; break;
       }
 	  if (isTemplate) result+=" (Template) ";
 	  result+=(QCString)clName;
@@ -676,7 +642,7 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
     /*! used as the title of the HTML page of a file */
     virtual QCString trFileReference(const char *fileName)
     {
-      QCString result="Referință la fișierul ";
+      QCString result="Referinƣă la fiƟierul ";
       result+=fileName;
       return result;
     }
@@ -684,7 +650,7 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
     /*! used as the title of the HTML page of a namespace */
     virtual QCString trNamespaceReference(const char *namespaceName)
     {
-      QCString result="Referință la Namespace-ul ";
+      QCString result="Referinƣă la Namespace-ul ";
       result+=namespaceName;
       return result;
     }
@@ -701,13 +667,13 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
     virtual QCString trProtectedMembers()
     { return "Metode Protejate"; }
     virtual QCString trProtectedSlots()
-    { return "Sloturi Protejate"; }
+    { return "Conectori (slots) ProtejaĆŁi"; }
     virtual QCString trStaticProtectedMembers()
     { return "Metode Statice Protejate"; }
     virtual QCString trPrivateMembers()
     { return "Metode Private"; }
     virtual QCString trPrivateSlots()
-    { return "Conectori (slots) Privați"; }
+    { return "Conectori (slots) PrivaĆŁi"; }
     virtual QCString trStaticPrivateMembers()
     { return "Metode Statice Private"; }
     
@@ -730,7 +696,7 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
           if (i<numEntries-2) // not the fore last entry 
             result+=", ";
           else                // the fore last entry
-            result+=" și ";
+            result+=" Ɵi ";
         }
       }
       return result; 
@@ -741,7 +707,7 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
      */
     virtual QCString trInheritsList(int numEntries)
     {
-      return "Moștenește "+trWriteList(numEntries)+".";
+      return "MoƟteneƟte "+trWriteList(numEntries)+".";
     }
 
     /*! used in class documentation to produce a list of super classes,
@@ -749,7 +715,7 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
      */
     virtual QCString trInheritedByList(int numEntries)
     {
-      return "Moștenit de "+trWriteList(numEntries)+".";
+      return "MoƟtenit de "+trWriteList(numEntries)+".";
     }
 
     /*! used in member documentation blocks to produce a list of 
@@ -765,7 +731,7 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
      */
     virtual QCString trReimplementedInList(int numEntries)
     {
-      return "Reimplementat în "+trWriteList(numEntries)+".";
+      return "Reimplementat Ăźn "+trWriteList(numEntries)+".";
     }
 
     /*! This is put above each page as a link to all members of namespaces. */
@@ -776,13 +742,13 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
     virtual QCString trNamespaceMemberDescription(bool extractAll)
     { 
       QCString result="Lista tuturor membrilor ";
-      if (!extractAll) result+="documentați ";
-	  result+="din toate namespace-urile, cu legături către ";
+      if (!extractAll) result+="documentaĆŁi ";
+	  result+="din toate namespace-urile, cu legături către ";
 		  
       if (extractAll) 
-        result+="documentația namespace-ului pentru fiecare membru în parte:";
+        result+="documentaĆŁia namespace-ului pentru fiecare membru Ăźn parte:";
       else 
-        result+="namespace-urile de care aparțin:";
+        result+="namespace-urile de care aparĆŁin:";
       return result;
     }
     /*! This is used in LaTeX as the title of the chapter with the 
@@ -795,7 +761,7 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
      *  the documentation of all namespaces.
      */
     virtual QCString trNamespaceDocumentation()
-    { return "Documentația Namespace-ului"; }
+    { return "DocumentaĆŁia Namespace-ului"; }
 
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990522
@@ -818,18 +784,18 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
         bool single)
     { // here s is one of " Class", " Struct" or " Union"
       // single is true implies a single file
-      QCString result=(QCString)"Documentația pentru această ";
+      QCString result=(QCString)"Documentaƣia pentru această ";
       switch(compType)
       {
-        case ClassDef::Class:      result+="clasă"; break;
-        case ClassDef::Struct:     result+="structură"; break;
+        case ClassDef::Class:      result+="clasă"; break;
+        case ClassDef::Struct:     result+="structură"; break;
         case ClassDef::Union:      result+="uniune"; break;
-        case ClassDef::Interface:  result+="interfață"; break;
+        case ClassDef::Interface:  result+="interfaƣă"; break;
         case ClassDef::Protocol:   result+="protocol"; break;
         case ClassDef::Category:   result+="categorie"; break;
-        case ClassDef::Exception:  result+="excepție"; break;
+        case ClassDef::Exception:  result+="excepĆŁie"; break;
       }
-      result+=" a fost generată din fișier";
+      result+=" a fost generată din fiƟier";
       if (single) result+="ul:"; else result+="ele:";
       return result;
     }
@@ -838,7 +804,7 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
      * list.
      */
     virtual QCString trAlphabeticalList()
-    { return "Listă Alfabetică"; }
+    { return "Listă Alfabetică"; }
 
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990901
@@ -851,7 +817,7 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
     /*! This is in the (quick) index as a link to the main page (index.html)
      */
     virtual QCString trMainPage()
-    { return "Pagina principală"; }
+    { return "Pagina principală"; }
 
     /*! This is used in references to page that are put in the LaTeX 
      *  documentation. It should be an abbreviation of the word page.
@@ -863,17 +829,13 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
 // new since 0.49-991003
 //////////////////////////////////////////////////////////////////////////
 
-    virtual QCString trSources()
-    {
-      return "Surse";
-    }
     virtual QCString trDefinedAtLineInSourceFile()
     {
-      return "Definiția în linia @0 a fișierului @1.";
+      return "Definiƣia ün linia @0 a fiƟierului @1.";
     }
     virtual QCString trDefinedInSourceFile()
     {
-      return "Definiția în fișierul @0.";
+      return "Definiƣia ün fiƟierul @0.";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -882,7 +844,7 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
 
     virtual QCString trDeprecated()
     {
-      return "Învechită(Deprecated)";
+      return "Învechită(Deprecated)";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -892,17 +854,17 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
     /*! this text is put before a collaboration diagram */
     virtual QCString trCollaborationDiagram(const char *clName)
     {
-      return (QCString)"Diagrama de relații pentru "+clName+":";
+      return (QCString)"Diagrama de relaĆŁii pentru "+clName+":";
     }
     /*! this text is put before an include dependency graph */
     virtual QCString trInclDepGraph(const char *fName)
     {
-      return (QCString)"Graful dependențelor prin incluziune pentru "+fName+":";
+      return (QCString)"Graful dependenĆŁelor prin incluziune pentru "+fName+":";
     }
     /*! header that is put before the list of constructor/destructors. */
     virtual QCString trConstructorDocumentation()
     {
-      return "Documentația pentru Constructori și Destructori"; 
+      return "Documentaƣia pentru Constructori Ɵi Destructori"; 
     }
     /*! Used in the file documentation to point to the corresponding sources. */
     virtual QCString trGotoSourceCode()
@@ -912,17 +874,17 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
     /*! Used in the file sources to point to the corresponding documentation. */
     virtual QCString trGotoDocumentation()
     {
-      return "Vezi documentația.";
+      return "Vezi documentaĆŁia.";
     }
     /*! Text for the \\pre command */
     virtual QCString trPrecondition()
     {
-      return "Precondiție";
+      return "PrecondiĆŁie";
     }
     /*! Text for the \\post command */
     virtual QCString trPostcondition()
     {
-      return "Postcondiție";
+      return "PostcondiĆŁie";
     }
     /*! Text for the \\invariant command */
     virtual QCString trInvariant()
@@ -932,7 +894,7 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
     /*! Text shown before a multi-line variable/enum initialization */
     virtual QCString trInitialValue()
     {
-      return "Inițializare:";
+      return "Valoarea iniƣială:";
     }
     /*! Text used the source code in the file index */
     virtual QCString trCode()
@@ -941,15 +903,15 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
     }
     virtual QCString trGraphicalHierarchy()
     {
-      return "Ierarhia claselor în mod grafic";
+      return "Ierarhia Claselor Ăźn mod grafic";
     }
     virtual QCString trGotoGraphicalHierarchy()
     {
-      return "Vezi ierarhia claselor în mod grafic";
+      return "Vezi ierarhia claselor Ăźn mod grafic";
     }
     virtual QCString trGotoTextualHierarchy()
     {
-      return "Vezi ierarhia claselor în mod text";
+      return "Vezi ierarhia claselor Ăźn mod text";
     }
     virtual QCString trPageIndex()
     {
@@ -962,7 +924,7 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
     
     virtual QCString trNote()
     {
-      return "Notă";
+      return "Notă";
     }
     virtual QCString trPublicTypes()
     {
@@ -972,7 +934,7 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
     {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Câmpuri de Date";
+        return "CĂąmpuri de Date";
       }
       else
       {
@@ -1016,12 +978,12 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
     /*! Used as a marker that is put before a todo item */
     virtual QCString trTodo()
     {
-      return "De făcut";
+      return "De făcut";
     }
     /*! Used as the header of the todo list */
     virtual QCString trTodoList()
     {
-      return "Lista lucrurilor de făcut";
+      return "Lista lucrurilor de făcut";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1034,16 +996,16 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
     }
     virtual QCString trRemarks()
     {
-      return "Observații";
+      return "ObservaĆŁii";
     }
     virtual QCString trAttention()
     {
-      return "Atenție";
+      return "AtenĆŁie";
     }
     virtual QCString trInclByDepGraph()
     {
-      return "Acest graf arată care fișiere includ, "
-		  "direct sau indirect, acest fișier:";
+      return "Acest graf arată care fiƟiere includ, "
+		  "direct sau indirect, acest fiƟier:";
     }
     virtual QCString trSince()
     {
@@ -1063,27 +1025,27 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
     virtual QCString trLegendDocs()
     {
       return 
-        "Această pagină arată modul în care trebuie să interpretați "
+        "Această pagină arată modul ßn care trebuie să interpretaƣi "
 		"grafurile generate de doxygen.<p>\n"
-        "Considerați următorul exemplu:\n"
+        "Consideraƣi următorul exemplu:\n"
         "\\code\n"
-        "/*! Clasă invizibilă, tăiată din cauza depășirii spațiului */\n"
+        "/*! Clasă invizibilă, tăiată din cauza depăƟirii spaƣiului */\n"
         "class Invisible { };\n\n"
-        "/*! Altă clasă tăiată, relația de moștenire este ascunsă */\n"
+        "/*! Altă clasă tăiată, relaƣia de moƟtenire este ascunsă */\n"
         "class Truncated : public Invisible { };\n\n"
-        "/* Clasă necomentată în stil doxygen */\n"
+        "/* Clasă necomentată ßn stil doxygen */\n"
         "class Undocumented { };\n\n"
-        "/*! Clasă care este moștenită în mod public */\n"
+        "/*! Clasă care este moƟtenită ün mod public */\n"
         "class PublicBase : public Truncated { };\n\n"
-        "/*! Clasă template */\n"
+        "/*! Clasă template */\n"
         "template<class T> class Templ { };\n\n"
-        "/*! Clasă care este moștenită în mod protejat */\n"
+        "/*! Clasă care este moƟtenită ün mod protejat */\n"
         "class ProtectedBase { };\n\n"
-        "/*! Clasă care este moștenită în mod privat */\n"
+        "/*! Clasă care este moƟtenită ün mod privat */\n"
         "class PrivateBase { };\n\n"
-        "/*! Clasă care este folosită de clasa Inherited */\n"
+        "/*! Clasă care este folosită de clasa Inherited */\n"
         "class Used { };\n\n"
-        "/*! Superclasă care moștenește un număr de alte clase */\n"
+        "/*! Superclasă care moƟteneƟte un număr de alte clase */\n"
         "class Inherited : public PublicBase,\n"
         "                  protected ProtectedBase,\n"
         "                  private PrivateBase,\n"
@@ -1094,29 +1056,29 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
         "    Used *m_usedClass;\n"
         "};\n"
         "\\endcode\n"
-        "Dacă tagul \\c MAX_DOT_GRAPH_HEIGHT din fișierul de configurație "
+        "Dacă tagul \\c MAX_DOT_GRAPH_HEIGHT din fiƟierul de configurare "
         "este setat la 200, acesta este graful rezultat:"
         "<p><center><img src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n"
         "<p>\n"
-        "Căsuțele din partea de sus au următoarea semnificație:\n"
+        "Căsuƣele din partea de sus au următoarea semnificaƣie:\n"
         "<ul>\n"
-        "<li>O căsuță neagră reprezintă structura sau clasa pentru care "
+        "<li>O căsuƣă neagră reprezintă structura sau clasa pentru care "
         "graful este generat.\n"
-        "<li>O căsuță cu marginea neagră reprezintă o structură sau o clasă documentate.\n"
-        "<li>O căsuță cu marginea gri reprezintă o structură sau o clasă nedocumentate.\n"
-        "<li>O căsuță cu marginea roșie reprezintă o structură sau o clasă documentate, pentru\n"
-        "care nu toate relațiile de moștenire/incluziune sunt arătate. Un graf este "
-        "tăiat dacă nu încape în marginile specificate."
+        "<li>O căsuƣă cu marginea neagră reprezintă o structură sau o clasă documentate.\n"
+        "<li>O căsuƣă cu marginea gri reprezintă o structură sau o clasă nedocumentate.\n"
+        "<li>O căsuƣă cu marginea roƟie reprezintă o structură sau o clasă documentate, pentru\n"
+        "care nu toate relaƣiile de moƟtenire/incluziune sunt arătate. Un graf este "
+        "tăiat dacă nu ßncape ßn marginile specificate."
         "</ul>\n"
-        "Săgețile au următoarea semnificație:\n"
+        "Săgeƣile au următoarea semnificaƣie:\n"
         "<ul>\n"
-        "<li>O săgeată de un albastru închis este folosită când avem o relație de "
-        "moștenire publică între două clase.\n"
-        "<li>O săgeată de un verde închis este folosită când avem o moștenire protejată.\n"
-        "<li>O săgeată de un roșu închis este folosită când avem o moștenire privată.\n"
-        "<li>O săgeată violetă punctată este folosită pentru o clasă conținută sau folosită "
-        "de o altă clasă. Săgeata este marcată cu variabila(e) "
-        "prin care este accesibilă clasa sau structura spre care este îndreptată. \n"
+        "<li>O săgeată de un albastru ßnchis este folosită cùnd avem o relaƣie de "
+        "moƟtenire publică üntre două clase.\n"
+        "<li>O săgeată de un verde ünchis este folosită cñnd avem o moƟtenire protejată.\n"
+        "<li>O săgeată de un roƟu ünchis este folosită cñnd avem o moƟtenire privată.\n"
+        "<li>O săgeată violetă punctată este folosită pentru o clasă conƣinută sau folosită "
+        "de o altă clasă. Săgeata este marcată cu variabila(e) "
+        "prin care este accesibilă clasa sau structura spre care este ßndreptată. \n"
         "</ul>\n";
     }
     /*! text for the link to the legend page */
@@ -1137,7 +1099,7 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
     /*! Used as the header of the test list */
     virtual QCString trTestList()
     {
-      return "Listă de teste";
+      return "Listă de teste";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1157,23 +1119,18 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
     /*! Used as a section header for IDL properties */
     virtual QCString trProperties()
     {
-      return "Proprietăți";
+      return "Proprietăƣi";
     }
     /*! Used as a section header for IDL property documentation */
     virtual QCString trPropertyDocumentation()
     {
-      return "Documentația Proprietăților";
+      return "Documentaƣia Proprietăƣilor";
     }
 
 //////////////////////////////////////////////////////////////////////////
 // new since 1.2.4
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used for Java interfaces in the summary section of Java packages */
-    virtual QCString trInterfaces()
-    {
-      return "Interfețe";
-    }
     /*! Used for Java classes in the summary section of Java packages */
     virtual QCString trClasses()
     {
@@ -1199,18 +1156,13 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
     /*! The description of the package index page */
     virtual QCString trPackageListDescription()
     {
-      return "Lista pachetelor, însoțită de scurte explicații, acolo unde acestea există:";
+      return "Lista pachetelor, ßnsoƣită de scurte explicaƣii, acolo unde acestea există:";
     }
     /*! The link name in the Quick links header for each page */
     virtual QCString trPackages()
     {
       return "Pachete";
     }
-    /*! Used as a chapter title for Latex & RTF output */
-    virtual QCString trPackageDocumentation()
-    {
-      return "Documentația Pachetelor";
-    }
     /*! Text shown before a multi-line define */
     virtual QCString trDefineValue()
     {
@@ -1263,7 +1215,7 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
      */
     virtual QCString trRTFansicp()
     {
-      return "1250"; //EASTEUROPE_CHARSET [don't know if this is correct:Ro has a 0x418 index in that file]
+      return "1250"; //EASTEUROPE_CHARSET
     }
     
 
@@ -1272,7 +1224,7 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
      */
     virtual QCString trRTFCharSet()
     {
-      return "0x418"; // well, I could not find a decent doc about this one - I think Ro code is 0x418
+      return "238";
     }
 
     /*! Used as header RTF general index */
@@ -1298,7 +1250,7 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
      */
     virtual QCString trFile(bool first_capital, bool singular)
     { 
-      QCString result((first_capital ? "Fișier" : "fișier"));
+      QCString result((first_capital ? "FiƟier" : "fiƟier"));
 	result+= singular ? "ul":"ele";
       return result; 
     }
@@ -1351,17 +1303,6 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
      *  be followed by a single name or by a list of names 
      *  of the category.
      */
-    virtual QCString trField(bool first_capital, bool singular)
-    { 
-      QCString result((first_capital ? "Câmp" : "câmp"));
-	result+= singular ? "ul":"urile";
-      return result; 
-    }
-
-    /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
-     *  of the category.
-     */
     virtual QCString trGlobal(bool first_capital, bool singular)
     { 
       QCString result((first_capital ? "Global" : "global"));
@@ -1390,7 +1331,7 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
      */
     virtual QCString trReferences()
     {
-      return "Referințe";
+      return "ReferinĆŁe";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1402,7 +1343,7 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
      */
     virtual QCString trImplementedFromList(int numEntries)
     {
-      return "Implementează "+trWriteList(numEntries)+".";
+      return "Implementează "+trWriteList(numEntries)+".";
     }
 
     /*! used in member documentation blocks to produce a list of
@@ -1410,7 +1351,7 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
      */
     virtual QCString trImplementedInList(int numEntries)
     {
-      return "Implementat în "+trWriteList(numEntries)+".";
+      return "Implementat Ăźn "+trWriteList(numEntries)+".";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1422,7 +1363,7 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
      */
     virtual QCString trRTFTableOfContents()
     {
-      return "Conținut";
+      return "Cuprins";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1434,7 +1375,7 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
      */
     virtual QCString trDeprecatedList()
     {
-      return "Lista elementelor învechite (deprecated)";
+      return "Lista elementelor Ăźnvechite (deprecated)";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1451,7 +1392,7 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
     /*! Header used for the documentation section of a class' events. */
     virtual QCString trEventDocumentation()
     {
-      return "Documentația aferentă evenimentelor";
+      return "Documentaƣia aferentă evenimentelor";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1462,35 +1403,35 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
      */
     virtual QCString trPackageTypes()
     { 
-      return "Tipuri în pachet";
+      return "Tipuri Ăźn pachet";
     }
     /*! Used as a heading for a list of Java class functions with package 
      * scope. 
      */
     virtual QCString trPackageMembers()
     { 
-      return "Funcții în pachet";
+      return "FuncĆŁii Ăźn pachet";
     }
     /*! Used as a heading for a list of static Java class functions with 
      *  package scope.
      */
     virtual QCString trStaticPackageMembers()
     { 
-      return "Funcții statice în pachet";
+      return "FuncĆŁii statice Ăźn pachet";
     }
     /*! Used as a heading for a list of Java class variables with package 
      * scope.
      */
     virtual QCString trPackageAttribs()
     { 
-      return "Atribute în pachet";
+      return "Atribute Ăźn pachet";
     }
     /*! Used as a heading for a list of static Java class variables with 
      * package scope.
      */
     virtual QCString trStaticPackageAttribs()
     { 
-      return "Atribute statice în pachet";
+      return "Atribute statice Ăźn pachet";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1507,7 +1448,7 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
     /*! Put in front of the call graph for a function. */
     virtual QCString trCallGraph()
     {
-      return "Graful de apel al acestei funcții:";
+      return "Graful de apel al acestei funcĆŁii:";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1520,14 +1461,14 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
      */
     virtual QCString trSearchForIndex()
     {
-      return "Caută";
+      return "Caută";
     }
     /*! This string is used as the title for the page listing the search
      *  results.
      */
     virtual QCString trSearchResultsTitle()
     {
-      return "Rezultatele căutarii";
+      return "Rezultatele căutarii";
     }
     /*! This string is put just before listing the search results. The
      *  text can be different depending on the number of documents found.
@@ -1541,16 +1482,16 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
     {
       if (numDocuments==0)
       {
-        return "Din pacate nu am găsit nici un document care să corespundă cererii.";
+        return "Din păcate nu am găsit nici un document care să corespundă cererii.";
       }
       else if (numDocuments==1)
       {
-        return "Am găsit <b>1</b> document corespunzând cererii.";
+        return "Am găsit <b>1</b> document corespunzùnd cererii.";
       }
       else 
       {
-        return "Am găsit <b>$num</b> documente corespunzând cererii. "
-               "Lista documentelor găsite, sortate după relevanță.";
+        return "Am găsit <b>$num</b> documente corespunzùnd cererii. "
+               "Lista documentelor găsite, sortate după relevanƣă.";
       }
     }
     /*! This string is put before the list of matched words, for each search 
@@ -1558,7 +1499,7 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
      */
     virtual QCString trSearchMatches()
     {
-      return "Găsite:";
+      return "Găsite:";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1569,7 +1510,7 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
       */
      virtual QCString trSourceFile(QCString& filename)
      {
-       return " Fișierul sursă " + filename;
+       return " FiƟierul sursă " + filename;
      }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1586,7 +1527,7 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
       *  of the directories.
       */
      virtual QCString trDirDocumentation()
-     { return "Documentația directoarelor"; }
+     { return "DocumentaĆŁia directoarelor"; }
 
      /*! This is used as the title of the directory index and also in the
       *  Quick links of a HTML page, to link to the directory hierarchy.
@@ -1598,8 +1539,8 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
       *  and the fact that it is sorted alphabetically per level
       */
      virtual QCString trDirDescription()
-     { return "Această ierarhie de directoare este sortată, "
-              "per nivel, in ordine alfabetică:";
+     { return "Această ierarhie de directoare este sortată ßn general, "
+              "dar nu complet, ßn ordine alfabetică:";
      }
 
      /*! This returns the title of a directory page. The name of the
@@ -1607,7 +1548,7 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
       */
      virtual QCString trDirReference(const char *dirName)
      { 
-       QCString  result="Director-referință "; result+=dirName; 
+       QCString  result="Director-referinƣă "; result+=dirName; 
        return result; 
      }
 
@@ -1621,6 +1562,236 @@ class TranslatorRomanian : public TranslatorAdapter_1_4_1
        return result;
      }
 
+//////////////////////////////////////////////////////////////////////////
+// new since 1.4.1
+//////////////////////////////////////////////////////////////////////////
+
+    /*! This text is added to the documentation when the \\overload command
+     *  is used for a overloaded function.
+     */
+    virtual QCString trOverloadText()
+    {
+       return "Aceasta este o funcƣie membră suprascrisă. "
+              "Diferă de funcƣia de mai sus "
+              "doar prin argumentele acceptate.";
+    }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.4.6
+//////////////////////////////////////////////////////////////////////////
+
+    /*! This is used to introduce a caller (or called-by) graph */
+    virtual QCString trCallerGraph()
+    {
+      return "Graful de apeluri pentru această funcƣie:";
+    }
+
+    /*! This is used in the documentation of a file/namespace before the list 
+     *  of documentation blocks for enumeration values
+     */
+    virtual QCString trEnumerationValueDocumentation()
+    { return "DocumentaĆŁia Enumeratorilor"; }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.5.4 (mainly for Fortran)
+//////////////////////////////////////////////////////////////////////////
+    
+    /*! header that is put before the list of member subprograms (Fortran). */
+    virtual QCString trMemberFunctionDocumentationFortran()
+    { return "DocumentaĆŁia FuncĆŁiei Membre/Subrutinei"; }
+
+    /*! This is put above each page as a link to the list of annotated data types (Fortran). */    
+    virtual QCString trCompoundListFortran()
+    { return "Lista Tipurilor de Date"; }
+
+    /*! This is put above each page as a link to all members of compounds (Fortran). */
+    virtual QCString trCompoundMembersFortran()
+    { return "CĂąmpuri de date"; }
+
+    /*! This is an introduction to the annotated compound list (Fortran). */
+    virtual QCString trCompoundListDescriptionFortran()
+    { return "Tipurile de date, cu scurte descrieri:"; }
+
+    /*! This is an introduction to the page with all data types (Fortran). */
+    virtual QCString trCompoundMembersDescriptionFortran(bool extractAll)
+    {
+      QCString result="Lista tuturor tipurilor de date ";
+      if (!extractAll)
+      {
+        result+="documentate ";
+      }
+      result+=" cu legături către ";
+      if (!extractAll) 
+      {
+         result+="documentaĆŁia structurii de date pentru fiecare membru";
+      }
+      else 
+      {
+         result+="tipurile de date de care aparĆŁin:";
+      }
+      return result;
+    }
+
+    /*! This is used in LaTeX as the title of the chapter with the 
+     * annotated compound index (Fortran).
+     */
+    virtual QCString trCompoundIndexFortran()
+    { return "Indexul Tipurilor de Date"; }
+
+    /*! This is used in LaTeX as the title of the chapter containing
+     *  the documentation of all data types (Fortran).
+     */
+    virtual QCString trTypeDocumentation()
+    { return "DocumentaĆŁia Tipurilor de Date"; }
+
+    /*! This is used in the documentation of a file as a header before the 
+     *  list of (global) subprograms (Fortran).
+     */
+    virtual QCString trSubprograms()
+    { return "FuncĆŁii/Subrutine"; }
+
+    /*! This is used in the documentation of a file/namespace before the list 
+     *  of documentation blocks for subprograms (Fortran)
+     */
+    virtual QCString trSubprogramDocumentation()
+    { return "DocumentaĆŁia FuncĆŁiilor/Subrutinelor"; }
+
+    /*! This is used in the documentation of a file/namespace/group before 
+     *  the list of links to documented compounds (Fortran)
+     */
+     virtual QCString trDataTypes()
+    { return "Tipuri de Date"; }
+    
+    /*! used as the title of page containing all the index of all modules (Fortran). */
+    virtual QCString trModulesList()
+    { return "Lista Modulelor"; }
+
+    /*! used as an introduction to the modules list (Fortran) */
+    virtual QCString trModulesListDescription(bool extractAll)
+    {
+      QCString result="Lista tuturor modulelor ";
+      if (!extractAll) result+="documentate ";
+      result+="cu scurte descrieri:";
+      return result;
+    }
+
+    /*! used as the title of the HTML page of a module/type (Fortran) */
+    virtual QCString trCompoundReferenceFortran(const char *clName,
+                                    ClassDef::CompoundType compType,
+                                    bool isTemplate)
+    {
+      QCString result="Referinƣă la ";
+      switch(compType)
+      {
+        case ClassDef::Class:      result+="Modulul "; break;
+        case ClassDef::Struct:     result+="Tipul "; break;
+        case ClassDef::Union:      result+="Uniunea "; break;
+        case ClassDef::Interface:  result+="InterfaĆŁa "; break;
+        case ClassDef::Protocol:   result+="Protocolul "; break;
+        case ClassDef::Category:   result+="Categoria "; break;
+        case ClassDef::Exception:  result+="ExcepĆŁia "; break;
+      }
+      if (isTemplate) result+="(Template) ";
+	  result+=(QCString)clName;
+      return result;
+    }
+    /*! used as the title of the HTML page of a module (Fortran) */
+    virtual QCString trModuleReference(const char *namespaceName)
+    {
+      QCString result="Referinƣă la Modulul ";
+	  result += namespaceName;
+      return result;
+    }
+    
+    /*! This is put above each page as a link to all members of modules. (Fortran) */
+    virtual QCString trModulesMembers()
+    { return "Membrii Modulului"; }
+
+    /*! This is an introduction to the page with all modules members (Fortran) */
+    virtual QCString trModulesMemberDescription(bool extractAll)
+    { 
+      QCString result="Lista tuturor membrilor ";
+      if (!extractAll) result+="documentaĆŁi ai ";
+      result+="modulului cu legături către ";
+      if (extractAll) 
+      {
+        result+="documentaĆŁia modulului pentru fiecare membru:";
+      }
+      else 
+      {
+        result+="modulele de care aparĆŁin:";
+      }
+      return result;
+    }
+
+    /*! This is used in LaTeX as the title of the chapter with the 
+     *  index of all modules (Fortran).
+     */
+    virtual QCString trModulesIndex()
+    { return "Indexul Modulelor"; }
+    
+    /*! This is used for translation of the word that will possibly
+     *  be followed by a single name or by a list of names 
+     *  of the category.
+     */
+    virtual QCString trModule(bool first_capital, bool singular)
+    {       
+      QCString result((first_capital ? "Modul" : "modul"));
+      if (singular)  result+="ul";
+	  else result += "ele";
+      return result; 
+    }
+    /*! This is put at the bottom of a module documentation page and is
+     *  followed by a list of files that were used to generate the page.
+     */
+    virtual QCString trGeneratedFromFilesFortran(ClassDef::CompoundType compType,
+        bool single)
+    { // here s is one of " Module", " Struct" or " Union"
+      // single is true implies a single file
+      QCString result=(QCString)"DocumentaĆŁia ";
+      switch(compType)
+      {
+        case ClassDef::Class:      result+="modulului"; break;
+        case ClassDef::Struct:     result+="tipului"; break;
+        case ClassDef::Union:      result+="uniunii"; break;
+        case ClassDef::Interface:  result+="interfeĆŁei"; break;
+        case ClassDef::Protocol:   result+="protocolului"; break;
+        case ClassDef::Category:   result+="categoriei"; break;
+        case ClassDef::Exception:  result+="excepĆŁiei"; break;
+      }
+      result+=" a fost generată din următo";
+      if (single) result+="rul fiƟier:"; else result+="arele fiƟiere:";
+      return result;
+    }
+    /*! This is used for translation of the word that will possibly
+     *  be followed by a single name or by a list of names 
+     *  of the category.
+     */
+    virtual QCString trType(bool first_capital, bool singular)
+    { 
+      QCString result((first_capital ? "Tip" : "tip"));
+      if (singular)  result+="ul";
+	  else result += "urile";
+      return result; 
+    }
+    /*! This is used for translation of the word that will possibly
+     *  be followed by a single name or by a list of names 
+     *  of the category.
+     */
+    virtual QCString trSubprogram(bool first_capital, bool singular)
+    { 
+      QCString result((first_capital ? "Subprogram" : "subprogram"));
+      if (singular)  result+="ul";
+	  else result += "urile";
+      return result; 
+    }
+
+    /*! C# Type Constraint list */
+    virtual QCString trTypeConstraints()
+    {
+      return "ConstrĂąngerile de Tip";
+    }
+	 
 };
 
 #endif
diff --git a/src/util.cpp b/src/util.cpp
index b1ff12c..bde39bd 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -1663,7 +1663,10 @@ nextChar:
         }
       }
       ADD_CHAR(c);
-      if (cliSupport && (c=='^' || c=='%') && i>1 && isId(s.at(i-1))) 
+      if (cliSupport &&
+          (c=='^' || c=='%') && i>1 && isId(s.at(i-1)) &&
+          !findOperator(s,i)
+         ) 
       {
         ADD_CHAR(' '); // C++/CLI: Type^ name and Type% name
       }
diff --git a/src/vhdlcode.l b/src/vhdlcode.l
index b696b2a..28e2d85 100644
--- a/src/vhdlcode.l
+++ b/src/vhdlcode.l
@@ -660,9 +660,14 @@ static void writeFuncProto()
 {
   QList<Argument> ql;
   QCString name,ret;
-  VhdlDocGen::parseFuncProto(g_FuncProto.data(),ql,name,ret,FALSE);
+  VhdlDocGen::parseFuncProto(g_FuncProto,ql,name,ret,FALSE);
 
-  QStringList qlist=QStringList::split(name.data(),g_FuncProto,FALSE);
+  if (name.isEmpty())
+  {
+    codifyLines(g_FuncProto.data(),g_CurrClass.data());
+    return;
+  }
+  QStringList qlist=QStringList::split(name,g_FuncProto,FALSE);
   QCString temp=(QCString)qlist[0];
   codifyLines(temp.data(),g_CurrClass.data());
   g_FuncProto.stripPrefix(temp.data());
diff --git a/src/vhdldocgen.cpp b/src/vhdldocgen.cpp
index 04fa62a..eb535ce 100644
--- a/src/vhdldocgen.cpp
+++ b/src/vhdldocgen.cpp
@@ -1049,10 +1049,10 @@ void VhdlDocGen::parseFuncProto(const char* text,QList<Argument>& qlist,
     QCString s1(text);
     s1=s1.stripWhiteSpace();
     int i=s1.find("(",0,FALSE);
-    int s=s1.find(" ",0,FALSE);
-    if (i==-1)
+    int s=s1.find(QRegExp("[ \\t]"));
+    if (i==-1 || i<s)
       s1=VhdlDocGen::getIndexWord(s1.data(),1);
-    else
+    else // s<i, s=start of name, i=end of name
       s1=s1.mid(s,(i-s));
 
     name=s1.stripWhiteSpace();
diff --git a/src/vhdlscanner.l b/src/vhdlscanner.l
index 87ece96..eb435b5 100644
--- a/src/vhdlscanner.l
+++ b/src/vhdlscanner.l
@@ -356,7 +356,7 @@ static void parseProcessProto()
   getBufText(qcs,0);
   if (qcs.contains('(') != qcs.contains(')')) return; 
   VhdlDocGen::deleteAllChars(qcs,'\n');
-  VhdlDocGen::parseProcessProto(qcs.data(),name,ql);
+  VhdlDocGen::parseProcessProto(qcs,name,ql);
   current->section=Entry::FUNCTION_SEC;
   //current->stat=TRUE;
   current->spec=VhdlDocGen::PROCESS;
@@ -409,7 +409,6 @@ static void parseFunctionProto()
     return; // function without a prototype 
   if (qcs.contains("function",FALSE)==0 && qcs.contains("procedure",FALSE)==0) 
     return; 
-  //Entry* ppEntry=new Entry;
   while (qcs.stripPrefix(" "));
   if (qcs.stripPrefix("impure"))
     current->exception="impure";
@@ -417,6 +416,7 @@ static void parseFunctionProto()
     current->exception="pure";
 
   VhdlDocGen::parseFuncProto(qcs.data(),ql,name,ret); 
+  //printf("parseFuncProto(%s)=%s,%s\n",qcs.data(),name.data(),ret.data());
   current->name=name;
   current->startLine=iFuncLine;
   current->bodyLine=iFuncLine;
@@ -442,7 +442,7 @@ static void parseFunctionProto()
   }
   current->args+" )";
 
-  if (ret.data()) 
+  if (!ret.isEmpty()) 
     current->spec=VhdlDocGen::FUNCTION;
   else
     current->spec=VhdlDocGen::PROCEDURE;
@@ -1051,6 +1051,7 @@ ALLID                   [^;()\t ]
     bb=FALSE;
   }
   bool ss = VhdlDocGen::isFunctionProto(ttt);
+  //printf("VhdlDocGen::isFunctionProto(%s)=%d\n",ttt.data(),ss);
   if (ss && bb)
   {
     bufferClear();