Release-1.2.11-20011021

12 files changed, 1229 insertions, 317 deletions

diff --git a/src/classdef.cpp b/src/classdef.cpp
index 8111928..24ca56f 100644
--- a/src/classdef.cpp
+++ b/src/classdef.cpp
@@ -1232,7 +1232,8 @@ void ClassDef::writeMemberList(OutputList &ol)
   ol.writeObjectLink(getReference(),getOutputFileBase(),0,name());
   parseText(ol,theTranslator->trIncludingInheritedMembers());
   
-  ol.startItemList();
+  //ol.startItemList();
+  ol.writeString("<table>\n");
   
   //MemberNameInfo *mni=m_allMemberNameInfoList->first();
   MemberNameInfoSDict::Iterator mnii(*m_allMemberNameInfoSDict); 
@@ -1244,17 +1245,6 @@ void ClassDef::writeMemberList(OutputList &ol)
     {
       MemberDef *md=mi->memberDef;
       ClassDef  *cd=md->getClassDef();
-      
-      // compute the protection level for this member
-      //Protection prot=md->protection();
-      //if (mi->prot==Protected) // inherited protection: Protected
-      //{
-      //  if (prot==Public) prot=Protected;
-      //}
-      //else if (mi->prot==Private) // inherited protection: Private
-      //{
-      //  prot=Private;
-      //}
       Protection prot = mi->prot;
       
       //printf("%s: Member %s of class %s md->protection()=%d mi->prot=%d prot=%d inherited=%d\n",
@@ -1268,23 +1258,15 @@ void ClassDef::writeMemberList(OutputList &ol)
         rmd  = rmd->reimplements();
       }
 
-      if (cd && !md->name().isEmpty() && md->name()[0]!='@' 
-          // && 
-          //(
-          // md->isFriend() 
-           // || 
-           //(/*mi->prot!=Private &&*/ 
-           // (prot!=Private || Config_getBool("EXTRACT_PRIVATE"))
-           //)
-          //)
-         )
+      if (cd && !md->name().isEmpty() && md->name()[0]!='@')
       {
         bool memberWritten=FALSE;
         if (cd->isLinkable() && md->isLinkable()) 
           // create a link to the documentation
         {
           QCString name=mi->ambiguityResolutionScope+md->name();
-          ol.writeListItem();
+          //ol.writeListItem();
+          ol.writeString("  <tr bgcolor=\"#f0f0f0\"><td>");
           ol.writeObjectLink(cd->getReference(),cd->getOutputFileBase(),
               md->anchor(),name);
           if ( md->isFunction() || md->isSignal() || md->isSlot() ||
@@ -1298,13 +1280,15 @@ void ClassDef::writeMemberList(OutputList &ol)
             ol.docify(" typedef");
           else if (md->isFriend() && !strcmp(md->typeString(),"friend class"))
             ol.docify(" class");
-          ol.writeString("\n");
+          //ol.writeString("\n");
+          ol.writeString("</td>");
           memberWritten=TRUE;
         }
         else if (!Config_getBool("HIDE_UNDOC_MEMBERS")) // no documentation, 
                                   // generate link to the class instead.
         {
-          ol.writeListItem();
+          //ol.writeListItem();
+          ol.writeString("  <tr bgcolor=\"#f0f0f0\"><td>");
           ol.startBold();
           ol.docify(md->name());
           ol.endBold();
@@ -1329,8 +1313,17 @@ void ClassDef::writeMemberList(OutputList &ol)
             ol.endBold();
           }
           ol.writeString(")");
+          ol.writeString("</td>");
           memberWritten=TRUE;
         }
+        if (memberWritten)
+        {
+          ol.writeString("<td>");
+          ol.writeObjectLink(cd->getReference(),cd->getOutputFileBase(),
+                             0,cd->name());
+          ol.writeString("</td>");
+          ol.writeString("<td>");
+        }
         if ((prot!=Public || virt!=Normal || 
              md->isFriend() || md->isRelated() || md->isExplicit() ||
              md->isMutable() || (md->isInline() && Config_getBool("INLINE_INFO")) ||
@@ -1368,11 +1361,19 @@ void ClassDef::writeMemberList(OutputList &ol)
           ol.docify("]");
           ol.endTypewriter();
         }
+        if (memberWritten)
+        {
+          ol.writeString("</td>");
+          ol.writeString("</tr>\n");
+        }
       }
       mi=mni->next();
     }
   }
-  ol.endItemList();
+  //ol.endItemList();
+
+  ol.writeString("</table>");
+  
   endFile(ol);
   ol.popGeneratorState();
 }
diff --git a/src/code.l b/src/code.l
index 1a662af..d55da72 100644
--- a/src/code.l
+++ b/src/code.l
@@ -77,7 +77,6 @@ class CodeVarDef
     QCString classScope;
 };
 
-typedef QList<CodeClassDef> CodeClassList; 
 typedef QDict<CodeClassDef> CodeClassDict;
 typedef QList<CodeVarDef>   CodeVarList; 
 
@@ -86,7 +85,6 @@ typedef QList<CodeVarDef>   CodeVarList;
  */
   
 static OutputDocInterface * g_code;
-//static CodeClassList g_codeClassList;
 static CodeClassDict g_codeClassDict(1009);
 static CodeVarList   g_codeVarList;
 static CodeVarList   g_codeParmList;
