From c84e679ca11f8945f449b8b8ad6d93c05d97839e Mon Sep 17 00:00:00 2001
From: Petr Prikryl <prikryl@atlas.cz>
Date: Tue, 25 Jun 2013 11:57:37 +0200
Subject: idLanguageCharset() method removed from all translator classes

---
 src/translator.h    |   1 -
 src/translator_am.h | 270 ++++++++++++++++----------------
 src/translator_ar.h | 346 ++++++++++++++++++++--------------------
 src/translator_br.h |  94 ++++++-----
 src/translator_ca.h | 374 ++++++++++++++++++++++---------------------
 src/translator_cn.h | 375 ++++++++++++++++++++++----------------------
 src/translator_cz.h |   6 -
 src/translator_de.h | 306 ++++++++++++++++++------------------
 src/translator_dk.h |   6 -
 src/translator_en.h | 391 +++++++++++++++++++++++----------------------
 src/translator_eo.h |  14 +-
 src/translator_es.h | 344 ++++++++++++++++++++--------------------
 src/translator_fa.h | 366 +++++++++++++++++++++----------------------
 src/translator_fi.h | 442 ++++++++++++++++++++++++++-------------------------
 src/translator_fr.h |   7 -
 src/translator_gr.h |   6 -
 src/translator_hr.h | 272 ++++++++++++++++----------------
 src/translator_hu.h |   6 -
 src/translator_id.h |   6 -
 src/translator_it.h |  64 ++++----
 src/translator_je.h |   7 +-
 src/translator_jp.h |   6 +-
 src/translator_ke.h |   7 +-
 src/translator_kr.h |   6 -
 src/translator_lt.h |   6 -
 src/translator_lv.h |   7 -
 src/translator_mk.h | 384 ++++++++++++++++++++++-----------------------
 src/translator_nl.h | 244 ++++++++++++++---------------
 src/translator_no.h |   6 -
 src/translator_pl.h | 386 ++++++++++++++++++++++-----------------------
 src/translator_pt.h | 150 +++++++++---------
 src/translator_ro.h |   6 -
 src/translator_ru.h | 268 ++++++++++++++++---------------
 src/translator_sc.h | 388 ++++++++++++++++++++++-----------------------
 src/translator_si.h |   4 -
 src/translator_sk.h |   6 -
 src/translator_sr.h | 444 ++++++++++++++++++++++++++--------------------------
 src/translator_sv.h |   6 -
 src/translator_tr.h | 412 ++++++++++++++++++++++++------------------------
 src/translator_tw.h |   6 -
 src/translator_ua.h |   8 +-
 src/translator_vi.h | 382 ++++++++++++++++++++++----------------------
 src/translator_za.h |   6 -
 43 files changed, 3298 insertions(+), 3543 deletions(-)

diff --git a/src/translator.h b/src/translator.h
index da832e3..9fbbddd 100644
--- a/src/translator.h
+++ b/src/translator.h
@@ -41,7 +41,6 @@ class Translator
 
     virtual QCString idLanguage() = 0;
     virtual QCString latexLanguageSupportCommand() = 0;
-    virtual QCString idLanguageCharset() = 0;
 
     // --- Language translation methods -------------------
 
diff --git a/src/translator_am.h b/src/translator_am.h
index d8ab0fd..9700cc9 100644
--- a/src/translator_am.h
+++ b/src/translator_am.h
@@ -1,12 +1,12 @@
 /******************************************************************************
  *
- * 
+ *
  *
  * Copyright (C) 1997-2013 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 
+ * 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.
  *
@@ -33,13 +33,7 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0
     virtual QCString latexLanguageSupportCommand()
     {
         return "<pre>\\usepackage[latin]{armtex}\n"
-			   "\\usepackage[armscii8]{inputenc}\n</pre>"; 
-    }
-
-    /*! return the language charset. This will be used for the HTML output */
-    virtual QCString idLanguageCharset()
-    {
-        return "utf-8"; 
+			   "\\usepackage[armscii8]{inputenc}\n</pre>";
     }
 
     // --- Language translation methods -------------------
@@ -132,7 +126,7 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0
 
     // quick reference sections
 
-    /*! This is put above each page as a link to the list of all groups of 
+    /*! 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()
@@ -178,11 +172,11 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0
     {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Գլոբալներ"; 
+        return "Գլոբալներ";
       }
       else
       {
-        return "Ֆայլի անդամներ"; 
+        return "Ֆայլի անդամներ";
       }
     }
 
@@ -291,26 +285,26 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0
     virtual QCString trModulesDescription()
     { return "Բոլոր մոդուլների ցուցակը."; }
 
-    // index titles (the project name is prepended for these) 
+    // index titles (the project name is prepended for these)
 
 
     /*! This is used in HTML as the title of index.html. */
     virtual QCString trDocumentation()
     { return " - Փաստագրություն"; }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * index of all groups.
      */
     virtual QCString trModuleIndex()
     { return "Մոդուլներ"; }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * class hierarchy.
      */
     virtual QCString trHierarchicalIndex()
     { return "Դասակարգումներ"; }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * annotated compound index.
      */
     virtual QCString trCompoundIndex()
@@ -374,43 +368,43 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0
     virtual QCString trReferenceManual()
     { return "Հղումների ձեռնարկ"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of defines
      */
     virtual QCString trDefines()
     { return "Մակրոսներ"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of function prototypes
      */
     virtual QCString trFuncProtos()
     { return "Ֆունկցիաների նախատիպեր"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of typedefs
      */
     virtual QCString trTypedefs()
     { return "Տիպի սահմանումներ (typedef)"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of enumerations
      */
     virtual QCString trEnumerations()
     { return "Համարակալումներ"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) functions
      */
     virtual QCString trFunctions()
     { return "Ֆունկցիաներ"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) variables
      */
     virtual QCString trVariables()
     { return "Փոփոխականներ"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) variables
      */
     virtual QCString trEnumerationValues()
@@ -422,37 +416,37 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0
     virtual QCString trDefineDocumentation()
     { return "Մակրոսներ"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for function prototypes
      */
     virtual QCString trFunctionPrototypeDocumentation()
     { return "Ֆունկցիաների նախատիպեր"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for typedefs
      */
     virtual QCString trTypedefDocumentation()
     { return "Տիպի սահմանումներ (typedef)"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for enumeration types
      */
     virtual QCString trEnumerationTypeDocumentation()
     { return "Համարակալման տիպեր"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for functions
      */
     virtual QCString trFunctionDocumentation()
     { return "Ֆունկցիաներ"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for variables
      */
     virtual QCString trVariableDocumentation()
     { return "Փոփոխականներ"; }
 
-    /*! This is used in the documentation of a file/namespace/group before 
+    /*! This is used in the documentation of a file/namespace/group before
      *  the list of links to documented compounds
      */
     virtual QCString trCompounds()
@@ -462,20 +456,20 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0
         return "Տվյալների կառուցվածք";
       }
       else
-      { 
+      {
         return "Դասեր";
       }
 
     }
 
-    /*! This is used in the documentation of a group before the list of 
+    /*! This is used in the documentation of a group before the list of
      *  links to documented files
      */
-    /*! This is used in the standard footer of each page and indicates when 
-     *  the page was generated 
+    /*! 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)"Ստեղծվել է "+date;
       if (projName) result+=projName+QCString(" -ի համար,");
       result+=(QCString)" հետևյալ համակարգով.";
@@ -529,11 +523,11 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0
     /*! this text is used in the title page of a LaTeX document. */
     virtual QCString trGeneratedBy()
     { return "Ստեղծված է հետևյալ համակարգի կողմից"; }
-    
+
 //////////////////////////////////////////////////////////////////////////
-// new since 0.49-990307 
+// new since 0.49-990307
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! used as the title of page containing all the index of all namespaces. */
     virtual QCString trNamespaceList()
     { return "Անունների տարածությունների ցուցակ"; }
@@ -556,13 +550,13 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990405
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! used in the class documentation as a header before the list of all
-     * related classes 
+     * related classes
      */
     virtual QCString trRelatedFunctionDocumentation()
     { return "Դասի ընկերներ և կապված ֆունկցիաներ"; }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990425
 //////////////////////////////////////////////////////////////////////////
@@ -574,7 +568,7 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0
     {
       QCString result=(QCString)clName;
       if (isTemplate)
-      {		  
+      {
         switch(compType)
         {
           case ClassDef::Class:      result+=" Դասի"; break;
@@ -618,7 +612,7 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0
       result+=" անունների տարածություններ";
       return result;
     }
-    
+
     virtual QCString trPublicMembers()
     { return "Բաց անդամ ֆունկցիաներ"; }
     virtual QCString trPublicSlots()
@@ -639,7 +633,7 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0
     { return "Փակ սլոթեր"; }
     virtual QCString trStaticPrivateMembers()
     { return "Փակ ստատիկ անդամ ֆունկցիաներ"; }
-    
+
     /*! this function is used to produce a comma-separated list of items.
      *  use generateMarker(i) to indicate where item i should be put.
      */
@@ -648,23 +642,23 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0
       QCString result;
       int i;
       // the inherits list contain `numEntries' classes
-      for (i=0;i<numEntries;i++) 
+      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 
+        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 
+          if (i<numEntries-2) // not the fore last entry
             result+=", ";
           else                // the fore last entry
             result+=" և ";
         }
       }
-      return result; 
+      return result;
     }
-    
+
     /*! used in class documentation to produce a list of base classes,
      *  if class diagrams are disabled.
      */
@@ -681,7 +675,7 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0
       return "Ժառանգորդ դասեր - "+trWriteList(numEntries)+":";
     }
 
-    /*! used in member documentation blocks to produce a list of 
+    /*! used in member documentation blocks to produce a list of
      *  members that are hidden by this one.
      */
     virtual QCString trReimplementedFromList(int numEntries)
@@ -708,14 +702,14 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0
       if (!extractAll) result+="փաստագրված ";
       result+="անունների տարածության անդամների ցուցակը` "
 			"հղումներով դեպի ";
-      if (extractAll) 
+      if (extractAll)
         result+="բոլոր անդամների անունների տարածության փաստագրությունը.";
-      else 
+      else
         result+="անունների տարածությունը, որին նրանք պատկանում են.";
       return result;
     }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      *  index of all namespaces.
      */
     virtual QCString trNamespaceIndex()
@@ -746,7 +740,7 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0
      */
     virtual QCString trGeneratedFromFiles(ClassDef::CompoundType compType,
         bool single)
-    { 
+    {
       QCString result = (QCString)"Այս ";
       switch(compType)
       {
@@ -783,7 +777,7 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0
     virtual QCString trMainPage()
     { return "Գլխավոր էջ"; }
 
-    /*! This is used in references to page that are put in the LaTeX 
+    /*! 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()
@@ -828,7 +822,7 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0
     /*! header that is put before the list of constructor/destructors. */
     virtual QCString trConstructorDocumentation()
     {
-      return "Կառուցիչներ"; 
+      return "Կառուցիչներ";
     }
     /*! Used in the file documentation to point to the corresponding sources. */
     virtual QCString trGotoSourceCode()
@@ -885,7 +879,7 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0
 //////////////////////////////////////////////////////////////////////////
 // new since 1.1.0
 //////////////////////////////////////////////////////////////////////////
-    
+
     virtual QCString trNote()
     {
       return "Նշում";
@@ -978,7 +972,7 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0
     {
       return "Սկսած";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.1.5
 //////////////////////////////////////////////////////////////////////////
@@ -988,12 +982,12 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0
     {
       return "Լեգենդ";
     }
-    /*! page explaining how the dot graph's should be interpreted 
+    /*! 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 
+      return
 		"Այս էջը նկարագրում է, թե ինչպես մեկնաբանել doxygen-ի ստեղծած գրաֆները:<p>\n"
         "Դիտարկենք հետևյալ օրինակը.\n"
         "\\code\n"
@@ -1059,7 +1053,7 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0
 //////////////////////////////////////////////////////////////////////////
 // new since 1.2.0
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! Used as a marker that is put before a test item */
     virtual QCString trTest()
     {
@@ -1141,7 +1135,7 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0
 //////////////////////////////////////////////////////////////////////////
 // new since 1.2.5
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! Used as a marker that is put before a \\bug item */
     virtual QCString trBug()
     {
@@ -1173,15 +1167,15 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0
     }
 
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trClass(bool first_capital, bool singular)
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
         QCString result((first_capital ? "Տվյալների կառուցվածք" : "տվյալների կառուցվածք"));
-        return result; 
+        return result;
       }
       else
       {
@@ -1192,69 +1186,69 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0
     }
 
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  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 ? "Ֆայլ" : "ֆայլ"));
       if (!singular)  result+="եր";
-      return result; 
+      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 
+     *  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 ? "Անունների տարածություն" : "անունների տարածություն"));
       if (!singular)  result+="ներ";
-      return result; 
+      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 
+     *  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 ? "Խ" : "խ"));
       result+=(singular ? "ումբ" : "մբեր");
-      return result; 
+      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 
+     *  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 ? "Էջ" : "էջ"));
       if (!singular)  result+="եր";
       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 
+     *  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 ? "Անդամ" : "անդամ"));
       if (!singular)  result+="ներ";
-      return result; 
+      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 
+     *  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 ? "Գլոբալ" : "գլոբալ"));
       if (!singular)  result+="ներ";
-      return result; 
+      return result;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1264,7 +1258,7 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0
     /*! 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 ? "Հեղինակ" : "հեղինակ"));
       if (!singular) result+="ներ";
       return result;
@@ -1285,7 +1279,7 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0
 // new since 1.2.13
 //////////////////////////////////////////////////////////////////////////
 
-    /*! used in member documentation blocks to produce a list of 
+    /*! used in member documentation blocks to produce a list of
      *  members that are implemented by this one.
      */
     virtual QCString trImplementedFromList(int numEntries)
@@ -1317,8 +1311,8 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0
 // new since 1.2.17
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as the header of the list of item that have been 
-     *  flagged deprecated 
+    /*! Used as the header of the list of item that have been
+     *  flagged deprecated
      */
     virtual QCString trDeprecatedList()
     {
@@ -1329,7 +1323,7 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0
 // new since 1.2.18
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as a header for declaration section of the events found in 
+    /*! Used as a header for declaration section of the events found in
      * a C# program
      */
     virtual QCString trEvents()
@@ -1349,43 +1343,43 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0
     /*! Used as a heading for a list of Java class types with package scope.
      */
     virtual QCString trPackageTypes()
-    { 
+    {
       return "Փաթեթի տիպեր";
     }
-    /*! Used as a heading for a list of Java class functions with package 
-     * scope. 
+    /*! Used as a heading for a list of Java class functions with package
+     * scope.
      */
     virtual QCString trPackageMembers()
-    { 
+    {
       return "Փաթեթի ֆունկցիաներ";
     }
-    /*! Used as a heading for a list of static Java class functions with 
+    /*! Used as a heading for a list of static Java class functions with
      *  package scope.
      */
     virtual QCString trStaticPackageMembers()
-    { 
+    {
       return "Փաթեթի ստատիկ ֆունկցիաներ";
     }
-    /*! Used as a heading for a list of Java class variables with package 
+    /*! Used as a heading for a list of Java class variables with package
      * scope.
      */
     virtual QCString trPackageAttribs()
-    { 
+    {
       return "Փաթեթի ատրիբուտներ";
     }
-    /*! Used as a heading for a list of static Java class variables with 
+    /*! Used as a heading for a list of static Java class variables with
      * package scope.
      */
     virtual QCString trStaticPackageAttribs()
-    { 
+    {
       return "Փաթեթի ստատիկ ատրիբուտներ";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.3.1
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used in the quick index of a class/file/namespace member list page 
+    /*! Used in the quick index of a class/file/namespace member list page
      *  to link to the unfiltered list of all members.
      */
     virtual QCString trAll()
@@ -1402,9 +1396,9 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0
 // new since 1.3.3
 //////////////////////////////////////////////////////////////////////////
 
-    /*! When the search engine is enabled this text is put in the header 
-     *  of each page before the field where one can enter the text to search 
-     *  for. 
+    /*! When the search engine is enabled this text is put in the header
+     *  of each page before the field where one can enter the text to search
+     *  for.
      */
     virtual QCString trSearchForIndex()
     {
@@ -1421,7 +1415,7 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0
      *  text can be different depending on the number of documents found.
      *  Inside the text you can put the special marker $num to insert
      *  the number representing the actual number of search results.
-     *  The @a numDocuments parameter can be either 0, 1 or 2, where the 
+     *  The @a numDocuments parameter can be either 0, 1 or 2, where the
      *  value 2 represents 2 or more matches. HTML markup is allowed inside
      *  the returned string.
      */
@@ -1435,13 +1429,13 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0
       {
         return "Հայտնաբերվել է 1 փաստաթուղթ:";
       }
-      else 
+      else
       {
         return "Հայտնաբերվել է <b>$num</b> փաստաթուղթ:"
           "Փաստաթղթերը դասակարգված են ըստ համապասխանության";
       }
     }
-    /*! This string is put before the list of matched words, for each search 
+    /*! This string is put before the list of matched words, for each search
      *  result. What follows is the list of words that matched the query.
      */
     virtual QCString trSearchMatches()
@@ -1482,12 +1476,12 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0
     virtual QCString trDirectories()
     { return "Ֆայլադրաններ"; }
 
-    /*! This returns a sentences that introduces the directory hierarchy. 
+    /*! This returns a sentences that introduces the directory hierarchy.
      *  and the fact that it is sorted alphabetically per level
      */
     virtual QCString trDirDescription()
     { return "Այս ֆայլադարանների հիերարխիան կարգավորված է կոպտորեն, "
-			"բայց ոչ ամբողջապես, այբբենական կարգով."; 
+			"բայց ոչ ամբողջապես, այբբենական կարգով.";
 	}
 
     /*! This returns the title of a directory page. The name of the
@@ -1500,10 +1494,10 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0
      *  (\a first_capital) and in sigular or plural form (\a singular).
      */
     virtual QCString trDir(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Ֆայլադարան" : "ֆայլադարան"));
       if (!singular) result+="ներ";
-      return result; 
+      return result;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1529,7 +1523,7 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0
       return "Այս ֆունկցիայի կանչերի գրաֆը.";
     }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for enumeration values
      */
     virtual QCString trEnumerationValueDocumentation()
@@ -1543,7 +1537,7 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0
     virtual QCString trMemberFunctionDocumentationFortran()
     { return "Անդամ ֆունցիաներ/ենթածրագրեր"; }
 
-    /*! This is put above each page as a link to the list of annotated data types (Fortran). */    
+    /*! This is put above each page as a link to the list of annotated data types (Fortran). */
     virtual QCString trCompoundListFortran()
     { return "Տվյալների տիպերի ցուցակը"; }
 
@@ -1564,18 +1558,18 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0
         result+="փաստագրված ";
       }
       result+="տվյալների տիպերի անդամների ցուցակը` հղումներով դեպի ";
-      if (!extractAll) 
+      if (!extractAll)
       {
 		result+="բոլոր անդամների տվյալների կառուցվածքի փաստագրությունը";
       }
-      else 
+      else
       {
         result+="տվյալների տիպերը, որոնց նրանք պատկանում են";
       }
       return result;
     }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * annotated compound index (Fortran).
      */
     virtual QCString trCompoundIndexFortran()
@@ -1587,24 +1581,24 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0
     virtual QCString trTypeDocumentation()
     { return "Տվյալների տիպեր"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) subprograms (Fortran).
      */
     virtual QCString trSubprograms()
     { return "Ֆունկցիաներ/ենթածրագրեր"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for subprograms (Fortran)
      */
     virtual QCString trSubprogramDocumentation()
     { return "Ֆունկցիաներ/ենթածրագրեր"; }
 
-    /*! This is used in the documentation of a file/namespace/group before 
+    /*! This is used in the documentation of a file/namespace/group before
      *  the list of links to documented compounds (Fortran)
      */
      virtual QCString trDataTypes()
     { return "Տվյալների տիպեր"; }
-    
+
     /*! used as the title of page containing all the index of all modules (Fortran). */
     virtual QCString trModulesList()
     { return "Մոդուլների ցուցակ"; }
@@ -1624,7 +1618,7 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0
                                     bool isTemplate)
     {
       QCString result=(QCString)clName;
-      if (!isTemplate) 
+      if (!isTemplate)
       {
         switch(compType)
         {
@@ -1660,43 +1654,43 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0
     {
       return QCString("Մոդուլ ") + namespaceName;
     }
-    
+
     /*! This is put above each page as a link to all members of modules. (Fortran) */
     virtual QCString trModulesMembers()
     { return "Մոդուլի անդամներ"; }
 
     /*! This is an introduction to the page with all modules members (Fortran) */
     virtual QCString trModulesMemberDescription(bool extractAll)
-    { 
+    {
       QCString result="Մոդուլի բոլոր ";
       if (!extractAll) result+="փաստագրված ";
       result+="անդամների ցուցակը` հղումներով դեպի ";
-      if (extractAll) 
+      if (extractAll)
       {
         result+="բոլոր անդամների փաստագրությունները.";
       }
-      else 
+      else
       {
         result+="մոդուլները, որոնց նրանք պատկանում են.";
       }
       return result;
     }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      *  index of all modules (Fortran).
      */
     virtual QCString trModulesIndex()
     { return "Մոդուլներ"; }
-    
+
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trModule(bool first_capital, bool singular)
-    {       
+    {
       QCString result((first_capital ? "Մոդուլ" : "մոդուլ"));
-      if (!singular)  result+="ներ"; 
-      return result; 
+      if (!singular)  result+="ներ";
+      return result;
     }
     /*! This is put at the bottom of a module documentation page and is
      *  followed by a list of files that were used to generate the page.
@@ -1722,24 +1716,24 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0
       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 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trType(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Տիպ" : "տիպ"));
       if (!singular)  result+="եր";
-      return result; 
+      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 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trSubprogram(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Ե" : "ե"));
-      if (singular)  result+="նթածրագիր"; else result+="նթածրագրեր"; 
-      return result; 
+      if (singular)  result+="նթածրագիր"; else result+="նթածրագրեր";
+      return result;
     }
 
     /*! C# Type Constraint list */
diff --git a/src/translator_ar.h b/src/translator_ar.h
index 89be422..7064415 100644
--- a/src/translator_ar.h
+++ b/src/translator_ar.h
@@ -1,12 +1,12 @@
 /******************************************************************************
  *
- * 
+ *
  *
  * Copyright (C) 1997-2013 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 
+ * 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.
  *
@@ -21,7 +21,7 @@
  * Please send your comments on this translation to moazreyad@yahoo.com
  *
  * Note : consider this file as Beta version for testing Arabic output with Doxygen.
- * 
+ *
  * Revision history :
  *
  * 6/2006 : Created initial version of Arabic translation.
@@ -39,19 +39,19 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6
   public:
 
     // --- Language control methods -------------------
-    
-    /*! Used for identification of the language. The identification 
-     * should not be translated. It should be replaced by the name 
+
+    /*! 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 should be equal to 
+     * (e.g. "czech", "japanese", "russian", etc.). It should be equal to
      * the identification used in language.cpp.
      */
     virtual QCString idLanguage()
     { return "arabic"; }
-    
-    /*! Used to get the LaTeX command(s) for the language support. 
+
+    /*! 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 
+     *  LaTeX to the desired language.  For example
      *  <pre>"\\usepackage[german]{babel}\n"
      *  </pre>
      *  or
@@ -59,7 +59,7 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6
      *  "\\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.
      */
@@ -68,12 +68,6 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6
       return "";
     }
 
-    /*! return the language charset. This will be used for the HTML output */
-    virtual QCString idLanguageCharset()
-    {
-      return "utf-8";
-    }
-
     // --- Language translation methods -------------------
 
     /*! used in the compound documentation before a list of related functions. */
@@ -91,30 +85,30 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6
     /*! header that is put before the list of typedefs. */
     virtual QCString trMemberTypedefDocumentation()
     { return "توثيق تعريفات النوع الأعضاء"; }
-    
+
     /*! header that is put before the list of enumerations. */
     virtual QCString trMemberEnumerationDocumentation()
     { return "توثيق العدديات الأعضاء"; }
-    
+
     /*! header that is put before the list of member functions. */
     virtual QCString trMemberFunctionDocumentation()
     { return "توثيق الدوال الأعضاء"; }
-    
+
     /*! header that is put before the list of member attributes. */
     virtual QCString trMemberDataDocumentation()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "توثيق الحقل"; 
+        return "توثيق الحقل";
       }
       else
       {
-        return "توثيق البيان العضو"; 
+        return "توثيق البيان العضو";
       }
     }
 
     /*! this is the text of a link put after brief descriptions. */
-    virtual QCString trMore() 
+    virtual QCString trMore()
     { return "المزيد ..."; }
 
     /*! put in the class documentation */
@@ -132,54 +126,54 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6
     /*! this is the remainder of the sentence after the class name */
     virtual QCString trIncludingInheritedMembers()
     { return ", متضمنة كل الأعضاء الموروثة"; }
-    
+
     /*! 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="تم تكوينها آليا بواسطة Doxygen";
       if (s) result+=(QCString)" لـ "+s;
-      result+=" من ملفات المصدر."; 
+      result+=" من ملفات المصدر.";
       return result;
     }
 
     /*! put after an enum name in the list of all members */
     virtual QCString trEnumName()
     { return "الإسم العددي"; }
-    
+
     /*! put after an enum value in the list of all members */
     virtual QCString trEnumValue()
     { return "القيمة العددية"; }
-    
+
     /*! put after an undocumented member in the list of all members */
     virtual QCString trDefinedIn()
     { return "معرف في"; }
 
     // quick reference sections
 
-    /*! This is put above each page as a link to the list of all groups of 
+    /*! 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 "مكونات"; }
-    
+
     /*! This is put above each page as a link to the class hierarchy */
     virtual QCString trClassHierarchy()
     { return "الشكل الهرمي للفئة"; }
-    
+
     /*! This is put above each page as a link to the list of annotated classes */
     virtual QCString trCompoundList()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
         return "هياكل البيانات";
       }
       else
       {
-        return "قائمة الفئات"; 
+        return "قائمة الفئات";
       }
     }
-    
+
     /*! This is put above each page as a link to the list of documented files */
     virtual QCString trFileList()
     { return "قائمة الملفات"; }
@@ -190,27 +184,27 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6
 
     /*! 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 "حقول البيانات"; 
+        return "حقول البيانات";
       }
       else
       {
-        return "أعضاء الفئة"; 
+        return "أعضاء الفئة";
       }
     }
 
     /*! This is put above each page as a link to all members of files. */
     virtual QCString trFileMembers()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "العوام"; 
+        return "العوام";
       }
       else
       {
-        return "أعضاء الملف"; 
+        return "أعضاء الملف";
       }
     }
 
@@ -243,16 +237,16 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6
 
     /*! This is an introduction to the annotated compound list. */
     virtual QCString trCompoundListDescription()
-    { 
-      
+    {
+
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "هذه هي هياكل البيانات مع وصف مختصر:"; 
+        return "هذه هي هياكل البيانات مع وصف مختصر:";
       }
       else
       {
         return "هذه هي الفئات ، البناءات ،"
-			"الإتحادات والواجهات مع وصف مختصر:"; 
+			"الإتحادات والواجهات مع وصف مختصر:";
       }
     }
 
@@ -260,7 +254,7 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6
     virtual QCString trCompoundMembersDescription(bool extractAll)
     {
       QCString result="هذه قائمة بكل ";
-      
+
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
         result+="حقول البناءات والإتحادات";
@@ -274,7 +268,7 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6
         result+=" الموثقة ";
       }
       result+=" مع وصلات إلى ";
-      if (!extractAll) 
+      if (!extractAll)
       {
         if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
         {
@@ -285,7 +279,7 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6
           result+="توثيق الفئة لكل عضو:";
         }
       }
-      else 
+      else
       {
         if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
         {
@@ -304,7 +298,7 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6
     {
       QCString result="Here is a list of all ";
       if (!extractAll) result+="documented ";
-      
+
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
         result+="functions, variables, defines, enums, and typedefs";
@@ -314,9 +308,9 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6
         result+="file members";
       }
       result+=" with links to ";
-      if (extractAll) 
+      if (extractAll)
         result+="the files they belong to:";
-      else 
+      else
         result+="the documentation:";
       return result;
     }
@@ -338,49 +332,49 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6
     { return "هذه قائمة بكل المكونات:"; }
 
     /*! This sentences is used in the annotated class/file lists if no brief
-     * description is given. 
+     * description is given.
      */
     virtual QCString trNoDescriptionAvailable()
     { return "لا يوجد وصف متاح"; }
-    
-    // index titles (the project name is prepended for these) 
+
+    // index titles (the project name is prepended for these)
 
 
     /*! This is used in HTML as the title of index.html. */
     virtual QCString trDocumentation()
     { return "التوثيق"; }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * index of all groups.
      */
     virtual QCString trModuleIndex()
     { return "فهرس المكونات"; }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * class hierarchy.
      */
     virtual QCString trHierarchicalIndex()
     { return "الفهرس الهرمي"; }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * annotated compound index.
      */
     virtual QCString trCompoundIndex()
     {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
-      { 
+      {
         return "فهرس هيكل البيانات";
       }
       else
       {
-        return "فهرس الفئة"; 
+        return "فهرس الفئة";
       }
     }
 
     /*! This is used in LaTeX as the title of the chapter with the
      * list of all files.
      */
-    virtual QCString trFileIndex() 
+    virtual QCString trFileIndex()
     { return "فهرس الملفات"; }
 
     /*! This is used in LaTeX as the title of the chapter containing
@@ -393,14 +387,14 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6
      *  the documentation of all classes, structs and unions.
      */
     virtual QCString trClassDocumentation()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "فهرس هيكل البيانات"; 
+        return "فهرس هيكل البيانات";
       }
       else
       {
-        return "فهرس الفئة"; 
+        return "فهرس الفئة";
       }
     }
 
@@ -425,111 +419,111 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6
     /*! This is used in LaTeX as the title of the document */
     virtual QCString trReferenceManual()
     { return "الكتيب المرجعي"; }
-    
-    /*! This is used in the documentation of a file as a header before the 
+
+    /*! This is used in the documentation of a file as a header before the
      *  list of defines
      */
     virtual QCString trDefines()
     { return "التعريفات"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of function prototypes
      */
     virtual QCString trFuncProtos()
     { return "Function Prototypes"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of typedefs
      */
     virtual QCString trTypedefs()
     { return "Typedefs"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of enumerations
      */
     virtual QCString trEnumerations()
     { return "العدديات"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) functions
      */
     virtual QCString trFunctions()
     { return "الدوال"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) variables
      */
     virtual QCString trVariables()
     { return "المتغيرات"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) variables
      */
     virtual QCString trEnumerationValues()
     { return "Enumerator"; }
-    
+
     /*! This is used in the documentation of a file before the list of
      *  documentation blocks for defines
      */
     virtual QCString trDefineDocumentation()
     { return "Define Documentation"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for function prototypes
      */
     virtual QCString trFunctionPrototypeDocumentation()
     { return "Function Prototype Documentation"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for typedefs
      */
     virtual QCString trTypedefDocumentation()
     { return "Typedef Documentation"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for enumeration types
      */
     virtual QCString trEnumerationTypeDocumentation()
     { return "Enumeration Type Documentation"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for enumeration values
      */
     virtual QCString trEnumerationValueDocumentation()
     { return "Enumerator Documentation"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for functions
      */
     virtual QCString trFunctionDocumentation()
     { return "توثيق الدالة"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for variables
      */
     virtual QCString trVariableDocumentation()
     { return "توثيق المتغير"; }
 
-    /*! This is used in the documentation of a file/namespace/group before 
+    /*! This is used in the documentation of a file/namespace/group before
      *  the list of links to documented compounds
      */
     virtual QCString trCompounds()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "هياكل البيانات"; 
+        return "هياكل البيانات";
       }
       else
       {
-        return "الفئات"; 
+        return "الفئات";
       }
     }
 
-    /*! This is used in the standard footer of each page and indicates when 
-     *  the page was generated 
+    /*! 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)"Generated on "+date;
       if (projName) result+=(QCString)" for "+projName;
       result+=(QCString)" by";
@@ -547,7 +541,7 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6
     {
       return (QCString)"Inheritance diagram for "+clName+":";
     }
-    
+
     /*! this text is generated when the \\internal command is used. */
     virtual QCString trForInternalUseOnly()
     { return "للاستخدام الداخلي فقط."; }
@@ -587,7 +581,7 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6
     /*! this text is generated when the \\exception command is used. */
     virtual QCString trExceptions()
     { return "استثناءات"; }
-    
+
     /*! this text is used in the title page of a LaTeX document. */
     virtual QCString trGeneratedBy()
     { return "انتجت بواسطة"; }
@@ -595,7 +589,7 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990307
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! used as the title of page containing all the index of all namespaces. */
     virtual QCString trNamespaceList()
     { return "قائمة مجالات الأسماء"; }
@@ -614,17 +608,17 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6
      */
     virtual QCString trFriends()
     { return "Friends"; }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990405
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! used in the class documentation as a header before the list of all
-     * related classes 
+     * related classes
      */
     virtual QCString trRelatedFunctionDocumentation()
     { return "Friends And Related Function Documentation"; }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990425
 //////////////////////////////////////////////////////////////////////////
@@ -655,7 +649,7 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6
     virtual QCString trFileReference(const char *fileName)
     {
       QCString result=fileName;
-      result+=" File Reference"; 
+      result+=" File Reference";
       return result;
     }
 
@@ -666,7 +660,7 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6
       result+=" Namespace Reference";
       return result;
     }
-    
+
     virtual QCString trPublicMembers()
     { return "Public Member Functions"; }
     virtual QCString trPublicSlots()
@@ -687,7 +681,7 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6
     { return "Private Slots"; }
     virtual QCString trStaticPrivateMembers()
     { return "Static Private Member Functions"; }
-    
+
     /*! this function is used to produce a comma-separated list of items.
      *  use generateMarker(i) to indicate where item i should be put.
      */
@@ -696,23 +690,23 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6
       QCString result;
       int i;
       // the inherits list contain `numEntries' classes
-      for (i=0;i<numEntries;i++) 
+      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 
+        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 
+          if (i<numEntries-2) // not the fore last entry
             result+=", ";
           else                // the fore last entry
             result+=", and ";
         }
       }
-      return result; 
+      return result;
     }
-    
+
     /*! used in class documentation to produce a list of base classes,
      *  if class diagrams are disabled.
      */
@@ -729,7 +723,7 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6
       return "Inherited by "+trWriteList(numEntries)+".";
     }
 
-    /*! used in member documentation blocks to produce a list of 
+    /*! used in member documentation blocks to produce a list of
      *  members that are hidden by this one.
      */
     virtual QCString trReimplementedFromList(int numEntries)
@@ -751,17 +745,17 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6
 
     /*! This is an introduction to the page with all namespace members */
     virtual QCString trNamespaceMemberDescription(bool extractAll)
-    { 
+    {
       QCString result="Here is a list of all ";
       if (!extractAll) result+="documented ";
       result+="namespace members with links to ";
-      if (extractAll) 
+      if (extractAll)
         result+="the namespace documentation for each member:";
-      else 
+      else
         result+="the namespaces they belong to:";
       return result;
     }
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      *  index of all namespaces.
      */
     virtual QCString trNamespaceIndex()
@@ -830,7 +824,7 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6
     virtual QCString trMainPage()
     { return "الصفحة الرئيسية"; }
 
-    /*! This is used in references to page that are put in the LaTeX 
+    /*! 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()
@@ -879,7 +873,7 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6
     /*! header that is put before the list of constructor/destructors. */
     virtual QCString trConstructorDocumentation()
     {
-      return "توثيق دوال البناء والهدم"; 
+      return "توثيق دوال البناء والهدم";
     }
     /*! Used in the file documentation to point to the corresponding sources. */
     virtual QCString trGotoSourceCode()
@@ -936,7 +930,7 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6
 //////////////////////////////////////////////////////////////////////////
 // new since 1.1.0
 //////////////////////////////////////////////////////////////////////////
-    
+
     virtual QCString trNote()
     {
       return "ملاحظات";
@@ -1025,7 +1019,7 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6
     {
       return "منذ";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.1.5
 //////////////////////////////////////////////////////////////////////////
@@ -1035,12 +1029,12 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6
     {
       return "Graph Legend";
     }
-    /*! page explaining how the dot graph's should be interpreted 
+    /*! 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 
+      return
         "This page explains how to interpret the graphs that are generated "
         "by doxygen.<p>\n"
         "Consider the following example:\n"
@@ -1105,11 +1099,11 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6
     {
       return "legend";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.2.0
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! Used as a marker that is put before a test item */
     virtual QCString trTest()
     {
@@ -1180,7 +1174,7 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6
     /*! The description of the package index page */
     virtual QCString trPackageListDescription()
     {
-		return "هذه هي الحزم مع وصف مختصر لكل منها )إن وجد( :";	  
+		return "هذه هي الحزم مع وصف مختصر لكل منها )إن وجد( :";
     }
     /*! The link name in the Quick links header for each page */
     virtual QCString trPackages()
@@ -1197,11 +1191,11 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6
     {
 		return "القيمة:";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.2.5
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! Used as a marker that is put before a \\bug item */
     virtual QCString trBug()
     {
@@ -1217,9 +1211,9 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6
 // new since 1.2.6
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as ansicpg for RTF file 
-     * 
-     * The following table shows the correlation of Charset name, Charset Value and 
+    /*! 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
@@ -1240,15 +1234,15 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6
      * GB2313_CHARSET          134 (x86)             936
      * CHINESEBIG5_CHARSET     136 (x88)             950
      * </pre>
-     * 
+     *
      */
     virtual QCString trRTFansicp()
     {
       return "1256";
     }
-    
 
-    /*! Used as ansicpg for RTF fcharset 
+
+    /*! Used as ansicpg for RTF fcharset
      *  \see trRTFansicp() for a table of possible values.
      */
     virtual QCString trRTFCharSet()
@@ -1261,93 +1255,93 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6
     {
       return "فهرس";
     }
-   
+
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  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("فئة");
       if (!singular)  result="فئات";
-      return result; 
+      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 
+     *  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("ملف");
       if (!singular)  result="ملفات";
-      return result; 
+      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 
+     *  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("مجال أسماء");
       if (!singular)  result="مجالات أسماء";
-      return result; 
+      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 
+     *  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("مجموعة");
       if (!singular)  result="مجموعات";
-      return result; 
+      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 
+     *  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("صفحة");
       if (!singular)  result="صفحات";
-      return result; 
+      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 
+     *  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("عضو");
       if (!singular)  result="أعضاء";
-      return result; 
+      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 
+     *  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("حقل");
       if (!singular)  result="حقول";
-      return result; 
+      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 
+     *  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("عام");
       if (!singular)  result="عوام";
-      return result; 
+      return result;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1357,10 +1351,10 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6
     /*! 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("المؤلف");
       if (!singular)  result="المؤلفون";
-      return result; 
+      return result;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1378,7 +1372,7 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6
 // new since 1.2.13
 //////////////////////////////////////////////////////////////////////////
 
-    /*! used in member documentation blocks to produce a list of 
+    /*! used in member documentation blocks to produce a list of
      *  members that are implemented by this one.
      */
     virtual QCString trImplementedFromList(int numEntries)
@@ -1410,8 +1404,8 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6
 // new since 1.2.17
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as the header of the list of item that have been 
-     *  flagged deprecated 
+    /*! Used as the header of the list of item that have been
+     *  flagged deprecated
      */
     virtual QCString trDeprecatedList()
     {
@@ -1422,7 +1416,7 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6
 // new since 1.2.18
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as a header for declaration section of the events found in 
+    /*! Used as a header for declaration section of the events found in
      * a C# program
      */
     virtual QCString trEvents()
@@ -1442,43 +1436,43 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6
     /*! Used as a heading for a list of Java class types with package scope.
      */
     virtual QCString trPackageTypes()
-    { 
+    {
       return "أنواع الحزمة";
     }
-    /*! Used as a heading for a list of Java class functions with package 
-     * scope. 
+    /*! Used as a heading for a list of Java class functions with package
+     * scope.
      */
     virtual QCString trPackageMembers()
-    { 
+    {
       return "دوال الحزمة";
     }
-    /*! Used as a heading for a list of static Java class functions with 
+    /*! Used as a heading for a list of static Java class functions with
      *  package scope.
      */
     virtual QCString trStaticPackageMembers()
-    { 
+    {
       return "دوال ساكنة للحزمة";
     }
-    /*! Used as a heading for a list of Java class variables with package 
+    /*! Used as a heading for a list of Java class variables with package
      * scope.
      */
     virtual QCString trPackageAttribs()
-    { 
+    {
       return "خصائص الحزمة";
     }
-    /*! Used as a heading for a list of static Java class variables with 
+    /*! Used as a heading for a list of static Java class variables with
      * package scope.
      */
     virtual QCString trStaticPackageAttribs()
-    { 
+    {
       return "خصائص ساكنة للحزمة";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.3.1
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used in the quick index of a class/file/namespace member list page 
+    /*! Used in the quick index of a class/file/namespace member list page
      *  to link to the unfiltered list of all members.
      */
     virtual QCString trAll()
@@ -1495,9 +1489,9 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6
 // new since 1.3.3
 //////////////////////////////////////////////////////////////////////////
 
-    /*! When the search engine is enabled this text is put in the header 
-     *  of each page before the field where one can enter the text to search 
-     *  for. 
+    /*! When the search engine is enabled this text is put in the header
+     *  of each page before the field where one can enter the text to search
+     *  for.
      */
     virtual QCString trSearchForIndex()
     {
@@ -1514,7 +1508,7 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6
      *  text can be different depending on the number of documents found.
      *  Inside the text you can put the special marker $num to insert
      *  the number representing the actual number of search results.
-     *  The @a numDocuments parameter can be either 0, 1 or 2, where the 
+     *  The @a numDocuments parameter can be either 0, 1 or 2, where the
      *  value 2 represents 2 or more matches. HTML markup is allowed inside
      *  the returned string.
      */
@@ -1528,13 +1522,13 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6
       {
         return "وثيقة مناسبة لما بحثت عنه. <b>1</b> تم العثور على.";
       }
-      else 
+      else
       {
         return "وثيقة مطابقة لما بحثت عنه <b>$num</b> تم إيجاد ."
                "وتم ترتيبهم بحيث يكون الأقرب لنتيجة البحث أولا.";
       }
     }
-    /*! This string is put before the list of matched words, for each search 
+    /*! This string is put before the list of matched words, for each search
      *  result. What follows is the list of words that matched the query.
      */
     virtual QCString trSearchMatches()
@@ -1575,7 +1569,7 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6
     virtual QCString trDirectories()
     { return "الأدلة"; }
 
-    /*! This returns a sentences that introduces the directory hierarchy. 
+    /*! This returns a sentences that introduces the directory hierarchy.
      *  and the fact that it is sorted alphabetically per level
      */
     virtual QCString trDirDescription()
@@ -1593,10 +1587,10 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6
      *  (\a first_capital) and in sigular or plural form (\a singular).
      */
     virtual QCString trDir(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Director" : "director"));
       if (singular) result+="y"; else result+="ies";
-      return result; 
+      return result;
     }
 
 //////////////////////////////////////////////////////////////////////////
diff --git a/src/translator_br.h b/src/translator_br.h
index e67ad9f..288b4b0 100644
--- a/src/translator_br.h
+++ b/src/translator_br.h
@@ -28,7 +28,7 @@
  *   20080206:
  *      - Method trTypeContraints() renamed to trTypeConstraints().
  *   20071216:
- * 	- New methods since 1.5.4 updated. 
+ * 	- New methods since 1.5.4 updated.
  *   Previous history removed from this version.
  */
 #ifndef TRANSLATOR_BR_H
@@ -62,12 +62,6 @@ class TranslatorBrazilian : public TranslatorAdapter_1_8_0
       return "\\usepackage[brazil]{babel}";
     }
 
-    /*! return the language charset. This will be used for the HTML output */
-    virtual QCString idLanguageCharset()
-    {
-      return "utf-8";
-    }
-
     // --- Language translation methods -------------------
 
     /*! used in the compound documentation before a list of related functions. */
@@ -247,7 +241,7 @@ class TranslatorBrazilian : public TranslatorAdapter_1_8_0
     virtual QCString trCompoundMembersDescription(bool extractAll)
     {
       QCString result="Esta é a lista de ";
-      
+
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
         result+="todas as estruturas e campos de uniões ";
@@ -1485,7 +1479,7 @@ class TranslatorBrazilian : public TranslatorAdapter_1_8_0
     {
       return "Resultados:";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.3.8
 //////////////////////////////////////////////////////////////////////////
@@ -1519,7 +1513,7 @@ class TranslatorBrazilian : public TranslatorAdapter_1_8_0
     virtual QCString trDirectories()
     { return "Diretórios"; }
 
-    /*! This returns a sentences that introduces the directory hierarchy. 
+    /*! This returns a sentences that introduces the directory hierarchy.
      *  and the fact that it is sorted alphabetically per level
      */
     virtual QCString trDirDescription()
@@ -1539,10 +1533,10 @@ class TranslatorBrazilian : public TranslatorAdapter_1_8_0
      *  (\a first_capital) and in sigular or plural form (\a singular).
      */
     virtual QCString trDir(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Diretório" : "diretório"));
       if (!singular) result+="s";
-      return result; 
+      return result;
     }
 //////////////////////////////////////////////////////////////////////////
 // new since 1.4.1
@@ -1556,7 +1550,7 @@ class TranslatorBrazilian : public TranslatorAdapter_1_8_0
        return "Este é um método provido por conveniência. "
        		"Ele difere do método acima apenas na lista de "
        		"argumentos que devem ser utilizados.";
-    }    
+    }
 
 //////////////////////////////////////////////////////////////////////////
 // new since 1.4.6
@@ -1568,22 +1562,22 @@ class TranslatorBrazilian : public TranslatorAdapter_1_8_0
       return "Este é o diagrama das funções que utilizam esta função:";
     }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for enumeration values
      */
     virtual QCString trEnumerationValueDocumentation()
     { return "Documentação da enumeração"; }
 
-  
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.5.4 (mainly for Fortran)
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! header that is put before the list of member subprograms (Fortran). */
     virtual QCString trMemberFunctionDocumentationFortran()
     { return "Documentação de Função Membro/Subrotina"; }
 
-    /*! This is put above each page as a link to the list of annotated data types (Fortran). */    
+    /*! This is put above each page as a link to the list of annotated data types (Fortran). */
     virtual QCString trCompoundListFortran()
     { return "Lista de Tipos de Dados"; }
 
@@ -1601,18 +1595,18 @@ class TranslatorBrazilian : public TranslatorAdapter_1_8_0
       QCString result="Esta é a lista de todos os membros ";
       if (!extractAll) result+="documentados ";
       result+="dos tipos de dados com links para ";
-      if (extractAll) 
+      if (extractAll)
       {
         result+="a documentação dos tipos de dados para cada membro:";
       }
-      else 
+      else
       {
         result+="os tipos de dados a que pertencem:";
       }
       return result;
     }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * annotated compound index (Fortran).
      */
     virtual QCString trCompoundIndexFortran()
@@ -1624,24 +1618,24 @@ class TranslatorBrazilian : public TranslatorAdapter_1_8_0
     virtual QCString trTypeDocumentation()
     { return "Documentação dos Tipos de Dados"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) subprograms (Fortran).
      */
     virtual QCString trSubprograms()
     { return "Funções/Subrotinas"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for subprograms (Fortran)
      */
     virtual QCString trSubprogramDocumentation()
     { return "Documentação da Função/Subrotina"; }
 
-    /*! This is used in the documentation of a file/namespace/group before 
+    /*! This is used in the documentation of a file/namespace/group before
      *  the list of links to documented compounds (Fortran)
      */
      virtual QCString trDataTypes()
     { return "Tipos de Dados"; }
-    
+
     /*! used as the title of page containing all the index of all modules (Fortran). */
     virtual QCString trModulesList()
     { return "Lista de Módulos"; }
@@ -1663,7 +1657,7 @@ class TranslatorBrazilian : public TranslatorAdapter_1_8_0
       QCString result = (QCString)"Referência ";
 
       if (isTemplate) result+="da Template ";
-      
+
       switch(compType)
       {
         case ClassDef::Class:      result+="do Modulo "; break;
@@ -1675,54 +1669,54 @@ class TranslatorBrazilian : public TranslatorAdapter_1_8_0
         case ClassDef::Exception:  result+="da Exceção "; break;
         default: break;
       }
-      result += clName; 
-     
+      result += clName;
+
       return result;
     }
     /*! used as the title of the HTML page of a module (Fortran) */
     virtual QCString trModuleReference(const char *namespaceName)
     {
       QCString result = "Referência do Módulo ";
-      result += namespaceName;        
+      result += namespaceName;
       return result;
     }
-    
+
     /*! This is put above each page as a link to all members of modules. (Fortran) */
     virtual QCString trModulesMembers()
     { return "Membros do Módulo"; }
 
     /*! This is an introduction to the page with all modules members (Fortran) */
     virtual QCString trModulesMemberDescription(bool extractAll)
-    { 
+    {
       QCString result="Esta é a lista de todos os membros ";
       if (!extractAll) result+="documentados ";
       result+="dos módulos com links para ";
-      if (extractAll) 
+      if (extractAll)
       {
         result+="a documentação dos módulos para cada membro:";
       }
-      else 
+      else
       {
         result+="os módulos a que pertencem:";
       }
       return result;
     }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      *  index of all modules (Fortran).
      */
     virtual QCString trModulesIndex()
     { return "Índice dos Módulos"; }
-    
+
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trModule(bool first_capital, bool singular)
-    {       
+    {
       QCString result((first_capital ? "Modulo" : "modulo"));
       if (!singular)  result+="s";
-      return result; 
+      return result;
     }
     /*! This is put at the bottom of a module documentation page and is
      *  followed by a list of files that were used to generate the page.
@@ -1743,41 +1737,41 @@ class TranslatorBrazilian : public TranslatorAdapter_1_8_0
         case ClassDef::Exception:  result+="esta exceção "; break;
         default: break;
       }
-      
+
       result+=" foi gerada a partir do";
-      if (single) 
+      if (single)
     	result+=" seguinte arquivo:";
       else
     	result+="s seguintes arquivos:";
-      
+
       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 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trType(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Tipo" : "tipo"));
       if (!singular)  result+="s";
-      return result; 
+      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 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trSubprogram(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Subprograma" : "subprograma"));
       if (!singular)  result+="s";
-      return result; 
+      return result;
     }
 
     /*! C# Type Contraint list */
     virtual QCString trTypeConstraints()
     {
       return "Restrições do Tipo";
-    }    
+    }
 
 //////////////////////////////////////////////////////////////////////////
 // new since 1.6.0 (mainly for the new search engine)
@@ -1842,7 +1836,7 @@ class TranslatorBrazilian : public TranslatorAdapter_1_8_0
       return (QCString)"Inclui arquivo em "+name;
     }
 
-    /** Compiles a date string. 
+    /** Compiles a date string.
      *  @param year Year in 4 digits
      *  @param month Month of the year: 1=January
      *  @param day Day of the Month: 1..31
@@ -1868,7 +1862,7 @@ class TranslatorBrazilian : public TranslatorAdapter_1_8_0
       }
       return sdate;
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.7.5
 //////////////////////////////////////////////////////////////////////////
@@ -1887,6 +1881,6 @@ class TranslatorBrazilian : public TranslatorAdapter_1_8_0
 
     /*! Header for the graph showing the directory dependencies */
     virtual QCString trDirDepGraph(const char *name)
-    { return QCString("Grafo de dependências do diretório ")+name+":"; }    
+    { return QCString("Grafo de dependências do diretório ")+name+":"; }
 };
 #endif
diff --git a/src/translator_ca.h b/src/translator_ca.h
index f888dc1..ab52516 100644
--- a/src/translator_ca.h
+++ b/src/translator_ca.h
@@ -1,12 +1,12 @@
 /******************************************************************************
  *
- * 
+ *
  *
  * Copyright (C) 1997-2013 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 
+ * 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.
  *
@@ -18,7 +18,7 @@
 #ifndef TRANSLATOR_CA_H
 #define TRANSLATOR_CA_H
 
-/*! 
+/*!
  When defining a translator class for the new language, follow
  the description in the documentation.  One of the steps says
  that you should copy the translator_en.h (this) file to your
@@ -45,19 +45,19 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0
   public:
 
     // --- Language control methods -------------------
-    
-    /*! Used for identification of the language. The identification 
-     * should not be translated. It should be replaced by the name 
+
+    /*! 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 should be equal to 
+     * (e.g. "czech", "japanese", "russian", etc.). It should be equal to
      * the identification used in language.cpp.
      */
     virtual QCString idLanguage()
     { return "catalan"; }
-    
-    /*! Used to get the LaTeX command(s) for the language support. 
+
+    /*! 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 
+     *  LaTeX to the desired language.  For example
      *  <pre>"\\usepackage[german]{babel}\n"
      *  </pre>
      *  or
@@ -65,7 +65,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0
      *  "\\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.
      */
@@ -75,12 +75,6 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0
       return "\\usepackage[catalan]{babel}\n";
     }
 
-    /*! return the language charset. This will be used for the HTML output */
-    virtual QCString idLanguageCharset()
-    {
-      return "utf-8";
-    }
-
     // --- Language translation methods -------------------
 
     /*! used in the compound documentation before a list of related functions. */
@@ -98,30 +92,30 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0
     /*! header that is put before the list of typedefs. */
     virtual QCString trMemberTypedefDocumentation()
     { return "Documentació de les Definicions de Tipus Membre"; }
-    
+
     /*! header that is put before the list of enumerations. */
     virtual QCString trMemberEnumerationDocumentation()
     { return "Documentació de les Enumeracions Membre"; }
-    
+
     /*! header that is put before the list of member functions. */
     virtual QCString trMemberFunctionDocumentation()
     { return "Documentació de les Funcions Membre"; }
-    
+
     /*! header that is put before the list of member attributes. */
     virtual QCString trMemberDataDocumentation()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Documentació dels Camps"; 
+        return "Documentació dels Camps";
       }
       else
       {
-        return "Documentació de les Dades Membre"; 
+        return "Documentació de les Dades Membre";
       }
     }
 
     /*! this is the text of a link put after brief descriptions. */
-    virtual QCString trMore() 
+    virtual QCString trMore()
     { return "Més..."; }
 
     /*! put in the class documentation */
@@ -139,77 +133,77 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0
     /*! this is the remainder of the sentence after the class name */
     virtual QCString trIncludingInheritedMembers()
     { return ", incloent tots els membres heretats."; }
-    
+
     /*! 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 automàticament per Doxygen";
       if (s) result+=(QCString)" per a "+s;
-      result+=" a partir del codi font."; 
+      result+=" a partir del codi font.";
       return result;
     }
 
     /*! put after an enum name in the list of all members */
     virtual QCString trEnumName()
     { return "nom de la enum"; }
-    
+
     /*! put after an enum value in the list of all members */
     virtual QCString trEnumValue()
     { return "valors de la enum"; }
-    
+
     /*! put after an undocumented member in the list of all members */
     virtual QCString trDefinedIn()
     { return "definit a"; }
 
     // quick reference sections
 
-    /*! This is put above each page as a link to the list of all groups of 
+    /*! 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 "Mòduls"; }
-    
+
     /*! This is put above each page as a link to the class hierarchy */
     virtual QCString trClassHierarchy()
     { return "Jerarquia de Classes"; }
-    
+
     /*! This is put above each page as a link to the list of annotated classes */
     virtual QCString trCompoundList()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
         return "Estructures de Dades";
       }
       else
       {
-        return "Llista de Classes"; 
+        return "Llista de Classes";
       }
     }
-    
+
     /*! This is put above each page as a link to the list of documented files */
     virtual QCString trFileList()
     { return "Llista dels Fitxers"; }
 
     /*! 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 "Camps de Dades"; 
+        return "Camps de Dades";
       }
       else
       {
-        return "Membres de Classes"; 
+        return "Membres de Classes";
       }
     }
 
     /*! This is put above each page as a link to all members of files. */
     virtual QCString trFileMembers()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Globals"; 
+        return "Globals";
       }
       else
       {
@@ -246,16 +240,16 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0
 
     /*! This is an introduction to the annotated compound list. */
     virtual QCString trCompoundListDescription()
-    { 
-      
+    {
+
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Aquestes són les estructures de dades acompanyades amb breus descripcions:"; 
+        return "Aquestes són les estructures de dades acompanyades amb breus descripcions:";
       }
       else
       {
         return "Aquestes són les classes, estructures, "
-               "unions i interfícies acompanyades amb breus descripcions:"; 
+               "unions i interfícies acompanyades amb breus descripcions:";
       }
     }
 
@@ -276,7 +270,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0
         result+=" documentats";
       }
       result+=" amb enllaços a ";
-      if (!extractAll) 
+      if (!extractAll)
       {
         if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
         {
@@ -287,7 +281,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0
           result+="la documentació de la classe per a cada membre:";
         }
       }
-      else 
+      else
       {
         if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
         {
@@ -315,9 +309,9 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0
         if (!extractAll) result+=" documentats";
       }
       result+=" amb enllaços ";
-      if (extractAll) 
+      if (extractAll)
         result+="als fitxers als quals corresponen:";
-      else 
+      else
         result+="a la documentació:";
       return result;
     }
@@ -333,45 +327,45 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0
     /*! This is an introduction to the page with the list of class/file groups */
     virtual QCString trModulesDescription()
     { return "Aquesta és la llista de mòduls:"; }
-    
-    // index titles (the project name is prepended for these) 
+
+    // index titles (the project name is prepended for these)
 
 
     /*! This is used in HTML as the title of index.html. */
     virtual QCString trDocumentation()
     { return ": Documentació"; }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * index of all groups.
      */
     virtual QCString trModuleIndex()
     { return "Índex de Mòduls"; }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * class hierarchy.
      */
     virtual QCString trHierarchicalIndex()
     { return "Índex Jeràrquic"; }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * annotated compound index.
      */
     virtual QCString trCompoundIndex()
     {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
-      { 
+      {
         return "Índex d'Estructures de Dades";
       }
       else
       {
-        return "Índex de Classes"; 
+        return "Índex de Classes";
       }
     }
 
     /*! This is used in LaTeX as the title of the chapter with the
      * list of all files.
      */
-    virtual QCString trFileIndex() 
+    virtual QCString trFileIndex()
     { return "Índex de Fitxers"; }
 
     /*! This is used in LaTeX as the title of the chapter containing
@@ -384,14 +378,14 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0
      *  the documentation of all classes, structs and unions.
      */
     virtual QCString trClassDocumentation()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
         return "Documentació de les Estructures de Dades";
       }
       else
       {
-        return "Documentació de les Classes"; 
+        return "Documentació de les Classes";
       }
     }
 
@@ -416,93 +410,93 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0
     /*! This is used in LaTeX as the title of the document */
     virtual QCString trReferenceManual()
     { return "Manual de Referència"; }
-    
-    /*! This is used in the documentation of a file as a header before the 
+
+    /*! This is used in the documentation of a file as a header before the
      *  list of defines
      */
     virtual QCString trDefines()
     { return "Definicions"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of function prototypes
      */
     virtual QCString trFuncProtos()
     { return "Prototipus de Funcions"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of typedefs
      */
     virtual QCString trTypedefs()
     { return "Definicions de Tipus"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of enumerations
      */
     virtual QCString trEnumerations()
     { return "Enumeracions"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) functions
      */
     virtual QCString trFunctions()
     { return "Funcions"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) variables
      */
     virtual QCString trVariables()
     { return "Variables"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) variables
      */
     virtual QCString trEnumerationValues()
     { return "Valors de les Enumeracions"; }
-    
+
     /*! This is used in the documentation of a file before the list of
      *  documentation blocks for defines
      */
     virtual QCString trDefineDocumentation()
     { return "Documentació de les Definicions"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for function prototypes
      */
     virtual QCString trFunctionPrototypeDocumentation()
     { return "Documentació de les Funcions Prototipus"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for typedefs
      */
     virtual QCString trTypedefDocumentation()
     { return "Documentació de les Definicions de Tipus"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for enumeration types
      */
     virtual QCString trEnumerationTypeDocumentation()
     { return "Documentació dels Tipus de les Enumeracions"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for functions
      */
     virtual QCString trFunctionDocumentation()
     { return "Documentació de les Funcions"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for variables
      */
     virtual QCString trVariableDocumentation()
     { return "Documentació de les Variables"; }
 
-    /*! This is used in the documentation of a file/namespace/group before 
+    /*! This is used in the documentation of a file/namespace/group before
      *  the list of links to documented compounds
      */
     virtual QCString trCompounds()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Estructures de Dades"; 
+        return "Estructures de Dades";
       }
       else
       {
@@ -510,11 +504,11 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0
       }
     }
 
-    /*! This is used in the standard footer of each page and indicates when 
-     *  the page was generated 
+    /*! 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 a "+date;
       if (projName) result+=(QCString)" per a "+projName;
       result+=(QCString)" per";
@@ -532,7 +526,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0
     {
       return (QCString)"Diagrama d'Herència per a "+clName+":";
     }
-    
+
     /*! this text is generated when the \\internal command is used. */
     virtual QCString trForInternalUseOnly()
     { return "Tan sols per a ús intern."; }
@@ -564,7 +558,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0
     /*! this text is generated when the \\exception command is used. */
     virtual QCString trExceptions()
     { return "Excepcions"; }
-    
+
     /*! this text is used in the title page of a LaTeX document. */
     virtual QCString trGeneratedBy()
     { return "Generat per"; }
@@ -572,7 +566,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990307
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! used as the title of page containing all the index of all namespaces. */
     virtual QCString trNamespaceList()
     { return "Llista dels Espais de Noms"; }
@@ -591,17 +585,17 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0
      */
     virtual QCString trFriends()
     { return "Classes Amigues"; }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990405
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! used in the class documentation as a header before the list of all
-     * related classes 
+     * related classes
      */
     virtual QCString trRelatedFunctionDocumentation()
     { return "Documentació de funcions amigues i relacionades"; }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990425
 //////////////////////////////////////////////////////////////////////////
@@ -632,7 +626,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0
     virtual QCString trFileReference(const char *fileName)
     {
       QCString result="Referència del Fitxer ";
-      result+=fileName; 
+      result+=fileName;
       return result;
     }
 
@@ -643,7 +637,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0
       result+=namespaceName;
       return result;
     }
-    
+
     virtual QCString trPublicMembers()
     { return "Mètodes públics"; }
     virtual QCString trPublicSlots()
@@ -664,7 +658,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0
     { return "Slots Privats"; }
     virtual QCString trStaticPrivateMembers()
     { return "Mètodes Privats Estàtics"; }
-    
+
     /*! this function is used to produce a comma-separated list of items.
      *  use generateMarker(i) to indicate where item i should be put.
      */
@@ -673,23 +667,23 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0
       QCString result;
       int i;
       // the inherits list contain `numEntries' classes
-      for (i=0;i<numEntries;i++) 
+      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 
+        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 
+          if (i<numEntries-2) // not the fore last entry
             result+=", ";
           else                // the fore last entry
             result+=" i ";
         }
       }
-      return result; 
+      return result;
     }
-    
+
     /*! used in class documentation to produce a list of base classes,
      *  if class diagrams are disabled.
      */
@@ -706,7 +700,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0
       return "Heretat per "+trWriteList(numEntries)+".";
     }
 
-    /*! used in member documentation blocks to produce a list of 
+    /*! used in member documentation blocks to produce a list of
      *  members that are hidden by this one.
      */
     virtual QCString trReimplementedFromList(int numEntries)
@@ -728,17 +722,17 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0
 
     /*! This is an introduction to the page with all namespace members */
     virtual QCString trNamespaceMemberDescription(bool extractAll)
-    { 
+    {
       QCString result="Aquesta és la llista de tots els membres de l'espai de noms ";
       if (!extractAll) result+="documentats ";
       result+="amb enllaços a ";
-      if (extractAll) 
+      if (extractAll)
         result+="la documentació de l'espai de noms de cada membre:";
-      else 
+      else
         result+="l'espai de noms al qual corresponen:";
       return result;
     }
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      *  index of all namespaces.
      */
     virtual QCString trNamespaceIndex()
@@ -811,7 +805,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0
     virtual QCString trMainPage()
     { return "Pàgina principal"; }
 
-    /*! This is used in references to page that are put in the LaTeX 
+    /*! 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()
@@ -856,7 +850,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0
     /*! header that is put before the list of constructor/destructors. */
     virtual QCString trConstructorDocumentation()
     {
-      return "Documentació del Constructor i el Destructor"; 
+      return "Documentació del Constructor i el Destructor";
     }
     /*! Used in the file documentation to point to the corresponding sources. */
     virtual QCString trGotoSourceCode()
@@ -913,7 +907,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0
 //////////////////////////////////////////////////////////////////////////
 // new since 1.1.0
 //////////////////////////////////////////////////////////////////////////
-    
+
     virtual QCString trNote()
     {
       return "Nota";
@@ -1002,7 +996,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0
     {
       return "Des de";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.1.5
 //////////////////////////////////////////////////////////////////////////
@@ -1012,12 +1006,12 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0
     {
       return "Llegenda del Gràfic";
     }
-    /*! page explaining how the dot graph's should be interpreted 
+    /*! 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 
+      return
         "Aquesta pàgina explica com s'interpreten els gràfics generats per doxygen.<p>\n"
         "Considera aquest exemple:\n"
         "\\code\n"
@@ -1075,11 +1069,11 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0
     {
       return "llegenda";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.2.0
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! Used as a marker that is put before a test item */
     virtual QCString trTest()
     {
@@ -1157,11 +1151,11 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0
     {
       return "Valor:";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.2.5
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! Used as a marker that is put before a \\bug item */
     virtual QCString trBug()
     {
@@ -1177,9 +1171,9 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0
 // new since 1.2.6
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as ansicpg for RTF file 
-     * 
-     * The following table shows the correlation of Charset name, Charset Value and 
+    /*! 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
@@ -1200,15 +1194,15 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0
      * GB2313_CHARSET          134 (x86)             936
      * CHINESEBIG5_CHARSET     136 (x88)             950
      * </pre>
-     * 
+     *
      */
     virtual QCString trRTFansicp()
     {
       return "1252";
     }
-    
 
-    /*! Used as ansicpg for RTF fcharset 
+
+    /*! Used as ansicpg for RTF fcharset
      *  \see trRTFansicp() for a table of possible values.
      */
     virtual QCString trRTFCharSet()
@@ -1221,82 +1215,82 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0
     {
       return "Índex";
     }
-   
+
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  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 ? "Classe" : "classe"));
       if (!singular)  result+="s";
-      return result; 
+      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 
+     *  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 ? "Fitxer" : "fitxer"));
       if (!singular)  result+="s";
-      return result; 
+      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 
+     *  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 result;
     }
 
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  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 ? "Grup" : "grup"));
       if (!singular)  result+="s";
-      return result; 
+      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 
+     *  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 ? "Pàgin" : "pàgin"));
       if (!singular)  result+="es"; else result+="a";
-      return result; 
+      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 
+     *  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 ? "Membre" : "membre"));
       if (!singular)  result+="s";
-      return result; 
+      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 
+     *  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 result;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1306,10 +1300,10 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0
     /*! 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 ? "Autor" : "autor"));
       if (!singular)  result+="s";
-      return result; 
+      return result;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1327,7 +1321,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0
 // new since 1.2.13
 //////////////////////////////////////////////////////////////////////////
 
-    /*! used in member documentation blocks to produce a list of 
+    /*! used in member documentation blocks to produce a list of
      *  members that are implemented by this one.
      */
     virtual QCString trImplementedFromList(int numEntries)
@@ -1359,8 +1353,8 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0
 // new since 1.2.17
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as the header of the list of item that have been 
-     *  flagged deprecated 
+    /*! Used as the header of the list of item that have been
+     *  flagged deprecated
      */
     virtual QCString trDeprecatedList()
     {
@@ -1371,7 +1365,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0
 // new since 1.2.18
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as a header for declaration section of the events found in 
+    /*! Used as a header for declaration section of the events found in
      * a C# program
      */
     virtual QCString trEvents()
@@ -1391,43 +1385,43 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0
     /*! Used as a heading for a list of Java class types with package scope.
      */
     virtual QCString trPackageTypes()
-    { 
+    {
       return "Tipus de paquets";
     }
-    /*! Used as a heading for a list of Java class functions with package 
-     * scope. 
+    /*! Used as a heading for a list of Java class functions with package
+     * scope.
      */
     virtual QCString trPackageMembers()
-    { 
+    {
       return "Funcions de Paquet";
     }
-    /*! Used as a heading for a list of static Java class functions with 
+    /*! Used as a heading for a list of static Java class functions with
      *  package scope.
      */
     virtual QCString trStaticPackageMembers()
-    { 
+    {
       return "Funcions Estàtiques de Paquet";
     }
-    /*! Used as a heading for a list of Java class variables with package 
+    /*! Used as a heading for a list of Java class variables with package
      * scope.
      */
     virtual QCString trPackageAttribs()
-    { 
+    {
       return "Atributs de Paquet";
     }
-    /*! Used as a heading for a list of static Java class variables with 
+    /*! Used as a heading for a list of static Java class variables with
      * package scope.
      */
     virtual QCString trStaticPackageAttribs()
-    { 
+    {
       return "Atributs Estàtics de Paquet";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.3.1
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used in the quick index of a class/file/namespace member list page 
+    /*! Used in the quick index of a class/file/namespace member list page
      *  to link to the unfiltered list of all members.
      */
     virtual QCString trAll()
@@ -1444,9 +1438,9 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0
 // new since 1.3.3
 //////////////////////////////////////////////////////////////////////////
 
-    /*! When the search engine is enabled this text is put in the header 
-     *  of each page before the field where one can enter the text to search 
-     *  for. 
+    /*! When the search engine is enabled this text is put in the header
+     *  of each page before the field where one can enter the text to search
+     *  for.
      */
     virtual QCString trSearchForIndex()
     {
@@ -1463,7 +1457,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0
      *  text can be different depending on the number of documents found.
      *  Inside the text you can put the special marker $num to insert
      *  the number representing the actual number of search results.
-     *  The @a numDocuments parameter can be either 0, 1 or 2, where the 
+     *  The @a numDocuments parameter can be either 0, 1 or 2, where the
      *  value 2 represents 2 or more matches. HTML markup is allowed inside
      *  the returned string.
      */
@@ -1477,13 +1471,13 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0
       {
         return "Trobat <b>1</b> document.";
       }
-      else 
+      else
       {
         return "Trobats <b>$num</b> documents. "
                "Mostrant els millors resultats primer.";
       }
     }
-    /*! This string is put before the list of matched words, for each search 
+    /*! This string is put before the list of matched words, for each search
      *  result. What follows is the list of words that matched the query.
      */
     virtual QCString trSearchMatches()
@@ -1524,7 +1518,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0
     virtual QCString trDirectories()
     { return "Directoris"; }
 
-    /*! This returns a sentences that introduces the directory hierarchy. 
+    /*! This returns a sentences that introduces the directory hierarchy.
      *  and the fact that it is sorted alphabetically per level
      */
     virtual QCString trDirDescription()
@@ -1542,10 +1536,10 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0
      *  (\a first_capital) and in sigular or plural form (\a singular).
      */
     virtual QCString trDir(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Directori" : "directori"));
       if (!singular) result+="s";
-      return result; 
+      return result;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1572,7 +1566,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0
       return "Gràfic de crides a aquesta funció:";
     }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for enumeration values
      */
     virtual QCString trEnumerationValueDocumentation()
@@ -1581,12 +1575,12 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0
 //////////////////////////////////////////////////////////////////////////
 // new since 1.5.4 (mainly for Fortran)
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! header that is put before the list of member subprograms (Fortran). */
     virtual QCString trMemberFunctionDocumentationFortran()
     { return "Documentació de les Funcions/Subrutines Membre"; }
 
-    /*! This is put above each page as a link to the list of annotated data types (Fortran). */    
+    /*! This is put above each page as a link to the list of annotated data types (Fortran). */
     virtual QCString trCompoundListFortran()
     { return "Llista de Tipus de Dades"; }
 
@@ -1607,18 +1601,18 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0
         result+=" documentats";
       }
       result+=" amb enllaços a ";
-      if (!extractAll) 
+      if (!extractAll)
       {
         result+="la documentació del tipus de dades per a cada membre:";
       }
-      else 
+      else
       {
         result+="els tipus de dades a que pertanyen:";
       }
       return result;
     }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * annotated compound index (Fortran).
      */
     virtual QCString trCompoundIndexFortran()
@@ -1630,24 +1624,24 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0
     virtual QCString trTypeDocumentation()
     { return "Documentació dels Tipus de Dades"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) subprograms (Fortran).
      */
     virtual QCString trSubprograms()
     { return "Funcions/Subrutines"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for subprograms (Fortran)
      */
     virtual QCString trSubprogramDocumentation()
     { return "Documentació de les Funcions/Subrutines"; }
 
-    /*! This is used in the documentation of a file/namespace/group before 
+    /*! This is used in the documentation of a file/namespace/group before
      *  the list of links to documented compounds (Fortran)
      */
      virtual QCString trDataTypes()
     { return "Tipus de Dades"; }
-    
+
     /*! used as the title of page containing all the index of all modules (Fortran). */
     virtual QCString trModulesList()
     { return "Llista de Mòduls"; }
@@ -1690,7 +1684,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0
       result+=namespaceName;
       return result;
     }
-    
+
     /*! This is put above each page as a link to all members of modules. (Fortran) */
     virtual QCString trModulesMembers()
     { return "Membres del Mòdul"; }
@@ -1704,32 +1698,32 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0
         result+=" documentats";
       }
       result+=" amb enllaços a ";
-      if (!extractAll) 
+      if (!extractAll)
       {
         result+="la documentació del mòdul per a cada membre:";
       }
-      else 
+      else
       {
         result+="els mòduls a que pertanyen:";
       }
       return result;
     }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      *  index of all modules (Fortran).
      */
     virtual QCString trModulesIndex()
     { return "Índex de Mòduls"; }
-    
+
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trModule(bool first_capital, bool singular)
-    {       
+    {
       QCString result((first_capital ? "Mòdul" : "mòdul"));
       if (!singular)  result+="s";
-      return result; 
+      return result;
     }
     /*! This is put at the bottom of a module documentation page and is
      *  followed by a list of files that were used to generate the page.
@@ -1760,25 +1754,25 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0
     }
 
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trType(bool first_capital, bool)
-    { 
+    {
       QCString result((first_capital ? "Tipus" : "tipus"));
       //if (!singular)  result+="s";
-      return result; 
+      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 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trSubprogram(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Subprogram" : "subprogram"));
       if (!singular)  result+="es";
       else            result+="a";
-      return result; 
+      return result;
     }
 
     /*! C# Type Constraint list */
@@ -1849,7 +1843,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0
       return (QCString)"Inclou fitxer a "+name;
     }
 
-    /** Compiles a date string. 
+    /** Compiles a date string.
      *  @param year Year in 4 digits
      *  @param month Month of the year: 1=January
      *  @param day Day of the Month: 1..31
diff --git a/src/translator_cn.h b/src/translator_cn.h
index ba6e078..4eef9c7 100644
--- a/src/translator_cn.h
+++ b/src/translator_cn.h
@@ -1,12 +1,12 @@
 /******************************************************************************
  *
- * 
+ *
  *
  * Copyright (C) 1997-2013 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 
+ * 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.
  *
@@ -33,13 +33,13 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
      * (e.g. "czech", "japanese", "russian", etc.). It should be equal to
      * the identification used in the language.cpp.
      */
-    
+
     virtual QCString idLanguage()
     { return "chinese"; }
 
-    /*! Used to get the LaTeX command(s) for the language support. 
+    /*! 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 
+     * LaTeX to the desired language.  For example
      * <pre>"\\usepackage[german]{babel}\n"
      * </pre>
      * or
@@ -47,7 +47,7 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
      * "\\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.
      */
@@ -56,12 +56,7 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
       return "";
     }
 
-
-    /*! return the language charset. This will be used for the HTML output */
-    virtual QCString idLanguageCharset()
-    { return "UTF-8"; }
-
-    /*! used in the compound documentation before a list of related functions. 
+    /*! used in the compound documentation before a list of related functions.
      */
     virtual QCString trRelatedFunctions()
     { return "相关函数"; }
@@ -70,8 +65,8 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
     virtual QCString trRelatedSubscript()
     { return "(请注意: 这些不是成员函数.)"; }
 
-    /*! header that is put before the detailed description of files, 
-     * classes and namespaces. 
+    /*! header that is put before the detailed description of files,
+     * classes and namespaces.
      */
     virtual QCString trDetailedDescription()
     { return "详细描述"; }
@@ -90,14 +85,14 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
 
     /*! header that is put before the list of member attributes. */
     virtual QCString trMemberDataDocumentation()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "结构体成员变量说明"; 
+        return "结构体成员变量说明";
       }
       else
       {
-        return "类成员变量说明"; 
+        return "类成员变量说明";
       }
     }
 
@@ -128,7 +123,7 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
     { QCString result;
       result = "由"CN_SPC"Doyxgen"CN_SPC"通过分析"CN_SPC;
       if (s) result += ((QCString)s+CN_SPC"的"CN_SPC);
-      result+= "源代码自动生成."; 
+      result+= "源代码自动生成.";
       return result;
     }
 
@@ -146,7 +141,7 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
 
     // quick reference sections
 
-    /*! This is put above each page as a link to the list of all groups of 
+    /*! 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()
@@ -158,12 +153,12 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
 
     /*! 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 "结构体"; 
+        return "结构体";
       }
       else {
-        return "类列表"; 
+        return "类列表";
       }
     }
 
@@ -173,22 +168,22 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
 
     /*! 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 "成员变量"; 
+    {
+      if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) {
+        return "成员变量";
       }
       else {
-        return "类成员"; 
+        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 "全局定义"; 
+        return "全局定义";
       } else {
-        return "文件成员"; 
+        return "文件成员";
       }
     }
 
@@ -215,14 +210,14 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
     }
 
     virtual QCString trCompoundListDescription()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "这里列出了所有结构体，并附带简要说明:"; 
+        return "这里列出了所有结构体，并附带简要说明:";
       }
       else
       {
-        return "这里列出了所有类、结构、联合以及接口定义等，并附带简要说明:"; 
+        return "这里列出了所有类、结构、联合以及接口定义等，并附带简要说明:";
       }
     }
 
@@ -261,18 +256,18 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
     virtual QCString trFileMembersDescription(bool extractAll)
     {
       QCString result="这里列出了所有";
-      if (!extractAll) 
+      if (!extractAll)
         result +="文档化的";
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) {
         result +="函数,变量,宏,枚举和类型定义等,并附带";
-      } 
+      }
       else {
         result +="文件成员,并附带";
       }
 
-      if (extractAll) 
+      if (extractAll)
         result+="其所属的文件:";
-      else 
+      else
         result+="其详细说明:";
       return result;
     }
@@ -296,30 +291,30 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
     { return "继承关系索引"; }
 
     virtual QCString trCompoundIndex()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "结构体索引"; 
-      } 
+        return "结构体索引";
+      }
       else {
-        return "类索引"; 
+        return "类索引";
       }
     }
 
-    virtual QCString trFileIndex() 
+    virtual QCString trFileIndex()
     { return "文件索引"; }
 
     virtual QCString trModuleDocumentation()
     { return "模块说明"; }
 
     virtual QCString trClassDocumentation()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
         return "结构体说明";
       }
       else {
-        return "类说明"; 
+        return "类说明";
       }
     }
 
@@ -376,13 +371,13 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
     { return "变量说明"; }
 
     virtual QCString trCompounds()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
-      { 
+      {
         return "结构体";
       }
       else {
-        return "类"; 
+        return "类";
       }
     }
 
@@ -429,11 +424,11 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
 
      virtual QCString trGeneratedBy()
     { return "制作者"; }
-    
+
 //////////////////////////////////////////////////////////////////////////
-// new since 0.49-990307 
+// new since 0.49-990307
 //////////////////////////////////////////////////////////////////////////
-    
+
      virtual QCString trNamespaceList()
     { return "命名空间列表"; }
 
@@ -451,10 +446,10 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990405
 //////////////////////////////////////////////////////////////////////////
-    
+
      virtual QCString trRelatedFunctionDocumentation()
     { return "友元及相关函数文档"; }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990425
 //////////////////////////////////////////////////////////////////////////
@@ -485,7 +480,7 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
     virtual QCString trFileReference(const char *fileName)
     {
       QCString result=fileName;
-      result+=CN_SPC"文件参考"; 
+      result+=CN_SPC"文件参考";
       return result;
     }
 
@@ -495,8 +490,8 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
       result+=CN_SPC"命名空间参考";
       return result;
     }
-    
-    // these are for the member sections of a class, struct or union 
+
+    // these are for the member sections of a class, struct or union
     virtual QCString trPublicMembers()
     { return "Public 成员函数"; }
 
@@ -517,17 +512,17 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
 
     virtual QCString trStaticProtectedMembers()
     { return "静态 Protected 成员函数"; }
-    
+
     virtual QCString trPrivateMembers()
     { return "Private 成员函数"; }
-    
+
     virtual QCString trPrivateSlots()
     { return "Private 槽"; }
-    
+
     virtual QCString trStaticPrivateMembers()
     { return "静态 Private 成员函数"; }
-    
-    // end of member sections 
+
+    // end of member sections
     virtual QCString trWriteList(int numEntries)
     {
       // this function is used to produce a comma-separated list of items.
@@ -535,23 +530,23 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
       QCString result;
       int i;
       // the inherits list contain `numEntries' classes
-      for (i=0;i<numEntries;i++) 
+      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 
+        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 
+          if (i<numEntries-2) // not the fore last entry
             result+=","CN_SPC;
           else                // the fore last entry
             result+=CN_SPC", 以及"CN_SPC;
         }
       }
-      return result; 
+      return result;
     }
-    
+
     /*! used in class documentation to produce a list of base classes,
      *  if class diagrams are disabled.
      */
@@ -565,15 +560,15 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
     {
       return "被"CN_SPC+trWriteList(numEntries)+CN_SPC"继承.";
     }
-    
-    /*! used in member documentation blocks to produce a list of 
+
+    /*! used in member documentation blocks to produce a list of
      *  members that are hidden by this one.
      */
     virtual QCString trReimplementedFromList(int numEntries)
     {
       return "重载"CN_SPC+trWriteList(numEntries)+CN_SPC".";
     }
-    
+
     /*! used in member documentation blocks to produce a list of
      *  all member that overwrite the implementation of this member.
      */
@@ -585,21 +580,21 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
     /*! This is put above each page as a link to all members of namespaces. */
     virtual QCString trNamespaceMembers()
     { return "命名空间成员"; }
-    
+
     /*! This is an introduction to the page with all namespace members */
     virtual QCString trNamespaceMemberDescription(bool extractAll)
-    { 
+    {
        QCString result="这里列出了所有";
       if (!extractAll) result+="文档化的";
       result+="命名空间成员，并附带";
-      if (extractAll) 
+      if (extractAll)
         result+="其说明文档:";
-      else 
+      else
         result+="其所属的文件:";
       return result;
     }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      *  index of all namespaces.
      */
     virtual QCString trNamespaceIndex()
@@ -669,7 +664,7 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
     virtual QCString trMainPage()
     { return "首页"; }
 
-    /*! This is used in references to page that are put in the LaTeX 
+    /*! 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()
@@ -717,7 +712,7 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
     /*! header that is put before the list of constructor/destructors. */
     virtual QCString trConstructorDocumentation()
     {
-      return "构造及析构函数说明"; 
+      return "构造及析构函数说明";
     }
 
     /*! Used in the file documentation to point to the corresponding sources. */
@@ -785,7 +780,7 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
 //////////////////////////////////////////////////////////////////////////
 // new since 1.1.0
 //////////////////////////////////////////////////////////////////////////
-    
+
     virtual QCString trNote()
     {
       return "注解";
@@ -799,7 +794,7 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
     virtual QCString trPublicAttribs()
     {
        if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
-       { 
+       {
          return "成员变量";
        }
        else {
@@ -887,7 +882,7 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
     {
       return "自从";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.1.5
 //////////////////////////////////////////////////////////////////////////
@@ -954,7 +949,7 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
         "<li>%黄色虚线箭头表示模板类实例和模板类之间的关系. 箭头旁边标明了模板类实例化的参数.</li>\n"
         "</ul>\n";
     }
-    
+
     /*! text for the link to the legend page */
     virtual QCString trLegend()
     {
@@ -964,7 +959,7 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
 //////////////////////////////////////////////////////////////////////////
 // new since 1.2.0
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! Used as a marker that is put before a test item */
     virtual QCString trTest()
     {
@@ -1024,7 +1019,7 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
     {
       return (QCString)"包"CN_SPC+name;
     }
-    
+
     /*! Title of the package index page */
     virtual QCString trPackageList()
     {
@@ -1034,7 +1029,7 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
     /*! The description of the package index page */
     virtual QCString trPackageListDescription()
     {
-       return "这里列出所有的包，附带简要说明(如果有的话):"; 
+       return "这里列出所有的包，附带简要说明(如果有的话):";
     }
 
     /*! The link name in the Quick links header for each page */
@@ -1066,9 +1061,9 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
 // new since 1.2.6
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as ansicpg for RTF file 
-     * 
-     * The following table shows the correlation of Charset name, Charset Value and 
+    /*! 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
@@ -1089,14 +1084,14 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
      * GB2313_CHARSET          134 (x86)             936
      * CHINESEBIG5_CHARSET     136 (x88)             950
      * </pre>
-     * 
+     *
      */
     virtual QCString trRTFansicp()
     {
       return "936";
     }
 
-    /*! Used as ansicpg for RTF fcharset 
+    /*! Used as ansicpg for RTF fcharset
      *  \see trRTFansicp() for a table of possible values.
      */
     virtual QCString trRTFCharSet()
@@ -1111,102 +1106,102 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
       return "索引";
     }
 
-   
+
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  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 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 
+     *  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 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 
+     *  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 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 
+     *  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 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 
+     *  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 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 
+     *  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 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 
+     *  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 result;
       */
       return "全局";
     }
@@ -1218,11 +1213,11 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
     /*! 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 result;
       */
       return "作者";
     }
@@ -1242,7 +1237,7 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
 // new since 1.2.13
 //////////////////////////////////////////////////////////////////////////
 
-    /*! used in member documentation blocks to produce a list of 
+    /*! used in member documentation blocks to produce a list of
      *  members that are implemented by this one.
      */
     virtual QCString trImplementedFromList(int numEntries)
@@ -1277,8 +1272,8 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
 // new since 1.2.17
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as the header of the list of item that have been 
-     *  flagged deprecated 
+    /*! Used as the header of the list of item that have been
+     *  flagged deprecated
      */
     virtual QCString trDeprecatedList()
     {
@@ -1289,14 +1284,14 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
 // new since 1.2.18
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as a header for declaration section of the events found in 
+    /*! Used as a header for declaration section of the events found in
      * a C# program
      */
     virtual QCString trEvents()
     {
       return "事件";
     }
-    
+
     /*! Header used for the documentation section of a class' events. */
     virtual QCString trEventDocumentation()
     {
@@ -1310,54 +1305,54 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
     /*! Used as a heading for a list of Java class types with package scope.
      */
     virtual QCString trPackageTypes()
-    { 
+    {
       return "包类型";
     }
-    
-    /*! Used as a heading for a list of Java class functions with package 
-     * scope. 
+
+    /*! Used as a heading for a list of Java class functions with package
+     * scope.
      */
     virtual QCString trPackageMembers()
-    { 
+    {
       return "包函数";
     }
-    
-    /*! Used as a heading for a list of static Java class functions with 
+
+    /*! Used as a heading for a list of static Java class functions with
      *  package scope.
      */
     virtual QCString trStaticPackageMembers()
-    { 
+    {
       return "静态包函数";
     }
-    
-    /*! Used as a heading for a list of Java class variables with package 
+
+    /*! Used as a heading for a list of Java class variables with package
      * scope.
      */
     virtual QCString trPackageAttribs()
-    { 
+    {
       return "包属性";
     }
-    
-    /*! Used as a heading for a list of static Java class variables with 
+
+    /*! Used as a heading for a list of static Java class variables with
      * package scope.
      */
     virtual QCString trStaticPackageAttribs()
     {
       return "静态包属性";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.3.1
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used in the quick index of a class/file/namespace member list page 
+    /*! Used in the quick index of a class/file/namespace member list page
      *  to link to the unfiltered list of all members.
      */
     virtual QCString trAll()
     {
       return "全部";
     }
-    
+
     /*! Put in front of the call graph for a function. */
     virtual QCString trCallGraph()
     {
@@ -1368,9 +1363,9 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
 // new since 1.3.3
 //////////////////////////////////////////////////////////////////////////
 
-    /*! When the search engine is enabled this text is put in the header 
-     *  of each page before the field where one can enter the text to search 
-     *  for. 
+    /*! When the search engine is enabled this text is put in the header
+     *  of each page before the field where one can enter the text to search
+     *  for.
      */
     virtual QCString trSearchForIndex()
     {
@@ -1383,12 +1378,12 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
     {
       return "搜索结果";
     }
-    
+
     /*! This string is put just before listing the search results. The
      *  text can be different depending on the number of documents found.
      *  Inside the text you can put the special marker $num to insert
      *  the number representing the actual number of search results.
-     *  The @a numDocuments parameter can be either 0, 1 or 2, where the 
+     *  The @a numDocuments parameter can be either 0, 1 or 2, where the
      *  value 2 represents 2 or more matches. HTML markup is allowed inside
      *  the returned string.
      */
@@ -1402,13 +1397,13 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
       {
         return "找到<b>1</b>篇与您查询相符的文档.";
       }
-      else 
+      else
       {
         return "找到<b>$num</b>篇与您查询相符的文档."
                "优先显示最符合的文档.";
       }
     }
-    /*! This string is put before the list of matched words, for each search 
+    /*! This string is put before the list of matched words, for each search
      *  result. What follows is the list of words that matched the query.
      */
     virtual QCString trSearchMatches()
@@ -1453,7 +1448,7 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
     virtual QCString trDirectories()
     { return "目录"; }
 
-    /*! This returns a sentences that introduces the directory hierarchy. 
+    /*! This returns a sentences that introduces the directory hierarchy.
      *  and the fact that it is sorted alphabetically per level
      */
     virtual QCString trDirDescription()
@@ -1467,7 +1462,7 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
     virtual QCString trDirReference(const char *dirName)
     {
       QCString result=dirName;
-      result+=CN_SPC"目录参考"; 
+      result+=CN_SPC"目录参考";
       return result;
     }
 
@@ -1475,10 +1470,10 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
      *  (\a first_capital) and in sigular or plural form (\a singular).
      */
     virtual QCString trDir(bool /*first_capital*/, bool /*singular*/)
-    { 
+    {
       return "目录";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.4.1
 //////////////////////////////////////////////////////////////////////////
@@ -1502,23 +1497,23 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
       return "这是这个函数的调用关系图:";
     }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for enumeration values
      */
     virtual QCString trEnumerationValueDocumentation()
-    { 
+    {
       return "枚举变量说明";
     }
 
 //////////////////////////////////////////////////////////////////////////
 // new since 1.5.4 (mainly for Fortran)
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! header that is put before the list of member subprograms (Fortran). */
     virtual QCString trMemberFunctionDocumentationFortran()
     { return "成员函数/子程序说明"; }
 
-    /*! This is put above each page as a link to the list of annotated data types (Fortran). */    
+    /*! This is put above each page as a link to the list of annotated data types (Fortran). */
     virtual QCString trCompoundListFortran()
     { return "数据类型列表"; }
 
@@ -1540,18 +1535,18 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
       }
       result+="数据类型成员,并附带";
       //result+=" with links to ";
-      if (!extractAll) 
+      if (!extractAll)
       {
         result+="其说明文档:";
       }
-      else 
+      else
       {
         result+="其所属的文件:";
       }
       return result;
     }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * annotated compound index (Fortran).
      */
     virtual QCString trCompoundIndexFortran()
@@ -1564,25 +1559,25 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
     virtual QCString trTypeDocumentation()
     { return "数据类型文档"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) subprograms (Fortran).
      */
     virtual QCString trSubprograms()
     { return "函数/子程序"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for subprograms (Fortran)
      */
     virtual QCString trSubprogramDocumentation()
     { return "函数/子程序说明"; }
 
 
-    /*! This is used in the documentation of a file/namespace/group before 
+    /*! This is used in the documentation of a file/namespace/group before
      *  the list of links to documented compounds (Fortran)
      */
      virtual QCString trDataTypes()
     { return "数据类型"; }
-    
+
     /*! used as the title of page containing all the index of all modules (Fortran). */
     virtual QCString trModulesList()
     { return "模块列表"; }
@@ -1617,30 +1612,30 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
       result+="参考手册";
       return result;
     }
-    
+
     /*! used as the title of the HTML page of a module (Fortran) */
     virtual QCString trModuleReference(const char *namespaceName)
     {
-      QCString result=namespaceName;  
+      QCString result=namespaceName;
       result += CN_SPC"模块参考手册";
       return result;
     }
-    
+
     /*! This is put above each page as a link to all members of modules. (Fortran) */
     virtual QCString trModulesMembers()
     { return "模块成员"; }
 
     /*! This is an introduction to the page with all modules members (Fortran) */
     virtual QCString trModulesMemberDescription(bool extractAll)
-    { 
+    {
       // QCString result="Here is a list of all ";
       // if (!extractAll) result+="documented ";
       // result+="module members with links to ";
-      // if (extractAll) 
+      // if (extractAll)
       // {
       //   result+="the module documentation for each member:";
       // }
-      // else 
+      // else
       // {
       //   result+="the modules they belong to:";
       // }
@@ -1652,22 +1647,22 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
       }
     }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      *  index of all modules (Fortran).
      */
     virtual QCString trModulesIndex()
     // { return "Modules Index"; }
     { return "模块索引"; }
-    
+
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trModule(bool, bool)
-    {       
+    {
       // QCString result((first_capital ? "Module" : "module"));
       // if (!singular)  result+="s";
-      // return result; 
+      // return result;
       return "模块";
     }
     /*! This is put at the bottom of a module documentation page and is
@@ -1675,7 +1670,7 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
      */
     virtual QCString trGeneratedFromFilesFortran(ClassDef::CompoundType compType,
         bool)
-    { 
+    {
       QCString result="该";
       switch(compType)
       {
@@ -1691,22 +1686,22 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
       result+=CN_SPC"的文档由以下文件生成:";
       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 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trType(bool, bool)
-    { 
+    {
       return "类型";
     }
-    
+
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trSubprogram(bool, bool)
-    { 
+    {
       return "子程序";
     }
 
@@ -1715,7 +1710,7 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
     {
       return "类型限制";
     }
-  
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.6.0
 //////////////////////////////////////////////////////////////////////////
@@ -1725,22 +1720,22 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
     // unsure
     return QCString(name)+CN_SPC"关系";
   }
-  
+
     virtual QCString trLoading()
   {
     return "载入中...";
   }
-    
+
   virtual QCString trGlobalNamespace()
   {
     return "全局命名空间";
   }
-  
+
     virtual QCString trSearching()
   {
     return "搜索中...";
   }
-    
+
   virtual QCString trNoMatches()
   {
     return "未找到";
@@ -1754,12 +1749,12 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
   {
     return QCString(name)+CN_SPC"的目录依赖关系图";
   }
-    
+
   virtual QCString trFileIn(const char *name)
   {
     return (QCString)"文件在"+CN_SPC+name;
   }
-  
+
   virtual QCString trIncludesFileIn(const char *name)
   {
     return (QCString)"在"CN_SPC+name+CN_SPC"中引用";
@@ -1771,11 +1766,11 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
   {
     static const char *days[]   = { "一","二","三","四","五","六","日" };
       static const char *months[] = { "一","二","三","四","五","六","七","八","九","十","十一","十二" };
-      
+
     QCString sdate;
-      
+
     sdate.sprintf("%d年"CN_SPC"%s月"CN_SPC"%d日"CN_SPC"星期%s",year, months[month-1], day, days[dayOfWeek-1]);
-      
+
     if (includeTime)
     {
       QCString stime;
@@ -1784,7 +1779,7 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
     }
     return sdate;
   }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.7.5
 //////////////////////////////////////////////////////////////////////////
@@ -1801,11 +1796,11 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
     virtual QCString trDirDepGraph(const char *name)
     {
       return QCString(name)+CN_SPC"的目录依赖关系图";
-    } 
-    
+    }
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.8.0
-//////////////////////////////////////////////////////////////////////////  
+//////////////////////////////////////////////////////////////////////////
 
     /*! Detail level selector shown for hierarchical indices */
     virtual QCString trDetailLevel()
@@ -1831,8 +1826,8 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2
     virtual QCString trInheritedFrom(const char *members,const char *what)
     { return QCString(members)+CN_SPC"继承自"CN_SPC+what; }
 
-    /*! Header of the sections with inherited members specific for the 
-     *  base class(es) 
+    /*! Header of the sections with inherited members specific for the
+     *  base class(es)
      */
     virtual QCString trAdditionalInheritedMembers()
     { return "额外继承的成员函数"; }
diff --git a/src/translator_cz.h b/src/translator_cz.h
index 6fb4259..e6d7af0 100644
--- a/src/translator_cz.h
+++ b/src/translator_cz.h
@@ -99,12 +99,6 @@ class TranslatorCzech : public Translator
              "\\usepackage[czech]{babel}\n";
     }
 
-    /*! return the language charset. This will be used for the HTML output */
-    virtual QCString idLanguageCharset()
-    {
-        return "utf-8";
-    }
-
     // --- Language translation methods -------------------
 
     /*! used in the compound documentation before a list of related functions. */
diff --git a/src/translator_de.h b/src/translator_de.h
index 5486f6c..2f42236 100644
--- a/src/translator_de.h
+++ b/src/translator_de.h
@@ -1,12 +1,12 @@
 /******************************************************************************
  *
- * 
+ *
  *
  * Copyright (C) 1997-2013 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 
+ * 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.
  *
@@ -36,7 +36,7 @@
 //   2001/04/17 Jens Seidel (jensseidel@users.sourceforge.net)
 //    - fixed typos ("Vererbunsbeziehung", "gesch&uumltzter")
 //    - use umlauts instead of html code ("&auml;",...)
-//      this makes it easier to read and fixes three problems (two in 
+//      this makes it easier to read and fixes three problems (two in
 //      \code segment)
 //
 //   2001/04/23 Jens Seidel (jensseidel@users.sourceforge.net)
@@ -81,30 +81,30 @@
 //
 //   2003/09/11 Jens Seidel (jensseidel@users.sourceforge.net)
 //    - Updated for "new since 1.3.1" version
-//  
+//
 //   2003/09/24 Jens Seidel (jensseidel@users.sourceforge.net)
 //    - Updated a few strings which changed in CVS revision 1.22
 //      ("compound" vs. "class")
-//    
+//
 //   2004/08/01 Jens Seidel (jensseidel@users.sourceforge.net)
 //    - Updated for "new since 1.3.8" version
-//    
+//
 //   2004/09/19 Jens Seidel (jensseidel@users.sourceforge.net)
 //    - Updated for "new since 1.3.9" version
-//    
+//
 //   2004/09/25 Jens Seidel (jensseidel@users.sourceforge.net)
 //    - changed "Typendefinitionen" to "Typdefinitionen" in
 //      trFileMembersDescription() and trTypedefs()
 //    - added a dash after (file, ...) names and in front of description
 //    - changed "Eigenschaften" to "Propertys" (yeah, not ..."ies")
-//    
+//
 //   2005/03/20 Jens Seidel (jensseidel@users.sourceforge.net)
 //    - Updated for "new since 1.4.1" version
-//    
+//
 //   2005/04/09 Jens Seidel (jensseidel@users.sourceforge.net)
 //    - Changed Todo list translation as suggested in
 //      http://bugzilla.gnome.org/show_bug.cgi?id=172818
-//    
+//
 //   2005/05/09 Jens Seidel (jensseidel@users.sourceforge.net)
 //    - Updated for "new since 1.4.3" version (removed unused methods)
 //
@@ -138,11 +138,11 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
   public:
 
     // --- Language control methods -------------------
-    
-    /*! Used for identification of the language. The identification 
-     * should not be translated. It should be replaced by the name 
+
+    /*! 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 should be equal to 
+     * (e.g. "czech", "japanese", "russian", etc.). It should be equal to
      * the identification used in language.cpp.
      */
     virtual QCString idLanguage()
@@ -156,12 +156,6 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
       return "\\usepackage[ngerman]{babel}\n";
     }
 
-    /*! return the language charset. This will be used for the HTML output */
-    virtual QCString idLanguageCharset()
-    {
-      return "utf-8";
-    }
-
     // --- Language translation methods -------------------
 
     /*! used in the compound documentation before a list of related functions. */
@@ -179,15 +173,15 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
     /*! header that is put before the list of typedefs. */
     virtual QCString trMemberTypedefDocumentation()
     { return "Dokumentation der benutzerdefinierten Datentypen"; }
-    
+
     /*! header that is put before the list of enumerations. */
     virtual QCString trMemberEnumerationDocumentation()
     { return "Dokumentation der Aufzählungstypen"; }
-    
+
     /*! header that is put before the list of member functions. */
     virtual QCString trMemberFunctionDocumentation()
     { return "Dokumentation der Elementfunktionen"; }
-    
+
     /*! header that is put before the list of member attributes. */
     virtual QCString trMemberDataDocumentation()
     { /* No difference if "OPTIMIZE_OUTPUT_FOR_C" is set! */
@@ -195,7 +189,7 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
     }
 
     /*! this is the text of a link put after brief descriptions. */
-    virtual QCString trMore() 
+    virtual QCString trMore()
     { return "Mehr ..."; }
 
     /*! put in the class documentation */
@@ -213,7 +207,7 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
     /*! this is the remainder of the sentence after the class name */
     virtual QCString trIncludingInheritedMembers()
     { return " einschließlich aller geerbten Elemente."; }
-    
+
     /*! this is put at the author sections at the bottom of man pages.
      *  parameter s is name of the project name.
      */
@@ -227,30 +221,30 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
     /*! put after an enum name in the list of all members */
     virtual QCString trEnumName()
     { return "enum-Bezeichner"; }
-    
+
     /*! put after an enum value in the list of all members */
     virtual QCString trEnumValue()
     { return "enum-Wert"; }
-    
+
     /*! put after an undocumented member in the list of all members */
     virtual QCString trDefinedIn()
     { return "Definiert in"; }
 
     // quick reference sections
 
-    /*! This is put above each page as a link to the list of all groups of 
+    /*! 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 "Klassenhierarchie"; }
-    
+
     /*! This is put above each page as a link to the list of annotated classes */
     virtual QCString trCompoundList()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
         return "Datenstrukturen";
@@ -260,14 +254,14 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
         return "Auflistung der Klassen";
       }
     }
-    
+
     /*! This is put above each page as a link to the list of documented files */
     virtual QCString trFileList()
     { return "Auflistung der Dateien"; }
 
     /*! 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 "Datenstruktur-Elemente";
@@ -312,7 +306,7 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
 
     /*! This is an introduction to the annotated compound list. */
     virtual QCString trCompoundListDescription()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
 	return "Hier folgt die Aufzählung aller Datenstrukturen "
@@ -342,7 +336,7 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
         result+="Klassenelemente";
       }
       result+=" mit Verweisen auf ";
-      if (!extractAll) 
+      if (!extractAll)
       {
         if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
         {
@@ -381,7 +375,7 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
         result+="Dateielemente";
       }
       result+=" mit Verweisen auf ";
-      if (extractAll) 
+      if (extractAll)
         result+="die Dokumentation zu jedem Element:";
       else
         result+="die zugehörigen Dateien:";
@@ -400,25 +394,25 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
     virtual QCString trModulesDescription()
     { return "Hier folgt die Aufzählung aller Module:"; }
 
-    // index titles (the project name is prepended for these) 
+    // index titles (the project name is prepended for these)
 
     /*! This is used in HTML as the title of index.html. */
     virtual QCString trDocumentation()
     { return "Dokumentation"; }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * index of all groups.
      */
     virtual QCString trModuleIndex()
     { return "Modul-Verzeichnis"; }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * class hierarchy.
      */
     virtual QCString trHierarchicalIndex()
     { return "Hierarchie-Verzeichnis"; }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * annotated compound index.
      */
     virtual QCString trCompoundIndex()
@@ -432,7 +426,7 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
     /*! This is used in LaTeX as the title of the chapter with the
      * list of all files.
      */
-    virtual QCString trFileIndex() 
+    virtual QCString trFileIndex()
     { return "Datei-Verzeichnis"; }
 
     /*! This is used in LaTeX as the title of the chapter containing
@@ -445,10 +439,10 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
      *  the documentation of all classes, structs and unions.
      */
     virtual QCString trClassDocumentation()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Datenstruktur-Dokumentation"; 
+        return "Datenstruktur-Dokumentation";
       }
       else
       {
@@ -477,90 +471,90 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
     /*! This is used in LaTeX as the title of the document */
     virtual QCString trReferenceManual()
     { return "Nachschlagewerk"; }
-    
-    /*! This is used in the documentation of a file as a header before the 
+
+    /*! This is used in the documentation of a file as a header before the
      *  list of defines
      */
     virtual QCString trDefines()
     { return "Makrodefinitionen"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of function prototypes
      */
     virtual QCString trFuncProtos()
     { return "Funktionsprototypen"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of typedefs
      */
     virtual QCString trTypedefs()
     { return "Typdefinitionen"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of enumerations
      */
     virtual QCString trEnumerations()
     { return "Aufzählungen"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) functions
      */
     virtual QCString trFunctions()
     { return "Funktionen"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) variables
      */
     virtual QCString trVariables()
     { return "Variablen"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) variables
      */
     virtual QCString trEnumerationValues()
     { return "Aufzählungswerte"; }
-    
+
     /*! This is used in the documentation of a file before the list of
      *  documentation blocks for defines
      */
     virtual QCString trDefineDocumentation()
     { return "Makro-Dokumentation"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for function prototypes
      */
     virtual QCString trFunctionPrototypeDocumentation()
     { return "Funktionsprototypen Dokumentation"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for typedefs
      */
     virtual QCString trTypedefDocumentation()
     { return "Dokumentation der benutzerdefinierten Typen"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for enumeration types
      */
     virtual QCString trEnumerationTypeDocumentation()
     { return "Dokumentation der Aufzählungstypen"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for functions
      */
     virtual QCString trFunctionDocumentation()
     { return "Dokumentation der Funktionen"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for variables
      */
     virtual QCString trVariableDocumentation()
     { return "Variablen-Dokumentation"; }
 
-    /*! This is used in the documentation of a file/namespace/group before 
+    /*! This is used in the documentation of a file/namespace/group before
      *  the list of links to documented compounds
      */
     virtual QCString trCompounds()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
         return "Datenstrukturen";
@@ -571,8 +565,8 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
       }
     }
 
-    /*! This is used in the standard footer of each page and indicates when 
-     *  the page was generated 
+    /*! 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)
     {
@@ -594,7 +588,7 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
     {
       return (QCString)"Klassendiagramm für "+clName+":";
     }
-    
+
     /*! this text is generated when the \\internal command is used. */
     virtual QCString trForInternalUseOnly()
     { return "Nur für den internen Gebrauch."; }
@@ -626,7 +620,7 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
     /*! this text is generated when the \\exception command is used. */
     virtual QCString trExceptions()
     { return "Ausnahmebehandlung"; }
-    
+
     /*! this text is used in the title page of a LaTeX document. */
     virtual QCString trGeneratedBy()
     { return "Erzeugt von"; }
@@ -634,7 +628,7 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990307
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! used as the title of page containing all the index of all namespaces. */
     virtual QCString trNamespaceList()
     { return "Liste aller Namensbereiche"; }
@@ -653,17 +647,17 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
      */
     virtual QCString trFriends()
     { return "Freundbeziehungen"; }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990405
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! used in the class documentation as a header before the list of all
-     * related classes 
+     * related classes
      */
     virtual QCString trRelatedFunctionDocumentation()
     { return "Freundbeziehungen und Funktionsdokumentation"; }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990425
 //////////////////////////////////////////////////////////////////////////
@@ -682,7 +676,7 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
         case ClassDef::Union:  result+="Varianten"; break;
         case ClassDef::Interface:  result+="Schnittstellen"; break;
         case ClassDef::Protocol:  result+="Protokoll"; break;
-        case ClassDef::Category:  result+="Kategorie"; break; 
+        case ClassDef::Category:  result+="Kategorie"; break;
         case ClassDef::Exception:  result+="Ausnahmen"; break;
         default: break;
       }
@@ -705,7 +699,7 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
       result+="-Namensbereichsreferenz";
       return result;
     }
-    
+
     virtual QCString trPublicMembers()
     { return "Öffentliche Methoden"; }
 
@@ -744,23 +738,23 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
       QCString result;
       int i;
       // the inherits list contain `numEntries' classes
-      for (i=0;i<numEntries;i++) 
+      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 
+        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 
+          if (i<numEntries-2) // not the fore last entry
             result+=", ";
           else                // the fore last entry
             result+=" und ";
         }
       }
-      return result; 
+      return result;
     }
-    
+
     /*! used in class documentation to produce a list of base classes,
      *  if class diagrams are disabled.
      */
@@ -777,7 +771,7 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
       return "Basisklasse für "+trWriteList(numEntries)+".";
     }
 
-    /*! used in member documentation blocks to produce a list of 
+    /*! used in member documentation blocks to produce a list of
      *  members that are hidden by this one.
      */
     virtual QCString trReimplementedFromList(int numEntries)
@@ -810,7 +804,7 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
       return result;
     }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      *  index of all namespaces.
      */
     virtual QCString trNamespaceIndex()
@@ -849,7 +843,7 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
         case ClassDef::Struct:     result+=" Struktur"; break;
         case ClassDef::Union:      result+=" Variante"; break;
         case ClassDef::Interface:  result+=" Schnittstelle"; break;
-        case ClassDef::Protocol:   result+="s Protokoll"; break; 
+        case ClassDef::Protocol:   result+="s Protokoll"; break;
         case ClassDef::Category:   result+=" Kategorie"; break;
         case ClassDef::Exception:  result+=" Ausnahme"; break;
         default: break;
@@ -878,7 +872,7 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
     virtual QCString trMainPage()
     { return "Hauptseite"; }
 
-    /*! This is used in references to page that are put in the LaTeX 
+    /*! 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()
@@ -926,7 +920,7 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
     /*! header that is put before the list of constructor/destructors. */
     virtual QCString trConstructorDocumentation()
     {
-      return "Beschreibung der Konstruktoren und Destruktoren"; 
+      return "Beschreibung der Konstruktoren und Destruktoren";
     }
 
     /*! Used in the file documentation to point to the corresponding sources. */
@@ -1098,7 +1092,7 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
     {
       return "Seit";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.1.5
 //////////////////////////////////////////////////////////////////////////
@@ -1109,12 +1103,12 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
       return "Erklärung des Graphen";
     }
 
-    /*! page explaining how the dot graph's should be interpreted 
+    /*! 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 
+      return
         "Diese Seite erklärt die Interpretation der von doxygen "
         "erzeugten Graphen.<p>\n"
         "Beispiel:\n"
@@ -1186,11 +1180,11 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
     {
       return "Legende";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.2.0
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! Used as a marker that is put before a test item */
     virtual QCString trTest()
     {
@@ -1271,11 +1265,11 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
     {
       return "Wert:";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.2.5
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! Used as a marker that is put before a \\bug item */
     virtual QCString trBug()
     {
@@ -1298,7 +1292,7 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
       return "1252";
     }
 
-    /*! Used as ansicpg for RTF fcharset 
+    /*! Used as ansicpg for RTF fcharset
      *  \see trRTFansicp() for a table of possible values.
      */
     virtual QCString trRTFCharSet()
@@ -1317,7 +1311,7 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
 //////////////////////////////////////////////////////////////////////////
 
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trClass(bool, bool singular)
@@ -1328,7 +1322,7 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
     }
 
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trFile(bool, bool singular)
@@ -1339,7 +1333,7 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
     }
 
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trNamespace(bool, bool singular)
@@ -1350,7 +1344,7 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
     }
 
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trGroup(bool, bool singular)
@@ -1361,7 +1355,7 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
     }
 
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trPage(bool, bool singular)
@@ -1372,7 +1366,7 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
     }
 
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trMember(bool, bool singular)
@@ -1381,9 +1375,9 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
       if (!singular)  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 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trGlobal(bool first_capital, bool singular)
@@ -1398,7 +1392,7 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
 //////////////////////////////////////////////////////////////////////////
 
     /*! This text is generated when the \\author command is used and
-     *  for the author section in man pages. 
+     *  for the author section in man pages.
      */
     virtual QCString trAuthor(bool, bool singular)
     {
@@ -1422,7 +1416,7 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
 // new since 1.2.13
 //////////////////////////////////////////////////////////////////////////
 
-    /*! used in member documentation blocks to produce a list of 
+    /*! used in member documentation blocks to produce a list of
      *  members that are implemented by this one.
      */
     virtual QCString trImplementedFromList(int numEntries)
@@ -1454,8 +1448,8 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
 // new since 1.2.17
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as the header of the list of item that have been 
-     *  flagged deprecated 
+    /*! Used as the header of the list of item that have been
+     *  flagged deprecated
      */
     virtual QCString trDeprecatedList()
     {
@@ -1466,7 +1460,7 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
 // new since 1.2.18
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as a header for declaration section of the events found in 
+    /*! Used as a header for declaration section of the events found in
      * a C# program
      */
     virtual QCString trEvents()
@@ -1487,47 +1481,47 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
     /*! Used as a heading for a list of Java class types with package scope.
      */
     virtual QCString trPackageTypes()
-    { 
+    {
       return "Pakettypen";
     }
 
-    /*! Used as a heading for a list of Java class functions with package 
-     * scope. 
+    /*! Used as a heading for a list of Java class functions with package
+     * scope.
      */
     virtual QCString trPackageMembers()
-    { 
+    {
       return "Paketfunktionen";
     }
 
-    /*! Used as a heading for a list of static Java class functions with 
+    /*! Used as a heading for a list of static Java class functions with
      *  package scope.
      */
     virtual QCString trStaticPackageMembers()
-    { 
+    {
       return "Statische Paketfunktionen";
     }
-    
-    /*! Used as a heading for a list of Java class variables with package 
+
+    /*! Used as a heading for a list of Java class variables with package
      * scope.
      */
     virtual QCString trPackageAttribs()
     {
       return "Paketattribute";
     }
-    
-    /*! Used as a heading for a list of static Java class variables with 
+
+    /*! Used as a heading for a list of static Java class variables with
      * package scope.
      */
     virtual QCString trStaticPackageAttribs()
     {
       return "Statische Paketattribute";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.3.1
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used in the quick index of a class/file/namespace member list page 
+    /*! Used in the quick index of a class/file/namespace member list page
      *  to link to the unfiltered list of all members.
      */
     virtual QCString trAll()
@@ -1544,9 +1538,9 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
 // new since 1.3.3
 //////////////////////////////////////////////////////////////////////////
 
-    /*! When the search engine is enabled this text is put in the header 
-     *  of each page before the field where one can enter the text to search 
-     *  for. 
+    /*! When the search engine is enabled this text is put in the header
+     *  of each page before the field where one can enter the text to search
+     *  for.
      */
     virtual QCString trSearchForIndex()
     {
@@ -1563,7 +1557,7 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
      *  text can be different depending on the number of documents found.
      *  Inside the text you can put the special marker $num to insert
      *  the number representing the actual number of search results.
-     *  The @a numDocuments parameter can be either 0, 1 or 2, where the 
+     *  The @a numDocuments parameter can be either 0, 1 or 2, where the
      *  value 2 represents 2 or more matches. HTML markup is allowed inside
      *  the returned string.
      */
@@ -1577,13 +1571,13 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
       {
         return "Es wurde <b>1</b> Dokument zu Ihrer Suchanfrage gefunden.";
       }
-      else 
+      else
       {
         return "Es wurden <b>$num</b> Dokumente zu Ihrer Suchanfrage "
 	       "gefunden. Die besten Treffer werden zuerst angezeigt.";
       }
     }
-    /*! This string is put before the list of matched words, for each search 
+    /*! This string is put before the list of matched words, for each search
      *  result. What follows is the list of words that matched the query.
      */
     virtual QCString trSearchMatches()
@@ -1624,7 +1618,7 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
     virtual QCString trDirectories()
     { return "Verzeichnisse"; }
 
-    /*! This returns a sentences that introduces the directory hierarchy. 
+    /*! This returns a sentences that introduces the directory hierarchy.
      *  and the fact that it is sorted alphabetically per level
      */
     virtual QCString trDirDescription()
@@ -1642,10 +1636,10 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
      *  (\a first_capital) and in sigular or plural form (\a singular).
      */
     virtual QCString trDir(bool, bool singular)
-    { 
+    {
       QCString result("Verzeichnis");
       if (!singular) result+="se";
-      return result; 
+      return result;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1672,7 +1666,7 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
       return "Hier ist ein Graph der zeigt, wo diese Funktion aufgerufen wird:";
     }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for enumeration values
      */
     virtual QCString trEnumerationValueDocumentation()
@@ -1681,12 +1675,12 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
 //////////////////////////////////////////////////////////////////////////
 // new since 1.5.4 (mainly for Fortran)
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! header that is put before the list of member subprograms (Fortran). */
     virtual QCString trMemberFunctionDocumentationFortran()
     { return "Elementfunktionen/Unterroutinen-Dokumentation"; }
 
-    /*! This is put above each page as a link to the list of annotated data types (Fortran). */    
+    /*! This is put above each page as a link to the list of annotated data types (Fortran). */
     virtual QCString trCompoundListFortran()
     { return "Datentyp-Liste"; }
 
@@ -1708,18 +1702,18 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
       }
       result+="Datentypelemente";
       result+=" mit Links ";
-      if (!extractAll) 
+      if (!extractAll)
       {
          result+="zur Datenstruktur-Dokumentation für jedes Element";
       }
-      else 
+      else
       {
          result+="zu den Datentypen, zu denen sie gehören:";
       }
       return result;
     }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * annotated compound index (Fortran).
      */
     virtual QCString trCompoundIndexFortran()
@@ -1731,24 +1725,24 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
     virtual QCString trTypeDocumentation()
     { return "Datentyp-Dokumentation"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) subprograms (Fortran).
      */
     virtual QCString trSubprograms()
     { return "Funktionen/Unterroutinen"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for subprograms (Fortran)
      */
     virtual QCString trSubprogramDocumentation()
     { return "Funktionen/Unterroutinen-Dokumentation"; }
 
-    /*! This is used in the documentation of a file/namespace/group before 
+    /*! This is used in the documentation of a file/namespace/group before
      *  the list of links to documented compounds (Fortran)
      */
      virtual QCString trDataTypes()
     { return "Datentypen"; }
-    
+
     /*! used as the title of page containing all the index of all modules (Fortran). */
     virtual QCString trModulesList()
     { return "Modulliste"; }
@@ -1791,43 +1785,43 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
       result+="-Modul-Referenz";
       return result;
     }
-    
+
     /*! This is put above each page as a link to all members of modules. (Fortran) */
     virtual QCString trModulesMembers()
     { return "Modul-Elemente"; }
 
     /*! This is an introduction to the page with all modules members (Fortran) */
     virtual QCString trModulesMemberDescription(bool extractAll)
-    { 
+    {
       QCString result="Hier folgt eine Liste aller ";
       if (!extractAll) result+="dokumentierten ";
       result+="Modulelemente mit Links ";
-      if (extractAll) 
+      if (extractAll)
       {
         result+="zur Moduldokumentation für jedes Element:";
       }
-      else 
+      else
       {
         result+="zu den Modulen, zu denen sie gehören:";
       }
       return result;
     }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      *  index of all modules (Fortran).
      */
     virtual QCString trModulesIndex()
     { return "Modul-Index"; }
-    
+
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trModule(bool /*first_capital*/, bool singular)
-    {       
+    {
       QCString result("Modul");
       if (!singular)  result+="e";
-      return result; 
+      return result;
     }
 
     /*! This is put at the bottom of a module documentation page and is
@@ -1857,25 +1851,25 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
     }
 
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trType(bool /*first_capital*/, bool singular)
-    { 
+    {
       QCString result("Typ");
       if (!singular)  result+="en";
-      return result; 
+      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 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trSubprogram(bool /*first_capital*/, bool singular)
-    { 
+    {
       QCString result("Unterprogramm");
       if (!singular)  result+="e";
-      return result; 
+      return result;
     }
 
     /*! C# Type Constraint list */
@@ -1921,13 +1915,13 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
 //////////////////////////////////////////////////////////////////////////
 // new since 1.6.3 (missing items for the directory pages)
 //////////////////////////////////////////////////////////////////////////
- 
+
     /*! introduction text for the directory dependency graph */
     virtual QCString trDirDependency(const char *name)
     {
       return (QCString)"Diagramm der Verzeichnisabhängigkeiten für "+name;
     }
- 
+
     /*! when clicking a directory dependency label, a page with a
      *  table is shown. The heading for the first column mentions the
      *  source file that has a relation to another file.
@@ -1936,7 +1930,7 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
     {
       return (QCString)"Datei in "+name;
     }
- 
+
     /*! when clicking a directory dependency label, a page with a
      *  table is shown. The heading for the second column mentions the
      *  destination file that is included.
@@ -1945,7 +1939,7 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
     {
       return (QCString)"Include-Dateien in "+name;
     }
- 
+
     /** Compiles a date string.
      *  @param year Year in 4 digits
      *  @param month Month of the year: 1=January
@@ -2024,8 +2018,8 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
     virtual QCString trInheritedFrom(const char *members,const char *what)
     { return QCString(members)+" geerbt von "+what; }
 
-    /*! Header of the sections with inherited members specific for the 
-     *  base class(es) 
+    /*! Header of the sections with inherited members specific for the
+     *  base class(es)
      */
     virtual QCString trAdditionalInheritedMembers()
     { return "Weitere Geerbte Elemente"; }
@@ -2035,7 +2029,7 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4
 //////////////////////////////////////////////////////////////////////////
 
     /*! Used as a tooltip for the toggle button thatappears in the
-     *  navigation tree in the HTML output when GENERATE_TREEVIEW is 
+     *  navigation tree in the HTML output when GENERATE_TREEVIEW is
      *  enabled. This tooltip explains the meaning of the button.
      */
     virtual QCString trPanelSynchronisationTooltip(bool enable)
diff --git a/src/translator_dk.h b/src/translator_dk.h
index 3f0f086..62d9d35 100644
--- a/src/translator_dk.h
+++ b/src/translator_dk.h
@@ -120,12 +120,6 @@ class TranslatorDanish : public TranslatorAdapter_1_8_0
 	"\\usepackage[T1]{fontenc}\n";
     }
 
-    /*! return the language charset. This will be used for the HTML output */
-    virtual QCString idLanguageCharset()
-    {
-      return "utf-8";
-    }
-
     // --- Language translation methods -------------------
 
     /*! used in the compound documentation before a list of related functions. */
diff --git a/src/translator_en.h b/src/translator_en.h
index 1ab9921..0240b52 100644
--- a/src/translator_en.h
+++ b/src/translator_en.h
@@ -1,12 +1,12 @@
 /******************************************************************************
  *
- * 
+ *
  *
  * Copyright (C) 1997-2013 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 
+ * 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.
  *
@@ -18,7 +18,7 @@
 #ifndef TRANSLATOR_EN_H
 #define TRANSLATOR_EN_H
 
-/*! 
+/*!
  When defining a translator class for the new language, follow
  the description in the documentation.  One of the steps says
  that you should copy the translator_en.h (this) file to your
@@ -45,19 +45,19 @@ class TranslatorEnglish : public Translator
   public:
 
     // --- Language control methods -------------------
-    
-    /*! Used for identification of the language. The identification 
-     * should not be translated. It should be replaced by the name 
+
+    /*! 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 should be equal to 
+     * (e.g. "czech", "japanese", "russian", etc.). It should be equal to
      * the identification used in language.cpp.
      */
     virtual QCString idLanguage()
     { return "english"; }
-    
-    /*! Used to get the LaTeX command(s) for the language support. 
+
+    /*! 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 
+     *  LaTeX to the desired language.  For example
      *  <pre>"\\usepackage[german]{babel}\n"
      *  </pre>
      *  or
@@ -65,7 +65,7 @@ class TranslatorEnglish : public Translator
      *  "\\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.
      */
@@ -74,13 +74,6 @@ class TranslatorEnglish : public Translator
       return "";
     }
 
-    /*! return the language charset. This will be used 
-        when transcoding the translatable strings in this file to UTF-8 */
-    virtual QCString idLanguageCharset()
-    {
-      return "iso-8859-1";
-    }
-
     // --- Language translation methods -------------------
 
     /*! used in the compound documentation before a list of related functions. */
@@ -98,30 +91,30 @@ class TranslatorEnglish : public Translator
     /*! header that is put before the list of typedefs. */
     virtual QCString trMemberTypedefDocumentation()
     { return "Member Typedef Documentation"; }
-    
+
     /*! header that is put before the list of enumerations. */
     virtual QCString trMemberEnumerationDocumentation()
     { return "Member Enumeration Documentation"; }
-    
+
     /*! header that is put before the list of member functions. */
     virtual QCString trMemberFunctionDocumentation()
     { return "Member Function Documentation"; }
-    
+
     /*! header that is put before the list of member attributes. */
     virtual QCString trMemberDataDocumentation()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Field Documentation"; 
+        return "Field Documentation";
       }
       else
       {
-        return "Member Data Documentation"; 
+        return "Member Data Documentation";
       }
     }
 
     /*! this is the text of a link put after brief descriptions. */
-    virtual QCString trMore() 
+    virtual QCString trMore()
     { return "More..."; }
 
     /*! put in the class documentation */
@@ -139,81 +132,81 @@ class TranslatorEnglish : public Translator
     /*! this is the remainder of the sentence after the class name */
     virtual QCString trIncludingInheritedMembers()
     { return ", including all inherited members."; }
-    
+
     /*! 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="Generated automatically by Doxygen";
       if (s) result+=(QCString)" for "+s;
-      result+=" from the source code."; 
+      result+=" from the source code.";
       return result;
     }
 
     /*! put after an enum name in the list of all members */
     virtual QCString trEnumName()
     { return "enum name"; }
-    
+
     /*! put after an enum value in the list of all members */
     virtual QCString trEnumValue()
     { return "enum value"; }
-    
+
     /*! put after an undocumented member in the list of all members */
     virtual QCString trDefinedIn()
     { return "defined in"; }
 
     // quick reference sections
 
-    /*! This is put above each page as a link to the list of all groups of 
+    /*! 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 "Modules"; }
-    
+
     /*! This is put above each page as a link to the class hierarchy */
     virtual QCString trClassHierarchy()
     { return "Class Hierarchy"; }
-    
+
     /*! This is put above each page as a link to the list of annotated classes */
     virtual QCString trCompoundList()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
         return "Data Structures";
       }
       else
       {
-        return "Class List"; 
+        return "Class List";
       }
     }
-    
+
     /*! This is put above each page as a link to the list of documented files */
     virtual QCString trFileList()
     { return "File List"; }
 
     /*! 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 "Data Fields"; 
+        return "Data Fields";
       }
       else
       {
-        return "Class Members"; 
+        return "Class Members";
       }
     }
 
     /*! This is put above each page as a link to all members of files. */
     virtual QCString trFileMembers()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Globals"; 
+        return "Globals";
       }
       else
       {
-        return "File Members"; 
+        return "File Members";
       }
     }
 
@@ -246,16 +239,16 @@ class TranslatorEnglish : public Translator
 
     /*! This is an introduction to the annotated compound list. */
     virtual QCString trCompoundListDescription()
-    { 
-      
+    {
+
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Here are the data structures with brief descriptions:"; 
+        return "Here are the data structures with brief descriptions:";
       }
       else
       {
         return "Here are the classes, structs, "
-               "unions and interfaces with brief descriptions:"; 
+               "unions and interfaces with brief descriptions:";
       }
     }
 
@@ -276,7 +269,7 @@ class TranslatorEnglish : public Translator
         result+="class members";
       }
       result+=" with links to ";
-      if (!extractAll) 
+      if (!extractAll)
       {
         if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
         {
@@ -287,7 +280,7 @@ class TranslatorEnglish : public Translator
           result+="the class documentation for each member:";
         }
       }
-      else 
+      else
       {
         if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
         {
@@ -306,7 +299,7 @@ class TranslatorEnglish : public Translator
     {
       QCString result="Here is a list of all ";
       if (!extractAll) result+="documented ";
-      
+
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
         result+="functions, variables, defines, enums, and typedefs";
@@ -316,9 +309,9 @@ class TranslatorEnglish : public Translator
         result+="file members";
       }
       result+=" with links to ";
-      if (extractAll) 
+      if (extractAll)
         result+="the files they belong to:";
-      else 
+      else
         result+="the documentation:";
       return result;
     }
@@ -335,43 +328,43 @@ class TranslatorEnglish : public Translator
     virtual QCString trModulesDescription()
     { return "Here is a list of all modules:"; }
 
-    // index titles (the project name is prepended for these) 
+    // index titles (the project name is prepended for these)
 
     /*! This is used in HTML as the title of index.html. */
     virtual QCString trDocumentation()
     { return "Documentation"; }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * index of all groups.
      */
     virtual QCString trModuleIndex()
     { return "Module Index"; }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * class hierarchy.
      */
     virtual QCString trHierarchicalIndex()
     { return "Hierarchical Index"; }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * annotated compound index.
      */
     virtual QCString trCompoundIndex()
     {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
-      { 
+      {
         return "Data Structure Index";
       }
       else
       {
-        return "Class Index"; 
+        return "Class Index";
       }
     }
 
     /*! This is used in LaTeX as the title of the chapter with the
      * list of all files.
      */
-    virtual QCString trFileIndex() 
+    virtual QCString trFileIndex()
     { return "File Index"; }
 
     /*! This is used in LaTeX as the title of the chapter containing
@@ -384,14 +377,14 @@ class TranslatorEnglish : public Translator
      *  the documentation of all classes, structs and unions.
      */
     virtual QCString trClassDocumentation()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Data Structure Documentation"; 
+        return "Data Structure Documentation";
       }
       else
       {
-        return "Class Documentation"; 
+        return "Class Documentation";
       }
     }
 
@@ -416,105 +409,105 @@ class TranslatorEnglish : public Translator
     /*! This is used in LaTeX as the title of the document */
     virtual QCString trReferenceManual()
     { return "Reference Manual"; }
-    
-    /*! This is used in the documentation of a file as a header before the 
+
+    /*! This is used in the documentation of a file as a header before the
      *  list of defines
      */
     virtual QCString trDefines()
     { return "Macros"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of function prototypes
      */
     virtual QCString trFuncProtos()
     { return "Function Prototypes"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of typedefs
      */
     virtual QCString trTypedefs()
     { return "Typedefs"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of enumerations
      */
     virtual QCString trEnumerations()
     { return "Enumerations"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) functions
      */
     virtual QCString trFunctions()
     { return "Functions"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) variables
      */
     virtual QCString trVariables()
     { return "Variables"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) variables
      */
     virtual QCString trEnumerationValues()
     { return "Enumerator"; }
-    
+
     /*! This is used in the documentation of a file before the list of
      *  documentation blocks for defines
      */
     virtual QCString trDefineDocumentation()
     { return "Macro Definition Documentation"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for function prototypes
      */
     virtual QCString trFunctionPrototypeDocumentation()
     { return "Function Prototype Documentation"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for typedefs
      */
     virtual QCString trTypedefDocumentation()
     { return "Typedef Documentation"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for enumeration types
      */
     virtual QCString trEnumerationTypeDocumentation()
     { return "Enumeration Type Documentation"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for functions
      */
     virtual QCString trFunctionDocumentation()
     { return "Function Documentation"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for variables
      */
     virtual QCString trVariableDocumentation()
     { return "Variable Documentation"; }
 
-    /*! This is used in the documentation of a file/namespace/group before 
+    /*! This is used in the documentation of a file/namespace/group before
      *  the list of links to documented compounds
      */
     virtual QCString trCompounds()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Data Structures"; 
+        return "Data Structures";
       }
       else
       {
-        return "Classes"; 
+        return "Classes";
       }
     }
 
-    /*! This is used in the standard footer of each page and indicates when 
-     *  the page was generated 
+    /*! 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)"Generated on "+date;
       if (projName) result+=(QCString)" for "+projName;
       result+=(QCString)" by";
@@ -532,7 +525,7 @@ class TranslatorEnglish : public Translator
     {
       return (QCString)"Inheritance diagram for "+clName+":";
     }
-    
+
     /*! this text is generated when the \\internal command is used. */
     virtual QCString trForInternalUseOnly()
     { return "For internal use only."; }
@@ -564,7 +557,7 @@ class TranslatorEnglish : public Translator
     /*! this text is generated when the \\exception command is used. */
     virtual QCString trExceptions()
     { return "Exceptions"; }
-    
+
     /*! this text is used in the title page of a LaTeX document. */
     virtual QCString trGeneratedBy()
     { return "Generated by"; }
@@ -572,7 +565,7 @@ class TranslatorEnglish : public Translator
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990307
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! used as the title of page containing all the index of all namespaces. */
     virtual QCString trNamespaceList()
     { return "Namespace List"; }
@@ -591,17 +584,17 @@ class TranslatorEnglish : public Translator
      */
     virtual QCString trFriends()
     { return "Friends"; }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990405
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! used in the class documentation as a header before the list of all
-     * related classes 
+     * related classes
      */
     virtual QCString trRelatedFunctionDocumentation()
     { return "Friends And Related Function Documentation"; }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990425
 //////////////////////////////////////////////////////////////////////////
@@ -632,7 +625,7 @@ class TranslatorEnglish : public Translator
     virtual QCString trFileReference(const char *fileName)
     {
       QCString result=fileName;
-      result+=" File Reference"; 
+      result+=" File Reference";
       return result;
     }
 
@@ -643,7 +636,7 @@ class TranslatorEnglish : public Translator
       result+=" Namespace Reference";
       return result;
     }
-    
+
     virtual QCString trPublicMembers()
     { return "Public Member Functions"; }
     virtual QCString trPublicSlots()
@@ -664,7 +657,7 @@ class TranslatorEnglish : public Translator
     { return "Private Slots"; }
     virtual QCString trStaticPrivateMembers()
     { return "Static Private Member Functions"; }
-    
+
     /*! this function is used to produce a comma-separated list of items.
      *  use generateMarker(i) to indicate where item i should be put.
      */
@@ -673,23 +666,23 @@ class TranslatorEnglish : public Translator
       QCString result;
       int i;
       // the inherits list contain `numEntries' classes
-      for (i=0;i<numEntries;i++) 
+      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 
+        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 
+          if (i<numEntries-2) // not the fore last entry
             result+=", ";
           else                // the fore last entry
             result+=", and ";
         }
       }
-      return result; 
+      return result;
     }
-    
+
     /*! used in class documentation to produce a list of base classes,
      *  if class diagrams are disabled.
      */
@@ -706,7 +699,7 @@ class TranslatorEnglish : public Translator
       return "Inherited by "+trWriteList(numEntries)+".";
     }
 
-    /*! used in member documentation blocks to produce a list of 
+    /*! used in member documentation blocks to produce a list of
      *  members that are hidden by this one.
      */
     virtual QCString trReimplementedFromList(int numEntries)
@@ -728,17 +721,17 @@ class TranslatorEnglish : public Translator
 
     /*! This is an introduction to the page with all namespace members */
     virtual QCString trNamespaceMemberDescription(bool extractAll)
-    { 
+    {
       QCString result="Here is a list of all ";
       if (!extractAll) result+="documented ";
       result+="namespace members with links to ";
-      if (extractAll) 
+      if (extractAll)
         result+="the namespace documentation for each member:";
-      else 
+      else
         result+="the namespaces they belong to:";
       return result;
     }
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      *  index of all namespaces.
      */
     virtual QCString trNamespaceIndex()
@@ -806,7 +799,7 @@ class TranslatorEnglish : public Translator
     virtual QCString trMainPage()
     { return "Main Page"; }
 
-    /*! This is used in references to page that are put in the LaTeX 
+    /*! 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()
@@ -851,7 +844,7 @@ class TranslatorEnglish : public Translator
     /*! header that is put before the list of constructor/destructors. */
     virtual QCString trConstructorDocumentation()
     {
-      return "Constructor & Destructor Documentation"; 
+      return "Constructor & Destructor Documentation";
     }
     /*! Used in the file documentation to point to the corresponding sources. */
     virtual QCString trGotoSourceCode()
@@ -908,7 +901,7 @@ class TranslatorEnglish : public Translator
 //////////////////////////////////////////////////////////////////////////
 // new since 1.1.0
 //////////////////////////////////////////////////////////////////////////
-    
+
     virtual QCString trNote()
     {
       return "Note";
@@ -997,7 +990,7 @@ class TranslatorEnglish : public Translator
     {
       return "Since";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.1.5
 //////////////////////////////////////////////////////////////////////////
@@ -1007,12 +1000,12 @@ class TranslatorEnglish : public Translator
     {
       return "Graph Legend";
     }
-    /*! page explaining how the dot graph's should be interpreted 
+    /*! 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 
+      return
         "This page explains how to interpret the graphs that are generated "
         "by doxygen.<p>\n"
         "Consider the following example:\n"
@@ -1079,11 +1072,11 @@ class TranslatorEnglish : public Translator
     {
       return "legend";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.2.0
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! Used as a marker that is put before a test item */
     virtual QCString trTest()
     {
@@ -1161,11 +1154,11 @@ class TranslatorEnglish : public Translator
     {
       return "Value:";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.2.5
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! Used as a marker that is put before a \\bug item */
     virtual QCString trBug()
     {
@@ -1181,9 +1174,9 @@ class TranslatorEnglish : public Translator
 // new since 1.2.6
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as ansicpg for RTF file 
-     * 
-     * The following table shows the correlation of Charset name, Charset Value and 
+    /*! 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
@@ -1204,15 +1197,15 @@ class TranslatorEnglish : public Translator
      * GB2313_CHARSET          134 (x86)             936
      * CHINESEBIG5_CHARSET     136 (x88)             950
      * </pre>
-     * 
+     *
      */
     virtual QCString trRTFansicp()
     {
       return "1252";
     }
-    
 
-    /*! Used as ansicpg for RTF fcharset 
+
+    /*! Used as ansicpg for RTF fcharset
      *  \see trRTFansicp() for a table of possible values.
      */
     virtual QCString trRTFCharSet()
@@ -1225,82 +1218,82 @@ class TranslatorEnglish : public Translator
     {
       return "Index";
     }
-   
+
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  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 result;
     }
 
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  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 result;
     }
 
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  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 result;
     }
 
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  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 result;
     }
 
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  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 result;
     }
 
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  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 result;
     }
-   
+
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  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 result;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1310,10 +1303,10 @@ class TranslatorEnglish : public Translator
     /*! 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 result;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1331,7 +1324,7 @@ class TranslatorEnglish : public Translator
 // new since 1.2.13
 //////////////////////////////////////////////////////////////////////////
 
-    /*! used in member documentation blocks to produce a list of 
+    /*! used in member documentation blocks to produce a list of
      *  members that are implemented by this one.
      */
     virtual QCString trImplementedFromList(int numEntries)
@@ -1363,8 +1356,8 @@ class TranslatorEnglish : public Translator
 // new since 1.2.17
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as the header of the list of item that have been 
-     *  flagged deprecated 
+    /*! Used as the header of the list of item that have been
+     *  flagged deprecated
      */
     virtual QCString trDeprecatedList()
     {
@@ -1375,7 +1368,7 @@ class TranslatorEnglish : public Translator
 // new since 1.2.18
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as a header for declaration section of the events found in 
+    /*! Used as a header for declaration section of the events found in
      * a C# program
      */
     virtual QCString trEvents()
@@ -1395,43 +1388,43 @@ class TranslatorEnglish : public Translator
     /*! Used as a heading for a list of Java class types with package scope.
      */
     virtual QCString trPackageTypes()
-    { 
+    {
       return "Package Types";
     }
-    /*! Used as a heading for a list of Java class functions with package 
-     * scope. 
+    /*! Used as a heading for a list of Java class functions with package
+     * scope.
      */
     virtual QCString trPackageMembers()
-    { 
+    {
       return "Package Functions";
     }
-    /*! Used as a heading for a list of static Java class functions with 
+    /*! Used as a heading for a list of static Java class functions with
      *  package scope.
      */
     virtual QCString trStaticPackageMembers()
-    { 
+    {
       return "Static Package Functions";
     }
-    /*! Used as a heading for a list of Java class variables with package 
+    /*! Used as a heading for a list of Java class variables with package
      * scope.
      */
     virtual QCString trPackageAttribs()
-    { 
+    {
       return "Package Attributes";
     }
-    /*! Used as a heading for a list of static Java class variables with 
+    /*! Used as a heading for a list of static Java class variables with
      * package scope.
      */
     virtual QCString trStaticPackageAttribs()
-    { 
+    {
       return "Static Package Attributes";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.3.1
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used in the quick index of a class/file/namespace member list page 
+    /*! Used in the quick index of a class/file/namespace member list page
      *  to link to the unfiltered list of all members.
      */
     virtual QCString trAll()
@@ -1448,9 +1441,9 @@ class TranslatorEnglish : public Translator
 // new since 1.3.3
 //////////////////////////////////////////////////////////////////////////
 
-    /*! When the search engine is enabled this text is put in the header 
-     *  of each page before the field where one can enter the text to search 
-     *  for. 
+    /*! When the search engine is enabled this text is put in the header
+     *  of each page before the field where one can enter the text to search
+     *  for.
      */
     virtual QCString trSearchForIndex()
     {
@@ -1467,7 +1460,7 @@ class TranslatorEnglish : public Translator
      *  text can be different depending on the number of documents found.
      *  Inside the text you can put the special marker $num to insert
      *  the number representing the actual number of search results.
-     *  The @a numDocuments parameter can be either 0, 1 or 2, where the 
+     *  The @a numDocuments parameter can be either 0, 1 or 2, where the
      *  value 2 represents 2 or more matches. HTML markup is allowed inside
      *  the returned string.
      */
@@ -1481,13 +1474,13 @@ class TranslatorEnglish : public Translator
       {
         return "Found <b>1</b> document matching your query.";
       }
-      else 
+      else
       {
         return "Found <b>$num</b> documents matching your query. "
                "Showing best matches first.";
       }
     }
-    /*! This string is put before the list of matched words, for each search 
+    /*! This string is put before the list of matched words, for each search
      *  result. What follows is the list of words that matched the query.
      */
     virtual QCString trSearchMatches()
@@ -1528,7 +1521,7 @@ class TranslatorEnglish : public Translator
     virtual QCString trDirectories()
     { return "Directories"; }
 
-    /*! This returns a sentences that introduces the directory hierarchy. 
+    /*! This returns a sentences that introduces the directory hierarchy.
      *  and the fact that it is sorted alphabetically per level
      */
     virtual QCString trDirDescription()
@@ -1546,10 +1539,10 @@ class TranslatorEnglish : public Translator
      *  (\a first_capital) and in sigular or plural form (\a singular).
      */
     virtual QCString trDir(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Director" : "director"));
       if (singular) result+="y"; else result+="ies";
-      return result; 
+      return result;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1576,7 +1569,7 @@ class TranslatorEnglish : public Translator
       return "Here is the caller graph for this function:";
     }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for enumeration values
      */
     virtual QCString trEnumerationValueDocumentation()
@@ -1585,12 +1578,12 @@ class TranslatorEnglish : public Translator
 //////////////////////////////////////////////////////////////////////////
 // new since 1.5.4 (mainly for Fortran)
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! header that is put before the list of member subprograms (Fortran). */
     virtual QCString trMemberFunctionDocumentationFortran()
     { return "Member Function/Subroutine Documentation"; }
 
-    /*! This is put above each page as a link to the list of annotated data types (Fortran). */    
+    /*! This is put above each page as a link to the list of annotated data types (Fortran). */
     virtual QCString trCompoundListFortran()
     { return "Data Types List"; }
 
@@ -1612,18 +1605,18 @@ class TranslatorEnglish : public Translator
       }
       result+="data types members";
       result+=" with links to ";
-      if (!extractAll) 
+      if (!extractAll)
       {
          result+="the data structure documentation for each member";
       }
-      else 
+      else
       {
          result+="the data types they belong to:";
       }
       return result;
     }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * annotated compound index (Fortran).
      */
     virtual QCString trCompoundIndexFortran()
@@ -1635,24 +1628,24 @@ class TranslatorEnglish : public Translator
     virtual QCString trTypeDocumentation()
     { return "Data Type Documentation"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) subprograms (Fortran).
      */
     virtual QCString trSubprograms()
     { return "Functions/Subroutines"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for subprograms (Fortran)
      */
     virtual QCString trSubprogramDocumentation()
     { return "Function/Subroutine Documentation"; }
 
-    /*! This is used in the documentation of a file/namespace/group before 
+    /*! This is used in the documentation of a file/namespace/group before
      *  the list of links to documented compounds (Fortran)
      */
      virtual QCString trDataTypes()
     { return "Data Types"; }
-    
+
     /*! used as the title of page containing all the index of all modules (Fortran). */
     virtual QCString trModulesList()
     { return "Modules List"; }
@@ -1691,46 +1684,46 @@ class TranslatorEnglish : public Translator
     virtual QCString trModuleReference(const char *namespaceName)
     {
       QCString result=namespaceName;
-      result+=" Module Reference";        
+      result+=" Module Reference";
       return result;
     }
-    
+
     /*! This is put above each page as a link to all members of modules. (Fortran) */
     virtual QCString trModulesMembers()
     { return "Module Members"; }
 
     /*! This is an introduction to the page with all modules members (Fortran) */
     virtual QCString trModulesMemberDescription(bool extractAll)
-    { 
+    {
       QCString result="Here is a list of all ";
       if (!extractAll) result+="documented ";
       result+="module members with links to ";
-      if (extractAll) 
+      if (extractAll)
       {
         result+="the module documentation for each member:";
       }
-      else 
+      else
       {
         result+="the modules they belong to:";
       }
       return result;
     }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      *  index of all modules (Fortran).
      */
     virtual QCString trModulesIndex()
     { return "Modules Index"; }
-    
+
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trModule(bool first_capital, bool singular)
-    {       
+    {
       QCString result((first_capital ? "Module" : "module"));
       if (!singular)  result+="s";
-      return result; 
+      return result;
     }
 
     /*! This is put at the bottom of a module documentation page and is
@@ -1758,25 +1751,25 @@ class TranslatorEnglish : public Translator
     }
 
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trType(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Type" : "type"));
       if (!singular)  result+="s";
-      return result; 
+      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 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trSubprogram(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Subprogram" : "subprogram"));
       if (!singular)  result+="s";
-      return result; 
+      return result;
     }
 
     /*! C# Type Constraint list */
@@ -1847,7 +1840,7 @@ class TranslatorEnglish : public Translator
       return (QCString)"Includes file in "+name;
     }
 
-    /** Compiles a date string. 
+    /** Compiles a date string.
      *  @param year Year in 4 digits
      *  @param month Month of the year: 1=January
      *  @param day Day of the Month: 1..31
@@ -1922,8 +1915,8 @@ class TranslatorEnglish : public Translator
     virtual QCString trInheritedFrom(const char *members,const char *what)
     { return QCString(members)+" inherited from "+what; }
 
-    /*! Header of the sections with inherited members specific for the 
-     *  base class(es) 
+    /*! Header of the sections with inherited members specific for the
+     *  base class(es)
      */
     virtual QCString trAdditionalInheritedMembers()
     { return "Additional Inherited Members"; }
@@ -1933,7 +1926,7 @@ class TranslatorEnglish : public Translator
 //////////////////////////////////////////////////////////////////////////
 
     /*! Used as a tooltip for the toggle button that appears in the
-     *  navigation tree in the HTML output when GENERATE_TREEVIEW is 
+     *  navigation tree in the HTML output when GENERATE_TREEVIEW is
      *  enabled. This tooltip explains the meaning of the button.
      */
     virtual QCString trPanelSynchronisationTooltip(bool enable)
diff --git a/src/translator_eo.h b/src/translator_eo.h
index c949901..c2dafb1 100644
--- a/src/translator_eo.h
+++ b/src/translator_eo.h
@@ -76,12 +76,6 @@ class TranslatorEsperanto : public TranslatorAdapter_1_8_4
       return "\\usepackage[esperanto]{babel}\n";
     }
 
-    /*! return the language charset. This will be used for the HTML output */
-    virtual QCString idLanguageCharset()
-    {
-      return "utf-8";
-    }
-
     // --- Language translation methods -------------------
 
     /*! used in the compound documentation before a list of related functions. */
@@ -1877,7 +1871,7 @@ class TranslatorEsperanto : public TranslatorAdapter_1_8_4
       }
       return sdate;
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.7.5
 //////////////////////////////////////////////////////////////////////////
@@ -1926,8 +1920,8 @@ class TranslatorEsperanto : public TranslatorAdapter_1_8_4
     virtual QCString trInheritedFrom(const char *members,const char *what)
     { return QCString(members)+" heredita el "+what; }
 
-    /*! Header of the sections with inherited members specific for the 
-     *  base class(es) 
+    /*! Header of the sections with inherited members specific for the
+     *  base class(es)
      */
     virtual QCString trAdditionalInheritedMembers()
     { return "Kromaj Hereditaj Membroj"; }
@@ -1937,7 +1931,7 @@ class TranslatorEsperanto : public TranslatorAdapter_1_8_4
 //////////////////////////////////////////////////////////////////////////
 
     /*! Used as a tooltip for the toggle button that appears in the
-     *  navigation tree in the HTML output when GENERATE_TREEVIEW is 
+     *  navigation tree in the HTML output when GENERATE_TREEVIEW is
      *  enabled. This tooltip explains the meaning of the button.
      */
     virtual QCString trPanelSynchronisationTooltip(bool enable)
diff --git a/src/translator_es.h b/src/translator_es.h
index 8654d28..0b85f4f 100644
--- a/src/translator_es.h
+++ b/src/translator_es.h
@@ -1,12 +1,12 @@
 /******************************************************************************
  *
- * 
+ *
  *
  * Copyright (C) 1997-2013 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 
+ * 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.
  *
@@ -18,10 +18,10 @@
 #ifndef TRANSLATOR_ES_H
 #define TRANSLATOR_ES_H
 
-/*! 
+/*!
  * translator_es.h modified by Lucas Cruz (7-julio-2000)
  * Some notes:
- * - It's posible that some sentences haven't got meaning because  
+ * - It's posible that some sentences haven't got meaning because
  * some words haven't got translate in spanish.
  * Updated from 1.3.8 to 1.4.6 by Guillermo Ballester Valor (May-05-2006)
  * Updated to 1.5.1 by Bartomeu Creus Navarro (22-enero-2007)
@@ -39,19 +39,19 @@ class TranslatorSpanish : public Translator
   public:
 
     // --- Language control methods -------------------
-    
-    /*! Used for identification of the language. The identification 
-     * should not be translated. It should be replaced by the name 
+
+    /*! 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 should be equal to 
+     * (e.g. "czech", "japanese", "russian", etc.). It should be equal to
      * the identification used in language.cpp.
      */
     virtual QCString idLanguage()
     { return "spanish"; }
-    
-    /*! Used to get the LaTeX command(s) for the language support. 
+
+    /*! 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 
+     *  LaTeX to the desired language.  For example
      *  <pre>"\\usepackage[german]{babel}\n"
      *  </pre>
      *  or
@@ -59,7 +59,7 @@ class TranslatorSpanish : public Translator
      *  "\\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.
      */
@@ -68,12 +68,6 @@ class TranslatorSpanish : public Translator
       return "\\usepackage[spanish]{babel}";
     }
 
-    /*! return the language charset. This will be used for the HTML output */
-    virtual QCString idLanguageCharset()
-    {
-      return "utf-8";
-    }
-
     // --- Language translation methods -------------------
 
     /*! used in the compound documentation before a list of related functions. */
@@ -91,30 +85,30 @@ class TranslatorSpanish : public Translator
     /*! header that is put before the list of typedefs. */
     virtual QCString trMemberTypedefDocumentation()
     { return "Documentación de los 'Typedef' miembros de la clase"; }
-    
+
     /*! header that is put before the list of enumerations. */
     virtual QCString trMemberEnumerationDocumentation()
     { return "Documentación de las enumeraciones miembro de la clase"; }
-    
+
     /*! header that is put before the list of member functions. */
     virtual QCString trMemberFunctionDocumentation()
     { return "Documentación de las funciones miembro"; }
-    
+
     /*! header that is put before the list of member attributes. */
     virtual QCString trMemberDataDocumentation()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Documentación de los campos"; 
+        return "Documentación de los campos";
       }
       else
       {
-        return "Documentación de los datos miembro"; 
+        return "Documentación de los datos miembro";
       }
     }
 
     /*! this is the text of a link put after brief descriptions. */
-    virtual QCString trMore() 
+    virtual QCString trMore()
     { return "Más..."; }
 
     /*! put in the class documentation */
@@ -132,77 +126,77 @@ class TranslatorSpanish : public Translator
     /*! this is the remainder of the sentence after the class name */
     virtual QCString trIncludingInheritedMembers()
     { return ", incluyendo todos los heredados:"; }
-    
+
     /*! 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="Generado automáticamente por Doxygen";
       if (s) result+=(QCString)" para "+s;
-      result+=" del código fuente."; 
+      result+=" del código fuente.";
       return result;
     }
 
     /*! put after an enum name in the list of all members */
     virtual QCString trEnumName()
     { return "nombre de la enumeración"; }
-    
+
     /*! put after an enum value in the list of all members */
     virtual QCString trEnumValue()
     { return "valor enumerado"; }
-    
+
     /*! put after an undocumented member in the list of all members */
     virtual QCString trDefinedIn()
     { return "definido en"; }
 
     // quick reference sections
 
-    /*! This is put above each page as a link to the list of all groups of 
+    /*! 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 "Módulos"; }
-    
+
     /*! This is put above each page as a link to the class hierarchy */
     virtual QCString trClassHierarchy()
     { return "Jerarquía de la clase"; }
-    
+
     /*! This is put above each page as a link to the list of annotated classes */
     virtual QCString trCompoundList()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
         return "Estructura de datos";
       }
       else
       {
-        return "Lista de clases"; 
+        return "Lista de clases";
       }
     }
-    
+
     /*! This is put above each page as a link to the list of documented files */
     virtual QCString trFileList()
     { return "Lista de archivos"; }
 
     /*! 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 "Campos de datos"; 
+        return "Campos de datos";
       }
       else
       {
-        return "Miembros de las clases"; 
+        return "Miembros de las clases";
       }
     }
 
     /*! This is put above each page as a link to all members of files. */
     virtual QCString trFileMembers()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Globales"; 
+        return "Globales";
       }
       else
       {
@@ -242,12 +236,12 @@ class TranslatorSpanish : public Translator
     {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Lista de estructuras con una breve descripción:"; 
+        return "Lista de estructuras con una breve descripción:";
       }
       else
       {
        return "Lista de las clases, estructuras, "
-             "uniones e interfaces con una breve descripción:"; 
+             "uniones e interfaces con una breve descripción:";
       }
     }
 
@@ -268,7 +262,7 @@ class TranslatorSpanish : public Translator
         result+=" documentados";
       }
       result+=" con enlaces a ";
-      if (!extractAll) 
+      if (!extractAll)
       {
         if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
         {
@@ -279,7 +273,7 @@ class TranslatorSpanish : public Translator
           result+="la documentación de la clase para cada miembro:";
         }
       }
-      else 
+      else
       {
         if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
         {
@@ -307,9 +301,9 @@ class TranslatorSpanish : public Translator
       }
       if (!extractAll) result+=" documentados";
       result+=" con enlaces ";
-      if (extractAll) 
+      if (extractAll)
         result+="a los ficheros a los que corresponden:";
-      else 
+      else
         result+="a la documentación:";
       return result;
     }
@@ -326,43 +320,43 @@ class TranslatorSpanish : public Translator
     virtual QCString trModulesDescription()
     { return "Lista de todos los módulos:"; }
 
-    // index titles (the project name is prepended for these) 
+    // index titles (the project name is prepended for these)
 
     /*! This is used in HTML as the title of index.html. */
     virtual QCString trDocumentation()
     { return "Documentación"; }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * index of all groups.
      */
     virtual QCString trModuleIndex()
     { return "Indice de módulos"; }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * class hierarchy.
      */
     virtual QCString trHierarchicalIndex()
     { return "Indice jerárquico"; }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * annotated compound index.
      */
     virtual QCString trCompoundIndex()
     {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
-      { 
+      {
         return "Índice de estructura de datos";
       }
       else
       {
-        return "Índice de clases"; 
+        return "Índice de clases";
       }
     }
 
     /*! This is used in LaTeX as the title of the chapter with the
      * list of all files.
      */
-    virtual QCString trFileIndex() 
+    virtual QCString trFileIndex()
     { return "Indice de archivos"; }
 
     /*! This is used in LaTeX as the title of the chapter containing
@@ -382,7 +376,7 @@ class TranslatorSpanish : public Translator
       }
       else
       {
-        return "Documentación de las clases"; 
+        return "Documentación de las clases";
       }
     }
 
@@ -407,93 +401,93 @@ class TranslatorSpanish : public Translator
     /*! This is used in LaTeX as the title of the document */
     virtual QCString trReferenceManual()
     { return "Manual de referencia"; }
-    
-    /*! This is used in the documentation of a file as a header before the 
+
+    /*! This is used in the documentation of a file as a header before the
      *  list of defines
      */
     virtual QCString trDefines()
     { return "'defines'"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of function prototypes
      */
     virtual QCString trFuncProtos()
     { return "Funciones prototipo"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of typedefs
      */
     virtual QCString trTypedefs()
     { return "'typedefs'"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of enumerations
      */
     virtual QCString trEnumerations()
     { return "Enumeraciones"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) functions
      */
     virtual QCString trFunctions()
     { return "Funciones"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) variables
      */
     virtual QCString trVariables()
     { return "Variables"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) variables
      */
     virtual QCString trEnumerationValues()
     { return "Valores de enumeraciones"; }
-    
+
     /*! This is used in the documentation of a file before the list of
      *  documentation blocks for defines
      */
     virtual QCString trDefineDocumentation()
     { return "Documentación de los 'defines'"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for function prototypes
      */
     virtual QCString trFunctionPrototypeDocumentation()
     { return "Documentación de las funciones prototipo"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for typedefs
      */
     virtual QCString trTypedefDocumentation()
     { return "Documentación de los 'typedefs'"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for enumeration types
      */
     virtual QCString trEnumerationTypeDocumentation()
     { return "Documentación de las enumeraciones"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for functions
      */
     virtual QCString trFunctionDocumentation()
     { return "Documentación de las funciones"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for variables
      */
     virtual QCString trVariableDocumentation()
     { return "Documentación de las variables"; }
 
-    /*! This is used in the documentation of a file/namespace/group before 
+    /*! This is used in the documentation of a file/namespace/group before
      *  the list of links to documented compounds
      */
     virtual QCString trCompounds()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Estructuras de datos"; 
+        return "Estructuras de datos";
       }
       else
       {
@@ -501,11 +495,11 @@ class TranslatorSpanish : public Translator
       }
     }
 
-    /*! This is used in the standard footer of each page and indicates when 
-     *  the page was generated 
+    /*! 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)"Generado el "+date;
       if (projName) result+=(QCString)" para "+projName;
       result+=(QCString)" por";
@@ -524,7 +518,7 @@ class TranslatorSpanish : public Translator
     {
       return (QCString)"Diagrama de herencias de "+clName;
     }
-    
+
     /*! this text is generated when the \\internal command is used. */
     virtual QCString trForInternalUseOnly()
     { return "Sólo para uso interno."; }
@@ -589,7 +583,7 @@ class TranslatorSpanish : public Translator
 //////////////////////////////////////////////////////////////////////////
 
     /*! used in the class documentation as a header before the list of all
-     * related classes 
+     * related classes
      */
     virtual QCString trRelatedFunctionDocumentation()
     { return "Documentación de las funciones relacionadas y clases amigas"; }
@@ -674,21 +668,21 @@ class TranslatorSpanish : public Translator
       QCString result;
       int i;
       // the inherits list contain `numEntries' classes
-      for (i=0;i<numEntries;i++) 
+      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 
+        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 
+          if (i<numEntries-2) // not the fore last entry
             result+=", ";
           else                // the fore last entry
             result+=" y ";
         }
       }
-      return result; 
+      return result;
     }
 
     /*! used in class documentation to produce a list of base classes,
@@ -707,7 +701,7 @@ class TranslatorSpanish : public Translator
       return "Heredado por "+trWriteList(numEntries)+".";
     }
 
-    /*! used in member documentation blocks to produce a list of 
+    /*! used in member documentation blocks to produce a list of
      *  members that are hidden by this one.
      */
     virtual QCString trReimplementedFromList(int numEntries)
@@ -729,17 +723,17 @@ class TranslatorSpanish : public Translator
 
     /*! This is an introduction to the page with all namespace members */
     virtual QCString trNamespaceMemberDescription(bool extractAll)
-    { 
+    {
       QCString result="Lista de ";
       if (!extractAll) result+="toda la documentación de ";
       result+="los miembros del namespace con enlace a ";
-      if (extractAll) 
+      if (extractAll)
         result+="los namespace de cada miembro:";
-      else 
+      else
         result+="la documentación de los namespaces pertenecientes a:";
       return result;
     }
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      *  index of all namespaces.
      */
     virtual QCString trNamespaceIndex()
@@ -785,7 +779,7 @@ class TranslatorSpanish : public Translator
         default: break;
       }
       result+=" fue generada a partir de";
-      if (single) result+="l siguiente fichero:"; 
+      if (single) result+="l siguiente fichero:";
       else result+=" los siguientes ficheros:";
       return result;
     }
@@ -809,7 +803,7 @@ class TranslatorSpanish : public Translator
     virtual QCString trMainPage()
     { return "Página principal"; }
 
-    /*! This is used in references to page that are put in the LaTeX 
+    /*! 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()
@@ -834,7 +828,7 @@ class TranslatorSpanish : public Translator
 
     virtual QCString trDeprecated()
     {
-    return "Obsoleto"; 
+    return "Obsoleto";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -856,7 +850,7 @@ class TranslatorSpanish : public Translator
     /*! header that is put before the list of constructor/destructors. */
     virtual QCString trConstructorDocumentation()
     {
-      return "Documentación del constructor y destructor"; 
+      return "Documentación del constructor y destructor";
     }
 
     /*! Used in the file documentation to point to the corresponding sources. */
@@ -1038,17 +1032,17 @@ class TranslatorSpanish : public Translator
       return "Colores y flechas del Gráfico";
     }
 
-    /*! page explaining how the dot graph's should be interpreted 
+    /*! 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 
+      return
         "Esta página explica como interpretar los gráficos que son generados "
         "por doxygen.<p>\n"
         "Considere el siguiente ejemplo:\n"
         "\\code\n"
-        "/*! Clase invisible por truncamiento */\n"  
+        "/*! Clase invisible por truncamiento */\n"
         "class Invisible { };\n\n"
         "/*! Clase truncada, relación de herencia escondida */\n"
         "class Truncated : public Invisible { };\n\n"
@@ -1099,7 +1093,7 @@ class TranslatorSpanish : public Translator
         "<li>Una flecha rojo oscuro es usada para herencia privada.\n"
         "<li>Una flecha segmentada púrpura se usa si la clase es contenida o "
         "usada por otra clase. La flecha está etiquetada por la variable "
-        "con que se accede a la clase o estructura apuntada. \n"  
+        "con que se accede a la clase o estructura apuntada. \n"
         "<li>Una flecha segmentada amarilla indica la relación entre una instancia template y la clase template de la que se ha instanciado."
         " La flecha se etiqueta con los parámetros con que se llama al template.\n"
         "</ul>\n";
@@ -1110,7 +1104,7 @@ class TranslatorSpanish : public Translator
     {
       return "significado de colores y flechas";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.2.0
 //////////////////////////////////////////////////////////////////////////
@@ -1220,9 +1214,9 @@ class TranslatorSpanish : public Translator
 // new since 1.2.6
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as ansicpg for RTF file 
-     * 
-     * The following table shows the correlation of Charset name, Charset Value and 
+    /*! 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
@@ -1243,15 +1237,15 @@ class TranslatorSpanish : public Translator
      * GB2313_CHARSET          134 (x86)             936
      * CHINESEBIG5_CHARSET     136 (x88)             950
      * </pre>
-     * 
+     *
      */
     virtual QCString trRTFansicp()
     {
       return "1252";
     }
-    
 
-    /*! Used as ansicpg for RTF fcharset 
+
+    /*! Used as ansicpg for RTF fcharset
      *  \see trRTFansicp() for a table of possible values.
      */
     virtual QCString trRTFCharSet()
@@ -1266,80 +1260,80 @@ class TranslatorSpanish : public Translator
     }
 
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  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 ? "Clase" : "clase"));
       if (!singular)  result+="s";
-      return result; 
+      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 
+     *  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 ? "Archivo" : "archivo"));
       if (!singular)  result+="s";
-      return result; 
+      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 
+     *  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 result;
     }
 
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  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 ? "Grupo" : "grupo"));
       if (!singular)  result+="s";
-      return result; 
+      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 
+     *  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 ? "Página" : "página"));
       if (!singular)  result+="s";
-      return result; 
+      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 
+     *  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 ? "Miembro" : "miembro"));
       if (!singular)  result+="s";
-      return result; 
+      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 
+     *  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+="es";
-      return result; 
+      return result;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1349,10 +1343,10 @@ class TranslatorSpanish : public Translator
     /*! 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 ? "Autor" : "autor"));
       if (!singular)  result+="es";
-      return result; 
+      return result;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1370,7 +1364,7 @@ class TranslatorSpanish : public Translator
 // new since 1.2.13
 //////////////////////////////////////////////////////////////////////////
 
-    /*! used in member documentation blocks to produce a list of 
+    /*! used in member documentation blocks to produce a list of
      *  members that are implemented by this one.
      */
     virtual QCString trImplementedFromList(int numEntries)
@@ -1402,8 +1396,8 @@ class TranslatorSpanish : public Translator
 // new since 1.2.17
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as the header of the list of item that have been 
-     *  flagged deprecated 
+    /*! Used as the header of the list of item that have been
+     *  flagged deprecated
      */
     virtual QCString trDeprecatedList()
     {
@@ -1414,7 +1408,7 @@ class TranslatorSpanish : public Translator
 // new since 1.2.18
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as a header for declaration section of the events found in 
+    /*! Used as a header for declaration section of the events found in
      * a C# program
      */
     virtual QCString trEvents()
@@ -1435,39 +1429,39 @@ class TranslatorSpanish : public Translator
     /*! Used as a heading for a list of Java class types with package scope.
      */
     virtual QCString trPackageTypes()
-    { 
+    {
       return "Tipos del 'package'";
     }
 
-    /*! Used as a heading for a list of Java class functions with package 
-     * scope. 
+    /*! Used as a heading for a list of Java class functions with package
+     * scope.
      */
     virtual QCString trPackageMembers()
-    { 
+    {
       return "Funciones del 'package'";
     }
 
-    /*! Used as a heading for a list of static Java class functions with 
+    /*! Used as a heading for a list of static Java class functions with
      *  package scope.
      */
     virtual QCString trStaticPackageMembers()
-    { 
+    {
       return "Funciones estáticas del 'package'";
     }
 
-    /*! Used as a heading for a list of Java class variables with package 
+    /*! Used as a heading for a list of Java class variables with package
      * scope.
      */
     virtual QCString trPackageAttribs()
-    { 
+    {
       return "Atributos del 'package'";
     }
 
-    /*! Used as a heading for a list of static Java class variables with 
+    /*! Used as a heading for a list of static Java class variables with
      * package scope.
      */
     virtual QCString trStaticPackageAttribs()
-    { 
+    {
       return "Atributos Estáticos del 'package'";
     }
 
@@ -1475,7 +1469,7 @@ class TranslatorSpanish : public Translator
 // new since 1.3.1
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used in the quick index of a class/file/namespace member list page 
+    /*! Used in the quick index of a class/file/namespace member list page
      *  to link to the unfiltered list of all members.
      */
     virtual QCString trAll()
@@ -1493,9 +1487,9 @@ class TranslatorSpanish : public Translator
 // new since 1.3.3
 //////////////////////////////////////////////////////////////////////////
 
-    /*! When the search engine is enabled this text is put in the header 
-     *  of each page before the field where one can enter the text to search 
-     *  for. 
+    /*! When the search engine is enabled this text is put in the header
+     *  of each page before the field where one can enter the text to search
+     *  for.
      */
     virtual QCString trSearchForIndex()
     {
@@ -1514,7 +1508,7 @@ class TranslatorSpanish : public Translator
      *  text can be different depending on the number of documents found.
      *  Inside the text you can put the special marker $num to insert
      *  the number representing the actual number of search results.
-     *  The @a numDocuments parameter can be either 0, 1 or 2, where the 
+     *  The @a numDocuments parameter can be either 0, 1 or 2, where the
      *  value 2 represents 2 or more matches. HTML markup is allowed inside
      *  the returned string.
      */
@@ -1528,14 +1522,14 @@ class TranslatorSpanish : public Translator
       {
         return "Se encontró <b>1</b> documento que coincide con su búsqueda.";
       }
-      else 
+      else
       {
         return "Se encontraron <b>$num</b> documentos que coinciden con su búsqueda. "
                 "Se muestran los mejores resultados primero.";
       }
     }
 
-    /*! This string is put before the list of matched words, for each search 
+    /*! This string is put before the list of matched words, for each search
      *  result. What follows is the list of words that matched the query.
      */
     virtual QCString trSearchMatches()
@@ -1576,7 +1570,7 @@ class TranslatorSpanish : public Translator
     virtual QCString trDirectories()
     { return "Directorios"; }
 
-    /*! This returns a sentences that introduces the directory hierarchy. 
+    /*! This returns a sentences that introduces the directory hierarchy.
      *  and the fact that it is sorted alphabetically per level
      */
     virtual QCString trDirDescription()
@@ -1598,10 +1592,10 @@ class TranslatorSpanish : public Translator
      *  (\a first_capital) and in sigular or plural form (\a singular).
      */
     virtual QCString trDir(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Directorio" : "directorio"));
       if (!singular) result+="s";
-      return result; 
+      return result;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1628,7 +1622,7 @@ class TranslatorSpanish : public Translator
       return "Gráfico de llamadas a esta función:";
     }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for enumeration values
      */
     virtual QCString trEnumerationValueDocumentation()
@@ -1648,7 +1642,7 @@ class TranslatorSpanish : public Translator
     virtual QCString trMemberFunctionDocumentationFortran()
     { return "Documetación de miembros Function/Subroutine"; }
 
-    /*! This is put above each page as a link to the list of annotated data types (Fortran). */    
+    /*! This is put above each page as a link to the list of annotated data types (Fortran). */
     virtual QCString trCompoundListFortran()
     { return "Lista de tipos de datos"; }
 
@@ -1670,18 +1664,18 @@ class TranslatorSpanish : public Translator
         result+="documentados ";
       }
       result+="con enlaces a ";
-      if (!extractAll) 
+      if (!extractAll)
       {
          result+="la documentación de la estructura de datos para cada miembro";
       }
-      else 
+      else
       {
          result+="los tipos de dato a que pertenece:";
       }
       return result;
     }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * annotated compound index (Fortran).
      */
     virtual QCString trCompoundIndexFortran()
@@ -1693,19 +1687,19 @@ class TranslatorSpanish : public Translator
     virtual QCString trTypeDocumentation()
     { return "Documentación de tipos de datos"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) subprograms (Fortran).
      */
     virtual QCString trSubprograms()
     { return "Funciones/Subprogramas"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for subprograms (Fortran)
      */
     virtual QCString trSubprogramDocumentation()
     { return "Documentación de Funciones/Subprogramas"; }
 
-    /*! This is used in the documentation of a file/namespace/group before 
+    /*! This is used in the documentation of a file/namespace/group before
      *  the list of links to documented compounds (Fortran)
      */
      virtual QCString trDataTypes()
@@ -1750,7 +1744,7 @@ class TranslatorSpanish : public Translator
     virtual QCString trModuleReference(const char *namespaceName)
     {
       QCString result="Referencia módulo ";
-      result+=namespaceName;        
+      result+=namespaceName;
       return result;
     }
 
@@ -1760,33 +1754,33 @@ class TranslatorSpanish : public Translator
 
     /*! This is an introduction to the page with all modules members (Fortran) */
     virtual QCString trModulesMemberDescription(bool extractAll)
-    { 
+    {
       QCString result="Lista de todos los miembros del módulo ";
       if (!extractAll) result+="documentados ";
       result+="con enlaces ";
-      if (extractAll) 
+      if (extractAll)
       {
         result+="a la documentación del módulo para cada uno:";
       }
-      else 
+      else
       {
         result+="al módulo al que pertenecen:";
       }
       return result;
     }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      *  index of all modules (Fortran).
      */
     virtual QCString trModulesIndex()
     { return "Índice de módulos"; }
-    
+
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trModule(bool first_capital, bool singular)
-    {       
+    {
       QCString result((first_capital ? "Módulo" : "módulo"));
       if (!singular)  result+="s";
       return result;
@@ -1825,18 +1819,18 @@ class TranslatorSpanish : public Translator
     {
       QCString result((first_capital ? "Tipo" : "tipo"));
       if (!singular)  result+="s";
-      return result; 
+      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 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trSubprogram(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Subprograma" : "subprograma"));
       if (!singular)  result+="s";
-      return result; 
+      return result;
     }
 
     /*! C# Type Constraint list */
@@ -1844,7 +1838,7 @@ class TranslatorSpanish : public Translator
     {
       return "Restriciones de tipo";
     }
-	
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.6.0 (mainly for the new search engine)
 //////////////////////////////////////////////////////////////////////////
@@ -1907,7 +1901,7 @@ class TranslatorSpanish : public Translator
       return (QCString)"Incluye ficheros en "+name;
     }
 
-    /** Compiles a date string. 
+    /** Compiles a date string.
      *  @param year Year in 4 digits
      *  @param month Month of the year: 1=January
      *  @param day Day of the Month: 1..31
@@ -1987,8 +1981,8 @@ class TranslatorSpanish : public Translator
     virtual QCString trInheritedFrom(const char *members,const char *what)
     { return QCString(members)+" heredados desde "+what; }
 
-    /*! Header of the sections with inherited members specific for the 
-     *  base class(es) 
+    /*! Header of the sections with inherited members specific for the
+     *  base class(es)
      */
     virtual QCString trAdditionalInheritedMembers()
     { return "Otros miembros heredados"; }
@@ -1998,7 +1992,7 @@ class TranslatorSpanish : public Translator
 //////////////////////////////////////////////////////////////////////////
 
     /*! Used as a tooltip for the toggle button that appears in the
-     *  navigation tree in the HTML output when GENERATE_TREEVIEW is 
+     *  navigation tree in the HTML output when GENERATE_TREEVIEW is
      *  enabled. This tooltip explains the meaning of the button.
      */
     virtual QCString trPanelSynchronisationTooltip(bool enable)
diff --git a/src/translator_fa.h b/src/translator_fa.h
index d3c38a6..14594a2 100644
--- a/src/translator_fa.h
+++ b/src/translator_fa.h
@@ -1,12 +1,12 @@
 /******************************************************************************
  *
- * 
+ *
  *
  * Copyright (C) 1997-2013 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 
+ * 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.
  *
@@ -20,10 +20,10 @@
  * ChangeLog :
  *   Thu 06 Jul 2006 11:54:09 PM IRDT <nadalizadeh at gmail dot com>
  *   >> First version of persian language support has been completed.
- *   
+ *
  *   Mon 04 Feb 2008 11:52:09 AM IRDT <nadalizadeh at gmail dot com>
  *   >> Obsolete methods removed. Translated more string(s) to persian. Upgraded to 1_5_4 adapter.
- *   
+ *
  *   Fri 04 Jun 2010 04:05:24 PM IRDT <nadalizadeh at gmail dot com>
  *   >> Implement missing new methods since 1.6.0.
  *   >> Add English to Persian digit convertor. (for date/time digits)
@@ -55,26 +55,26 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5
 			else
 				output += str.at(i);
 		}
-		
+
 		return output;
 	}
 
   public:
 
     // --- Language control methods -------------------
-    
-    /*! Used for identification of the language. The identification 
-     * should not be translated. It should be replaced by the name 
+
+    /*! Used for identification of the language. The identification
+     * should not be translated. It should be replaced by the name
      * of the language in Persian using lower-case characters only
-     * (e.g. "czech", "japanese", "russian", etc.). It should be equal to 
+     * (e.g. "czech", "japanese", "russian", etc.). It should be equal to
      * the identification used in language.cpp.
      */
     virtual QCString idLanguage()
     { return "persian"; }
-    
-    /*! Used to get the LaTeX command(s) for the language support. 
+
+    /*! 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 
+     *  LaTeX to the desired language.  For example
      *  <pre>"\\usepackage[german]{babel}\n"
      *  </pre>
      *  or
@@ -82,7 +82,7 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5
      *  "\\usepackage[latin2]{inputenc}\n"
      *  "\\usepackage[T1]{fontenc}\n"
      *  </pre>
-     * 
+     *
      * The Persian LaTeX does not use such commands.  Because of this
      * the empty string is returned in this implementation.
      */
@@ -91,12 +91,6 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5
       return "";
     }
 
-    /*! return the language charset. This will be used for the HTML output */
-    virtual QCString idLanguageCharset()
-    {
-      return "utf-8";
-    }
-
     // --- Language translation methods -------------------
 
     /*! used in the compound documentation before a list of related functions. */
@@ -114,30 +108,30 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5
     /*! header that is put before the list of typedefs. */
     virtual QCString trMemberTypedefDocumentation()
     { return "مستندات تعریف گونه ها"; }
-    
+
     /*! header that is put before the list of enumerations. */
     virtual QCString trMemberEnumerationDocumentation()
     { return "های عضو Enumeration مستندات"; }
-    
+
     /*! header that is put before the list of member functions. */
     virtual QCString trMemberFunctionDocumentation()
     { return "توضيحات توابع عضو"; }
-    
+
     /*! header that is put before the list of member attributes. */
     virtual QCString trMemberDataDocumentation()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Field مستندات"; 
+        return "Field مستندات";
       }
       else
       {
-        return "مستندات متغيير های عضو"; 
+        return "مستندات متغيير های عضو";
       }
     }
 
     /*! this is the text of a link put after brief descriptions. */
-    virtual QCString trMore() 
+    virtual QCString trMore()
     { return "بيشتر..."; }
 
     /*! put in the class documentation */
@@ -155,81 +149,81 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5
     /*! this is the remainder of the sentence after the class name */
     virtual QCString trIncludingInheritedMembers()
     { return "شامل همه ی اعضای به ارث برده شده می باشد."; }
-    
+
     /*! 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)" برای "+s;
-      result+=" از کد برنامه "; 
+      result+=" از کد برنامه ";
       return result;
     }
 
     /*! put after an enum name in the list of all members */
     virtual QCString trEnumName()
     { return "enum نام"; }
-    
+
     /*! put after an enum value in the list of all members */
     virtual QCString trEnumValue()
     { return "enum مقدار"; }
-    
+
     /*! put after an undocumented member in the list of all members */
     virtual QCString trDefinedIn()
     { return "تعریف شده در"; }
 
     // quick reference sections
 
-    /*! This is put above each page as a link to the list of all groups of 
+    /*! 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 "Modules"; }
-    
+
     /*! This is put above each page as a link to the class hierarchy */
     virtual QCString trClassHierarchy()
     { return "سلسله مراتب کلاس ها"; }
-    
+
     /*! This is put above each page as a link to the list of annotated classes */
     virtual QCString trCompoundList()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
         return "ساختار های داده ";
       }
       else
       {
-        return "ليست کلاس ها "; 
+        return "ليست کلاس ها ";
       }
     }
-    
+
     /*! This is put above each page as a link to the list of documented files */
     virtual QCString trFileList()
     { return "ليست فايل ها"; }
 
     /*! 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 "فضاهای داده ها"; 
+        return "فضاهای داده ها";
       }
       else
       {
-        return "اعضاء کلاس ها"; 
+        return "اعضاء کلاس ها";
       }
     }
 
     /*! This is put above each page as a link to all members of files. */
     virtual QCString trFileMembers()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Globals"; 
+        return "Globals";
       }
       else
       {
-        return "اعضاء پرونده"; 
+        return "اعضاء پرونده";
       }
     }
 
@@ -261,11 +255,11 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5
 
     /*! This is an introduction to the annotated compound list. */
     virtual QCString trCompoundListDescription()
-    { 
-      
+    {
+
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "ليست ساختارهای داده به همراه توضيحی کوتاه :"; 
+        return "ليست ساختارهای داده به همراه توضيحی کوتاه :";
       }
       else
       {
@@ -312,7 +306,7 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5
     {
       QCString result="ليست همه ی توابع ، متغيير ها، تعاريف و ... ";
       if (!extractAll) result+="(مستند شده) ";
-      
+
       result+=" به همراه ارتباط آنها ";
       result+="با پرونده هايی که به آن مربوط اند :";
       return result;
@@ -330,44 +324,44 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5
     virtual QCString trModulesDescription()
     { return "لیست تمام ماژول ها:"; }
 
-    // index titles (the project name is prepended for these) 
+    // index titles (the project name is prepended for these)
 
 
     /*! This is used in HTML as the title of index.html. */
     virtual QCString trDocumentation()
     { return "مستندات"; }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * index of all groups.
      */
     virtual QCString trModuleIndex()
     { return "فهرست ماژول ها"; }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * class hierarchy.
      */
     virtual QCString trHierarchicalIndex()
     { return "فهرست سلسله مراتب"; }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * annotated compound index.
      */
     virtual QCString trCompoundIndex()
     {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
-      { 
+      {
         return "فهرست ساختار داده ها";
       }
       else
       {
-        return "فهرست کلاس های"; 
+        return "فهرست کلاس های";
       }
     }
 
     /*! This is used in LaTeX as the title of the chapter with the
      * list of all files.
      */
-    virtual QCString trFileIndex() 
+    virtual QCString trFileIndex()
     { return "فهرست پرونده ها"; }
 
     /*! This is used in LaTeX as the title of the chapter containing
@@ -380,14 +374,14 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5
      *  the documentation of all classes, structs and unions.
      */
     virtual QCString trClassDocumentation()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "مستندات ساختار داده ها"; 
+        return "مستندات ساختار داده ها";
       }
       else
       {
-        return "مستندات کلاس ها"; 
+        return "مستندات کلاس ها";
       }
     }
 
@@ -412,111 +406,111 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5
     /*! This is used in LaTeX as the title of the document */
     virtual QCString trReferenceManual()
     { return "راهنمای مرجع"; }
-    
-    /*! This is used in the documentation of a file as a header before the 
+
+    /*! This is used in the documentation of a file as a header before the
      *  list of defines
      */
     virtual QCString trDefines()
     { return "تعاريف"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of function prototypes
      */
     virtual QCString trFuncProtos()
     { return "پیش تعریف های توابع"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of typedefs
      */
     virtual QCString trTypedefs()
     { return "تعریف گونه ها"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of enumerations
      */
     virtual QCString trEnumerations()
     { return "تعاريف"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) functions
      */
     virtual QCString trFunctions()
     { return "توابع"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) variables
      */
     virtual QCString trVariables()
     { return "متغيير ها"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) variables
      */
     virtual QCString trEnumerationValues()
     { return "معرف ها"; }
-    
+
     /*! This is used in the documentation of a file before the list of
      *  documentation blocks for defines
      */
     virtual QCString trDefineDocumentation()
     { return "Define Documentation"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for function prototypes
      */
     virtual QCString trFunctionPrototypeDocumentation()
     { return "مستندات تعاریف اولیه توابع"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for typedefs
      */
     virtual QCString trTypedefDocumentation()
     { return "Typedef"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for enumeration types
      */
     virtual QCString trEnumerationTypeDocumentation()
     { return "مستندات تعريف"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for enumeration values
      */
     virtual QCString trEnumerationValueDocumentation()
     { return "مستندات معرف"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for functions
      */
     virtual QCString trFunctionDocumentation()
     { return "توضيح تابع"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for variables
      */
     virtual QCString trVariableDocumentation()
     { return "توضيح متغير"; }
 
-    /*! This is used in the documentation of a file/namespace/group before 
+    /*! This is used in the documentation of a file/namespace/group before
      *  the list of links to documented compounds
      */
     virtual QCString trCompounds()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "ساختارهای داده"; 
+        return "ساختارهای داده";
       }
       else
       {
-        return "کلاس ها"; 
+        return "کلاس ها";
       }
     }
 
-    /*! This is used in the standard footer of each page and indicates when 
-     *  the page was generated 
+    /*! 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 = HtmlDivEnd + HtmlRightToLeft + QCString("توليد شده در ") +date ;
       if (projName) result+=(QCString)" برای "+projName;
       result+=(QCString)" توسط";
@@ -534,7 +528,7 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5
     {
       return (QCString)""+clName+" نمودار وراثت برای  :";
     }
-    
+
     /*! this text is generated when the \\internal command is used. */
     virtual QCString trForInternalUseOnly()
     { return ".فقط برای استعمال داخلی"; }
@@ -566,7 +560,7 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5
     /*! this text is generated when the \\exception command is used. */
     virtual QCString trExceptions()
     { return "استثناء ها"; }
-    
+
     /*! this text is used in the title page of a LaTeX document. */
     virtual QCString trGeneratedBy()
     { return "توليد شده توسط"; }
@@ -574,7 +568,7 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990307
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! used as the title of page containing all the index of all namespaces. */
     virtual QCString trNamespaceList()
     { return "ليست فضاهای نام"; }
@@ -593,17 +587,17 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5
      */
     virtual QCString trFriends()
     { return "کلاس های دوست"; }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990405
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! used in the class documentation as a header before the list of all
-     * related classes 
+     * related classes
      */
     virtual QCString trRelatedFunctionDocumentation()
     { return "مستندات توابع مربوط و دوست"; }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990425
 //////////////////////////////////////////////////////////////////////////
@@ -634,7 +628,7 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5
     virtual QCString trFileReference(const char *fileName)
     {
       QCString result=fileName;
-      result+=" مرجع پرونده"; 
+      result+=" مرجع پرونده";
       return result;
     }
 
@@ -645,7 +639,7 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5
       result+=" مرجع فضای نام";
       return result;
     }
-    
+
     virtual QCString trPublicMembers()
     { return "توابع عمومی عضو کلاس"; }
     virtual QCString trPublicSlots()
@@ -666,7 +660,7 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5
     { return "های خصوصی Slot"; }
     virtual QCString trStaticPrivateMembers()
     { return "توابع خصوصی ثابت عضو کلاس"; }
-    
+
     /*! this function is used to produce a comma-separated list of items.
      *  use generateMarker(i) to indicate where item i should be put.
      */
@@ -675,23 +669,23 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5
       QCString result;
       int i;
       // the inherits list contain `numEntries' classes
-      for (i=0;i<numEntries;i++) 
+      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 
+        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 
+          if (i<numEntries-2) // not the fore last entry
             result+=", ";
           else                // the fore last entry
             result+=" و ";
         }
       }
-      return result; 
+      return result;
     }
-    
+
     /*! used in class documentation to produce a list of base classes,
      *  if class diagrams are disabled.
      */
@@ -708,7 +702,7 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5
       return ".اين کلاس را به ارث برده است "+trWriteList(numEntries)+".";
     }
 
-    /*! used in member documentation blocks to produce a list of 
+    /*! used in member documentation blocks to produce a list of
      *  members that are hidden by this one.
      */
     virtual QCString trReimplementedFromList(int numEntries)
@@ -730,14 +724,14 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5
 
     /*! This is an introduction to the page with all namespace members */
     virtual QCString trNamespaceMemberDescription(bool extractAll)
-    { 
+    {
       QCString result="ليست همه اعضای فضای نام  ";
       if (!extractAll) result+="(مستند شده) ";
       result+=" با ارتباطشان با";
       result+="فضاهای نامی که به آن مربوط اند را مشاهده ميکنيد :";
       return result;
     }
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      *  index of all namespaces.
      */
     virtual QCString trNamespaceIndex()
@@ -807,7 +801,7 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5
     virtual QCString trMainPage()
     { return "صفحه ی اصلی"; }
 
-    /*! This is used in references to page that are put in the LaTeX 
+    /*! 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()
@@ -851,7 +845,7 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5
     /*! header that is put before the list of constructor/destructors. */
     virtual QCString trConstructorDocumentation()
     {
-      return "مستندات توباع آغازین و پایانی"; 
+      return "مستندات توباع آغازین و پایانی";
     }
     /*! Used in the file documentation to point to the corresponding sources. */
     virtual QCString trGotoSourceCode()
@@ -908,7 +902,7 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5
 //////////////////////////////////////////////////////////////////////////
 // new since 1.1.0
 //////////////////////////////////////////////////////////////////////////
-    
+
     virtual QCString trNote()
     {
       return "نکته";
@@ -996,7 +990,7 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5
     {
       return "از";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.1.5
 //////////////////////////////////////////////////////////////////////////
@@ -1006,12 +1000,12 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5
     {
       return "راهنمای نمودار";
     }
-    /*! page explaining how the dot graph's should be interpreted 
+    /*! 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 
+      return
         "This page explains how to interpret the graphs that are generated "
         "by doxygen.<p>\n"
         "Consider the following example:\n"
@@ -1076,11 +1070,11 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5
     {
       return "راهنما";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.2.0
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! Used as a marker that is put before a test item */
     virtual QCString trTest()
     {
@@ -1158,11 +1152,11 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5
     {
       return "مقدار:";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.2.5
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! Used as a marker that is put before a \\bug item */
     virtual QCString trBug()
     {
@@ -1178,9 +1172,9 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5
 // new since 1.2.6
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as ansicpg for RTF file 
-     * 
-     * The following table shows the correlation of Charset name, Charset Value and 
+    /*! 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
@@ -1201,15 +1195,15 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5
      * GB2313_CHARSET          134 (x86)             936
      * CHINESEBIG5_CHARSET     136 (x88)             950
      * </pre>
-     * 
+     *
      */
     virtual QCString trRTFansicp()
     {
       return "1256";
     }
-    
 
-    /*! Used as ansicpg for RTF fcharset 
+
+    /*! Used as ansicpg for RTF fcharset
      *  \see trRTFansicp() for a table of possible values.
      */
     virtual QCString trRTFCharSet()
@@ -1222,82 +1216,82 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5
     {
       return "فهرست";
     }
-   
+
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  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 ? "کلاس" : "کلاس"));
       if (!singular)  result+="ها";
-      return result; 
+      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 
+     *  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("پرونده");
       if (!singular) result=result+" ها";
-      return result; 
+      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 
+     *  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 ? "فضای نام " : "فضای نام "));
       if (!singular)  result+="ها";
-      return result; 
+      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 
+     *  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 result;
     }
 
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  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 ? "صفحه" : "صفحه"));
       if (!singular)  result+=" ها ";
-      return result; 
+      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 
+     *  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 ? "عضو" : "عضو"));
       if (!singular)  result+="ها";
-      return result; 
+      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 
+     *  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 result;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1307,10 +1301,10 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5
     /*! 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 result;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1328,7 +1322,7 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5
 // new since 1.2.13
 //////////////////////////////////////////////////////////////////////////
 
-    /*! used in member documentation blocks to produce a list of 
+    /*! used in member documentation blocks to produce a list of
      *  members that are implemented by this one.
      */
     virtual QCString trImplementedFromList(int numEntries)
@@ -1360,8 +1354,8 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5
 // new since 1.2.17
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as the header of the list of item that have been 
-     *  flagged deprecated 
+    /*! Used as the header of the list of item that have been
+     *  flagged deprecated
      */
     virtual QCString trDeprecatedList()
     {
@@ -1372,7 +1366,7 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5
 // new since 1.2.18
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as a header for declaration section of the events found in 
+    /*! Used as a header for declaration section of the events found in
      * a C# program
      */
     virtual QCString trEvents()
@@ -1392,43 +1386,43 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5
     /*! Used as a heading for a list of Java class types with package scope.
      */
     virtual QCString trPackageTypes()
-    { 
+    {
       return "انواع بسته ها";
     }
-    /*! Used as a heading for a list of Java class functions with package 
-     * scope. 
+    /*! Used as a heading for a list of Java class functions with package
+     * scope.
      */
     virtual QCString trPackageMembers()
-    { 
+    {
       return "توابع بسته ها";
     }
-    /*! Used as a heading for a list of static Java class functions with 
+    /*! Used as a heading for a list of static Java class functions with
      *  package scope.
      */
     virtual QCString trStaticPackageMembers()
-    { 
+    {
       return "Static Package Functions";
     }
-    /*! Used as a heading for a list of Java class variables with package 
+    /*! Used as a heading for a list of Java class variables with package
      * scope.
      */
     virtual QCString trPackageAttribs()
-    { 
+    {
       return "خواص بسته ها";
     }
-    /*! Used as a heading for a list of static Java class variables with 
+    /*! Used as a heading for a list of static Java class variables with
      * package scope.
      */
     virtual QCString trStaticPackageAttribs()
-    { 
+    {
       return "Static Package Attributes";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.3.1
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used in the quick index of a class/file/namespace member list page 
+    /*! Used in the quick index of a class/file/namespace member list page
      *  to link to the unfiltered list of all members.
      */
     virtual QCString trAll()
@@ -1445,9 +1439,9 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5
 // new since 1.3.3
 //////////////////////////////////////////////////////////////////////////
 
-    /*! When the search engine is enabled this text is put in the header 
-     *  of each page before the field where one can enter the text to search 
-     *  for. 
+    /*! When the search engine is enabled this text is put in the header
+     *  of each page before the field where one can enter the text to search
+     *  for.
      */
     virtual QCString trSearchForIndex()
     {
@@ -1464,7 +1458,7 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5
      *  text can be different depending on the number of documents found.
      *  Inside the text you can put the special marker $num to insert
      *  the number representing the actual number of search results.
-     *  The @a numDocuments parameter can be either 0, 1 or 2, where the 
+     *  The @a numDocuments parameter can be either 0, 1 or 2, where the
      *  value 2 represents 2 or more matches. HTML markup is allowed inside
      *  the returned string.
      */
@@ -1478,13 +1472,13 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5
       {
         return "یک سند برای این مورد یافت شد.";
       }
-      else 
+      else
       {
         return "Found <b>$num</b> documents matching your query. "
                "Showing best matches first.";
       }
     }
-    /*! This string is put before the list of matched words, for each search 
+    /*! This string is put before the list of matched words, for each search
      *  result. What follows is the list of words that matched the query.
      */
     virtual QCString trSearchMatches()
@@ -1525,7 +1519,7 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5
     virtual QCString trDirectories()
     { return "شاخه ها"; }
 
-    /*! This returns a sentences that introduces the directory hierarchy. 
+    /*! This returns a sentences that introduces the directory hierarchy.
      *  and the fact that it is sorted alphabetically per level
      */
     virtual QCString trDirDescription()
@@ -1542,10 +1536,10 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5
      *  (\a first_capital) and in sigular or plural form (\a singular).
      */
     virtual QCString trDir(bool /*first_capital*/, bool singular)
-    { 
+    {
       QCString result("شاخه");
       if (singular) result+=" ها "+result;
-      return result; 
+      return result;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1574,12 +1568,12 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5
 //////////////////////////////////////////////////////////////////////////
 // new since 1.5.4 (mainly for Fortran)
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! header that is put before the list of member subprograms (Fortran). */
     virtual QCString trMemberFunctionDocumentationFortran()
     { return "مستندات توابع عضو"; }
 
-    /*! This is put above each page as a link to the list of annotated data types (Fortran). */    
+    /*! This is put above each page as a link to the list of annotated data types (Fortran). */
     virtual QCString trCompoundListFortran()
     { return "لیست ساختار های داده"; }
 
@@ -1597,7 +1591,7 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5
       return "توضیحات اعضا ساختارها به همراه مستندات ساختار داده ی مربوطه";
     }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * annotated compound index (Fortran).
      */
     virtual QCString trCompoundIndexFortran()
@@ -1609,24 +1603,24 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5
     virtual QCString trTypeDocumentation()
     { return "Data Type Documentation"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) subprograms (Fortran).
      */
     virtual QCString trSubprograms()
     { return "توابع و زیربرنامه ها"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for subprograms (Fortran)
      */
     virtual QCString trSubprogramDocumentation()
     { return "مستندات توابع و زیربرنامه ها"; }
 
-    /*! This is used in the documentation of a file/namespace/group before 
+    /*! This is used in the documentation of a file/namespace/group before
      *  the list of links to documented compounds (Fortran)
      */
      virtual QCString trDataTypes()
     { return "ساختار های داده"; }
-    
+
     /*! used as the title of page containing all the index of all modules (Fortran). */
     virtual QCString trModulesList()
     { return "لیست ماژول ها"; }
@@ -1663,36 +1657,36 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5
     virtual QCString trModuleReference(const char *namespaceName)
     {
       QCString result=namespaceName;
-      result+=" Module Reference";        
+      result+=" Module Reference";
       return result;
     }
-    
+
     /*! This is put above each page as a link to all members of modules. (Fortran) */
     virtual QCString trModulesMembers()
     { return "اعضاء ماژول"; }
 
     /*! This is an introduction to the page with all modules members (Fortran) */
     virtual QCString trModulesMemberDescription(bool)
-    { 
+    {
       QCString result="لیست اعضاء ماژول ها به همراه مستندات ماژول مربوطه";
       return result;
     }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      *  index of all modules (Fortran).
      */
     virtual QCString trModulesIndex()
     { return "Modules Index"; }
-    
+
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trModule(bool, bool singular)
-    {       
+    {
       QCString result("ماژول");
       if (!singular)  result+=" ها";
-      return result; 
+      return result;
     }
     /*! This is put at the bottom of a module documentation page and is
      *  followed by a list of files that were used to generate the page.
@@ -1718,24 +1712,24 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5
       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 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trType(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Type" : "type"));
       if (!singular)  result+="s";
-      return result; 
+      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 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trSubprogram(bool, bool singular)
-    { 
+    {
       QCString result("زیربرنامه");
       if (!singular)  result+=" ها ";
-      return result; 
+      return result;
     }
 
     /*! C# Type Constraint list */
@@ -1806,7 +1800,7 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5
       return (QCString)"Includes file in "+name;
     }
 
-    /** Compiles a date string. 
+    /** Compiles a date string.
      *  @param year Year in 4 digits
      *  @param month Month of the year: 1=January
      *  @param day Day of the Month: 1..31
diff --git a/src/translator_fi.h b/src/translator_fi.h
index 3a9a890..050a58b 100644
--- a/src/translator_fi.h
+++ b/src/translator_fi.h
@@ -1,12 +1,12 @@
 /******************************************************************************
  *
- * 
+ *
  *
  * Copyright (C) 1997-2013 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 
+ * 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.
  *
@@ -23,8 +23,8 @@ Antti Laine   (0.49-990425 -> )     <antti.a.laine@tut.fi>
 1999/10/19
 *  Alustava käännös valmis.
 
-*  Huom: Kaikille termeille on keksitty käännösvastine, mikä ei ehkä ole 
-         kaikissa tapauksissa hyvä ratkaisu, ja parempikin termi voi 
+*  Huom: Kaikille termeille on keksitty käännösvastine, mikä ei ehkä ole
+         kaikissa tapauksissa hyvä ratkaisu, ja parempikin termi voi
          olla vakiintuneessa käytössä.
 
 2008-04-08
@@ -38,7 +38,7 @@ Antti Laine   (0.49-990425 -> )     <antti.a.laine@tut.fi>
 * Enumeraatio -> luettelotyyppi
 * Paranneltu kieltä ja poistettu kirjoitusvirheitä
 
-* Tehtävää: 
+* Tehtävää:
         - Termien kokoaminen listaksi ja suomennosten järkevyyden tarkastelu. (lista on jo melko kattava)
                 Author          = Tekijä
                 Class           = Luokka
@@ -99,21 +99,21 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
              "It was not updated since version 1.0.0.  As a result,\n"
              "some sentences may appear in English.\n\n";
     }*/
-    
+
     // --- Language control methods -------------------
-    
-    /*! Used for identification of the language. The identification 
-     * should not be translated. It should be replaced by the name 
+
+    /*! 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 should be equal to 
+     * (e.g. "czech", "japanese", "russian", etc.). It should be equal to
      * the identification used in language.cpp.
      */
     virtual QCString idLanguage()
     { return "finnish"; }
 
-    /*! Used to get the LaTeX command(s) for the language support. 
+    /*! 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 
+     *  LaTeX to the desired language.  For example
      *  <pre>"\\usepackage[german]{babel}\n"
      *  </pre>
      *  or
@@ -121,7 +121,7 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
      *  "\\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.
      */
@@ -130,12 +130,6 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
       return "\\usepackage[finnish]{babel}\n";
     }
 
-    /*! return the language charset. This will be used for the HTML output */
-    virtual QCString idLanguageCharset()
-    {
-      return "utf-8";
-    }
-
     // --- Language translation methods -------------------
 
     /*! used in the compound documentation before a list of related functions. */
@@ -165,10 +159,10 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
 
     /*! header that is put before the list of member attributes. */
     virtual QCString trMemberDataDocumentation()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Kenttien dokumentaatio"; // "Field Documentation"; 
+        return "Kenttien dokumentaatio"; // "Field Documentation";
       }
       else
       {
@@ -225,19 +219,19 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
 
     // quick reference sections
 
-    /*! This is put above each page as a link to the list of all groups of 
+    /*! 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 "Moduulit"; } // "Modules"
-    
+
     /*! This is put above each page as a link to the class hierarchy */
     virtual QCString trClassHierarchy()
     { return "Luokkahierarkia"; } // "Class Hierarchy"
-   
-    /*! This is put above each page as a link to the list of annotated classes */ 
+
+    /*! This is put above each page as a link to the list of annotated classes */
     virtual QCString trCompoundList()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
         return "Tietueet"; // "Data Structures"
@@ -251,26 +245,26 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
     /*! This is put above each page as a link to the list of documented files */
     virtual QCString trFileList()
     { return "Tiedostolista"; } // "File List"
-   
-    /*! This is put above each page as a link to all members of compounds. */ 
+
+    /*! 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 "Tietueen kentät"; // "Data Fields" 
+        return "Tietueen kentät"; // "Data Fields"
       }
       else
       {
         return "Luokan jäsenet"; // "Class Members"
       }
     }
-    
+
     /*! This is put above each page as a link to all members of files. */
     virtual QCString trFileMembers()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Globaalit"; // "Globals" 
+        return "Globaalit"; // "Globals"
       }
       else
       {
@@ -281,16 +275,16 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
     /*! This is put above each page as a link to all related pages. */
     virtual QCString trRelatedPages()
     { return "Liittyvät sivut"; } // "Related Pages"
-   
-    /*! This is put above each page as a link to all examples. */ 
+
+    /*! This is put above each page as a link to all examples. */
     virtual QCString trExamples()
     { return "Esimerkit"; } // "Examples"
-   
-    /*! This is put above each page as a link to the search engine. */ 
+
+    /*! This is put above each page as a link to the search engine. */
     virtual QCString trSearch()
     { return "Etsi"; } // "Search"
-   
-    /*! This is an introduction to the class hierarchy. */ 
+
+    /*! This is an introduction to the class hierarchy. */
     virtual QCString trClassHierarchyDescription()
     { return "Tämä periytymislista on päätasoltaan aakkostettu " // "This inheritance list is sorted roughly, "
              "mutta alijäsenet on aakkostettu itsenäisesti:"; // "but not completely, alphabetically:";
@@ -304,11 +298,11 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
       result+="tiedostoista lyhyen selitteen kanssa:"; // "files with brief descriptions:"
       return result;
     }
-    
+
     /*! This is an introduction to the annotated compound list. */
     virtual QCString trCompoundListDescription()
     {
-    
+
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
         return "Tässä ovat tietueet lyhyen selitteen kanssa:"; // "Here are the data structures with brief descriptions:"
@@ -319,7 +313,7 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
              "yhdisteet lyhyen selitteen kanssa:"; // "unions with brief descriptions:"
       }
     }
-    
+
     /*! This is an introduction to the page with all class members. */
     virtual QCString trCompoundMembersDescription(bool extractAll)
     {
@@ -337,7 +331,7 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
         result+="luokkien jäsenistä"; // "class members"
       }
       result+=" linkitettyinä "; // " with links to "
-      if (!extractAll) 
+      if (!extractAll)
       {
         if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
         {
@@ -348,7 +342,7 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
           result+="jokaisen jäsenen luokkadokumentaatioon:"; // "the class documentation for each member:"
         }
       }
-      else 
+      else
       {
         if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
         {
@@ -367,7 +361,7 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
     {
       QCString result="Tässä on lista kaikista "; // "Here is a list of all "
       if (!extractAll) result+="dokumentoiduista "; // "documented "
-      
+
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
         result+="funktioista, muuttujista, määrittelyistä, luettelotyypeistä ja tyyppimäärittelyistä"; // "functions, variables, defines, enums, and typedefs"
@@ -377,50 +371,50 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
         result+="tiedoston jäsenistä"; // "file members"
       }
       result+=" linkitettyinä "; // " with links to "
-      if (extractAll) 
+      if (extractAll)
         result+="tiedostoihin, joihin ne kuuluvat:"; // "the files they belong to:"
-      else 
+      else
         result+="dokumentaatioon:"; // "the documentation:"
       return result;
     }
-    
+
     /*! This is an introduction to the page with the list of all examples */
     virtual QCString trExamplesDescription()
     { return "Tässä on lista kaikista esimerkeistä:"; } //  "Here is a list of all examples:"
-   
-    /*! This is an introduction to the page with the list of related pages */ 
+
+    /*! This is an introduction to the page with the list of related pages */
     virtual QCString trRelatedPagesDescription()
     { return "Tässä on lista kaikista liittyvistä dokumentaatiosivuista:"; } // "Here is a list of all related documentation pages:"
-   
-    /*! This is an introduction to the page with the list of class/file groups */ 
+
+    /*! This is an introduction to the page with the list of class/file groups */
     virtual QCString trModulesDescription()
     { return "Tässä on lista kaikista moduleista:"; } // "Here is a list of all modules:"
-    
-    // index titles (the project name is prepended for these) 
-    
+
+    // index titles (the project name is prepended for these)
+
     /*! This is used in HTML as the title of index.html. */
     virtual QCString trDocumentation()
     { return "Dokumentaatio"; } // "Documentation"
-    
-    /*! This is used in LaTeX as the title of the chapter with the 
+
+    /*! This is used in LaTeX as the title of the chapter with the
      * index of all groups.
      */
     virtual QCString trModuleIndex()
     { return "Moduuliluettelo"; } // "Module Index"
-    
-    /*! This is used in LaTeX as the title of the chapter with the 
+
+    /*! This is used in LaTeX as the title of the chapter with the
      * class hierarchy.
      */
     virtual QCString trHierarchicalIndex()
     { return "Hierarkinen luettelo"; } // "Hierarchical Index"
-    
-    /*! This is used in LaTeX as the title of the chapter with the 
+
+    /*! This is used in LaTeX as the title of the chapter with the
      * annotated compound index.
      */
     virtual QCString trCompoundIndex()
     {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
-      { 
+      {
         return "Tietueluettelo"; // "Data Structure Index"
       }
       else
@@ -428,19 +422,19 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
         return "Luokkaluettelo"; // "Class Index"
       }
     }
-    
+
     /*! This is used in LaTeX as the title of the chapter with the
      * list of all files.
      */
-    virtual QCString trFileIndex() 
+    virtual QCString trFileIndex()
     { return "Tiedostoluettelo"; } // "File Index"
-    
+
     /*! This is used in LaTeX as the title of the chapter containing
      *  the documentation of all groups.
      */
     virtual QCString trModuleDocumentation()
     { return "Moduulien dokumentaatio"; } // "Module Documentation"
-    
+
     /*! This is used in LaTeX as the title of the chapter containing
      *  the documentation of all classes, structs and unions.
      */
@@ -461,60 +455,60 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
      */
     virtual QCString trFileDocumentation()
     { return "Tiedostojen dokumentaatio"; } // "File Documentation"
-    
+
     /*! This is used in LaTeX as the title of the chapter containing
      *  the documentation of all examples.
      */
     virtual QCString trExampleDocumentation()
     { return "Esimerkkien dokumentaatio"; } // "Example Documentation"
-    
+
     /*! This is used in LaTeX as the title of the chapter containing
      *  the documentation of all related pages.
      */
     virtual QCString trPageDocumentation()
     { return "Sivujen dokumentaatio"; } // "Page Documentation"
-    
+
     /*! This is used in LaTeX as the title of the document */
     virtual QCString trReferenceManual()
     { return "Käsikirja"; } // "Reference Manual"
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of defines
      */
     virtual QCString trDefines()
     { return "Määrittelyt"; } // "Defines"
-    
-    /*! This is used in the documentation of a file as a header before the 
+
+    /*! This is used in the documentation of a file as a header before the
      *  list of function prototypes
      */
     virtual QCString trFuncProtos()
     { return "Funktioiden prototyypit"; } // "Function Prototypes"
-    
-    /*! This is used in the documentation of a file as a header before the 
+
+    /*! This is used in the documentation of a file as a header before the
      *  list of typedefs
      */
     virtual QCString trTypedefs()
     { return "Tyyppimäärittelyt"; } // "Typedefs"
-    
-    /*! This is used in the documentation of a file as a header before the 
+
+    /*! This is used in the documentation of a file as a header before the
      *  list of enumerations
      */
     virtual QCString trEnumerations()
     { return "Luettelotyypit"; } // "Enumerations"
-    
-    /*! This is used in the documentation of a file as a header before the 
+
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) functions
      */
     virtual QCString trFunctions()
     { return "Funktiot"; } // "Functions"
-    
-    /*! This is used in the documentation of a file as a header before the 
+
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) variables
      */
     virtual QCString trVariables()
     { return "Muuttujat"; } // "Variables"
-    
-    /*! This is used in the documentation of a file as a header before the 
+
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) variables
      */
     virtual QCString trEnumerationValues()
@@ -525,38 +519,38 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
      */
     virtual QCString trDefineDocumentation()
     { return "Määritysten dokumentointi"; } // "Define Documentation"
-    
-    /*! This is used in the documentation of a file/namespace before the list 
+
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for function prototypes
      */
     virtual QCString trFunctionPrototypeDocumentation()
     { return "Funktioprototyyppien dokumentaatio"; } // "Function Prototype Documentation"
-    
-    /*! This is used in the documentation of a file/namespace before the list 
+
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for typedefs
      */
     virtual QCString trTypedefDocumentation()
     { return "Tyyppimääritysten dokumentaatio"; } // "Typedef Documentation"
-    
-    /*! This is used in the documentation of a file/namespace before the list 
+
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for enumeration types
      */
     virtual QCString trEnumerationTypeDocumentation()
     { return "Luettelotyyppien dokumentaatio"; } // "Enumeration Type Documentation"
-    
-    /*! This is used in the documentation of a file/namespace before the list 
+
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for functions
      */
     virtual QCString trFunctionDocumentation()
     { return "Funktioiden dokumentaatio"; } // "Function Documentation"
-    
-    /*! This is used in the documentation of a file/namespace before the list 
+
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for variables
      */
     virtual QCString trVariableDocumentation()
     { return "Muuttujien dokumentaatio"; } // "Variable Documentation"
-    
-    /*! This is used in the documentation of a file/namespace/group before 
+
+    /*! This is used in the documentation of a file/namespace/group before
      *  the list of links to documented compounds
      */
     virtual QCString trCompounds()
@@ -570,12 +564,12 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
         return "Luokat"; // "Classes"
       }
     }
-    
-    /*! This is used in the standard footer of each page and indicates when 
-     *  the page was generated 
+
+    /*! 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)
-    { 
+    {
         // funktio on hiukan vaikea kääntää prepositioihin sidotun rakenteen vuoksi.
         // Muutetaan siis lauserakennetta suomalaisemmaksi
         // Generated on $date for $project by:
@@ -601,47 +595,47 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
     /*! this text is generated when the \\internal command is used. */
     virtual QCString trForInternalUseOnly()
     { return "Vain sisäiseen käyttöön."; } // "For internal use only."
-    
+
     /*! this text is generated when the \\warning command is used. */
     virtual QCString trWarning()
     { return "Varoitus"; } // "Warning"
-    
+
     /*! this text is generated when the \\version command is used. */
     virtual QCString trVersion()
     { return "Versio"; } // "Version"
-    
+
     /*! this text is generated when the \\date command is used. */
     virtual QCString trDate()
     { return "Päiväys"; } // "Date"
-    
+
     /*! this text is generated when the \\return command is used. */
     virtual QCString trReturns()
     { return "Palauttaa"; } // "Returns"
-    
+
     /*! this text is generated when the \\sa command is used. */
     virtual QCString trSeeAlso()
     { return "Katso myös"; } // "See also"
-    
+
     /*! this text is generated when the \\param command is used. */
     virtual QCString trParameters()
     { return "Parametrit"; } // "Parameters"
-    
+
     /*! this text is generated when the \\exception command is used. */
     virtual QCString trExceptions()
     { return "Poikkeukset"; } // "Exceptions"
-    
+
     /*! this text is used in the title page of a LaTeX document. */
     virtual QCString trGeneratedBy()
     { return "Generoinut"; } // "Generated by"
-    
+
 //////////////////////////////////////////////////////////////////////////
-// new since 0.49-990307 
+// new since 0.49-990307
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! used as the title of page containing all the index of all namespaces. */
     virtual QCString trNamespaceList()
     { return "Nimiavaruus Lista"; } // "Namespace List"
-    
+
     /*! used as an introduction to the namespace list */
     virtual QCString trNamespaceListDescription(bool extractAll)
     {
@@ -650,7 +644,7 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
       result+="nimiavaruuksista lyhyen selitteen kanssa:"; // "namespaces with brief descriptions:"
       return result;
     }
-    
+
     /*! used in the class documentation as a header before the list of all
      *  friends of a class
      */
@@ -660,13 +654,13 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990405
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! used in the class documentation as a header before the list of all
-     * related classes 
+     * related classes
      */
     virtual QCString trRelatedFunctionDocumentation()
     { return "Ystävät ja niihin liittyvien funktioiden dokumentaatio"; } // "Friends And Related Function Documentation"
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990425
 //////////////////////////////////////////////////////////////////////////
@@ -700,7 +694,7 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
       result+=" tiedostoreferenssi"; // " File Reference"
       return result;
     }
-    
+
     /*! used as the title of the HTML page of a namespace */
     virtual QCString trNamespaceReference(const char *namespaceName)
     {
@@ -708,7 +702,7 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
       result+=" nimiavaruusreferenssi"; // " Namespace Reference"
       return result;
     }
-    
+
     virtual QCString trPublicMembers()
     { return "Julkiset jäsenfunktiot"; } // "Public Member Functions"
     virtual QCString trPublicSlots()
@@ -738,23 +732,23 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
       QCString result;
       int i;
       // the inherits list contain `numEntries' classes
-      for (i=0;i<numEntries;i++) 
+      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 
+        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 
+          if (i<numEntries-2) // not the fore last entry
             result+=", ";
           else                // the fore last entry
             result+=" ja "; // ", and "
         }
       }
-      return result; 
+      return result;
     }
-    
+
     /*! used in class documentation to produce a list of base classes,
      *  if class diagrams are disabled.
      */
@@ -762,7 +756,7 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
     {
       return (QCString)"Periytyy "+(numEntries > 1 ? "luokista " : "luokasta ")+trWriteList(numEntries)+"."; // "Inherits "
     }
-    
+
     /*! used in class documentation to produce a list of super classes,
      *  if class diagrams are disabled.
      */
@@ -770,15 +764,15 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
     {
       return (QCString)"Periytetään "+(numEntries > 1 ? "luokissa " : "luokassa ")+trWriteList(numEntries)+"."; // "Inherited by "
     }
-    
-    /*! used in member documentation blocks to produce a list of 
+
+    /*! used in member documentation blocks to produce a list of
      *  members that are hidden by this one.
      */
     virtual QCString trReimplementedFromList(int numEntries)
     {
       return (QCString)"Uudelleentoteuttaa "+(numEntries > 1 ? "luokat " : "luokan  ")+trWriteList(numEntries)+"."; // "Reimplemented from "
     }
-    
+
     /*! used in member documentation blocks to produce a list of
      *  all member that overwrite the implementation of this member.
      */
@@ -790,25 +784,25 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
     /*! This is put above each page as a link to all members of namespaces. */
     virtual QCString trNamespaceMembers()
     { return "Nimiavaruuden jäsenet"; } // "Namespace Members"
-    
+
     /*! This is an introduction to the page with all namespace members */
     virtual QCString trNamespaceMemberDescription(bool extractAll)
-    { 
+    {
       QCString result="Tässä on lista kaikista "; // "Here is a list of all "
       if (!extractAll) result+="dokumentoiduista "; // "documented "
       result+="nimiavaruuden jäsenistä linkitettynä "; // "namespace members with links to "
-      if (extractAll) 
+      if (extractAll)
         result+="nimiavaruuden dokumentaatioon johon ne kuuluvat:"; // "the namespace documentation for each member:";
-      else 
+      else
         result+="nimiavaruuksiin joihin ne kuuluvat:"; // "the namespaces they belong to:"
       return result;
     }
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      *  index of all namespaces.
-     */ 
+     */
     virtual QCString trNamespaceIndex()
     { return "Nimiavaruuksien luettelo"; } // "Namespace Index"
-    
+
     /*! This is used in LaTeX as the title of the chapter containing
      *  the documentation of all namespaces.
      */
@@ -872,7 +866,7 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
     virtual QCString trMainPage()
     { return "Pääsivu"; } // "Main Page"
 
-    /*! This is used in references to page that are put in the LaTeX 
+    /*! 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()
@@ -974,7 +968,7 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
 //////////////////////////////////////////////////////////////////////////
 // new since 1.1.0
 //////////////////////////////////////////////////////////////////////////
-    
+
     virtual QCString trNote()
     {
         // FIXME: Missähän merkityksessä tätä käytetään?
@@ -1067,7 +1061,7 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
         // FIXME: Missä merkityksessä tätä käytetään?
       return "Lähtien"; // "Since"
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.1.5
 //////////////////////////////////////////////////////////////////////////
@@ -1077,12 +1071,12 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
     {
       return "Kaavion selite"; // "Graph Legend"
     }
-    /*! page explaining how the dot graph's should be interpreted 
+    /*! 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 
+      return
         "Tämä sivu selittää, kuinka doxygenin luomia kaavioita tulkitaan.<p>\n"
         // "This page explains how to interpret the graphs that are generated "
         // "by doxygen.<p>\n"
@@ -1194,11 +1188,11 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
     {
       return "selite"; // "legend"
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.2.0
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! Used as a marker that is put before a test item */
     virtual QCString trTest()
     {
@@ -1276,11 +1270,11 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
     {
       return "Arvo:"; // "Value:"
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.2.5
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! Used as a marker that is put before a \\bug item */
     virtual QCString trBug()
     {
@@ -1296,9 +1290,9 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
 // new since 1.2.6
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as ansicpg for RTF file 
-     * 
-     * The following table shows the correlation of Charset name, Charset Value and 
+    /*! 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
@@ -1319,15 +1313,15 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
      * GB2313_CHARSET          134 (x86)             936
      * CHINESEBIG5_CHARSET     136 (x88)             950
      * </pre>
-     * 
+     *
      */
     virtual QCString trRTFansicp()
     {
       return "1252";
     }
-    
 
-    /*! Used as ansicpg for RTF fcharset 
+
+    /*! Used as ansicpg for RTF fcharset
      *  \see trRTFansicp() for a table of possible values.
      */
     virtual QCString trRTFCharSet()
@@ -1340,82 +1334,82 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
     {
       return "Hakemisto"; // "Index"
     }
-   
+
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  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 ? "Luokka" : "luokka")); // "Class" / "class"
       if (!singular)  result=(first_capital ? "Luokat" : "luokat"); // "+es" -> "Classes" / "classes"
-      return result; 
+      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 
+     *  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 ? "Tiedosto" : "tiedosto")); // "File" / "file"
       if (!singular)  result+="t"; // "+s" -> "Files" / "files"
-      return result; 
+      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 
+     *  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 ? "Nimiavaruus" : "nimiavaruus")); // "Namespace" / "namespace"
       if (!singular)  result=(first_capital ? "Nimiavaruudet" : "nimiavaruudet"); // "+s"
-      return result; 
+      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 
+     *  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 ? "Ryhmä" : "ryhmä")); // "Group" / "group"
       if (!singular)  result+="t"; // "+s"
-      return result; 
+      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 
+     *  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 ? "Sivu" : "sivu")); // "Page" / "page"
       if (!singular)  result+="t"; // "+s"
-      return result; 
+      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 
+     *  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 ? "Jäsen" : "jäsen")); // "Member" / "member"
       if (!singular)  result+="et"; // "+s"
-      return result; 
+      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 
+     *  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 ? "Globaali" : "globaali")); // "Global" / "global"
       if (!singular)  result+="t"; // "+s"
-      return result; 
+      return result;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1425,10 +1419,10 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
     /*! 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 ? "Tekijä" : "tekijä")); // "Author" / "author"
       if (!singular)  result+="t"; // "+s"
-      return result; 
+      return result;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1446,7 +1440,7 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
 // new since 1.2.13
 //////////////////////////////////////////////////////////////////////////
 
-    /*! used in member documentation blocks to produce a list of 
+    /*! used in member documentation blocks to produce a list of
      *  members that are implemented by this one.
      */
     virtual QCString trImplementedFromList(int numEntries)
@@ -1478,8 +1472,8 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
 // new since 1.2.17
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as the header of the list of item that have been 
-     *  flagged deprecated 
+    /*! Used as the header of the list of item that have been
+     *  flagged deprecated
      */
     virtual QCString trDeprecatedList()
     {
@@ -1490,7 +1484,7 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
 // new since 1.2.18
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as a header for declaration section of the events found in 
+    /*! Used as a header for declaration section of the events found in
      * a C# program
      */
     virtual QCString trEvents()
@@ -1510,43 +1504,43 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
     /*! Used as a heading for a list of Java class types with package scope.
      */
     virtual QCString trPackageTypes()
-    { 
+    {
       return "Paketin tyypit"; // "Package Types"
     }
-    /*! Used as a heading for a list of Java class functions with package 
-     * scope. 
+    /*! Used as a heading for a list of Java class functions with package
+     * scope.
      */
     virtual QCString trPackageMembers()
-    { 
+    {
       return "Paketin funktiot"; // "Package Functions"
     }
-    /*! Used as a heading for a list of static Java class functions with 
+    /*! Used as a heading for a list of static Java class functions with
      *  package scope.
      */
     virtual QCString trStaticPackageMembers()
-    { 
+    {
       return "Paketin staattiset funktiot"; // "Static Package Functions"
     }
-    /*! Used as a heading for a list of Java class variables with package 
+    /*! Used as a heading for a list of Java class variables with package
      * scope.
      */
     virtual QCString trPackageAttribs()
-    { 
+    {
       return "Paketin attribuutit"; // "Package Attributes"
     }
-    /*! Used as a heading for a list of static Java class variables with 
+    /*! Used as a heading for a list of static Java class variables with
      * package scope.
      */
     virtual QCString trStaticPackageAttribs()
-    { 
+    {
       return "Paketin staattiset attribuutit"; // "Static Package Attributes"
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.3.1
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used in the quick index of a class/file/namespace member list page 
+    /*! Used in the quick index of a class/file/namespace member list page
      *  to link to the unfiltered list of all members.
      */
     virtual QCString trAll()
@@ -1563,9 +1557,9 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
 // new since 1.3.3
 //////////////////////////////////////////////////////////////////////////
 
-    /*! When the search engine is enabled this text is put in the header 
-     *  of each page before the field where one can enter the text to search 
-     *  for. 
+    /*! When the search engine is enabled this text is put in the header
+     *  of each page before the field where one can enter the text to search
+     *  for.
      */
     virtual QCString trSearchForIndex()
     {
@@ -1582,7 +1576,7 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
      *  text can be different depending on the number of documents found.
      *  Inside the text you can put the special marker $num to insert
      *  the number representing the actual number of search results.
-     *  The @a numDocuments parameter can be either 0, 1 or 2, where the 
+     *  The @a numDocuments parameter can be either 0, 1 or 2, where the
      *  value 2 represents 2 or more matches. HTML markup is allowed inside
      *  the returned string.
      */
@@ -1596,13 +1590,13 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
       {
         return "Löytyi <b>1</b> dokumentti, joka vastasi hakuasi."; // "Found <b>1</b> document matching your query.";
       }
-      else 
+      else
       {
         return "Löytyi <b>$num</b> dokumenttia, jotka vastasivat hakuasi. " // "Found <b>$num</b> documents matching your query. "
                 "Parhaat tulokset näytetään ensin."; // "Showing best matches first."
       }
     }
-    /*! This string is put before the list of matched words, for each search 
+    /*! This string is put before the list of matched words, for each search
      *  result. What follows is the list of words that matched the query.
      */
     virtual QCString trSearchMatches()
@@ -1643,7 +1637,7 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
     virtual QCString trDirectories()
     { return "Hakemistot"; } // "Directories"
 
-    /*! This returns a sentences that introduces the directory hierarchy. 
+    /*! This returns a sentences that introduces the directory hierarchy.
      *  and the fact that it is sorted alphabetically per level
      */
     virtual QCString trDirDescription()
@@ -1663,10 +1657,10 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
      *  (\a first_capital) and in sigular or plural form (\a singular).
      */
     virtual QCString trDir(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Hakemisto" : "hakemisto")); // "Director" / "director"
       if (singular) result+=""; else result+="t"; // "+y" / "+ies"
-      return result; 
+      return result;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1696,7 +1690,7 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
       return "Tässä on kutsukaavio tälle funktiolle:"; // "Here is the caller graph for this function:"
     }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for enumeration values
      */
     virtual QCString trEnumerationValueDocumentation()
@@ -1705,12 +1699,12 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
 //////////////////////////////////////////////////////////////////////////
 // new since 1.5.4 (mainly for Fortran)
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! header that is put before the list of member subprograms (Fortran). */
     virtual QCString trMemberFunctionDocumentationFortran()
     { return "Jäsenfunktioiden/aliohjelmien dokumentaatio"; } // "Member Function/Subroutine Documentation"
 
-    /*! This is put above each page as a link to the list of annotated data types (Fortran). */    
+    /*! This is put above each page as a link to the list of annotated data types (Fortran). */
     virtual QCString trCompoundListFortran()
     { return "Tietotyyppien lista"; } // "Data Types List"
 
@@ -1732,18 +1726,18 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
       }
       result+="tietotyyppien jäsenistä"; // "data types members"
       result+=", sekä linkit "; // " with links to "
-      if (!extractAll) 
+      if (!extractAll)
       {
          result+="tietueen dokumentaatioon jokaiselle jäsenelle"; // "the data structure documentation for each member"
       }
-      else 
+      else
       {
          result+="tietotyyppeihin, joihin ne kuuluvat:"; // "the data types they belong to:"
       }
       return result;
     }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * annotated compound index (Fortran).
      */
     virtual QCString trCompoundIndexFortran()
@@ -1755,24 +1749,24 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
     virtual QCString trTypeDocumentation()
     { return "Tietotyyppien dokumentaatio"; } // "Data Type Documentation"
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) subprograms (Fortran).
      */
     virtual QCString trSubprograms()
     { return "Funktiot/aliohjelmat"; } // "Functions/Subroutines"
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for subprograms (Fortran)
      */
     virtual QCString trSubprogramDocumentation()
     { return "Funktioiden/aliohjelmien dokumentaatio"; } // "Function/Subroutine Documentation"
 
-    /*! This is used in the documentation of a file/namespace/group before 
+    /*! This is used in the documentation of a file/namespace/group before
      *  the list of links to documented compounds (Fortran)
      */
      virtual QCString trDataTypes()
     { return "Tietotyypit"; } // "Data Types"
-    
+
     /*! used as the title of page containing all the index of all modules (Fortran). */
     virtual QCString trModulesList()
     { return "Moduulilista"; } // "Modules List"
@@ -1814,43 +1808,43 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
       result+=" moduulin referenssi"; // " Module Reference"
       return result;
     }
-    
+
     /*! This is put above each page as a link to all members of modules. (Fortran) */
     virtual QCString trModulesMembers()
     { return "Moduulin jäsenet"; } // "Module Members"
 
     /*! This is an introduction to the page with all modules members (Fortran) */
     virtual QCString trModulesMemberDescription(bool extractAll)
-    { 
+    {
       QCString result="Tässä on lista moduulin kaikista "; // "Here is a list of all "
       if (!extractAll) result+="dokumentoiduista"; // "documented "
       result+="jäsenistä, sekä linkit "; // "module members with links to "
-      if (extractAll) 
+      if (extractAll)
       {
         result+="moduulin dokumentaatioon jokaiselle jäsenelle:"; // "the module documentation for each member:"
       }
-      else 
+      else
       {
         result+="moduuleihin, joihin ne kuuluvat:"; // "the modules they belong to:"
       }
       return result;
     }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      *  index of all modules (Fortran).
      */
     virtual QCString trModulesIndex()
     { return "Moduulien hakemisto"; } // "Modules Index"
-    
+
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trModule(bool first_capital, bool singular)
-    {       
+    {
       QCString result((first_capital ? "Moduuli" : "moduuli")); // "Module" / "module"
       if (!singular)  result+="t"; // "+s"
-      return result; 
+      return result;
     }
     /*! This is put at the bottom of a module documentation page and is
      *  followed by a list of files that were used to generate the page.
@@ -1876,24 +1870,24 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
       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 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trType(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Tyyppi" : "tyyppi")); // "Type" / "type"
       if (!singular)  result=(first_capital ? "Tyypit" : "tyypit"); // "+s"
-      return result; 
+      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 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trSubprogram(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Aliohjelma" : "aliohjelma")); // "Subprogram" / "subprogram"
       if (!singular)  result+="t"; // "+s"
-      return result; 
+      return result;
     }
 
     /*! C# Type Constraint list */
diff --git a/src/translator_fr.h b/src/translator_fr.h
index 87bc874..3c1005b 100644
--- a/src/translator_fr.h
+++ b/src/translator_fr.h
@@ -134,13 +134,6 @@ class TranslatorFrench : public Translator
          return "\\usepackage[french]{babel}\n";
       }
 
-    /*! return the language charset. This will be used
-        when transcoding the translatable strings in this file to UTF-8 */
-       virtual QCString idLanguageCharset()
-      {
-         return "utf-8";
-      }
-
     // --- Language translation methods -------------------
 
     /*! used in the compound documentation before a list of related functions. */
diff --git a/src/translator_gr.h b/src/translator_gr.h
index 3b6aaf4..f837907 100644
--- a/src/translator_gr.h
+++ b/src/translator_gr.h
@@ -47,12 +47,6 @@ class TranslatorGreek : public TranslatorAdapter_1_8_4
       return "\\usepackage[greek,english]{babel}\n";
     }
 
-    /*! return the language charset. This will be used for the HTML output */
-    virtual QCString idLanguageCharset()
-    {
-        return "utf-8";
-    }
-
     // --- Language translation methods -------------------
 
     /*! used in the compound documentation before a list of related functions. */
diff --git a/src/translator_hr.h b/src/translator_hr.h
index bb124dd..7d37740 100644
--- a/src/translator_hr.h
+++ b/src/translator_hr.h
@@ -1,12 +1,12 @@
 /******************************************************************************
  *
- * 
+ *
  *
  * Copyright (C) 1997-2013 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 
+ * 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.
  *
@@ -17,7 +17,7 @@
 // translation by Boris Bralo <boris.bralo@gmail.com>
 // Updates:
 // --------
-// 2000/08/20 
+// 2000/08/20
 //  - Better handling of ISO-8859-2/ WIN 1250 stuff based on (actually stolen from :-)) Czech translations
 //    implemented by Petr Prikryl (prikrylp@skil.cz).
 //    As opposed to Czech translation this one assumes that Doxygen strings are written in Linux ( it's true,
@@ -27,7 +27,7 @@
 // - Added strings from 1.2.1
 // - Removed unneeeded decode() calls
 // - Changed some CS terminology
-// 
+//
 // 2001/01/22
 // - Added strings from 1.2.4
 //
@@ -40,9 +40,9 @@
 // - Method latexBabelPackage() removed, ude latexLanguageSupportCommand
 //
 // 2001/11/13
-// - inherits from Translator 
+// - inherits from Translator
 // - Added strings for 1.2.11
-// - better output for C documentation (trCompoundMembersDescription(), trClassDocumentation()) 
+// - better output for C documentation (trCompoundMembersDescription(), trClassDocumentation())
 //
 // 2001/11/13
 // - Added strings for 1.2.13
@@ -71,29 +71,25 @@
 // 2009/01/09
 // - Updated trLegendDocs
 //
-// 2010/03/04 
+// 2010/03/04
 // - Updates for "new since 1.6.0 (mainly for the new search engine)".
 // - UTF-8
 // - removed decode()
 //
-// 2010/05/27 
-// - Updates for 1.6.3 
-// 2012/04/12 
-// - Updates for 1.8.0 
+// 2010/05/27
+// - Updates for 1.6.3
+// 2012/04/12
+// - Updates for 1.8.0
 #ifndef TRANSLATOR_HR_H
 #define TRANSLATOR_HR_H
 
 class TranslatorCroatian : public TranslatorAdapter_1_8_2
 {
   private:
-  
+
   public:
     QCString idLanguage()
     { return "croatian"; }
-    QCString idLanguageCharset()
-    {
-        return "utf-8";
-    }
     QCString latexLanguageSupportCommand()
     { return "\\usepackage[croatian]{babel}\n"; }
     QCString trRelatedFunctions()
@@ -121,9 +117,9 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2
     QCString trIncludingInheritedMembers()
     { return ", uključujući naslijeđene članove."; }
     QCString trGeneratedAutomatically(const char *s)
-    { QCString result="napravljeno automatski Doxygen-om"; 
+    { QCString result="napravljeno automatski Doxygen-om";
       if (s) result+=(QCString)" za "+s;
-      result+=" iz programskog koda."; 
+      result+=" iz programskog koda.";
       return result;
     }
     QCString trEnumName()
@@ -144,7 +140,7 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2
 		}
 		else
 		{
-			return "Sve klase"; 
+			return "Sve klase";
 		}
 	}
     QCString trFileList()
@@ -152,9 +148,9 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2
     QCString trCompoundMembers()
 	{
 		if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
-			return "Svi članovi struktura"; 
+			return "Svi članovi struktura";
 		else
-			return "Svi članovi klasa"; 
+			return "Svi članovi klasa";
 	}
     QCString trFileMembers()
     { return "članovi klasa u datoteci"; }
@@ -177,7 +173,7 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2
     }
     QCString trCompoundListDescription()
     { return "Popis svih klasa, unija i struktura "
-		  "s kratkim opisom :"; 
+		  "s kratkim opisom :";
     }
     QCString trCompoundMembersDescription(bool extractAll)
     {
@@ -189,7 +185,7 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2
 		  result+="članova klasa s linkovima na ";
 	  else
 		  result+="članova struktura s linkovima na ";
-		  
+
       if (!extractAll)
 	  {
 		  result+="dokumentaciju svakog člana:";
@@ -231,7 +227,7 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2
     QCString trCompoundIndex()
     {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
-      { 
+      {
         return "Kazalo struktura podataka";
       }
       else
@@ -239,7 +235,7 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2
 		return "Skupno kazalo ";
       }
 	}
-    QCString trFileIndex() 
+    QCString trFileIndex()
     { return "Kazalo datoteka"; }
     QCString trModuleDocumentation()
     { return "Dokumentacija modula"; }
@@ -247,7 +243,7 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2
     {
 		if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
 		{
-			return "Dokumentacija struktura podataka"; 
+			return "Dokumentacija struktura podataka";
 		}
 		else
 		{
@@ -292,7 +288,7 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2
     QCString trCompounds()
     { return "Strukture"; }
     QCString trGeneratedAt(const char *date,const char *projName)
-    { 
+    {
       QCString result=(QCString)"Napravljeno "+date;
       if (projName) result+=(QCString)" projekt: "+projName;
       result+=" generator: ";
@@ -324,11 +320,11 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2
     { return "Iznimke"; }
     QCString trGeneratedBy()
     { return "Generirao"; }
-    
+
 //////////////////////////////////////////////////////////////////////////
-// new since 0.49-990307 
+// new since 0.49-990307
 //////////////////////////////////////////////////////////////////////////
-    
+
     QCString trNamespaceList()
     { return "Popis imenika"; }
     QCString trNamespaceListDescription(bool extractAll)
@@ -344,10 +340,10 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990405
 //////////////////////////////////////////////////////////////////////////
-    
+
     QCString trRelatedFunctionDocumentation()
     { return "Dokumentacija povezanih funkcija"; }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990425
 //////////////////////////////////////////////////////////////////////////
@@ -364,8 +360,8 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2
         case ClassDef::Struct: result+=" strukture "; break;
         case ClassDef::Union:  result+=" unije "; break;
         case ClassDef::Interface:  result+=" sučelja (interface) "; break;
-        case ClassDef::Protocol:   result+=" protokola "; break; 
-        case ClassDef::Category:   result+=" kategorije "; break; 
+        case ClassDef::Protocol:   result+=" protokola "; break;
+        case ClassDef::Category:   result+=" kategorije "; break;
         case ClassDef::Exception:  result+=" iznimke (exception) "; break;
         default: break;
       }
@@ -375,7 +371,7 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2
     QCString trFileReference(const char *fileName)
       // used as the title of the HTML page of a file
     {
-      QCString result="Opis datoteke "; 
+      QCString result="Opis datoteke ";
           result+=fileName;
           return result;
     }
@@ -384,11 +380,11 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2
     {
       QCString result ="Opis imenika ";
           result+=namespaceName;
-      
+
       return result;
     }
-    
-    // these are for the member sections of a class, struct or union 
+
+    // these are for the member sections of a class, struct or union
     QCString trPublicMembers()
     { return "Public članovi"; }
     QCString trPublicSlots()
@@ -409,8 +405,8 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2
     { return "Privatni slotovi"; }
     QCString trStaticPrivateMembers()
     { return "Statični privatni članovi"; }
-    // end of member sections 
-    
+    // end of member sections
+
     QCString trWriteList(int numEntries)
     {
       // this function is used to produce a comma-separated list of items.
@@ -418,23 +414,23 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2
       QCString result;
       int i;
       // the inherits list contain `numEntries' classes
-      for (i=0;i<numEntries;i++) 
+      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 
+        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 
+          if (i<numEntries-2) // not the fore last entry
             result+=", ";
           else                // the fore last entry
             result+="";
         }
       }
-      return result; 
+      return result;
     }
-    
+
     QCString trInheritsList(int numEntries)
       // used in class documentation to produce a list of base classes,
       // if class diagrams are disabled.
@@ -448,7 +444,7 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2
       return "Naslijeđena u "+trWriteList(numEntries)+".";
     }
     QCString trReimplementedFromList(int numEntries)
-      // used in member documentation blocks to produce a list of 
+      // used in member documentation blocks to produce a list of
       // members that are hidden by this one.
     {
       return "Reimplementirano od  "+trWriteList(numEntries)+".";
@@ -465,18 +461,18 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2
     { return "članovi imenika"; }
     QCString trNamespaceMemberDescription(bool extractAll)
       // This is an introduction to the page with all namespace members
-    { 
+    {
       QCString result="Lista svih ";
       if (!extractAll) result+="dokumentiranih ";
       result+="članova imenika s linkovima na ";
-      if (extractAll) 
+      if (extractAll)
         result+="imeničku dokumentaciju svakog člana:";
-      else 
+      else
         result+="imenike kojima pripadaju:";
       return result;
     }
     QCString trNamespaceIndex()
-      // This is used in LaTeX as the title of the chapter with the 
+      // This is used in LaTeX as the title of the chapter with the
       // index of all namespaces.
     { return "Kazalo imenika"; }
     QCString trNamespaceDocumentation()
@@ -514,8 +510,8 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2
         case ClassDef::Struct:     result+="strukture"; break;
         case ClassDef::Union:      result+="unije"; break;
         case ClassDef::Interface:  result+="sučelja (interface)"; break;
-        case ClassDef::Protocol:   result+="protokola"; break; 
-        case ClassDef::Category:   result+="kategorije"; break; 
+        case ClassDef::Protocol:   result+="protokola"; break;
+        case ClassDef::Category:   result+="kategorije"; break;
         case ClassDef::Exception:  result+="iznimke (exception)"; break;
         default: break;
       }
@@ -542,7 +538,7 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2
     QCString trMainPage()
     { return "Glavna stranica"; }
 
-    /*! This is used in references to page that are put in the LaTeX 
+    /*! 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()
@@ -587,7 +583,7 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2
     /*! header that is put before the list of constructor/destructors. */
     QCString trConstructorDocumentation()
     {
-      return "Dokumentacija konstruktora i destruktora "; 
+      return "Dokumentacija konstruktora i destruktora ";
     }
     /*! Used in the file documentation to point to the corresponding sources. */
     QCString trGotoSourceCode()
@@ -644,7 +640,7 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2
 //////////////////////////////////////////////////////////////////////////
 // new since 1.1.0
 //////////////////////////////////////////////////////////////////////////
-    
+
     QCString trNote()
     {
       return "Primjedba";
@@ -738,7 +734,7 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2
     /*! page explaining how the dot graph's should be interpreted */
     virtual QCString trLegendDocs()
     {
-      return 
+      return
         "Ova stranica objašnjava kako interpretirati grafikone koje je generirao "
         "doxygen.<p>\n"
         "Na primjer:\n"
@@ -803,7 +799,7 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2
 //////////////////////////////////////////////////////////////////////////
 // new since 1.2.0
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! Used as a marker that is put before a test item */
     virtual QCString trTest()
     {
@@ -877,7 +873,7 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2
 //////////////////////////////////////////////////////////////////////////
 // new since 1.2.5
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! Used as a marker that is put before a \\bug item */
     virtual QCString trBug()
     {
@@ -907,89 +903,89 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2
     {
       return "Sadržaj";
     }
-   
+
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  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 ? "Klas" : "klas"));
       result+= (singular ? "a" : "e");
-      return result; 
+      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 
+     *  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"));
       result+= (singular ? "a" : "e");
-      return result; 
+      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 
+     *  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;
 		if (singular)
 			result = ((first_capital ? "Imenik" : "imenik"));
 		else
 			result = ((first_capital ? "Imenici" : "imenici"));
-      return result; 
+      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 
+     *  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 ? "Grup" : "grup"));
       result+= (singular ? "a" : "e");
-      return result; 
+      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 
+     *  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 ? "Stranic" : "stranic"));
       result+= (singular ? "a" : "e");
-      return result; 
+      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 
+     *  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 ? "član" : "član"));
       if (!singular)  result+="ovi";
-      return result; 
+      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 
+     *  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 ? "G" : "g"));
 	  if( singular )
 		  result += "lobalna varijabla";
 	  else
 		  result += "lobalne varijable";
 
-	  return result; 
+	  return result;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -999,10 +995,10 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2
     /*! 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 ? "Autor" : "autor"));
       if (!singular)  result+="i";
-      return result; 
+      return result;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1019,7 +1015,7 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2
 // new since 1.2.13
 //////////////////////////////////////////////////////////////////////////
 
-    /*! used in member documentation blocks to produce a list of 
+    /*! used in member documentation blocks to produce a list of
      *  members that are implemented by this one.
      */
     virtual QCString trImplementedFromList(int numEntries)
@@ -1049,8 +1045,8 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2
 // new since 1.2.17
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as the header of the list of item that have been 
-     *  flagged deprecated 
+    /*! Used as the header of the list of item that have been
+     *  flagged deprecated
      */
     virtual QCString trDeprecatedList()
     {
@@ -1060,7 +1056,7 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2
 // new since 1.2.18
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as a header for declaration section of the events found in 
+    /*! Used as a header for declaration section of the events found in
      * a C# program
      */
     virtual QCString trEvents()
@@ -1079,42 +1075,42 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2
     /*! Used as a heading for a list of Java class types with package scope.
      */
     virtual QCString trPackageTypes()
-    { 
+    {
       return "Tipovi u paketu";
     }
-    /*! Used as a heading for a list of Java class functions with package 
-     * scope. 
+    /*! Used as a heading for a list of Java class functions with package
+     * scope.
      */
     virtual QCString trPackageMembers()
-    { 
+    {
       return "Funkcije u paketu";
     }
-    /*! Used as a heading for a list of static Java class functions with 
+    /*! Used as a heading for a list of static Java class functions with
      *  package scope.
      */
     virtual QCString trStaticPackageMembers()
-    { 
+    {
       return "Statičke funkcije u paketu";
     }
-    /*! Used as a heading for a list of Java class variables with package 
+    /*! Used as a heading for a list of Java class variables with package
      * scope.
      */
     virtual QCString trPackageAttribs()
-    { 
+    {
       return "Atributi u paketu";
     }
-    /*! Used as a heading for a list of static Java class variables with 
+    /*! Used as a heading for a list of static Java class variables with
      * package scope.
      */
     virtual QCString trStaticPackageAttribs()
-    { 
+    {
       return "Statički atributi u paketu";
     }
 	//////////////////////////////////////////////////////////////////////////
 	// new since 1.3.1
 	//////////////////////////////////////////////////////////////////////////
 
-	/*! Used in the quick index of a class/file/namespace member list page 
+	/*! Used in the quick index of a class/file/namespace member list page
 	*  to link to the unfiltered list of all members.
 	*/
 	virtual QCString trAll()
@@ -1131,9 +1127,9 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2
 	// new since 1.3.3
 	//////////////////////////////////////////////////////////////////////////
 
-	/*! When the search engine is enabled this text is put in the header 
-	*  of each page before the field where one can enter the text to search 
-	*  for. 
+	/*! When the search engine is enabled this text is put in the header
+	*  of each page before the field where one can enter the text to search
+	*  for.
 	*/
 	virtual QCString trSearchForIndex()
 	{
@@ -1150,7 +1146,7 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2
 	*  text can be different depending on the number of documents found.
 	*  Inside the text you can put the special marker $num to insert
 	*  the number representing the actual number of search results.
-	*  The @a numDocuments parameter can be either 0, 1 or 2, where the 
+	*  The @a numDocuments parameter can be either 0, 1 or 2, where the
 	*  value 2 represents 2 or more matches. HTML markup is allowed inside
 	*  the returned string.
 	*/
@@ -1164,20 +1160,20 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2
 		{
 			return "Nađen <b>1</b> dokument koji odgovara vašem upitu.";
 		}
-		else if (numDocuments<5) 
+		else if (numDocuments<5)
 		{
-			// Croatian (AFAIK all Slavic languages except Macedonian and Bulgarian) 
-            // have different plural form for 2,3,4. 
+			// Croatian (AFAIK all Slavic languages except Macedonian and Bulgarian)
+            // have different plural form for 2,3,4.
 			return "Nađena <b>$num</b> dokumenta koji odgovaraju vašem upitu."
 				"Najbolji su prikazani prvi.";
 		}
-		else 
+		else
 		{
 			return "Nađeno <b>$num</b> dokumenata koji odgovaraju vašem upitu."
 				"Najbolji su prikazani prvi.";
 		}
 	}
-	/*! This string is put before the list of matched words, for each search 
+	/*! This string is put before the list of matched words, for each search
 	*  result. What follows is the list of words that matched the query.
 	*/
 	virtual QCString trSearchMatches()
@@ -1218,7 +1214,7 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2
     virtual QCString trDirectories()
     { return "Direktoriji"; }
 
-    /*! This returns a sentences that introduces the directory hierarchy. 
+    /*! This returns a sentences that introduces the directory hierarchy.
      *  and the fact that it is sorted alphabetically per level
      */
     virtual QCString trDirDescription()
@@ -1234,10 +1230,10 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2
      *  (\a first_capital) and in sigular or plural form (\a singular).
      */
     virtual QCString trDir(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Direktorij" : "direktorij"));
-      if (!singular) result+="i"; 
-      return result; 
+      if (!singular) result+="i";
+      return result;
     }
 //////////////////////////////////////////////////////////////////////////
 // new since 1.4.1
@@ -1263,7 +1259,7 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2
       return "Ovo je graf funkcija koje pozivaju ovu funkciju:";
     }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for enumeration values
      */
     virtual QCString trEnumerationValueDocumentation()
@@ -1276,7 +1272,7 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2
     virtual QCString trMemberFunctionDocumentationFortran()
     { return "Dokumentacija member funkcija/subrutina"; }
 
-    /*! This is put above each page as a link to the list of annotated data types (Fortran). */    
+    /*! This is put above each page as a link to the list of annotated data types (Fortran). */
     virtual QCString trCompoundListFortran()
     { return "Lista tipova podataka"; }
 
@@ -1298,18 +1294,18 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2
       }
       result+="polja";
       result+=" s linkovima na ";
-      if (!extractAll) 
+      if (!extractAll)
       {
         result+="dokumentaciju struktura podataka za svako polje";
       }
-      else 
+      else
       {
         result+="strukture kojima pripadaju:";
       }
       return result;
     }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
     * annotated compound index (Fortran).
     */
     virtual QCString trCompoundIndexFortran()
@@ -1321,19 +1317,19 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2
     virtual QCString trTypeDocumentation()
     { return "Dokumentacija tipova podataka"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
     *  list of (global) subprograms (Fortran).
     */
     virtual QCString trSubprograms()
     { return "Funkcije/Subrutine"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
     *  of documentation blocks for subprograms (Fortran)
     */
     virtual QCString trSubprogramDocumentation()
     { return "Documentacija funkcija/subrutina"; }
 
-    /*! This is used in the documentation of a file/namespace/group before 
+    /*! This is used in the documentation of a file/namespace/group before
     *  the list of links to documented compounds (Fortran)
     */
     virtual QCString trDataTypes()
@@ -1377,7 +1373,7 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2
     virtual QCString trModuleReference(const char *namespaceName)
     {
       QCString result=namespaceName;
-      result+=" - Sadržaj modula";        
+      result+=" - Sadržaj modula";
       return result;
     }
 
@@ -1387,36 +1383,36 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2
 
     /*! This is an introduction to the page with all modules members (Fortran) */
     virtual QCString trModulesMemberDescription(bool extractAll)
-    { 
+    {
       QCString result="Lista svih ";
       if (!extractAll) result+="dokumentiranih ";
       result+="članova modula s linkovima na ";
-      if (extractAll) 
+      if (extractAll)
       {
         result+="dokumentaciju modula za svaki član:";
       }
-      else 
+      else
       {
         result+="modul kojem pripadaju:";
       }
       return result;
     }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
     *  index of all modules (Fortran).
     */
     virtual QCString trModulesIndex()
     { return "Kazalo modula"; }
 
     /*! This is used for translation of the word that will possibly
-    *  be followed by a single name or by a list of names 
+    *  be followed by a single name or by a list of names
     *  of the category.
     */
     virtual QCString trModule(bool first_capital, bool singular)
-    {       
+    {
       QCString result((first_capital ? "Modul" : "modul"));
       if (!singular)  result+="i";
-      return result; 
+      return result;
     }
     /*! This is put at the bottom of a module documentation page and is
     *  followed by a list of files that were used to generate the page.
@@ -1441,24 +1437,24 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2
       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 
+    *  be followed by a single name or by a list of names
     *  of the category.
     */
     virtual QCString trType(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Tip" : "tip"));
       if (!singular)  result+="ovi";
-      return result; 
+      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 
+    *  be followed by a single name or by a list of names
     *  of the category.
     */
     virtual QCString trSubprogram(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Subprogram" : "subprogram"));
       if (!singular)  result+="i";
-      return result; 
+      return result;
     }
 
     /*! C# Type Constraint list */
@@ -1528,7 +1524,7 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2
       return (QCString)"Uključuje datotake u "+name;
     }
 
-    /** Compiles a date string. 
+    /** Compiles a date string.
      *  @param year Year in 4 digits
      *  @param month Month of the year: 1=January
      *  @param day Day of the Month: 1..31
@@ -1602,8 +1598,8 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2
     virtual QCString trInheritedFrom(const char *members,const char *what)
     { return QCString(members)+" naslijeđeni od "+what; }
 
-    /*! Header of the sections with inherited members specific for the 
-     *  base class(es) 
+    /*! Header of the sections with inherited members specific for the
+     *  base class(es)
      */
     virtual QCString trAdditionalInheritedMembers()
     { return "Dodatni naslijeđeni članovi"; }
diff --git a/src/translator_hu.h b/src/translator_hu.h
index d9f485b..29a38b0 100644
--- a/src/translator_hu.h
+++ b/src/translator_hu.h
@@ -58,12 +58,6 @@ class TranslatorHungarian : public TranslatorAdapter_1_4_6
              "\\usepackage[magyar]{babel}\n";
     }
 
-    /*! 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. */
diff --git a/src/translator_id.h b/src/translator_id.h
index bcf0efc..bd2eda5 100644
--- a/src/translator_id.h
+++ b/src/translator_id.h
@@ -58,12 +58,6 @@ class TranslatorIndonesian : public TranslatorAdapter_1_8_0
       return "\\usepackage[bahasa]{babel}";
     }
 
-    /*! return the language charset. This will be used for the HTML output */
-    virtual QCString idLanguageCharset()
-    {
-      return "utf-8";
-    }
-
     // --- Language translation methods -------------------
 
     /*! used in the compound documentation before a list of related functions. */
diff --git a/src/translator_it.h b/src/translator_it.h
index db8bd81..0741188 100644
--- a/src/translator_it.h
+++ b/src/translator_it.h
@@ -108,12 +108,6 @@ class TranslatorItalian : public TranslatorAdapter_1_8_2
       return "\\usepackage[italian]{babel}\n";
     }
 
-    /*! return the language charset. This will be used for the HTML output */
-    virtual QCString idLanguageCharset()
-    {
-      return "UTF-8";
-    }
-
     // --- Language translation methods -------------------
 
     /*! used in the compound documentation before a list of related functions. */
@@ -1507,7 +1501,7 @@ class TranslatorItalian : public TranslatorAdapter_1_8_2
     virtual QCString trDirectories()
     { return "Directory"; }
 
-    /*! This returns a sentences that introduces the directory hierarchy. 
+    /*! This returns a sentences that introduces the directory hierarchy.
      *  and the fact that it is sorted alphabetically per level
      */
     virtual QCString trDirDescription()
@@ -1554,7 +1548,7 @@ class TranslatorItalian : public TranslatorAdapter_1_8_2
       return "Questo è il grafo dei chiamanti di questa funzione:";
     }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for enumeration values
      */
     virtual QCString trEnumerationValueDocumentation()
@@ -1563,12 +1557,12 @@ class TranslatorItalian : public TranslatorAdapter_1_8_2
 //////////////////////////////////////////////////////////////////////////
 // new since 1.5.4 (mainly for Fortran)
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! header that is put before the list of member subprograms (Fortran). */
     virtual QCString trMemberFunctionDocumentationFortran()
     { return "Documentazione delle funzioni membro/subroutine"; }
 
-    /*! This is put above each page as a link to the list of annotated data types (Fortran). */    
+    /*! This is put above each page as a link to the list of annotated data types (Fortran). */
     virtual QCString trCompoundListFortran()
     { return "Elenco dei tipi di dato"; }
 
@@ -1589,18 +1583,18 @@ class TranslatorItalian : public TranslatorAdapter_1_8_2
         result+="documentati ";
       }
       result+="dei tipi di dato con collegamenti ";
-      if (!extractAll) 
+      if (!extractAll)
       {
          result+="alla documentazione della struttura dati per ciascun membro:";
       }
-      else 
+      else
       {
          result+="ai tipi dato a cui appartengono:";
       }
       return result;
     }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * annotated compound index (Fortran).
      */
     virtual QCString trCompoundIndexFortran()
@@ -1612,24 +1606,24 @@ class TranslatorItalian : public TranslatorAdapter_1_8_2
     virtual QCString trTypeDocumentation()
     { return "Documentazione dei tipi dato"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) subprograms (Fortran).
      */
     virtual QCString trSubprograms()
     { return "Funzioni/Subroutine"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for subprograms (Fortran)
      */
     virtual QCString trSubprogramDocumentation()
     { return "Documentazione funzioni/subroutine"; }
 
-    /*! This is used in the documentation of a file/namespace/group before 
+    /*! This is used in the documentation of a file/namespace/group before
      *  the list of links to documented compounds (Fortran)
      */
      virtual QCString trDataTypes()
     { return "Tipi di dato"; }
-    
+
     /*! used as the title of page containing all the index of all modules (Fortran). */
     virtual QCString trModulesList()
     { return "Elenco dei moduli"; }
@@ -1669,47 +1663,47 @@ class TranslatorItalian : public TranslatorAdapter_1_8_2
     virtual QCString trModuleReference(const char *namespaceName)
     {
       QCString result="Riferimenti per il modulo ";
-      result+=namespaceName;        
+      result+=namespaceName;
       return result;
     }
-    
+
     /*! This is put above each page as a link to all members of modules. (Fortran) */
     virtual QCString trModulesMembers()
     { return "Membri del modulo"; }
 
     /*! This is an introduction to the page with all modules members (Fortran) */
     virtual QCString trModulesMemberDescription(bool extractAll)
-    { 
+    {
       QCString result="Questo è un elenco di tutti i membri dei moduli ";
       if (!extractAll) result+="documentati ";
       result+="con collegamenti ";
-      if (extractAll) 
+      if (extractAll)
       {
         result+="alla documentazione del modulo per ciascun membro:";
       }
-      else 
+      else
       {
         result+="al modulo a cui appartengono:";
       }
       return result;
     }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      *  index of all modules (Fortran).
      */
     virtual QCString trModulesIndex()
     { return "Indice dei moduli"; }
-    
+
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trModule(bool first_capital, bool singular)
-    {       
+    {
       QCString result((first_capital ? "Modul" : "modul"));
       if (singular) result+="o";
       else result+="i";
-      return result; 
+      return result;
     }
     /*! This is put at the bottom of a module documentation page and is
      *  followed by a list of files that were used to generate the page.
@@ -1735,26 +1729,26 @@ class TranslatorItalian : public TranslatorAdapter_1_8_2
       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 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trType(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Tip" : "tip"));
       if (singular) result+="o";
       else result+="i";
-      return result; 
+      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 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trSubprogram(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Sottoprogramm" : "sottoprogramm"));
       if (singular) result+="a";
       else result+="i";
-      return result; 
+      return result;
     }
 
     /*! C# Type Contraint list */
@@ -1901,8 +1895,8 @@ class TranslatorItalian : public TranslatorAdapter_1_8_2
     virtual QCString trInheritedFrom(const char *members,const char *what)
     { return QCString(members)+" ereditati da "+what; }
 
-    /*! Header of the sections with inherited members specific for the 
-     *  base class(es) 
+    /*! Header of the sections with inherited members specific for the
+     *  base class(es)
      */
     virtual QCString trAdditionalInheritedMembers()
     { return "Altri membri ereditati"; }
diff --git a/src/translator_je.h b/src/translator_je.h
index a3195fa..894452a 100644
--- a/src/translator_je.h
+++ b/src/translator_je.h
@@ -35,13 +35,8 @@ class TranslatorJapaneseEn : public TranslatorEnglish
     virtual QCString idLanguage()
     { return "japanese-en"; }
     virtual QCString latexLanguageSupportCommand()
-      {
-	return "platex";
-      }
-    /*! returns the name of the package that is included by LaTeX */
-    virtual QCString idLanguageCharset()
     {
-        return "utf-8";
+      return "platex";
     }
     virtual QCString trRTFansicp()
     {
diff --git a/src/translator_jp.h b/src/translator_jp.h
index 8e973cf..e25828e 100644
--- a/src/translator_jp.h
+++ b/src/translator_jp.h
@@ -37,15 +37,11 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
   public:
     virtual QCString idLanguage()
     { return "japanese"; }
+
     virtual QCString latexLanguageSupportCommand()
     {
       return "";
     }
-    /*! returns the name of the package that is included by LaTeX */
-    virtual QCString idLanguageCharset()
-    {
-        return "utf-8";
-    }
 
     /*! used in the compound documentation before a list of related functions. */
     virtual QCString trRelatedFunctions()
diff --git a/src/translator_ke.h b/src/translator_ke.h
index 437e426..357465d 100644
--- a/src/translator_ke.h
+++ b/src/translator_ke.h
@@ -34,13 +34,8 @@ class TranslatorKoreanEn : public TranslatorEnglish
     virtual QCString idLanguage()
     { return "korean-en"; }
     virtual QCString latexLanguageSupportCommand()
-      {
-	return "\\usepackage{hfont}\n";
-      }
-    /*! returns the name of the package that is included by LaTeX */
-    virtual QCString idLanguageCharset()
     {
-      return "utf-8";
+      return "\\usepackage{hfont}\n";
     }
     virtual QCString trRTFansicp()
     {
diff --git a/src/translator_kr.h b/src/translator_kr.h
index 6de6044..467e832 100644
--- a/src/translator_kr.h
+++ b/src/translator_kr.h
@@ -89,12 +89,6 @@ class TranslatorKorean : public Translator
       return "\\usepackage{hfont}\n";
     }
 
-    /*! return the language charset. This will be used for the HTML output */
-    virtual QCString idLanguageCharset()
-    {
-      return "utf-8";
-    }
-
     // --- Language translation methods -------------------
 
     /*! used in the compound documentation before a list of related functions. */
diff --git a/src/translator_lt.h b/src/translator_lt.h
index 20b262f..aaa6691 100644
--- a/src/translator_lt.h
+++ b/src/translator_lt.h
@@ -65,12 +65,6 @@ class TranslatorLithuanian : public TranslatorAdapter_1_4_6
              "\\usepackage[lithuanian]{babel}\n";
     }
 
-    /*! return the language charset. This will be used for the HTML output */
-    virtual QCString idLanguageCharset()
-    {
-      return "utf-8";
-    }
-
     // --- Language translation methods -------------------
 
     /*! used in the compound documentation before a list of related functions. */
diff --git a/src/translator_lv.h b/src/translator_lv.h
index 55cdf3b..1193ea4 100644
--- a/src/translator_lv.h
+++ b/src/translator_lv.h
@@ -80,13 +80,6 @@ class TranslatorLatvian : public Translator
              "\\usepackage[latvian]{babel}\n";
     }
 
-    /*! return the language charset. This will be used
-        when transcoding the translatable strings in this file to UTF-8 */
-    virtual QCString idLanguageCharset()
-    {
-      return "utf-8";
-    }
-
     // --- Language translation methods -------------------
 
     /*! used in the compound documentation before a list of related functions. */
diff --git a/src/translator_mk.h b/src/translator_mk.h
index e190241..3cf7bf6 100644
--- a/src/translator_mk.h
+++ b/src/translator_mk.h
@@ -1,12 +1,12 @@
 /******************************************************************************
  *
- * 
+ *
  *
  * Copyright (C) 1997-2013 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 
+ * 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.
  *
@@ -21,7 +21,7 @@
 //
 // Updates:
 // --------
-// 2007/12/09 
+// 2007/12/09
 //  - Initial translation to Macedonian.
 //
 // 2008/05/22
@@ -37,19 +37,19 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0
   public:
 
     // --- Language control methods -------------------
-    
-    /*! Used for identification of the language. The identification 
-     * should not be translated. It should be replaced by the name 
+
+    /*! 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 should be equal to 
+     * (e.g. "czech", "japanese", "russian", etc.). It should be equal to
      * the identification used in language.cpp.
      */
     virtual QCString idLanguage()
     { return "macedonian"; }
-    
-    /*! Used to get the LaTeX command(s) for the language support. 
+
+    /*! 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 
+     *  LaTeX to the desired language.  For example
      *  <pre>"\\usepackage[german]{babel}\n"
      *  </pre>
      *  or
@@ -57,7 +57,7 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0
      *  "\\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.
      */
@@ -66,12 +66,6 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0
       return "\\usepackage[macedonian]{babel}\n";
     }
 
-    /*! return the language charset. This will be used for the HTML output */
-    virtual QCString idLanguageCharset()
-    {
-      return "UTF-8";
-    }
-
     // --- Language translation methods -------------------
 
     /*! used in the compound documentation before a list of related functions. */
@@ -89,26 +83,26 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0
     /*! header that is put before the list of typedefs. */
     virtual QCString trMemberTypedefDocumentation()
     { return "Документација на членови дефиниции на тип"; }
-    
+
     /*! header that is put before the list of enumerations. */
     virtual QCString trMemberEnumerationDocumentation()
     { return "Документација на набројани членови"; }
-    
+
     /*! header that is put before the list of member functions. */
     virtual QCString trMemberFunctionDocumentation()
     { return "Документација на функции членови"; }
-    
+
     /*! header that is put before the list of member attributes. */
     virtual QCString trMemberDataDocumentation()
-    { 
+    {
       //if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Документација на членови"; 
-      }      
+        return "Документација на членови";
+      }
     }
 
     /*! this is the text of a link put after brief descriptions. */
-    virtual QCString trMore() 
+    virtual QCString trMore()
     { return "Повеќе..."; }
 
     /*! put in the class documentation */
@@ -126,44 +120,44 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0
     /*! this is the remainder of the sentence after the class name */
     virtual QCString trIncludingInheritedMembers()
     { return ", вклучувајќи ги сите наследени членови."; }
-    
+
     /*! 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="Автоматски создадено од Doxygen";
       if (s) result+=(QCString)" за "+s;
-      result+=" изворниот код."; 
+      result+=" изворниот код.";
       return result;
     }
 
     /*! put after an enum name in the list of all members */
     virtual QCString trEnumName()
     { return "име на набројан член"; }
-    
+
     /*! put after an enum value in the list of all members */
     virtual QCString trEnumValue()
     { return "вредност на набројан член"; }
-    
+
     /*! put after an undocumented member in the list of all members */
     virtual QCString trDefinedIn()
     { return "дефиниран во"; }
 
     // quick reference sections
 
-    /*! This is put above each page as a link to the list of all groups of 
+    /*! 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 "Модули"; }
-    
+
     /*! This is put above each page as a link to the class hierarchy */
     virtual QCString trClassHierarchy()
     { return "Стебло на класи"; }
-    
+
     /*! This is put above each page as a link to the list of annotated classes */
     virtual QCString trCompoundList()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
         return "Список на Структури";
@@ -173,34 +167,34 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0
         return "Список на Класи";
       }
     }
-    
+
     /*! This is put above each page as a link to the list of documented files */
     virtual QCString trFileList()
     { return "Список на Датотеки"; }
 
     /*! 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 "Членови"; 
+        return "Членови";
       }
       else
       {
-        return "Членови на Класата"; 
+        return "Членови на Класата";
       }
     }
 
     /*! This is put above each page as a link to all members of files. */
     virtual QCString trFileMembers()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Глобални Членови"; 
+        return "Глобални Членови";
       }
       else
       {
-        return "Членови на Датотеката"; 
+        return "Членови на Датотеката";
       }
     }
 
@@ -232,16 +226,16 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0
 
     /*! This is an introduction to the annotated compound list. */
     virtual QCString trCompoundListDescription()
-    { 
-      
+    {
+
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Список на структури со кратки описи:"; 
+        return "Список на структури со кратки описи:";
       }
       else
       {
         return "Список на класи, структури, унии и интерфејси "
-               "со кратки описи:"; 
+               "со кратки описи:";
       }
     }
 
@@ -262,7 +256,7 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0
         result+="членови на класата";
       }
       result+=" со врски до ";
-      if (!extractAll) 
+      if (!extractAll)
       {
         if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
         {
@@ -273,7 +267,7 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0
           result+="документацијата на секој член на класата:";
         }
       }
-      else 
+      else
       {
         if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
         {
@@ -292,7 +286,7 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0
     {
       QCString result="Список на сите ";
       if (!extractAll) result+="документирани ";
-      
+
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
         result+="функции, променливи, дефиниции, набројувања и дефиниции на тип";
@@ -302,9 +296,9 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0
         result+="членови на датотеки";
       }
       result+=" со врски до ";
-      if (extractAll) 
+      if (extractAll)
         result+="датотеките на кои што припаѓаат:";
-      else 
+      else
         result+="документацијата:";
       return result;
     }
@@ -321,43 +315,43 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0
     virtual QCString trModulesDescription()
     { return "Список на сите модули:"; }
 
-    // index titles (the project name is prepended for these) 
+    // index titles (the project name is prepended for these)
 
     /*! This is used in HTML as the title of index.html. */
     virtual QCString trDocumentation()
     { return "Документација"; }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * index of all groups.
      */
     virtual QCString trModuleIndex()
     { return "Попис на Модули"; }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * class hierarchy.
      */
     virtual QCString trHierarchicalIndex()
     { return "Попис на Стебло"; }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * annotated compound index.
      */
     virtual QCString trCompoundIndex()
     {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
-      { 
+      {
         return "Попис на Структури";
       }
       else
       {
-        return "Попис на Класи"; 
+        return "Попис на Класи";
       }
     }
 
     /*! This is used in LaTeX as the title of the chapter with the
      * list of all files.
      */
-    virtual QCString trFileIndex() 
+    virtual QCString trFileIndex()
     { return "Попис на Датотеки"; }
 
     /*! This is used in LaTeX as the title of the chapter containing
@@ -370,14 +364,14 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0
      *  the documentation of all classes, structs and unions.
      */
     virtual QCString trClassDocumentation()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Документација на Структури"; 
+        return "Документација на Структури";
       }
       else
       {
-        return "Документација на Класи"; 
+        return "Документација на Класи";
       }
     }
 
@@ -402,105 +396,105 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0
     /*! This is used in LaTeX as the title of the document */
     virtual QCString trReferenceManual()
     { return "Прирачник"; }
-    
-    /*! This is used in the documentation of a file as a header before the 
+
+    /*! This is used in the documentation of a file as a header before the
      *  list of defines
      */
     virtual QCString trDefines()
     { return "Дефинирања"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of function prototypes
      */
     virtual QCString trFuncProtos()
     { return "Прототипи на Функции"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of typedefs
      */
     virtual QCString trTypedefs()
     { return "Дефиниции на Тип"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of enumerations
      */
     virtual QCString trEnumerations()
     { return "Набројувања"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) functions
      */
     virtual QCString trFunctions()
     { return "Функции"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) variables
      */
     virtual QCString trVariables()
     { return "Променливи"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) variables
      */
     virtual QCString trEnumerationValues()
     { return "Вредности на Набројувањата"; }
-    
+
     /*! This is used in the documentation of a file before the list of
      *  documentation blocks for defines
      */
     virtual QCString trDefineDocumentation()
     { return "Документција на Дефиниции"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for function prototypes
      */
     virtual QCString trFunctionPrototypeDocumentation()
     { return "Документација на Прототип на Функции"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for typedefs
      */
     virtual QCString trTypedefDocumentation()
     { return "Документација на Дефиниции на Тип"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for enumeration types
      */
     virtual QCString trEnumerationTypeDocumentation()
     { return "Документација на Набројувања"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for functions
      */
     virtual QCString trFunctionDocumentation()
     { return "Документација на Функции"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for variables
      */
     virtual QCString trVariableDocumentation()
     { return "Документација на Променливи"; }
 
-    /*! This is used in the documentation of a file/namespace/group before 
+    /*! This is used in the documentation of a file/namespace/group before
      *  the list of links to documented compounds
      */
     virtual QCString trCompounds()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Структури"; 
+        return "Структури";
       }
       else
       {
-        return "Класи"; 
+        return "Класи";
       }
     }
 
-    /*! This is used in the standard footer of each page and indicates when 
-     *  the page was generated 
+    /*! 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)"Создадено на "+date;
       if (projName) result+=(QCString)" за "+projName;
       result+=(QCString)" од";
@@ -518,7 +512,7 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0
     {
       return (QCString)"Диаграм на наследување за "+clName+":";
     }
-    
+
     /*! this text is generated when the \\internal command is used. */
     virtual QCString trForInternalUseOnly()
     { return "Само за интерна употреба."; }
@@ -550,7 +544,7 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0
     /*! this text is generated when the \\exception command is used. */
     virtual QCString trExceptions()
     { return "Исклучоци"; }
-    
+
     /*! this text is used in the title page of a LaTeX document. */
     virtual QCString trGeneratedBy()
     { return "Создадено од"; }
@@ -558,7 +552,7 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990307
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! used as the title of page containing all the index of all namespaces. */
     virtual QCString trNamespaceList()
     { return "Список на Имиња на Простор"; }
@@ -577,17 +571,17 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0
      */
     virtual QCString trFriends()
     { return "Пријатели"; }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990405
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! used in the class documentation as a header before the list of all
-     * related classes 
+     * related classes
      */
     virtual QCString trRelatedFunctionDocumentation()
     { return "Документација на Пријатели и Поврзани Функции"; }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990425
 //////////////////////////////////////////////////////////////////////////
@@ -618,7 +612,7 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0
     virtual QCString trFileReference(const char *fileName)
     {
       QCString result = "Опис на Датотекaта ";
-      result += fileName; 
+      result += fileName;
       return result;
     }
 
@@ -629,7 +623,7 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0
       result += namespaceName;
       return result;
     }
-    
+
     virtual QCString trPublicMembers()
     { return "Јавни Функции Членови"; }
     virtual QCString trPublicSlots()
@@ -650,7 +644,7 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0
     { return "Приватни Слотови"; }
     virtual QCString trStaticPrivateMembers()
     { return "Статични Приватни Функции Членови"; }
-    
+
     /*! this function is used to produce a comma-separated list of items.
      *  use generateMarker(i) to indicate where item i should be put.
      */
@@ -659,23 +653,23 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0
       QCString result;
       int i;
       // the inherits list contain `numEntries' classes
-      for (i=0;i<numEntries;i++) 
+      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 
+        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 
+          if (i<numEntries-2) // not the fore last entry
             result+=", ";
           else                // the fore last entry
             result+=" и ";
         }
       }
-      return result; 
+      return result;
     }
-    
+
     /*! used in class documentation to produce a list of base classes,
      *  if class diagrams are disabled.
      */
@@ -692,7 +686,7 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0
       return "Наследено од "+trWriteList(numEntries)+".";
     }
 
-    /*! used in member documentation blocks to produce a list of 
+    /*! used in member documentation blocks to produce a list of
      *  members that are hidden by this one.
      */
     virtual QCString trReimplementedFromList(int numEntries)
@@ -714,17 +708,17 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0
 
     /*! This is an introduction to the page with all namespace members */
     virtual QCString trNamespaceMemberDescription(bool extractAll)
-    { 
+    {
       QCString result="Список на сите ";
       if (!extractAll) result+="документирани ";
       result+="членови на името на простор со врски до ";
-      if (extractAll) 
+      if (extractAll)
         result+="документацијата на секој член:";
-      else 
+      else
         result+="името на простор на кое што му припаѓаат:";
       return result;
     }
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      *  index of all namespaces.
      */
     virtual QCString trNamespaceIndex()
@@ -793,7 +787,7 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0
     virtual QCString trMainPage()
     { return "Главна Страна"; }
 
-    /*! This is used in references to page that are put in the LaTeX 
+    /*! 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()
@@ -838,7 +832,7 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0
     /*! header that is put before the list of constructor/destructors. */
     virtual QCString trConstructorDocumentation()
     {
-      return "Документација на Конструктор и Деструктор"; 
+      return "Документација на Конструктор и Деструктор";
     }
     /*! Used in the file documentation to point to the corresponding sources. */
     virtual QCString trGotoSourceCode()
@@ -895,7 +889,7 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0
 //////////////////////////////////////////////////////////////////////////
 // new since 1.1.0
 //////////////////////////////////////////////////////////////////////////
-    
+
     virtual QCString trNote()
     {
       return "Забелешка";
@@ -984,7 +978,7 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0
     {
       return "Од";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.1.5
 //////////////////////////////////////////////////////////////////////////
@@ -994,12 +988,12 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0
     {
       return "Легенда на Дијаграмот";
     }
-    /*! page explaining how the dot graph's should be interpreted 
+    /*! 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 
+      return
         "Оваа страна објаснува како да ги толкувате дијаграмите создадени"
         " од doxygen.<p>\n"
         "На пример:\n"
@@ -1063,11 +1057,11 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0
     {
       return "Легенда";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.2.0
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! Used as a marker that is put before a test item */
     virtual QCString trTest()
     {
@@ -1145,11 +1139,11 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0
     {
       return "Вредност:";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.2.5
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! Used as a marker that is put before a \\bug item */
     virtual QCString trBug()
     {
@@ -1165,9 +1159,9 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0
 // new since 1.2.6
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as ansicpg for RTF file 
-     * 
-     * The following table shows the correlation of Charset name, Charset Value and 
+    /*! 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
@@ -1188,15 +1182,15 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0
      * GB2313_CHARSET          134 (x86)             936
      * CHINESEBIG5_CHARSET     136 (x88)             950
      * </pre>
-     * 
+     *
      */
     virtual QCString trRTFansicp()
     {
       return "1251";
     }
-    
 
-    /*! Used as ansicpg for RTF fcharset 
+
+    /*! Used as ansicpg for RTF fcharset
      *  \see trRTFansicp() for a table of possible values.
      */
     virtual QCString trRTFCharSet()
@@ -1209,82 +1203,82 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0
     {
       return "Попис";
     }
-   
+
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  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 ? "Клас" : "клас"));
       result += (singular ? "а" : "и");
-      return result; 
+      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 
+     *  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 ? "Датотек" : "датотек"));
       result += (singular ? "а" : "и");
-      return result; 
+      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 
+     *  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 ? "Им" : "им"));      
+    {
+      QCString result((first_capital ? "Им" : "им"));
       result += (singular ? "е на простор" : "иња на простори");
-      return result; 
+      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 
+     *  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 ? "Груп" : "груп"));
       result += (singular ? "а" : "и");
-      return result; 
+      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 
+     *  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 ? "Стран" : "стран"));
       result += (singular ? "а" : "и");
-      return result; 
+      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 
+     *  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 ? "Член" : "член"));
       if (!singular)  result+="ови";
-      return result; 
+      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 
+     *  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 ? "Глобал" : "глобал"));
       result += (singular ? "ен" : "ни");
-      return result; 
+      return result;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1294,10 +1288,10 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0
     /*! 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 ? "Автор" : "автор"));
       if (!singular)  result+="и";
-      return result; 
+      return result;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1315,7 +1309,7 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0
 // new since 1.2.13
 //////////////////////////////////////////////////////////////////////////
 
-    /*! used in member documentation blocks to produce a list of 
+    /*! used in member documentation blocks to produce a list of
      *  members that are implemented by this one.
      */
     virtual QCString trImplementedFromList(int numEntries)
@@ -1347,8 +1341,8 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0
 // new since 1.2.17
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as the header of the list of item that have been 
-     *  flagged deprecated 
+    /*! Used as the header of the list of item that have been
+     *  flagged deprecated
      */
     virtual QCString trDeprecatedList()
     {
@@ -1359,7 +1353,7 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0
 // new since 1.2.18
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as a header for declaration section of the events found in 
+    /*! Used as a header for declaration section of the events found in
      * a C# program
      */
     virtual QCString trEvents()
@@ -1379,43 +1373,43 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0
     /*! Used as a heading for a list of Java class types with package scope.
      */
     virtual QCString trPackageTypes()
-    { 
+    {
       return "Типови во Пакетот";
     }
-    /*! Used as a heading for a list of Java class functions with package 
-     * scope. 
+    /*! Used as a heading for a list of Java class functions with package
+     * scope.
      */
     virtual QCString trPackageMembers()
-    { 
+    {
       return "Функции во Пакетот";
     }
-    /*! Used as a heading for a list of static Java class functions with 
+    /*! Used as a heading for a list of static Java class functions with
      *  package scope.
      */
     virtual QCString trStaticPackageMembers()
-    { 
+    {
       return "Статични Функции во Пакетот";
     }
-    /*! Used as a heading for a list of Java class variables with package 
+    /*! Used as a heading for a list of Java class variables with package
      * scope.
      */
     virtual QCString trPackageAttribs()
-    { 
+    {
       return "Членови во Пакетот";
     }
-    /*! Used as a heading for a list of static Java class variables with 
+    /*! Used as a heading for a list of static Java class variables with
      * package scope.
      */
     virtual QCString trStaticPackageAttribs()
-    { 
+    {
       return "Статични Членови во Пакетот";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.3.1
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used in the quick index of a class/file/namespace member list page 
+    /*! Used in the quick index of a class/file/namespace member list page
      *  to link to the unfiltered list of all members.
      */
     virtual QCString trAll()
@@ -1432,9 +1426,9 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0
 // new since 1.3.3
 //////////////////////////////////////////////////////////////////////////
 
-    /*! When the search engine is enabled this text is put in the header 
-     *  of each page before the field where one can enter the text to search 
-     *  for. 
+    /*! When the search engine is enabled this text is put in the header
+     *  of each page before the field where one can enter the text to search
+     *  for.
      */
     virtual QCString trSearchForIndex()
     {
@@ -1451,7 +1445,7 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0
      *  text can be different depending on the number of documents found.
      *  Inside the text you can put the special marker $num to insert
      *  the number representing the actual number of search results.
-     *  The @a numDocuments parameter can be either 0, 1 or 2, where the 
+     *  The @a numDocuments parameter can be either 0, 1 or 2, where the
      *  value 2 represents 2 or more matches. HTML markup is allowed inside
      *  the returned string.
      */
@@ -1465,13 +1459,13 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0
       {
         return "Пронајден <b>1</b> документ кој се поклопува со вашето барање.";
       }
-      else 
+      else
       {
         return "Пронајдени <b>$num</b> документи кои се поклопуваат со вашето барање."
                "Најдобро поклопените документи се прикажани први.";
       }
     }
-    /*! This string is put before the list of matched words, for each search 
+    /*! This string is put before the list of matched words, for each search
      *  result. What follows is the list of words that matched the query.
      */
     virtual QCString trSearchMatches()
@@ -1512,7 +1506,7 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0
     virtual QCString trDirectories()
     { return "Именици"; }
 
-    /*! This returns a sentences that introduces the directory hierarchy. 
+    /*! This returns a sentences that introduces the directory hierarchy.
      *  and the fact that it is sorted alphabetically per level
      */
     virtual QCString trDirDescription()
@@ -1528,10 +1522,10 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0
      *  (\a first_capital) and in sigular or plural form (\a singular).
      */
     virtual QCString trDir(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Имени" : "имени"));
       if (singular) result+="к"; else result+="ци";
-      return result; 
+      return result;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1557,7 +1551,7 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0
       return "Ова е графот на повикување за оваа фунција:";
     }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for enumeration values
      */
     virtual QCString trEnumerationValueDocumentation()
@@ -1566,12 +1560,12 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0
 //////////////////////////////////////////////////////////////////////////
 // new since 1.5.4 (mainly for Fortran)
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! header that is put before the list of member subprograms (Fortran). */
     virtual QCString trMemberFunctionDocumentationFortran()
     { return "Документација на функции/процедури членови"; }
 
-    /*! This is put above each page as a link to the list of annotated data types (Fortran). */    
+    /*! This is put above each page as a link to the list of annotated data types (Fortran). */
     virtual QCString trCompoundListFortran()
     { return "Список на Типови"; }
 
@@ -1593,18 +1587,18 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0
       }
       result+="членови на типови";
       result+=" со врски до ";
-      if (!extractAll) 
+      if (!extractAll)
       {
          result+="документацијата за секој член:";
       }
-      else 
+      else
       {
          result+="типовите на кои што припаѓаат:";
       }
       return result;
     }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * annotated compound index (Fortran).
      */
     virtual QCString trCompoundIndexFortran()
@@ -1616,24 +1610,24 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0
     virtual QCString trTypeDocumentation()
     { return "Документација на Типови"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) subprograms (Fortran).
      */
     virtual QCString trSubprograms()
     { return "Функции/Процедури"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for subprograms (Fortran)
      */
     virtual QCString trSubprogramDocumentation()
     { return "Документација на Функции/Процедури"; }
 
-    /*! This is used in the documentation of a file/namespace/group before 
+    /*! This is used in the documentation of a file/namespace/group before
      *  the list of links to documented compounds (Fortran)
      */
      virtual QCString trDataTypes()
     { return "Типови"; }
-    
+
     /*! used as the title of page containing all the index of all modules (Fortran). */
     virtual QCString trModulesList()
     { return "Попис на Модули"; }
@@ -1671,46 +1665,46 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0
     virtual QCString trModuleReference(const char *namespaceName)
     {
       QCString result=namespaceName;
-      result+=" - Содржина на Модул";        
+      result+=" - Содржина на Модул";
       return result;
     }
-    
+
     /*! This is put above each page as a link to all members of modules. (Fortran) */
     virtual QCString trModulesMembers()
     { return "Членови на Модул"; }
 
     /*! This is an introduction to the page with all modules members (Fortran) */
     virtual QCString trModulesMemberDescription(bool extractAll)
-    { 
+    {
       QCString result="Список на сите ";
       if (!extractAll) result+="документирани ";
       result+="членови на модулот со врски до ";
-      if (extractAll) 
+      if (extractAll)
       {
         result+="документацијата за секој член:";
       }
-      else 
+      else
       {
         result+="модулите на кои што припаѓаат:";
       }
       return result;
     }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      *  index of all modules (Fortran).
      */
     virtual QCString trModulesIndex()
     { return "Попис на Модули"; }
-    
+
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trModule(bool first_capital, bool singular)
-    {       
+    {
       QCString result((first_capital ? "Модул" : "модул"));
       if (!singular)  result+="и";
-      return result; 
+      return result;
     }
     /*! This is put at the bottom of a module documentation page and is
      *  followed by a list of files that were used to generate the page.
@@ -1736,29 +1730,29 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0
       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 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trType(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Тип" : "тип"));
       if (!singular)  result+="ови";
-      return result; 
+      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 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trSubprogram(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Потпрограм" : "потпрограм"));
       if (singular){
 		result+="а";
       }else{
       	result+="и";
       }
-      
-      return result; 
+
+      return result;
     }
 
     /*! C# Type Constraint list */
diff --git a/src/translator_nl.h b/src/translator_nl.h
index 405d712..ab16f8f 100644
--- a/src/translator_nl.h
+++ b/src/translator_nl.h
@@ -1,12 +1,12 @@
 /******************************************************************************
  *
- * 
+ *
  *
  * Copyright (C) 1997-2013 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 
+ * 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.
  *
@@ -23,9 +23,9 @@ class TranslatorDutch : public Translator
   public:
     QCString idLanguage()
     { return "dutch"; }
-    /*! Used to get the LaTeX command(s) for the language support. 
+    /*! 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 
+     *  LaTeX to the desired language.  For example
      *  <pre>"\\usepackage[german]{babel}\n"
      *  </pre>
      *  or
@@ -38,12 +38,6 @@ class TranslatorDutch : public Translator
     {
       return "\\usepackage[dutch]{babel}\n";
     }
-    /*! return the language charset. This will be used for the HTML output */
-    QCString idLanguageCharset()
-    {
-      return "iso-8859-1";
-    }
-
     QCString trRelatedFunctions()
     { return "Gerelateerde functies"; }
     QCString trRelatedSubscript()
@@ -69,9 +63,9 @@ class TranslatorDutch : public Translator
     QCString trIncludingInheritedMembers()
     { return ", inclusief alle overge&euml;rfde members."; }
     QCString trGeneratedAutomatically(const char *s)
-    { QCString result="Automatisch gegenereerd door Doxygen"; 
+    { QCString result="Automatisch gegenereerd door Doxygen";
       if (s) result+=(QCString)" voor "+s;
-      result+=" uit de programmatekst."; 
+      result+=" uit de programmatekst.";
       return result;
     }
     QCString trEnumName()
@@ -111,7 +105,7 @@ class TranslatorDutch : public Translator
     }
     QCString trCompoundListDescription()
     { return "Hieronder volgen de klassen, structs en "
-             "unions met voor elk een korte beschrijving:"; 
+             "unions met voor elk een korte beschrijving:";
     }
     QCString trCompoundMembersDescription(bool extractAll)
     {
@@ -146,7 +140,7 @@ class TranslatorDutch : public Translator
     { return "Hi&euml;rarchische Index"; }
     QCString trCompoundIndex()
     { return "Klasse Index"; }
-    QCString trFileIndex() 
+    QCString trFileIndex()
     { return "Bestand Index"; }
     QCString trModuleDocumentation()
     { return "Module Documentatie"; }
@@ -192,7 +186,7 @@ class TranslatorDutch : public Translator
     QCString trCompounds()
     { return "Klassen"; }
     QCString trGeneratedAt(const char *date,const char *projName)
-    { 
+    {
       QCString result=(QCString)"Gegenereerd op "+date;
       if (projName) result+=(QCString)" voor "+projName;
       result+=(QCString)" door";
@@ -224,11 +218,11 @@ class TranslatorDutch : public Translator
     { return "Excepties"; }
     QCString trGeneratedBy()
     { return "Gegenereerd door"; }
-    
+
 //////////////////////////////////////////////////////////////////////////
-// new since 0.49-990307 
+// new since 0.49-990307
 //////////////////////////////////////////////////////////////////////////
-    
+
     QCString trNamespaceList()
     { return "Namespace Lijst"; }
     QCString trNamespaceListDescription(bool extractAll)
@@ -244,10 +238,10 @@ class TranslatorDutch : public Translator
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990405
 //////////////////////////////////////////////////////////////////////////
-    
+
     QCString trRelatedFunctionDocumentation()
     { return "Documentatie van friends en gerelateerde functies"; }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990425
 //////////////////////////////////////////////////////////////////////////
@@ -277,7 +271,7 @@ class TranslatorDutch : public Translator
       // used as the title of the HTML page of a file
     {
       QCString result=fileName;
-      result+=" Bestand Referentie"; 
+      result+=" Bestand Referentie";
       return result;
     }
     QCString trNamespaceReference(const char *namespaceName)
@@ -287,8 +281,8 @@ class TranslatorDutch : public Translator
       result+=" Namespace Referentie";
       return result;
     }
-    
-    // these are for the member sections of a class, struct or union 
+
+    // these are for the member sections of a class, struct or union
     QCString trPublicMembers()
     { return "Public Members"; }
     QCString trPublicSlots()
@@ -309,8 +303,8 @@ class TranslatorDutch : public Translator
     { return "Private Slots"; }
     QCString trStaticPrivateMembers()
     { return "Static Private Members"; }
-    // end of member sections 
-    
+    // end of member sections
+
     QCString trWriteList(int numEntries)
     {
       // this function is used to produce a comma-separated list of items.
@@ -318,23 +312,23 @@ class TranslatorDutch : public Translator
       QCString result;
       int i;
       // the inherits list contain `numEntries' classes
-      for (i=0;i<numEntries;i++) 
+      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 
+        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 
+          if (i<numEntries-2) // not the fore last entry
             result+=", ";
           else                // the fore last entry
             result+=" en ";
         }
       }
-      return result; 
+      return result;
     }
-    
+
     QCString trInheritsList(int numEntries)
       // used in class documentation to produce a list of base classes,
       // if class diagrams are disabled.
@@ -348,7 +342,7 @@ class TranslatorDutch : public Translator
       return "Wordt overge&euml;rfd door "+trWriteList(numEntries)+".";
     }
     QCString trReimplementedFromList(int numEntries)
-      // used in member documentation blocks to produce a list of 
+      // used in member documentation blocks to produce a list of
       // members that are hidden by this one.
     {
       return "Nieuwe implementatie van "+trWriteList(numEntries)+".";
@@ -365,18 +359,18 @@ class TranslatorDutch : public Translator
     { return "Namespace Members"; }
     QCString trNamespaceMemberDescription(bool extractAll)
       // This is an introduction to the page with all namespace members
-    { 
+    {
       QCString result="Hier is een lijst van alle ";
       if (!extractAll) result+="gedocumenteerde ";
       result+="namespace members met links naar ";
-      if (extractAll) 
+      if (extractAll)
         result+="de namespace documentatie voor iedere member:";
-      else 
+      else
         result+="de namespaces waartoe ze behoren:";
       return result;
     }
     QCString trNamespaceIndex()
-      // This is used in LaTeX as the title of the chapter with the 
+      // This is used in LaTeX as the title of the chapter with the
       // index of all namespaces.
     { return "Namespace Index"; }
     QCString trNamespaceDocumentation()
@@ -445,7 +439,7 @@ class TranslatorDutch : public Translator
     QCString trMainPage()
     { return "Hoofd Pagina"; }
 
-    /*! This is used in references to page that are put in the LaTeX 
+    /*! 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()
@@ -490,7 +484,7 @@ class TranslatorDutch : public Translator
     /*! header that is put before the list of constructor/destructors. */
     QCString trConstructorDocumentation()
     {
-      return "Constructor & Destructor Documentatie"; 
+      return "Constructor & Destructor Documentatie";
     }
     /*! Used in the file documentation to point to the corresponding sources. */
     QCString trGotoSourceCode()
@@ -547,7 +541,7 @@ class TranslatorDutch : public Translator
 //////////////////////////////////////////////////////////////////////////
 // new since 1.1.0
 //////////////////////////////////////////////////////////////////////////
-    
+
     QCString trNote()
     {
       return "Noot";
@@ -630,7 +624,7 @@ class TranslatorDutch : public Translator
     {
       return "Sinds";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.1.5
 //////////////////////////////////////////////////////////////////////////
@@ -643,7 +637,7 @@ class TranslatorDutch : public Translator
     /*! page explaining how the dot graph's should be interpreted */
     QCString trLegendDocs()
     {
-      return 
+      return
         "Deze pagina legt uit hoe de grafen die gegenereerd worden door doxygen "
         "ge&iuml;nterpreteerd dienen te worden.<p>\n"
         "Beschouw het volgende voorbeeld:\n"
@@ -711,7 +705,7 @@ class TranslatorDutch : public Translator
 //////////////////////////////////////////////////////////////////////////
 // new since 1.2.0
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! Used as a marker that is put before a test item */
     QCString trTest()
     {
@@ -747,7 +741,7 @@ class TranslatorDutch : public Translator
     {
       return "Property Documentatie";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.2.4
 //////////////////////////////////////////////////////////////////////////
@@ -782,11 +776,11 @@ class TranslatorDutch : public Translator
     {
       return "Waarde:";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.2.5
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! Used as a marker that is put before a \\bug item */
     QCString trBug()
     {
@@ -802,9 +796,9 @@ class TranslatorDutch : public Translator
 // new since 1.2.6
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as ansicpg for RTF file 
-     * 
-     * The following table shows the correlation of Charset name, Charset Value and 
+    /*! 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
@@ -825,15 +819,15 @@ class TranslatorDutch : public Translator
      * GB2313_CHARSET          134 (x86)             936
      * CHINESEBIG5_CHARSET     136 (x88)             950
      * </pre>
-     * 
+     *
      */
     virtual QCString trRTFansicp()
     {
       return "1252";
     }
-    
 
-    /*! Used as ansicpg for RTF fcharset 
+
+    /*! Used as ansicpg for RTF fcharset
      *  \see trRTFansicp() for a table of possible values.
      */
     virtual QCString trRTFCharSet()
@@ -846,82 +840,82 @@ class TranslatorDutch : public Translator
     {
       return "Index";
     }
-   
+
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  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 ? "Klasse" : "klass"));
       if (!singular)  result+="n";
-      return result; 
+      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 
+     *  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 ? "Bestand" : "bestand"));
       if (!singular)  result+="en";
-      return result; 
+      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 
+     *  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 result;
     }
 
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  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 ? "Groep" : "groep"));
       if (!singular)  result+="en";
-      return result; 
+      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 
+     *  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 ? "Pagina" : "pagina"));
       if (!singular)  result+="s";
-      return result; 
+      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 
+     *  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 result;
     }
-   
+
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  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 ? "Globale member" : "globale member"));
       if (!singular)  result+="s";
-      return result; 
+      return result;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -931,10 +925,10 @@ class TranslatorDutch : public Translator
     /*! 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 ? "Auteur" : "auteur"));
       if (!singular)  result+="s";
-      return result; 
+      return result;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -952,7 +946,7 @@ class TranslatorDutch : public Translator
 // new since 1.2.13
 //////////////////////////////////////////////////////////////////////////
 
-    /*! used in member documentation blocks to produce a list of 
+    /*! used in member documentation blocks to produce a list of
      *  members that are implemented by this one.
      */
     virtual QCString trImplementedFromList(int numEntries)
@@ -979,8 +973,8 @@ class TranslatorDutch : public Translator
 // new since 1.2.17
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as the header of the list of item that have been 
-     *  flagged deprecated 
+    /*! Used as the header of the list of item that have been
+     *  flagged deprecated
      */
     virtual QCString trDeprecatedList()
     {
@@ -1010,35 +1004,35 @@ class TranslatorDutch : public Translator
     /*! Used as a heading for a list of Java class types with package scope.
      */
     virtual QCString trPackageTypes()
-    { 
+    {
       return "Package Types";
     }
-    /*! Used as a heading for a list of Java class functions with package 
-     * scope. 
+    /*! Used as a heading for a list of Java class functions with package
+     * scope.
      */
     virtual QCString trPackageMembers()
-    { 
+    {
       return "Package Functies";
     }
-    /*! Used as a heading for a list of static Java class functions with 
+    /*! Used as a heading for a list of static Java class functions with
      *  package scope.
      */
     virtual QCString trStaticPackageMembers()
-    { 
+    {
       return "Statische Package Functies";
     }
-    /*! Used as a heading for a list of Java class variables with package 
+    /*! Used as a heading for a list of Java class variables with package
      * scope.
      */
     virtual QCString trPackageAttribs()
-    { 
+    {
       return "Package Attributen";
     }
-    /*! Used as a heading for a list of static Java class variables with 
+    /*! Used as a heading for a list of static Java class variables with
      * package scope.
      */
     virtual QCString trStaticPackageAttribs()
-    { 
+    {
       return "Statische Package Attributen";
     }
 
@@ -1046,7 +1040,7 @@ class TranslatorDutch : public Translator
 // new since 1.3.1
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used in the quick index of a class/file/namespace member list page 
+    /*! Used in the quick index of a class/file/namespace member list page
      *  to link to the unfiltered list of all members.
      */
     virtual QCString trAll()
@@ -1063,8 +1057,8 @@ class TranslatorDutch : public Translator
 // new since 1.3.3
 //////////////////////////////////////////////////////////////////////////
 
-    /*! When the search engine is enabled this text is put in the index 
-     *  of each page before the search field. 
+    /*! When the search engine is enabled this text is put in the index
+     *  of each page before the search field.
      */
     virtual QCString trSearchForIndex()
     {
@@ -1081,7 +1075,7 @@ class TranslatorDutch : public Translator
      *  text can be different depending on the number of documents found.
      *  Inside the text you can put the special marker $num to insert
      *  the number representing the actual number of search results.
-     *  The @a numDocuments parameter can be either 0, 1 or 2, where the 
+     *  The @a numDocuments parameter can be either 0, 1 or 2, where the
      *  value 2 represents 2 or more matches. HTML markup is allowed inside
      *  the returned string.
      */
@@ -1095,13 +1089,13 @@ class TranslatorDutch : public Translator
       {
         return "Er is <b>1</b> document gevonden dat aan de zoekopdracht voldoet.";
       }
-      else 
+      else
       {
         return "Er zijn <b>$num</b> documenten gevonden die aan de zoekopdracht voldoen. "
                "De beste resultaten worden eerst getoond.";
       }
     }
-    /*! This string is put before the list of matched words, for each search 
+    /*! This string is put before the list of matched words, for each search
      *  result. What follows is the list of words that matched the query.
      */
     virtual QCString trSearchMatches()
@@ -1142,7 +1136,7 @@ class TranslatorDutch : public Translator
     virtual QCString trDirectories()
     { return "Folders"; }
 
-    /*! This returns a sentences that introduces the directory hierarchy. 
+    /*! This returns a sentences that introduces the directory hierarchy.
      *  and the fact that it is sorted alphabetically per level
      */
     virtual QCString trDirDescription()
@@ -1160,10 +1154,10 @@ class TranslatorDutch : public Translator
      *  (\a first_capital) and in sigular or plural form (\a singular).
      */
     virtual QCString trDir(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Folder" : "folder"));
       if (!singular) result+="s";
-      return result; 
+      return result;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1189,7 +1183,7 @@ class TranslatorDutch : public Translator
     {
       return "Hier is de caller graaf voor deze functie:";
     }
-    
+
     /*! header that is put before the list of member subprograms (Fortran). */
     virtual QCString trMemberFunctionDocumentationFortran()
     { return "Member Functie/Subroutine Documentatie"; }
@@ -1198,7 +1192,7 @@ class TranslatorDutch : public Translator
 // new since 1.5.4 (mainly for Fortran)
 //////////////////////////////////////////////////////////////////////////
 
-    /*! This is put above each page as a link to the list of annotated data types (Fortran). */    
+    /*! This is put above each page as a link to the list of annotated data types (Fortran). */
     virtual QCString trCompoundListFortran()
     { return "Lijst met data types"; }
 
@@ -1221,7 +1215,7 @@ class TranslatorDutch : public Translator
       return result;
     }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * annotated compound index (Fortran).
      */
     virtual QCString trCompoundIndexFortran()
@@ -1233,24 +1227,24 @@ class TranslatorDutch : public Translator
     virtual QCString trTypeDocumentation()
     { return "Data Type Documentatie"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) subprograms (Fortran).
      */
     virtual QCString trSubprograms()
     { return "Functies/Subroutines"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for subprograms (Fortran)
      */
     virtual QCString trSubprogramDocumentation()
     { return "Functie/Subroutine Documentatie"; }
 
-    /*! This is used in the documentation of a file/namespace/group before 
+    /*! This is used in the documentation of a file/namespace/group before
      *  the list of links to documented compounds (Fortran)
      */
      virtual QCString trDataTypes()
     { return "Data Types"; }
-    
+
     /*! used as the title of page containing all the index of all modules (Fortran). */
     virtual QCString trModulesList()
     { return "Module Lijst"; }
@@ -1289,42 +1283,42 @@ class TranslatorDutch : public Translator
     virtual QCString trModuleReference(const char *namespaceName)
     {
       QCString result=namespaceName;
-      result+=" Module Referentie";        
+      result+=" Module Referentie";
       return result;
     }
-    
+
     /*! This is put above each page as a link to all members of modules. (Fortran) */
     virtual QCString trModulesMembers()
     { return "Module Members"; }
 
     /*! This is an introduction to the page with all modules members (Fortran) */
     virtual QCString trModulesMemberDescription(bool extractAll)
-    { 
+    {
       QCString result="Hier is een lijst van alle ";
       if (!extractAll) result+="gedocumenteerde ";
       result+="module members met links naar ";
-      if (extractAll) 
+      if (extractAll)
         result+="de module documentatie voor iedere member:";
-      else 
+      else
         result+="de module waartoe ze behoren:";
       return result;
     }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      *  index of all modules (Fortran).
      */
     virtual QCString trModulesIndex()
     { return "Module Index"; }
-    
+
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trModule(bool first_capital, bool singular)
-    {       
+    {
       QCString result((first_capital ? "Module" : "module"));
       if (!singular)  result+="n";
-      return result; 
+      return result;
     }
     /*! This is put at the bottom of a module documentation page and is
      *  followed by a list of files that were used to generate the page.
@@ -1352,24 +1346,24 @@ class TranslatorDutch : public Translator
       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 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trType(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Type" : "type"));
       if (!singular)  result+="s";
-      return result; 
+      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 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trSubprogram(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Subprogramma" : "subprogramma"));
       if (!singular)  result+="s";
-      return result; 
+      return result;
     }
 
     /*! C# Type Contraint list */
@@ -1505,8 +1499,8 @@ class TranslatorDutch : public Translator
     virtual QCString trInheritedFrom(const char *members,const char *what)
     { return QCString(members)+" overge&euml;rfd van "+what; }
 
-    /*! Header of the sections with inherited members specific for the 
-     *  base class(es) 
+    /*! Header of the sections with inherited members specific for the
+     *  base class(es)
      */
     virtual QCString trAdditionalInheritedMembers()
     { return "Additionele Overge&euml;rfde Members"; }
@@ -1516,7 +1510,7 @@ class TranslatorDutch : public Translator
 //////////////////////////////////////////////////////////////////////////
 
     /*! Used as a tooltip for the toggle button that appears in the
-     *  navigation tree in the HTML output when GENERATE_TREEVIEW is 
+     *  navigation tree in the HTML output when GENERATE_TREEVIEW is
      *  enabled. This tooltip explains the meaning of the button.
      */
     virtual QCString trPanelSynchronisationTooltip(bool enable)
diff --git a/src/translator_no.h b/src/translator_no.h
index dbc14dc..d5d8051 100644
--- a/src/translator_no.h
+++ b/src/translator_no.h
@@ -76,12 +76,6 @@ class TranslatorNorwegian : public TranslatorAdapter_1_4_6
         "\\usepackage[T1]{fontenc}\n";
     }
 
-    /*! return the language charset. This will be used for the HTML output */
-    virtual QCString idLanguageCharset()
-    {
-      return "utf-8";
-    }
-
     // --- Language translation methods -------------------
 
     /*! used in the compound documentation before a list of related functions. */
diff --git a/src/translator_pl.h b/src/translator_pl.h
index b1e90ce..69450a1 100644
--- a/src/translator_pl.h
+++ b/src/translator_pl.h
@@ -5,8 +5,8 @@
  * Copyright (C) 1997-2013 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 
+ * 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.
  *
@@ -27,12 +27,12 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
   public:
 
     // --- Language control methods -------------------
-    
-    /*! Used for identification of the language. May resemble 
+
+    /*! 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 
+     * (e.g. Czech, Japanese, Russian, etc.). It should be equal to
      * the identification in language.h.
      */
     QCString idLanguage()
@@ -48,12 +48,6 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
              "\\usepackage[T1]{fontenc}\n";
     }
 
-    /*! return the language charset. This will be used for the HTML output */
-    virtual QCString idLanguageCharset()
-    {
-        return "utf-8"; 
-    }
-    
     // --- Language translation methods -------------------
 
     /*! used in the compound documentation before a list of related functions. */
@@ -71,30 +65,30 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
     /*! header that is put before the list of typedefs. */
     QCString trMemberTypedefDocumentation()
     { return "Dokumentacja składowych definicji typu"; }
-    
+
     /*! header that is put before the list of enumerations. */
     QCString trMemberEnumerationDocumentation()
     { return "Dokumentacja składowych wyliczanych"; }
-    
+
     /*! header that is put before the list of member functions. */
     QCString trMemberFunctionDocumentation()
     { return "Dokumentacja funkcji składowych"; }
-    
+
     /*! header that is put before the list of member attributes. */
     QCString trMemberDataDocumentation()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Dokumentacja pól"; 
+        return "Dokumentacja pól";
       }
       else
       {
-        return "Dokumentacja atrybutów składowych"; 
+        return "Dokumentacja atrybutów składowych";
       }
     }
 
     /*! this is the text of a link put after brief descriptions. */
-    QCString trMore() 
+    QCString trMore()
     { return "Więcej..."; }
 
     /*! put in the class documentation */
@@ -112,54 +106,54 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
     /*! this is the remainder of the sentence after the class name */
     QCString trIncludingInheritedMembers()
     { return ", uwzględniająca wszystkie dziedziczone składowe."; }
-    
+
     /*! this is put at the author sections at the bottom of man pages.
      *  parameter s is name of the project name.
      */
     QCString trGeneratedAutomatically(const char *s)
     { QCString result="Wygenerowano automatycznie z kodu źródłowego programem Doxygen";
       if (s) result+=(QCString)" dla "+s;
-      result+="."; 
+      result+=".";
       return result;
     }
 
     /*! put after an enum name in the list of all members */
     QCString trEnumName()
     { return "nazwa wyliczenia"; }
-    
+
     /*! put after an enum value in the list of all members */
     QCString trEnumValue()
     { return "wartość wyliczenia"; }
-    
+
     /*! put after an undocumented member in the list of all members */
     QCString trDefinedIn()
     { return "zdefiniowana w"; }
-    
+
     // quick reference sections
 
-    /*! This is put above each page as a link to the list of all groups of 
+    /*! This is put above each page as a link to the list of all groups of
      *  compounds or files (see the \\group command).
      */
     QCString trModules()
     { return "Moduły"; }
-    
+
     /*! This is put above each page as a link to the class hierarchy */
     QCString trClassHierarchy()
     { return "Hierarchia klas"; }
-    
+
     /*! This is put above each page as a link to the list of annotated classes */
     QCString trCompoundList()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
         return "Struktury danych";
       }
       else
       {
-        return "Lista klas"; 
+        return "Lista klas";
       }
-    }   
-    
+    }
+
     /*! This is put above each page as a link to the list of documented files */
     QCString trFileList()
     { return "Lista plików"; }
@@ -170,27 +164,27 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
 
     /*! This is put above each page as a link to all members of compounds. */
     QCString trCompoundMembers()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Pola danych"; 
+        return "Pola danych";
       }
       else
       {
-        return "Składowe klas"; 
+        return "Składowe klas";
       }
     }
 
     /*! This is put above each page as a link to all members of files. */
     QCString trFileMembers()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Globalne"; 
+        return "Globalne";
       }
       else
       {
-        return "Składowe plików"; 
+        return "Składowe plików";
       }
     }
 
@@ -223,16 +217,16 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
 
     /*! This is an introduction to the annotated compound list. */
     QCString trCompoundListDescription()
-    { 
-      
+    {
+
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Tutaj znajdują się struktury danych wraz z ich krótkimi opisami:"; 
+        return "Tutaj znajdują się struktury danych wraz z ich krótkimi opisami:";
       }
       else
       {
         return "Tutaj znajdują się klasy, struktury, "
-             "unie i interfejsy wraz z ich krótkimi opisami:"; 
+             "unie i interfejsy wraz z ich krótkimi opisami:";
       }
     }
 
@@ -253,7 +247,7 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
         result+="składowych";
       }
       result+=" wraz z odnośnikami do ";
-      if (!extractAll) 
+      if (!extractAll)
       {
         if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
         {
@@ -264,7 +258,7 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
           result+="dokumentacji klas dla każdej składowej:";
         }
       }
-      else 
+      else
       {
         if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
         {
@@ -292,9 +286,9 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
         result+="składowych plików";
       }
       result+=" wraz z odnośnikami do ";
-      if (extractAll) 
+      if (extractAll)
         result+="plików, do których one należą:";
-      else 
+      else
         result+="dokumentacji:";
       return result;
     }
@@ -316,49 +310,49 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
     { return "Tutaj znajduje się lista wszystkich grup:"; }
 
     /*! This sentences is used in the annotated class/file lists if no brief
-     * description is given. 
+     * description is given.
      */
     QCString trNoDescriptionAvailable()
     { return "Brak opisu"; }
-    
-    // index titles (the project name is prepended for these) 
+
+    // index titles (the project name is prepended for these)
 
 
     /*! This is used in HTML as the title of index.html. */
     QCString trDocumentation()
     { return "Dokumentacja"; }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * index of all groups.
      */
     QCString trModuleIndex()
     { return "Indeks grup"; }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * class hierarchy.
      */
     QCString trHierarchicalIndex()
     { return "Indeks hierarchiczny"; }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * annotated compound index.
      */
     QCString trCompoundIndex()
     {
      if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
-      { 
+      {
         return "Indeks struktur danych";
       }
       else
       {
-        return "Indeks klas"; 
+        return "Indeks klas";
       }
     }
 
     /*! This is used in LaTeX as the title of the chapter with the
      * list of all files.
      */
-    QCString trFileIndex() 
+    QCString trFileIndex()
     { return "Indeks plików"; }
 
     /*! This is used in LaTeX as the title of the chapter containing
@@ -371,14 +365,14 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
      *  the documentation of all classes, structs and unions.
      */
     QCString trClassDocumentation()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Dokumentacja struktur danych"; 
+        return "Dokumentacja struktur danych";
       }
       else
       {
-        return "Dokumentacja klas"; 
+        return "Dokumentacja klas";
       }
     }
 
@@ -403,105 +397,105 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
     /*! This is used in LaTeX as the title of the document */
     QCString trReferenceManual()
     { return "Podręcznik"; }
-    
-    /*! This is used in the documentation of a file as a header before the 
+
+    /*! This is used in the documentation of a file as a header before the
      *  list of defines
      */
     QCString trDefines()
     { return "Definicje"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of function prototypes
      */
     QCString trFuncProtos()
     { return "Prototypy funkcji"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of typedefs
      */
     QCString trTypedefs()
     { return "Definicje typów"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of enumerations
      */
     QCString trEnumerations()
     { return "Wyliczenia"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) functions
      */
     QCString trFunctions()
     { return "Funkcje"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) variables
      */
     QCString trVariables()
     { return "Zmienne"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) variables
      */
     QCString trEnumerationValues()
     { return "Wartości wyliczeń"; }
-    
+
     /*! This is used in the documentation of a file before the list of
      *  documentation blocks for defines
      */
     QCString trDefineDocumentation()
     { return "Dokumentacja definicji"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for function prototypes
      */
     QCString trFunctionPrototypeDocumentation()
     { return "Dokumentacja prototypów funkcji"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for typedefs
      */
     QCString trTypedefDocumentation()
     { return "Dokumentacja definicji typów"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for enumeration types
      */
     QCString trEnumerationTypeDocumentation()
     { return "Dokumentacja typów wyliczanych"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for functions
      */
     QCString trFunctionDocumentation()
     { return "Dokumentacja funkcji"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for variables
      */
     QCString trVariableDocumentation()
     { return "Dokumentacja zmiennych"; }
 
-    /*! This is used in the documentation of a file/namespace/group before 
+    /*! This is used in the documentation of a file/namespace/group before
      *  the list of links to documented compounds
      */
     QCString trCompounds()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Struktury danych"; 
+        return "Struktury danych";
       }
       else
       {
-        return "Komponenty"; 
+        return "Komponenty";
       }
     }
 
-    /*! This is used in the standard footer of each page and indicates when 
-     *  the page was generated 
+    /*! This is used in the standard footer of each page and indicates when
+     *  the page was generated
      */
     QCString trGeneratedAt(const char *date,const char *projName)
-    { 
+    {
       QCString result=(QCString)"Wygenerowano "+date;
       if (projName) result+=(QCString)" dla "+projName;
       result+=(QCString)" programem";
@@ -519,7 +513,7 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
     {
       return (QCString)"Diagram dziedziczenia dla "+clName;
     }
-    
+
     /*! this text is generated when the \\internal command is used. */
     QCString trForInternalUseOnly()
     { return "Tylko do użytku wewnętrznego."; }
@@ -559,13 +553,13 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
     /*! this text is generated when the \\exception command is used. */
     QCString trExceptions()
     { return "Wyjątki"; }
-    
+
     /*! this text is used in the title page of a LaTeX document. */
     QCString trGeneratedBy()
     { return "Wygenerowano przez"; }
 
     // new since 0.49-990307
-    
+
     /*! used as the title of page containing all the index of all namespaces. */
     QCString trNamespaceList()
     { return "Lista przestrzeni nazw"; }
@@ -584,17 +578,17 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
      */
     QCString trFriends()
     { return "Przyjaciele"; }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990405
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! used in the class documentation as a header before the list of all
-     * related classes 
+     * related classes
      */
     QCString trRelatedFunctionDocumentation()
     { return "Dokumentacja przyjaciół i funkcji związanych"; }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990425
 //////////////////////////////////////////////////////////////////////////
@@ -625,7 +619,7 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
     QCString trFileReference(const char *fileName)
     {
       QCString result="Dokumentacja pliku ";
-      result+=fileName; 
+      result+=fileName;
       return result;
     }
 
@@ -636,7 +630,7 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
       result+=namespaceName;
       return result;
     }
-    
+
     /* these are for the member sections of a class, struct or union */
     QCString trPublicMembers()
     { return "Metody publiczne"; }
@@ -658,7 +652,7 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
     { return "Sloty prywatne"; }
     QCString trStaticPrivateMembers()
     { return "Statyczne metody prywatne"; }
-    
+
     /*! this function is used to produce a comma-separated list of items.
      *  use generateMarker(i) to indicate where item i should be put.
      */
@@ -667,23 +661,23 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
       QCString result;
       int i;
       // the inherits list contain `numEntries' classes
-      for (i=0;i<numEntries;i++) 
+      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 
+        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 
+          if (i<numEntries-2) // not the fore last entry
             result+=", ";
           else                // the fore last entry
             result+=" i ";
         }
       }
-      return result; 
+      return result;
     }
-    
+
     /*! used in class documentation to produce a list of base classes,
      *  if class diagrams are disabled.
      */
@@ -700,7 +694,7 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
       return "Dziedziczona przez "+trWriteList(numEntries)+".";
     }
 
-    /*! used in member documentation blocks to produce a list of 
+    /*! used in member documentation blocks to produce a list of
      *  members that are hidden by this one.
      */
     QCString trReimplementedFromList(int numEntries)
@@ -722,17 +716,17 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
 
     /*! This is an introduction to the page with all namespace members */
     QCString trNamespaceMemberDescription(bool extractAll)
-    { 
+    {
       QCString result="Tutaj znajduje się lista wszystkich ";
       if (!extractAll) result+="udokumentowanych ";
       result+="składowych wraz z odnośnikami do ";
-      if (extractAll) 
+      if (extractAll)
         result+="dokumentacji przestrzeni nazw dla każdej składowej:";
-      else 
+      else
         result+="przestrzeni nazw do których składowe te należą:";
       return result;
     }
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      *  index of all namespaces.
      */
     QCString trNamespaceIndex()
@@ -801,7 +795,7 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
     QCString trMainPage()
     { return "Strona główna"; }
 
-    /*! This is used in references to page that are put in the LaTeX 
+    /*! 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()
@@ -850,7 +844,7 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
     /*! header that is put before the list of constructor/destructors. */
     QCString trConstructorDocumentation()
     {
-      return "Dokumentacja konstruktora i destruktora"; 
+      return "Dokumentacja konstruktora i destruktora";
     }
     /*! Used in the file documentation to point to the corresponding sources. */
     QCString trGotoSourceCode()
@@ -907,7 +901,7 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
 //////////////////////////////////////////////////////////////////////////
 // new since 1.1.0
 //////////////////////////////////////////////////////////////////////////
-    
+
     QCString trNote()
     {
       return "Nota";
@@ -1009,7 +1003,7 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
     /*! page explaining how the dot graph's should be interpreted */
     QCString trLegendDocs()
     {
-      return 
+      return
         "Ta strona wyjaśnia jak interpretować wykresy, które są wygenerowane "
         "przez doxygen.<p>\n"
         "Rozważ następujący przykład:\n"
@@ -1167,7 +1161,7 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
 //////////////////////////////////////////////////////////////////////////
 // new since 1.2.5
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! Used as a marker that is put before a \\bug item */
     virtual QCString trBug()
     {
@@ -1188,7 +1182,7 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
     {
       return "1250";
     }
-    
+
     /*! Used as ansicpg for RTF fcharset */
     virtual QCString trRTFCharSet()
     {
@@ -1200,94 +1194,94 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
     {
       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 
+     *  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 ? "Klas" : "klas"));
       result+=(singular ? "a" : "y");
-      return result; 
+      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 
+     *  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 ? "Plik" : "plik"));
       if (!singular)  result+="i";
-      return result; 
+      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 
+     *  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 ? "Przestrze" : "przestrze"));
       result+=(singular ? "ń" : "nie");
       result+=" nazw";
-      return result; 
+      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 
+     *  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 ? "Grupa" : "grupa"));
       result+=(singular ? "a" : "y");
-      return result; 
+      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 
+     *  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 ? "Stron" : "stron"));
       result+=(singular ? "a" : "y");
-      return result; 
+      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 
+     *  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 ? "Składow" : "składow"));
       result+=(singular ? "a" : "e");
-      return result; 
+      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 
+     *  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 ? "Pol" : "pol"));
       result+=(singular ? "e" : "a");
-      return result; 
+      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 
+     *  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"));
       result+=(singular ? "ny" : "ne");
-      return result; 
+      return result;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1297,10 +1291,10 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
     /*! 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 ? "Auto" : "auto"));
       result += (singular) ? "r" : "rzy";
-      return result; 
+      return result;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1314,18 +1308,18 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
       return "Odwołuje się do";
     }
 
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.2.13
 //////////////////////////////////////////////////////////////////////////
-    
 
-    virtual QCString trImplementedFromList(int numEntries) 
-    { 
+
+    virtual QCString trImplementedFromList(int numEntries)
+    {
       return "Implementuje "+trWriteList(numEntries)+".";
     }
 
-    virtual QCString trImplementedInList(int numEntries) 
+    virtual QCString trImplementedInList(int numEntries)
     {
       return "Implementowany w "+trWriteList(numEntries)+".";
     }
@@ -1346,8 +1340,8 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
 // new since 1.2.17
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as the header of the list of item that have been 
-     *  flagged deprecated 
+    /*! Used as the header of the list of item that have been
+     *  flagged deprecated
      */
     virtual QCString trDeprecatedList()
     {
@@ -1358,7 +1352,7 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
 // new since 1.2.18
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as a header for declaration section of the events found in 
+    /*! Used as a header for declaration section of the events found in
      * a C# program
      */
     virtual QCString trEvents()
@@ -1378,43 +1372,43 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
     /*! Used as a heading for a list of Java class types with package scope.
      */
     virtual QCString trPackageTypes()
-    { 
+    {
       return "Typy pakietu";
     }
-    /*! Used as a heading for a list of Java class functions with package 
-     * scope. 
+    /*! Used as a heading for a list of Java class functions with package
+     * scope.
      */
     virtual QCString trPackageMembers()
-    { 
+    {
       return "Funkcje pakietu";
     }
-    /*! Used as a heading for a list of static Java class functions with 
+    /*! Used as a heading for a list of static Java class functions with
      *  package scope.
      */
     virtual QCString trStaticPackageMembers()
-    { 
+    {
       return "Statyczne funkcje pakietu";
     }
-    /*! Used as a heading for a list of Java class variables with package 
+    /*! Used as a heading for a list of Java class variables with package
      * scope.
      */
     virtual QCString trPackageAttribs()
-    { 
+    {
       return "Atrybuty pakietu";
     }
-    /*! Used as a heading for a list of static Java class variables with 
+    /*! Used as a heading for a list of static Java class variables with
      * package scope.
      */
     virtual QCString trStaticPackageAttribs()
-    { 
+    {
       return "Statyczne atrybuty pakietu";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.3.1
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used in the quick index of a class/file/namespace member list page 
+    /*! Used in the quick index of a class/file/namespace member list page
      *  to link to the unfiltered list of all members.
      */
     virtual QCString trAll()
@@ -1431,9 +1425,9 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
 // new since 1.3.3
 //////////////////////////////////////////////////////////////////////////
 
-    /*! When the search engine is enabled this text is put in the header 
-     *  of each page before the field where one can enter the text to search 
-     *  for. 
+    /*! When the search engine is enabled this text is put in the header
+     *  of each page before the field where one can enter the text to search
+     *  for.
      */
     virtual QCString trSearchForIndex()
     {
@@ -1450,7 +1444,7 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
      *  text can be different depending on the number of documents found.
      *  Inside the text you can put the special marker $num to insert
      *  the number representing the actual number of search results.
-     *  The @a numDocuments parameter can be either 0, 1 or 2, where the 
+     *  The @a numDocuments parameter can be either 0, 1 or 2, where the
      *  value 2 represents 2 or more matches. HTML markup is allowed inside
      *  the returned string.
      */
@@ -1470,13 +1464,13 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
         return "Znaleziono <b>$num</b> dokumenty pasujące do twojego zapytania. "
                "Najlepiej pasujące dokumenty wyświetlane są na początku listy.";
       }
-      else 
+      else
       {
         return "Znaleziono <b>$num</b> dokumentów pasujących do twojego zapytania. "
                "Najlepiej pasujące dokumenty wyświetlane są na początku listy.";
       }
     }
-    /*! This string is put before the list of matched words, for each search 
+    /*! This string is put before the list of matched words, for each search
      *  result. What follows is the list of words that matched the query.
      */
     virtual QCString trSearchMatches()
@@ -1517,11 +1511,11 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
     virtual QCString trDirectories()
     { return "Katalogi"; }
 
-    /*! This returns a sentences that introduces the directory hierarchy. 
+    /*! This returns a sentences that introduces the directory hierarchy.
      *  and the fact that it is sorted alphabetically per level
      */
     virtual QCString trDirDescription()
-    { 
+    {
       return "Ta struktura katalogów jest posortowana jest z grubsza, "
              "choć nie całkowicie, alfabetycznie:";
     }
@@ -1536,10 +1530,10 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
      *  (\a first_capital) and in sigular or plural form (\a singular).
      */
     virtual QCString trDir(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Katalog" : "katalog"));
       if (! singular) result+="i";
-      return result; 
+      return result;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1552,9 +1546,9 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
     virtual QCString trOverloadText()
     {
       return "To jest metoda przeciążona, udostępniona dla wygody. "
-             "Różni się od powyższej metody tylko zestawem akceptowanych argumentów.";               
+             "Różni się od powyższej metody tylko zestawem akceptowanych argumentów.";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.4.6
 //////////////////////////////////////////////////////////////////////////
@@ -1565,7 +1559,7 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
       return "Oto graf wywoływań tej funkcji:";
     }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for enumeration values
      */
     virtual QCString trEnumerationValueDocumentation()
@@ -1574,12 +1568,12 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
 //////////////////////////////////////////////////////////////////////////
 // new since 1.5.4 (mainly for Fortran)
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! header that is put before the list of member subprograms (Fortran). */
     virtual QCString trMemberFunctionDocumentationFortran()
     { return "Dokumentacja składowej funkcji/podprogramu"; }
 
-    /*! This is put above each page as a link to the list of annotated data types (Fortran). */    
+    /*! This is put above each page as a link to the list of annotated data types (Fortran). */
     virtual QCString trCompoundListFortran()
     { return "Lista typów danych"; }
 
@@ -1601,18 +1595,18 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
       }
       result+="składowych typów danych";
       result+=" wraz z odnośnikami do ";
-      if (!extractAll) 
-      {                                 
+      if (!extractAll)
+      {
          result+="dokumentacji struktury danych dla każdej składowej";
       }
-      else 
+      else
       {
          result+="typów danych, do których dana składowa należy:";
       }
       return result;
     }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * annotated compound index (Fortran).
      */
     virtual QCString trCompoundIndexFortran()
@@ -1624,24 +1618,24 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
     virtual QCString trTypeDocumentation()
     { return "Dokumentacja typów danych"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) subprograms (Fortran).
      */
     virtual QCString trSubprograms()
     { return "Funkcje/podprogramy"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for subprograms (Fortran)
      */
     virtual QCString trSubprogramDocumentation()
     { return "Dokumentacja funkcji/podprogramu"; }
 
-    /*! This is used in the documentation of a file/namespace/group before 
+    /*! This is used in the documentation of a file/namespace/group before
      *  the list of links to documented compounds (Fortran)
      */
      virtual QCString trDataTypes()
     { return "Typy danych"; }
-    
+
     /*! used as the title of page containing all the index of all modules (Fortran). */
     virtual QCString trModulesList()
     { return "Lista modułów"; }
@@ -1678,48 +1672,48 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
     }
     /*! used as the title of the HTML page of a module (Fortran) */
     virtual QCString trModuleReference(const char *namespaceName)
-    {      
+    {
       QCString result="Dokumentacja modułu ";
-      result+=namespaceName; 
+      result+=namespaceName;
       return result;
     }
-    
+
     /*! This is put above each page as a link to all members of modules. (Fortran) */
     virtual QCString trModulesMembers()
     { return "Składowe modułu"; }
 
     /*! This is an introduction to the page with all modules members (Fortran) */
     virtual QCString trModulesMemberDescription(bool extractAll)
-    { 
+    {
       QCString result="Tutaj znajduje się lista wszystkich ";
       if (!extractAll) result+="udokumentowanych ";
       result+="składowych modułów wraz z odnośnikami do ";
-      if (extractAll) 
+      if (extractAll)
       {
         result+="dokumentacji modułu dla każdej składowej:";
       }
-      else 
+      else
       {
         result+="modułów do których składowe te należą:";
       }
       return result;
     }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      *  index of all modules (Fortran).
      */
     virtual QCString trModulesIndex()
     { return "Indeks modułu"; }
-    
+
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trModule(bool first_capital, bool singular)
-    {       
+    {
       QCString result((first_capital ? "Moduł" : "moduł"));
       if (!singular)  result+="y";
-      return result; 
+      return result;
     }
     /*! This is put at the bottom of a module documentation page and is
      *  followed by a list of files that were used to generate the page.
@@ -1745,24 +1739,24 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
       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 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trType(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Typ" : "typ"));
       if (!singular)  result+="y";
-      return result; 
+      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 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trSubprogram(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Podprogram" : "podprogram"));
       if (!singular)  result+="y";
-      return result; 
+      return result;
     }
 
     /*! C# Type Constraint list */
@@ -1804,7 +1798,7 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
     {
       return "Brak dopasowań";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.6.3 (missing items for the directory pages)
 //////////////////////////////////////////////////////////////////////////
@@ -1833,7 +1827,7 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
       return (QCString)"Zawiera plik w "+name;
     }
 
-    /** Compiles a date string. 
+    /** Compiles a date string.
      *  @param year Year in 4 digits
      *  @param month Month of the year: 1=January
      *  @param day Day of the Month: 1..31
@@ -1907,8 +1901,8 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
     virtual QCString trInheritedFrom(const char *members,const char *what)
     { return QCString(members)+" dziedziczone z "+what; }
 
-    /*! Header of the sections with inherited members specific for the 
-     *  base class(es) 
+    /*! Header of the sections with inherited members specific for the
+     *  base class(es)
      */
     virtual QCString trAdditionalInheritedMembers()
     { return "Dodatkowe Dziedziczone Składowe"; }
diff --git a/src/translator_pt.h b/src/translator_pt.h
index 5130fcf..6201103 100644
--- a/src/translator_pt.h
+++ b/src/translator_pt.h
@@ -11,7 +11,7 @@
  * input used in their production; they are not affected by this license.
  *
  * Portuguese translation version 20110428
- *    Maintainer (from 04/28/2011): 
+ *    Maintainer (from 04/28/2011):
  *       Fabio "FJTC" Jun Takada Chino <jun-chino at uol.com.br>
  *    Maintainer (until 04/28/2011):
  *       Rui Godinho Lopes <rui at ruilopes.com>
@@ -25,10 +25,10 @@
  * ---------------
  * History:
  * 20110628:
- *	- Updated to 1.7.5; 
+ *	- Updated to 1.7.5;
  *      - All obsolete methods have been removed;
  * 20110428
- *   - Updated to doxygen 1.6.3 using the Brazilian Portuguese as the base. 
+ *   - Updated to doxygen 1.6.3 using the Brazilian Portuguese as the base.
  *     Requires revision by a Portuguese (Portugal native speaker);
  * 007 09 june 2003
  *   ! Updated for doxygen v1.3.1
@@ -58,18 +58,18 @@ class TranslatorPortuguese : public TranslatorAdapter_1_8_0
 
     // --- Language control methods -------------------
 
-    /*! Used for identification of the language. The identification 
-     * should not be translated. It should be replaced by the name 
+    /*! 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 should be equal to 
+     * (e.g. "czech", "japanese", "russian", etc.). It should be equal to
      * the identification used in language.cpp.
      */
     QCString idLanguage()
     { return "portuguese"; }
 
-    /*! Used to get the LaTeX command(s) for the language support. 
+    /*! 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 
+     *  LaTeX to the desired language.  For example
      *  <pre>"\\usepackage[german]{babel}\n"
      *  </pre>
      *  or
@@ -77,17 +77,13 @@ class TranslatorPortuguese : public TranslatorAdapter_1_8_0
      *  "\\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()
     { return "Portuguese"; }
 
-    /*! return the language charset. This will be used for the HTML output */
-    virtual QCString idLanguageCharset()
-    { return "utf-8"; }
-
     // --- Language translation methods -------------------
 
     /*! used in the compound documentation before a list of related functions. */
@@ -119,7 +115,7 @@ class TranslatorPortuguese : public TranslatorAdapter_1_8_0
     {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Documentação dos campos e atributos"; 
+        return "Documentação dos campos e atributos";
       }
       else
       {
@@ -251,7 +247,7 @@ class TranslatorPortuguese : public TranslatorAdapter_1_8_0
 
     /*! This is an introduction to the annotated compound list. */
     QCString trCompoundListDescription()
-    {       
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
         return "Lista das estruturas de dados com uma breve descrição:";
@@ -279,7 +275,7 @@ class TranslatorPortuguese : public TranslatorAdapter_1_8_0
         result+=" documentadas";
       }
       result+=" com referência para ";
-      if (!extractAll) 
+      if (!extractAll)
       {
         if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
         {
@@ -290,7 +286,7 @@ class TranslatorPortuguese : public TranslatorAdapter_1_8_0
           result+="a documentação de cada membro:";
         }
       }
-      else 
+      else
       {
         if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
         {
@@ -319,9 +315,9 @@ class TranslatorPortuguese : public TranslatorAdapter_1_8_0
         if (!extractAll) result+="documentados ";
       }
       result+="com referência para ";
-      if (extractAll) 
+      if (extractAll)
         result+="o ficheiro a que pertecem:";
-      else 
+      else
         result+="a respectiva documentação:";
       return result;
     }
@@ -363,7 +359,7 @@ class TranslatorPortuguese : public TranslatorAdapter_1_8_0
     QCString trCompoundIndex()
     {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
-      { 
+      {
         return "Índice das estruturas de dados";
       }
       else
@@ -1324,7 +1320,7 @@ class TranslatorPortuguese : public TranslatorAdapter_1_8_0
 // new since 1.2.13
 //////////////////////////////////////////////////////////////////////////
 
-    /*! used in member documentation blocks to produce a list of 
+    /*! used in member documentation blocks to produce a list of
      *  members that are implemented by this one.
      */
     virtual QCString trImplementedFromList(int numEntries)
@@ -1368,7 +1364,7 @@ class TranslatorPortuguese : public TranslatorAdapter_1_8_0
 // new since 1.2.18
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as a header for declaration section of the events found in 
+    /*! Used as a header for declaration section of the events found in
      * a C# program
      */
     virtual QCString trEvents()
@@ -1388,43 +1384,43 @@ class TranslatorPortuguese : public TranslatorAdapter_1_8_0
     /*! Used as a heading for a list of Java class types with package scope.
      */
     virtual QCString trPackageTypes()
-    { 
+    {
       return "Tipos do Pacote";
     }
-    /*! Used as a heading for a list of Java class functions with package 
-     * scope. 
+    /*! Used as a heading for a list of Java class functions with package
+     * scope.
      */
     virtual QCString trPackageMembers()
-    { 
+    {
       return "Funções do Pacote";
     }
-    /*! Used as a heading for a list of static Java class functions with 
+    /*! Used as a heading for a list of static Java class functions with
      *  package scope.
      */
     virtual QCString trStaticPackageMembers()
-    { 
+    {
       return "Funções Estáticas do Pacote";
     }
-    /*! Used as a heading for a list of Java class variables with package 
+    /*! Used as a heading for a list of Java class variables with package
      * scope.
      */
     virtual QCString trPackageAttribs()
-    { 
+    {
       return "Atributos do Pacote";
     }
-    /*! Used as a heading for a list of static Java class variables with 
+    /*! Used as a heading for a list of static Java class variables with
      * package scope.
      */
     virtual QCString trStaticPackageAttribs()
-    { 
+    {
       return "Atributos Estáticos do Pacote";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.3.1
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used in the quick index of a class/file/namespace member list page 
+    /*! Used in the quick index of a class/file/namespace member list page
      *  to link to the unfiltered list of all members.
      */
     virtual QCString trAll()
@@ -1436,7 +1432,7 @@ class TranslatorPortuguese : public TranslatorAdapter_1_8_0
     {
       return "Grafo de chamadas desta função:";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.3.3 - Based on the Brazilian Portuguese Translation
 //////////////////////////////////////////////////////////////////////////
@@ -1487,7 +1483,7 @@ class TranslatorPortuguese : public TranslatorAdapter_1_8_0
     {
       return "Resultados:";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.3.8
 //////////////////////////////////////////////////////////////////////////
@@ -1521,7 +1517,7 @@ class TranslatorPortuguese : public TranslatorAdapter_1_8_0
     virtual QCString trDirectories()
     { return "Diretórios"; }
 
-    /*! This returns a sentences that introduces the directory hierarchy. 
+    /*! This returns a sentences that introduces the directory hierarchy.
      *  and the fact that it is sorted alphabetically per level
      */
     virtual QCString trDirDescription()
@@ -1541,10 +1537,10 @@ class TranslatorPortuguese : public TranslatorAdapter_1_8_0
      *  (\a first_capital) and in sigular or plural form (\a singular).
      */
     virtual QCString trDir(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Diretório" : "diretório"));
       if (!singular) result+="s";
-      return result; 
+      return result;
     }
 //////////////////////////////////////////////////////////////////////////
 // new since 1.4.1
@@ -1558,7 +1554,7 @@ class TranslatorPortuguese : public TranslatorAdapter_1_8_0
        return "Este é um método provido por conveniência. "
        		"Ele difere do método acima apenas na lista de "
        		"argumentos que devem ser utilizados.";
-    }    
+    }
 
 //////////////////////////////////////////////////////////////////////////
 // new since 1.4.6
@@ -1570,22 +1566,22 @@ class TranslatorPortuguese : public TranslatorAdapter_1_8_0
       return "Este é o diagrama das funções que utilizam esta função:";
     }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for enumeration values
      */
     virtual QCString trEnumerationValueDocumentation()
     { return "Documentação da enumeração"; }
 
-  
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.5.4 (mainly for Fortran)
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! header that is put before the list of member subprograms (Fortran). */
     virtual QCString trMemberFunctionDocumentationFortran()
     { return "Documentação de Função Membro/Subrotina"; }
 
-    /*! This is put above each page as a link to the list of annotated data types (Fortran). */    
+    /*! This is put above each page as a link to the list of annotated data types (Fortran). */
     virtual QCString trCompoundListFortran()
     { return "Lista de Tipos de Dados"; }
 
@@ -1603,18 +1599,18 @@ class TranslatorPortuguese : public TranslatorAdapter_1_8_0
       QCString result="Esta é a lista de todos os membros ";
       if (!extractAll) result+="documentados ";
       result+="dos tipos de dados com links para ";
-      if (extractAll) 
+      if (extractAll)
       {
         result+="a documentação dos tipos de dados para cada membro:";
       }
-      else 
+      else
       {
         result+="os tipos de dados a que pertencem:";
       }
       return result;
     }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * annotated compound index (Fortran).
      */
     virtual QCString trCompoundIndexFortran()
@@ -1626,24 +1622,24 @@ class TranslatorPortuguese : public TranslatorAdapter_1_8_0
     virtual QCString trTypeDocumentation()
     { return "Documentação dos Tipos de Dados"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) subprograms (Fortran).
      */
     virtual QCString trSubprograms()
     { return "Funções/Subrotinas"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for subprograms (Fortran)
      */
     virtual QCString trSubprogramDocumentation()
     { return "Documentação da Função/Subrotina"; }
 
-    /*! This is used in the documentation of a file/namespace/group before 
+    /*! This is used in the documentation of a file/namespace/group before
      *  the list of links to documented compounds (Fortran)
      */
      virtual QCString trDataTypes()
     { return "Tipos de Dados"; }
-    
+
     /*! used as the title of page containing all the index of all modules (Fortran). */
     virtual QCString trModulesList()
     { return "Lista de Módulos"; }
@@ -1665,7 +1661,7 @@ class TranslatorPortuguese : public TranslatorAdapter_1_8_0
       QCString result = (QCString)"Referência ";
 
       if (isTemplate) result+="da Template ";
-      
+
       switch(compType)
       {
         case ClassDef::Class:      result+="do Modulo "; break;
@@ -1677,54 +1673,54 @@ class TranslatorPortuguese : public TranslatorAdapter_1_8_0
         case ClassDef::Exception:  result+="da Exceção "; break;
         default: break;
       }
-      result += clName; 
-     
+      result += clName;
+
       return result;
     }
     /*! used as the title of the HTML page of a module (Fortran) */
     virtual QCString trModuleReference(const char *namespaceName)
     {
       QCString result = "Referência do Módulo ";
-      result += namespaceName;        
+      result += namespaceName;
       return result;
     }
-    
+
     /*! This is put above each page as a link to all members of modules. (Fortran) */
     virtual QCString trModulesMembers()
     { return "Membros do Módulo"; }
 
     /*! This is an introduction to the page with all modules members (Fortran) */
     virtual QCString trModulesMemberDescription(bool extractAll)
-    { 
+    {
       QCString result="Esta é a lista de todos os membros ";
       if (!extractAll) result+="documentados ";
       result+="dos módulos com links para ";
-      if (extractAll) 
+      if (extractAll)
       {
         result+="a documentação dos módulos para cada membro:";
       }
-      else 
+      else
       {
         result+="os módulos a que pertencem:";
       }
       return result;
     }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      *  index of all modules (Fortran).
      */
     virtual QCString trModulesIndex()
     { return "Índice dos Módulos"; }
-    
+
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trModule(bool first_capital, bool singular)
-    {       
+    {
       QCString result((first_capital ? "Modulo" : "modulo"));
       if (!singular)  result+="s";
-      return result; 
+      return result;
     }
     /*! This is put at the bottom of a module documentation page and is
      *  followed by a list of files that were used to generate the page.
@@ -1745,41 +1741,41 @@ class TranslatorPortuguese : public TranslatorAdapter_1_8_0
         case ClassDef::Exception:  result+="esta exceção "; break;
         default: break;
       }
-      
+
       result+=" foi gerada a partir do";
-      if (single) 
+      if (single)
     	result+=" seguinte ficheiro:";
       else
     	result+="s seguintes ficheiros:";
-      
+
       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 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trType(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Tipo" : "tipo"));
       if (!singular)  result+="s";
-      return result; 
+      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 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trSubprogram(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Subprograma" : "subprograma"));
       if (!singular)  result+="s";
-      return result; 
+      return result;
     }
 
     /*! C# Type Contraint list */
     virtual QCString trTypeConstraints()
     {
       return "Restrições do Tipo";
-    }    
+    }
 
 //////////////////////////////////////////////////////////////////////////
 // new since 1.6.0 (mainly for the new search engine)
@@ -1844,7 +1840,7 @@ class TranslatorPortuguese : public TranslatorAdapter_1_8_0
       return (QCString)"Inclui ficheiro em "+name;
     }
 
-    /** Compiles a date string. 
+    /** Compiles a date string.
      *  @param year Year in 4 digits
      *  @param month Month of the year: 1=January
      *  @param day Day of the Month: 1..31
@@ -1870,7 +1866,7 @@ class TranslatorPortuguese : public TranslatorAdapter_1_8_0
       }
       return sdate;
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.7.5
 //////////////////////////////////////////////////////////////////////////
@@ -1889,7 +1885,7 @@ class TranslatorPortuguese : public TranslatorAdapter_1_8_0
 
     /*! Header for the graph showing the directory dependencies */
     virtual QCString trDirDepGraph(const char *name)
-    { return QCString("Grafo de dependências do directório ")+name+":"; }       
+    { return QCString("Grafo de dependências do directório ")+name+":"; }
 };
 
 #endif
diff --git a/src/translator_ro.h b/src/translator_ro.h
index 70da281..b9b5c48 100644
--- a/src/translator_ro.h
+++ b/src/translator_ro.h
@@ -75,12 +75,6 @@ class TranslatorRomanian : public Translator
       return "\\usepackage[romanian]{babel}\n";
     }
 
-    /*! return the language charset. This will be used for the HTML output */
-    virtual QCString idLanguageCharset()
-    {
-      return "utf-8";
-    }
-
     // --- Language translation methods -------------------
 
     /*! used in the compound documentation before a list of related functions. */
diff --git a/src/translator_ru.h b/src/translator_ru.h
index 5c8295a..8ac4fae 100644
--- a/src/translator_ru.h
+++ b/src/translator_ru.h
@@ -1,12 +1,12 @@
 /******************************************************************************
  *
- * 
+ *
  *
  * Copyright (C) 1997-2013 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 
+ * 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.
  *
@@ -36,13 +36,7 @@ class TranslatorRussian : public TranslatorAdapter_1_7_5
     /* Used to get the command(s) for the language support. */
     virtual QCString latexLanguageSupportCommand()
     {
-        return "\\usepackage[T2A]{fontenc}\n\\usepackage[russian]{babel}\n"; 
-    }
-
-    /*! return the language charset. This will be used for the HTML output */
-    virtual QCString idLanguageCharset()
-    {
-        return "utf-8"; 
+        return "\\usepackage[T2A]{fontenc}\n\\usepackage[russian]{babel}\n";
     }
 
     // --- Language translation methods -------------------
@@ -118,7 +112,7 @@ class TranslatorRussian : public TranslatorAdapter_1_7_5
     virtual QCString trGeneratedAutomatically(const char *s)
     { QCString result="Автоматически создано Doxygen";
       if (s) result+=QCString(" для ")+s;
-      result+=" из исходного текста."; 
+      result+=" из исходного текста.";
       return result;
     }
 
@@ -136,7 +130,7 @@ class TranslatorRussian : public TranslatorAdapter_1_7_5
 
     // quick reference sections
 
-    /*! This is put above each page as a link to the list of all groups of 
+    /*! 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()
@@ -285,26 +279,26 @@ class TranslatorRussian : public TranslatorAdapter_1_7_5
     virtual QCString trModulesDescription()
     { return "Полный список групп."; }
 
-    // index titles (the project name is prepended for these) 
+    // index titles (the project name is prepended for these)
 
 
     /*! This is used in HTML as the title of index.html. */
     virtual QCString trDocumentation()
     { return "Документация"; }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * index of all groups.
      */
     virtual QCString trModuleIndex()
     { return "Алфавитный указатель групп"; }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * class hierarchy.
      */
     virtual QCString trHierarchicalIndex()
     { return "Иерархический список классов"; }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * annotated compound index.
      */
     virtual QCString trCompoundIndex()
@@ -368,43 +362,43 @@ class TranslatorRussian : public TranslatorAdapter_1_7_5
     virtual QCString trReferenceManual()
     { return "Оглавление"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of defines
      */
     virtual QCString trDefines()
     { return "Макросы"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of function prototypes
      */
     virtual QCString trFuncProtos()
     { return "Прототипы функций"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of typedefs
      */
     virtual QCString trTypedefs()
     { return "Определения типов"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of enumerations
      */
     virtual QCString trEnumerations()
     { return "Перечисления"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) functions
      */
     virtual QCString trFunctions()
     { return "Функции"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) variables
      */
     virtual QCString trVariables()
     { return "Переменные"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) variables
      */
     virtual QCString trEnumerationValues()
@@ -416,37 +410,37 @@ class TranslatorRussian : public TranslatorAdapter_1_7_5
     virtual QCString trDefineDocumentation()
     { return "Макросы"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for function prototypes
      */
     virtual QCString trFunctionPrototypeDocumentation()
     { return "Прототипы функций"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for typedefs
      */
     virtual QCString trTypedefDocumentation()
     { return "Типы"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for enumeration types
      */
     virtual QCString trEnumerationTypeDocumentation()
     { return "Перечисления"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for functions
      */
     virtual QCString trFunctionDocumentation()
     { return "Функции"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for variables
      */
     virtual QCString trVariableDocumentation()
     { return "Переменные"; }
 
-    /*! This is used in the documentation of a file/namespace/group before 
+    /*! This is used in the documentation of a file/namespace/group before
      *  the list of links to documented compounds
      */
     virtual QCString trCompounds()
@@ -456,20 +450,20 @@ class TranslatorRussian : public TranslatorAdapter_1_7_5
         return "Структуры данных";
       }
       else
-      { 
+      {
         return "Классы";
       }
 
     }
 
-    /*! This is used in the documentation of a group before the list of 
+    /*! This is used in the documentation of a group before the list of
      *  links to documented files
      */
-    /*! This is used in the standard footer of each page and indicates when 
-     *  the page was generated 
+    /*! 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="Документация ";
       if (projName) result+=QCString("по ")+projName;
       result+=QCString(". Последние изменения: ")+date;
@@ -524,11 +518,11 @@ class TranslatorRussian : public TranslatorAdapter_1_7_5
     /*! this text is used in the title page of a LaTeX document. */
     virtual QCString trGeneratedBy()
     { return "Создано системой"; }
-    
+
 //////////////////////////////////////////////////////////////////////////
-// new since 0.49-990307 
+// new since 0.49-990307
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! used as the title of page containing all the index of all namespaces. */
     virtual QCString trNamespaceList()
     { return "Пространства имен"; }
@@ -551,14 +545,14 @@ class TranslatorRussian : public TranslatorAdapter_1_7_5
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990405
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! used in the class documentation as a header before the list of all
-     * related classes 
+     * related classes
      */
     virtual QCString trRelatedFunctionDocumentation()
     { return "Документация по друзьям класса и функциям, отноносящимся"
         " к классу"; }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990425
 //////////////////////////////////////////////////////////////////////////
@@ -569,7 +563,7 @@ class TranslatorRussian : public TranslatorAdapter_1_7_5
                                  bool isTemplate)
     {
       QCString result;
-      if (isTemplate) 
+      if (isTemplate)
       {
         result="Шаблон ";
         switch(compType)
@@ -613,7 +607,7 @@ class TranslatorRussian : public TranslatorAdapter_1_7_5
     {
       return QCString("Пространство имен ")+namespaceName;
     }
-    
+
     virtual QCString trPublicMembers()
     { return "Открытые члены"; }
     virtual QCString trPublicSlots()
@@ -634,7 +628,7 @@ class TranslatorRussian : public TranslatorAdapter_1_7_5
     { return "Закрытые слоты"; }
     virtual QCString trStaticPrivateMembers()
     { return "Закрытые статические члены"; }
-    
+
     /*! this function is used to produce a comma-separated list of items.
      *  use generateMarker(i) to indicate where item i should be put.
      */
@@ -643,23 +637,23 @@ class TranslatorRussian : public TranslatorAdapter_1_7_5
       QCString result;
       int i;
       // the inherits list contain `numEntries' classes
-      for (i=0;i<numEntries;i++) 
+      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 
+        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 
+          if (i<numEntries-2) // not the fore last entry
             result+=", ";
           else                // the fore last entry
             result+=" и ";
         }
       }
-      return result; 
+      return result;
     }
-    
+
     /*! used in class documentation to produce a list of base classes,
      *  if class diagrams are disabled.
      */
@@ -676,7 +670,7 @@ class TranslatorRussian : public TranslatorAdapter_1_7_5
       return "Производные классы:"+trWriteList(numEntries)+".";
     }
 
-    /*! used in member documentation blocks to produce a list of 
+    /*! used in member documentation blocks to produce a list of
      *  members that are hidden by this one.
      */
     virtual QCString trReimplementedFromList(int numEntries)
@@ -710,7 +704,7 @@ class TranslatorRussian : public TranslatorAdapter_1_7_5
       return result;
     }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      *  index of all namespaces.
      */
     virtual QCString trNamespaceIndex()
@@ -746,10 +740,10 @@ class TranslatorRussian : public TranslatorAdapter_1_7_5
       QCString result=QCString("Объявления и описания членов ");
       switch(compType)
       {
-        case ClassDef::Class:      result+="класс"; 
+        case ClassDef::Class:      result+="класс";
           if (single) result+="а"; else result+="ов";
           break;
-        case ClassDef::Struct:     result+="структур"; 
+        case ClassDef::Struct:     result+="структур";
           if (single) result+="ы";
           break;
         case ClassDef::Union:      result+="объединени";
@@ -767,7 +761,7 @@ class TranslatorRussian : public TranslatorAdapter_1_7_5
         case ClassDef::Exception:  result+="исключени";
           if (single) result+="я"; else result+="й";
           break;
-        default: 
+        default:
           break;
       }
       result+=" находятся в файл";
@@ -794,7 +788,7 @@ class TranslatorRussian : public TranslatorAdapter_1_7_5
     virtual QCString trMainPage()
     { return "Титульная страница"; }
 
-    /*! This is used in references to page that are put in the LaTeX 
+    /*! 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()
@@ -839,7 +833,7 @@ class TranslatorRussian : public TranslatorAdapter_1_7_5
     /*! header that is put before the list of constructor/destructors. */
     virtual QCString trConstructorDocumentation()
     {
-      return "Конструктор(ы)"; 
+      return "Конструктор(ы)";
     }
     /*! Used in the file documentation to point to the corresponding sources. */
     virtual QCString trGotoSourceCode()
@@ -896,7 +890,7 @@ class TranslatorRussian : public TranslatorAdapter_1_7_5
 //////////////////////////////////////////////////////////////////////////
 // new since 1.1.0
 //////////////////////////////////////////////////////////////////////////
-    
+
     virtual QCString trNote()
     {
       return "Заметки";
@@ -988,7 +982,7 @@ class TranslatorRussian : public TranslatorAdapter_1_7_5
     {
       return "Начиная с";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.1.5
 //////////////////////////////////////////////////////////////////////////
@@ -1001,7 +995,7 @@ class TranslatorRussian : public TranslatorAdapter_1_7_5
     /*! page explaining how the dot graph's should be interpreted */
     virtual QCString trLegendDocs()
     {
-      return 
+      return
         "Обозначения, используемые в графах.<p>\n"
         "Рассмотрим следующий пример:\n"
         "\\code\n"
@@ -1070,7 +1064,7 @@ class TranslatorRussian : public TranslatorAdapter_1_7_5
 //////////////////////////////////////////////////////////////////////////
 // new since 1.2.0
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! Used as a marker that is put before a test item */
     virtual QCString trTest()
     {
@@ -1152,7 +1146,7 @@ class TranslatorRussian : public TranslatorAdapter_1_7_5
 //////////////////////////////////////////////////////////////////////////
 // new since 1.2.5
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! Used as a marker that is put before a \\bug item */
     virtual QCString trBug()
     {
@@ -1184,15 +1178,15 @@ class TranslatorRussian : public TranslatorAdapter_1_7_5
     }
 
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trClass(bool first_capital, bool singular)
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
         QCString result((first_capital ? "Структуры данных" : "структуры данных"));
-        return result; 
+        return result;
       }
       else
       {
@@ -1203,69 +1197,69 @@ class TranslatorRussian : public TranslatorAdapter_1_7_5
     }
 
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  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 ? "Файл" : "файл"));
       if (!singular)  result+="ы";
-      return result; 
+      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 
+     *  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 ? "Пространств" : "пространств"));
       result+=(singular?"о имен":"а имен");
-      return result; 
+      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 
+     *  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 ? "Групп" : "групп"));
       result+=(singular ? "а" : "ы");
-      return result; 
+      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 
+     *  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 ? "Страниц" : "страниц"));
       result+=(singular ? "а" : "ы");
       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 
+     *  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 ? "Член" : "член"));
       if (!singular)  result+="ы";
-      return result; 
+      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 
+     *  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 ? "Глобальны" : "глобальны"));
       result+=(singular ? "й" : "е");
-      return result; 
+      return result;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1275,7 +1269,7 @@ class TranslatorRussian : public TranslatorAdapter_1_7_5
     /*! 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 ? "Автор" : "автор"));
       if (!singular) result+="ы";
       return result;
@@ -1296,7 +1290,7 @@ class TranslatorRussian : public TranslatorAdapter_1_7_5
 // new since 1.2.13
 //////////////////////////////////////////////////////////////////////////
 
-    /*! used in member documentation blocks to produce a list of 
+    /*! used in member documentation blocks to produce a list of
      *  members that are implemented by this one.
      */
     virtual QCString trImplementedFromList(int numEntries)
@@ -1328,8 +1322,8 @@ class TranslatorRussian : public TranslatorAdapter_1_7_5
 // new since 1.2.17
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as the header of the list of item that have been 
-     *  flagged deprecated 
+    /*! Used as the header of the list of item that have been
+     *  flagged deprecated
      */
     virtual QCString trDeprecatedList()
     {
@@ -1340,7 +1334,7 @@ class TranslatorRussian : public TranslatorAdapter_1_7_5
 // new since 1.2.18
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as a header for declaration section of the events found in 
+    /*! Used as a header for declaration section of the events found in
      * a C# program
      */
     virtual QCString trEvents()
@@ -1360,43 +1354,43 @@ class TranslatorRussian : public TranslatorAdapter_1_7_5
     /*! Used as a heading for a list of Java class types with package scope.
      */
     virtual QCString trPackageTypes()
-    { 
+    {
       return "Типы с областью видимости пакета";
     }
-    /*! Used as a heading for a list of Java class functions with package 
-     * scope. 
+    /*! Used as a heading for a list of Java class functions with package
+     * scope.
      */
     virtual QCString trPackageMembers()
-    { 
+    {
       return "Функции с областью видимости пакета";
     }
-    /*! Used as a heading for a list of static Java class functions with 
+    /*! Used as a heading for a list of static Java class functions with
      *  package scope.
      */
     virtual QCString trStaticPackageMembers()
-    { 
+    {
       return "Статические функции с областью видимости пакета";
     }
-    /*! Used as a heading for a list of Java class variables with package 
+    /*! Used as a heading for a list of Java class variables with package
      * scope.
      */
     virtual QCString trPackageAttribs()
-    { 
+    {
       return "Переменные с областью видимости пакета";
     }
-    /*! Used as a heading for a list of static Java class variables with 
+    /*! Used as a heading for a list of static Java class variables with
      * package scope.
      */
     virtual QCString trStaticPackageAttribs()
-    { 
+    {
       return "Статические переменные с областью видимости пакета";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.3.1
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used in the quick index of a class/file/namespace member list page 
+    /*! Used in the quick index of a class/file/namespace member list page
      *  to link to the unfiltered list of all members.
      */
     virtual QCString trAll()
@@ -1413,9 +1407,9 @@ class TranslatorRussian : public TranslatorAdapter_1_7_5
 // new since 1.3.3
 //////////////////////////////////////////////////////////////////////////
 
-    /*! When the search engine is enabled this text is put in the header 
-     *  of each page before the field where one can enter the text to search 
-     *  for. 
+    /*! When the search engine is enabled this text is put in the header
+     *  of each page before the field where one can enter the text to search
+     *  for.
      */
     virtual QCString trSearchForIndex()
     {
@@ -1432,7 +1426,7 @@ class TranslatorRussian : public TranslatorAdapter_1_7_5
      *  text can be different depending on the number of documents found.
      *  Inside the text you can put the special marker $num to insert
      *  the number representing the actual number of search results.
-     *  The @a numDocuments parameter can be either 0, 1 or 2, where the 
+     *  The @a numDocuments parameter can be either 0, 1 or 2, where the
      *  value 2 represents 2 or more matches. HTML markup is allowed inside
      *  the returned string.
      */
@@ -1446,13 +1440,13 @@ class TranslatorRussian : public TranslatorAdapter_1_7_5
       {
         return "Найден 1 документ.";
       }
-      else 
+      else
       {
         return "Найден(о) <b>$num</b> документ(ов). "
           "Документы отсортированы по релевантности.";
       }
     }
-    /*! This string is put before the list of matched words, for each search 
+    /*! This string is put before the list of matched words, for each search
      *  result. What follows is the list of words that matched the query.
      */
     virtual QCString trSearchMatches()
@@ -1493,7 +1487,7 @@ class TranslatorRussian : public TranslatorAdapter_1_7_5
     virtual QCString trDirectories()
     { return "Алфавитный указатель директорий"; }
 
-    /*! This returns a sentences that introduces the directory hierarchy. 
+    /*! This returns a sentences that introduces the directory hierarchy.
      *  and the fact that it is sorted alphabetically per level
      */
     virtual QCString trDirDescription()
@@ -1509,10 +1503,10 @@ class TranslatorRussian : public TranslatorAdapter_1_7_5
      *  (\a first_capital) and in sigular or plural form (\a singular).
      */
     virtual QCString trDir(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Директори" : "директори"));
       if (singular) result+="я"; else result+="и";
-      return result; 
+      return result;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1539,7 +1533,7 @@ class TranslatorRussian : public TranslatorAdapter_1_7_5
       return "Граф вызова функции:";
     }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for enumeration values
      */
     virtual QCString trEnumerationValueDocumentation()
@@ -1551,12 +1545,12 @@ class TranslatorRussian : public TranslatorAdapter_1_7_5
 //////////////////////////////////////////////////////////////////////////
     // Простите переводчика, уже лет 20 не писал на фортране...
     // Любые замечания приму с благодарностью.
-    
+
     /*! header that is put before the list of member subprograms (Fortran). */
     virtual QCString trMemberFunctionDocumentationFortran()
     { return "Функции/подпрограммы"; }
 
-    /*! This is put above each page as a link to the list of annotated data types (Fortran). */    
+    /*! This is put above each page as a link to the list of annotated data types (Fortran). */
     virtual QCString trCompoundListFortran()
     { return "Типы данных"; }
 
@@ -1577,18 +1571,18 @@ class TranslatorRussian : public TranslatorAdapter_1_7_5
         result+="документированных ";
       }
       result+="членов типа со ссылками ";
-      if (!extractAll) 
+      if (!extractAll)
       {
 	result+="на документацию для каждого члена:";
       }
-      else 
+      else
       {
          result+="на содержащую структуру:";
       }
       return result;
     }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * annotated compound index (Fortran).
      */
     virtual QCString trCompoundIndexFortran()
@@ -1600,24 +1594,24 @@ class TranslatorRussian : public TranslatorAdapter_1_7_5
     virtual QCString trTypeDocumentation()
     { return "Оглавление типов данных"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) subprograms (Fortran).
      */
     virtual QCString trSubprograms()
     { return "Функции/подпрограммы"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for subprograms (Fortran)
      */
     virtual QCString trSubprogramDocumentation()
     { return "Функции/подпрограммы"; }
 
-    /*! This is used in the documentation of a file/namespace/group before 
+    /*! This is used in the documentation of a file/namespace/group before
      *  the list of links to documented compounds (Fortran)
      */
      virtual QCString trDataTypes()
     { return "Типы данных"; }
-    
+
     /*! used as the title of page containing all the index of all modules (Fortran). */
     virtual QCString trModulesList()
     { return "Указатель модулей"; }
@@ -1637,7 +1631,7 @@ class TranslatorRussian : public TranslatorAdapter_1_7_5
                                     bool isTemplate)
     {
       QCString result=(QCString)clName;
-      if (isTemplate) 
+      if (isTemplate)
       {
 	switch(compType)
 	{
@@ -1673,43 +1667,43 @@ class TranslatorRussian : public TranslatorAdapter_1_7_5
     {
       return QCString("Модуль ") + namespaceName;
     }
-    
+
     /*! This is put above each page as a link to all members of modules. (Fortran) */
     virtual QCString trModulesMembers()
     { return "Члены модуля"; }
 
     /*! This is an introduction to the page with all modules members (Fortran) */
     virtual QCString trModulesMemberDescription(bool extractAll)
-    { 
+    {
       QCString result="Список всех ";
       if (!extractAll) result+="документированных ";
       result+="модулей со ссылками ";
-      if (extractAll) 
+      if (extractAll)
       {
         result+="на документацию для каждого члена:";
       }
-      else 
+      else
       {
         result+="на модули, их содержащие:";
       }
       return result;
     }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      *  index of all modules (Fortran).
      */
     virtual QCString trModulesIndex()
     { return "Указатель модулей"; }
-    
+
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trModule(bool first_capital, bool singular)
-    {       
+    {
       QCString result((first_capital ? "Модул" : "модул"));
-      if (singular)  result+="ь"; else result+="и"; 
-      return result; 
+      if (singular)  result+="ь"; else result+="и";
+      return result;
     }
     /*! This is put at the bottom of a module documentation page and is
      *  followed by a list of files that were used to generate the page.
@@ -1735,24 +1729,24 @@ class TranslatorRussian : public TranslatorAdapter_1_7_5
       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 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trType(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Тип" : "тип"));
       if (!singular)  result+="ы";
-      return result; 
+      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 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trSubprogram(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Подпрограмм" : "подпрограмм"));
-      if (singular)  result+="а"; else result+="ы"; 
-      return result; 
+      if (singular)  result+="а"; else result+="ы";
+      return result;
     }
 
     /*! C# Type Constraint list */
@@ -1822,7 +1816,7 @@ class TranslatorRussian : public TranslatorAdapter_1_7_5
       return (QCString)"Включает файл в "+name;
     }
 
-    /** Compiles a date string. 
+    /** Compiles a date string.
      *  @param year Year in 4 digits
      *  @param month Month of the year: 1=January
      *  @param day Day of the Month: 1..31
diff --git a/src/translator_sc.h b/src/translator_sc.h
index edf5ba2..5685576 100644
--- a/src/translator_sc.h
+++ b/src/translator_sc.h
@@ -1,12 +1,12 @@
 /******************************************************************************
  *
- * 
+ *
  *
  * Copyright (C) 1997-2013 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 
+ * 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.
  *
@@ -18,7 +18,7 @@
 #ifndef TRANSLATOR_SC_H
 #define TRANSLATOR_SC_H
 
-/*! 
+/*!
  When defining a translator class for the new language, follow
  the description in the documentation.  One of the steps says
  that you should copy the translator_en.h (this) file to your
@@ -45,19 +45,19 @@ class TranslatorSerbianCyrilic : public TranslatorAdapter_1_6_0
   public:
 
     // --- Language control methods -------------------
-    
-    /*! Used for identification of the language. The identification 
-     * should not be translated. It should be replaced by the name 
+
+    /*! 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 should be equal to 
+     * (e.g. "czech", "japanese", "russian", etc.). It should be equal to
      * the identification used in language.cpp.
      */
     virtual QCString idLanguage()
     { return "serbiancyr"; }
-    
-    /*! Used to get the LaTeX command(s) for the language support. 
+
+    /*! 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 
+     *  LaTeX to the desired language.  For example
      *  <pre>"\\usepackage[german]{babel}\n"
      *  </pre>
      *  or
@@ -65,7 +65,7 @@ class TranslatorSerbianCyrilic : public TranslatorAdapter_1_6_0
      *  "\\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.
      */
@@ -74,12 +74,6 @@ class TranslatorSerbianCyrilic : public TranslatorAdapter_1_6_0
       return "";
     }
 
-    /*! return the language charset. This will be used for the HTML output */
-    virtual QCString idLanguageCharset()
-    {
-      return "utf-8";
-    }
-
     // --- Language translation methods -------------------
 
     /*! used in the compound documentation before a list of related functions. */
@@ -97,30 +91,30 @@ class TranslatorSerbianCyrilic : public TranslatorAdapter_1_6_0
     /*! header that is put before the list of typedefs. */
     virtual QCString trMemberTypedefDocumentation()
     { return "Документација дефиниције типа"; }
-    
+
     /*! header that is put before the list of enumerations. */
     virtual QCString trMemberEnumerationDocumentation()
     { return "Документација члана набрајања"; }
-    
+
     /*! header that is put before the list of member functions. */
     virtual QCString trMemberFunctionDocumentation()
     { return "Документација функције чланице"; }
-    
+
     /*! header that is put before the list of member attributes. */
     virtual QCString trMemberDataDocumentation()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Документација поља"; 
+        return "Документација поља";
       }
       else
       {
-        return "Документација атрибута"; 
+        return "Документација атрибута";
       }
     }
 
     /*! this is the text of a link put after brief descriptions. */
-    virtual QCString trMore() 
+    virtual QCString trMore()
     { return "Још..."; }
 
     /*! put in the class documentation */
@@ -138,81 +132,81 @@ class TranslatorSerbianCyrilic : public TranslatorAdapter_1_6_0
     /*! this is the remainder of the sentence after the class name */
     virtual QCString trIncludingInheritedMembers()
     { return ", укључујући све наслеђене чланове."; }
-    
+
     /*! 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="Аутоматски направљено помоћу Doxygen-а";
       if (s) result+=(QCString)" за "+s;
-      result+=" из изворног кода."; 
+      result+=" из изворног кода.";
       return result;
     }
 
     /*! put after an enum name in the list of all members */
     virtual QCString trEnumName()
     { return "назив набрајања"; }
-    
+
     /*! put after an enum value in the list of all members */
     virtual QCString trEnumValue()
     { return "вредност набрајања"; }
-    
+
     /*! put after an undocumented member in the list of all members */
     virtual QCString trDefinedIn()
     { return "дефинисано у"; }
 
     // quick reference sections
 
-    /*! This is put above each page as a link to the list of all groups of 
+    /*! 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 "Модули"; }
-    
+
     /*! This is put above each page as a link to the class hierarchy */
     virtual QCString trClassHierarchy()
     { return "Хијерархија класа"; }
-    
+
     /*! This is put above each page as a link to the list of annotated classes */
     virtual QCString trCompoundList()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
         return "Структуре";
       }
       else
       {
-        return "Списак класа"; 
+        return "Списак класа";
       }
     }
-    
+
     /*! This is put above each page as a link to the list of documented files */
     virtual QCString trFileList()
     { return "Списак датотека"; }
 
     /*! 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 "Поља"; 
+        return "Поља";
       }
       else
       {
-        return "Чланови класе"; 
+        return "Чланови класе";
       }
     }
 
     /*! This is put above each page as a link to all members of files. */
     virtual QCString trFileMembers()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Глобално"; 
+        return "Глобално";
       }
       else
       {
-        return "Чланови датотеке"; 
+        return "Чланови датотеке";
       }
     }
 
@@ -245,16 +239,16 @@ class TranslatorSerbianCyrilic : public TranslatorAdapter_1_6_0
 
     /*! This is an introduction to the annotated compound list. */
     virtual QCString trCompoundListDescription()
-    { 
-      
+    {
+
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Овде су структуре са кратким описима:"; 
+        return "Овде су структуре са кратким описима:";
       }
       else
       {
         return "Овде су класе, структуре, "
-               "уније и интерфејси са кратким описима:"; 
+               "уније и интерфејси са кратким описима:";
       }
     }
 
@@ -275,7 +269,7 @@ class TranslatorSerbianCyrilic : public TranslatorAdapter_1_6_0
         result+="чланова класа";
       }
       result+=" са везама ка ";
-      if (!extractAll) 
+      if (!extractAll)
       {
         if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
         {
@@ -286,7 +280,7 @@ class TranslatorSerbianCyrilic : public TranslatorAdapter_1_6_0
           result+="документацији класе за сваки члан:";
         }
       }
-      else 
+      else
       {
         if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
         {
@@ -305,7 +299,7 @@ class TranslatorSerbianCyrilic : public TranslatorAdapter_1_6_0
     {
       QCString result="Овде је списак свих ";
       if (!extractAll) result+="документованих ";
-      
+
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
         result+="фрункција, променљивих, макро замена, набрајања, и дефиниција типова";
@@ -315,9 +309,9 @@ class TranslatorSerbianCyrilic : public TranslatorAdapter_1_6_0
         result+="чланова датотеке";
       }
       result+=" са везама ка ";
-      if (extractAll) 
+      if (extractAll)
         result+="датотекама којима припадају:";
-      else 
+      else
         result+="документацији:";
       return result;
     }
@@ -334,43 +328,43 @@ class TranslatorSerbianCyrilic : public TranslatorAdapter_1_6_0
     virtual QCString trModulesDescription()
     { return "Овде је списак свих модула:"; }
 
-    // index titles (the project name is prepended for these) 
+    // index titles (the project name is prepended for these)
 
     /*! This is used in HTML as the title of index.html. */
     virtual QCString trDocumentation()
     { return "Документација"; }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * index of all groups.
      */
     virtual QCString trModuleIndex()
     { return "Индекс модула"; }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * class hierarchy.
      */
     virtual QCString trHierarchicalIndex()
     { return "Хијерархијски индекс"; }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * annotated compound index.
      */
     virtual QCString trCompoundIndex()
     {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
-      { 
+      {
         return "Индекс структура";
       }
       else
       {
-        return "Индекс класа"; 
+        return "Индекс класа";
       }
     }
 
     /*! This is used in LaTeX as the title of the chapter with the
      * list of all files.
      */
-    virtual QCString trFileIndex() 
+    virtual QCString trFileIndex()
     { return "Индекс датотека"; }
 
     /*! This is used in LaTeX as the title of the chapter containing
@@ -383,14 +377,14 @@ class TranslatorSerbianCyrilic : public TranslatorAdapter_1_6_0
      *  the documentation of all classes, structs and unions.
      */
     virtual QCString trClassDocumentation()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Документација структуре"; 
+        return "Документација структуре";
       }
       else
       {
-        return "Документација класе"; 
+        return "Документација класе";
       }
     }
 
@@ -415,105 +409,105 @@ class TranslatorSerbianCyrilic : public TranslatorAdapter_1_6_0
     /*! This is used in LaTeX as the title of the document */
     virtual QCString trReferenceManual()
     { return "Приручник"; }
-    
-    /*! This is used in the documentation of a file as a header before the 
+
+    /*! This is used in the documentation of a file as a header before the
      *  list of defines
      */
     virtual QCString trDefines()
     { return "Дефиниције"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of function prototypes
      */
     virtual QCString trFuncProtos()
     { return "Декларације функција"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of typedefs
      */
     virtual QCString trTypedefs()
     { return "Дефиниције типова"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of enumerations
      */
     virtual QCString trEnumerations()
     { return "Набрајања"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) functions
      */
     virtual QCString trFunctions()
     { return "Функције"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) variables
      */
     virtual QCString trVariables()
     { return "Променљиве"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) variables
      */
     virtual QCString trEnumerationValues()
     { return "Вредности набрајања"; }
-    
+
     /*! This is used in the documentation of a file before the list of
      *  documentation blocks for defines
      */
     virtual QCString trDefineDocumentation()
     { return "Документација дефиниције"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for function prototypes
      */
     virtual QCString trFunctionPrototypeDocumentation()
     { return "Документација декларације функције"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for typedefs
      */
     virtual QCString trTypedefDocumentation()
     { return "Документација дефиниције типа"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for enumeration types
      */
     virtual QCString trEnumerationTypeDocumentation()
     { return "Документација набрајања"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for functions
      */
     virtual QCString trFunctionDocumentation()
     { return "Документација функције"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for variables
      */
     virtual QCString trVariableDocumentation()
     { return "Документација променљиве"; }
 
-    /*! This is used in the documentation of a file/namespace/group before 
+    /*! This is used in the documentation of a file/namespace/group before
      *  the list of links to documented compounds
      */
     virtual QCString trCompounds()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Структуре"; 
+        return "Структуре";
       }
       else
       {
-        return "Класе"; 
+        return "Класе";
       }
     }
 
-    /*! This is used in the standard footer of each page and indicates when 
-     *  the page was generated 
+    /*! 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)"Направљено "+date;
       if (projName) result+=(QCString)" за "+projName;
       result+=(QCString)" помоћу";
@@ -531,7 +525,7 @@ class TranslatorSerbianCyrilic : public TranslatorAdapter_1_6_0
     {
       return (QCString)"Дијаграм наслеђивања за "+clName+":";
     }
-    
+
     /*! this text is generated when the \\internal command is used. */
     virtual QCString trForInternalUseOnly()
     { return "Само за унутрашњу употребу."; }
@@ -563,7 +557,7 @@ class TranslatorSerbianCyrilic : public TranslatorAdapter_1_6_0
     /*! this text is generated when the \\exception command is used. */
     virtual QCString trExceptions()
     { return "Изизеци"; }
-    
+
     /*! this text is used in the title page of a LaTeX document. */
     virtual QCString trGeneratedBy()
     { return "Направљено помоћу"; }
@@ -571,7 +565,7 @@ class TranslatorSerbianCyrilic : public TranslatorAdapter_1_6_0
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990307
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! used as the title of page containing all the index of all namespaces. */
     virtual QCString trNamespaceList()
     { return "Списак простора имена"; }
@@ -590,17 +584,17 @@ class TranslatorSerbianCyrilic : public TranslatorAdapter_1_6_0
      */
     virtual QCString trFriends()
     { return "Пријатељи"; }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990405
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! used in the class documentation as a header before the list of all
-     * related classes 
+     * related classes
      */
     virtual QCString trRelatedFunctionDocumentation()
     { return "Документација за пријатеље и повезане функције"; }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990425
 //////////////////////////////////////////////////////////////////////////
@@ -611,7 +605,7 @@ class TranslatorSerbianCyrilic : public TranslatorAdapter_1_6_0
                                     bool isTemplate)
     {
       QCString result=(QCString)clName;
-      if (isTemplate) 
+      if (isTemplate)
       {
         result+=" Шаблон";
         switch(compType)
@@ -625,8 +619,8 @@ class TranslatorSerbianCyrilic : public TranslatorAdapter_1_6_0
           case ClassDef::Exception:  result+="ски изузетак"; break;
           default: break;
         }
-      } 
-      else 
+      }
+      else
       {
         result+=" Референца";
         switch(compType)
@@ -648,7 +642,7 @@ class TranslatorSerbianCyrilic : public TranslatorAdapter_1_6_0
     virtual QCString trFileReference(const char *fileName)
     {
       QCString result=fileName;
-      result+=" Референца датотеке"; 
+      result+=" Референца датотеке";
       return result;
     }
 
@@ -659,7 +653,7 @@ class TranslatorSerbianCyrilic : public TranslatorAdapter_1_6_0
       result+=" Референца простора имена";
       return result;
     }
-    
+
     virtual QCString trPublicMembers()
     { return "Јавне функције чланице"; }
     virtual QCString trPublicSlots()
@@ -680,7 +674,7 @@ class TranslatorSerbianCyrilic : public TranslatorAdapter_1_6_0
     { return "Приватни слотови"; }
     virtual QCString trStaticPrivateMembers()
     { return "Статичке приватне функције чланице"; }
-    
+
     /*! this function is used to produce a comma-separated list of items.
      *  use generateMarker(i) to indicate where item i should be put.
      */
@@ -689,23 +683,23 @@ class TranslatorSerbianCyrilic : public TranslatorAdapter_1_6_0
       QCString result;
       int i;
       // the inherits list contain `numEntries' classes
-      for (i=0;i<numEntries;i++) 
+      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 
+        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 
+          if (i<numEntries-2) // not the fore last entry
             result+=", ";
           else                // the fore last entry
             result+=" и ";
         }
       }
-      return result; 
+      return result;
     }
-    
+
     /*! used in class documentation to produce a list of base classes,
      *  if class diagrams are disabled.
      */
@@ -722,7 +716,7 @@ class TranslatorSerbianCyrilic : public TranslatorAdapter_1_6_0
       return "Наслеђују "+trWriteList(numEntries)+".";
     }
 
-    /*! used in member documentation blocks to produce a list of 
+    /*! used in member documentation blocks to produce a list of
      *  members that are hidden by this one.
      */
     virtual QCString trReimplementedFromList(int numEntries)
@@ -744,17 +738,17 @@ class TranslatorSerbianCyrilic : public TranslatorAdapter_1_6_0
 
     /*! This is an introduction to the page with all namespace members */
     virtual QCString trNamespaceMemberDescription(bool extractAll)
-    { 
+    {
       QCString result="Овде је списак свих ";
       if (!extractAll) result+="документованих ";
       result+="чланова простора имена са везама ка ";
-      if (extractAll) 
+      if (extractAll)
         result+="документацији простора имена за сваки члан:";
-      else 
+      else
         result+="просторима имена којима припадају:";
       return result;
     }
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      *  index of all namespaces.
      */
     virtual QCString trNamespaceIndex()
@@ -823,7 +817,7 @@ class TranslatorSerbianCyrilic : public TranslatorAdapter_1_6_0
     virtual QCString trMainPage()
     { return "Главна страница"; }
 
-    /*! This is used in references to page that are put in the LaTeX 
+    /*! 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()
@@ -868,7 +862,7 @@ class TranslatorSerbianCyrilic : public TranslatorAdapter_1_6_0
     /*! header that is put before the list of constructor/destructors. */
     virtual QCString trConstructorDocumentation()
     {
-      return "Документација конструктора и деструктора"; 
+      return "Документација конструктора и деструктора";
     }
     /*! Used in the file documentation to point to the corresponding sources. */
     virtual QCString trGotoSourceCode()
@@ -925,7 +919,7 @@ class TranslatorSerbianCyrilic : public TranslatorAdapter_1_6_0
 //////////////////////////////////////////////////////////////////////////
 // new since 1.1.0
 //////////////////////////////////////////////////////////////////////////
-    
+
     virtual QCString trNote()
     {
       return "Напомена";
@@ -1014,7 +1008,7 @@ class TranslatorSerbianCyrilic : public TranslatorAdapter_1_6_0
     {
       return "Од";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.1.5
 //////////////////////////////////////////////////////////////////////////
@@ -1024,12 +1018,12 @@ class TranslatorSerbianCyrilic : public TranslatorAdapter_1_6_0
     {
       return "Легенда графова";
     }
-    /*! page explaining how the dot graph's should be interpreted 
+    /*! 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 
+      return
         "Ова страница објашњава како тумачити графове који су направљени "
         "doxygen-ом.<p>\n"
         "Размотримо следећи пример:\n"
@@ -1094,11 +1088,11 @@ class TranslatorSerbianCyrilic : public TranslatorAdapter_1_6_0
     {
       return "легенда";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.2.0
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! Used as a marker that is put before a test item */
     virtual QCString trTest()
     {
@@ -1176,11 +1170,11 @@ class TranslatorSerbianCyrilic : public TranslatorAdapter_1_6_0
     {
       return "Вредност:";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.2.5
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! Used as a marker that is put before a \\bug item */
     virtual QCString trBug()
     {
@@ -1196,9 +1190,9 @@ class TranslatorSerbianCyrilic : public TranslatorAdapter_1_6_0
 // new since 1.2.6
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as ansicpg for RTF file 
-     * 
-     * The following table shows the correlation of Charset name, Charset Value and 
+    /*! 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
@@ -1219,15 +1213,15 @@ class TranslatorSerbianCyrilic : public TranslatorAdapter_1_6_0
      * GB2313_CHARSET          134 (x86)             936
      * CHINESEBIG5_CHARSET     136 (x88)             950
      * </pre>
-     * 
+     *
      */
     virtual QCString trRTFansicp()
     {
       return "1251";
     }
-    
 
-    /*! Used as ansicpg for RTF fcharset 
+
+    /*! Used as ansicpg for RTF fcharset
      *  \see trRTFansicp() for a table of possible values.
      */
     virtual QCString trRTFCharSet()
@@ -1240,82 +1234,82 @@ class TranslatorSerbianCyrilic : public TranslatorAdapter_1_6_0
     {
       return "Индекс";
     }
-   
+
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  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 ? "Клас" : "клас"));
       if (!singular)  result+="e"; else result+="a";
-      return result; 
+      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 
+     *  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 ? "Датотек" : "датотек"));
       if (!singular)  result+="e"; else result+="a";
-      return result; 
+      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 
+     *  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 ? "Простор" : "простор"));
       if (!singular)  result+="и имена"; else result+=" имена";
-      return result; 
+      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 
+     *  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 ? "Груп" : "груп"));
       if (!singular)  result+="е"; else result+="a";
-      return result; 
+      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 
+     *  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 ? "Страниц" : "страниц"));
       if (!singular)  result+="е"; else result += "a";
-      return result; 
+      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 
+     *  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 ? "Члан" : "члан"));
       if (!singular)  result+="ови";
-      return result; 
+      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 
+     *  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 ? "Глобалн" : "глобалн"));
       if (!singular)  result+="а"; else result+="о";
-      return result; 
+      return result;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1325,10 +1319,10 @@ class TranslatorSerbianCyrilic : public TranslatorAdapter_1_6_0
     /*! 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 ? "Аутор" : "аутор"));
       if (!singular)  result+="и";
-      return result; 
+      return result;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1346,7 +1340,7 @@ class TranslatorSerbianCyrilic : public TranslatorAdapter_1_6_0
 // new since 1.2.13
 //////////////////////////////////////////////////////////////////////////
 
-    /*! used in member documentation blocks to produce a list of 
+    /*! used in member documentation blocks to produce a list of
      *  members that are implemented by this one.
      */
     virtual QCString trImplementedFromList(int numEntries)
@@ -1378,8 +1372,8 @@ class TranslatorSerbianCyrilic : public TranslatorAdapter_1_6_0
 // new since 1.2.17
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as the header of the list of item that have been 
-     *  flagged deprecated 
+    /*! Used as the header of the list of item that have been
+     *  flagged deprecated
      */
     virtual QCString trDeprecatedList()
     {
@@ -1390,7 +1384,7 @@ class TranslatorSerbianCyrilic : public TranslatorAdapter_1_6_0
 // new since 1.2.18
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as a header for declaration section of the events found in 
+    /*! Used as a header for declaration section of the events found in
      * a C# program
      */
     virtual QCString trEvents()
@@ -1410,43 +1404,43 @@ class TranslatorSerbianCyrilic : public TranslatorAdapter_1_6_0
     /*! Used as a heading for a list of Java class types with package scope.
      */
     virtual QCString trPackageTypes()
-    { 
+    {
       return "Типови пакета";
     }
-    /*! Used as a heading for a list of Java class functions with package 
-     * scope. 
+    /*! Used as a heading for a list of Java class functions with package
+     * scope.
      */
     virtual QCString trPackageMembers()
-    { 
+    {
       return "Функције пакета";
     }
-    /*! Used as a heading for a list of static Java class functions with 
+    /*! Used as a heading for a list of static Java class functions with
      *  package scope.
      */
     virtual QCString trStaticPackageMembers()
-    { 
+    {
       return "Статичке функције пакета";
     }
-    /*! Used as a heading for a list of Java class variables with package 
+    /*! Used as a heading for a list of Java class variables with package
      * scope.
      */
     virtual QCString trPackageAttribs()
-    { 
+    {
       return "Атрибути пакета";
     }
-    /*! Used as a heading for a list of static Java class variables with 
+    /*! Used as a heading for a list of static Java class variables with
      * package scope.
      */
     virtual QCString trStaticPackageAttribs()
-    { 
+    {
       return "Статички атрибути пакета";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.3.1
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used in the quick index of a class/file/namespace member list page 
+    /*! Used in the quick index of a class/file/namespace member list page
      *  to link to the unfiltered list of all members.
      */
     virtual QCString trAll()
@@ -1463,9 +1457,9 @@ class TranslatorSerbianCyrilic : public TranslatorAdapter_1_6_0
 // new since 1.3.3
 //////////////////////////////////////////////////////////////////////////
 
-    /*! When the search engine is enabled this text is put in the header 
-     *  of each page before the field where one can enter the text to search 
-     *  for. 
+    /*! When the search engine is enabled this text is put in the header
+     *  of each page before the field where one can enter the text to search
+     *  for.
      */
     virtual QCString trSearchForIndex()
     {
@@ -1482,7 +1476,7 @@ class TranslatorSerbianCyrilic : public TranslatorAdapter_1_6_0
      *  text can be different depending on the number of documents found.
      *  Inside the text you can put the special marker $num to insert
      *  the number representing the actual number of search results.
-     *  The @a numDocuments parameter can be either 0, 1 or 2, where the 
+     *  The @a numDocuments parameter can be either 0, 1 or 2, where the
      *  value 2 represents 2 or more matches. HTML markup is allowed inside
      *  the returned string.
      */
@@ -1508,13 +1502,13 @@ class TranslatorSerbianCyrilic : public TranslatorAdapter_1_6_0
       {
         return "Пронађена <b>4</b> документа која одговарају упиту.";
       }
-      else 
+      else
       {
         return "Пронађено <b>$num</b> докумената који одговарају упиту. "
                "Приказују се прво најбољи поготци.";
       }
     }
-    /*! This string is put before the list of matched words, for each search 
+    /*! This string is put before the list of matched words, for each search
      *  result. What follows is the list of words that matched the query.
      */
     virtual QCString trSearchMatches()
@@ -1555,7 +1549,7 @@ class TranslatorSerbianCyrilic : public TranslatorAdapter_1_6_0
     virtual QCString trDirectories()
     { return "Директоријуми"; }
 
-    /*! This returns a sentences that introduces the directory hierarchy. 
+    /*! This returns a sentences that introduces the directory hierarchy.
      *  and the fact that it is sorted alphabetically per level
      */
     virtual QCString trDirDescription()
@@ -1573,10 +1567,10 @@ class TranslatorSerbianCyrilic : public TranslatorAdapter_1_6_0
      *  (\a first_capital) and in sigular or plural form (\a singular).
      */
     virtual QCString trDir(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Директоријум" : "директоријум"));
       if (singular) result+=""; else result+="и";
-      return result; 
+      return result;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1602,7 +1596,7 @@ class TranslatorSerbianCyrilic : public TranslatorAdapter_1_6_0
       return "Ово је граф функција које позивају ову функцију:";
     }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for enumeration values
      */
     virtual QCString trEnumerationValueDocumentation()
@@ -1611,12 +1605,12 @@ class TranslatorSerbianCyrilic : public TranslatorAdapter_1_6_0
 //////////////////////////////////////////////////////////////////////////
 // new since 1.5.4 (mainly for Fortran)
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! header that is put before the list of member subprograms (Fortran). */
     virtual QCString trMemberFunctionDocumentationFortran()
     { return "Документацијаr функције чланице, односно потпрограма члана"; }
 
-    /*! This is put above each page as a link to the list of annotated data types (Fortran). */    
+    /*! This is put above each page as a link to the list of annotated data types (Fortran). */
     virtual QCString trCompoundListFortran()
     { return "Списак типова података"; }
 
@@ -1638,18 +1632,18 @@ class TranslatorSerbianCyrilic : public TranslatorAdapter_1_6_0
       }
       result+="чланова типова података";
       result+=" са везама ка ";
-      if (!extractAll) 
+      if (!extractAll)
       {
          result+="документацији структуре података за сваки члан";
       }
-      else 
+      else
       {
          result+="типовима података којима припадају:";
       }
       return result;
     }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * annotated compound index (Fortran).
      */
     virtual QCString trCompoundIndexFortran()
@@ -1661,24 +1655,24 @@ class TranslatorSerbianCyrilic : public TranslatorAdapter_1_6_0
     virtual QCString trTypeDocumentation()
     { return "Документација типова података"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) subprograms (Fortran).
      */
     virtual QCString trSubprograms()
     { return "Функције/потпрограми"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for subprograms (Fortran)
      */
     virtual QCString trSubprogramDocumentation()
     { return "Документација функције/потпрограма"; }
 
-    /*! This is used in the documentation of a file/namespace/group before 
+    /*! This is used in the documentation of a file/namespace/group before
      *  the list of links to documented compounds (Fortran)
      */
      virtual QCString trDataTypes()
     { return "Типови података"; }
-    
+
     /*! used as the title of page containing all the index of all modules (Fortran). */
     virtual QCString trModulesList()
     { return "Списак модула"; }
@@ -1717,46 +1711,46 @@ class TranslatorSerbianCyrilic : public TranslatorAdapter_1_6_0
     virtual QCString trModuleReference(const char *namespaceName)
     {
       QCString result=namespaceName;
-      result+=" Референца модула";        
+      result+=" Референца модула";
       return result;
     }
-    
+
     /*! This is put above each page as a link to all members of modules. (Fortran) */
     virtual QCString trModulesMembers()
     { return "Чланови модула"; }
 
     /*! This is an introduction to the page with all modules members (Fortran) */
     virtual QCString trModulesMemberDescription(bool extractAll)
-    { 
+    {
       QCString result="Овде је списак свих ";
       if (!extractAll) result+="документованих ";
       result+="чланова модула са везама ка ";
-      if (extractAll) 
+      if (extractAll)
       {
         result+="документацији модула за сваки члан:";
       }
-      else 
+      else
       {
         result+="модулима којима припадају:";
       }
       return result;
     }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      *  index of all modules (Fortran).
      */
     virtual QCString trModulesIndex()
     { return "Индекс модула"; }
-    
+
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trModule(bool first_capital, bool singular)
-    {       
+    {
       QCString result((first_capital ? "Модул" : "модул"));
       if (!singular)  result+="и";
-      return result; 
+      return result;
     }
     /*! This is put at the bottom of a module documentation page and is
      *  followed by a list of files that were used to generate the page.
@@ -1782,24 +1776,24 @@ class TranslatorSerbianCyrilic : public TranslatorAdapter_1_6_0
       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 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trType(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Тип" : "тип"));
       if (!singular)  result+="ови";
-      return result; 
+      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 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trSubprogram(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Потпрограм" : "потпрограм"));
       if (!singular)  result+="и";
-      return result; 
+      return result;
     }
 
     /*! C# Type Constraint list */
diff --git a/src/translator_si.h b/src/translator_si.h
index 8568b1e..ee46097 100644
--- a/src/translator_si.h
+++ b/src/translator_si.h
@@ -38,10 +38,6 @@ class TranslatorSlovene : public TranslatorAdapter_1_4_6
     {
       return "\\usepackage[slovene]{babel}\n\\usepackage[T1]{fontenc}\n";
     }
-    QCString idLanguageCharset()
-    {
-      return "utf-8";
-    }
     QCString trRelatedFunctions()
     { return "Povezane funkcije"; }
     QCString trRelatedSubscript()
diff --git a/src/translator_sk.h b/src/translator_sk.h
index 836d7f2..ea025a0 100644
--- a/src/translator_sk.h
+++ b/src/translator_sk.h
@@ -43,12 +43,6 @@ class TranslatorSlovak : public Translator
     virtual QCString latexLanguageSupportCommand()
     { return "\\usepackage[slovak]{babel}\n"; }
 
-    /*! return the language charset. This will be used for the HTML output */
-    virtual QCString idLanguageCharset()
-    {
-        return "utf-8";
-    }
-
     // --- Language translation methods -------------------
 
     /*! used in the compound documentation before a list of related functions. */
diff --git a/src/translator_sr.h b/src/translator_sr.h
index 86c2777..04ae216 100644
--- a/src/translator_sr.h
+++ b/src/translator_sr.h
@@ -1,12 +1,12 @@
 /******************************************************************************
  *
- * 
+ *
  *
  * Copyright (C) 1997-2013 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 
+ * 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.
  *
@@ -14,7 +14,7 @@
  * input used in their production; they are not affected by this license.
  *
  */
-	
+
 #ifndef TRANSLATOR_SR_H
 #define TRANSLATOR_SR_H
 
@@ -25,23 +25,23 @@
 // translation update by Andrija M. Bosnjakovic <andrija@etf.bg.ac.yu>
 
 class TranslatorSerbian : public TranslatorAdapter_1_6_0
-{                                
+{
   public:
 
     // --- Language control methods -------------------
-    
-    /*! Used for identification of the language. The identification 
-     * should not be translated. It should be replaced by the name 
+
+    /*! 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 should be equal to 
+     * (e.g. "czech", "japanese", "russian", etc.). It should be equal to
      * the identification used in language.cpp.
      */
     virtual QCString idLanguage()
     { return "serbian"; }
-    
-    /*! Used to get the LaTeX command(s) for the language support. 
+
+    /*! 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 
+     *  LaTeX to the desired language.  For example
      *  <pre>"\\usepackage[german]{babel}\n"
      *  </pre>
      *  or
@@ -49,7 +49,7 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
      *  "\\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.
      */
@@ -59,23 +59,17 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
       return result;
     }
 
-    /*! return the language charset. This will be used for the HTML output */
-    virtual QCString idLanguageCharset()
-    {
-        return "utf-8";
-    }
-
     // --- Language translation methods -------------------
 
     /*! used in the compound documentation before a list of related functions. */
     virtual QCString trRelatedFunctions()
-    //! Čini se da je ovako manje loše nego "Povezane funkcije", 
+    //! Čini se da je ovako manje loše nego "Povezane funkcije",
     //! što uopšte ne izgleda dobro jer ta kartica sadrži prijatelje i globalne funkcije
-    { return "Relevantne funkcije"; }  
+    { return "Relevantne funkcije"; }
 
     /*! subscript for the related functions. */
     virtual QCString trRelatedSubscript()
-    { return "(To nisu funkcije članice.)"; } 
+    { return "(To nisu funkcije članice.)"; }
 
     /*! header that is put before the detailed description of files, classes and namespaces. */
     virtual QCString trDetailedDescription()
@@ -84,31 +78,31 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
     /*! header that is put before the list of typedefs. */
     virtual QCString trMemberTypedefDocumentation()
     { return "Dokumentacija unutrašnjih definicija tipa"; }
-    
+
     /*! header that is put before the list of enumerations. */
     virtual QCString trMemberEnumerationDocumentation()
     //! Ovo je u skladu sa "unutrašnja klasa" što se može videti u knjizi.
     { return "Dokumentacija unutrašnjih nabrajanja"; }
-    
+
     /*! header that is put before the list of member functions. */
     virtual QCString trMemberFunctionDocumentation()
     { return "Dokumentacija funkcija članica"; }
-    
+
     /*! header that is put before the list of member attributes. */
     virtual QCString trMemberDataDocumentation()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Dokumentacija polja"; 
+        return "Dokumentacija polja";
       }
       else
       {
-        return "Dokumentacija atributa"; 
+        return "Dokumentacija atributa";
       }
     }
 
     /*! this is the text of a link put after brief descriptions. */
-    virtual QCString trMore() 
+    virtual QCString trMore()
     { return "Još..."; }
 
     /*! put in the class documentation */
@@ -126,81 +120,81 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
     /*! this is the remainder of the sentence after the class name */
     virtual QCString trIncludingInheritedMembers()
     { return ", uključujući nasleđene članove."; }
-    
+
     /*! 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="Napravljeno automatski korišćenjem alata Doxygen";
       if( s ) result+=(QCString)" za projekat " + s;
-      result+=" od izvornog koda."; 
+      result+=" od izvornog koda.";
       return result;
     }
 
     /*! put after an enum name in the list of all members */
     virtual QCString trEnumName()
     { return "ime nabrajanja "; }
-    
+
     /*! put after an enum value in the list of all members */
     virtual QCString trEnumValue()
     { return "vrednost nabrojane konstante"; }
-    
+
     /*! put after an undocumented member in the list of all members */
     virtual QCString trDefinedIn()
     { return "definicija u"; }
 
     // quick reference sections
 
-    /*! This is put above each page as a link to the list of all groups of 
+    /*! 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 "Moduli"; }
-    
+
     /*! This is put above each page as a link to the class hierarchy */
     virtual QCString trClassHierarchy()
     { return "Hijerarhija klasa"; }
-    
+
     /*! This is put above each page as a link to the list of annotated classes */
     virtual QCString trCompoundList()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
         return "Spisak struktura";
       }
       else
       {
-        return "Spisak klasa"; 
+        return "Spisak klasa";
       }
     }
-    
+
     /*! This is put above each page as a link to the list of documented files */
     virtual QCString trFileList()
     { return "Spisak datoteka"; }
 
     /*! 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 "Sva polja struktura"; 
+        return "Sva polja struktura";
       }
       else
       {
-        return "Svi članovi klasa"; 
+        return "Svi članovi klasa";
       }
     }
 
     /*! This is put above each page as a link to all members of files. */
     virtual QCString trFileMembers()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-       return "Članovi datoteke"; 
+       return "Članovi datoteke";
       }
       else
       {
-       return "Članovi datoteke"; 
+       return "Članovi datoteke";
       }
     }
 
@@ -231,11 +225,11 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
 
     /*! This is an introduction to the annotated compound list. */
     virtual QCString trCompoundListDescription()
-    { 
-      
+    {
+
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Spisak struktura sa kratkim opisima:"; 
+        return "Spisak struktura sa kratkim opisima:";
       }
       else
       {
@@ -260,18 +254,18 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
         result+="članova klasa";
       }
       result+=" sa vezama ka ";
-      if (extractAll) 
+      if (extractAll)
       {
         if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
         {
-          result+="dokumentaciji svakog polja strukture/unije:";  
+          result+="dokumentaciji svakog polja strukture/unije:";
         }
         else
         {
-          result+="dokumentaciji svakog člana klase:";       
+          result+="dokumentaciji svakog člana klase:";
         }
       }
-      else 
+      else
       {
         if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
         {
@@ -279,7 +273,7 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
         }
         else
         {
-          result+="klasama kojima pripadaju:"; 
+          result+="klasama kojima pripadaju:";
         }
       }
       return result;
@@ -290,19 +284,19 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
     {
       QCString result="Spisak svih ";
       if (!extractAll) result+="dokumentovanih ";
-      
+
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
         result+="funkcija, promenljivih, makro zamena, nabrajanja i definicija tipa";
       }
       else
       {
-        result+="članova";               
+        result+="članova";
       }
       result+=" sa vezama ka ";
-      if (extractAll) 
+      if (extractAll)
         result+="datotekama u kojima se nalaze:";
-      else 
+      else
         result+="dokumentaciji:";
       return result;
     }
@@ -319,43 +313,43 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
     virtual QCString trModulesDescription()
     { return "Spisak svih modula:"; }
 
-    // index titles (the project name is prepended for these) 
+    // index titles (the project name is prepended for these)
 
     /*! This is used in HTML as the title of index.html. */
     virtual QCString trDocumentation()
     { return "Dokumentacija"; }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * index of all groups.
      */
     virtual QCString trModuleIndex()
     { return "Indeks modula"; }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * class hierarchy.
      */
     virtual QCString trHierarchicalIndex()
     { return "Hijerarhijski sadržaj"; }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * annotated compound index.
      */
     virtual QCString trCompoundIndex()
     {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
-      { 
-        return "Spisak struktura/unija"; 
+      {
+        return "Spisak struktura/unija";
       }
       else
       {
-        return "Spisak klasa"; 
+        return "Spisak klasa";
       }
     }
 
     /*! This is used in LaTeX as the title of the chapter with the
      * list of all files.
      */
-    virtual QCString trFileIndex() 
+    virtual QCString trFileIndex()
     { return "Indeks datoteka"; }
 
     /*! This is used in LaTeX as the title of the chapter containing
@@ -368,14 +362,14 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
      *  the documentation of all classes, structs and unions.
      */
     virtual QCString trClassDocumentation()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Dokumentacija stuktura/unija"; 
+        return "Dokumentacija stuktura/unija";
       }
       else
       {
-        return "Dokumentacija klasa"; 
+        return "Dokumentacija klasa";
       }
     }
 
@@ -400,105 +394,105 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
     /*! This is used in LaTeX as the title of the document */
     virtual QCString trReferenceManual()
     { return "Priručnik"; }
-    
-    /*! This is used in the documentation of a file as a header before the 
+
+    /*! This is used in the documentation of a file as a header before the
      *  list of defines
      */
     virtual QCString trDefines()
     { return "Makro zamene"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of function prototypes
      */
     virtual QCString trFuncProtos()
     { return "Deklaracije funkcija"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of typedefs
      */
     virtual QCString trTypedefs()
     { return "Definicije tipa"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of enumerations
      */
     virtual QCString trEnumerations()
     { return "Nabrajanja"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) functions
      */
     virtual QCString trFunctions()
     { return "Funkcije"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) variables
      */
     virtual QCString trVariables()
     { return "Promenljive"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) variables
      */
     virtual QCString trEnumerationValues()
     { return "Vrednosti nabrojanih konstanti"; }
-    
+
     /*! This is used in the documentation of a file before the list of
      *  documentation blocks for defines
      */
     virtual QCString trDefineDocumentation()
     { return "Dokumentacija makro zamene"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for function prototypes
      */
     virtual QCString trFunctionPrototypeDocumentation()
     { return "Dokumentacija deklaracije funkcije"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for typedefs
      */
     virtual QCString trTypedefDocumentation()
     { return "Dokumentacija definicije tipa"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for enumeration types
      */
     virtual QCString trEnumerationTypeDocumentation()
     { return "Dokumentacija nabrajanja"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for functions
      */
     virtual QCString trFunctionDocumentation()
     { return "Dokumentacija funkcije"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for variables
      */
     virtual QCString trVariableDocumentation()
     { return "Dokumentacija promenljive"; }
 
-    /*! This is used in the documentation of a file/namespace/group before 
+    /*! This is used in the documentation of a file/namespace/group before
      *  the list of links to documented compounds
      */
     virtual QCString trCompounds()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Strukture i unije";  
+        return "Strukture i unije";
       }
       else
       {
-        return "Klase, strukture i unije";   
+        return "Klase, strukture i unije";
       }
     }
 
-    /*! This is used in the standard footer of each page and indicates when 
-     *  the page was generated 
+    /*! 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)"[" + date + "] Napravljeno automatski ";
       if ( projName ) result+=(QCString)" za projekat " + projName;
 	  result+=(QCString)" upotrebom ";
@@ -516,7 +510,7 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
     {
       return QCString("Dijagram nasleđivanja za klasu ") + clName + ":";
     }
-    
+
     /*! this text is generated when the \\internal command is used. */
     virtual QCString trForInternalUseOnly()
     { return "Samo za unutrašnju upotrebu."; }
@@ -548,7 +542,7 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
     /*! this text is generated when the \\exception command is used. */
     virtual QCString trExceptions()
     { return "Izuzeci"; }
-    
+
     /*! this text is used in the title page of a LaTeX document. */
     virtual QCString trGeneratedBy()
     { return "Napravio"; }
@@ -556,7 +550,7 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990307
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! used as the title of page containing all the index of all namespaces. */
     virtual QCString trNamespaceList()
     { return "Spisak prostora imena"; }
@@ -575,17 +569,17 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
      */
     virtual QCString trFriends()
     { return "Prijatelji"; }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990405
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! used in the class documentation as a header before the list of all
-     * related classes 
+     * related classes
      */
     virtual QCString trRelatedFunctionDocumentation()
     { return "Dokumentacija prijatelja i relevantnih funkcija"; }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990425
 //////////////////////////////////////////////////////////////////////////
@@ -594,8 +588,8 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
     virtual QCString trCompoundReference(const char *clName,
                                     ClassDef::CompoundType compType,
                                     bool isTemplate)
-    {                            
-      QCString result( "Dokumentacija " );   
+    {
+      QCString result( "Dokumentacija " );
       switch(compType)
       {
         case ClassDef::Class:      result+="klase "; break;
@@ -607,7 +601,7 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
         case ClassDef::Exception:  result+="izuzetka "; break;
         default: break;
       }
-      if (isTemplate) result += "šablona ";  
+      if (isTemplate) result += "šablona ";
       result += clName;
       return result;
     }
@@ -616,7 +610,7 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
     virtual QCString trFileReference(const char *fileName)
     {
       QCString result = "Opis datoteke ";
-      result += fileName; 
+      result += fileName;
       return result;
     }
 
@@ -627,7 +621,7 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
       result += namespaceName;
       return result;
     }
-    
+
     virtual QCString trPublicMembers()
     { return "Javni članovi"; }
     virtual QCString trPublicSlots()
@@ -648,7 +642,7 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
     { return "Privatni slotovi"; }
     virtual QCString trStaticPrivateMembers()
     { return "Zajednički privatni članovi"; }
-    
+
     /*! this function is used to produce a comma-separated list of items.
      *  use generateMarker(i) to indicate where item i should be put.
      */
@@ -657,23 +651,23 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
       QCString result;
       int i;
       // the inherits list contain `numEntries' classes
-      for (i=0;i<numEntries;i++) 
+      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 
+        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 
+          if (i<numEntries-2) // not the fore last entry
             result+=", ";
           else                // the fore last entry
             result+=" i ";
         }
       }
-      return result; 
+      return result;
     }
-    
+
     /*! used in class documentation to produce a list of base classes,
      *  if class diagrams are disabled.
      */
@@ -690,7 +684,7 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
       return "Spisak izvedenih klasa: ";
     }
 
-    /*! used in member documentation blocks to produce a list of 
+    /*! used in member documentation blocks to produce a list of
      *  members that are hidden by this one.
      */
     virtual QCString trReimplementedFromList(int numEntries)
@@ -712,17 +706,17 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
 
     /*! This is an introduction to the page with all namespace members */
     virtual QCString trNamespaceMemberDescription(bool extractAll)
-    { 
+    {
       QCString result="Spisak svih ";
       if (!extractAll) result+="dokumentovanih ";
       result+="članova prostora imena sa vezama prema ";
-      if (extractAll) 
+      if (extractAll)
         result+="dokumentaciji svakog člana prostora imena: ";
-      else 
+      else
         result+="prostorima imena kojima pripadaju: ";
       return result;
     }
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      *  index of all namespaces.
      */
     virtual QCString trNamespaceIndex()
@@ -791,7 +785,7 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
     virtual QCString trMainPage()
     { return "Glavna strana"; }
 
-    /*! This is used in references to page that are put in the LaTeX 
+    /*! 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()
@@ -836,7 +830,7 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
     /*! header that is put before the list of constructor/destructors. */
     virtual QCString trConstructorDocumentation()
     {
-      return "Dokumentacija konstruktora i destruktora"; 
+      return "Dokumentacija konstruktora i destruktora";
     }
     /*! Used in the file documentation to point to the corresponding sources. */
     virtual QCString trGotoSourceCode()
@@ -893,10 +887,10 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
 //////////////////////////////////////////////////////////////////////////
 // new since 1.1.0
 //////////////////////////////////////////////////////////////////////////
-    
+
     virtual QCString trNote()
     {
-      return "Beleška"; 
+      return "Beleška";
     }
     virtual QCString trPublicTypes()
     {
@@ -906,7 +900,7 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
     {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Polja";        
+        return "Polja";
       }
       else
       {
@@ -963,7 +957,7 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
 
     virtual QCString trReferencedBy()
     { //! Izbegavanje roda. Uskladjivanje sa trReferences
-      return "Korisnici: "; 
+      return "Korisnici: ";
     }
     virtual QCString trRemarks()
     {
@@ -982,7 +976,7 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
     {
       return "Od";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.1.5
 //////////////////////////////////////////////////////////////////////////
@@ -992,7 +986,7 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
     {
       return "Objašnjenje korišćenih simbola";
     }
-    /*! page explaining how the dot graph's should be interpreted 
+    /*! 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()
@@ -1041,7 +1035,7 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
          "<li>Sa sivom ivicom predstavlja strukturu ili klasu bez doxygen komentara.\n"
          "<li>Sa crvenom ivicom predstavlja dokumentovanu strukturu ili klasu\n"
          "za koju nisu prikazani svi relevantni grafovi.\n"
-         "</ul>" 
+         "</ul>"
         "Strelice imaju sledeća značenja:\n"
         "<ul>\n"
          "<li>Tamnoplava strelica označava javno izvođenje.\n"
@@ -1061,11 +1055,11 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
     {
       return "Objašnjenje korišćenih simbola";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.2.0
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! Used as a marker that is put before a test item */
     virtual QCString trTest()
     {
@@ -1143,11 +1137,11 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
     {
       return "Vrednost:";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.2.5
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! Used as a marker that is put before a \\bug item */
     virtual QCString trBug()
     {
@@ -1163,9 +1157,9 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
 // new since 1.2.6
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as ansicpg for RTF file 
-     * 
-     * The following table shows the correlation of Charset name, Charset Value and 
+    /*! 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
@@ -1186,15 +1180,15 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
      * GB2313_CHARSET          134 (x86)             936
      * CHINESEBIG5_CHARSET     136 (x88)             950
      * </pre>
-     * 
+     *
      */
     virtual QCString trRTFansicp()
     {
       return "1252";
     }
-    
 
-    /*! Used as ansicpg for RTF fcharset 
+
+    /*! Used as ansicpg for RTF fcharset
      *  \see trRTFansicp() for a table of possible values.
      */
     virtual QCString trRTFCharSet()
@@ -1207,83 +1201,83 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
     {
       return "Sadržaj";
     }
-   
+
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  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 ? "Klas" : "klas") );
       result+= (singular ? "a" : "e");
-      return result; 
+      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 
+     *  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"));
       result+= (singular ? "a" : "e");
-      return result; 
+      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 
+     *  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 ? "Prostor" : "prostor"));
-      result += (singular ? "" : "i"); 
+      result += (singular ? "" : "i");
       result += " imena";
-      return result; 
+      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 
+     *  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 ? "Grup" : "grup"));
       result+= (singular ? "a" : "e");
-      return result; 
+      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 
+     *  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"));
       result+= (singular ? "a" : "e");
-      return result; 
+      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 
+     *  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 ? "Član" : "član"));
       result+= (singular ? "" : "ovi");
-      return result; 
+      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 
+     *  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 ? "Globalni " : "globalni "));
       result+= (singular ? "podatak" : "podaci");
-      return result; 
+      return result;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1293,10 +1287,10 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
     /*! 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 ? "Autor" : "autor"));
       result+= (singular ? "" : "i");
-      return result; 
+      return result;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1314,7 +1308,7 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
 // new since 1.2.13
 //////////////////////////////////////////////////////////////////////////
 
-    /*! used in member documentation blocks to produce a list of 
+    /*! used in member documentation blocks to produce a list of
      *  members that are implemented by this one.
      */
     virtual QCString trImplementedFromList(int /*numEntries*/)
@@ -1341,24 +1335,24 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
      {
       return "Sadržaj";
      }
-     
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.2.17
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as the header of the list of item that have been 
-     *  flagged deprecated 
+    /*! Used as the header of the list of item that have been
+     *  flagged deprecated
      */
     virtual QCString trDeprecatedList()
     {
       return "Spisak zastarelih stvari";
-    } 
+    }
 
 //////////////////////////////////////////////////////////////////////////
 // new since 1.2.18
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as a header for declaration section of the events found in 
+    /*! Used as a header for declaration section of the events found in
      * a C# program
      */
     virtual QCString trEvents()
@@ -1378,43 +1372,43 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
     /*! Used as a heading for a list of Java class types with package scope.
      */
     virtual QCString trPackageTypes()
-    { 
+    {
       return "Tipovi u paketu";
     }
-    /*! Used as a heading for a list of Java class functions with package 
-     * scope. 
+    /*! Used as a heading for a list of Java class functions with package
+     * scope.
      */
     virtual QCString trPackageMembers()
-    { 
+    {
       return "Funkcije u paketu";
     }
-    /*! Used as a heading for a list of static Java class functions with 
+    /*! Used as a heading for a list of static Java class functions with
      *  package scope.
      */
     virtual QCString trStaticPackageMembers()
-    { 
+    {
       return "Statičke funkcije u paketu";  // Zajednicke funkcije u paketu
     }
-    /*! Used as a heading for a list of Java class variables with package 
+    /*! Used as a heading for a list of Java class variables with package
      * scope.
      */
     virtual QCString trPackageAttribs()
-    { 
+    {
       return "Atributi u paketu"; // Clanovi u paketu
     }
-    /*! Used as a heading for a list of static Java class variables with 
+    /*! Used as a heading for a list of static Java class variables with
      * package scope.
      */
     virtual QCString trStaticPackageAttribs()
-    { 
+    {
       return "Statički atributi u paketu";  // Zajednicki clanovi u paketu
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.3.1
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used in the quick index of a class/file/namespace member list page 
+    /*! Used in the quick index of a class/file/namespace member list page
      *  to link to the unfiltered list of all members.
      */
     virtual QCString trAll()
@@ -1431,9 +1425,9 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
 // new since 1.3.3
 //////////////////////////////////////////////////////////////////////////
 
-    /*! When the search engine is enabled this text is put in the header 
-     *  of each page before the field where one can enter the text to search 
-     *  for. 
+    /*! When the search engine is enabled this text is put in the header
+     *  of each page before the field where one can enter the text to search
+     *  for.
      */
     virtual QCString trSearchForIndex()
     {
@@ -1450,7 +1444,7 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
      *  text can be different depending on the number of documents found.
      *  Inside the text you can put the special marker $num to insert
      *  the number representing the actual number of search results.
-     *  The @a numDocuments parameter can be either 0, 1 or 2, where the 
+     *  The @a numDocuments parameter can be either 0, 1 or 2, where the
      *  value 2 represents 2 or more matches. HTML markup is allowed inside
      *  the returned string.
      */
@@ -1462,7 +1456,7 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
       }
       else if (numDocuments==1)
       { return "Nađen je <b>1</b> dokument koji odgovara vašem upitu."; }
-      else if (numDocuments<5) 
+      else if (numDocuments<5)
       { return "Nađena su <b>$num</b> dokumenta koji odgovaraju vašem upitu."
                " Najbolji su prikazani prvi."; }
       else
@@ -1470,7 +1464,7 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
                " Najbolji su prikazani prvi.";
       }
     }
-    /*! This string is put before the list of matched words, for each search 
+    /*! This string is put before the list of matched words, for each search
      *  result. What follows is the list of words that matched the query.
      */
     virtual QCString trSearchMatches()
@@ -1511,7 +1505,7 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
     virtual QCString trDirectories()
     { return "Direktorijumi"; }
 
-    /*! This returns a sentences that introduces the directory hierarchy. 
+    /*! This returns a sentences that introduces the directory hierarchy.
      *  and the fact that it is sorted alphabetically per level
      */
     virtual QCString trDirDescription()
@@ -1527,10 +1521,10 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
      *  (\a first_capital) and in sigular or plural form (\a singular).
      */
     virtual QCString trDir(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Direktorijum" : "direktorijum"));
-      if (!singular) result+="i"; 
-      return result; 
+      if (!singular) result+="i";
+      return result;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1556,7 +1550,7 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
       return "Graf funkcija koje pozivaju ovu funkciju:";
     }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for enumeration values
      */
     virtual QCString trEnumerationValueDocumentation()
@@ -1565,12 +1559,12 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
 //////////////////////////////////////////////////////////////////////////
 // new since 1.5.4 (mainly for Fortran)
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! header that is put before the list of member subprograms (Fortran). */
     virtual QCString trMemberFunctionDocumentationFortran()
     { return "Dokumentacija funkcija i procedura"; }
 
-    /*! This is put above each page as a link to the list of annotated data types (Fortran). */    
+    /*! This is put above each page as a link to the list of annotated data types (Fortran). */
     /* TODO: Koji je prevod za Compound u Fortran kontekstu */
     virtual QCString trCompoundListFortran()
     { return "Složeni tipovi podataka"; }
@@ -1593,18 +1587,18 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
       }
       result+="polja složenih tipova podataka";
       result+=" sa vezama ka ";
-      if (!extractAll) 
+      if (!extractAll)
       {
          result+="dokumentaciji strukture podataka za svakog člana";
       }
-      else 
+      else
       {
          result+="složenim tipovima podataka kojima pripadaju:";
       }
       return result;
     }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * annotated compound index (Fortran).
      */
     virtual QCString trCompoundIndexFortran()
@@ -1616,24 +1610,24 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
     virtual QCString trTypeDocumentation()
     { return "Dokumentacija tipova podataka"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) subprograms (Fortran).
      */
     virtual QCString trSubprograms()
     { return "Funkcije i procedure"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for subprograms (Fortran)
      */
     virtual QCString trSubprogramDocumentation()
     { return "Dokumentacija funkcija i procedura"; }
 
-    /*! This is used in the documentation of a file/namespace/group before 
+    /*! This is used in the documentation of a file/namespace/group before
      *  the list of links to documented compounds (Fortran)
      */
      virtual QCString trDataTypes()
     { return "Složeni tipovi podataka"; }
-    
+
     /*! used as the title of page containing all the index of all modules (Fortran). */
     virtual QCString trModulesList()
     { return "Spisak modula"; }
@@ -1672,46 +1666,46 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
     virtual QCString trModuleReference(const char *namespaceName)
     {
       QCString result=namespaceName;
-      result+=" - sažet pregled modula";        
+      result+=" - sažet pregled modula";
       return result;
     }
-    
+
     /*! This is put above each page as a link to all members of modules. (Fortran) */
     virtual QCString trModulesMembers()
     { return "Članovi modula"; }
 
     /*! This is an introduction to the page with all modules members (Fortran) */
     virtual QCString trModulesMemberDescription(bool extractAll)
-    { 
+    {
       QCString result="Spisak svih ";
       if (!extractAll) result+="dokumentovanih ";
       result+="članova modula sa vezama ka ";
-      if (extractAll) 
+      if (extractAll)
       {
         result+="dokumentaciji za svakog člana modula:";
       }
-      else 
+      else
       {
         result+="modulima kojima pripadaju:";
       }
       return result;
     }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      *  index of all modules (Fortran).
      */
     virtual QCString trModulesIndex()
     { return "Spisak modula"; }
-    
+
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trModule(bool first_capital, bool singular)
-    {       
+    {
       QCString result((first_capital ? "Modul" : "modul"));
       if (!singular)  result+="i";
-      return result; 
+      return result;
     }
     /*! This is put at the bottom of a module documentation page and is
      *  followed by a list of files that were used to generate the page.
@@ -1737,24 +1731,24 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
       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 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trType(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Tip" : "tip"));
       if (!singular)  result+="ovi";
-      return result; 
+      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 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trSubprogram(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Procedura" : "procedura"));
       if (!singular)  result = (first_capital ? "Procedure" : "procedure");
-      return result; 
+      return result;
     }
 
     /*! C# Type Constraint list */
@@ -1762,7 +1756,7 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
     {
       return "Ograničenja tipova";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // following methods have no corresponding entry in translator_en.h
 //////////////////////////////////////////////////////////////////////////
@@ -1770,51 +1764,51 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0
 //      /*! This is put above each page as a link to the list of all verbatim headers */
 //     virtual QCString trHeaderFiles()
 //     { return "Zaglavlja"; }
-// 
+//
 //     /*! This is an introduction to the page with the list of all header files. */
 //     virtual QCString trHeaderFilesDescription()
 //     { return "Zaglavlja koje izgraduju API:"; }
-// 
+//
 //     /*! This sentences is used in the annotated class/file lists if no brief
-//      * description is given. 
+//      * description is given.
 //      */
 //     virtual QCString trNoDescriptionAvailable()
 //     { return "Opis nije dostupan"; }
-//     
+//
 //     /*! this text is generated when the \\reimp command is used. */
 //     virtual QCString trReimplementedForInternalReasons()
 //     { return decode("Preuradeno zbog unutrasnjih razloga; Nema uticaja na API." ); }
-// 
+//
 //     /*! this text is generated when the \\bug command is used. */
 //     virtual QCString trBugsAndLimitations()
 //     { return "Greske i ogranicenja"; }
-// 
+//
 //     virtual QCString trSources()
 //     {
 //       return decode("Izvorne datoteke" );
 //     }
-// 
+//
 //     /*! Used for Java interfaces in the summary section of Java packages */
 //     virtual QCString trInterfaces()
 //     {
 //       return "Interfejsi";  //!< Radna okruzenja. Ali to je dve reci.
 //     }
-// 
+//
 //     /*! Used as a chapter title for Latex & RTF output */
 //     virtual QCString trPackageDocumentation()
 //     {
 //       return "Dokumentacija paketa";
 //     }
-//  
+//
 //     /*! This is used for translation of the word that will possibly
-//      *  be followed by a single name or by a list of names 
+//      *  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"));
 //       result+= (singular ? "e" : "a");
-//       return result; 
+//       return result;
 //     }
 
 };
diff --git a/src/translator_sv.h b/src/translator_sv.h
index 35baf88..e0cd4f9 100644
--- a/src/translator_sv.h
+++ b/src/translator_sv.h
@@ -95,12 +95,6 @@ class TranslatorSwedish : public TranslatorAdapter_1_6_0
       return "\\usepackage[swedish]{babel}\n";
     }
 
-    /*! return the language charset. This will be used for the HTML output */
-    virtual QCString idLanguageCharset()
-    {
-      return "utf-8";
-    }
-
     virtual QCString trRelatedFunctions()
     { return "Besläktade funktioner"; }
 
diff --git a/src/translator_tr.h b/src/translator_tr.h
index 9c66c55..f16350f 100644
--- a/src/translator_tr.h
+++ b/src/translator_tr.h
@@ -1,12 +1,12 @@
 /******************************************************************************
  *
- * 
+ *
  *
  * Copyright (C) 1997-2013 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 
+ * 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.
  *
@@ -18,7 +18,7 @@
 #ifndef TRANSLATOR_TR_H
 #define TRANSLATOR_TR_H
 
-/*! 
+/*!
  When defining a translator class for the new language, follow
  the description in the documentation.  One of the steps says
  that you should copy the translator_en.h (this) file to your
@@ -45,19 +45,19 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
   public:
 
     // --- Language control methods -------------------
-    
-    /*! Used for identification of the language. The identification 
-     * should not be translated. It should be replaced by the name 
+
+    /*! 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 should be equal to 
+     * (e.g. "czech", "japanese", "russian", etc.). It should be equal to
      * the identification used in language.cpp.
      */
     virtual QCString idLanguage()
     { return "turkish"; }
-    
-    /*! Used to get the LaTeX command(s) for the language support. 
+
+    /*! 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 
+     *  LaTeX to the desired language.  For example
      *  <pre>"\\usepackage[german]{babel}\n"
      *  </pre>
      *  or
@@ -65,7 +65,7 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
      *  "\\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.
      */
@@ -74,12 +74,6 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
       return "";
     }
 
-    /*! return the language charset. This will be used for the HTML output */
-    virtual QCString idLanguageCharset()
-    {
-      return "utf-8";
-    }
-
     // --- Language translation methods -------------------
 
     /*! used in the compound documentation before a list of related fonksiyonlar. */
@@ -97,30 +91,30 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
     /*! header that is put before the list of typedefs. */
     virtual QCString trMemberTypedefDocumentation()
     { return "Üye Typedef Dokümantasyonu"; }
-    
+
     /*! header that is put before the list of enumerations. */
     virtual QCString trMemberEnumerationDocumentation()
     { return "Üye Enümerasyon Dokümantasyonu"; }
-    
+
     /*! header that is put before the list of member fonksiyonlar. */
     virtual QCString trMemberFunctionDocumentation()
     { return "Üye Fonksiyon Dokümantasyonu"; }
-    
+
     /*! header that is put before the list of member attributes. */
     virtual QCString trMemberDataDocumentation()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Alan Dokümantasyonu"; 
+        return "Alan Dokümantasyonu";
       }
       else
       {
-        return "Üye Veri Dokümantasyonu"; 
+        return "Üye Veri Dokümantasyonu";
       }
     }
 
     /*! this is the text of a link put after brief descriptions. */
-    virtual QCString trMore() 
+    virtual QCString trMore()
     { return "Ayrıntılar..."; }
 
     /*! put in the class documentation */
@@ -138,81 +132,81 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
     /*! this is the remainder of the sentence after the class name */
     virtual QCString trIncludingInheritedMembers()
     { return "  (kalıtımla gelen üyeleri de içerir)."; }
-    
+
     /*! 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="Doxygen tarafından";
       if (s) result+=s+(QCString)" için ";
-      result+=" kaynak koddan otomatik üretilmiştir."; 
+      result+=" kaynak koddan otomatik üretilmiştir.";
       return result;
     }
 
     /*! put after an enum name in the list of all members */
     virtual QCString trEnumName()
     { return "enum adı"; }
-    
+
     /*! put after an enum value in the list of all members */
     virtual QCString trEnumValue()
     { return "enum değeri"; }
-    
+
     /*! put after an undocumented member in the list of all members */
     virtual QCString trDefinedIn()
     { return "tanımlandığı yer"; }
 
     // quick reference sections
 
-    /*! This is put above each page as a link to the list of all groups of 
+    /*! 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 "Modüller"; }
-    
+
     /*! This is put above each page as a link to the class hierarchy */
     virtual QCString trClassHierarchy()
     { return "Sınıf Hiyerarşisi"; }
-    
+
     /*! This is put above each page as a link to the list of annotated classes */
     virtual QCString trCompoundList()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
         return "Veri Yapıları";
       }
       else
       {
-        return "Sınıf Listesi"; 
+        return "Sınıf Listesi";
       }
     }
-    
+
     /*! This is put above each page as a link to the list of documented files */
     virtual QCString trFileList()
     { return "Dosya Listesi"; }
 
     /*! 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 "Veri Alanları"; 
+        return "Veri Alanları";
       }
       else
       {
-        return "Sınıf Üyeleri"; 
+        return "Sınıf Üyeleri";
       }
     }
 
     /*! This is put above each page as a link to all members of files. */
     virtual QCString trFileMembers()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Globaller"; 
+        return "Globaller";
       }
       else
       {
-        return "Dosya Üyeleri"; 
+        return "Dosya Üyeleri";
       }
     }
 
@@ -245,16 +239,16 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
 
     /*! This is an introduction to the annotated compound list. */
     virtual QCString trCompoundListDescription()
-    { 
-      
+    {
+
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Kısa tanımlarıyla birlikte veri yapıları:"; 
+        return "Kısa tanımlarıyla birlikte veri yapıları:";
       }
       else
       {
         return "Kısa tanımlarıyla sınıflar, yapılar (struct), "
-               "birleşimler(union) ve arayüzler:"; 
+               "birleşimler(union) ve arayüzler:";
       }
     }
 
@@ -275,7 +269,7 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
         result+="sınıf üyelerini içerir";
       }
       result+=" ve ";
-      if (!extractAll) 
+      if (!extractAll)
       {
         if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
         {
@@ -286,7 +280,7 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
           result+="her üye için sınıf dokümantasyonuna bağlar:";
         }
       }
-      else 
+      else
       {
         if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
         {
@@ -305,7 +299,7 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
     {
       QCString result="Bu liste tüm ";
       if (!extractAll) result+="dokümante edilmiş ";
-      
+
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
         result+="fonksiyonları, değişkenleri, makroları, enümerasyonları ve typedef\'leri içerir";
@@ -315,9 +309,9 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
         result+="dosya üyelerini içerir";
       }
       result+=" ve ";
-      if (extractAll) 
+      if (extractAll)
         result+="ait olduğu dosyalar bağlar:";
-      else 
+      else
         result+="dokümantasyona bağlar:";
       return result;
     }
@@ -334,43 +328,43 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
     virtual QCString trModulesDescription()
     { return "Tüm modüllerin listesi aşağıdadır:"; }
 
-    // index titles (the project name is prepended for these) 
+    // index titles (the project name is prepended for these)
 
     /*! This is used in HTML as the title of index.html. */
     virtual QCString trDocumentation()
     { return "Dokümantasyonu"; }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * index of all groups.
      */
     virtual QCString trModuleIndex()
     { return "Modül İndeksi"; }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * class hierarchy.
      */
     virtual QCString trHierarchicalIndex()
     { return "Hiyerarşik İndeksi"; }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * annotated compound index.
      */
     virtual QCString trCompoundIndex()
     {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
-      { 
+      {
         return "Veri Yapıları İndeksi";
       }
       else
       {
-        return "Sınıf İndeksi"; 
+        return "Sınıf İndeksi";
       }
     }
 
     /*! This is used in LaTeX as the title of the chapter with the
      * list of all files.
      */
-    virtual QCString trFileIndex() 
+    virtual QCString trFileIndex()
     { return "Dosya İndeksi"; }
 
     /*! This is used in LaTeX as the title of the chapter containing
@@ -383,14 +377,14 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
      *  the documentation of all classes, structs and unions.
      */
     virtual QCString trClassDocumentation()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Veri Yapıları Dokümantasyonu"; 
+        return "Veri Yapıları Dokümantasyonu";
       }
       else
       {
-        return "Sınıf Dokümantasyonu"; 
+        return "Sınıf Dokümantasyonu";
       }
     }
 
@@ -415,105 +409,105 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
     /*! This is used in LaTeX as the title of the document */
     virtual QCString trReferenceManual()
     { return "Referans Kitabı"; }
-    
-    /*! This is used in the documentation of a file as a header before the 
+
+    /*! This is used in the documentation of a file as a header before the
      *  list of defines
      */
     virtual QCString trDefines()
     { return "Makrolar"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of function prototypes
      */
     virtual QCString trFuncProtos()
     { return "Fonksiyon Prototipleri"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of typedefs
      */
     virtual QCString trTypedefs()
     { return "Typedef\'ler"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of enumerations
      */
     virtual QCString trEnumerations()
     { return "Enümerasyonlar"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) functions
      */
     virtual QCString trFunctions()
     { return "Fonksiyonlar"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) variables
      */
     virtual QCString trVariables()
     { return "Değişkenler"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) variables
      */
     virtual QCString trEnumerationValues()
     { return "Enümeratör"; }
-    
+
     /*! This is used in the documentation of a file before the list of
      *  documentation blocks for defines
      */
     virtual QCString trDefineDocumentation()
     { return "Makro Dokümantasyonu"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for function prototypes
      */
     virtual QCString trFunctionPrototypeDocumentation()
     { return "Fonksiyon Prototip Dokümantasyonu"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for typedefs
      */
     virtual QCString trTypedefDocumentation()
     { return "Typedef Dokümantasyonu"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for enumeration types
      */
     virtual QCString trEnumerationTypeDocumentation()
     { return "Enümerasyon Tipi Dokümantasyonu"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for functions
      */
     virtual QCString trFunctionDocumentation()
     { return "Fonksiyon Dokümantasyonu"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for variables
      */
     virtual QCString trVariableDocumentation()
     { return "Değişken Dokümantasyonu"; }
 
-    /*! This is used in the documentation of a file/namespace/group before 
+    /*! This is used in the documentation of a file/namespace/group before
      *  the list of links to documented compounds
      */
     virtual QCString trCompounds()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Veri Yapıları"; 
+        return "Veri Yapıları";
       }
       else
       {
-        return "Sınıflar"; 
+        return "Sınıflar";
       }
     }
 
-    /*! This is used in the standard footer of each page and indicates when 
-     *  the page was generated 
+    /*! 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=projName+(QCString)" için "+date;
       if (projName) result+=(QCString)" tarihinde ";
       result+=(QCString)" üreten: ";
@@ -531,7 +525,7 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
     {
       return clName+(QCString)" için kalıtım şeması:";
     }
-    
+
     /*! this text is generated when the \\internal command is used. */
     virtual QCString trForInternalUseOnly()
     { return "İç kullanıma ayrılmıştır."; }
@@ -563,7 +557,7 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
     /*! this text is generated when the \\exception command is used. */
     virtual QCString trExceptions()
     { return "İstisnalar"; }
-    
+
     /*! this text is used in the title page of a LaTeX document. */
     virtual QCString trGeneratedBy()
     { return "Oluşturan"; }
@@ -571,7 +565,7 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990307
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! used as the title of page containing all the index of all namespaces. */
     virtual QCString trNamespaceList()
     { return "Namespace Listesi"; }
@@ -590,17 +584,17 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
      */
     virtual QCString trFriends()
     { return "Arkadaşları"; }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990405
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! used in the class documentation as a header before the list of all
-     * related classes 
+     * related classes
      */
     virtual QCString trRelatedFunctionDocumentation()
     { return "Arkadaş Ve İlgili Fonksiyon Dokümantasyonu"; }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990425
 //////////////////////////////////////////////////////////////////////////
@@ -631,7 +625,7 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
     virtual QCString trFileReference(const char *fileName)
     {
       QCString result=fileName;
-      result+=" Dosya Referansı"; 
+      result+=" Dosya Referansı";
       return result;
     }
 
@@ -642,7 +636,7 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
       result+=" Namespace Referansı";
       return result;
     }
-    
+
     virtual QCString trPublicMembers()
     { return "Public Üye Fonksiyonlar"; }
     virtual QCString trPublicSlots()
@@ -663,7 +657,7 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
     { return "Özel Slotlar"; }
     virtual QCString trStaticPrivateMembers()
     { return "Statik Özel Üye Fonksiyonlar"; }
-    
+
     /*! this function is used to produce a comma-separated list of items.
      *  use generateMarker(i) to indicate where item i should be put.
      */
@@ -672,23 +666,23 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
       QCString result;
       int i;
       // the inherits list contain `numEntries' classes
-      for (i=0;i<numEntries;i++) 
+      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 
+        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 
+          if (i<numEntries-2) // not the fore last entry
             result+=", ";
           else                // the fore last entry
             result+=" ve ";
         }
       }
-      return result; 
+      return result;
     }
-    
+
     /*! used in class documentation to produce a list of base classes,
      *  if class diagrams are disabled.
      */
@@ -705,7 +699,7 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
       return "Şu sınıfların atasıdır : "+trWriteList(numEntries)+".";
     }
 
-    /*! used in member documentation blocks to produce a list of 
+    /*! used in member documentation blocks to produce a list of
      *  members that are hidden by this one.
      */
     virtual QCString trReimplementedFromList(int numEntries)
@@ -727,17 +721,17 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
 
     /*! This is an introduction to the page with all namespace members */
     virtual QCString trNamespaceMemberDescription(bool extractAll)
-    { 
+    {
       QCString result="Bu liste tüm ";
       if (!extractAll) result+="dokümante edilmiş ";
       result+="namespace üyelerini listeler ve ";
-      if (extractAll) 
+      if (extractAll)
         result+="her üye için üye dokümantasyonuna bağlar:";
-      else 
+      else
         result+="ait olduğu namespace\'lere bağlar:";
       return result;
     }
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      *  index of all namespaces.
      */
     virtual QCString trNamespaceIndex()
@@ -807,7 +801,7 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
     virtual QCString trMainPage()
     { return "Ana Sayfa"; }
 
-    /*! This is used in references to page that are put in the LaTeX 
+    /*! 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()
@@ -852,7 +846,7 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
     /*! header that is put before the list of constructor/destructors. */
     virtual QCString trConstructorDocumentation()
     {
-      return "Constructor & Destructor Dokümantasyonu"; 
+      return "Constructor & Destructor Dokümantasyonu";
     }
     /*! Used in the file documentation to point to the corresponding sources. */
     virtual QCString trGotoSourceCode()
@@ -909,7 +903,7 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
 //////////////////////////////////////////////////////////////////////////
 // new since 1.1.0
 //////////////////////////////////////////////////////////////////////////
-    
+
     virtual QCString trNote()
     {
       return "Not";
@@ -998,7 +992,7 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
     {
       return "Şu zamandan beri";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.1.5
 //////////////////////////////////////////////////////////////////////////
@@ -1008,12 +1002,12 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
     {
       return "Şekil Lejantı";
     }
-    /*! page explaining how the dot graph's should be interpreted 
+    /*! 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 
+      return
         "Bu dosya doxygen tarafından üretilen grafiklerin nasıl anlaşılacağını "
         "açıklar.<p>\n"
         "Aşağıdaki örneğe bakalım:\n"
@@ -1077,11 +1071,11 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
     {
       return "lejant";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.2.0
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! Used as a marker that is put before a test item */
     virtual QCString trTest()
     {
@@ -1159,11 +1153,11 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
     {
       return "Değer:";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.2.5
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! Used as a marker that is put before a \\bug item */
     virtual QCString trBug()
     {
@@ -1179,9 +1173,9 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
 // new since 1.2.6
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as ansicpg for RTF file 
-     * 
-     * The following table shows the correlation of Charset name, Charset Value and 
+    /*! 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
@@ -1202,15 +1196,15 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
      * GB2313_CHARSET          134 (x86)             936
      * CHINESEBIG5_CHARSET     136 (x88)             950
      * </pre>
-     * 
+     *
      */
     virtual QCString trRTFansicp()
     {
       return "1254";
     }
-    
 
-    /*! Used as ansicpg for RTF fcharset 
+
+    /*! Used as ansicpg for RTF fcharset
      *  \see trRTFansicp() for a table of possible values.
      */
     virtual QCString trRTFCharSet()
@@ -1223,82 +1217,82 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
     {
       return "İndeks";
     }
-   
+
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  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 ? "Sınıf" : "sınıf"));
       if (!singular)  result+="lar";
-      return result; 
+      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 
+     *  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 ? "Dosya" : "dosya"));
       if (!singular)  result+="lar";
-      return result; 
+      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 
+     *  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+="\'ler";
-      return result; 
+      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 
+     *  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 ? "Grup" : "grup"));
       if (!singular)  result+="lar";
-      return result; 
+      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 
+     *  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 ? "Sayfa" : "sayfa"));
       if (!singular)  result+="lar";
-      return result; 
+      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 
+     *  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 ? "Üye" : "üye"));
       if (!singular)  result+="ler";
-      return result; 
+      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 
+     *  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 değişken" : "global değişken"));
       if (!singular)  result+="ler";
-      return result; 
+      return result;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1308,10 +1302,10 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
     /*! 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 ? "Yazar" : "yazar"));
       if (!singular)  result+="lar";
-      return result; 
+      return result;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1329,7 +1323,7 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
 // new since 1.2.13
 //////////////////////////////////////////////////////////////////////////
 
-    /*! used in member documentation blocks to produce a list of 
+    /*! used in member documentation blocks to produce a list of
      *  members that are implemented by this one.
      */
     virtual QCString trImplementedFromList(int numEntries)
@@ -1361,8 +1355,8 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
 // new since 1.2.17
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as the header of the list of item that have been 
-     *  flagged deprecated 
+    /*! Used as the header of the list of item that have been
+     *  flagged deprecated
      */
     virtual QCString trDeprecatedList()
     {
@@ -1373,7 +1367,7 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
 // new since 1.2.18
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as a header for declaration section of the events found in 
+    /*! Used as a header for declaration section of the events found in
      * a C# program
      */
     virtual QCString trEvents()
@@ -1393,43 +1387,43 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
     /*! Used as a heading for a list of Java class types with package scope.
      */
     virtual QCString trPackageTypes()
-    { 
+    {
       return "Paket Tipleri";
     }
-    /*! Used as a heading for a list of Java class fonksiyonlar with package 
-     * scope. 
+    /*! Used as a heading for a list of Java class fonksiyonlar with package
+     * scope.
      */
     virtual QCString trPackageMembers()
-    { 
+    {
       return "Paket Fonksiyonlar";
     }
-    /*! Used as a heading for a list of static Java class fonksiyonlar with 
+    /*! Used as a heading for a list of static Java class fonksiyonlar with
      *  package scope.
      */
     virtual QCString trStaticPackageMembers()
-    { 
+    {
       return "Static Pakat Fonksiyonları";
     }
-    /*! Used as a heading for a list of Java class variables with package 
+    /*! Used as a heading for a list of Java class variables with package
      * scope.
      */
     virtual QCString trPackageAttribs()
-    { 
+    {
       return "Packet Özellikleri(attribute)";
     }
-    /*! Used as a heading for a list of static Java class variables with 
+    /*! Used as a heading for a list of static Java class variables with
      * package scope.
      */
     virtual QCString trStaticPackageAttribs()
-    { 
+    {
       return "Statik Packet Özellikleri(attribute)";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.3.1
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used in the quick index of a class/file/namespace member list page 
+    /*! Used in the quick index of a class/file/namespace member list page
      *  to link to the unfiltered list of all members.
      */
     virtual QCString trAll()
@@ -1446,9 +1440,9 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
 // new since 1.3.3
 //////////////////////////////////////////////////////////////////////////
 
-    /*! When the search engine is enabled this text is put in the header 
-     *  of each page before the field where one can enter the text to search 
-     *  for. 
+    /*! When the search engine is enabled this text is put in the header
+     *  of each page before the field where one can enter the text to search
+     *  for.
      */
     virtual QCString trSearchForIndex()
     {
@@ -1465,7 +1459,7 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
      *  text can be different depending on the number of documents found.
      *  Inside the text you can put the special marker $num to insert
      *  the number representing the actual number of search results.
-     *  The @a numDocuments parameter can be either 0, 1 or 2, where the 
+     *  The @a numDocuments parameter can be either 0, 1 or 2, where the
      *  value 2 represents 2 or more matches. HTML markup is allowed inside
      *  the returned string.
      */
@@ -1479,13 +1473,13 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
       {
         return "Sorgunuzla eşleşen <b>1</b> doküman bulundu.";
       }
-      else 
+      else
       {
         return "Sorgunuzla eşleşen <b>$num</b> doküman bulundu. "
                "Önce en iyi eşleşmeler gösteriliyor.";
       }
     }
-    /*! This string is put before the list of matched words, for each search 
+    /*! This string is put before the list of matched words, for each search
      *  result. What follows is the list of words that matched the query.
      */
     virtual QCString trSearchMatches()
@@ -1526,7 +1520,7 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
     virtual QCString trDirectories()
     { return "Dizinler"; }
 
-    /*! This returns a sentences that introduces the directory hierarchy. 
+    /*! This returns a sentences that introduces the directory hierarchy.
      *  and the fact that it is sorted alphabetically per level
      */
     virtual QCString trDirDescription()
@@ -1544,10 +1538,10 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
      *  (\a first_capital) and in sigular or plural form (\a singular).
      */
     virtual QCString trDir(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Dizin" : "dizin"));
       if (!singular) result+="ler";
-      return result; 
+      return result;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1574,7 +1568,7 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
       return "Bu fonksiyon için çağırılma şeması:";
     }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for enumeration values
      */
     virtual QCString trEnumerationValueDocumentation()
@@ -1583,12 +1577,12 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
 //////////////////////////////////////////////////////////////////////////
 // new since 1.5.4 (mainly for Fortran)
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! header that is put before the list of member subprograms (Fortran). */
     virtual QCString trMemberFunctionDocumentationFortran()
     { return "Üye Fonksiyon/Subroutine Dokümantasyonu"; }
 
-    /*! This is put above each page as a link to the list of annotated data types (Fortran). */    
+    /*! This is put above each page as a link to the list of annotated data types (Fortran). */
     virtual QCString trCompoundListFortran()
     { return "Veri Tipleri Listesi"; }
 
@@ -1609,18 +1603,18 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
         result+="dokümante edilmiş ";
       }
       result+="veri tiplerini içerir ve ";
-      if (!extractAll) 
+      if (!extractAll)
       {
          result+="her üyeyi veri yapısı dokümantasyonuna bağlar:";
       }
-      else 
+      else
       {
          result+="ait oldukları veri tiplerine bağlar:";
       }
       return result;
     }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * annotated compound index (Fortran).
      */
     virtual QCString trCompoundIndexFortran()
@@ -1632,24 +1626,24 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
     virtual QCString trTypeDocumentation()
     { return "Veri Tipi Dokümantasyonu"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) subprograms (Fortran).
      */
     virtual QCString trSubprograms()
     { return "Fonksiyonlar/Subroutine\'ler"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for subprograms (Fortran)
      */
     virtual QCString trSubprogramDocumentation()
     { return "Fonksiyon/Subroutine Dokümantasyonu"; }
 
-    /*! This is used in the documentation of a file/namespace/group before 
+    /*! This is used in the documentation of a file/namespace/group before
      *  the list of links to documented compounds (Fortran)
      */
      virtual QCString trDataTypes()
     { return "Veri Tipleri"; }
-    
+
     /*! used as the title of page containing all the index of all modules (Fortran). */
     virtual QCString trModulesList()
     { return "Modüller Listesi"; }
@@ -1688,46 +1682,46 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
     virtual QCString trModuleReference(const char *namespaceName)
     {
       QCString result=namespaceName;
-      result+=" Modül Referansı";        
+      result+=" Modül Referansı";
       return result;
     }
-    
+
     /*! This is put above each page as a link to all members of modules. (Fortran) */
     virtual QCString trModulesMembers()
     { return "Modül Üyeleri"; }
 
     /*! This is an introduction to the page with all modules members (Fortran) */
     virtual QCString trModulesMemberDescription(bool extractAll)
-    { 
+    {
       QCString result="Bu liste tüm ";
       if (!extractAll) result+="dokümante edilmiş ";
       result+="modül üyelerini içerir ve ";
-      if (extractAll) 
+      if (extractAll)
       {
         result+="her üyeyi modül dokümantasyonuna bağlar:";
       }
-      else 
+      else
       {
         result+="ait oldukları modüllere bağlar:";
       }
       return result;
     }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      *  index of all modules (Fortran).
      */
     virtual QCString trModulesIndex()
     { return "Modüller Indeksi"; }
-    
+
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trModule(bool first_capital, bool singular)
-    {       
+    {
       QCString result((first_capital ? "Modül" : "modül"));
       if (!singular)  result+="ler";
-      return result; 
+      return result;
     }
     /*! This is put at the bottom of a module documentation page and is
      *  followed by a list of files that were used to generate the page.
@@ -1754,24 +1748,24 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
       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 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trType(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Tip" : "tip"));
       if (!singular)  result+="ler";
-      return result; 
+      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 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trSubprogram(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Alt program" : "alt program"));
       if (!singular)  result+="lar";
-      return result; 
+      return result;
     }
 
     /*! C# Type Constraint list */
@@ -1779,52 +1773,52 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
     {
       return "Tip Sınırlamaları";
     }
-	
-	
+
+
 	//////////////////////////////////////////////////////////////////////////
 	// new since 1.6.0 (mainly for the new search engine)
 	//////////////////////////////////////////////////////////////////////////
-	
+
     /*! directory relation for \a name */
     virtual QCString trDirRelation(const char *name)
     {
 		return QCString(name)+" İlişkisi";
     }
-	
+
     /*! Loading message shown when loading search results */
     virtual QCString trLoading()
     {
 		return "Yüklüyor...";
     }
-	
+
     /*! Label used for search results in the global namespace */
     virtual QCString trGlobalNamespace()
     {
 		return "En Üst Seviye";
     }
-	
+
     /*! Message shown while searching */
     virtual QCString trSearching()
     {
 		return "Arıyor...";
     }
-	
+
     /*! Text shown when no search results are found */
     virtual QCString trNoMatches()
     {
 		return "Eşleşme Yok";
     }
-	
+
 	//////////////////////////////////////////////////////////////////////////
 	// new since 1.6.3 (missing items for the directory pages)
 	//////////////////////////////////////////////////////////////////////////
-	
+
     /*! introduction text for the directory dependency graph */
     virtual QCString trDirDependency(const char *name)
     {
 		return (QCString)(name) + (QCString)" için dizin bağımlılık grafiği";
     }
-	
+
     /*! when clicking a directory dependency label, a page with a
      *  table is shown. The heading for the first column mentions the
      *  source file that has a relation to another file.
@@ -1833,7 +1827,7 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
     {
 		return (QCString)(name) + (QCString)" dizinindeki dosya";
     }
-	
+
     /*! when clicking a directory dependency label, a page with a
      *  table is shown. The heading for the second column mentions the
      *  destination file that is included.
@@ -1842,8 +1836,8 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
     {
 		return (QCString)(name) + (QCString)" dizinindeki dosyayı kapsıyor";
     }
-	
-    /** Compiles a date string. 
+
+    /** Compiles a date string.
      *  @param year Year in 4 digits
      *  @param month Month of the year: 1=January
      *  @param day Day of the Month: 1..31
@@ -1869,8 +1863,8 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5
 		}
 		return sdate;
     }
-	
-	
+
+
 };
 
 #endif
diff --git a/src/translator_tw.h b/src/translator_tw.h
index 48629fe..d118ad2 100644
--- a/src/translator_tw.h
+++ b/src/translator_tw.h
@@ -75,12 +75,6 @@ class TranslatorChinesetraditional : public Translator
       return "";
     }
 
-    /*! return the language charset. This will be used for the HTML output */
-    virtual QCString idLanguageCharset()
-    {
-      return "utf-8";
-    }
-
     // --- Language translation methods -------------------
 
     /*! used in the compound documentation before a list of related functions. */
diff --git a/src/translator_ua.h b/src/translator_ua.h
index e899801..ce24cff 100644
--- a/src/translator_ua.h
+++ b/src/translator_ua.h
@@ -32,12 +32,6 @@ class TranslatorUkrainian : public TranslatorAdapter_1_8_4
       return "\\usepackage[T2A]{fontenc}\n\\usepackage[ukrainian]{babel}\n";
     }
 
-    /*! return the language charset. This will be used for the HTML output */
-    virtual QCString idLanguageCharset()
-    {
-        return "utf-8";
-    }
-
     // --- Language translation methods -------------------
 
     /*! used in the compound documentation before a list of related functions. */
@@ -757,7 +751,7 @@ class TranslatorUkrainian : public TranslatorAdapter_1_8_4
         case ClassDef::Exception:
           if (single) result+="цього винятку"; else result+="цих винятків";
           break;
-        default: 
+        default:
           break;
       }
       result+=" була створена з файл";
diff --git a/src/translator_vi.h b/src/translator_vi.h
index 36fb48a..19f94bc 100644
--- a/src/translator_vi.h
+++ b/src/translator_vi.h
@@ -1,12 +1,12 @@
 /******************************************************************************
  *
- * 
+ *
  *
  * Copyright (C) 1997-2013 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 
+ * 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.
  *
@@ -25,7 +25,7 @@
  */
 
 
-/*! 
+/*!
  When defining a translator class for the new language, follow
  the description in the documentation.  One of the steps says
  that you should copy the translator_en.h (this) file to your
@@ -52,19 +52,19 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0
   public:
 
     // --- Language control methods -------------------
-    
-    /*! Used for identification of the language. The identification 
-     * should not be translated. It should be replaced by the name 
+
+    /*! 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 should be equal to 
+     * (e.g. "czech", "japanese", "russian", etc.). It should be equal to
      * the identification used in language.cpp.
      */
     virtual QCString idLanguage()
     { return "vietnamese"; }
-    
-    /*! Used to get the LaTeX command(s) for the language support. 
+
+    /*! 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 
+     *  LaTeX to the desired language.  For example
      *  <pre>"\\usepackage[german]{babel}\n"
      *  </pre>
      *  or
@@ -72,7 +72,7 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0
      *  "\\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.
      */
@@ -81,12 +81,6 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0
       return "";
     }
 
-    /*! return the language charset. This will be used for the HTML output */
-    virtual QCString idLanguageCharset()
-    {
-      return "utf-8";
-    }
-
     // --- Language translation methods -------------------
 
     /*! used in the compound documentation before a list of related functions. */
@@ -104,30 +98,30 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0
     /*! header that is put before the list of typedefs. */
     virtual QCString trMemberTypedefDocumentation()
     { return "Thông tin về Member Typedef"; }
-    
+
     /*! header that is put before the list of enumerations. */
     virtual QCString trMemberEnumerationDocumentation()
     { return "Thông tin về Member Enumeration"; }
-    
+
     /*! header that is put before the list of member functions. */
     virtual QCString trMemberFunctionDocumentation()
     { return "Thông tin về hàm thành viên"; }
-    
+
     /*! header that is put before the list of member attributes. */
     virtual QCString trMemberDataDocumentation()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Thông tin về trường"; 
+        return "Thông tin về trường";
       }
       else
       {
-        return "Thông tin về Member Data"; 
+        return "Thông tin về Member Data";
       }
     }
 
     /*! this is the text of a link put after brief descriptions. */
-    virtual QCString trMore() 
+    virtual QCString trMore()
     { return "Tiếp..."; }
 
     /*! put in the class documentation */
@@ -145,81 +139,81 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0
     /*! this is the remainder of the sentence after the class name */
     virtual QCString trIncludingInheritedMembers()
     { return ", cùng với tất cả các thành viên kế thừa."; }
-    
+
     /*! 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="Được tạo ra bởi Doxygen";
       if (s) result+=(QCString)" cho "+s;
-      result+=" từ mã nguồn."; 
+      result+=" từ mã nguồn.";
       return result;
     }
 
     /*! put after an enum name in the list of all members */
     virtual QCString trEnumName()
     { return "tên enum"; }
-    
+
     /*! put after an enum value in the list of all members */
     virtual QCString trEnumValue()
     { return "giá trị enum"; }
-    
+
     /*! put after an undocumented member in the list of all members */
     virtual QCString trDefinedIn()
     { return "được định nghĩa trong"; }
 
     // quick reference sections
 
-    /*! This is put above each page as a link to the list of all groups of 
+    /*! 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 "Các Modules"; }
-    
+
     /*! This is put above each page as a link to the class hierarchy */
     virtual QCString trClassHierarchy()
     { return "Kiến trúc Class"; }
-    
+
     /*! This is put above each page as a link to the list of annotated classes */
     virtual QCString trCompoundList()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
         return "Cấu trúc cơ sở dữ liệu (Data Structures)";
       }
       else
       {
-        return "Danh mục các Class"; 
+        return "Danh mục các Class";
       }
     }
-    
+
     /*! This is put above each page as a link to the list of documented files */
     virtual QCString trFileList()
     { return "Danh mục File"; }
 
     /*! This is put above each page as a link to all members of compounds. */
     virtual QCString trCompoundMembers()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Các trường dữ liệu"; 
+        return "Các trường dữ liệu";
       }
       else
       {
-        return "Các thành viên của Class"; 
+        return "Các thành viên của Class";
       }
     }
 
     /*! This is put above each page as a link to all members of files. */
     virtual QCString trFileMembers()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Toàn cục"; 
+        return "Toàn cục";
       }
       else
       {
-        return "File thành viên"; 
+        return "File thành viên";
       }
     }
 
@@ -252,16 +246,16 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0
 
     /*! This is an introduction to the annotated compound list. */
     virtual QCString trCompoundListDescription()
-    { 
-      
+    {
+
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Đây là cấu trúc cơ sở dữ liệu với mô tả tóm tắt:"; 
+        return "Đây là cấu trúc cơ sở dữ liệu với mô tả tóm tắt:";
       }
       else
       {
         return "Đây là các classes, structs, "
-               "unions và interfaces với các mô tả tóm tắt:"; 
+               "unions và interfaces với các mô tả tóm tắt:";
       }
     }
 
@@ -282,7 +276,7 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0
         result+="class members";
       }
       result+=" cùng với các các liên kết đến ";
-      if (!extractAll) 
+      if (!extractAll)
       {
         if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
         {
@@ -293,7 +287,7 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0
           result+="Thông tin về class cho từng thành viên:";
         }
       }
-      else 
+      else
       {
         if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
         {
@@ -312,7 +306,7 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0
     {
       QCString result="Danh sách tất cả các ";
       if (!extractAll) result+="(đã được mô tat) ";
-      
+
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
         result+="functions, variables, defines, enums, và typedefs";
@@ -322,9 +316,9 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0
         result+="các file thành viên";
       }
       result+=" cùng với links tới ";
-      if (extractAll) 
+      if (extractAll)
         result+="các files thuộc:";
-      else 
+      else
         result+="tài liệu:";
       return result;
     }
@@ -341,43 +335,43 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0
     virtual QCString trModulesDescription()
     { return "Danh sách tất cả các thành viên:"; }
 
-    // index titles (the project name is prepended for these) 
+    // index titles (the project name is prepended for these)
 
     /*! This is used in HTML as the title of index.html. */
     virtual QCString trDocumentation()
     { return "Thông tin"; }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * index of all groups.
      */
     virtual QCString trModuleIndex()
     { return "Chỉ mục (Index) Module"; }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * class hierarchy.
      */
     virtual QCString trHierarchicalIndex()
     { return "Hierarchical Index"; }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * annotated compound index.
      */
     virtual QCString trCompoundIndex()
     {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
-      { 
+      {
         return "Index cấu trúc cơ sở dữ liệu";
       }
       else
       {
-        return "Class Index"; 
+        return "Class Index";
       }
     }
 
     /*! This is used in LaTeX as the title of the chapter with the
      * list of all files.
      */
-    virtual QCString trFileIndex() 
+    virtual QCString trFileIndex()
     { return "File Index"; }
 
     /*! This is used in LaTeX as the title of the chapter containing
@@ -390,14 +384,14 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0
      *  the documentation of all classes, structs and unions.
      */
     virtual QCString trClassDocumentation()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Thông tin về cấu trúc cơ sở dữ liệu"; 
+        return "Thông tin về cấu trúc cơ sở dữ liệu";
       }
       else
       {
-        return "Thông tin về Class"; 
+        return "Thông tin về Class";
       }
     }
 
@@ -422,105 +416,105 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0
     /*! This is used in LaTeX as the title of the document */
     virtual QCString trReferenceManual()
     { return "Thông tin tham chiếu"; }
-    
-    /*! This is used in the documentation of a file as a header before the 
+
+    /*! This is used in the documentation of a file as a header before the
      *  list of defines
      */
     virtual QCString trDefines()
     { return "Định nghĩa"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of function prototypes
      */
     virtual QCString trFuncProtos()
     { return "Function Prototypes"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of typedefs
      */
     virtual QCString trTypedefs()
     { return "Typedefs"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of enumerations
      */
     virtual QCString trEnumerations()
     { return "Enumerations"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) functions
      */
     virtual QCString trFunctions()
     { return "Các hàm"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) variables
      */
     virtual QCString trVariables()
     { return "Các biến"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) variables
      */
     virtual QCString trEnumerationValues()
     { return "Enumerator"; }
-    
+
     /*! This is used in the documentation of a file before the list of
      *  documentation blocks for defines
      */
     virtual QCString trDefineDocumentation()
     { return "Thông tin về định nghĩa"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for function prototypes
      */
     virtual QCString trFunctionPrototypeDocumentation()
     { return "Thông tin về Function Prototype"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for typedefs
      */
     virtual QCString trTypedefDocumentation()
     { return "Thông tin về Typedef"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for enumeration types
      */
     virtual QCString trEnumerationTypeDocumentation()
     { return "Thông tin về Enumeration Type"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for functions
      */
     virtual QCString trFunctionDocumentation()
     { return "Thông tin về hàm"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for variables
      */
     virtual QCString trVariableDocumentation()
     { return "Thông tin về các biến"; }
 
-    /*! This is used in the documentation of a file/namespace/group before 
+    /*! This is used in the documentation of a file/namespace/group before
      *  the list of links to documented compounds
      */
     virtual QCString trCompounds()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Cấu trúc cơ sở dữ liệu"; 
+        return "Cấu trúc cơ sở dữ liệu";
       }
       else
       {
-        return "Classes"; 
+        return "Classes";
       }
     }
 
-    /*! This is used in the standard footer of each page and indicates when 
-     *  the page was generated 
+    /*! 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)"Được biên soạn vào "+date;
       if (projName) result+=(QCString)" cho mã nguồn dự án "+projName;
       result+=(QCString)" bởi";
@@ -538,7 +532,7 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0
     {
       return (QCString)"Sơ đồ kế thừa cho "+clName+":";
     }
-    
+
     /*! this text is generated when the \\internal command is used. */
     virtual QCString trForInternalUseOnly()
     { return "Chỉ cho sử dụng nội bộ."; }
@@ -570,7 +564,7 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0
     /*! this text is generated when the \\exception command is used. */
     virtual QCString trExceptions()
     { return "Exceptions"; }
-    
+
     /*! this text is used in the title page of a LaTeX document. */
     virtual QCString trGeneratedBy()
     { return "Được biên soạn bởi"; }
@@ -578,7 +572,7 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990307
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! used as the title of page containing all the index of all namespaces. */
     virtual QCString trNamespaceList()
     { return "Danh sách Namespace"; }
@@ -597,17 +591,17 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0
      */
     virtual QCString trFriends()
     { return "Friends"; }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990405
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! used in the class documentation as a header before the list of all
-     * related classes 
+     * related classes
      */
     virtual QCString trRelatedFunctionDocumentation()
     { return "Thông tin về Friends và các hàm liên quan"; }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990425
 //////////////////////////////////////////////////////////////////////////
@@ -638,7 +632,7 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0
     virtual QCString trFileReference(const char *fileName)
     {
       QCString result=fileName;
-      result+=" File Tham chiếu"; 
+      result+=" File Tham chiếu";
       return result;
     }
 
@@ -649,7 +643,7 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0
       result+=" Namespace Tham chiếu";
       return result;
     }
-    
+
     virtual QCString trPublicMembers()
     { return "Các hàm thành viên Public"; }
     virtual QCString trPublicSlots()
@@ -670,7 +664,7 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0
     { return "Private Slots"; }
     virtual QCString trStaticPrivateMembers()
     { return "Các hàm thành viên Static Private"; }
-    
+
     /*! this function is used to produce a comma-separated list of items.
      *  use generateMarker(i) to indicate where item i should be put.
      */
@@ -679,23 +673,23 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0
       QCString result;
       int i;
       // the inherits list contain `numEntries' classes
-      for (i=0;i<numEntries;i++) 
+      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 
+        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 
+          if (i<numEntries-2) // not the fore last entry
             result+=", ";
           else                // the fore last entry
             result+=", và ";
         }
       }
-      return result; 
+      return result;
     }
-    
+
     /*! used in class documentation to produce a list of base classes,
      *  if class diagrams are disabled.
      */
@@ -712,7 +706,7 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0
       return "Được kế thừa bởi "+trWriteList(numEntries)+".";
     }
 
-    /*! used in member documentation blocks to produce a list of 
+    /*! used in member documentation blocks to produce a list of
      *  members that are hidden by this one.
      */
     virtual QCString trReimplementedFromList(int numEntries)
@@ -734,17 +728,17 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0
 
     /*! This is an introduction to the page with all namespace members */
     virtual QCString trNamespaceMemberDescription(bool extractAll)
-    { 
+    {
       QCString result="Danh sách tất cả các ";
       if (!extractAll) result+="(đã được biên soạn) ";
       result+="các thành viên namespace cùng với link tới ";
-      if (extractAll) 
+      if (extractAll)
         result+="Thông tin namespace cho từng thành viên:";
-      else 
+      else
         result+=" namespaces mà phụ thuộc bởi:";
       return result;
     }
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      *  index of all namespaces.
      */
     virtual QCString trNamespaceIndex()
@@ -813,7 +807,7 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0
     virtual QCString trMainPage()
     { return "Tranh chính"; }
 
-    /*! This is used in references to page that are put in the LaTeX 
+    /*! 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()
@@ -858,7 +852,7 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0
     /*! header that is put before the list of constructor/destructors. */
     virtual QCString trConstructorDocumentation()
     {
-      return "Thông tin về Constructor và Destructor"; 
+      return "Thông tin về Constructor và Destructor";
     }
     /*! Used in the file documentation to point to the corresponding sources. */
     virtual QCString trGotoSourceCode()
@@ -915,7 +909,7 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0
 //////////////////////////////////////////////////////////////////////////
 // new since 1.1.0
 //////////////////////////////////////////////////////////////////////////
-    
+
     virtual QCString trNote()
     {
       return "Ghi chú";
@@ -1004,7 +998,7 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0
     {
       return "Từ";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.1.5
 //////////////////////////////////////////////////////////////////////////
@@ -1014,12 +1008,12 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0
     {
       return "Chú giải Graph";
     }
-    /*! page explaining how the dot graph's should be interpreted 
+    /*! 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 
+      return
         "Trang này giải nghĩa các biểu đồ được biên soạn bởi "
         " doxygen.<p>\n"
         "Hãy xem xét các ví dụ sau:\n"
@@ -1083,11 +1077,11 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0
     {
       return "Chú giải";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.2.0
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! Used as a marker that is put before a test item */
     virtual QCString trTest()
     {
@@ -1165,11 +1159,11 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0
     {
       return "Giá trị:";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.2.5
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! Used as a marker that is put before a \\bug item */
     virtual QCString trBug()
     {
@@ -1185,9 +1179,9 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0
 // new since 1.2.6
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as ansicpg for RTF file 
-     * 
-     * The following table shows the correlation of Charset name, Charset Value and 
+    /*! 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
@@ -1208,15 +1202,15 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0
      * GB2313_CHARSET          134 (x86)             936
      * CHINESEBIG5_CHARSET     136 (x88)             950
      * </pre>
-     * 
+     *
      */
     virtual QCString trRTFansicp()
     {
       return "1258";
     }
-    
 
-    /*! Used as ansicpg for RTF fcharset 
+
+    /*! Used as ansicpg for RTF fcharset
      *  \see trRTFansicp() for a table of possible values.
      */
     virtual QCString trRTFCharSet()
@@ -1229,82 +1223,82 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0
     {
       return "Chỉ số";
     }
-   
+
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  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 result;
     }
 
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  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 result;
     }
 
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  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 result;
     }
 
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  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 result;
     }
 
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  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 ? "Trang" : "trang"));
       if (!singular)  result+="";
-      return result; 
+      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 
+     *  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 result;
     }
-   
+
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  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 result;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1314,10 +1308,10 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0
     /*! 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 ? "Tác giả" : "tác giả"));
       if (!singular)  result+="";
-      return result; 
+      return result;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1335,7 +1329,7 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0
 // new since 1.2.13
 //////////////////////////////////////////////////////////////////////////
 
-    /*! used in member documentation blocks to produce a list of 
+    /*! used in member documentation blocks to produce a list of
      *  members that are implemented by this one.
      */
     virtual QCString trImplementedFromList(int numEntries)
@@ -1367,8 +1361,8 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0
 // new since 1.2.17
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as the header of the list of item that have been 
-     *  flagged deprecated 
+    /*! Used as the header of the list of item that have been
+     *  flagged deprecated
      */
     virtual QCString trDeprecatedList()
     {
@@ -1379,7 +1373,7 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0
 // new since 1.2.18
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as a header for declaration section of the events found in 
+    /*! Used as a header for declaration section of the events found in
      * a C# program
      */
     virtual QCString trEvents()
@@ -1399,43 +1393,43 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0
     /*! Used as a heading for a list of Java class types with package scope.
      */
     virtual QCString trPackageTypes()
-    { 
+    {
       return "Kiểu gói";
     }
-    /*! Used as a heading for a list of Java class functions with package 
-     * scope. 
+    /*! Used as a heading for a list of Java class functions with package
+     * scope.
      */
     virtual QCString trPackageMembers()
-    { 
+    {
       return "Các hàm Package";
     }
-    /*! Used as a heading for a list of static Java class functions with 
+    /*! Used as a heading for a list of static Java class functions with
      *  package scope.
      */
     virtual QCString trStaticPackageMembers()
-    { 
+    {
       return "Các hàm Static Package";
     }
-    /*! Used as a heading for a list of Java class variables with package 
+    /*! Used as a heading for a list of Java class variables with package
      * scope.
      */
     virtual QCString trPackageAttribs()
-    { 
+    {
       return "Các thuộc tính Package";
     }
-    /*! Used as a heading for a list of static Java class variables with 
+    /*! Used as a heading for a list of static Java class variables with
      * package scope.
      */
     virtual QCString trStaticPackageAttribs()
-    { 
+    {
       return "Các thuộc tính Static Package";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.3.1
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used in the quick index of a class/file/namespace member list page 
+    /*! Used in the quick index of a class/file/namespace member list page
      *  to link to the unfiltered list of all members.
      */
     virtual QCString trAll()
@@ -1452,9 +1446,9 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0
 // new since 1.3.3
 //////////////////////////////////////////////////////////////////////////
 
-    /*! When the search engine is enabled this text is put in the header 
-     *  of each page before the field where one can enter the text to search 
-     *  for. 
+    /*! When the search engine is enabled this text is put in the header
+     *  of each page before the field where one can enter the text to search
+     *  for.
      */
     virtual QCString trSearchForIndex()
     {
@@ -1471,7 +1465,7 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0
      *  text can be different depending on the number of documents found.
      *  Inside the text you can put the special marker $num to insert
      *  the number representing the actual number of search results.
-     *  The @a numDocuments parameter can be either 0, 1 or 2, where the 
+     *  The @a numDocuments parameter can be either 0, 1 or 2, where the
      *  value 2 represents 2 or more matches. HTML markup is allowed inside
      *  the returned string.
      */
@@ -1485,13 +1479,13 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0
       {
         return "Tìm thấy <b>1</b> tài liệu thỏa mã truy vấn của bạn.";
       }
-      else 
+      else
       {
         return "Tìm thấy tất cả <b>$num</b> tài liệu thỏa mã truy vấn của bạn. "
                "Hiển thị những thỏa mãn tốt nhất trước.";
       }
     }
-    /*! This string is put before the list of matched words, for each search 
+    /*! This string is put before the list of matched words, for each search
      *  result. What follows is the list of words that matched the query.
      */
     virtual QCString trSearchMatches()
@@ -1532,7 +1526,7 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0
     virtual QCString trDirectories()
     { return "Các thư mục"; }
 
-    /*! This returns a sentences that introduces the directory hierarchy. 
+    /*! This returns a sentences that introduces the directory hierarchy.
      *  and the fact that it is sorted alphabetically per level
      */
     virtual QCString trDirDescription()
@@ -1550,10 +1544,10 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0
      *  (\a first_capital) and in sigular or plural form (\a singular).
      */
     virtual QCString trDir(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Thư mục" : "thư mục"));
       if (singular) result+=""; else result+="";
-      return result; 
+      return result;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1580,7 +1574,7 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0
       return "Biểu đồ các lời gọi cho hàm này:";
     }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for enumeration values
      */
     virtual QCString trEnumerationValueDocumentation()
@@ -1589,12 +1583,12 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0
 //////////////////////////////////////////////////////////////////////////
 // new since 1.5.4 (mainly for Fortran)
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! header that is put before the list of member subprograms (Fortran). */
     virtual QCString trMemberFunctionDocumentationFortran()
     { return "Thông tin về các hàm và các thủ tục thành viên"; }
 
-    /*! This is put above each page as a link to the list of annotated data types (Fortran). */    
+    /*! This is put above each page as a link to the list of annotated data types (Fortran). */
     virtual QCString trCompoundListFortran()
     { return "Danh sách kiêu dữ liệu"; }
 
@@ -1616,18 +1610,18 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0
       }
       result+="các kiểu dữ liệu thành viên";
       result+=" cùng với liên kết với ";
-      if (!extractAll) 
+      if (!extractAll)
       {
          result+="Thông tin cấu trúc dữ liệu cho từng thành viên";
       }
-      else 
+      else
       {
          result+=" các kiểu dữ liệu thuộc:";
       }
       return result;
     }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      * annotated compound index (Fortran).
      */
     virtual QCString trCompoundIndexFortran()
@@ -1639,24 +1633,24 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0
     virtual QCString trTypeDocumentation()
     { return "Thông tin về kiểu dữ liệu"; }
 
-    /*! This is used in the documentation of a file as a header before the 
+    /*! This is used in the documentation of a file as a header before the
      *  list of (global) subprograms (Fortran).
      */
     virtual QCString trSubprograms()
     { return "Functions/Subroutines"; }
 
-    /*! This is used in the documentation of a file/namespace before the list 
+    /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for subprograms (Fortran)
      */
     virtual QCString trSubprogramDocumentation()
     { return "Thông tin về Function/Subroutine"; }
 
-    /*! This is used in the documentation of a file/namespace/group before 
+    /*! This is used in the documentation of a file/namespace/group before
      *  the list of links to documented compounds (Fortran)
      */
      virtual QCString trDataTypes()
     { return "Kiểu dữ liệu"; }
-    
+
     /*! used as the title of page containing all the index of all modules (Fortran). */
     virtual QCString trModulesList()
     { return "Danh sách Modules"; }
@@ -1695,46 +1689,46 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0
     virtual QCString trModuleReference(const char *namespaceName)
     {
       QCString result=namespaceName;
-      result+=" Tham chiếu Module";        
+      result+=" Tham chiếu Module";
       return result;
     }
-    
+
     /*! This is put above each page as a link to all members of modules. (Fortran) */
     virtual QCString trModulesMembers()
     { return "Thành viên Module"; }
 
     /*! This is an introduction to the page with all modules members (Fortran) */
     virtual QCString trModulesMemberDescription(bool extractAll)
-    { 
+    {
       QCString result="Danh sách tất cả ";
       if (!extractAll) result+="(đã được mô tả) ";
       result+="các module thành viên cùng với liên kết tới ";
-      if (extractAll) 
+      if (extractAll)
       {
         result+="Thông tin module cho từng thành viên:";
       }
-      else 
+      else
       {
         result+="các module thuộc:";
       }
       return result;
     }
 
-    /*! This is used in LaTeX as the title of the chapter with the 
+    /*! This is used in LaTeX as the title of the chapter with the
      *  index of all modules (Fortran).
      */
     virtual QCString trModulesIndex()
     { return "Chỉ mục các Module"; }
-    
+
     /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trModule(bool first_capital, bool singular)
-    {       
+    {
       QCString result((first_capital ? "Module" : "module"));
       if (!singular)  result+="";
-      return result; 
+      return result;
     }
     /*! This is put at the bottom of a module documentation page and is
      *  followed by a list of files that were used to generate the page.
@@ -1760,24 +1754,24 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0
       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 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trType(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Kiểu" : "kiểu"));
       if (!singular)  result+="";
-      return result; 
+      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 
+     *  be followed by a single name or by a list of names
      *  of the category.
      */
     virtual QCString trSubprogram(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Chương trình con" : "chương trình con"));
       if (!singular)  result+="";
-      return result; 
+      return result;
     }
 
     /*! C# Type Constraint list */
diff --git a/src/translator_za.h b/src/translator_za.h
index af4ba41..cce4bda 100644
--- a/src/translator_za.h
+++ b/src/translator_za.h
@@ -62,12 +62,6 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
       return "";
     }
 
-    /*! return the language charset. This will be used for the HTML output */
-    virtual QCString idLanguageCharset()
-    {
-      return "utf-8";
-    }
-
     // --- Language translation methods -------------------
 
     /*! used in the compound documentation before a list of related functions. */
-- 
cgit v0.12