Release-1.2.2

19 files changed, 1451 insertions, 224 deletions

diff --git a/INSTALL b/INSTALL
index b2b9f40..6eee5a4 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,6 +1,6 @@
-DOXYGEN Version 1.2.1-20000917
+DOXYGEN Version 1.2.2
 
 Please read the installation section of the manual for instructions.
 
 --------
-Dimitri van Heesch (17 September 2000)
+Dimitri van Heesch (24 September 2000)
diff --git a/README b/README
index 2dd17a8..6c6b1a3 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-DOXYGEN Version 1.2.1-20000917
+DOXYGEN Version 1.2.2
 
 Please read INSTALL for compilation instructions.
 
@@ -7,4 +7,4 @@ The latest version of doxygen can be obtained at
 
 Enjoy,
 
-Dimitri van Heesch (17 September 2000)
+Dimitri van Heesch (24 September 2000)
diff --git a/VERSION b/VERSION
index 4322162..23aa839 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2.1-20000917
+1.2.2
diff --git a/addon/configgen/configgen.cpp b/addon/configgen/configgen.cpp
index 203a041..0a6f2ad 100644
--- a/addon/configgen/configgen.cpp
+++ b/addon/configgen/configgen.cpp
@@ -775,7 +775,8 @@ void init()
                     "information to generate all constant output in the proper language. \n"
                     "The default language is English, other supported languages are: \n"
                     "Dutch, French, Italian, Czech, Swedish, German, Finnish, Japanese, \n"
-                    "Korean, Hungarian, Spanish, Russian, Croatian, Polish, and Portuguese.\n"
+                    "Korean, Hungarian, Spanish, Romanian, Russian, Croatian, Polish, and \n"
+                    "Portuguese.\n"
                    );
   ConfigString::addFixedValue("outputLanguage","English");
   ConfigString::addFixedValue("outputLanguage","Dutch");
@@ -789,6 +790,7 @@ void init()
   ConfigString::addFixedValue("outputLanguage","Japanese");
   ConfigString::addFixedValue("outputLanguage","Korean");
   ConfigString::addFixedValue("outputLanguage","Spanish");
+  ConfigString::addFixedValue("outputLanguage","Romanian");
   ConfigString::addFixedValue("outputLanguage","Russian");
   ConfigString::addFixedValue("outputLanguage","Croatian");
   ConfigString::addFixedValue("outputLanguage","Polish");
@@ -1035,7 +1037,6 @@ void init()
                     "put the command \\sideeffect (or @sideeffect) in the documentation, which \n"
                     "will result in a user defined paragraph with heading \"Side Effects:\". \n"
                     "You can put \\n's in the value part of an alias to insert newlines. \n" 
-                    "Predefined commands cannot be overwritten using aliases. \n" 
                  );
   //-----------------------------------------------------------------------------------------------
   ConfigInfo::add(  "Messages","configuration options related to warning and progress messages");
diff --git a/doc/config.doc b/doc/config.doc
index a73463b..87488a5 100644
--- a/doc/config.doc
+++ b/doc/config.doc
@@ -448,7 +448,6 @@ followed by the descriptions of the tags grouped by category.
  put the command \\sideeffect (or \@sideeffect) in the documentation, which 
  will result in a user defined paragraph with heading "Side Effects:".
  You can put \\n's in the value part of an alias to insert newlines.
- Predefined commands cannot be overwritten using aliases.
 
 </dl>
 
diff --git a/packages/rpm/doxygen.spec b/packages/rpm/doxygen.spec
index 2d08df3..4675094 100644
--- a/packages/rpm/doxygen.spec
+++ b/packages/rpm/doxygen.spec
@@ -1,5 +1,5 @@
 Name: doxygen
-Version: 1.2.1-20000917
+Version: 1.2.2
 Summary: documentation system for C, C++ and IDL
 Release: 1
 Source0: doxygen-%{version}.src.tar.gz
diff --git a/src/classdef.cpp b/src/classdef.cpp
index a54724c..4d56c74 100644
--- a/src/classdef.cpp
+++ b/src/classdef.cpp
@@ -616,6 +616,8 @@ void ClassDef::writeDocumentation(OutputList &ol)
 
   ol.startTextBlock();
   
+  //printf("Class %s brief=`%s' doc=`%s'\n",name().data(),briefDescription().data(),documentation().data());
+  
   // write brief description
   OutputList briefOutput(&ol); 
   if (!briefDescription().isEmpty())
@@ -1421,7 +1423,7 @@ bool ClassDef::isBaseClass(ClassDef *bcd)
  * superclasses!
  */
 