diff --git a/src/doc.l b/src/doc.l
index 3b06654..d0397f1 100644
--- a/src/doc.l
+++ b/src/doc.l
@@ -864,7 +864,7 @@ FILE      ({FILESCHAR}*{FILEECHAR}+("."{FILESCHAR}*{FILEECHAR}+)*)|("\""[^\n\"]+
 ID        [a-z_A-Z][a-z_A-Z0-9]*
 SCOPENAME (({ID}?{BN}*"::"{BN}*)*)((~{BN}*)?{ID})
 SCOPEMASK {ID}?(("::"|"#")?(~)?{ID})+
-URLMASK   [a-z_A-Z0-9\~\:\?\@\&\%\#\.\-\+\/\=]+
+URLMASK   ([^\>\"\n]+)|([a-z_A-Z0-9\~\:\?\@\&\%\#\.\-\+\/\=]+)
 NONTERM   [\{\}\[\]\`\~\@\|\-\+\#\$\/\\\!\%\^\&\*()a-z_A-Z<>0-9\x80-\xff]
 WORD      ({NONTERM}+([^\n\t ]*{NONTERM}+)?)|("\""[^\n\"]"\"")
 ATTR      ({B}+[^>\n]*)?
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index 1605da3..9d3788f 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -2421,6 +2421,10 @@ static void findUsedClassesForClass(Entry *root,
           ClassDef *usedCd = Doxygen::hiddenClasses.find(type);
           if (usedCd==0 && !Config_getBool("HIDE_UNDOC_RELATIONS"))
           {
+             if (type.right(2)=="(*") // type is a function pointer
+             {
+               type+=md->argsString();
+             }
              Debug::print(Debug::Classes,0,"  New undocumented used class `%s'\n", type.data());
              usedCd = new ClassDef(
                masterCd->getDefFileName(),masterCd->getDefLine(),
@@ -5012,19 +5016,23 @@ static void generateClassDocs()
   for ( ; cli.current() ; ++cli )
   {
     ClassDef *cd=cli.current();
-    if ( cd->isLinkableInProject() && cd->templateMaster()==0 &&
-        (cd->getOuterScope()==0 || // <-- should not happen
-         cd->getOuterScope()==Doxygen::globalScope
-        )
-       ) // skip external references, anonymous compounds and 
-         // template instances and nested classes
+   
+    if (cd->getOuterScope()==0 || // <-- should not happen, but can if we read an old tag file
+        cd->getOuterScope()==Doxygen::globalScope // only look at global classes
+       ) 
     {
-      msg("Generating docs for compound %s...\n",cd->name().data());
-      
-      cd->writeDocumentation(*outputList);
-      cd->writeMemberList(*outputList);
+      // skip external references, anonymous compounds and 
+      // template instances 
+      if ( cd->isLinkableInProject() && cd->templateMaster()==0)
+      {
+        msg("Generating docs for compound %s...\n",cd->name().data());
+
+        cd->writeDocumentation(*outputList);
+        cd->writeMemberList(*outputList);
+      }
+      // even for undocumented classes, the inner classes can be documented.
+      cd->writeDocumentationForInnerClasses(*outputList);
     }
-    cd->writeDocumentationForInnerClasses(*outputList);
   }
 }
 
@@ -5607,6 +5615,7 @@ static void generateNamespaceDocs()
   
   NamespaceSDict::Iterator nli(Doxygen::namespaceSDict);
   NamespaceDef *nd;
+  // for each namespace...
   for (;(nd=nli.current());++nli)
   {
     if (nd->isLinkableInProject())
@@ -5614,12 +5623,12 @@ static void generateNamespaceDocs()
       msg("Generating docs for namespace %s\n",nd->name().data());
       nd->writeDocumentation(*outputList);
     }
-    ClassSDict::Iterator cli(Doxygen::classSDict);
+    // for each class in the namespace...
+    ClassSDict::Iterator cli(*nd->classSDict);
     for ( ; cli.current() ; ++cli )
     {
       ClassDef *cd=cli.current();
-      if ( cd->getOuterScope()==nd &&
-           cd->isLinkableInProject() && 
+      if ( cd->isLinkableInProject() && 
            cd->templateMaster()==0
          ) // skip external references, anonymous compounds and 
            // template instances and nested classes
@@ -6965,7 +6974,7 @@ void parseInput()
   msg("Building page list...\n");
   buildPageList(root);
 
-  msg("Buidling package list...\n");
+  msg("Building package list...\n");
   buildPackageList(root);
 
   msg("Search for main page...\n");
diff --git a/src/doxytag.l b/src/doxytag.l
index b8f1279..1afe949 100644
--- a/src/doxytag.l
+++ b/src/doxytag.l
@@ -391,6 +391,7 @@ QCString unhtmlify(const char *str)
 <ReadArgs>"&amp;"		   { memberArgs+="&"; }
 <ReadArgs>"&lt;"		   { memberArgs+="<"; }
 <ReadArgs>"&gt;"		   { memberArgs+=">"; }
+<ReadArgs>"&nbsp;"		   { memberArgs+=" "; }
   /*
 <ReadArgs>[{}]			   { // handle enums
   				     memberArgs.resize(0);
diff --git a/src/latexgen.cpp b/src/latexgen.cpp
index 1e42ee8..7b2b2bb 100644
--- a/src/latexgen.cpp
+++ b/src/latexgen.cpp
@@ -1265,6 +1265,7 @@ void LatexGenerator::docify(const char *str)
   static bool isKorean    = theTranslator->idLanguage()=="korean";
   static bool isRussian   = theTranslator->idLanguage()=="russian";
   static bool isUkrainian = theTranslator->idLanguage()=="ukrainian";
+  static bool isChinese   = theTranslator->idLanguage()=="chinese";
   if (str)
   {
     const unsigned char *p=(const unsigned char *)str;
@@ -1329,9 +1330,9 @@ void LatexGenerator::docify(const char *str)
                      break;
 
           default:   
-
-             if (isJapanese || isKorean)
-             { // Japanese language uses wide characters
+             // Some languages uses wide characters
+             if (isJapanese || isKorean || isChinese)
+             { 
                if (c>=128) 
                {
                  t << (char)c;
diff --git a/src/scanner.l b/src/scanner.l
index 43ed58f..5873d2e 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -3051,7 +3051,7 @@ CHARLIT   (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
                                               );
   					  yyLineNr++;
   					}
-<PackageDocArg1>{SCOPENAME}		{
+<PackageDocArg1>{ID}("."{ID})*		{
   					  current->name = yytext;
 					  newDocState();
   					}
diff --git a/src/translator_cn.h b/src/translator_cn.h
index b85aad2..30375d7 100644
--- a/src/translator_cn.h
+++ b/src/translator_cn.h
@@ -26,245 +26,489 @@
 */
 #define CN_SPC
 
-class TranslatorChinese : public TranslatorAdapter_1_2_1
+class TranslatorChinese : public Translator
 {
   public:
-    QCString idLanguage()
+		/*! Used for identification of the language. The identification
+		 * should not be translated. It should be replaced by the name
+		 * of the language in English using lower-case characters only
+		 * (e.g. "czech", "japanese", "russian", etc.). It sould be equal to
+		 * the identification used in the language.cpp.
+		 */
+    virtual QCString idLanguage()
     { return "chinese"; }
-    QCString idLanguageCharset()
+
+		/*! Used to get the LaTeX command(s) for the language support. 
+		 * This method should return string with commands that switch
+		 * LaTeX to the desired language.  For example 
+		 * <pre>"\\usepackage[german]{babel}\n"
+		 * </pre>
+		 * or
+		 * <pre>"\\usepackage{polski}\n"
+		 * "\\usepackage[latin2]{inputenc}\n"
+		 * "\\usepackage[T1]{fontenc}\n"
+		 * </pre>
+		 * 
+		 * The English LaTeX does not use such commands.  Because of this
+		 * the empty string is returned in this implementation.
+		 */
+		virtual QCString latexLanguageSupportCommand()
+		{
+   		QCString result(latexBabelPackage());
+      if (!result.isEmpty())
+      {
+        result = "\\usepackage{" + result;
+        result += "}\n";
+      }
+      return result;
+		}
+
+    virtual QCString latexBabelPackage()
+    { return "CJK"; }
+
+		/*! return the language charset. This will be used for the HTML output */
+    virtual QCString idLanguageCharset()
     { return "gb2312"; }
-    QCString latexBabelPackage()
-    { return "chinese"; }
-    QCString trRelatedFunctions()
+
+		/*! used in the compound documentation before a list of related functions. 
+		 */
+    virtual QCString trRelatedFunctions()
     { return "Ïà¹Øº¯Êý"; }
-    QCString trRelatedSubscript()
-    { return "£¨×¢Ò⣺ÕâЩ²»ÊdzÉÔ±º¯Êý£©"; }
-    QCString trDetailedDescription()
-    { return "ÏêϤÃèÊö"; }
-    QCString trMemberTypedefDocumentation()
+
+		/*! subscript for the related functions. */
+    virtual QCString trRelatedSubscript()
+    { return "£¨×¢Ò⣺ÕâЩ²»ÊdzÉÔ±º¯Êý¡££©"; }
+
+		/*! header that is put before the detailed description of files, 
+		 * classes and namespaces. 
+		 */
+    virtual QCString trDetailedDescription()
+    { return "ÏêϸÃèÊö"; }
+
+		/*! header that is put before the list of typedefs. */
+    virtual QCString trMemberTypedefDocumentation()
     { return "³ÉÔ±ÀàÐͶ¨ÒåÎĵµ"; }
-    QCString trMemberEnumerationDocumentation()
+
+		/*! header that is put before the list of enumerations. */
+    virtual QCString trMemberEnumerationDocumentation()
     { return "³ÉԱö¾ÙÀàÐÍÎĵµ"; }
-    QCString trEnumerationValueDocumentation()
+
+    virtual QCString trEnumerationValueDocumentation()
     { return "³ÉԱö¾ÙÖµÎĵµ"; }
-    QCString trMemberFunctionDocumentation()
+
+		/*! header that is put before the list of member function. */
+    virtual QCString trMemberFunctionDocumentation()
     { return "³ÉÔ±º¯ÊýÎĵµ"; }
-    QCString trMemberDataDocumentation()
-    { return "³ÉÔ±Êý¾ÝÎĵµ"; }
-    QCString trMore()
+
+		/*! header that is put before the list of member attributes. */
+    virtual QCString trMemberDataDocumentation()
+    { 
+			if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) 
+			{
+				return "×Ö¶ÎÎĵµ"; 
+			}
+			else {
+				return "³ÉÔ±Êý¾ÝÎĵµ"; 
+			}
+		}
+
+		/*! this is the text of a link put after brief descriptions. */
+    virtual QCString trMore()
     { return "¸ü¶à..."; }
-    QCString trListOfAllMembers()
+
+		/*! put in the class documention */
+    virtual QCString trListOfAllMembers()
     { return "ËùÓгÉÔ±µÄÁÐ±í¡£"; }
-    QCString trMemberList()
+
+		/*! used as the title of the "list of all members" page of a class */
+    virtual QCString trMemberList()
     { return "³ÉÔ±Áбí"; }
-    QCString trThisIsTheListOfAllMembers()
+
+		/*! this is the first part of a sentence that is followed by a class name */
+    virtual QCString trThisIsTheListOfAllMembers()
     { return "³ÉÔ±µÄÍêÕûÁÐ±í£¬ÕâЩ³ÉÔ±ÊôÓÚ"CN_SPC; }
-    QCString trIncludingInheritedMembers()
+
+		/*! this is the remainder of the sentence after the class name */
+    virtual QCString trIncludingInheritedMembers()
     { return "£¬°üÀ¨ËùÓм̳жøÀ´µÄ³ÉÔ±"; }
-    QCString trGeneratedAutomatically(const char *s)
-    { QCString result;
+
+		/*! 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;
       if (s) result=(QCString)"Ϊ"CN_SPC+s+"£¬";
       result+="ÓÉ"CN_SPC"Doyxgen"CN_SPC"ͨ¹ý·ÖÎöÔ´´úÂë×Ô¶¯Éú³É¡£"; 
       return result;
     }
-    QCString trEnumName()
+
+		/*! put after an enum name in the list of all members */
+    virtual QCString trEnumName()
     { return "ö¾ÙÃû³Æ"; }
-    QCString trEnumValue()
+
+		/*! put after an enum value in the list of all members */
+    virtual QCString trEnumValue()
     { return "ö¾ÙÖµ"; }
-    QCString trDefinedIn()
+
+		/*! put after an undocumented member in the list of all members */
+    virtual QCString trDefinedIn()
     { return "¶¨ÒåÓÚ"CN_SPC; }
-    QCString trVerbatimText(const char *f)
+
+		// quick reference sections
+
+
+    virtual QCString trVerbatimText(const char *f)
     { return (QCString)"ÕâÊÇÍ·Îļþ"CN_SPC+f+CN_SPC"µÄÔ´´úÂë¡£"; }
-    QCString trModules()
+
+		/*! 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 "Ä£¿é"; }
-    QCString trClassHierarchy()
+
+		/*! This is put above each page as a link to the class hierarchy */
+ 		virtual QCString trClassHierarchy()
     { return "Àà¼Ì³Ð¹Øϵ"; }
-    QCString trCompoundList()
-    { return "×éºÏÀàÐÍÁбí"; }
-    QCString trFileList()
+
+		/*! This is put above each page as a link to the list of annotated class */
+ 		virtual QCString trCompoundList()
+    { 
+			if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) {
+				return "Êý¾Ý½á¹¹"; 
+			}
+			else {
+				return "×éºÏÀàÐÍÁбí"; 
+			}
+		}
+
+		/*! This is put above each page as a link to the list of documented files */
+    virtual QCString trFileList()
     { return "ÎļþÁбí"; }
-    QCString trHeaderFiles()
+
+
+		/*! This is put above each page as a link to the list of all verbatim headers */
+    virtual QCString trHeaderFiles()
     { return "Í·Îļþ"; }
-    QCString trCompoundMembers()
-    { return "×éºÏÀàÐͳÉÔ±"; }
-    QCString trFileMembers()
-    { return "Îļþ³ÉÔ±"; }
-    QCString trRelatedPages()
+
+		/*! 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 "Êý¾Ý×Ö¶Î"; 
+			}
+			else {
+				return "×éºÏÀàÐͳÉÔ±"; 
+			}
+		}
+
+		/*! This is put above each page as a link to all member of files. */
+    virtual QCString trFileMembers()
+    { 
+			if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) {
+				return "È«¾Ö¶¨Òå"; 
+			} else {
+				return "Îļþ³ÉÔ±"; 
+			}
+		}
+
+		/*! This is put above each page as a link to all related pages. */
+    virtual QCString trRelatedPages()
     { return "Ïà¹ØÒ³Ãæ"; }
-    QCString trExamples()
+
+		/*! This is put above each page as a link to all examples. */
+    virtual QCString trExamples()
     { return "ʾÀý"; }
-    QCString trSearch()
+
+    virtual QCString trSearch()
     { return "ËÑË÷"; }
-    QCString trClassHierarchyDescription()
+
+    virtual QCString trClassHierarchyDescription()
     { return "´ËÁбí»ù±¾°´×Öµä˳ÐòÅÅÐò£º"; }
-    QCString trFileListDescription(bool extractAll)
+
+    virtual QCString trFileListDescription(bool extractAll)
     {
-      QCString result="ÕâÀïÁгöËùÓÐ";
+   		QCString result="ÕâÀïÁгöËùÓÐ";
       if (!extractAll) result+="Îĵµ»¯µÄ";
       result+="Îļþ£¬¸½´ø¼òҪ˵Ã÷£º";
       return result;
     }
-    QCString trCompoundListDescription()
-    { return "ÕâÀïÁгöËùÓÐÀà¡¢½á¹¹¡¢ÁªºÏÒÔ¼°½Ó¿Ú¶¨Ò壬¸½´ø¼òҪ˵Ã÷£º"; 
+
+    virtual QCString trCompoundListDescription()
+    { 
+
+			if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+			{
+				return "ÕâÀïÁгöËùÓÐÊý¾Ý½á¹¹£¬¸½´ø¼òҪ˵Ã÷£º"; 
+			}
+			else
+			{
+				return "ÕâÀïÁгöËùÓÐÀà¡¢½á¹¹¡¢ÁªºÏÒÔ¼°½Ó¿Ú¶¨Ò壬¸½´ø¼òҪ˵Ã÷£º"; 
+			}
     }
-    QCString trCompoundMembersDescription(bool extractAll)
+
+    virtual QCString trCompoundMembersDescription(bool extractAll)
     {
-      QCString result="ÕâÀïÁгöËùÓÐ";
-      if (!extractAll) result+="Îĵµ»¯µÄ";
-      result+="Àà³ÉÔ±£¬¸½´ø";
-      if (extractAll) result+="ËùÔÚÀàµÄÎĵµµÄÁ´½Ó£º";
-      else result+="ËùÔÚÀàµÄÁ´½Ó£º";
+   		QCString result="ÕâÀïÁгöËùÓÐ";
+      if (!extractAll) {
+				result+="Îĵµ»¯µÄ";
+			}
+			if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) {
+				result+="½á¹¹ºÍÁªºÏµÄ³ÉÔ±£¬¸½´ø";
+			}
+			else {
+				result+="Àà³ÉÔ±£¬¸½´ø";
+			}
+
+      if (extractAll) {
+				if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) {
+					result+="ËùÔڽṹ£¯ÁªºÏµÄÎĵµµÄÁ´½Ó£º";
+				}
+				else {
+					result+="ËùÔÚÀàµÄÎĵµµÄÁ´½Ó£º";
+				}
+			}
+      else {
+				if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) {
+					result+="ËùÊô½á¹¹£¯ÁªºÏµÄÁ´½Ó£º";
+				}
+				else {
+					result+="ËùÊôÀàµÄÁ´½Ó£º";
+				}
+			}
       return result;
     }
-    QCString trFileMembersDescription(bool extractAll)
+
+    virtual QCString trFileMembersDescription(bool extractAll)
     {
-      QCString result="ÕâÀïÁгöËùÓÐ";
-      if (!extractAll) result+="Îĵµ»¯µÄ";
-      result+="Îļþ³ÉÔ±£¬¸½´ø";
-      if (extractAll) result+="ËùÔÚÎļþµÄÎĵµµÄÁ´½Ó£º";
-      else result+="ËùÔÚÎļþµÄÁ´½Ó£º";
+   		QCString result="ÕâÀïÁгöËùÓÐ";
+      if (!extractAll) 
+				result +="Îĵµ»¯µÄ";
+
+			if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) {
+				result +="º¯Êý£¬±äÁ¿£¬ºê£¬Ã¶¾ÙºÍÀàÐͶ¨Ò壬¸½´ø";
+			} 
+			else {
+				result +="Îļþ³ÉÔ±£¬¸½´ø";
+			}
+
+      if (extractAll) 
+				result+="ËùÔÚÎļþµÄÎĵµµÄÁ´½Ó£º";
+      else 
+				result+="ËùÔÚÎļþµÄÁ´½Ó£º";
       return result;
     }
-    QCString trHeaderFilesDescription()
+
+    virtual QCString trHeaderFilesDescription()
     { return "ÕâÀïÁгö×é³ÉAPIµÄÍ·Îļþ£º"; }
-    QCString trExamplesDescription()
+
+    virtual QCString trExamplesDescription()
     { return "ÕâÀïÁгöËùÓÐʾÀý£º"; }
-    QCString trRelatedPagesDescription()
+
+    virtual QCString trRelatedPagesDescription()
     { return "ÕâÀïÁгöËùÓÐÏà¹ØµÄÒ³Ã棺"; }
-    QCString trModulesDescription()
+
+    virtual QCString trModulesDescription()
     { return "ÕâÀïÁгöËùÓÐÄ£¿é"; }
-    QCString trNoDescriptionAvailable()
+
+    virtual QCString trNoDescriptionAvailable()
     { return "ÎÞ¿ÉÓÃÎĵµ"; }
 
-    QCString trDocumentation()
+    virtual QCString trDocumentation()
     { return "Îĵµ"; }
-    QCString trModuleIndex()
+
+    virtual QCString trModuleIndex()
     { return "Ä£¿éË÷Òý"; }
-    QCString trHierarchicalIndex()
+
+    virtual QCString trHierarchicalIndex()
     { return "¼Ì³Ð¹ØϵË÷Òý"; }
-    QCString trCompoundIndex()
-    { return "×éºÏÀàÐÍË÷Òý"; }
-    QCString trFileIndex() 
+
+    virtual QCString trCompoundIndex()
+    { 
+			if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+			{
+				return "Êý¾Ý½á¹¹Ë÷Òý"; 
+			} 
+			else {
+				return "×éºÏÀàÐÍË÷Òý"; 
+			}
+		}
+
+    virtual QCString trFileIndex() 
     { return "ÎļþË÷Òý"; }
-    QCString trModuleDocumentation()
+
+    virtual QCString trModuleDocumentation()
     { return "Ä£¿éÎĵµ"; }
-    QCString trClassDocumentation()
-    { return "ÀàÎĵµ"; }
-    QCString trFileDocumentation()
+
+    virtual QCString trClassDocumentation()
+    { 
+			if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+			{
+				return "Êý¾Ý½á¹¹Îĵµ";
+			}
+			else {
+				return "ÀàÎĵµ"; 
+			}
+		}
+
+    virtual QCString trFileDocumentation()
     { return "ÎļþÎĵµ"; }
-    QCString trExampleDocumentation()
+
+    virtual QCString trExampleDocumentation()
     { return "ʾÀýÎĵµ"; }
-    QCString trPageDocumentation()
+
+    virtual QCString trPageDocumentation()
     { return "Ò³ÃæÎĵµ"; }
-    QCString trReferenceManual()
+
+    virtual QCString trReferenceManual()
     { return "²Î¿¼ÊÖ²á"; }
 
-    QCString trDefines()
+    virtual QCString trDefines()
     { return "ºê¶¨Òå"; }
-    QCString trFuncProtos()
+
+    virtual QCString trFuncProtos()
     { return "º¯ÊýÔ­ÐÍ"; }
-    QCString trTypedefs()
+
+    virtual QCString trTypedefs()
     { return "ÀàÐͶ¨Òå"; }
-    QCString trEnumerations()
+
+    virtual QCString trEnumerations()
     { return "ö¾Ù"; }
-    QCString trFunctions()
+
+    virtual QCString trFunctions()
     { return "º¯Êý"; }
-    QCString trVariables()
+
+    virtual QCString trVariables()
     { return "±äÁ¿"; }
-    QCString trEnumerationValues()
+
+    virtual QCString trEnumerationValues()
     { return "ö¾ÙÖµ"; }
-    QCString trAuthor()
+
+    virtual QCString trAuthor()
     { return "×÷Õß"; }
-    QCString trDefineDocumentation()
+
+ 		virtual QCString trDefineDocumentation()
     { return "ºê¶¨ÒåÎĵµ"; }
-    QCString trFunctionPrototypeDocumentation()
+
+ 		virtual QCString trFunctionPrototypeDocumentation()
     { return "º¯ÊýÔ­ÐÍÎĵµ"; }
-    QCString trTypedefDocumentation()
+
+ 		virtual QCString trTypedefDocumentation()
     { return "ÀàÐͶ¨ÒåÎĵµ"; }
-    QCString trEnumerationTypeDocumentation()
+
+ 		virtual QCString trEnumerationTypeDocumentation()
     { return "ö¾ÙÀàÐÍÎĵµ"; }
-    QCString trFunctionDocumentation()
+
+ 		virtual QCString trFunctionDocumentation()
     { return "º¯ÊýÎĵµ"; }
-    QCString trVariableDocumentation()
+
+ 		virtual QCString trVariableDocumentation()
     { return "±äÁ¿Îĵµ"; }
-    QCString trCompounds()
-    { return "×éºÏÀàÐÍ"; }
-    QCString trFiles()
+
+ 		virtual QCString trCompounds()
+    { 
+			if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+			{ 
+				return "Êý¾Ý½á¹¹";
+			}
+			else {
+				return "×éºÏÀàÐÍ"; 
+			}
+		}
+
+ 		virtual QCString trFiles()
     { return "Îļþ"; }
-    QCString trGeneratedAt(const char *date,const char *projName)
+
+ 		virtual QCString trGeneratedAt(const char *date,const char *projName)
     { 
-      QCString result=(QCString)"Generated at "+date;
+   		QCString result=(QCString)"Generated at "+date;
       if (projName) result+=(QCString)" for "+projName;
       result+=(QCString)" by";
       return result;
     }
-    QCString trWrittenBy()
+
+ 		virtual QCString trWrittenBy()
     {
       return "written by";
     }
-    QCString trClassDiagram(const char *clName)
+
+ 		virtual QCString trClassDiagram(const char *clName)
     {
       return (QCString)"¼Ì³Ðͼ£¬Àà"CN_SPC+clName;
     }
-    QCString trForInternalUseOnly()
+
+ 		virtual QCString trForInternalUseOnly()
     { return "½öÏÞÄÚ²¿Ê¹Óá£"; }
-    QCString trReimplementedForInternalReasons()
+
+ 		virtual QCString trReimplementedForInternalReasons()
     { return "ÓÉÓÚÄÚ²¿Ô­Òò±»ÖØÔØ£»µ«²»Ó°ÏìAPI"; 
     }
-    QCString trWarning()
+
+ 		virtual QCString trWarning()
     { return "¾¯¸æ"; }
-    QCString trBugsAndLimitations()
+
+ 		virtual QCString trBugsAndLimitations()
     { return "BUG"CN_SPC"Óë¾ÖÏÞ"; }
-    QCString trVersion()
+
+ 		virtual QCString trVersion()
     { return "°æ±¾"; }
-    QCString trDate()
+
+ 		virtual QCString trDate()
     { return "ÈÕÆÚ"; }
-    QCString trAuthors()
+
+ 		virtual QCString trAuthors()
     { return "×÷Õß"; }
-    QCString trReturns()
+
+ 		virtual QCString trReturns()
     { return "·µ»Ø"; }
-    QCString trSeeAlso()
+
+ 		virtual QCString trSeeAlso()
     { return "²Î¼û"; }
-    QCString trParameters()
+
+ 		virtual QCString trParameters()
     { return "²ÎÊý"; }
-    QCString trExceptions()
+
+ 		virtual QCString trExceptions()
     { return "Òì³£"; }
-    QCString trGeneratedBy()
+
+ 		virtual QCString trGeneratedBy()
     { return "ÖÆ×÷Õß"; }
     
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990307 
 //////////////////////////////////////////////////////////////////////////
     
-    QCString trNamespaceList()
-    { return "ÃüÃû¿Õ¼äÁбí"; }
-    QCString trNamespaceListDescription(bool extractAll)
+ 		virtual QCString trNamespaceList()
+    { return "Ãû×Ö¿Õ¼äÁбí"; }
+
+ 		virtual QCString trNamespaceListDescription(bool extractAll)
     {
-      QCString result="ÕâÀïÁгöËùÓÐ";
+   		QCString result="ÕâÀïÁгöËùÓÐ";
       if (!extractAll) result+="Îĵµ»¯µÄ";
-      result+="ÃüÃû¿Õ¼ä¶¨Ò壬¸½´ø¼òҪ˵Ã÷£º";
+      result+="Ãû×ֿռ䶨Ò壬¸½´ø¼òҪ˵Ã÷£º";
       return result;
     }
-    QCString trFriends()
+
+ 		virtual QCString trFriends()
     { return "ÓÑÔª"; }
 
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990405
 //////////////////////////////////////////////////////////////////////////
     
-    QCString trRelatedFunctionDocumentation()
+ 		virtual QCString trRelatedFunctionDocumentation()
     { return "ÓÑÔª¼°Ïà¹Øº¯ÊýÎĵµ"; }
     
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990425
 //////////////////////////////////////////////////////////////////////////
 
-    QCString trCompoundReference(const char *clName,
+ 		virtual QCString trCompoundReference(const char *clName,
                                  ClassDef::CompoundType compType,
                                  bool isTemplate)
       // used as the title of the HTML page of a class/struct/union
     {
-      QCString result=(QCString)clName;
+   		QCString result=(QCString)clName;
       if (isTemplate) result+=CN_SPC"Ä£°å";
       switch(compType)
       {
@@ -277,49 +521,61 @@ class TranslatorChinese : public TranslatorAdapter_1_2_1
       result+="²Î¿¼";
       return result;
     }
-    QCString trFileReference(const char *fileName)
+
+ 		virtual QCString trFileReference(const char *fileName)
       // used as the title of the HTML page of a file
     {
-      QCString result=fileName;
+   		QCString result=fileName;
       result+=CN_SPC"Îļþ²Î¿¼"; 
       return result;
     }
-    QCString trNamespaceReference(const char *namespaceName)
+
+ 		virtual QCString trNamespaceReference(const char *namespaceName)
       // used as the title of the HTML page of a namespace
     {
-      QCString result=namespaceName;
-      result+=CN_SPC"ÃüÃû¿Õ¼ä²Î¿¼";
+   		QCString result=namespaceName;
+      result+=CN_SPC"Ãû×Ö¿Õ¼ä²Î¿¼";
       return result;
     }
     
     // these are for the member sections of a class, struct or union 
-    QCString trPublicMembers()
+ 		virtual QCString trPublicMembers()
     { return "¹«ÓгÉÔ±"; }
-    QCString trPublicSlots()
+
+ 		virtual QCString trPublicSlots()
     { return "¹«ÓвÛ"; }
-    QCString trSignals()
+
+ 		virtual QCString trSignals()
     { return "ÐźÅ"; }
-    QCString trStaticPublicMembers()
+
+ 		virtual QCString trStaticPublicMembers()
     { return "¾²Ì¬¹«ÓгÉÔ±"; }
-    QCString trProtectedMembers()
+
+ 		virtual QCString trProtectedMembers()
     { return "±£»¤³ÉÔ±"; }
-    QCString trProtectedSlots()
+
+ 		virtual QCString trProtectedSlots()
     { return "±£»¤²Û"; }
-    QCString trStaticProtectedMembers()
+
+ 		virtual QCString trStaticProtectedMembers()
     { return "¾²Ì¬±£»¤³ÉÔ±"; }
-    QCString trPrivateMembers()
+		
+ 		virtual QCString trPrivateMembers()
     { return "˽ÓгÉÔ±"; }
-    QCString trPrivateSlots()
+		
+ 		virtual QCString trPrivateSlots()
     { return "˽ÓвÛ"; }
-    QCString trStaticPrivateMembers()
+		
+ 		virtual QCString trStaticPrivateMembers()
     { return "¾²Ì¬Ë½ÓгÉÔ±"; }
+		
     // end of member sections 
     
-    QCString trWriteList(int numEntries)
+ 		virtual QCString trWriteList(int numEntries)
     {
       // this function is used to produce a comma-separated list of items.
       // use generateMarker(i) to indicate where item i should be put.
-      QCString result;
+   		QCString result;
       int i;
       // the inherits list contain `numEntries' classes
       for (i=0;i<numEntries;i++) 
@@ -339,54 +595,60 @@ class TranslatorChinese : public TranslatorAdapter_1_2_1
       return result; 
     }
     
-    QCString trInheritsList(int numEntries)
+ 		virtual QCString trInheritsList(int numEntries)
       // used in class documentation to produce a list of base classes,
       // if class diagrams are disabled.
     {
       return "¼Ì³Ð×Ô"CN_SPC+trWriteList(numEntries)+"¡£";
     }
-    QCString trInheritedByList(int numEntries)
+
+ 		virtual QCString trInheritedByList(int numEntries)
       // used in class documentation to produce a list of super classes,
       // if class diagrams are disabled.
     {
       return "±»"CN_SPC+trWriteList(numEntries)+CN_SPC"¼Ì³Ð.";
     }
-    QCString trReimplementedFromList(int numEntries)
+		
+ 		virtual QCString trReimplementedFromList(int numEntries)
       // used in member documentation blocks to produce a list of 
       // members that are hidden by this one.
     {
       return "ÖØÔØ"CN_SPC+trWriteList(numEntries)+"¡£";
     }
-    QCString trReimplementedInList(int numEntries)
+		
+ 		virtual QCString trReimplementedInList(int numEntries)
     {
       // used in member documentation blocks to produce a list of
       // all member that overwrite the implementation of this member.
       return "±»"CN_SPC+trWriteList(numEntries)+CN_SPC"ÖØÔØ¡£";
     }
 
-    QCString trNamespaceMembers()
+ 		virtual QCString trNamespaceMembers()
       // This is put above each page as a link to all members of namespaces.
-    { return "ÃüÃû¿Õ¼ä³ÉÔ±"; }
-    QCString trNamespaceMemberDescription(bool extractAll)
+    { return "Ãû×Ö¿Õ¼ä³ÉÔ±"; }
+		
+ 		virtual QCString trNamespaceMemberDescription(bool extractAll)
       // This is an introduction to the page with all namespace members
     { 
-      QCString result="ÕâÀïÁгöÁËËùÓÐ";
+   		QCString result="ÕâÀïÁгöÁËËùÓÐ";
       if (!extractAll) result+="Îĵµ»¯µÄ";
-      result+="ÃüÃû¿Õ¼ä³ÉÔ±£¬¸½´ø";
+      result+="Ãû×Ö¿Õ¼ä³ÉÔ±£¬¸½´ø";
       if (extractAll) 
         result+="ËùÔÚÀàµÄÎĵµµÄÁ´½Ó£º";
       else 
         result+="ËùÔÚÀàµÄÁ´½Ó£º";
       return result;
     }
-    QCString trNamespaceIndex()
+
+ 		virtual QCString trNamespaceIndex()
       // This is used in LaTeX as the title of the chapter with the 
       // index of all namespaces.
-    { return "ÃüÃû¿Õ¼äË÷Òý"; }
-    QCString trNamespaceDocumentation()
+    { return "Ãû×Ö¿Õ¼äË÷Òý"; }
+
+ 		virtual QCString trNamespaceDocumentation()
       // This is used in LaTeX as the title of the chapter containing
       // the documentation of all namespaces.
-    { return "ÃüÃû¿Õ¼äÎĵµ"; }
+    { return "Ãû×Ö¿Õ¼äÎĵµ"; }
 
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990522
@@ -395,7 +657,7 @@ class TranslatorChinese : public TranslatorAdapter_1_2_1
     /*! This is used in the documentation before the list of all
      *  namespaces in a file.
      */
-    QCString trNamespaces()
+ 		virtual QCString trNamespaces()
     {
       return "Namespaces";
     }
@@ -407,11 +669,11 @@ class TranslatorChinese : public TranslatorAdapter_1_2_1
     /*! 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.
      */
-    QCString trGeneratedFromFiles(ClassDef::CompoundType compType,
+ 		virtual QCString trGeneratedFromFiles(ClassDef::CompoundType compType,
         bool)
     { // here s is one of " Class", " Struct" or " Union"
       // single is true implies a single file
-      QCString result=(QCString)"¸Ã";
+   		QCString result=(QCString)"¸Ã";
       switch(compType)
       {
         case ClassDef::Class:      result+="Àà"; break;
@@ -427,7 +689,7 @@ class TranslatorChinese : public TranslatorAdapter_1_2_1
     /*! This is in the (quick) index as a link to the alphabetical compound
      * list.
      */
-    QCString trAlphabeticalList()
+ 		virtual QCString trAlphabeticalList()
     { return "°´×Öµä˳ÐòÅÅÐòµÄÁбí"; }
 
 //////////////////////////////////////////////////////////////////////////
@@ -435,33 +697,35 @@ class TranslatorChinese : public TranslatorAdapter_1_2_1
 //////////////////////////////////////////////////////////////////////////
 
     /*! This is used as the heading text for the retval command. */
-    QCString trReturnValues()
+ 		virtual QCString trReturnValues()
     { return "·µ»ØÖµ"; }
 
     /*! This is in the (quick) index as a link to the main page (index.html)
      */
-    QCString trMainPage()
+ 		virtual QCString trMainPage()
     { return "Ê×Ò³"; }
 
     /*! 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()
+ 		virtual QCString trPageAbbreviation()
     { return "p."; }
 
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-991106
 //////////////////////////////////////////////////////////////////////////
 
-    QCString trSources()
+ 		virtual QCString trSources()
     {
       return "Ô´´úÂë";
     }
-    QCString trDefinedAtLineInSourceFile()
+
+ 		virtual QCString trDefinedAtLineInSourceFile()
     {
       return "ÔÚÎļþ"CN_SPC"@1"CN_SPC"µÚ"CN_SPC"@0"CN_SPC"Ðж¨Òå¡£";
     }
-    QCString trDefinedInSourceFile()
+
+ 		virtual QCString trDefinedInSourceFile()
     {
       return "ÔÚÎļþ"CN_SPC"@0"CN_SPC"Öж¨Òå¡£";
     }
@@ -470,7 +734,7 @@ class TranslatorChinese : public TranslatorAdapter_1_2_1
 // new since 0.49-991205
 //////////////////////////////////////////////////////////////////////////
 
-    QCString trDeprecated()
+ 		virtual QCString trDeprecated()
     {
       return "Deprecated";
     }
@@ -480,68 +744,81 @@ class TranslatorChinese : public TranslatorAdapter_1_2_1
 //////////////////////////////////////////////////////////////////////////
 
     /*! this text is put before a collaboration diagram */
-    QCString trCollaborationDiagram(const char *clName)
+ 		virtual QCString trCollaborationDiagram(const char *clName)
     {
       return (QCString)clName+CN_SPC"ºÏ×÷ͼ£º";
     }
+
     /*! this text is put before an include dependency graph */
-    QCString trInclDepGraph(const char *fName)
+ 		virtual QCString trInclDepGraph(const char *fName)
     {
       return (QCString)fName+CN_SPC"°üº¬/ÒÀÀµ¹Øϵͼ£º";
     }
+
     /*! header that is put before the list of constructor/destructors. */
-    QCString trConstructorDocumentation()
+ 		virtual QCString trConstructorDocumentation()
     {
       return "¹¹Ôì¼°Îö¹¹º¯ÊýÎĵµ"; 
     }
+
     /*! Used in the file documentation to point to the corresponding sources. */
-    QCString trGotoSourceCode()
+ 		virtual QCString trGotoSourceCode()
     {
       return "ä¯ÀÀ¸ÃÎļþµÄÔ´´úÂë¡£";
     }
+
     /*! Used in the file sources to point to the corresponding documentation. */
-    QCString trGotoDocumentation()
+ 		virtual QCString trGotoDocumentation()
     {
       return "ä¯ÀÀ¸ÃÎļþµÄÎĵµ¡£";
     }
+
     /*! Text for the \\pre command */
-    QCString trPrecondition()
+ 		virtual QCString trPrecondition()
     {
       return "Ç°ÖÃÌõ¼þ";
     }
+
     /*! Text for the \\post command */
-    QCString trPostcondition()
+ 		virtual QCString trPostcondition()
     {
       return "ºóÖÃÌõ¼þ";
     }
+
     /*! Text for the \\invariant command */
-    QCString trInvariant()
+ 		virtual QCString trInvariant()
     {
       return "²»±äÐÔ";
     }
+
     /*! Text shown before a multi-line variable/enum initialization */
-    QCString trInitialValue()
+ 		virtual QCString trInitialValue()
     {
       return "³õʼ»¯ÐòÁУº";
     }
+
     /*! Text used the source code in the file index */
-    QCString trCode()
+ 		virtual QCString trCode()
     {
       return "´úÂë";
     }
-    QCString trGraphicalHierarchy()
+
+ 		virtual QCString trGraphicalHierarchy()
     {
       return "Àà¼Ì³Ð¹Øϵͼ";
     }
-    QCString trGotoGraphicalHierarchy()
+
+ 		virtual QCString trGotoGraphicalHierarchy()
     {
       return "ä¯ÀÀÀà¼Ì³Ð¹Øϵͼ";
     }
-    QCString trGotoTextualHierarchy()
+
+ 		virtual QCString trGotoTextualHierarchy()
     {
       return "ä¯ÀÀÀà¼Ì³Ð¹Øϵ±í";
     }
-    QCString trPageIndex()
+
+ 		virtual QCString trPageIndex()
     {
       return "Ò³ÃæË÷Òý";
     }
@@ -550,43 +827,58 @@ class TranslatorChinese : public TranslatorAdapter_1_2_1
 // new since 1.1.0
 //////////////////////////////////////////////////////////////////////////
     
-    QCString trNote()
+ 		virtual QCString trNote()
     {
       return "×¢½â";
     }
-    QCString trPublicTypes()
+
+ 		virtual QCString trPublicTypes()
     {
       return "¹«ÓÐÀàÐÍ";
     }
-    QCString trPublicAttribs()
+
+ 		virtual QCString trPublicAttribs()
     {
-      return "¹«ÓÐÊôÐÔ";
+			 if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+			 { 
+				 return "Êý¾Ý³ÉÔ±";
+			 }
+			 else {
+				 return "¹«ÓÐÊôÐÔ";
+			 }
     }
-    QCString trStaticPublicAttribs()
+
+ 		virtual QCString trStaticPublicAttribs()
     {
       return "¾²Ì¬¹«ÓÐÊôÐÔ";
     }
-    QCString trProtectedTypes()
+
+ 		virtual QCString trProtectedTypes()
     {
       return "±£»¤ÀàÐÍ";
     }
-    QCString trProtectedAttribs()
+
+ 		virtual QCString trProtectedAttribs()
     {
       return "±£»¤ÊôÐÔ";
     }
-    QCString trStaticProtectedAttribs()
+
+ 		virtual QCString trStaticProtectedAttribs()
     {
       return "¾²Ì¬±£»¤ÊôÐÔ";
     }
-    QCString trPrivateTypes()
+
+ 		virtual QCString trPrivateTypes()
     {
       return "˽ÓÐÀàÐÍ";
     }
-    QCString trPrivateAttribs()
+
+ 		virtual QCString trPrivateAttribs()
     {
       return "˽ÓÐÊôÐÔ";
     }
-    QCString trStaticPrivateAttribs()
+
+ 		virtual QCString trStaticPrivateAttribs()
     {
       return "¾²Ì¬Ë½ÓÐÊôÐÔ";
     }
@@ -597,12 +889,13 @@ class TranslatorChinese : public TranslatorAdapter_1_2_1
 //////////////////////////////////////////////////////////////////////////
 
     /*! Used as a marker that is put before a todo item */
-    QCString trTodo()
+ 		virtual QCString trTodo()
     {
       return "TODO";
     }
+
     /*! Used as the header of the todo list */
-    QCString trTodoList()
+ 		virtual QCString trTodoList()
     {
       return "TODO"CN_SPC"Áбí";
     }
@@ -611,23 +904,27 @@ class TranslatorChinese : public TranslatorAdapter_1_2_1
 // new since 1.1.4
 //////////////////////////////////////////////////////////////////////////
 
-    QCString trReferencedBy()
+ 		virtual QCString trReferencedBy()
     {
       return "²Î¿¼×Ô";
     }
-    QCString trRemarks()
+
+ 		virtual QCString trRemarks()
     {
       return "ÆÀÂÛ";
     }
-    QCString trAttention()
+
+ 		virtual QCString trAttention()
     {
       return "×¢Òâ";
     }
-    QCString trInclByDepGraph()
+
+ 		virtual QCString trInclByDepGraph()
     {
       return "´Ëͼչʾֱ½Ó»ò¼ä½Ó°üº¬¸ÃÎļþµÄÎļþ£º";
     }
-    QCString trSince()
+
+ 		virtual QCString trSince()
     {
       return "×Ô´Ó";
     }
@@ -637,12 +934,13 @@ class TranslatorChinese : public TranslatorAdapter_1_2_1
 //////////////////////////////////////////////////////////////////////////
 
     /*! title of the graph legend page */
-    QCString trLegendTitle()
+ 		virtual QCString trLegendTitle()
     {
       return "ͼÀý";
     }
+
     /*! page explaining how the dot graph's should be interpreted */
-    QCString trLegendDocs()
+ 		virtual QCString trLegendDocs()
     {
       return 
         "±¾Ò³ÏòÄúչʾÈçºÎÀí½âÓÉ"CN_SPC"Doxygen"CN_SPC"Éú³ÉµÄͼÐΡ£<p>\n"
@@ -694,7 +992,7 @@ class TranslatorChinese : public TranslatorAdapter_1_2_1
         "</ul>\n";
     }
     /*! text for the link to the legend page */
-    QCString trLegend()
+ 		virtual QCString trLegend()
     {
       return "ͼÀý";
     }
@@ -708,12 +1006,289 @@ class TranslatorChinese : public TranslatorAdapter_1_2_1
     {
       return "²âÊÔ";
     }
+
     /*! Used as the header of the test list */
     virtual QCString trTestList()
     {
       return "²âÊÔÁбí";
     }
 
+//////////////////////////////////////////////////////////////////////////
+//// new since 1.2.1
+////////////////////////////////////////////////////////////////////////////
+		/*! Used as a section header for KDE-2 IDL methods */
+		virtual QCString trDCOPMethods()
+		{
+			return "DCOP"CN_SPC"·½·¨";
+		}
+
+//////////////////////////////////////////////////////////////////////////
+//// new since 1.2.2
+////////////////////////////////////////////////////////////////////////////
+
+		/*! Used as a section header for IDL properties */
+		virtual QCString trProperties()
+		{
+			return "ÊôÐÔ";
+		}
+
+		/*! Used as a section header for IDL property documentation */
+		virtual QCString trPropertyDocumentation()
+		{
+			return "ÊôÐÔÎĵµ";
+		}
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.2.4
+//////////////////////////////////////////////////////////////////////////
+
+    /*! Used for Java interfaces in the summary section of Java packages */
+    virtual QCString trInterfaces()
+    {
+      return "½Ó¿Ú";
+    }
+
+    /*! Used for Java classes in the summary section of Java packages */
+    virtual QCString trClasses()
+    {
+			if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+			{
+				return "Êý¾Ý½á¹¹";
+			}
+			else
+			{
+				return "Àà";
+			}
+    }
+
+    /*! Used as the title of a Java package */
+    virtual QCString trPackage(const char *name)
+    {
+      return (QCString)"°ü "+name;
+    }
+		
+    /*! Title of the package index page */
+    virtual QCString trPackageList()
+    {
+      return "°üÁбí";
+    }
+
+    /*! The description of the package index page */
+    virtual QCString trPackageListDescription()
+    {
+			 return "ÕâÀïÁгöËùÓеİü£¬¸½´ø¼òҪ˵Ã÷(Èç¹ûÓеĻ°)£º"; 
+    }
+
+    /*! The link name in the Quick links header for each page */
+    virtual QCString trPackages()
+    {
+      return "°ü";
+    }
+
+    /*! Used as a chapter title for Latex & RTF output */
+    virtual QCString trPackageDocumentation()
+    {
+      return "°üµÄÎĵµ";
+    }
+
+    /*! Text shown before a multi-line define */
+    virtual QCString trDefineValue()
+    {
+      return 	"Öµ:";
+    }
+
+////////////////////////////////////////////////////////////////////////////
+//// new since 1.2.6
+////////////////////////////////////////////////////////////////////////////
+		virtual QCString trBug ()
+		{
+			return "ȱÏÝ";
+		}
+
+		virtual QCString trBugList ()
+		{
+			return "ȱÏÝÁбí";
+		}
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.2.6
+//////////////////////////////////////////////////////////////////////////
+
+    /*! Used as ansicpg for RTF file 
+     * 
+     * The following table shows the correlation of Charset name, Charset Value and 
+     * <pre>
+     * Codepage number:
+     * Charset Name       Charset Value(hex)  Codepage number
+     * ------------------------------------------------------
+     * DEFAULT_CHARSET           1 (x01)
+     * SYMBOL_CHARSET            2 (x02)
+     * OEM_CHARSET             255 (xFF)
+     * ANSI_CHARSET              0 (x00)            1252
+     * RUSSIAN_CHARSET         204 (xCC)            1251
+     * EE_CHARSET              238 (xEE)            1250
+     * GREEK_CHARSET           161 (xA1)            1253
+     * TURKISH_CHARSET         162 (xA2)            1254
+     * BALTIC_CHARSET          186 (xBA)            1257
+     * HEBREW_CHARSET          177 (xB1)            1255
+     * ARABIC _CHARSET         178 (xB2)            1256
+     * SHIFTJIS_CHARSET        128 (x80)             932
+     * HANGEUL_CHARSET         129 (x81)             949
+     * GB2313_CHARSET          134 (x86)             936
+     * CHINESEBIG5_CHARSET     136 (x88)             950
+     * </pre>
+     * 
+     */
+    virtual QCString trRTFansicp()
+    {
+      return "936";
+    }
+
+    /*! Used as ansicpg for RTF fcharset 
+     *  \see trRTFansicp() for a table of possible values.
+     */
+    virtual QCString trRTFCharSet()
+    {
+      return "134";
+    }
+
+
+    /*! Used as header RTF general index */
+    virtual QCString trRTFGeneralIndex()
+    {
+      return "Ë÷Òý";
+    }
+
+   
+    /*! 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 trClass(bool /*first_capital*/, bool /*singular*/)
+    { 
+			/*
+   		QCString result((first_capital ? "Class" : "class"));
+      if (!singular)  result+="es";
+      return result; 
+			*/
+			return "Àà";
+    }
+
+    /*! 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 trFile(bool /*first_capital*/, bool /*singular*/)
+    { 
+			/*
+   		QCString result((first_capital ? "File" : "file"));
+      if (!singular)  result+="s";
+      return result; 
+			*/
+			return "Îļþ";
+
+    }
+
+    /*! 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 trNamespace(bool /*first_capital*/, bool /*singular*/)
+    { 
+			/*
+   		QCString result((first_capital ? "Namespace" : "namespace"));
+      if (!singular)  result+="s";
+      return result; 
+			*/
+			return "Ãû×Ö¿Õ¼ä";
+    }
+
+    /*! 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 trGroup(bool /*first_capital*/, bool /*singular*/)
+    { 
+			/*
+   		QCString result((first_capital ? "Group" : "group"));
+      if (!singular)  result+="s";
+      return result; 
+			*/
+			return "×é";
+    }
+
+    /*! 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 trPage(bool /*first_capital*/, bool /*singular*/)
+    { 
+			/*
+   		QCString result((first_capital ? "Page" : "page"));
+      if (!singular)  result+="s";
+      return result; 
+			*/
+			return "Ò³";
+    }
+
+    /*! 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 trMember(bool /*first_capital*/, bool /*singular*/)
+    { 
+			/*
+   		QCString result((first_capital ? "Member" : "member"));
+      if (!singular)  result+="s";
+      return result; 
+			*/
+			return "³ÉÔ±";
+    }
+   
+    /*! 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 trField(bool /*first_capital*/, bool /*singular*/)
+    { 
+			/*
+   		QCString result((first_capital ? "Field" : "field"));
+      if (!singular)  result+="s";
+      return result; 
+			*/
+			return "×Ö¶Î";
+    }
+
+    /*! 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"));
+      if (!singular)  result+="s";
+      return result; 
+			*/
+			return "È«¾Ö¶¨Òå";
+    }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.2.7
+//////////////////////////////////////////////////////////////////////////
+
+    /*! This text is generated when the \\author command is used and
+     *  for the author section in man pages. */
+    virtual QCString trAuthor(bool /*first_capital*/, bool /*singular*/)
+    {                                                                         
+			/*
+   		QCString result((first_capital ? "Author" : "author"));
+      if (!singular)  result+="s";
+      return result; 
+			*/
+			return "×÷Õß";
+    }
+
 };
 
 #endif
diff --git a/src/translator_ru.h b/src/translator_ru.h
index 392c684..1473cf0 100644
--- a/src/translator_ru.h
+++ b/src/translator_ru.h
@@ -1069,6 +1069,8 @@ class TranslatorRussian : public Translator
         "class Undocumented { };\n\n"
         "/*! ïÔËÒÙÔÏÅ ÎÁÓÌÅÄÏ×ÁÎÉÅ */\n"
         "class PublicBase : public Truncated { };\n\n"
+        "/*! ûÁÂÌÏÎ ËÌÁÓÓÁ */\n"
+        "template<class T> class Templ {};\n\n"
         "/*! úÁÝÉÝÅÎÎÏÅ ÎÁÓÌÅÄÏ×ÁÎÉÅ */\n"
         "class ProtectedBase { };\n\n"
         "/*! úÁËÒÙÔÏÅ ÎÁÓÌÅÄÏ×ÁÎÉÅ */\n"
@@ -1079,25 +1081,26 @@ class TranslatorRussian : public Translator
         "class Inherited : public PublicBase,\n"
         "                  protected ProtectedBase,\n"
         "                  private PrivateBase,\n"
-        "                  public Undocumented\n"
+        "                  public Undocumented,\n"
+        "                  public Templ<int>\n"
         "{\n"
         "  private:\n"
         "    Used *m_usedClass;\n"
         "};\n"
         "\\endcode\n"
         "åÓÌÉ \\c MAX_DOT_GRAPH_HEIGHT × ËÏÎÆÉÇÕÒÁÃÉÏÎÎÏÍ ÆÁÊÌÅ "