-void ClassDef::mergeMembers(/*ClassDef *cd,BaseClassList *bcl*/)
+void ClassDef::mergeMembers()
 {
   BaseClassListIterator bcli(*baseClasses());
   BaseClassDef *bcd;
@@ -1648,9 +1650,15 @@ void ClassDef::determineImplUsageRelation()
             QCString templSpec;
             if (te>ts) templSpec = type.mid(ts,te-ts);
             // TODO: also check using Nx::Cx cases here!
-            ClassDef *cd=getResolvedClass(name()+"::"+type.mid(i,l));
-            if (cd==0) cd=getResolvedClass(type.mid(i,l)); // TODO: also try inbetween scopes!
-            //printf("Search for class %s result=%p\n",type.mid(i,l).data(),cd);
+            QCString usedClassName = type.mid(i,l);
+            ClassDef *cd=0;
+            if (getNamespaceDef()!=0)
+            {
+              cd=getResolvedClass(getNamespaceDef()->name()+"::"+usedClassName);
+            }
+            if (cd==0) cd=getResolvedClass(name()+"::"+usedClassName);
+            if (cd==0) cd=getResolvedClass(usedClassName); // TODO: also try inbetween scopes!
+            //printf("Search for class %s result=%p\n",usedClassName.data(),cd);
             if (cd) // class exists 
             {
               found=TRUE;
diff --git a/src/config.h b/src/config.h
index bb5449e..cec30e6 100644
--- a/src/config.h
+++ b/src/config.h
@@ -1,4 +1,4 @@
-/* This file was generated by configgen on Sat Sep 2 10:51:52 2000
+/* This file was generated by configgen on Sun Sep 24 18:38:07 2000
  * from config_templ.h
  *
  * DO NOT EDIT!
diff --git a/src/config.l b/src/config.l
index 5a6f318..0a3302b 100644
--- a/src/config.l
+++ b/src/config.l
@@ -1,4 +1,4 @@
-/* This file was generated by configgen on Sat Sep 2 10:51:52 2000
+/* This file was generated by configgen on Sun Sep 24 18:38:07 2000
  * from config_templ.l
  *
  * DO NOT EDIT!
@@ -1015,7 +1015,8 @@ void writeTemplateConfig(QFile *f,bool sl)
     t << "# information to generate all constant output in the proper language. \n";
     t << "# The default language is English, other supported languages are: \n";
     t << "# Dutch, French, Italian, Czech, Swedish, German, Finnish, Japanese, \n";
-    t << "# Korean, Hungarian, Spanish, Russian, Croatian, Polish, and Portuguese.\n";
+    t << "# Korean, Hungarian, Spanish, Romanian, Russian, Croatian, Polish, and \n";
+    t << "# Portuguese.\n";
     t << "\n";
   }
   t << "OUTPUT_LANGUAGE        = ";
@@ -1193,11 +1194,11 @@ void writeTemplateConfig(QFile *f,bool sl)
   if (!sl)
   {
     t << "\n";
-    t << "# If the CASE_SENSE_NAMES tag is set to NO (the default) then Doxygen \n";
-    t << "# will only generate file names in lower case letters. If set to \n";
-    t << "# YES upper case letters are also allowed. This is useful if you have \n";
-    t << "# classes or files whose names only differ in case and if your file system \n";
-    t << "# supports case sensitive file names. \n";
+    t << "# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate \n";
+    t << "# file names in lower case letters. If set to YES upper case letters are also \n";
+    t << "# allowed. This is useful if you have classes or files whose names only differ \n";
+    t << "# in case and if your file system supports case sensitive file names. Windows \n";
+    t << "# users are adviced to set this option to NO.\n";
     t << "\n";
   }
   t << "CASE_SENSE_NAMES       = ";
@@ -1344,7 +1345,6 @@ void writeTemplateConfig(QFile *f,bool sl)
     t << "# put the command \\sideeffect (or @sideeffect) in the documentation, which \n";
     t << "# will result in a user defined paragraph with heading \"Side Effects:\". \n";
     t << "# You can put \\n's in the value part of an alias to insert newlines. \n";
-    t << "# Predefined commands cannot be overwritten using aliases. \n";
     t << "\n";
   }
   t << "ALIASES                = ";
diff --git a/src/doc.l b/src/doc.l
index 263fd70..7e262e7 100644
--- a/src/doc.l
+++ b/src/doc.l
@@ -2069,24 +2069,6 @@ DOCPARAM  ([a-z_A-Z0-9:\<\>\=\.\-]+)|("\"".*"\"")
   					    outDoc->writeChar(' '); 
 					  }
   					}
-<DocScan>"\\"[a-z_A-Z][a-z_A-Z0-9]*[\\] { // directory type of text
-  					  outDoc->docify(yytext);
-  					}
-<DocScan>{CMD}[a-z_A-Z][a-z_A-Z0-9]* 	{
-  					  QCString *pValue=aliasDict[yytext+1];
-					  if (pValue)
-					  {
-					    int i,l=pValue->length();
-					    for (i=l-1;i>=0;i--)
-					    {
-					      unput(pValue->at(i));
-					    }
-					  }
-					  else
-					  {
-  					    warn(yyFileName,yyLineNr,"Warning in the documentation of this entity:\nUnknown command `%s' found.",yytext);
-					  }
-  					}
 <DocCode,DocEmphasis,DocBold,DocScan,Text>[a-z_A-Z0-9]+ { 
 					  outDoc->docify(yytext);
 					}
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index af7ed6e..b77c746 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -3201,7 +3201,7 @@ static void findMember(Entry *root,QCString funcDecl,QCString related,bool overl
           NamespaceDef *nd=0;
           if (!namespaceName.isEmpty()) nd=getResolvedNamespace(namespaceName);
           tcd = findClassDefinition(fd,nd,scopeName,classTempList);
-          
+
           if (cd && tcd==cd) // member's classes match
           {
             Debug::print(Debug::FindMembers,0,
@@ -5737,7 +5737,29 @@ int main(int argc,char **argv)
       {
         QCString name=alias.left(i).stripWhiteSpace();
         QCString value=alias.right(alias.length()-i-1);
-        value=substitute(value,"\\n","\n");
+        QCString newValue;
+        int in,p=0;
+        // for each \n in the alias command value
+        while ((in=value.find("\\n",p))!=-1)
+        {
+          newValue+=value.mid(p,in-p);
+          // expand \n's except if \n is part of a built-in command.
+          if (value.mid(in,5)!="\\note" && 
+              value.mid(in,5)!="\\name" && 
+              value.mid(in,10)!="\\namespace" && 
+              value.mid(in,14)!="\\nosubgrouping"
+             ) 
+          {
+            newValue+="\n";
+          }
+          else 
+          {
+            newValue+="\\n";
+          }
+          p=in+2;
+        }
+        newValue+=value.mid(p,value.length()-p);
+        value=newValue;
         //printf("Alias: found name=`%s' value=`%s'\n",name.data(),value.data()); 
         if (!name.isEmpty())
         {
diff --git a/src/doxygen.pro.in b/src/doxygen.pro.in
index 91549dd..9280e22 100644
--- a/src/doxygen.pro.in
+++ b/src/doxygen.pro.in
@@ -26,7 +26,8 @@ HEADERS      =	doxygen.h scanner.h doc.h classdef.h classlist.h memberdef.h \
 		translator_nl.h translator_se.h translator_cz.h translator_fr.h \
 		translator_it.h formula.h debug.h membergroup.h htmlhelp.h \
                 translator_ru.h translator_pl.h dot.h rtfgen.h xml.h xml_dtd.h \
-                reflist.h page.h sortdict.h translator_hu.h translator_kr.h
+                reflist.h page.h sortdict.h translator_hu.h translator_kr.h \
+                translator_ro.h
 SOURCES      =	doxygen.cpp scanner.cpp doc.cpp classdef.cpp classlist.cpp \
                 memberdef.cpp membername.cpp index.cpp memberlist.cpp \
 		entry.cpp logos.cpp instdox.cpp message.cpp code.cpp \
diff --git a/src/index.cpp b/src/index.cpp
index b81f69a..9bd0e37 100644
--- a/src/index.cpp
+++ b/src/index.cpp
@@ -1673,9 +1673,10 @@ void writeIndex(OutputList &ol)
   {
     projPrefix=Config::projectName+" ";
   }
+
+  //--------------------------------------------------------------------
   // write HTML index
-  //ol.disable(OutputGenerator::Man);
-  //ol.disable(OutputGenerator::Latex);
+  //--------------------------------------------------------------------
   ol.disableAllBut(OutputGenerator::Html);
 
   QCString defFileName = 
@@ -1690,7 +1691,7 @@ void writeIndex(OutputList &ol)
   }
   else 
   {
-    title = mainPage->title;
+    title = substitute(mainPage->title,"%","");
   }
   ol.startFile("index",title,FALSE);
 
@@ -1727,7 +1728,9 @@ void writeIndex(OutputList &ol)
   endFile(ol);
   ol.disable(OutputGenerator::Html);
   
+  //--------------------------------------------------------------------
   // write LaTeX/RTF index
+  //--------------------------------------------------------------------
   ol.enable(OutputGenerator::Latex);
   ol.enable(OutputGenerator::RTF);
 
@@ -1844,14 +1847,14 @@ void writeIndex(OutputList &ol)
   {
     ol.disable(OutputGenerator::Man);
     startFile(ol,mainPage->name,mainPage->title);
-    SectionInfo *si=0;
-    if (!mainPage->title.isEmpty() && !mainPage->name.isEmpty() &&
-        (si=sectionDict[mainPage->name])!=0)
-    {
-      ol.startSection(si->label,si->title,FALSE);
-      ol.docify(si->title);
-      ol.endSection(si->label,FALSE);
-    }
+    //SectionInfo *si=0;
+    //if (!mainPage->title.isEmpty() && !mainPage->name.isEmpty() &&
+    //    (si=sectionDict[mainPage->name])!=0)
+    //{
+    //  ol.startSection(si->label,si->title,FALSE);
+    //  ol.docify(si->title);
+    //  ol.endSection(si->label,FALSE);
+    //}
     ol.startTextBlock();
     parseDoc(ol,defFileName,defLine,0,0,mainPage->doc);
     ol.endTextBlock();
diff --git a/src/language.cpp b/src/language.cpp
index 5d2c92d..1c2f997 100644
--- a/src/language.cpp
+++ b/src/language.cpp
@@ -33,6 +33,7 @@
 #include "translator_pt.h"
 #include "translator_hu.h"
 #include "translator_kr.h"
+#include "translator_ro.h"
 #endif
 
 #define L_EQUAL(a) !stricmp(langName,a)
@@ -110,6 +111,10 @@ bool setTranslator(const char *langName)
   {
     theTranslator=new TranslatorKorean;
   }
+  else if (L_EQUAL("romanian"))
+  {
+    theTranslator=new TranslatorRomanian;
+  }
 #endif
   else // use the default language (i.e. english)
   {
diff --git a/src/scanner.l b/src/scanner.l
index ae07bce..4a74166 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -139,6 +139,7 @@ static char             lastCopyArgChar;
 static QCString         *pCopyRoundString;
 static QCString         *pCopyCurlyString;
 static QCString         *pCopyQuotedString;
+static QCString         *pSkipDoc;
 
 static bool             insideFormula;
 
@@ -2837,30 +2838,58 @@ TITLE     [tT][iI][tT][lL][eE]
   					  sectionType=SectionInfo::Anchor;
 					  BEGIN(AnchorLabel);
   					}
-<Doc,PageDoc,JavaDoc,ClassDoc>("\\\\"|"@@")"verbatim"/[^a-z_A-Z0-9] {
+<Doc,PageDoc,ClassDoc>("\\\\"|"@@")"verbatim"/[^a-z_A-Z0-9] {
 					  current->doc+="\\\\verbatim";
 					}
-<Doc,PageDoc,JavaDoc,ClassDoc>{CMD}"verbatim"/[^a-z_A-Z0-9] {
+<Doc,PageDoc,ClassDoc>{CMD}"verbatim"/[^a-z_A-Z0-9] {
 					  lastVerbState=YY_START;
 					  current->doc+="\\verbatim";
   					  BEGIN(SkipVerbatim);
   					}
-<Doc,PageDoc,JavaDoc,ClassDoc>{CMD}"addindex"{B}+[^\n]+ {
+<Doc,PageDoc,ClassDoc>{CMD}"addindex"{B}+[^\n]+ {
   					  current->doc+=yytext;
   					}
-<Doc,PageDoc,JavaDoc,ClassDoc>("\\\\"|"@@")"code"/[^a-z_A-Z0-9] {
+<Doc,PageDoc,ClassDoc>("\\\\"|"@@")"code"/[^a-z_A-Z0-9] {
   					  current->doc+="\\\\code";
   					}
-<Doc,PageDoc,JavaDoc,ClassDoc>{CMD}"code"/[^a-z_A-Z0-9] {
+<Doc,PageDoc,ClassDoc>{CMD}"code"/[^a-z_A-Z0-9] {
   					  lastCodeState=YY_START;
 					  current->doc+="\\code";
+					  pSkipDoc=&current->doc;
 					  BEGIN(SkipCode);
 					}
-<Doc,PageDoc,JavaDoc,ClassDoc>"<"{PRE}{ATTR}">" {
+<Doc,PageDoc,ClassDoc>"<"{PRE}{ATTR}">" {
   					  lastCodeState=YY_START;
 					  current->doc+="<PRE>";
+					  pSkipDoc=&current->doc;
 					  BEGIN(SkipCode);
   					}
+<JavaDoc>"<"{PRE}{ATTR}">" 		{
+  					  lastCodeState=YY_START;
+					  current->brief+="<PRE>";
+					  pSkipDoc=&current->brief;
+					  BEGIN(SkipCode);
+  					}
+<JavaDoc>("\\\\"|"@@")"verbatim"/[^a-z_A-Z0-9] {
+					  current->brief+="\\\\verbatim";
+					}
+<JavaDoc>{CMD}"verbatim"/[^a-z_A-Z0-9] 	{
+					  lastVerbState=YY_START;
+					  current->brief+="\\verbatim";
+  					  BEGIN(SkipVerbatim);
+  					}
+<JavaDoc>{CMD}"addindex"{B}+[^\n]+ 	{
+  					  current->brief+=yytext;
+  					}
+<JavaDoc>("\\\\"|"@@")"code"/[^a-z_A-Z0-9] {
+  					  current->brief+="\\\\code";
+  					}
+<JavaDoc>{CMD}"code"/[^a-z_A-Z0-9] 	{
+  					  lastCodeState=YY_START;
+					  current->brief+="\\code";
+					  pSkipDoc=&current->brief;
+					  BEGIN(SkipCode);
+					}
 <SkipVerbatim>{CMD}"endverbatim"/[^a-z_A-Z0-9] {
   					  current->doc+=yytext;
   					  BEGIN(lastVerbState);
@@ -2890,30 +2919,30 @@ TITLE     [tT][iI][tT][lL][eE]
   					  current->doc+=*yytext;
   					}
 <SkipCode>{CMD}"endcode"		{
-  					  current->doc+="\\endcode";
+  					  *pSkipDoc+="\\endcode";
 					  BEGIN(lastCodeState);
   					}
 <SkipCode>"</"{PRE}{ATTR}">"		{
-  					  current->doc+="</PRE>";
+  					  *pSkipDoc+="</PRE>";
 					  BEGIN(lastCodeState);
   					}
 <SkipCode>^"//"({B}*"*"+)?		{
   					  if (!removeSlashes)
-					    current->doc+=yytext;
+					    *pSkipDoc+=yytext;
   					}
 <SkipCode>^{B}*"*"+		
 <SkipCode>"//"				{
-  					  current->doc+=yytext;
+  					  *pSkipDoc+=yytext;
   					}
 <SkipCode>[^ \<\*\t\/\\\n]+		{
-  					  current->doc+=yytext;
+  					  *pSkipDoc+=yytext;
   					}
 <SkipCode>\n				{
   					  yyLineNr++;
-					  current->doc+=*yytext;
+					  *pSkipDoc+=*yytext;
   					}
 <SkipCode>.				{
-  					  current->doc+=*yytext;
+  					  *pSkipDoc+=*yytext;
   					}
 <AnchorLabel>{ID}			{
   					  sectionLabel=yytext;
@@ -3004,7 +3033,7 @@ TITLE     [tT][iI][tT][lL][eE]
 					  {
 					    err("Error: comment block ended inside \\code ... \\endcode block at line %d in %s!\n",
 						yyLineNr,yyFileName);
-					    current->doc += "\\endcode\n\n";
+					    *pSkipDoc += "\\endcode\n\n";
 					    BEGIN( lastDocContext );
 					  }
 					  else if (YY_START==ClassDocBrief &&
@@ -3340,6 +3369,43 @@ TITLE     [tT][iI][tT][lL][eE]
 <Doc,JavaDoc,ClassDoc,PageDoc,ExampleDoc,ReadFormulaShort,ReadFormulaLong,ClassDocBrief,AfterDoc,AfterDocBrief>^{B}*(("//"{B}*)?)"*"+{B}+ { 
   					  current->doc+=' '; 
 					}
+
+<Doc,ClassDoc,PageDoc,ExampleDoc,AfterDoc>"\\"[a-z_A-Z][a-z_A-Z0-9]*[\\] { // directory type of text
+  					  current->doc+=yytext;
+  					}
+<Doc,ClassDoc,PageDoc,ExampleDoc,AfterDoc>{CMD}[a-z_A-Z][a-z_A-Z0-9]* 	{
+  					  QCString *pValue=aliasDict[yytext+1];
+					  if (pValue)
+					  {
+					    int i,l=pValue->length();
+					    for (i=l-1;i>=0;i--)
+					    {
+					      unput(pValue->at(i));
+					    }
+					  }
+					  else
+					  {
+  					    current->doc+=yytext;
+					  }
+  					}
+<JavaDoc,LineDoc,ClassDocBrief,AfterDocBrief,AfterDocLine>"\\"[a-z_A-Z][a-z_A-Z0-9]*[\\] { // directory type of text
+  					  current->brief+=yytext;
+  					}
+<JavaDoc,LineDoc,ClassDocBrief,AfterDocBrief,AfterDocLine>{CMD}[a-z_A-Z][a-z_A-Z0-9]* 	{
+  					  QCString *pValue=aliasDict[yytext+1];
+					  if (pValue)
+					  {
+					    int i,l=pValue->length();
+					    for (i=l-1;i>=0;i--)
+					    {
+					      unput(pValue->at(i));
+					    }
+					  }
+					  else
+					  {
+  					    current->brief+=yytext;
+					  }
+  					}
 <DefLineDoc,LineDoc,ClassDoc,Doc>"/*"   { current->doc += yytext; }
 <SkipCxxComment>.*/\n			{ 
 					  BEGIN( lastCContext ) ;
diff --git a/src/translator_hr.h b/src/translator_hr.h
index 338ad17..b857fb2 100644
--- a/src/translator_hr.h
+++ b/src/translator_hr.h
@@ -23,6 +23,11 @@
 //    As opposed to Czech translation this one assumes that Doxygen strings are written in Linux ( it's true,
 //    I don't have QT pro licence ) , and uses ISOToWin function when built in WIN32
 //
+// 2000/09/18
+// - Added strings from 1.2.1
+// - Removed unneeeded decode() calls
+// - Changed some CS terminology
+// 
 #ifndef TRANSLATOR_HR_H
 #define TRANSLATOR_HR_H
 
@@ -32,9 +37,6 @@ class TranslatorCroatian : public Translator
 {
   private:
         /*! to avoid macro redefinition from translator_cz.h */
-        /*  Speed loss is actualy less than in Czech version due to
-                fewer QCString copying. 
-         */
         inline QCString decode(const QCString& sInput)
         { 
 #ifdef _WIN32
@@ -56,30 +58,30 @@ class TranslatorCroatian : public Translator
     QCString latexBabelPackage()
     { return "croatian"; }
     QCString trRelatedFunctions()
-    { return decode("Povezane funkcije"); }
+    { return "Povezane funkcije"; }
     QCString trRelatedSubscript()
-    { return decode("(To nisu member funkcije.)"); }
+    { return "(To nisu member funkcije.)"; }
     QCString trDetailedDescription()
     { return decode("Detaljno obja¹njenje"); }
     QCString trMemberTypedefDocumentation()
     { return decode("Dokumentacija typedef èlanova"); }
     QCString trMemberEnumerationDocumentation()
-    { return decode("Dokumentacija enum èlanova"); }
+    { return decode("Dokumentacija enumeracijskih èlanova"); }
     QCString trEnumerationValueDocumentation()
-    { return decode("Dokumentacija enum vrijednosti"); }
+    { return "Dokumentacija enumeracijskih vrijednosti"; }
     QCString trMemberFunctionDocumentation()
-        { return decode("Dokumentacija funkcija"); }
+        { return "Dokumentacija funkcija"; }
     QCString trMemberDataDocumentation()
-    { return decode("Documentacija varijabli"); }
+    { return "Documentacija varijabli"; }
     QCString trGeneratedFrom(const char *s,bool single)
     { 
-      QCString result= decode("Dokumentacija za ")+s+
-                       decode("je generirana iz ");
+      QCString result= (QCString)"Dokumentacija za "+s+
+                       "je generirana iz ";
       if (single)
-                  result+= decode("datoteke :");
+                  result+= "datoteke :";
           else
-                  result+= decode("slijedeæih datoteka:");
-      return result;
+                  result+= "slijedeæih datoteka:";
+      return decode(result);
     }
     QCString trMore()
     { return decode("Op¹irnije..."); }
@@ -93,9 +95,9 @@ class TranslatorCroatian : public Translator
     { return decode(", ukljuèujuæi naslijeðene èlanove."); }
     QCString trGeneratedAutomatically(const char *s)
     { QCString result=decode("generirano automatski Doxygen-om"); 
-      if (s) result+=(QCString)decode(" za ")+s;
-      result+=decode(" iz programskog koda."); 
-      return result;
+      if (s) result+=(QCString)" za "+s;
+      result+=" iz programskog koda."; 
+      return decode(result);
     }
     QCString trEnumName()
     { return decode("enum ime"); }
@@ -104,17 +106,17 @@ class TranslatorCroatian : public Translator
     QCString trDefinedIn()
     { return decode("definirano u"); }
     QCString trVerbatimText(const char *f)
-    { return (QCString)decode("Ovo je citirani tekst iz include datoteke ")+f+"."; }
+    { return (QCString)"Ovo je citirani tekst iz include datoteke "+f+"."; }
     QCString trModules()
-    { return decode("Moduli"); }
+    { return "Moduli"; }
     QCString trClassHierarchy()
-    { return decode("Stablo klasa"); }
+    { return "Stablo klasa"; }
     QCString trCompoundList()
-    { return decode("Sve klase"); }
+    { return "Sve klase"; }
     QCString trFileList()
-    { return decode("Popis datoteka"); }
+    { return "Popis datoteka"; }
     QCString trHeaderFiles()
-    { return decode("Header datoteke"); }
+    { return "Header datoteke"; }
     QCString trCompoundMembers()
     { return decode("Svi èlanovi"); }
     QCString trFileMembers()
@@ -122,7 +124,7 @@ class TranslatorCroatian : public Translator
     QCString trRelatedPages()
     { return decode("Povezane stranice"); }
     QCString trExamples()
-    { return decode("Primjeri"); }
+    { return "Primjeri"; }
     QCString trSearch()
     { return decode("Tra¾i"); }
     QCString trClassHierarchyDescription()
@@ -131,105 +133,105 @@ class TranslatorCroatian : public Translator
     }
     QCString trFileListDescription(bool extractAll)
     {
-      QCString result=decode("Popis svih ");
-      if (!extractAll) result+=decode("dokumentiranih ");
-      result+=decode("datoteka, s kratkim opisom:");
-      return result;
+      QCString result="Popis svih ";
+      if (!extractAll) result+="dokumentiranih ";
+      result+="datoteka, s kratkim opisom:";
+      return decode(result);
     }
     QCString trCompoundListDescription()
-    { return decode("Popis svih klasa, unija i struktura "
-                                        "s kratkim opisom :"); 
+    { return "Popis svih klasa, unija i struktura "
+		  "s kratkim opisom :"; 
     }
     QCString trCompoundMembersDescription(bool extractAll)
     {
-      QCString result=decode("Popis svih ");
-      if (!extractAll) result+=decode("dokumentiranih ");
-      result+=decode("èlanova klasa s linkovima na ");
-      if (extractAll) result+=decode("dokumentaciju svakog èlana:");
-      else result+=decode("dokumentaciju klase :");
-      return result;
+      QCString result="Popis svih ";
+      if (!extractAll) result+="dokumentiranih ";
+      result+="èlanova klasa s linkovima na ";
+      if (extractAll) result+="dokumentaciju svakog èlana:";
+      else result+="dokumentaciju klase :";
+      return decode(result);
     }
     QCString trFileMembersDescription(bool extractAll)
     {
-      QCString result=decode("Popis svih ");
-      if (!extractAll) result+=decode("dokumentiranih ");
-      result+=decode("èlanova s linkovima na ");
-      if (extractAll) result+=decode("dokumentaciju datoteke u kojima se nalaze:");
-      else result+=decode("datoteke u kojima se nalaze:");
-      return result;
+      QCString result="Popis svih ";
+      if (!extractAll) result+="dokumentiranih ";
+      result+="èlanova s linkovima na ";
+      if (extractAll) result+="dokumentaciju datoteke u kojima se nalaze:";
+      else result+="datoteke u kojima se nalaze:";
+      return decode(result);
     }
     QCString trHeaderFilesDescription()
     { return decode("Popis header datoteka koje èine API :"); }
     QCString trExamplesDescription()
-    { return decode("Popis primjera :"); }
+    { return "Popis primjera :"; }
     QCString trRelatedPagesDescription()
-    { return decode("Popis povezanih stranica:"); }
+    { return "Popis povezanih stranica:"; }
     QCString trModulesDescription()
-    { return decode("Popis svih modula:"); }
+    { return "Popis svih modula:"; }
     QCString trNoDescriptionAvailable()
-    { return decode("Opis nije dostupan"); }
+    { return "Opis nije dostupan"; }
 
     QCString trDocumentation()
-    { return decode("Dokumentacija"); }
+    { return "Dokumentacija"; }
     QCString trModuleIndex()
-    { return decode("Indeks modula"); }
+    { return "Kazalo modula"; }
     QCString trHierarchicalIndex()
-    { return decode("Hijerarhijski indeks"); }
+    { return "Hijerarhijsko kazalo"; }
     QCString trCompoundIndex()
-    { return decode("Skupni indeks"); }
+    { return "Skupno kazalo "; }
     QCString trFileIndex() 
-    { return decode("Indeks datoteka"); }
+    { return "Kazalo datoteka"; }
     QCString trModuleDocumentation()
-    { return decode("Dokumentacija modula"); }
+    { return "Dokumentacija modula"; }
     QCString trClassDocumentation()
-    { return decode("Dokumentacija klasa"); }
+    { return "Dokumentacija klasa"; }
     QCString trFileDocumentation()
-    { return decode("Dokumentacija datoteka"); }
+    { return "Dokumentacija datoteka"; }
     QCString trExampleDocumentation()
-    { return decode("Dokumentacija primjera"); }
+    { return "Dokumentacija primjera"; }
     QCString trPageDocumentation()
-    { return decode("Dokumentacija za povezane stranice"); }
+    { return "Dokumentacija vezane stranice"; }
     QCString trReferenceManual()
     { return decode("Priruènik"); }
 
     QCString trDefines()
-    { return decode("Define-ovi"); }
+    { return "Definicije"; }
     QCString trFuncProtos()
-    { return decode("Prototipi funkcija"); }
+    { return "Prototipi funkcija"; }
     QCString trTypedefs()
-    { return decode("Typedef-ovi"); }
+    { return "Typedef-ovi"; }
     QCString trEnumerations()
-    { return decode("Enumeracije"); }
+    { return "Enumeracije"; }
     QCString trFunctions()
-    { return decode("Funkcije"); }
+    { return "Funkcije"; }
     QCString trVariables()
-    { return decode("Varijable"); }
+    { return "Varijable"; }
     QCString trEnumerationValues()
-    { return decode("Vrijednosti enum-ova"); }
+    { return "Vrijednosti enumeracija"; }
     QCString trAuthor()
-    { return decode("autor"); }
+    { return "autor"; }
     QCString trDefineDocumentation()
-    { return decode("Dokumentacija define-a"); }
+    { return "Dokumentacija definicija"; }
     QCString trFunctionPrototypeDocumentation()
-    { return decode("Dokumentacija prototipa funkcije"); }
+    { return "Dokumentacija prototipa funkcije"; }
     QCString trTypedefDocumentation()
-    { return decode("Dokumentacija typedef-a"); }
+    { return "Dokumentacija typedef-a"; }
     QCString trEnumerationTypeDocumentation()
-    { return decode("Dokumentacija enum tipa"); }
+    { return "Dokumentacija enumeracijskog tipa"; }
     QCString trFunctionDocumentation()
-    { return decode("Dokumentacije funkcijs"); }
+    { return "Dokumentacije funkcija"; }
     QCString trVariableDocumentation()
-    { return decode("Dokumentacija varijable"); }
+    { return "Dokumentacija varijable"; }
     QCString trCompounds()
-    { return decode("Strukture"); }
+    { return "Strukture"; }
     QCString trFiles()
-    { return decode("Datoteke"); }
+    { return "Datoteke"; }
     QCString trGeneratedAt(const char *date,const char *projName)
     { 
-      QCString result=(QCString)decode("Generirano ")+date;
-      if (projName) result+=(QCString)decode(" projekt: ")+projName;
-      result+=(QCString)decode(" generator: ");
-      return result;
+      QCString result=(QCString)"Generirano "+date;
+      if (projName) result+=(QCString)" projekt: "+projName;
+      result+=" generator: ";
+      return decode(result);
     }
     QCString trWrittenBy()
     {
@@ -246,38 +248,38 @@ class TranslatorCroatian : public Translator
                                         "Nema utjecaja na API."); 
     }
     QCString trWarning()
-    { return decode("Upozorenje"); }
+    { return "Upozorenje"; }
     QCString trBugsAndLimitations()
     { return decode("Gre¹ke i ogranièenja"); }
     QCString trVersion()
-    { return decode("Verzija"); }
+    { return "Verzija"; }
     QCString trDate()
-    { return decode("Datum"); }
+    { return "Datum"; }
     QCString trAuthors()
-    { return decode("Autor(i)"); }
+    { return "Autor(i)"; }
     QCString trReturns()
-    { return decode("Povratne vrijednosti"); }
+    { return "Povratne vrijednosti"; }
     QCString trSeeAlso()
     { return decode("Vidi takoðer"); }
     QCString trParameters()
-    { return decode("Parametri"); }
+    { return "Parametri"; }
     QCString trExceptions()
-    { return decode("Iznimke"); }
+    { return "Iznimke"; }
     QCString trGeneratedBy()
-    { return decode("Generirao"); }
+    { return "Generirao"; }
     
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990307 
 //////////////////////////////////////////////////////////////////////////
     
     QCString trNamespaceList()
-    { return decode("Popis namespace-ova"); }
+    { return "Popis namespace-ova"; }
     QCString trNamespaceListDescription(bool extractAll)
     {
-      QCString result=decode("Popis svih ");
-      if (!extractAll) result+=decode("dokumentiranih ");
-      result+=decode("namespace-ova s kratkim opisom:");
-      return result;
+      QCString result="Popis svih ";
+      if (!extractAll) result+="dokumentiranih ";
+      result+="namespace-ova s kratkim opisom:";
+      return decode(result);
     }
     QCString trFriends()
     { return decode("Friend-ovi "); }
@@ -287,7 +289,7 @@ class TranslatorCroatian : public Translator
 //////////////////////////////////////////////////////////////////////////
     
     QCString trRelatedFunctionDocumentation()
-    { return decode("Dokumentacija povezanih funkcija"); }
+    { return "Dokumentacija povezanih funkcija"; }
     
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990425
@@ -298,48 +300,48 @@ class TranslatorCroatian : public Translator
                                     bool /*isTemplate*/)
       // used as the title of the HTML page of a class/struct/union
     {
-      QCString result=decode("Opis ");
+      QCString result="Opis ";
       switch(compType)
       {
-        case ClassDef::Class:  result+=decode(" klase "); break;
-        case ClassDef::Struct: result+=decode(" strukture "); break;
-        case ClassDef::Union:  result+=decode(" unije "); break;
-        case ClassDef::Interface:  result+=decode(" suèelja (interface) "); break;
-        case ClassDef::Exception:  result+=decode(" iznimke (exception) "); break;
+        case ClassDef::Class:  result+=" klase "; break;
+        case ClassDef::Struct: result+=" strukture "; break;
+        case ClassDef::Union:  result+=" unije "; break;
+        case ClassDef::Interface:  result+=" suèelja (interface) "; break;
+        case ClassDef::Exception:  result+=" iznimke (exception) "; break;
       }
-          result += (QCString)clName;
+          result += clName;
       
-      return result;
+      return decode(result);
     }
     QCString trFileReference(const char *fileName)
       // used as the title of the HTML page of a file
     {
-      QCString result=decode("Opis datoteke "); 
+      QCString result="Opis datoteke "; 
           result+=fileName;
-          return result;
+          return decode(result);
     }
     QCString trNamespaceReference(const char *namespaceName)
       // used as the title of the HTML page of a namespace
     {
-      QCString result =decode("Opis namespace-a ");
+      QCString result ="Opis namespace-a ";
           result+=namespaceName;
       
-      return result;
+      return decode(result);
     }
     
     // these are for the member sections of a class, struct or union 
     QCString trPublicMembers()
     { return decode("Public èlanovi"); }
     QCString trPublicSlots()
-    { return decode("Public slotovi"); }
+    { return "Public slotovi"; }
     QCString trSignals()
-    { return decode("Signali"); }
+    { return "Signali"; }
     QCString trStaticPublicMembers()
     { return decode("Static public èlanovi"); }
     QCString trProtectedMembers()
     { return decode("Protected èlanovi"); }
     QCString trProtectedSlots()
-    { return decode("Protected slotovi"); }
+    { return "Protected slotovi"; }
     QCString trStaticProtectedMembers()
     { return decode("Static protected èlanovi"); }
     QCString trPrivateMembers()
@@ -405,23 +407,23 @@ class TranslatorCroatian : public Translator
     QCString trNamespaceMemberDescription(bool extractAll)
       // This is an introduction to the page with all namespace members
     { 
-      QCString result=decode("Lista svih ");
-      if (!extractAll) result+=decode("dokumentiranih ");
-      result+=decode("namespace èlanova s linkovima na ");
+      QCString result="Lista svih ";
+      if (!extractAll) result+="dokumentiranih ";
+      result+="namespace èlanova s linkovima na ";
       if (extractAll) 
-        result+=decode("namespace dokumentaciju svakog èlana:");
+        result+="namespace dokumentaciju svakog èlana:";
       else 
-        result+=decode("namespace kojima pripadaju:");
-      return result;
+        result+="namespace kojima pripadaju:";
+      return decode(result);
     }
     QCString trNamespaceIndex()
       // This is used in LaTeX as the title of the chapter with the 
       // index of all namespaces.
-    { return decode("Indeks namespace-a"); }
+    { return "Kazalo namespace-a"; }
     QCString trNamespaceDocumentation()
       // This is used in LaTeX as the title of the chapter containing
       // the documentation of all namespaces.
-    { return decode("Dokumentacija namespace-a"); }
+    { return "Dokumentacija namespace-a"; }
 
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990728
@@ -434,25 +436,25 @@ class TranslatorCroatian : public Translator
         bool single)
     { // here s is one of " Class", " Struct" or " Union"
       // single is true implies a single file
-      QCString result=(QCString)decode("Dokumentacija ove ");
+      QCString result="Dokumentacija ove ";
       switch(compType)
       {
-        case ClassDef::Class:      result+=decode("klase"); break;
-        case ClassDef::Struct:     result+=decode("strukture"); break;
-        case ClassDef::Union:      result+=decode("unije"); break;
-        case ClassDef::Interface:  result+=decode("suèelja (interface)"); break;
-        case ClassDef::Exception:  result+=decode("iznimke (exception)"); break;
+        case ClassDef::Class:      result+="klase"; break;
+        case ClassDef::Struct:     result+="strukture"; break;
+        case ClassDef::Union:      result+="unije"; break;
+        case ClassDef::Interface:  result+="suèelja (interface)"; break;
+        case ClassDef::Exception:  result+="iznimke (exception)"; break;
       }
-      result+=decode(" je generirana iz datotek");
+      result+=" je generirana iz datotek";
       if (single) result+="e :"; else result+="a :";
-      return result;
+      return decode(result);
     }
 
     /*! This is in the (quick) index as a link to the alphabetical compound
      * list.
      */
     QCString trAlphabeticalList()
-    { return decode("Abecedni popis"); }
+    { return "Abecedni popis"; }
 
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990901
@@ -460,18 +462,18 @@ class TranslatorCroatian : public Translator
 
     /*! This is used as the heading text for the retval command. */
     QCString trReturnValues()
-    { return decode("Povratna vrijednost"); }
+    { return "Povratna vrijednost"; }
 
     /*! This is in the (quick) index as a link to the main page (index.html)
      */
     QCString trMainPage()
-    { return decode("Glavna stranica"); }
+    { return "Glavna stranica"; }
 
     /*! This is used in references to page that are put in the LaTeX 
      *  documentation. It should be an abbreviation of the word page.
      */
     QCString trPageAbbreviation()
-    { return decode("str."); }
+    { return "str."; }
 
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-991106
@@ -479,15 +481,15 @@ class TranslatorCroatian : public Translator
 
     QCString trSources()
     {
-      return decode("Izvorne datoteke");
+      return "Izvorne datoteke";
     }
     QCString trDefinedAtLineInSourceFile()
     {
-      return decode("Definirano u liniji @0 datoteke @1.");
+      return "Definirano u liniji @0 datoteke @1.";
     }
     QCString trDefinedInSourceFile()
     {
-      return decode("Definirano u datoteci @0.");
+      return "Definirano u datoteci @0.";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -496,7 +498,7 @@ class TranslatorCroatian : public Translator
 
     QCString trDeprecated()
     {
-      return decode("Zastarjelo");
+      return "Zastarjelo";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -516,32 +518,32 @@ class TranslatorCroatian : public Translator
     /*! header that is put before the list of constructor/destructors. */
     QCString trConstructorDocumentation()
     {
-      return decode("Dokumentacija konstruktora i destruktora "); 
+      return "Dokumentacija konstruktora i destruktora "; 
     }
     /*! Used in the file documentation to point to the corresponding sources. */
     QCString trGotoSourceCode()
     {
-      return decode("Izvorni kod");
+      return "Izvorni kod";
     }
     /*! Used in the file sources to point to the corresponding documentation. */
     QCString trGotoDocumentation()
     {
-      return decode("Dokumenacija za ovu datoteku.");
+      return "Dokumenacija za ovu datoteku.";
     }
     /*! Text for the \pre command */
     QCString trPrecondition()
     {
-      return decode("Preduvjeti");
+      return "Preduvjeti";
     }
     /*! Text for the \post command */
     QCString trPostcondition()
     {
-      return decode("Postuvjeti");
+      return "Postuvjeti";
     }
     /*! Text for the \invariant command */
     QCString trInvariant()
     {
-      return decode("Invarijanta");
+      return "Invarijanta";
     }
     /*! Text shown before a multi-line variable/enum initialization */
     QCString trInitialValue()
@@ -551,7 +553,7 @@ class TranslatorCroatian : public Translator
     /*! Text used the source code in the file index */
     QCString trCode()
     {
-      return decode("kod");
+      return "kod";
     }
     QCString trGraphicalHierarchy()
     {
@@ -563,11 +565,11 @@ class TranslatorCroatian : public Translator
     }
     QCString trGotoTextualHierarchy()
     {
-      return decode("Tekstualno stablo klasa");
+      return "Tekstualno stablo klasa";
     }
     QCString trPageIndex()
     {
-      return decode("Indeks stranice");
+      return "Indeks stranice";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -576,43 +578,43 @@ class TranslatorCroatian : public Translator
     
     QCString trNote()
     {
-      return decode("Primjedba");
+      return "Primjedba";
     }
     QCString trPublicTypes()
     {
-      return decode("Public tipovi");
+      return "Public tipovi";
     }
     QCString trPublicAttribs()
     {
-      return decode("Public atributi");
+      return "Public atributi";
     }
     QCString trStaticPublicAttribs()
     {
-      return decode("Static public atributi");
+      return "Static public atributi";
     }
     QCString trProtectedTypes()
     {
-      return decode("Protected tipovi");
+      return "Protected tipovi";
     }
     QCString trProtectedAttribs()
     {
-      return decode("Protected atributi");
+      return "Protected atributi";
     }
     QCString trStaticProtectedAttribs()
     {
-      return decode("Static protected atributi");
+      return "Static protected atributi";
     }
     QCString trPrivateTypes()
     {
-      return decode("Private tipovi");
+      return "Private tipovi";
     }
     QCString trPrivateAttribs()
     {
-      return decode("Private atributi");
+      return "Private atributi";
     }
     QCString trStaticPrivateAttribs()
     {
-      return decode("Static private atributi");
+      return "Static private atributi";
     }
 //////////////////////////////////////////////////////////////////////////
 // new since 1.1.3
@@ -621,12 +623,12 @@ class TranslatorCroatian : public Translator
     /*! Used as a marker that is put before a todo item */
     virtual QCString trTodo()
     {
-      return decode("Za uraditi");
+      return "Za uraditi";
     }
     /*! Used as the header of the todo list */
     virtual QCString trTodoList()
     {
-      return decode("Ostalo za uraditi");
+      return "Ostalo za uraditi";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -635,11 +637,11 @@ class TranslatorCroatian : public Translator
 
     virtual QCString trReferencedBy()
     {
-      return decode("Referencirano od");
+      return "Referencirano od";
     }
     virtual QCString trRemarks()
     {
-      return decode("Napomene");
+      return "Napomene";
     }
     virtual QCString trAttention()
     {
@@ -652,7 +654,7 @@ class TranslatorCroatian : public Translator
     }
     virtual QCString trSince()
     {
-      return decode("Od");
+      return "Od";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -662,7 +664,7 @@ class TranslatorCroatian : public Translator
     /*! title of the graph legend page */
     virtual QCString trLegendTitle()
     {
-      return decode("Legenda");
+      return "Legenda";
     }
     /*! page explaining how the dot graph's should be interpreted */
     virtual QCString trLegendDocs()
@@ -721,7 +723,7 @@ class TranslatorCroatian : public Translator
     /*! text for the link to the legend page */
     virtual QCString trLegend()
     {
-      return decode("legenda");
+      return "legenda";
     }
 //////////////////////////////////////////////////////////////////////////
 // new since 1.2.0
@@ -737,6 +739,16 @@ class TranslatorCroatian : public Translator
     {
       return "Test lista";
     }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.2.1
+//////////////////////////////////////////////////////////////////////////
+
+    /*! Used as a section header for KDE-2 IDL methods */
+    virtual QCString trDCOPMethods()
+    {
+      return "DCOP metode";
+    }
 };
 
 #endif
diff --git a/src/translator_ro.h b/src/translator_ro.h
new file mode 100644
index 0000000..ec76d39
--- /dev/null
+++ b/src/translator_ro.h
@@ -0,0 +1,1019 @@
+/******************************************************************************
+ *
+ * 
+ *
+ * Copyright (C) 1997-2000 by Dimitri van Heesch.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation under the terms of the GNU General Public License is hereby 
+ * granted. No representations are made about the suitability of this software 
+ * for any purpose. It is provided "as is" without express or implied warranty.
+ * See the GNU General Public License for more details.
+ *
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
+ *
+ */
+
+/* The translation from English to Romanian by Alexandru Iosup [aiosup@yahoo.com].
+ *
+ * Disclaimer: I hope I translated these to Romanian keeping
+ * the meaning of the sentences intact. Keep in mind that I used C-words were possible,
+ * (e.g. the romanian for typedef is much unexpressive than the original), since we are
+ * producing C-documentation of our projects.
+ *
+ * If you have suggestions, please mail the comments and text proposals to the address 
+ * shown aprox.10 lines above
+ *
+ * Project start:
+ * --------------
+ * 20.Sep.2k 
+ */
+#ifndef TRANSLATOR_RO_H
+#define TRANSLATOR_RO_H
+
+#include "qtbc.h"
+#include "classdef.h"
+#include "util.h"
+
+class TranslatorRomanian: public Translator
+{
+  public:
+
+    // --- Language contol methods -------------------
+    
+    /*! Used for identification of the language. May resemble 
+     * the string returned by latexBabelPackage(), but it is not used
+     * for the same purpose. The identification should not be translated.
+     * It should be replaced by the name of the language in English
+     * (e.g. Czech, Japanese, Russian, etc.). It should be equal to 
+     * the identification in language.h.
+     */
+    virtual QCString idLanguage()
+    { return "romanian"; }
+    /*! Used to get the command(s) for the language support. This method
+     *  was designed for languages which do not prefer babel package.
+     *  If this methods returns empty string, then the latexBabelPackage()
+     *  method is used to generate the command for using the babel package.
+     */
+    virtual QCString latexLanguageSupportCommand()
+    {
+      return "\\usepackage{romanian}\n";
+    }
+    /*! returns the name of the package that is included by LaTeX */
+    virtual QCString latexBabelPackage() 
+    { return "romanian"; }
+
+    /*! return the language charset. This will be used for the HTML output */
+    virtual QCString idLanguageCharset()
+    {
+      return "iso-8859-2";
+    }
+
+    // --- Language translation methods -------------------
+
+    /*! used in the compound documentation before a list of related functions. */
+    virtual QCString trRelatedFunctions()
+    { return "Funcþii înrudite"; }
+
+    /*! subscript for the related functions. */
+    virtual QCString trRelatedSubscript()
+    { return "(Atenþie: NU sunt funcþii membre.)"; }
+
+    /*! header that is put before the detailed description of files, classes and namespaces. */
+    virtual QCString trDetailedDescription()
+    { return "Descriere Detaliatã"; }
+
+    /*! header that is put before the list of typedefs. */
+    virtual QCString trMemberTypedefDocumentation()
+    { return "Documentaþia Declaraþiilor Typedef membre"; }
+    
+    /*! header that is put before the list of enumerations. */
+    virtual QCString trMemberEnumerationDocumentation()
+    { return "Documentaþia membrilor Enum"; }
+    
+    /*! header that is put before the list of member functions. */
+    virtual QCString trMemberFunctionDocumentation()
+    { return "Documentaþia Funcþiilor membre"; }
+    
+    /*! header that is put before the list of member attributes. */
+    virtual QCString trMemberDataDocumentation()
+    { return "Documentaþia Datelor membre"; }
+
+    /*! this is the text of a link put after brief descriptions. */
+    virtual QCString trMore() 
+    { return "Mai mult..."; }
+
+    /*! put in the class documentation */
+    virtual QCString trListOfAllMembers()
+    { return "Lista tuturor membrilor."; }
+
+    /*! used as the title of the "list of all members" page of a class */
+    virtual QCString trMemberList()
+    { return "Lista Membrilor"; }
+
+    /*! this is the first part of a sentence that is followed by a class name */
+    virtual QCString trThisIsTheListOfAllMembers()
+    { return "Aceasta este 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."; }
+    
+    /*! this is put at the author sections at the bottom of man pages.
+     *  parameter s is name of the project name.
+     */
+    virtual QCString trGeneratedAutomatically(const char *s)
+    { QCString result="Generat automat de Doxygen";
+      if (s) result+=(QCString)" pentru "+s;
+      result+=" din codul sursã."; 
+      return result;
+    }
+
+    /*! put after an enum name in the list of all members */
+    virtual QCString trEnumName()
+    { return "nume enum"; }
+    
+    /*! put after an enum value in the list of all members */
+    virtual QCString trEnumValue()
+    { return "valoare enum"; }
+    
+    /*! put after an undocumented member in the list of all members */
+    virtual QCString trDefinedIn()
+    { return "definit în"; }
+
+    /*! put as in introduction in the verbatim header file of a class.
+     *  parameter f is the name of the include file.
+     */
+    virtual QCString trVerbatimText(const char *f)
+    { return (QCString)"Acesta este textul original al fiºierului inclus "+f; }
+    
+    // quick reference sections
+
+    /*! This is put above each page as a link to the list of all groups of 
+     *  compounds or files (see the \group command).
+     */
+    virtual QCString trModules()
+    { return "Module"; }
+    
+    /*! This is put above each page as a link to the class hierarchy */
+    virtual QCString trClassHierarchy()
+    { return "Ierarhia Claselor"; }
+    
+    /*! This is put above each page as a link to the list of annotated classes */
+    virtual QCString trCompoundList()
+    { return "Lista Componenþilor"; }
+    
+    /*! 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"; }
+
+    /*! This is put above each page as a link to all members of compounds. */
+    virtual QCString trCompoundMembers()
+    { return "Membrii Componenþi"; }//cu articol hotarat
+
+    /*! This is put above each page as a link to all members of files. */
+    virtual QCString trFileMembers()
+    { 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"; }
+
+    /*! This is put above each page as a link to all examples. */
+    virtual QCString trExamples()
+    { return "Exemples"; }
+
+    /*! This is put above each page as a link to the search engine. */
+    virtual QCString trSearch()
+    { return "Cautã"; }
+
+    /*! This is an introduction to the class hierarchy. */
+    virtual QCString trClassHierarchyDescription()
+    { return "Aceastã listã de legãturi este sortatã în mare, "
+             "dar nu complet, în ordine alfabeticã:";
+    }
+
+    /*! This is an introduction to the list with all files. */
+    virtual QCString trFileListDescription(bool extractAll)
+    {
+      QCString result="Aici este lista tuturor ";
+      result+="fiºierelor";
+	  if (!extractAll) result+=" documentate";
+	  result+=", cu scurte descrieri:";
+      return result;
+    }
+
+    /*! This is an introduction to the annotated compound list. */
+    virtual QCString trCompoundListDescription()
+    { return "Aici sunt clasele, structurile, uniunile ºi interfeþele"
+		", cu scurte descrieri"; 
+    }
+
+    /*! This is an introduction to the page with all class members. */
+    virtual QCString trCompoundMembersDescription(bool extractAll)
+    {
+      QCString result="Aici este lista tuturor ";
+      result+="membrilor ";
+	  if (!extractAll) result+="documentaþi ";
+	  result+="din toate clasele, cu legãturi cãtre ";
+		  
+      if (extractAll) 
+        result+="documentaþia clasei pentru fiecare membru în parte:";
+      else 
+        result+="clasele de care aparþin:";
+      return result;
+    }
+
+    /*! This is an introduction to the page with all file members. */
+    virtual QCString trFileMembersDescription(bool extractAll)
+    {
+      QCString result="Aici este lista tuturor ";
+	  result+="membrilor ";
+	  if (!extractAll) result+="documentaþi ";
+	  result+="din toate fiºierele, cu legãturi cãtre ";
+      if (extractAll) 
+        result+="documentaþia fiºierului pentru fiecare membru în parte:";
+      else 
+        result+="fiºierele de care aparþin:";
+      return result;
+    }
+
+    /*! This is an introduction to the page with the list of all header files. */
+    virtual QCString trHeaderFilesDescription()
+    { return "Aici sunt 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 "Aici este lista tuturor exemplelor:"; }
+
+    /*! This is an introduction to the page with the list of related pages */
+    virtual QCString trRelatedPagesDescription()
+    { return "Aici este lista tuturor documentaþiilor înrudite:"; }
+
+    /*! This is an introduction to the page with the list of class/file groups */
+    virtual QCString trModulesDescription()
+    { return "Aici este 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"; }
+
+    /*! This is used in LaTeX as the title of the chapter with the 
+     * index of all groups.
+     */
+    virtual QCString trModuleIndex()
+    { return "Indexul Modulelor"; }
+
+    /*! This is used in LaTeX as the title of the chapter with the 
+     * class hierarchy.
+     */
+    virtual QCString trHierarchicalIndex()
+    { return "Index Ierarhic"; }
+
+    /*! This is used in LaTeX as the title of the chapter with the 
+     * annotated compound index.
+     */
+    virtual QCString trCompoundIndex()
+    { return "Indexul Componenþilor"; }
+
+    /*! This is used in LaTeX as the title of the chapter with the
+     * list of all files.
+     */
+    virtual QCString trFileIndex() 
+    { 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"; }
+
+    /*! This is used in LaTeX as the title of the chapter containing
+     *  the documentation of all classes, structs and unions.
+     */
+    virtual QCString trClassDocumentation()
+    { return "Documentaþia Claselor"; }
+
+    /*! This is used in LaTeX as the title of the chapter containing
+     *  the documentation of all files.
+     */
+    virtual QCString trFileDocumentation()
+    { 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"; }
+
+    /*! 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"; }
+
+    /*! This is used in LaTeX as the title of the document */
+    virtual QCString trReferenceManual()
+    { return "Manual de utilizare"; }
+    
+    /*! This is used in the documentation of a file as a header before the 
+     *  list of defines
+     */
+    virtual QCString trDefines()
+    { 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"; }
+
+    /*! This is used in the documentation of a file as a header before the 
+     *  list of typedefs
+     */
+    virtual QCString trTypedefs()
+    { return "Declaraþii Typedef"; }
+
+    /*! This is used in the documentation of a file as a header before the 
+     *  list of enumerations
+     */
+    virtual QCString trEnumerations()
+    { return "Enumeraþii"; }
+
+    /*! This is used in the documentation of a file as a header before the 
+     *  list of (global) functions
+     */
+    virtual QCString trFunctions()
+    { return "Funcþii"; }
+
+    /*! This is used in the documentation of a file as a header before the 
+     *  list of (global) variables
+     */
+    virtual QCString trVariables()
+    { return "Variabile"; }
+
+    /*! This is used in the documentation of a file as a header before the 
+     *  list of (global) variables
+     */
+    virtual QCString trEnumerationValues()
+    { return "Valori enum"; }
+    
+    /*! This is used in man pages as the author section. */
+    virtual QCString trAuthor()
+    { return "Autor"; }
+
+    /*! 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"; }
+
+    /*! 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"; }
+
+    /*! 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"; }
+
+    /*! 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"; }
+
+    /*! 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"; }
+
+    /*! 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"; }
+
+    /*! This is used in the documentation of a file/namespace/group before 
+     *  the list of links to documented compounds
+     */
+    virtual QCString trCompounds()
+    { return "Membri"; }
+
+    /*! This is used in the documentation of a group before the list of 
+     *  links to documented files
+     */
+    virtual QCString trFiles()
+    { return "Fiºiere"; }
+
+    /*! This is used in the standard footer of each page and indicates when 
+     *  the page was generated 
+     */
+    virtual QCString trGeneratedAt(const char *date,const char *projName)
+    { 
+      QCString result=(QCString)"Generat la "+date;
+      if (projName) result+=(QCString)" pentru "+projName;
+      result+=(QCString)" de cãtre";
+      return result;
+    }
+    /*! This is part of the sentence used in the standard footer of each page.
+     */
+    virtual QCString trWrittenBy()
+    {
+      return "scris de";
+    }
+
+    /*! this text is put before a class diagram */
+    virtual QCString trClassDiagram(const char *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"; }
+
+    /*! this text is generated when the \version command is used. */
+    virtual QCString trVersion()
+    { return "Versiunea"; }
+
+    /*! this text is generated when the \date command is used. */
+    virtual QCString trDate()
+    { return "Data"; }
+
+    /*! this text is generated when the \author command is used. */
+    virtual QCString trAuthors()
+    { return "Autorul/Autorii"; }
+
+    /*! this text is generated when the \return command is used. */
+    virtual QCString trReturns()
+    { return "Întoarce"; }
+
+    /*! this text is generated when the \sa command is used. */
+    virtual QCString trSeeAlso()
+    { return "Vezi ºi"; }
+
+    /*! this text is generated when the \param command is used. */
+    virtual QCString trParameters()
+    { return "Parametri"; }
+
+    /*! this text is generated when the \exception command is used. */
+    virtual QCString trExceptions()
+    { return "Excepþii"; }
+    
+    /*! this text is used in the title page of a LaTeX document. */
+    virtual QCString trGeneratedBy()
+    { return "Generat de"; }
+
+    // new since 0.49-990307
+    
+    /*! used as the title of page containing all the index of all namespaces. */
+    virtual QCString trNamespaceList()
+    { return "Lista Namespace"; }
+
+    /*! used as an introduction to the namespace list */
+    virtual QCString trNamespaceListDescription(bool extractAll)
+    {
+      QCString result="Aici este lista tuturor ";
+      result+="namespace-urilor ";
+	  if (!extractAll) result+="documentate ";
+	  result+=", cu scurte descrieri:";
+      return result;
+    }
+
+    /*! used in the class documentation as a header before the list of all
+     *  friends of a class
+     */
+    virtual QCString trFriends()
+    { return "Prieteni"; }
+    
+//////////////////////////////////////////////////////////////////////////
+// new since 0.49-990405
+//////////////////////////////////////////////////////////////////////////
+    
+    /*! used in the class documentation as a header before the list of all
+     * related classes 
+     */
+    virtual QCString trRelatedFunctionDocumentation()
+    { return "Documentaþia funcþiilor prietene sau înrudite"; }
+    
+//////////////////////////////////////////////////////////////////////////
+// new since 0.49-990425
+//////////////////////////////////////////////////////////////////////////
+
+    /*! used as the title of the HTML page of a class/struct/union */
+    virtual QCString trCompoundReference(const char *clName,
+                                    ClassDef::CompoundType compType,
+                                    bool isTemplate)
+    {
+	  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::Exception:  result+="excepþia"; break;
+      }
+	  if (isTemplate) result+=" (Template) ";
+	  result+=(QCString)clName;
+      
+      return result;
+    }
+
+    /*! used as the title of the HTML page of a file */
+    virtual QCString trFileReference(const char *fileName)
+    {
+      QCString result="Referinþã la fiºierul";
+      result+=fileName;
+      return result;
+    }
+
+    /*! used as the title of the HTML page of a namespace */
+    virtual QCString trNamespaceReference(const char *namespaceName)
+    {
+      QCString result="Referinþã la Namespace-ul ";
+      result+=namespaceName;
+      return result;
+    }
+    
+    /*! \mgroup Class sections
+     *  these are for the member sections of a class, struct or union 
+     */
+    virtual QCString trPublicMembers()
+    { return "Metode Publice"; }
+    virtual QCString trPublicSlots()
+    { return "Sloturi Publice"; }
+    virtual QCString trSignals()
+    { return "Semnale"; }
+    virtual QCString trStaticPublicMembers()
+    { return "Metode Statice Publice"; }
+    virtual QCString trProtectedMembers()
+    { return "Metode Protejate"; }
+    virtual QCString trProtectedSlots()
+    { return "Sloturi Protejate"; }
+    virtual QCString trStaticProtectedMembers()
+    { return "Metode Statice Protejate"; }
+    virtual QCString trPrivateMembers()
+    { return "Metode Private"; }
+    virtual QCString trPrivateSlots()
+    { return "Sloturi Private"; }
+    virtual QCString trStaticPrivateMembers()
+    { return "Metode Statice Private"; }
+    /*! \endmgroup */ 
+    
+    /*! this function is used to produce a comma-separated list of items.
+     *  use generateMarker(i) to indicate where item i should be put.
+     */
+    virtual QCString trWriteList(int numEntries)
+    {
+      QCString result;
+      int i;
+      // the inherits list contain `numEntries' classes
+      for (i=0;i<numEntries;i++) 
+      {
+        // use generateMarker to generate placeholders for the class links!
+        result+=generateMarker(i); // generate marker for entry i in the list 
+                                   // (order is left to right)
+        
+        if (i!=numEntries-1)  // not the last entry, so we need a separator
+        {
+          if (i<numEntries-2) // not the fore last entry 
+            result+=", ";
+          else                // the fore last entry
+            result+=" ºi ";
+        }
+      }
+      return result; 
+    }
+    
+    /*! used in class documentation to produce a list of base classes,
+     *  if class diagrams are disabled.
+     */
+    virtual QCString trInheritsList(int numEntries)
+    {
+      return "Moºteneºte "+trWriteList(numEntries)+".";
+    }
+
+    /*! used in class documentation to produce a list of super classes,
+     *  if class diagrams are disabled.
+     */
+    virtual QCString trInheritedByList(int numEntries)
+    {
+      return "Moºtenit de "+trWriteList(numEntries)+".";
+    }
+
+    /*! used in member documentation blocks to produce a list of 
+     *  members that are hidden by this one.
+     */
+    virtual QCString trReimplementedFromList(int numEntries)
+    {
+      return "Reimplementat din "+trWriteList(numEntries)+".";
+    }
+
+    /*! used in member documentation blocks to produce a list of
+     *  all member that overwrite the implementation of this member.
+     */
+    virtual QCString trReimplementedInList(int numEntries)
+    {
+      return "Reimplementat în "+trWriteList(numEntries)+".";
+    }
+
+    /*! This is put above each page as a link to all members of namespaces. */
+    virtual QCString trNamespaceMembers()
+    { return "Membrii Namespace-ului"; }
+
+    /*! This is an introduction to the page with all namespace members */
+    virtual QCString trNamespaceMemberDescription(bool extractAll)
+    { 
+      QCString result="Aici este lista tuturor membrilor ";
+      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:";
+      else 
+        result+="namespace-urile de care aparþin:";
+      return result;
+    }
+    /*! This is used in LaTeX as the title of the chapter with the 
+     *  index of all namespaces.
+     */
+    virtual QCString trNamespaceIndex()
+    { return "Indexul Namespace-ului"; }
+
+    /*! This is used in LaTeX as the title of the chapter containing
+     *  the documentation of all namespaces.
+     */
+    virtual QCString trNamespaceDocumentation()
+    { return "Documentaþia Namespace-ului"; }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 0.49-990522
+//////////////////////////////////////////////////////////////////////////
+
+    /*! This is used in the documentation before the list of all
+     *  namespaces in a file.
+     */
+    virtual QCString trNamespaces()
+    { return "Namespace-uri"; }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 0.49-990728
+//////////////////////////////////////////////////////////////////////////
+
+    /*! This is put at the bottom of a class documentation page and is
+     *  followed by a list of files that were used to generate the page.
+     */
+    virtual QCString trGeneratedFromFiles(ClassDef::CompoundType compType,
+        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ã ";
+      switch(compType)
+      {
+        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::Exception:  result+="excepþie"; break;
+      }
+      result+=" a fost generatã din fiºier";
+      if (single) result+="ul:"; else result+="ele:";
+      return result;
+    }
+
+    /*! This is in the (quick) index as a link to the alphabetical compound
+     * list.
+     */
+    virtual QCString trAlphabeticalList()
+    { return "Listã Alfabeticã"; }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 0.49-990901
+//////////////////////////////////////////////////////////////////////////
+
+    /*! This is used as the heading text for the retval command. */
+    virtual QCString trReturnValues()
+    { return "Valori returnate"; }
+
+    /*! This is in the (quick) index as a link to the main page (index.html)
+     */
+    virtual QCString trMainPage()
+    { 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.
+     */
+    virtual QCString trPageAbbreviation()
+    { return "pg."; }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 0.49-991003
+//////////////////////////////////////////////////////////////////////////
+
+    virtual QCString trSources()
+    {
+      return "Surse";
+    }
+    virtual QCString trDefinedAtLineInSourceFile()
+    {
+      return "Definiþia în linia @0 a fiºierului @1.";
+    }
+    virtual QCString trDefinedInSourceFile()
+    {
+      return "Definiþia în fiºierul @0.";
+    }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 0.49-991205
+//////////////////////////////////////////////////////////////////////////
+
+    virtual QCString trDeprecated()
+    {
+      return "Învechitã(Deprecated)";
+    }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.0.0
+//////////////////////////////////////////////////////////////////////////
+
+    /*! this text is put before a collaboration diagram */
+    virtual QCString trCollaborationDiagram(const char *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+":";
+    }
+    /*! header that is put before the list of constructor/destructors. */
+    virtual QCString trConstructorDocumentation()
+    {
+      return "Documentaþia pentru Constructori ºi Destructori"; 
+    }
+    /*! Used in the file documentation to point to the corresponding sources. */
+    virtual QCString trGotoSourceCode()
+    {
+      return "Vezi sursele.";
+    }
+    /*! Used in the file sources to point to the corresponding documentation. */
+    virtual QCString trGotoDocumentation()
+    {
+      return "Vezi documentaþia.";
+    }
+    /*! Text for the \pre command */
+    virtual QCString trPrecondition()
+    {
+      return "Precondiþie";
+    }
+    /*! Text for the \post command */
+    virtual QCString trPostcondition()
+    {
+      return "Postcondiþie";
+    }
+    /*! Text for the \invariant command */
+    virtual QCString trInvariant()
+    {
+      return "Invariant";
+    }
+    /*! Text shown before a multi-line variable/enum initialization */
+    virtual QCString trInitialValue()
+    {
+      return "Iniþializare:";
+    }
+    /*! Text used the source code in the file index */
+    virtual QCString trCode()
+    {
+      return "cod";
+    }
+    virtual QCString trGraphicalHierarchy()
+    {
+      return "Ierarhia claselor în mod grafic";
+    }
+    virtual QCString trGotoGraphicalHierarchy()
+    {
+      return "Vezi ierarhia claselor în mod grafic";
+    }
+    virtual QCString trGotoTextualHierarchy()
+    {
+      return "Vezi ierarhia claselor în mod text";
+    }
+    virtual QCString trPageIndex()
+    {
+      return "Indexul Paginilor";
+    }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.1.0
+//////////////////////////////////////////////////////////////////////////
+    
+    virtual QCString trNote()
+    {
+      return "Notã";
+    }
+    virtual QCString trPublicTypes()
+    {
+      return "Tipuri publice";
+    }
+    virtual QCString trPublicAttribs()
+    {
+      return "Atribute Publice";
+    }
+    virtual QCString trStaticPublicAttribs()
+    {
+      return "Atribute Statice Publice";
+    }
+    virtual QCString trProtectedTypes()
+    {
+      return "Tipuri Protejate";
+    }
+    virtual QCString trProtectedAttribs()
+    {
+      return "Atribute Protejate";
+    }
+    virtual QCString trStaticProtectedAttribs()
+    {
+      return "Atribute Statice Protejate";
+    }
+    virtual QCString trPrivateTypes()
+    {
+      return "Tipuri Private";
+    }
+    virtual QCString trPrivateAttribs()
+    {
+      return "Atribute Private";
+    }
+    virtual QCString trStaticPrivateAttribs()
+    {
+      return "Atribute Statice Private";
+    }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.1.3
+//////////////////////////////////////////////////////////////////////////
+
+    /*! Used as a marker that is put before a todo item */
+    virtual QCString trTodo()
+    {
+      return "De fãcut";
+    }
+    /*! Used as the header of the todo list */
+    virtual QCString trTodoList()
+    {
+      return "Lista lucrurilor rãmase de fãcut";
+    }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.1.4
+//////////////////////////////////////////////////////////////////////////
+
+    virtual QCString trReferencedBy()
+    {
+      return "Semnalat de";
+    }
+    virtual QCString trRemarks()
+    {
+      return "Observaþii";
+    }
+    virtual QCString trAttention()
+    {
+      return "Atenþie";
+    }
+    virtual QCString trInclByDepGraph()
+    {
+      return "Acest graf aratã care fiºiere includ, "
+		  "direct sau indirect, acest fiºier:";
+    }
+    virtual QCString trSince()
+    {
+      return "Din";
+    }
+    
+//////////////////////////////////////////////////////////////////////////
+// new since 1.1.5
+//////////////////////////////////////////////////////////////////////////
+
+    /*! title of the graph legend page */
+    virtual QCString trLegendTitle()
+    {
+      return "Legenda grafului";
+    }
+    /*! page explaining how the dot graph's should be interpreted */
+    virtual QCString trLegendDocs()
+    {
+      return 
+        "Aceastã paginã aratã modul în care trebuie sã interpretaþi "
+		"grafurile generate de doxygen.<p>\n"
+        "Consideraþi urmãtorul exemplu:\n"
+        "\\code\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"
+        "class Truncated : public Invisible { };\n\n"
+        "/* Clasã necomentatã în stil doxygen */\n"
+        "class Undocumented { };\n\n"
+        "/*! Clasã care este moºtenitã în mod public */\n"
+        "class PublicBase : public Truncated { };\n\n"
+        "/*! Clasã care este moºtenitã în mod protejat */\n"
+        "class ProtectedBase { };\n\n"
+        "/*! Clasã care este moºtenitã în mod privat */\n"
+        "class PrivateBase { };\n\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"
+        "class Inherited : public PublicBase,\n"
+        "                  protected ProtectedBase,\n"
+        "                  private PrivateBase,\n"
+        "                  public Undocumented\n"
+        "{\n"
+        "  private:\n"
+        "    Used *m_usedClass;\n"
+        "};\n"
+        "\\endcode\n"
+        "Dacã tagul \\c MAX_DOT_GRAPH_HEIGHT din fiºierul de configuraþie "
+        "Este setat la 200 acesta este graful rezultat:"
+        "<p><center><img src=\"graph_legend.gif\"></center>\n"
+        "<p>\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 "
+        "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."
+        "</ul>\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"
+        "</ul>\n";
+    }
+    /*! text for the link to the legend page */
+    virtual QCString trLegend()
+    {
+      return "legenda";
+    }
+    
+//////////////////////////////////////////////////////////////////////////
+// new since 1.2.0
+//////////////////////////////////////////////////////////////////////////
+    
+    /*! Used as a marker that is put before a test item */
+    virtual QCString trTest()
+    {
+      return "Test";
+    }
+    /*! Used as the header of the test list */
+    virtual QCString trTestList()
+    {
+      return "Listã de teste";
+    }
+
+};
+
+#endif
diff --git a/src/translator_ru.h b/src/translator_ru.h
index 84fc1b9..495d96a 100644
--- a/src/translator_ru.h
+++ b/src/translator_ru.h
@@ -26,6 +26,10 @@ class TranslatorRussian : public Translator
     { return "russian"; }
     QCString latexBabelPackage()
     { return "russian"; }
+    QCString idLanguageCharset()
+    {
+      return "koi8-r";
+    }
     QCString trRelatedFunctions()
     {
 	return "ó×ÑÚÁÎÎÙÅ æÕÎËÃÉÉ";
@@ -691,7 +695,108 @@ class TranslatorRussian : public Translator
     {
 	return "óÔÁÔÉÞÅÓËÉÅ úÁËÒÙÔÙÅ áÔÔÒÉÂÕÔÙ";
     }
-	
+    QCString trTodo()
+    {
+      return "Todo";
+    }
+    QCString trTodoList()
+    {
+      return "óÐÉÓÏË ïÓÔÁ×ÛÉÈÓÑ äÅÌ";
+    }
+    QCString trReferencedBy()
+    {
+      return "õÐÏÍÉÎÁÅÔÓÑ ×";
+    }
+    QCString trRemarks()
+    {
+      return "ðÒÉÍÅÞÁÎÉÑ";
+    }
+    QCString trAttention()
+    {
+      return "÷ÎÉÍÁÎÉÅ";
+    }
+    QCString trInclByDepGraph()
+    {
+      return "üÔÏÔ ÇÒÁÆ ÐÏËÁÚÙ×ÁÅÔ, ËÁËÉÅ ÆÁÊÌÙ ÐÒÑÍÏ ÉÌÉ "
+             "ËÏÓ×ÅÎÎÏ ×ËÌÀÞÁÀÔ ÜÔÏÔ ÆÁÊÌ:";
+    }
+    QCString trSince()
+    {
+      return "ðÏÓÌÅ";
+    }
+    QCString trLegendTitle()
+    {
+      return "ôÏÌËÏ×ÁÎÉÅ ÇÒÁÆÁ";
+    }
+    QCString trLegendDocs()
+    {
+      return 
+        "üÔÁ ÓÔÒÁÎÉÃÁ ÏÂØÑÓÎÑÅÔ, ËÁË ÐÏÎÉÍÁÔØ ÇÒÁÆÙ, ËÏÔÏÒÙÅ ÇÅÎÅÒÉÒÕÅÔ "
+        "doxygen.<p>\n"
+        "òÁÓÓÍÏÔÒÉÍ ÓÌÅÄÕÀÝÉÊ ÐÒÉÍÅÒ:\n"
+        "\\code\n"
+        "/*! îÅ×ÉÄÉÍÙÊ ËÌÁÓÓ ÉÚ-ÚÁ ÕÓÅÞÅÎÉÑ */\n"
+        "class Invisible { };\n\n"
+        "/*! õÓÅÞÅÎÎÙÊ ËÌÁÓÓ, ÏÔÎÏÛÅÎÉÅ ÎÁÓÌÅÄÏ×ÁÎÉÑ ÓËÒÙÔÏ */\n"
+        "class Truncated : public Invisible { };\n\n"
+        "/* ëÌÁÓÓ, ÎÅ ÄÏËÕÍÅÎÔÉÒÏ×ÁÎÎÙÊ ËÏÍÍÅÎÔÁÒÉÑÍÉ doxygen */\n"
+        "class Undocumented { };\n\n"
+        "/*! ëÌÁÓÓ, ÉÓÐÏÌØÚÕÀÝÉÊ ÏÔËÒÙÔÏÅ ÎÁÓÌÅÄÏ×ÁÎÉÅ */\n"
+        "class PublicBase : public Truncated { };\n\n"
+        "/*! ëÌÁÓÓ, ÉÓÐÏÌØÚÕÀÝÉÊ ÚÁÝÉÝÅÎÎÏÅ ÎÁÓÌÅÄÏ×ÁÎÉÅ */\n"
+        "class ProtectedBase { };\n\n"
+        "/*! ëÌÁÓÓ, ÉÓÐÏÌØÚÕÀÝÉÊ ÚÁËÒÙÔÏÅ ÎÁÓÌÅÄÏ×ÁÎÉÅ */\n"
+        "class PrivateBase { };\n\n"
+        "/*! ëÌÁÓÓ, ÉÓÐÏÌØÚÕÅÍÙÊ ËÌÁÓÓÏÍ Inherited */\n"
+        "class Used { };\n\n"
+        "/*! ëÌÁÓÓ, ÐÏÒÏÖÄÅÎÎÙÊ ÏÔ ÄÒÕÇÉÈ ËÌÁÓÓÏ× */\n"
+        "class Inherited : public PublicBase,\n"
+        "                  protected ProtectedBase,\n"
+        "                  private PrivateBase,\n"
+        "                  public Undocumented\n"
+        "{\n"
+        "  private:\n"
+        "    Used *m_usedClass;\n"
+        "};\n"
+        "\\endcode\n"
+        "åÓÌÉ \\c MAX_DOT_GRAPH_HEIGHT ÔÜÇ × ËÏÎÆÉÇÕÒÁÃÉÏÎÎÏÍ ÆÁÊÌÅ "
+        "ÕÓÔÁÎÏ×ÌÅÎ × 200, ÐÏÌÕÞÉÔÓÑ ÓÌÅÄÕÀÝÉÊ ÇÒÁÆ:"
+        "<p><center><img src=\"graph_legend.gif\"></center>\n"
+        "<p>\n"
+        "ðÒÑÍÏÕÇÏÌØÎÉËÉ × ÜÔÏÍ ÇÒÁÆÅ ÉÍÅÀÔ ÓÌÅÄÕÀÝÅÅ ÚÎÁÞÅÎÉÅ:\n"
+        "<ul>\n"
+        "<li>úÁÐÏÌÎÅÎÎÙÊ ÞÅÒÎÎÙÊ ÐÒÑÍÏÕÇÏÌØÎÉË ÐÒÅÄÓÔÁ×ÌÑÅÔ ÓÔÒÕËÔÕÒÕ ÉÌÉ ËÌÁÓÓ, "
+	"ÄÌÑ ËÏÔÏÒÏÇÏ ÓÏÚÄÁÎ ÇÒÁÆ.\n"
+        "<li>ðÒÑÍÏÕÇÏÌØÎÉË Ó ÞÅÒÎÏÊ ÇÒÁÎÉÃÅÊ ÏÂÏÚÎÁÞÁÅÔ ÄÏËÕÍÅÎÔÉÒÏ×ÁÎÎÕÀ ÓÔÒÕËÔÕÒÕ ÉÌÉ ËÌÁÓÓ.\n"
+        "<li>ðÒÑÍÏÕÇÏÌØÎÉË Ó ÓÅÒÏÊ ÇÒÁÎÉÃÅÊ ÏÂÏÚÎÁÞÁÅÔ ÄÏËÕÍÅÎÔÉÒÏ×ÁÎÎÕÀ ÓÔÒÕËÔÕÒÕ ÉÌÉ ËÌÁÓÓ.\n"
+        "<li>ðÒÑÍÏÕÇÏÌØÎÉË Ó ËÒÁÓÎÏÊ ÇÒÁÎÉÃÅÊ ÏÂÏÚÎÁÞÁÅÔ ÄÏËÕÍÅÎÔÉÒÏ×ÁÎÎÕÀ ÓÔÒÕËÔÕÒÕ ÉÌÉ ËÌÁÓÓ, ÄÌÑ ËÏÔÏÒÏÇÏ\n"
+        " ÎÅ ×ÓÅ ÏÔÎÏÛÅÎÉÑ ÎÁÓÌÅÄÏ×ÁÎÉÑ/ÓÏÄÅÒÖÁÎÉÑ ÐÏËÁÚÁÎÙ. çÒÁÆ ÕÓÅÞÅÎ, "
+        "ÅÓÌÉ ÏÎ ÎÅ ÐÏÍÅÓÔÉÌÓÑ × ÕËÁÚÁÎÎÙÈ ÇÒÁÎÉÃÁÈ."
+        "</ul>\n"
+        "óÔÒÅÌËÉ ÉÍÅÀÔ ÓÌÅÄÕÀÝÅÅ ÚÎÁÞÅÎÉÅ:\n"
+        "<ul>\n"
+        "<li>ôÅÍÎÏÓÉÎÑÑ ÓÔÒÅÌËÁ ÉÓÐÏÌØÚÕÅÔÓÑ ÄÌÑ ÉÚÏÂÒÁÖÅÎÉÑ ÏÔÎÏÛÅÎÉÑ ÏÔËÒÙÔÏÇÏ ÎÁÓÌÅÄÏ×ÁÎÉÑ "
+        "ÍÅÖÄÕ Ä×ÕÍÑ ËÌÁÓÓÁÍÉ.\n"
+        "<li>ôÅÍÎÏÚÅÌÅÎÁÑ ÓÔÒÅÌËÁ ÉÓÐÏÌØÚÕÅÔÓÑ ÐÒÉ ÚÁÝÉÝÅÎÎÏÍ ÎÁÓÌÅÄÏ×ÁÎÉÉ.\n"
+        "<li>ôÅÍÎÏÚÅÌÅÎÁÑ ÓÔÒÅÌËÁ ÉÓÐÏÌØÚÕÅÔÓÑ ÐÒÉ ÚÁËÒÙÔÏÍ ÎÁÓÌÅÄÏ×ÁÎÉÉ.\n"
+        "<li>æÉÏÌÅÔÏ×ÁÑ ÓÔÒÅÌËÁ ÉÓÐÏÌØÚÕÅÔÓÑ, ÅÓÌÉ ËÌÁÓÓ ÓÏÄÅÒÖÉÔÓÑ × ÉÌÉ ÉÓÐÏÌØÚÕÅÔÓÑ ÄÒÕÇÉÍ ËÌÁÓÓÏÍ"
+        ". óÔÒÅÌËÁ ÍÁÒËÉÒÏ×ÁÎÎÁ ÐÅÒÅÍÅÎÎÏÊ, "
+        "ÞÅÒÅÚ ËÏÔÏÒÕÀ ÄÏÓÔÕÐÅÎ ÕËÁÚÙ×ÁÅÍÙÊ ËÌÁÓÓ ÉÌÉ ÓÔÒÕËÔÕÒÁ. \n"
+        "</ul>\n";
+    }
+    QCString trLegend()
+    {
+      return "ÔÏÌËÏ×ÁÎÉÅ";
+    }
+    QCString trTest()
+    {
+      return "ôÅÓÔ";
+    }
+    QCString trTestList()
+    {
+      return "óÐÉÓÏË ôÅÓÔÏ×";
+    }
+
 };
 
 #endif
diff --git a/src/util.cpp b/src/util.cpp
index d2691ce..36c9e77 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -491,6 +491,10 @@ void linkifyText(const TextGeneratorIntf &out,const char *scName,const char *nam
         out.writeBreak();
         out.writeString(splitText.right(splitLength-i-1));
       } 
+      else
+      {
+        out.writeString(splitText); 
+      }
       floatingIndex=splitLength-i-1;
     }
     else