-        "ÕÓÔÁÎÏ×ÌÅÎ × 200, ÐÏÌÕÞÉÔÓÑ ÓÌÅÄÕÀÝÉÊ ÇÒÁÆ:"
+        "ÕÓÔÁÎÏ×ÌÅÎ × 240, ÐÏÌÕÞÉÔÓÑ ÓÌÅÄÕÀÝÉÊ ÇÒÁÆ:"
         "<p><center><img src=\"graph_legend.gif\"></center>\n"
         "<p>\n"
         "ðÒÑÍÏÕÇÏÌØÎÉËÉ × ÜÔÏÍ ÇÒÁÆÅ ÉÍÅÀÔ ÓÌÅÄÕÀÝÅÅ ÚÎÁÞÅÎÉÅ:\n"
         "<ul>\n"
-        "<li>úÁÐÏÌÎÅÎÎÙÊ ÞÅÒÎÎÙÊ ÐÒÑÍÏÕÇÏÌØÎÉË ÐÒÅÄÓÔÁ×ÌÑÅÔ ÓÔÒÕËÔÕÒÕ ÉÌÉ ËÌÁÓÓ, "
+        "<li>úÁÐÏÌÎÅÎÎÙÊ ÞÅÒÎÙÊ ÐÒÑÍÏÕÇÏÌØÎÉË ÐÒÅÄÓÔÁ×ÌÑÅÔ ÓÔÒÕËÔÕÒÕ ÉÌÉ ËÌÁÓÓ, "
         "ÄÌÑ ËÏÔÏÒÏÇÏ ÓÏÚÄÁÎ ÇÒÁÆ.\n"
         "<li>ðÒÑÍÏÕÇÏÌØÎÉË Ó ÞÅÒÎÏÊ ÇÒÁÎÉÃÅÊ ÏÂÏÚÎÁÞÁÅÔ ÄÏËÕÍÅÎÔÉÒÏ×ÁÎÎÕÀ ÓÔÒÕËÔÕÒÕ ÉÌÉ ËÌÁÓÓ.\n"
         "<li>ðÒÑÍÏÕÇÏÌØÎÉË Ó ÓÅÒÏÊ ÇÒÁÎÉÃÅÊ ÏÂÏÚÎÁÞÁÅÔ ÎÅÄÏËÕÍÅÎÔÉÒÏ×ÁÎÎÕÀ ÓÔÒÕËÔÕÒÕ ÉÌÉ ËÌÁÓÓ.\n"
         "<li>ðÒÑÍÏÕÇÏÌØÎÉË Ó ËÒÁÓÎÏÊ ÇÒÁÎÉÃÅÊ ÏÂÏÚÎÁÞÁÅÔ ÄÏËÕÍÅÎÔÉÒÏ×ÁÎÎÕÀ ÓÔÒÕËÔÕÒÕ ÉÌÉ ËÌÁÓÓ, ÄÌÑ ËÏÔÏÒÏÇÏ\n"
         " ÎÅ ×ÓÅ ÏÔÎÏÛÅÎÉÑ ÎÁÓÌÅÄÏ×ÁÎÉÑ/ÓÏÄÅÒÖÁÎÉÑ ÐÏËÁÚÁÎÙ. çÒÁÆ ÕÓÅÞÅÎ, "
-        "ÅÓÌÉ ÏÎ ÎÅ ÐÏÍÅÓÔÉÌÓÑ × ÕËÁÚÁÎÎÙÈ ÇÒÁÎÉÃÁÈ."
+        "ÅÓÌÉ ÏÎ ÎÅ ÐÏÍÅÓÔÉÌÓÑ × ÕËÁÚÁÎÎÙÈ ÇÒÁÎÉÃÁÈ.\n"
         "</ul>\n"
         "óÔÒÅÌËÉ ÉÍÅÀÔ ÓÌÅÄÕÀÝÅÅ ÚÎÁÞÅÎÉÅ:\n"
         "<ul>\n"
@@ -1109,6 +1112,9 @@ class TranslatorRussian : public Translator
         "ÄÒÕÇÏÍ ËÌÁÓÅ ÉÌÉ ÉÓÐÏÌØÚÕÅÔÓÑ ÄÒÕÇÉÍ ËÌÁÓÓÏÍ."
         "óÏ ÓÔÒÅÌËÏÊ ÕËÁÚÙ×ÁÅÔÓÑ ÐÅÒÅÍÅÎÎÁÑ, "
         "ÞÅÒÅÚ ËÏÔÏÒÕÀ ÄÏÓÔÕÐÅÎ ÕËÁÚÙ×ÁÅÍÙÊ ËÌÁÓÓ ÉÌÉ ÓÔÒÕËÔÕÒÁ. \n"
+        "<li>öÅÌÔÁÑ ÓÔÒÅÌËÁ ÉÓÐÏÌØÚÕÅÔÓÑ ÄÌÑ Ó×ÑÚÉ ÐÏÄÓÔÁÎÏ×ËÉ ÛÁÂÌÏÎÁ É "
+        "ÛÁÂÌÏÎÁ, ÎÁ ÏÓÎÏ×Å ËÏÔÏÒÏÇÏ ÜÔÁ ÐÏÄÓÔÁÎÏ×ËÁ ×ÙÐÌÄÎÅÎÁ. ó ÛÁÂÌÏÎÏÍ"
+        "ÕËÁÚÙ×ÁÅÔÓÑ ÐÁÒÁÍÅÔÒ ÐÏÄÓÔÁÎÏ×ËÉ.\n"
         "</ul>\n");
     }
     /*! text for the link to the legend page */
diff --git a/src/translator_si.h b/src/translator_si.h
index 74efad5..0e7bf6e 100644
--- a/src/translator_si.h
+++ b/src/translator_si.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2001 by Dimitri van Heesch.
+ * 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 
@@ -20,9 +20,8 @@
 #ifndef TRANSLATOR_SI_H
 #define TRANSLATOR_SI_H
 
-#include "translator_adapter.h"
 
-class TranslatorSlovene : public TranslatorAdapter_1_1_5
+class TranslatorSlovene : public Translator
 {
   public:
     QCString idLanguage()
@@ -36,8 +35,6 @@ class TranslatorSlovene : public TranslatorAdapter_1_1_5
     {
       return "\\usepackage[slovene]{babel} \n\\usepackage[latin2]{inputenc} \n\\usepackage[T1]{fontenc}\n";
     }
-    QCString latexBabelPackage()
-    { return "slovene"; }
     QCString idLanguageCharset()
     { 
 #ifdef _WIN32
@@ -55,9 +52,9 @@ class TranslatorSlovene : public TranslatorAdapter_1_1_5
     QCString trMemberTypedefDocumentation()
     { return "Opis <code> uporabni¹ko definiranih tipov (typedef) </code>"; }
     QCString trMemberEnumerationDocumentation()
-    { return "Opis <code>  na¹tevnih tipov </code> èlanova"; }
+    { return "Opis komponent <code> na¹tevnih tipov </code>"; }
     QCString trEnumerationValueDocumentation()
-    { return "Opis <code> na¹tevnih vednosti (enum) </code> "; }
+    { return "Opis vrednosti <code> na¹tevnih tipov (enum) </code> "; }
     QCString trMemberFunctionDocumentation()
     { return "Opis metod"; }
     QCString trMemberDataDocumentation()
@@ -67,27 +64,25 @@ class TranslatorSlovene : public TranslatorAdapter_1_1_5
     QCString trListOfAllMembers()
     { return "Seznam vseh metod / atributov."; }
     QCString trMemberList()
-    { return " - Seznam metod in atributov."; }
+    { return " - seznam metod in atributov."; }
     QCString trThisIsTheListOfAllMembers()
-    { return "To je seznam metod razreda "; }
+    { return "Seznam metod razreda "; }
     QCString trIncludingInheritedMembers()
     { return ", vkljuèujoè dedovane metode in atribute."; }
     QCString trGeneratedAutomatically(const char *s)
-    { QCString result="zgenerirano avtomatièno z Doxygen-om"; 
+    { QCString result="zgenerirano z Doxygen-om"; 
       if (s) result+=(QCString)" za "+s;
-      result+=" iz programskog koda."; 
+      result+=" iz izvorne kode."; 
       return result;
     }
     QCString trEnumName()
-    { return "enum ime"; }
+    { return "na¹tevno ime"; }
     QCString trEnumValue()
-    { return "enum vrednost"; }
+    { return "na¹tevna vrednost"; }
     QCString trDefinedIn()
     { return "definirano v"; }
-    QCString trVerbatimText(const char *f)
-    { return (QCString)"Ovo je citirani tekst iz include datoteke "+f+"."; }
     QCString trModules()
-    { return "Moduli"; }
+    { return "moduli"; }
     QCString trClassHierarchy()
     { return "dedovalna hierarhija"; }
     QCString trCompoundList()
@@ -95,13 +90,13 @@ class TranslatorSlovene : public TranslatorAdapter_1_1_5
     QCString trFileList()
     { return "seznam datotek"; }
     QCString trHeaderFiles()
-    { return "\"Header\" datoteka"; }
+    { return "'Header' datoteka"; }
     QCString trCompoundMembers()
     { return "metode in atributi"; }
     QCString trFileMembers()
     { return "komponente v datotekah"; }
     QCString trRelatedPages()
-    { return "Povezane strani"; }
+    { return "dodatni opisi"; }
     QCString trExamples()
     { return "Primeri"; }
     QCString trSearch()
@@ -113,7 +108,7 @@ class TranslatorSlovene : public TranslatorAdapter_1_1_5
     {
       QCString result="Seznam vseh ";
       if (!extractAll) result+="dokumentiranih ";
-      result+="datotek, s kratkim opisom:";
+      result+="datotek s kratkim opisom:";
       return result;
     }
     QCString trCompoundListDescription()
@@ -133,17 +128,17 @@ class TranslatorSlovene : public TranslatorAdapter_1_1_5
     {
       QCString result="Seznam ";
       if (!extractAll) result+="dokumentiranih ";
-      result+="entite v datotekah ";
+      result+="entitet v datotekah ";
       if (extractAll) result+="skupaj z opisom datoteke v kateri se nahajajo:";
-      else result+="z linki na datoteke v katerih se nahajajo:";
+      else result+="s povezavami na datoteke v katerih se nahajajo:";
       return result;
     }
     QCString trHeaderFilesDescription()
-    { return "Seznam header datotek, ki tvoriju aplikacijski vmesnik (API) :"; }
+    { return "Seznam header datotek, ki tvorijo aplikacijski vmesnik (API) :"; }
     QCString trExamplesDescription()
     { return "Seznam primerov :"; }
     QCString trRelatedPagesDescription()
-    { return "Seznam povezanih strani:"; }
+    { return "Seznam strani z dodatnimi opisi:"; }
     QCString trModulesDescription()
     { return "Seznam modulov:"; }
     QCString trNoDescriptionAvailable()
@@ -168,7 +163,7 @@ class TranslatorSlovene : public TranslatorAdapter_1_1_5
     QCString trExampleDocumentation()
     { return "Opis primera"; }
     QCString trPageDocumentation()
-    { return "Dokumentacija povezanih strani"; }
+    { return "Opis povezanih strani"; }
     QCString trReferenceManual()
     { return "Priroènik"; }
 
@@ -186,8 +181,6 @@ class TranslatorSlovene : public TranslatorAdapter_1_1_5
     { return "Spremenljivke"; }
     QCString trEnumerationValues()
     { return "Vrednosti na¹tevnih tipov"; }
-    QCString trAuthor()
-    { return "avtor"; }
     QCString trDefineDocumentation()
     { return "Opis makro definicije"; }
     QCString trFunctionPrototypeDocumentation()
@@ -202,8 +195,6 @@ class TranslatorSlovene : public TranslatorAdapter_1_1_5
     { return "Opis spremenljivke"; }
     QCString trCompounds()
     { return "Strukture"; }
-    QCString trFiles()
-    { return "Datoteke"; }
     QCString trGeneratedAt(const char *date,const char *projName)
     { 
       QCString result=(QCString)"Generirano "+date;
@@ -222,8 +213,8 @@ class TranslatorSlovene : public TranslatorAdapter_1_1_5
     QCString trForInternalUseOnly()
     { return "Samo za interno uporabo."; }
     QCString trReimplementedForInternalReasons()
-    { return "Reimplementirano zbog internih razloga; "
-             "Nema utjecaja na API."; 
+    { return "Ponovno implementirano zaradi internih razlogov. "
+             "Nima vpliva na API."; 
     }
     QCString trWarning()
     { return "Opozorilo"; }
@@ -233,8 +224,6 @@ class TranslatorSlovene : public TranslatorAdapter_1_1_5
     { return "Verzija"; }
     QCString trDate()
     { return "Datum"; }
-    QCString trAuthors()
-    { return "Avtor(ji)"; }
     QCString trReturns()
     { return "Rezultat(i)"; }
     QCString trSeeAlso()
@@ -242,7 +231,7 @@ class TranslatorSlovene : public TranslatorAdapter_1_1_5
     QCString trParameters()
     { return "Parametri"; }
     QCString trExceptions()
-    { return "Izjeme (Exceptions)"; }
+    { return "Prekinitve (Exceptions)"; }
     QCString trGeneratedBy()
     { return "Izdelano s pomoèjo"; }
     
@@ -251,7 +240,7 @@ class TranslatorSlovene : public TranslatorAdapter_1_1_5
 //////////////////////////////////////////////////////////////////////////
     
     QCString trNamespaceList()
-    { return "Seznam imenskih prostorov"; }
+    { return "seznam imenskih prostorov"; }
     QCString trNamespaceListDescription(bool extractAll)
     {
       QCString result="Seznam ";
@@ -285,7 +274,7 @@ class TranslatorSlovene : public TranslatorAdapter_1_1_5
         case ClassDef::Struct: result+=" strukture "; break;
         case ClassDef::Union:  result+=" unije "; break;
         case ClassDef::Interface:  result+=" vmesnika (interface) "; break;
-        case ClassDef::Exception:  result+=" izjeme (exception) "; break;
+        case ClassDef::Exception:  result+=" prekinitve (exception) "; break;
       }
 	  result += (QCString)clName;
       
@@ -370,39 +359,38 @@ class TranslatorSlovene : public TranslatorAdapter_1_1_5
       // used in member documentation blocks to produce a list of 
       // members that are hidden by this one.
     {
-      return "Redefinirano v "+trWriteList(numEntries)+".";
+      return "Skrije implementacijo iz "+trWriteList(numEntries)+".";
     }
     QCString trReimplementedInList(int numEntries)
     {
       // used in member documentation blocks to produce a list of
       // all member that overwrite the implementation of this member.
-      return "Reimplementacija u "+trWriteList(numEntries)+".";
+      return "Metodo skrijejo implementacije v razredih "+trWriteList(numEntries)+".";
     }
 
     QCString trNamespaceMembers()
       // This is put above each page as a link to all members of namespaces.
-    { return "Namespace èlanovi"; }
+    { return "elementi imenskega prostora"; }
     QCString trNamespaceMemberDescription(bool extractAll)
       // This is an introduction to the page with all namespace members
     { 
-      QCString result="Lista svih ";
+      QCString result="Seznam vseh ";
       if (!extractAll) result+="dokumentiranih ";
-      result+="namespace èlanova s linkovima na ";
+      result+="elementov imenskega prostora s povezavami na ";
       if (extractAll) 
-        result+="namespace dokumentaciju svakog èlana:";
+        result+="opis vsakega elementa:";
       else 
-        result+="namespace kojima pripadaju:";
+        result+="imenski prostor, ki mu pripadajo:";
       return result;
     }
     QCString trNamespaceIndex()
       // This is used in LaTeX as the title of the chapter with the 
       // index of all namespaces.
-    { return "Indeks namespace-a"; }
+    { return "Indeks imenskih prostorov"; }
     QCString trNamespaceDocumentation()
       // This is used in LaTeX as the title of the chapter containing
       // the documentation of all namespaces.
-    { return "Podati o imenskih prostorih"; }
-
+    { return "Podatki o imenskih prostorih"; }
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990522
 //////////////////////////////////////////////////////////////////////////
@@ -410,10 +398,9 @@ class TranslatorSlovene : public TranslatorAdapter_1_1_5
     /*! This is used in the documentation before the list of all
      *  namespaces in a file.
      */
-    QCString trNamespaces()
-    {
-      return "Namespaces";
-    }
+    virtual QCString trNamespaces()
+    { return "Imenski prostori"; }
+
 
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990728
@@ -433,7 +420,7 @@ class TranslatorSlovene : public TranslatorAdapter_1_1_5
         case ClassDef::Struct:     result+="strukture"; break;
         case ClassDef::Union:      result+="unije"; break;
         case ClassDef::Interface:  result+="vmesnika (interface)"; break;
-        case ClassDef::Exception:  result+="izjeme (exception)"; break;
+        case ClassDef::Exception:  result+="prekinitve (exception)"; break;
       }
       result+=" je zgrajen na podlagi naslednj";
       if (single) result+="e "; else result+="ih";
@@ -510,8 +497,7 @@ class TranslatorSlovene : public TranslatorAdapter_1_1_5
           "direktno ali indirektno vkljuèuje. Pravokotniki ponazarjajo datoteke, pu¹èice "
 	  "predstavljajo relacije med njimi. "
 	  "Èrn pravokotnik ponazarja datoteko "+fName+". Pu¹èice A->B ponazarjajo "
-	  "usmerjeno relacijo \"A vkljuèuje B\"."
-;
+	  "usmerjeno relacijo \"A vkljuèuje B\".";
     }
     /*! header that is put before the list of constructor/destructors. */
     QCString trConstructorDocumentation()
@@ -528,17 +514,17 @@ class TranslatorSlovene : public TranslatorAdapter_1_1_5
     {
       return "dokumenacija tekoèe datoteke.";
     }
-    /*! Text for the \\pre command */
+    /*! Text for the \pre command */
     QCString trPrecondition()
     {
       return "Predpogoji (preconditions)";
     }
-    /*! Text for the \\post command */
+    /*! Text for the \post command */
     QCString trPostcondition()
     {
       return "Naknadni pogoji (posconditions)";
     }
-    /*! Text for the \\invariant command */
+    /*! Text for the \invariant command */
     QCString trInvariant()
     {
       return "Invarianta";
@@ -619,12 +605,12 @@ class TranslatorSlovene : public TranslatorAdapter_1_1_5
 //////////////////////////////////////////////////////////////////////////
 
     /*! Used as a marker that is put before a todo item */
-    QCString trTodo()
+    virtual QCString trTodo()
     {
       return "TODO";
     }
     /*! Used as the header of the todo list */
-    QCString trTodoList()
+    virtual QCString trTodoList()
     {
       return "Seznam nedokonèanih opravil";
     }
@@ -633,19 +619,19 @@ class TranslatorSlovene : public TranslatorAdapter_1_1_5
 // new since 1.1.4
 //////////////////////////////////////////////////////////////////////////
 
-    QCString trReferencedBy()
+    virtual QCString trReferencedBy()
     {
       return "Uporabniki entitete:  ";
     }
-    QCString trRemarks()
+    virtual QCString trRemarks()
     {
       return "Opomba";
     }
-    QCString trAttention()
+    virtual QCString trAttention()
     {
       return "Pozor";
     }
-    QCString trInclByDepGraph()
+    virtual QCString trInclByDepGraph()
     {
       return "Graf prikazuje datoteke, ki posredno ali neposredno "
              "vkljuèujejo tekoèo datoteko. Pravokotniki simbolizirajo datoteke, "
@@ -657,11 +643,343 @@ class TranslatorSlovene : public TranslatorAdapter_1_1_5
 	     "le posredno. "
 	;
     }
-    QCString trSince()
+    virtual QCString trSince()
     {
       return "Od";
     }
 
+//////////////////////////////////////////////////////////////////////////
+// new since 1.1.5
+//////////////////////////////////////////////////////////////////////////
+
+    /*! title of the graph legend page */
+    virtual QCString trLegendTitle()
+    {
+      return "Legenda grafa";
+    }
+    /*! page explaining how the dot graph's should be interpreted 
+     *  The %A in the text below are to prevent link to classes called "A".
+     */
+    virtual QCString trLegendDocs()
+    {
+      return 
+        "Tekoèa stran pojasnjuje naèin interpretacije grafov, ki jih izri¹e "
+        "doxygen.<p>\n"
+        "Poglejmo si naslednji primer:\n"
+        "\\code\n"
+        "/*! Nevide razred zaradi rezanja */\n"
+        "class Invisible { };\n\n"
+        "/*! Odrezan razred, dedovalna relacija je skrita */\n"
+        "class Truncated : public Invisible { };\n\n"
+        "/* razred, ki ni opisan z doxygen komentarji */\n"
+        "class Undocumented { };\n\n"
+        "/*! Razred, ki ga dedujemo s pomoèjo javnega dedovanja */\n"
+        "class PublicBase : public Truncated { };\n\n"
+        "/*! Razred, ki ga dedujemo s pomoèjo za¹èitenega dedovanja */\n"
+        "class ProtectedBase { };\n\n"
+        "/*! Razred, ki ga dedujemo s pomoèjo skritega dedovanja */\n"
+        "class PrivateBase { };\n\n"
+        "/*! Razred, ki ga uporablja dedovani razred */\n"
+        "class Used { };\n\n"
+        "/*! Super class that inherits a number of other classes */\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"
+        "If the \\c MAX_DOT_GRAPH_HEIGHT tag in the configuration file "
+        "is set to 200 this will result in the following graph:"
+        "<p><center><img src=\"graph_legend.gif\"></center>\n"
+        "<p>\n"
+        "The boxes in the above graph have the following meaning:\n"
+        "<ul>\n"
+        "<li>%A filled black box represents the struct or class for which the "
+        "graph is generated.\n"
+        "<li>%A box with a black border denotes a documented struct or class.\n"
+        "<li>%A box with a grey border denotes an undocumented struct or class.\n"
+        "<li>%A box with a red border denotes a documented struct or class for\n"
+        "which not all inheritance/containment relations are shown. %A graph is "
+        "truncated if it does not fit within the specified boundaries."
+        "</ul>\n"
+        "The arrows have the following meaning:\n"
+        "<ul>\n"
+        "<li>%A dark blue arrow is used to visualize a public inheritance "
+        "relation between two classes.\n"
+        "<li>%A dark green arrow is used for protected inheritance.\n"
+        "<li>%A dark red arrow is used for private inheritance.\n"
+        "<li>%A purple dashed arrow is used if a class is contained or used "
+        "by another class. The arrow is labeled with the variable(s) "
+        "through which the pointed class or struct is accessible. \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 "Test List";
+    }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.2.1
+//////////////////////////////////////////////////////////////////////////
+
+    /*! Used as a section header for KDE-2 IDL methods */
+    virtual QCString trDCOPMethods()
+    {
+      return "DCOP metode";
+    }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.2.2
+//////////////////////////////////////////////////////////////////////////
+
+    /*! Used as a section header for IDL properties */
+    virtual QCString trProperties()
+    {
+      return "IDL Lastnosti";
+    }
+    /*! Used as a section header for IDL property documentation */
+    virtual QCString trPropertyDocumentation()
+    {
+      return "Opis IDL lastnosti";
+    }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.2.4
+//////////////////////////////////////////////////////////////////////////
+
+    /*! Used for Java interfaces in the summary section of Java packages */
+    virtual QCString trInterfaces()
+    {
+      return "Vmesniki";
+    }
+    /*! Used for Java classes in the summary section of Java packages */
+    virtual QCString trClasses()
+    {
+      if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+      {
+        return "Podatkovne strukture";
+      }
+      else
+      {
+        return "Razredi";
+      }
+    }
+    /*! Used as the title of a Java package */
+    virtual QCString trPackage(const char *name)
+    {
+      return (QCString)"JAVA paket "+name;
+    }
+    /*! Title of the package index page */
+    virtual QCString trPackageList()
+    {
+      return "Seznam JAVA paketov";
+    }
+    /*! The description of the package index page */
+    virtual QCString trPackageListDescription()
+    {
+      return "Seznam JAVA paketov in njihovih kratkih opisov v primeru, da obstajajo:";
+    }
+    /*! The link name in the Quick links header for each page */
+    virtual QCString trPackages()
+    {
+      return "JAVA paketi";
+    }
+    /*! Used as a chapter title for Latex & RTF output */
+    virtual QCString trPackageDocumentation()
+    {
+      return "Opisi JAVA paketov";
+    }
+    /*! Text shown before a multi-line define */
+    virtual QCString trDefineValue()
+    {
+      return "Vrednost:";
+    }
+    
+//////////////////////////////////////////////////////////////////////////
+// new since 1.2.5
+//////////////////////////////////////////////////////////////////////////
+    
+    /*! Used as a marker that is put before a \\bug item */
+    virtual QCString trBug()
+    {
+      return "Programska napaka";
+    }
+    /*! Used as the header of the bug list */
+    virtual QCString trBugList()
+    {
+      return "Seznam programskih napak";
+    }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.2.6
+//////////////////////////////////////////////////////////////////////////
+
+    /*! Used as ansicpg for RTF file 
+     * 
+     * The following table shows the correlation of Charset name, Charset Value and 
+     * <pre>
+     * Codepage number:
+     * Charset Name       Charset Value(hex)  Codepage number
+     * ------------------------------------------------------
+     * DEFAULT_CHARSET           1 (x01)
+     * SYMBOL_CHARSET            2 (x02)
+     * OEM_CHARSET             255 (xFF)
+     * ANSI_CHARSET              0 (x00)            1252
+     * RUSSIAN_CHARSET         204 (xCC)            1251
+     * EE_CHARSET              238 (xEE)            1250
+     * GREEK_CHARSET           161 (xA1)            1253
+     * TURKISH_CHARSET         162 (xA2)            1254
+     * BALTIC_CHARSET          186 (xBA)            1257
+     * HEBREW_CHARSET          177 (xB1)            1255
+     * ARABIC _CHARSET         178 (xB2)            1256
+     * SHIFTJIS_CHARSET        128 (x80)             932
+     * HANGEUL_CHARSET         129 (x81)             949
+     * GB2313_CHARSET          134 (x86)             936
+     * CHINESEBIG5_CHARSET     136 (x88)             950
+     * </pre>
+     * 
+     */
+    virtual QCString trRTFansicp()
+    {
+      return "1250";
+    }
+    
+
+    /*! Used as ansicpg for RTF fcharset 
+     *  \see trRTFansicp() for a table of possible values.
+     */
+    virtual QCString trRTFCharSet()
+    {
+      return "0";
+    }
+
+    /*! Used as header RTF general index */
+    virtual QCString trRTFGeneralIndex()
+    {
+      return "Indeks";
+    }
+   
+    /*! 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 trClass(bool first_capital, bool singular)
+    { 
+      QCString result((first_capital ? "Razred" : "razred"));
+      if (!singular)  result+="i";
+      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 trFile(bool first_capital, bool singular)
+    { 
+      QCString result((first_capital ? "Datotek" : "datotek"));
+      if (!singular)  result+="e";
+      else result += "a";
+      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 trNamespace(bool first_capital, bool singular)
+    { 
+      QCString result((first_capital ? "Imenski prostor" : "imenski prostor"));
+      if (!singular)  result+="i";
+      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 trGroup(bool first_capital, bool singular)
+    { 
+      QCString result((first_capital ? "Skupina" : "skupina"));
+      if (!singular)  result+="s";
+      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 trPage(bool first_capital, bool singular)
+    { 
+      QCString result((first_capital ? "Stran" : "stran"));
+      if (!singular)  result+="i";
+      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 trMember(bool first_capital, bool singular)
+    { 
+      QCString result((first_capital ? "Element" : "element"));
+      if (!singular)  result+="i";
+      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 trField(bool first_capital, bool singular)
+    { 
+      QCString result((first_capital ? "Polj" : "polj"));
+      if (!singular)  result+="a";
+      else result += "e";
+      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"));
+      if (!singular)  result+="s";
+      return result; 
+    }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.2.7
+//////////////////////////////////////////////////////////////////////////
+
+    /*! This text is generated when the \\author command is used and
+     *  for the author section in man pages. */
+    virtual QCString trAuthor(bool first_capital, bool singular)
+    {                                                                         
+      QCString result((first_capital ? "Avtor" : "avtor"));
+      if (!singular)  result+="ji";
+      return result; 
+    }
 
 };
 
diff --git a/src/util.cpp b/src/util.cpp
index f1fa9c6..4d2e130 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -2638,12 +2638,15 @@ bool generateLink(OutputDocInterface &od,const char *clName,
   }
   else if ((gd=Doxygen::groupSDict[linkRef])) // link to a group
   {
-    od.startTextLink(gd->getOutputFileBase(),0);
-    if (lt)
-      od.docify(lt);
-    else
-      od.docify(gd->groupTitle());
-    od.endTextLink();
+    //od.startTextLink(gd->getOutputFileBase(),0);
+    //if (lt)
+    //  od.docify(lt);
+    //else
+    //  od.docify(gd->groupTitle());
+    //od.endTextLink();
+    QCString title;
+    if (lt) title=lt; else title=gd->groupTitle();
+    od.writeObjectLink(gd->getReference(),gd->getOutputFileBase(),0,title);  
     if (gd->isLinkableInProject())
     {
       writePageRef(od,gd->getOutputFileBase(),0);
@@ -3436,8 +3439,8 @@ found:
 void addRelatedPage(const char *name,const QCString &ptitle,
                            const QCString &doc,QList<QCString> *anchors,
                            const char *fileName,int startLine,
-                           int todoId,int testId,int bugId,GroupDef *gd=0,
-                           TagInfo *tagInfo=0
+                           int todoId,int testId,int bugId,GroupDef *gd,
+                           TagInfo *tagInfo
                           )
 {
   PageInfo *pi=0;
@@ -3509,7 +3512,7 @@ void addRelatedPage(const char *name,const QCString &ptitle,
 //----------------------------------------------------------------------------
 
 void addRefItem(int todoId,int testId,int bugId,const char *prefix,
-                        const char *name,const char *title,const char *args=0)
+                        const char *name,const char *title,const char *args)
 {
 
   //printf("addRefItem(%s) todoId=%d testId=%d bugId=%d\n",name,todoId,testId,bugId);
diff --git a/src/util.h b/src/util.h
index 6a9f058..f5c2dfe 100644
--- a/src/util.h
+++ b/src/util.h
@@ -42,7 +42,7 @@ class ClassList;
 class MemberGroupList;
 class MemberGroupDict;
 class Definition;
-class TagInfo;
+struct TagInfo;
 
 //--------------------------------------------------------------------