Merge pull request #12 from pepr/master

Almost all translators converted to UTF-8

8 files changed, 1531 insertions, 1428 deletions

diff --git a/src/language.cpp b/src/language.cpp
index 8dbd6d3..b0218d4 100644
--- a/src/language.cpp
+++ b/src/language.cpp
@@ -189,7 +189,7 @@ bool setTranslator(const char *langName)
 #ifdef LANG_SV
   else if (L_EQUAL("swedish"))
   {
-    theTranslator=new TranslatorDecoder(new TranslatorSwedish);
+    theTranslator=new TranslatorSwedish;
   }
 #endif
 #ifdef LANG_CZ
@@ -207,7 +207,7 @@ bool setTranslator(const char *langName)
 #ifdef LANG_ID
   else if (L_EQUAL("indonesian"))
   {
-    theTranslator=new TranslatorDecoder(new TranslatorIndonesian);
+    theTranslator=new TranslatorIndonesian;
   }
 #endif
 #ifdef LANG_IT
@@ -225,7 +225,7 @@ bool setTranslator(const char *langName)
 #ifdef LANG_JP
   else if (L_EQUAL("japanese"))
   {
-    theTranslator=new TranslatorDecoder(new TranslatorJapanese);
+    theTranslator=new TranslatorJapanese;
   }
 #endif
 #ifdef LANG_JE
@@ -297,7 +297,7 @@ bool setTranslator(const char *langName)
 #ifdef LANG_SI
   else if (L_EQUAL("slovene"))
   {
-    theTranslator=new TranslatorDecoder(new TranslatorSlovene);
+    theTranslator=new TranslatorSlovene;
   }
 #endif
 #ifdef LANG_CN
@@ -309,7 +309,7 @@ bool setTranslator(const char *langName)
 #ifdef LANG_TW
   else if (L_EQUAL("chinese-traditional"))
   {
-    theTranslator=new TranslatorDecoder(new TranslatorChinesetraditional);
+    theTranslator=new TranslatorChinesetraditional;
   }
 #endif
 #ifdef LANG_NO
@@ -351,7 +351,7 @@ bool setTranslator(const char *langName)
 #ifdef LANG_SR
   else if (L_EQUAL("serbian"))
   {
-    theTranslator=new TranslatorDecoder(new TranslatorSerbian);
+    theTranslator=new TranslatorSerbian;
   }
 #endif
 #ifdef LANG_SC
@@ -381,7 +381,7 @@ bool setTranslator(const char *langName)
 #ifdef LANG_ZA
   else if (L_EQUAL("afrikaans"))
   {
-    theTranslator=new TranslatorDecoder(new TranslatorAfrikaans);
+    theTranslator=new TranslatorAfrikaans;
   }
 #endif
 #ifdef LANG_AR
diff --git a/src/translator_id.h b/src/translator_id.h
index 18e561a..bcf0efc 100644
--- a/src/translator_id.h
+++ b/src/translator_id.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_ID_H
 #define TRANSLATOR_ID_H
 
-/* 
+/*
  * Translasi berikut didasarkan pada versi translator_en.h dalam
  * Doxygen 1.7.5.1.
  *
@@ -30,18 +30,18 @@ class TranslatorIndonesian : 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.
      */
     virtual QCString idLanguage()
     { return "indonesian"; }
 
-    /*! 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 TranslatorIndonesian : 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.
      */
@@ -61,7 +61,7 @@ class TranslatorIndonesian : public TranslatorAdapter_1_8_0
     /*! return the language charset. This will be used for the HTML output */
     virtual QCString idLanguageCharset()
     {
-      return "iso-8859-1";
+      return "utf-8";
     }
 
     // --- Language translation methods -------------------
@@ -92,19 +92,19 @@ class TranslatorIndonesian : public TranslatorAdapter_1_8_0
 
     /*! header that is put before the list of member attributes. */
     virtual QCString trMemberDataDocumentation()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Dokumentasi Variabel"; 
+        return "Dokumentasi Variabel";
       }
       else
       {
-        return "Dokumentasi Anggota: Data"; 
+        return "Dokumentasi Anggota: Data";
       }
     }
 
     /*! this is the text of a link put after brief descriptions. */
-    virtual QCString trMore() 
+    virtual QCString trMore()
     { return "Selengkapnya..."; }
 
     /*! put in the class documentation */
@@ -129,7 +129,7 @@ class TranslatorIndonesian : public TranslatorAdapter_1_8_0
     virtual QCString trGeneratedAutomatically(const char *s)
     { QCString result="Dibangkitkan secara otomatis oleh Doxygen";
       if (s) result+=(QCString)" untuk "+s;
-      result+=" dari kode sumber."; 
+      result+=" dari kode sumber.";
       return result;
     }
 
@@ -147,7 +147,7 @@ class TranslatorIndonesian : 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()
@@ -159,14 +159,14 @@ class TranslatorIndonesian : public TranslatorAdapter_1_8_0
 
     /*! 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 "Struktur Data";
       }
       else
       {
-        return "Daftar Kelas"; 
+        return "Daftar Kelas";
       }
     }
 
@@ -176,23 +176,23 @@ class TranslatorIndonesian : public TranslatorAdapter_1_8_0
 
     /*! 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 "Variabel Data"; 
+        return "Variabel Data";
       }
       else
       {
-        return "Daftar Anggota Kelas"; 
+        return "Daftar Anggota Kelas";
       }
     }
 
     /*! 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 "Daftar Definisi Global"; 
+        return "Daftar Definisi Global";
       }
       else
       {
@@ -229,11 +229,11 @@ class TranslatorIndonesian : 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 "Berikut ini daftar struktur data, dengan penjelasan singkat:"; 
+        return "Berikut ini daftar struktur data, dengan penjelasan singkat:";
       }
       else
       {
@@ -258,7 +258,7 @@ class TranslatorIndonesian : public TranslatorAdapter_1_8_0
         result+=" yang didokumentasikan";
       }
       result+=", dengan tautan ke ";
-      if (!extractAll) 
+      if (!extractAll)
       {
         if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
         {
@@ -269,7 +269,7 @@ class TranslatorIndonesian : public TranslatorAdapter_1_8_0
           result+="dokumentasi kelas untuk setiap anggota:";
         }
       }
-      else 
+      else
       {
         if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
         {
@@ -298,9 +298,9 @@ class TranslatorIndonesian : public TranslatorAdapter_1_8_0
       }
       if (!extractAll) result+=" yang didokumentasikan";
       result+=", dengan tautan ke ";
-      if (extractAll) 
+      if (extractAll)
         result+="file yang memuatnya:";
-      else 
+      else
         result+="dokumentasinya:";
       return result;
     }
@@ -317,43 +317,43 @@ class TranslatorIndonesian : public TranslatorAdapter_1_8_0
     virtual QCString trModulesDescription()
     { return "Berikut ini daftar semua modul:"; }
 
-    // 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 "Dokumentasi"; }
 
-    /*! 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 Modul"; }
 
-    /*! 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 "Indeks Hierarki Kelas"; }
 
-    /*! 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 "Indeks Struktur Data";
       }
       else
       {
-        return "Indeks Kelas"; 
+        return "Indeks Kelas";
       }
     }
 
     /*! 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 File"; }
 
     /*! This is used in LaTeX as the title of the chapter containing
@@ -366,14 +366,14 @@ class TranslatorIndonesian : public TranslatorAdapter_1_8_0
      *  the documentation of all classes, structs and unions.
      */
     virtual QCString trClassDocumentation()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Dokumentasi Struktur Data"; 
+        return "Dokumentasi Struktur Data";
       }
       else
       {
-        return "Dokumentasi Kelas"; 
+        return "Dokumentasi Kelas";
       }
     }
 
@@ -399,43 +399,43 @@ class TranslatorIndonesian : public TranslatorAdapter_1_8_0
     virtual QCString trReferenceManual()
     { return "Dokumen Referensi"; }
 
-    /*! 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 Definisi"; }
 
-    /*! 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 "Prototipe Fungsi"; }
 
-    /*! 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 "Definisi Tipe"; }
 
-    /*! 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 "Enumerasi"; }
 
-    /*! 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 "Fungsi"; }
 
-    /*! 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 "Variabel"; }
 
-    /*! 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()
@@ -447,56 +447,56 @@ class TranslatorIndonesian : public TranslatorAdapter_1_8_0
     virtual QCString trDefineDocumentation()
     { return "Dokumentasi Makro Definisi"; }
 
-    /*! 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 "Dokumentasi Prototipe Fungsi"; }
 
-    /*! 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 "Dokumentasi Definisi Tipe"; }
 
-    /*! 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 "Dokumentasi Tipe Enumerasi"; }
 
-    /*! 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 "Dokumentasi Fungsi"; }
 
-    /*! 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 "Dokumentasi Variabel"; }
 
-    /*! 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 "Struktur Data"; 
+        return "Struktur Data";
       }
       else
       {
-        return "Kelas"; 
+        return "Kelas";
       }
     }
 
-    /*! 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)"Dibangkitkan pada tanggal "+date;
       if (projName) result+=(QCString)" untuk "+projName;
       result+=(QCString)" oleh";
@@ -579,7 +579,7 @@ class TranslatorIndonesian : public TranslatorAdapter_1_8_0
 //////////////////////////////////////////////////////////////////////////
 
     /*! used in the class documentation as a header before the list of all
-     * related classes 
+     * related classes
      */
     virtual QCString trRelatedFunctionDocumentation()
     { return "Dokumentasi Friend Dan Fungsi Terkait"; }
@@ -614,7 +614,7 @@ class TranslatorIndonesian : public TranslatorAdapter_1_8_0
     virtual QCString trFileReference(const char *fileName)
     {
       QCString result="Referensi File ";
-      result+=fileName; 
+      result+=fileName;
       return result;
     }
 
@@ -655,21 +655,21 @@ class TranslatorIndonesian : 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+=", dan ";
         }
       }
-      return result; 
+      return result;
     }
 
     /*! used in class documentation to produce a list of base classes,
@@ -688,7 +688,7 @@ class TranslatorIndonesian : public TranslatorAdapter_1_8_0
       return "Diwariskan ke "+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,17 +710,17 @@ class TranslatorIndonesian : public TranslatorAdapter_1_8_0
 
     /*! This is an introduction to the page with all namespace members */
     virtual QCString trNamespaceMemberDescription(bool extractAll)
-    { 
+    {
       QCString result="Berikut ini daftar anggota namespace";
       if (!extractAll) result+=" yang didokumentasikan";
       result+=", dengan tautan ke ";
-      if (extractAll) 
+      if (extractAll)
         result+="dokumentasi namespace untuk setiap anggota:";
-      else 
+      else
         result+="namespace yang memuatnya:";
       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()
@@ -790,7 +790,7 @@ class TranslatorIndonesian : public TranslatorAdapter_1_8_0
     virtual QCString trMainPage()
     { return "Halaman Utama"; }
 
-    /*! 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()
@@ -835,7 +835,7 @@ class TranslatorIndonesian : public TranslatorAdapter_1_8_0
     /*! header that is put before the list of constructor/destructors. */
     virtual QCString trConstructorDocumentation()
     {
-      return "Dokumentasi Konstruktor & Destruktor"; 
+      return "Dokumentasi Konstruktor & Destruktor";
     }
     /*! Used in the file documentation to point to the corresponding sources. */
     virtual QCString trGotoSourceCode()
@@ -992,12 +992,12 @@ class TranslatorIndonesian : public TranslatorAdapter_1_8_0
     {
       return "Keterangan Bagan";
     }
-    /*! 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
         "Halaman ini berisi keterangan cara membaca bagan yang dibangkitkan "
         "oleh doxygen.<p>\n"
         "Contoh:\n"
@@ -1161,9 +1161,9 @@ class TranslatorIndonesian : 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
@@ -1184,7 +1184,7 @@ class TranslatorIndonesian : public TranslatorAdapter_1_8_0
      * GB2313_CHARSET          134 (x86)             936
      * CHINESEBIG5_CHARSET     136 (x88)             950
      * </pre>
-     * 
+     *
      */
     virtual QCString trRTFansicp()
     {
@@ -1192,7 +1192,7 @@ class TranslatorIndonesian : public TranslatorAdapter_1_8_0
     }
 
 
-    /*! Used as ansicpg for RTF fcharset 
+    /*! Used as ansicpg for RTF fcharset
      *  \see trRTFansicp() for a table of possible values.
      */
     virtual QCString trRTFCharSet()
@@ -1207,80 +1207,80 @@ class TranslatorIndonesian : 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)
-    { 
+    {
       QCString result((first_capital ? "Kelas" : "kelas"));
       if (!singular) result+="-kelas";
-      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+="-file";
-      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)
-    { 
+    {
       QCString result((first_capital ? "Namespace" : "namespace"));
-      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 ? "Kelompok" : "kelompok"));
       if (!singular) result+="-kelompok";
-      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 ? "Halaman" : "halaman"));
       if (!singular) result+="-halaman";
-      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 ? "Anggota" : "anggota"));
       if (!singular) result+="-anggota";
-      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 ? "Definisi" : "definisi"));
       if (!singular)  result+="-definisi";
       result += " global";
-      return result; 
+      return result;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1290,10 +1290,10 @@ class TranslatorIndonesian : 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)
-    {                                                                         
+    {
       QCString result((first_capital ? "Penulis" : "penulis"));
       //if (!singular)  result+="s";
-      return result; 
+      return result;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1311,7 +1311,7 @@ class TranslatorIndonesian : 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)
@@ -1343,8 +1343,8 @@ class TranslatorIndonesian : 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()
     {
@@ -1355,7 +1355,7 @@ class TranslatorIndonesian : 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()
@@ -1375,35 +1375,35 @@ class TranslatorIndonesian : public TranslatorAdapter_1_8_0
     /*! Used as a heading for a list of Java class types with package scope.
      */
     virtual QCString trPackageTypes()
-    { 
+    {
       return "Jenis Paket";
     }
-    /*! 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 "Daftar Fungsi Paket";
     }
-    /*! 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 "Daftar Fungsi Statis Paket";
     }
-    /*! 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 "Daftar Atribut Paket";
     }
-    /*! 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 "Daftar Atribut Statis Paket";
     }
 
@@ -1411,7 +1411,7 @@ class TranslatorIndonesian : public TranslatorAdapter_1_8_0
 // 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()
@@ -1428,9 +1428,9 @@ class TranslatorIndonesian : 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()
     {
@@ -1447,7 +1447,7 @@ class TranslatorIndonesian : 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.
      */
@@ -1461,13 +1461,13 @@ class TranslatorIndonesian : public TranslatorAdapter_1_8_0
       {
         return "Ditemukan <b>1</b> dokumen yang cocok.";
       }
-      else 
+      else
       {
         return "Ditemukan <b>$num</b> documents yang cocok. "
                "Menampilkan hasil terbaik lebih awal.";
       }
     }
-    /*! 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()
@@ -1508,7 +1508,7 @@ class TranslatorIndonesian : public TranslatorAdapter_1_8_0
     virtual QCString trDirectories()
     { return "Daftar Direktori"; }
 
-    /*! 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()
@@ -1525,10 +1525,10 @@ class TranslatorIndonesian : public TranslatorAdapter_1_8_0
      *  (\a first_capital) and in sigular or plural form (\a singular).
      */
     virtual QCString trDir(bool first_capital, bool)
-    { 
+    {
       QCString result((first_capital ? "Direktori" : "direktori"));
       //if (singular) result+="y"; else result+="ies";
-      return result; 
+      return result;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1555,7 +1555,7 @@ class TranslatorIndonesian : public TranslatorAdapter_1_8_0
       return "Berikut ini bagan fungsi-pemanggil untuk fungsi ini:";
     }
 
-    /*! 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()
@@ -1564,12 +1564,12 @@ class TranslatorIndonesian : 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 "Dokumentasi Fungsi/Subrutin Anggota"; }
 
-    /*! 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 "Daftar Tipe Data"; }
 
@@ -1590,18 +1590,18 @@ class TranslatorIndonesian : public TranslatorAdapter_1_8_0
         result+="terdokumentasi ";
       }
       result+=" dengan tautan ke ";
-      if (!extractAll) 
+      if (!extractAll)
       {
          result+="dokumentasi struktur data untuk setiap anggota:";
       }
-      else 
+      else
       {
          result+="tipe data yang memuatnya:";
       }
       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()
@@ -1613,24 +1613,24 @@ class TranslatorIndonesian : public TranslatorAdapter_1_8_0
     virtual QCString trTypeDocumentation()
     { return "Dokumentasi Tipe Data"; }
 
-    /*! 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 "Fungsi/Subrutin"; }
 
-    /*! 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 "Dokumentasi Fungsi/Subrutin"; }
 
-    /*! 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 "Tipe Data"; }
-    
+
     /*! used as the title of page containing all the index of all modules (Fortran). */
     virtual QCString trModulesList()
     { return "Modules List"; }
@@ -1672,43 +1672,43 @@ class TranslatorIndonesian : 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 "Anggota Modul"; }
 
     /*! This is an introduction to the page with all modules members (Fortran) */
     virtual QCString trModulesMemberDescription(bool extractAll)
-    { 
+    {
       QCString result="Berikut daftar semua anggota modul ";
       if (!extractAll) result+="terdokumentasi ";
       result+="dengan tautan ke ";
-      if (extractAll) 
+      if (extractAll)
       {
         result+="dokumentasi modul untuk setiap anggota:";
       }
-      else 
+      else
       {
         result+="modul yang memuatnya:";
       }
       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 Modul"; }
-    
+
     /*! 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+="-modul";
-      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,24 +1735,24 @@ class TranslatorIndonesian : 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 ? "Tipe" : "tipe"));
       if (!singular)  result+="-tipe";
-      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+="-subprogram";
-      return result; 
+      return result;
     }
 
     /*! C# Type Constraint list */
@@ -1823,7 +1823,7 @@ class TranslatorIndonesian : public TranslatorAdapter_1_8_0
       return (QCString)"Memuat file dalam "+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_jp.h b/src/translator_jp.h
index 418d6bb..8e973cf 100644
--- a/src/translator_jp.h
+++ b/src/translator_jp.h
@@ -16,7 +16,7 @@
  */
 
 /*
- * translator_jp.h 
+ * translator_jp.h
  * Updates:
  * 1.2.5)
  * First Translation
@@ -34,19 +34,6 @@
 
 class TranslatorJapanese : public TranslatorAdapter_1_6_0
 {
- private:
-  /*! The decode() can change euc into sjis */
-  inline QCString decode(const QCString & sInput)
-  {
-    //if (Config_getBool("USE_WINDOWS_ENCODING"))
-    //{
-    //  return JapaneseEucToSjis(sInput);
-    //}
-    //else
-    //{
-      return sInput;
-    //}
-  }
   public:
     virtual QCString idLanguage()
     { return "japanese"; }
@@ -57,46 +44,39 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
     /*! returns the name of the package that is included by LaTeX */
     virtual QCString idLanguageCharset()
     {
-      //if (Config_getBool("USE_WINDOWS_ENCODING"))
-      //{
-      //  return "Shift_JIS";
-      //}
-      //else
-      //{
-        return "euc-jp";
-      //}
+        return "utf-8";
     }
 
     /*! used in the compound documentation before a list of related functions. */
     virtual QCString trRelatedFunctions()
-    { return decode("��Ϣ����ؿ�"); }
+    { return "関連する関数"; }
 
     /*! subscript for the related functions. */
     virtual QCString trRelatedSubscript()
-    { return decode("�ʤ����ϥ᥽�åɤǤʤ����Ȥ����ա�"); }
+    { return "（これらはメソッドでないことに注意）"; }
 
     /*! header that is put before the detailed description of files, classes and namespaces. */
     virtual QCString trDetailedDescription()
-    { return decode("����"); }
+    { return "説明"; }
 
     /*! header that is put before the list of typedefs. */
     virtual QCString trMemberTypedefDocumentation()
-    { return decode("�����"); }
+    { return "型定義"; }
 
     /*! header that is put before the list of enumerations. */
     virtual QCString trMemberEnumerationDocumentation()
-    { return decode("���"); }
+    { return "列挙型"; }
 
     /*! header that is put before the list of member functions. */
     virtual QCString trMemberFunctionDocumentation()
-    { 
+    {
 	  if( Config_getBool("OPTIMIZE_OUTPUT_JAVA"))
 	  {
-		return decode("�᥽�å�");
+		return "メソッド";
 	  }
 	  else
 	  {
-		return decode("�ؿ�");
+		return "関数";
 	  }
 	}
 
@@ -105,55 +85,55 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
     {
       if( Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
 	  {
-	    return decode("��¤��");
+	    return "構造体";
 	  }
       else
 	  {
-	    return decode("�ѿ�");
+	    return "変数";
 	  }
     }
 
     /*! this is the text of a link put after brief descriptions. */
 	virtual QCString trMore()
-    { return decode("[�ܺ�]"); }
+    { return "[詳細]"; }
 
     /*! put in the class documentation */
     virtual QCString trListOfAllMembers()
-    { return decode("���٤ƤΥ��а���"); }
+    { return "すべてのメンバ一覧"; }
 
     /*! used as the title of the "list of all members" page of a class */
     virtual QCString trMemberList()
-    { return decode("�����"); }
+    { return "メンバ一覧"; }
 
     /*! this is the first part of a sentence that is followed by a class name */
     virtual QCString trThisIsTheListOfAllMembers()
-    { return decode("����������Фΰ����Ǥ���"); }
+    { return "これは全メンバの一覧です。"; }
 
     /*! this is the remainder of the sentence after the class name */
     virtual QCString trIncludingInheritedMembers()
-    { return decode("�Ѿ����Ф�ޤ�Ǥ��ޤ���"); }
+    { 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+decode("��");
-      result+=decode("���������� Doxygen �ˤ���������ޤ�����");
+      if (s) result=(QCString)s+"の";
+      result+="ソースから Doxygen により生成しました。";
       return result;
     }
 
     /*! put after an enum name in the list of all members */
     virtual QCString trEnumName()
-    { return decode("Enum"); }
+    { return "Enum"; }
 
     /*! put after an enum value in the list of all members */
     virtual QCString trEnumValue()
-    { return decode("Enum ��"); }
+    { return "Enum 値"; }
 
     /*! put after an undocumented member in the list of all members */
     virtual QCString trDefinedIn()
-    { return decode("�����������Ƥ��ޤ���"); }
+    { return "次で定義されています。"; }
 
     // quick reference sections
 
@@ -161,43 +141,43 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
      *  compounds or files (see the \\group command).
      */
     virtual QCString trModules()
-    { return decode("�⥸�塼��"); }
+    { return "モジュール"; }
 
     /*! This is put above each page as a link to the class hierarchy */
     virtual QCString trClassHierarchy()
-    { return decode("���饹����"); }
+    { 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 decode("�ǡ�����¤");
+	  return "データ構造";
 	}
       else
 	{
-	  return decode("����");
+	  return "構成";
 	}
     }
 
     /*! This is put above each page as a link to the list of documented files */
     virtual QCString trFileList()
-    { return decode("�ե��������"); }
+    { return "ファイル一覧"; }
 
     /*! This is put above each page as a link to the list of all verbatim headers */
     virtual QCString trHeaderFiles()
-    { return decode("�إå��ե�����"); }
+    { 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 decode("�ǡ����ե������");
+	  return "データフィールド";
 	}
       else
 	{
-	  return decode("��������");
+	  return "構成メンバ";
 	}
     }
 
@@ -206,36 +186,36 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
     {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
 	{
-	  return decode("��������");
+	  return "グローバル";
 	}
       else
 	{
-	  return decode("�ե��������");
+	  return "ファイルメンバ";
 	}
     }
     /*! This is put above each page as a link to all related pages. */
     virtual QCString trRelatedPages()
-    { return decode("��Ϣ�ڡ���"); }
+    { return "関連ページ"; }
 
     /*! This is put above each page as a link to all examples. */
     virtual QCString trExamples()
-    { return decode("��"); }
+    { return "例"; }
 
     /*! This is put above each page as a link to the search engine. */
     virtual QCString trSearch()
-    { return decode("����"); }
+    { return "検索"; }
 
     /*! This is an introduction to the class hierarchy. */
     virtual QCString trClassHierarchyDescription()
-    { return decode("���ηѾ������Ϥ����ޤ��ˤϥ����Ȥ���Ƥ��ޤ�����"
-             "�����˥���ե��٥åȽ�ǥ����Ȥ���ƤϤ��ޤ���");
+    { return "この継承一覧はおおまかにはソートされていますが、"
+             "完全にアルファベット順でソートされてはいません。";
     }
 
     /*! This is an introduction to the list with all files. */
     virtual QCString trFileListDescription(bool /*extractAll*/)
     {
-      QCString result=decode("�����");
-      result+=decode("�ե���������Ǥ���");
+      QCString result="これは";
+      result+="ファイル一覧です。";
       return result;
     }
 
@@ -244,88 +224,88 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
     {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
 	{
-	  return decode("�ǡ�����¤�������Ǥ���");
+	  return "データ構造の説明です。";
 	}
       else
 	{
-	  return decode("���饹����¤�Ρ������Ρ����󥿥ե������������Ǥ���");
+	  return "クラス、構造体、共用体、インタフェースの説明です。";
 	}
     }
 
     /*! This is an introduction to the page with all class members. */
     virtual QCString trCompoundMembersDescription(bool extractAll)
     {
-      QCString result=decode("�����");
+      QCString result="これは";
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
 	  {
-	    result+=decode("�ե�����ɤΰ����Ǥ��줾��");
-	    if (extractAll) result+=decode("��°���Ƥ��빽¤��/������");
+	    result+="フィールドの一覧でそれぞれ";
+	    if (extractAll) result+="が属している構造体/共用体";
 	  }
       else
 	  {
-	    result+=decode("���饹���Фΰ����ǡ����줾��");
-	    if (extractAll) result+=decode("��°���Ƥ��륯�饹");
+	    result+="クラスメンバの一覧で、それぞれ";
+	    if (extractAll) result+="が属しているクラス";
 	  }
-      result+=decode("�������إ�󥯤��Ƥ��ޤ���");
+      result+="の説明へリンクしています。";
       return result;
     }
 
     /*! This is an introduction to the page with all file members. */
     virtual QCString trFileMembersDescription(bool /*extractAll*/)
     {
-      QCString result=decode("�����");
+      QCString result="これは";
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
 	{
-	  result+=decode("�ؿ����ѿ����ޥ�����Enum��Typedef ��");
+	  result+="関数、変数、マクロ、Enum、Typedef の";
 	}
       else
 	{
-	  result+=decode("�ե�������Ф�");
+	  result+="ファイルメンバの";
 	}
-      result+=decode("�����Ǥ������줾�줬°���Ƥ���ե�����������إ�󥯤��Ƥ��ޤ���");
+      result+="一覧です。それぞれが属しているファイルの説明へリンクしています。";
       return result;
     }
 
     /*! This is an introduction to the page with the list of all header files. */
     virtual QCString trHeaderFilesDescription()
-    { return decode("API��������إå��ե�����Ǥ���"); }
+    { return "APIを構成するヘッダファイルです。"; }
 
     /*! This is an introduction to the page with the list of all examples */
     virtual QCString trExamplesDescription()
-    { return decode("���٤Ƥ���ΰ����Ǥ���"); }
+    { return "すべての例の一覧です。"; }
 
     /*! This is an introduction to the page with the list of related pages */
     virtual QCString trRelatedPagesDescription()
-    { return decode("��Ϣ�ڡ����ΰ����Ǥ���"); }
+    { return "関連ページの一覧です。"; }
 
     /*! This is an introduction to the page with the list of class/file groups */
     virtual QCString trModulesDescription()
-    { return decode("���٤ƤΥ⥸�塼��ΰ����Ǥ���"); }
+    { return "すべてのモジュールの一覧です。"; }
 
     /*! This sentences is used in the annotated class/file lists if no brief
      * description is given.
      */
     virtual QCString trNoDescriptionAvailable()
-    { return decode("�ɥ�����Ȥ����Ҥ���Ƥ��ޤ���"); }
+    { return "ドキュメントが記述されていません。"; }
 
     // index titles (the project name is prepended for these)
 
 
     /*! This is used in HTML as the title of index.html. */
     virtual QCString trDocumentation()
-    { return decode("�ɥ������"); }
+    { return "ドキュメント"; }
 
     /*! This is used in LaTeX as the title of the chapter with the
      * index of all groups.
      */
     virtual QCString trModuleIndex()
-    { return decode("�⥸�塼�����"); }
+    { return "モジュール索引"; }
 
     /*! This is used in LaTeX as the title of the chapter with the
      * class hierarchy.
      */
     virtual QCString trHierarchicalIndex()
-    { return decode("���غ���"); }
+    { return "階層索引"; }
 
     /*! This is used in LaTeX as the title of the chapter with the
      * annotated compound index.
@@ -334,11 +314,11 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
     {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
 	{
-	  return decode("�ǡ�����¤����");
+	  return "データ構造索引";
 	}
       else
 	{
-	  return decode("��������");
+	  return "構成索引";
 	}
     }
 
@@ -346,13 +326,13 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
      * list of all files.
      */
     virtual QCString trFileIndex()
-    { return decode("�ե��������"); }
+    { return "ファイル索引"; }
 
     /*! This is used in LaTeX as the title of the chapter containing
      *  the documentation of all groups.
      */
     virtual QCString trModuleDocumentation()
-    { return decode("�⥸�塼��"); }
+    { return "モジュール"; }
 
     /*! This is used in LaTeX as the title of the chapter containing
      *  the documentation of all classes, structs and unions.
@@ -361,11 +341,11 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
     {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
 	{
-	  return decode("�ǡ�����¤");
+	  return "データ構造";
 	}
       else
 	{
-	  return decode("���饹");
+	  return "クラス";
 	}
     }
 
@@ -373,100 +353,100 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
      *  the documentation of all files.
      */
     virtual QCString trFileDocumentation()
-    { return decode("�ե�����"); }
+    { return "ファイル"; }
 
     /*! This is used in LaTeX as the title of the chapter containing
      *  the documentation of all examples.
      */
     virtual QCString trExampleDocumentation()
-    { return decode("��"); }
+    { return "例"; }
 
     /*! This is used in LaTeX as the title of the chapter containing
      *  the documentation of all related pages.
      */
     virtual QCString trPageDocumentation()
-    { return decode("�ڡ���"); }
+    { return "ページ"; }
 
     /*! This is used in LaTeX as the title of the document */
     virtual QCString trReferenceManual()
-    { return decode("��ե���󥹥ޥ˥奢��"); }
+    { return "リファレンスマニュアル"; }
 
     /*! This is used in the documentation of a file as a header before the
      *  list of defines
      */
     virtual QCString trDefines()
-    { return decode("�ޥ������"); }
+    { return "マクロ定義"; }
 
     /*! This is used in the documentation of a file as a header before the
      *  list of function prototypes
      */
     virtual QCString trFuncProtos()
-    { return decode("�ؿ��ץ��ȥ�����"); }
+    { return "関数プロトタイプ"; }
 
     /*! This is used in the documentation of a file as a header before the
      *  list of typedefs
      */
     virtual QCString trTypedefs()
-    { return decode("�����"); }
+    { return "型定義"; }
 
     /*! This is used in the documentation of a file as a header before the
      *  list of enumerations
      */
     virtual QCString trEnumerations()
-    { return decode("���"); }
+    { return "列挙型"; }
 
     /*! This is used in the documentation of a file as a header before the
      *  list of (global) functions
      */
     virtual QCString trFunctions()
-    { return decode("�ؿ�"); }
+    { return "関数"; }
 
     /*! This is used in the documentation of a file as a header before the
      *  list of (global) variables
      */
     virtual QCString trVariables()
-    { return decode("�ѿ�"); }
+    { return "変数"; }
 
     /*! This is used in the documentation of a file as a header before the
      *  list of (global) variables
      */
     virtual QCString trEnumerationValues()
-      { return decode("��󷿤���"); }
+      { return "列挙型の値"; }
     /*! This is used in the documentation of a file before the list of
      *  documentation blocks for defines
      */
     virtual QCString trDefineDocumentation()
-    { return decode("�ޥ������"); }
+    { return "マクロ定義"; }
 
     /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for function prototypes
      */
     virtual QCString trFunctionPrototypeDocumentation()
-    { return decode("�ؿ��ץ��ȥ�����"); }
+    { return "関数プロトタイプ"; }
 
     /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for typedefs
      */
     virtual QCString trTypedefDocumentation()
-    { return decode("�����"); }
+    { return "型定義"; }
 
     /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for enumeration types
      */
     virtual QCString trEnumerationTypeDocumentation()
-    { return decode("���"); }
+    { return "列挙型"; }
 
     /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for functions
      */
     virtual QCString trFunctionDocumentation()
-    { return decode("�ؿ�"); }
+    { return "関数"; }
 
     /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for variables
      */
     virtual QCString trVariableDocumentation()
-    { return decode("�ѿ�"); }
+    { return "変数"; }
 
     /*! This is used in the documentation of a file/namespace/group before
      *  the list of links to documented compounds
@@ -475,11 +455,11 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
     {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
 	{
-	  return decode("�ǡ�����¤");
+	  return "データ構造";
 	}
       else
 	{
-	  return decode("����");
+	  return "構成";
 	}
     }
     /*! This is used in the standard footer of each page and indicates when
@@ -488,67 +468,67 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
     virtual QCString trGeneratedAt(const char *date,const char *projName)
     {
       QCString result;
-      if (projName) result+=(QCString)projName+decode("������");
-      result+=(QCString)date+decode("����������ޤ�����");
+      if (projName) result+=(QCString)projName+"に対して";
+      result+=(QCString)date+"に生成されました。";
       return result;
     }
     /*! This is part of the sentence used in the standard footer of each page.
      */
     virtual QCString trWrittenBy()
     {
-      return decode("���");
+      return "作者";
     }
 
     /*! this text is put before a class diagram */
     virtual QCString trClassDiagram(const char *clName)
     {
-      return (QCString)clName+decode("���Ф���Ѿ������");
+      return (QCString)clName+"に対する継承グラフ";
     }
 
     /*! this text is generated when the \\internal command is used. */
     virtual QCString trForInternalUseOnly()
-    { return decode("�������ѤΤߡ�"); }
+    { return "内部使用のみ。"; }
 
     /*! this text is generated when the \\reimp command is used. */
     virtual QCString trReimplementedForInternalReasons()
-    { return decode("����Ū����ͳ�ˤ��Ƽ�������ޤ�������API�ˤϱƶ����ޤ���");
+    { return "内部的な理由により再実装されましたが、APIには影響しません。";
     }
 
     /*! this text is generated when the \\warning command is used. */
     virtual QCString trWarning()
-    { return decode("�ٹ�"); }
+    { return "警告"; }
 
     /*! this text is generated when the \\bug command is used. */
     virtual QCString trBugsAndLimitations()
-    { return decode("��������"); }
+    { return "バグと制限"; }
 
     /*! this text is generated when the \\version command is used. */
     virtual QCString trVersion()
-    { return decode("�������"); }
+    { return "バージョン"; }
 
     /*! this text is generated when the \\date command is used. */
     virtual QCString trDate()
-    { return decode("����"); }
+    { return "日付"; }
 
     /*! this text is generated when the \\return command is used. */
     virtual QCString trReturns()
-    { return decode("�����"); }
+    { return "戻り値"; }
 
     /*! this text is generated when the \\sa command is used. */
     virtual QCString trSeeAlso()
-    { return decode("����"); }
+    { return "参照"; }
 
     /*! this text is generated when the \\param command is used. */
     virtual QCString trParameters()
-    { return decode("����"); }
+    { return "引数"; }
 
     /*! this text is generated when the \\exception command is used. */
     virtual QCString trExceptions()
-    { return decode("�㳰"); }
+    { return "例外"; }
 
     /*! this text is used in the title page of a LaTeX document. */
     virtual QCString trGeneratedBy()
-    { return decode("������"); }
+    { return "作成："; }
 
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990307
@@ -556,21 +536,19 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
 
     /*! used as the title of page containing all the index of all namespaces. */
     virtual QCString trNamespaceList()
-    { return decode("�͡��ॹ�ڡ�������"); }
+    { return "ネームスペース一覧"; }
 
     /*! used as an introduction to the namespace list */
     virtual QCString trNamespaceListDescription(bool /*extractAll*/)
     {
-      QCString result=decode("");
-      result+=decode("�͡��ॹ�ڡ����ΰ����Ǥ���");
-      return result;
+      return "ネームスペースの一覧です。";
     }
 
     /*! used in the class documentation as a header before the list of all
      *  friends of a class
      */
     virtual QCString trFriends()
-    { return decode("�ե���"); }
+    { return "フレンド"; }
 
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990405
@@ -580,7 +558,7 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
      * related classes
      */
     virtual QCString trRelatedFunctionDocumentation()
-    { return decode("�ե��ɤȴ�Ϣ����ؿ�"); }
+    { return "フレンドと関連する関数"; }
 
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990425
@@ -594,16 +572,16 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
       QCString result="";
       switch(compType)
       {
-        case ClassDef::Class:      result+=decode("���饹 "); break;
-        case ClassDef::Struct:     result+=decode("��¤�� "); break;
-        case ClassDef::Union:      result+=decode("������ "); break;
-        case ClassDef::Interface:  result+=decode("���󥿥ե����� "); break;
-        case ClassDef::Protocol:   result+=decode("�ץ��ȥ��� "); break;
-        case ClassDef::Category:   result+=decode("���ƥ��� "); break;
-        case ClassDef::Exception:  result+=decode("�㳰 "); break;
+        case ClassDef::Class:      result+="クラス "; break;
+        case ClassDef::Struct:     result+="構造体 "; break;
+        case ClassDef::Union:      result+="共用体 "; break;
+        case ClassDef::Interface:  result+="インタフェース "; break;
+        case ClassDef::Protocol:   result+="プロトコル "; break;
+        case ClassDef::Category:   result+="カテゴリ "; break;
+        case ClassDef::Exception:  result+="例外 "; break;
         default: break;
       }
-      if (isTemplate) result+=decode("�ƥ�ץ졼�� ");
+      if (isTemplate) result+="テンプレート ";
       result+=(QCString)clName;
       return result;
     }
@@ -611,38 +589,38 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
     /*! used as the title of the HTML page of a file */
     virtual QCString trFileReference(const char *fileName)
     {
-      QCString result=decode("")+(QCString)fileName;
+      QCString result=""+(QCString)fileName;
       return result;
     }
 
     /*! used as the title of the HTML page of a namespace */
     virtual QCString trNamespaceReference(const char *namespaceName)
     {
-      QCString result=decode("�͡��ॹ�ڡ��� ")+(QCString)namespaceName;
+      QCString result="ネームスペース "+(QCString)namespaceName;
       return result;
     }
 
     /* these are for the member sections of a class, struct or union */
     virtual QCString trPublicMembers()
-    { return decode("Public �᥽�å�"); }
+    { return "Public メソッド"; }
     virtual QCString trPublicSlots()
-    { return decode("Public �����å�"); }
+    { return "Public スロット"; }
     virtual QCString trSignals()
-    { return decode("�����ʥ�"); }
+    { return "シグナル"; }
     virtual QCString trStaticPublicMembers()
-    { return decode("Static Public �᥽�å�"); }
+    { return "Static Public メソッド"; }
     virtual QCString trProtectedMembers()
-    { return decode("Protected �᥽�å�"); }
+    { return "Protected メソッド"; }
     virtual QCString trProtectedSlots()
-    { return decode("Protected �����å�"); }
+    { return "Protected スロット"; }
     virtual QCString trStaticProtectedMembers()
-    { return decode("Static Protected �᥽�å�"); }
+    { return "Static Protected メソッド"; }
     virtual QCString trPrivateMembers()
-    { return decode("Private �᥽�å�"); }
+    { return "Private メソッド"; }
     virtual QCString trPrivateSlots()
-    { return decode("Private �����å�"); }
+    { return "Private スロット"; }
     virtual QCString trStaticPrivateMembers()
-    { return decode("Static Private �᥽�å�"); }
+    { return "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.
@@ -661,9 +639,9 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
         if (i!=numEntries-1)  // not the last entry, so we need a separator
         {
           if (i<numEntries-2) // not the fore last entry
-            result+=decode(", ");
+            result+=", ";
           else                // the fore last entry
-            result+=decode(", �� ");
+            result+=", と ";
         }
       }
       return result;
@@ -674,7 +652,7 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
      */
     virtual QCString trInheritsList(int numEntries)
     {
-      return trWriteList(numEntries)+decode("��Ѿ����Ƥ��ޤ���");
+      return trWriteList(numEntries)+"を継承しています。";
     }
 
     /*! used in class documentation to produce a list of super classes,
@@ -682,7 +660,7 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
      */
     virtual QCString trInheritedByList(int numEntries)
     {
-      return trWriteList(numEntries)+decode("�˷Ѿ�����Ƥ��ޤ���");
+      return trWriteList(numEntries)+"に継承されています。";
     }
 
     /*! used in member documentation blocks to produce a list of
@@ -690,7 +668,7 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
      */
     virtual QCString trReimplementedFromList(int numEntries)
     {
-      return trWriteList(numEntries)+decode("���������Ƥ��ޤ���");
+      return trWriteList(numEntries)+"を再定義しています。";
     }
 
     /*! used in member documentation blocks to produce a list of
@@ -698,36 +676,36 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
      */
     virtual QCString trReimplementedInList(int numEntries)
     {
-      return trWriteList(numEntries)+decode("�Ǻ��������Ƥ��ޤ���");
+      return trWriteList(numEntries)+"で再定義されています。";
     }
 
     /*! This is put above each page as a link to all members of namespaces. */
     virtual QCString trNamespaceMembers()
-    { return decode("�͡��ॹ�ڡ�������"); }
+    { return "ネームスペースメンバ"; }
 
     /*! This is an introduction to the page with all namespace members */
     virtual QCString trNamespaceMemberDescription(bool extractAll)
     {
-	QCString result=decode("�����");
-      result+=decode("�͡��ॹ�ڡ����ΰ����Ǥ������줾��");
+	QCString result="これは";
+      result+="ネームスペースの一覧です。それぞれ";
       if (extractAll)
-	  result+=decode("�Υ͡��ॹ�ڡ���");
+	  result+="のネームスペース";
       else
-	  result+=decode("��°���Ƥ���͡��ॹ�ڡ���");
-      result+=decode("�إ�󥯤��Ƥ��ޤ���");
+	  result+="が属しているネームスペース";
+      result+="へリンクしています。";
       return result;
     }
     /*! This is used in LaTeX as the title of the chapter with the
      *  index of all namespaces.
      */
     virtual QCString trNamespaceIndex()
-    { return decode("�͡��ॹ�ڡ�������"); }
+    { return "ネームスペース索引"; }
 
     /*! This is used in LaTeX as the title of the chapter containing
      *  the documentation of all namespaces.
      */
     virtual QCString trNamespaceDocumentation()
-    { return decode("�͡��ॹ�ڡ���"); }
+    { return "ネームスペース"; }
 
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990522
@@ -737,7 +715,7 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
      *  namespaces in a file.
      */
     virtual QCString trNamespaces()
-    { return decode("�͡��ॹ�ڡ���"); }
+    { return "ネームスペース"; }
 
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990728
@@ -750,19 +728,19 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
         bool)
     { // here s is one of " Class", " Struct" or " Union"
       // single is true implies a single file
-      QCString result=(QCString)decode("����");
+      QCString result=(QCString)"この";
       switch(compType)
       {
-        case ClassDef::Class:      result+=decode("���饹"); break;
-        case ClassDef::Struct:     result+=decode("��¤��"); break;
-        case ClassDef::Union:      result+=decode("������"); break;
-        case ClassDef::Interface:  result+=decode("���󥿥ե�����"); break;
-        case ClassDef::Protocol:   result+=decode("�ץ��ȥ���"); break;
-        case ClassDef::Category:   result+=decode("���ƥ���"); break;
-        case ClassDef::Exception:  result+=decode("�㳰"); break;
+        case ClassDef::Class:      result+="クラス"; break;
+        case ClassDef::Struct:     result+="構造体"; break;
+        case ClassDef::Union:      result+="共用体"; break;
+        case ClassDef::Interface:  result+="インタフェース"; break;
+        case ClassDef::Protocol:   result+="プロトコル"; break;
+        case ClassDef::Category:   result+="カテゴリ"; break;
+        case ClassDef::Exception:  result+="例外"; break;
         default: break;
       }
-      result+=decode("�������ϼ��Υե����뤫����������ޤ���:");
+      result+="の説明は次のファイルから生成されました:";
       return result;
     }
 
@@ -770,7 +748,7 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
      * list.
      */
     virtual QCString trAlphabeticalList()
-    { return decode("����ե��٥åȽ����"); }
+    { return "アルファベット順一覧"; }
 
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990901
@@ -778,18 +756,18 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
 
     /*! This is used as the heading text for the retval command. */
     virtual QCString trReturnValues()
-    { return decode("�����"); }
+    { return "戻り値"; }
 
     /*! This is in the (quick) index as a link to the main page (index.html)
      */
     virtual QCString trMainPage()
-    { return decode("�ᥤ��ڡ���"); }
+    { return "メインページ"; }
 
     /*! This is used in references to page that are put in the LaTeX
      *  documentation. It should be an abbreviation of the word page.
      */
     virtual QCString trPageAbbreviation()
-    { return decode("p."); }
+    { return "p."; }
 
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-991003
@@ -797,15 +775,15 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
 
     virtual QCString trSources()
     {
-      return decode("������");
+      return "ソース";
     }
     virtual QCString trDefinedAtLineInSourceFile()
     {
-      return decode(" @1 �� @0 �Ԥ��������Ƥ��ޤ���");
+      return " @1 の @0 行で定義されています。";
     }
     virtual QCString trDefinedInSourceFile()
     {
-      return decode(" @0 ���������Ƥ��ޤ���");
+      return " @0 で定義されています。";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -814,7 +792,7 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
 
     virtual QCString trDeprecated()
     {
-      return decode("��侩");
+      return "非推奨";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -824,68 +802,68 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
     /*! this text is put before a collaboration diagram */
     virtual QCString trCollaborationDiagram(const char *clName)
     {
-      return (QCString)clName+decode("�Υ���ܥ졼������");
+      return (QCString)clName+"のコラボレーション図";
     }
     /*! this text is put before an include dependency graph */
     virtual QCString trInclDepGraph(const char *fName)
     {
-	return (QCString)fName+decode("�Υ��󥯥롼�ɰ�¸�ط���");
+	return (QCString)fName+"のインクルード依存関係図";
     }
     /*! header that is put before the list of constructor/destructors. */
     virtual QCString trConstructorDocumentation()
     {
-      return decode("���󥹥ȥ饯���ȥǥ��ȥ饯��");
+      return "コンストラクタとデストラクタ";
     }
     /*! Used in the file documentation to point to the corresponding sources. */
     virtual QCString trGotoSourceCode()
     {
-      return decode("�����������ɤ򸫤롣");
+      return "ソースコードを見る。";
     }
     /*! Used in the file sources to point to the corresponding documentation. */
     virtual QCString trGotoDocumentation()
     {
-      return decode("�����򸫤롣");
+      return "説明を見る。";
     }
     /*! Text for the \\pre command */
     virtual QCString trPrecondition()
     {
-      return decode("�������");
+      return "事前条件";
     }
     /*! Text for the \\post command */
     virtual QCString trPostcondition()
     {
-      return decode("������");
+      return "事後条件";
     }
     /*! Text for the \\invariant command */
     virtual QCString trInvariant()
     {
-      return decode("����");
+      return "不変";
     }
     /*! Text shown before a multi-line variable/enum initialization */
     virtual QCString trInitialValue()
     {
-      return decode("�����:");
+      return "初期値:";
     }
     /*! Text used the source code in the file index */
     virtual QCString trCode()
     {
-      return decode("������");
+      return "コード";
     }
     virtual QCString trGraphicalHierarchy()
     {
-      return decode("���饹���ؿ�");
+      return "クラス階層図";
     }
     virtual QCString trGotoGraphicalHierarchy()
     {
-      return decode("���饹���ؿޤ򸫤롣");
+      return "クラス階層図を見る。";
     }
     virtual QCString trGotoTextualHierarchy()
     {
-      return decode("���饹���ؿޤ򸫤롣");
+      return "クラス階層図を見る。";
     }
     virtual QCString trPageIndex()
     {
-      return decode("�ڡ�������");
+      return "ページ索引";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -894,50 +872,50 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
 
     virtual QCString trNote()
     {
-      return decode("����");
+      return "覚え書き";
     }
     virtual QCString trPublicTypes()
     {
-      return decode("Public ��");
+      return "Public 型";
     }
     virtual QCString trPublicAttribs()
     {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
 	{
-	  return decode("�ѿ�");
+	  return "変数";
 	}
       else
 	{
-	  return decode("Public �ѿ�");
+	  return "Public 変数";
 	}
     }
     virtual QCString trStaticPublicAttribs()
     {
-      return decode("Static Public �ѿ�");
+      return "Static Public 変数";
     }
     virtual QCString trProtectedTypes()
     {
-      return decode("Protected ��");
+      return "Protected 型";
     }
     virtual QCString trProtectedAttribs()
     {
-      return decode("Protected �ѿ�");
+      return "Protected 変数";
     }
     virtual QCString trStaticProtectedAttribs()
     {
-      return decode("Static Protected �ѿ�");
+      return "Static Protected 変数";
     }
     virtual QCString trPrivateTypes()
     {
-      return decode("Private ��");
+      return "Private 型";
     }
     virtual QCString trPrivateAttribs()
     {
-      return decode("Private �ѿ�");
+      return "Private 変数";
     }
     virtual QCString trStaticPrivateAttribs()
     {
-      return decode("Static Private �ѿ�");
+      return "Static Private 変数";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -947,12 +925,12 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
     /*! Used as a marker that is put before a todo item */
     virtual QCString trTodo()
     {
-      return decode("TODO");
+      return "TODO";
     }
     /*! Used as the header of the todo list */
     virtual QCString trTodoList()
     {
-      return decode("TODO����");
+      return "TODO一覧";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -961,24 +939,24 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
 
     virtual QCString trReferencedBy()
     {
-      return decode("���ȸ�");
+      return "参照元";
     }
     virtual QCString trRemarks()
     {
-      return decode("�ո�");
+      return "意見";
     }
     virtual QCString trAttention()
     {
-      return decode("����");
+      return "注意";
     }
     virtual QCString trInclByDepGraph()
     {
-	return decode("���Υ���դϡ��ɤΥե����뤫��ľ�ܡ�����Ū��"
-             "���󥯥롼�ɤ���Ƥ��뤫�򼨤��Ƥ��ޤ���");
+	return "このグラフは、どのファイルから直接、間接的に"
+               "インクルードされているかを示しています。";
     }
     virtual QCString trSince()
     {
-      return decode("����");
+      return "から";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -988,33 +966,33 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
     /*! title of the graph legend page */
     virtual QCString trLegendTitle()
     {
-      return decode("����դ�����");
+      return "グラフの凡例";
     }
     /*! page explaining how the dot graph's should be interpreted */
     virtual QCString trLegendDocs()
     {
       return
-        decode("���Υڡ����Ǥϡ�doxygen ���������줿����դ�ɤΤ褦�ˤߤ���褤����"
-        "�������ޤ���<p>\n"
-        "�������ͤ��Ƥߤޤ���\n"
+        "このページでは、doxygen で生成されたグラフをどのようにみたらよいかを"
+        "説明します。<p>\n"
+        "次の例を考えてみます。\n"
         "\\code\n"
-        "/*! ��ά����Ƹ����ʤ����饹 */\n"
+        "/*! 省略されて見えないクラス */\n"
         "class Invisible { };\n\n"
-        "/*! ��ά���줿���饹(�Ѿ��ط��ϱ�����Ƥ���) */\n"
+        "/*! 省略されたクラス(継承関係は隠されている) */\n"
         "class Truncated : public Invisible { };\n\n"
-        "/* doxygen �����Ȥˤ��ɥ�����Ȥ��ʤ����饹 */\n"
+        "/* doxygen コメントによるドキュメントがないクラス */\n"
         "class Undocumented { };\n\n"
-        "/*! public �ǷѾ����줿���饹 */\n"
+        "/*! public で継承されたクラス */\n"
         "class PublicBase : public Truncated { };\n\n"
         "/*! A template class */\n"
         "template<class T> class Templ { };\n\n"
-        "/*! protected �ǷѾ����줿���饹 */\n"
+        "/*! protected で継承されたクラス */\n"
         "class ProtectedBase { };\n\n"
-        "/*! private �ǷѾ����줿���饹 */\n"
+        "/*! private で継承されたクラス */\n"
         "class PrivateBase { };\n\n"
-        "/*! �Ѿ����줿���饹�ǻȤ��Ƥ��륯�饹 */\n"
+        "/*! 継承されたクラスで使われているクラス */\n"
         "class Used { };\n\n"
-        "/*! ʣ���Υ��饹��Ѿ����Ƥ����̥��饹 */\n"
+        "/*! 複数のクラスを継承している上位クラス */\n"
         "class Inherited : public PublicBase,\n"
         "                  protected ProtectedBase,\n"
         "                  private PrivateBase,\n"
@@ -1025,34 +1003,34 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
         "    Used *m_usedClass;\n"
         "};\n"
         "\\endcode\n"
-        "����ե�������ǡ����� \\c MAX_DOT_GRAPH_HEIGHT �� 200 �˥��åȤ��줿"
-        "��硢���Τ褦�ʥ���դȤʤ�ޤ���"
+        "設定ファイル中で、タグ \\c MAX_DOT_GRAPH_HEIGHT が 200 にセットされた"
+        "場合、次のようなグラフとなります。"
         "<p><center><img src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n"
         "<p>\n"
-        "��Υ������Υܥå����ˤϼ��Τ褦�ʰ�̣������ޤ���\n"
+        "上のグラフ内のボックスには次のような意味があります。\n"
         "<ul>\n"
-        "<li>�����ɤ�Ĥ֤��줿�ܥå����ϡ����Υ���դ��б����빽¤�Τ䥯�饹��"
-        "ɽ���ޤ���\n"
-        "<li>���ȤΥܥå����ϥɥ�����Ȥ����빽¤�Τ䥯�饹��ɽ���ޤ���\n"
-        "<li>�������ȤΥܥå����ϥɥ�����Ȥ��ʤ���¤�Τ䥯�饹��ɽ���ޤ���\n"
-        "<li>���ȤΥܥå����ϥɥ�����Ȥ����빽¤�Τ䥯�饹��ɽ���ޤ�����"
-	  "���ꤵ�줿�������˼��ޤ�ʤ�����˷Ѿ�����޴ط��򤹤٤ƿ޼�����"
-	  "���Ȥ��Ǥ��ʤ��ä����Ȥ򼨤��ޤ���"
+        "<li>黒く塗りつぶされたボックスは、このグラフに対応する構造体やクラスを"
+        "表します。\n"
+        "<li>黒枠のボックスはドキュメントがある構造体やクラスを表します。\n"
+        "<li>灰色の枠のボックスはドキュメントがない構造体やクラスを表します。\n"
+        "<li>赤枠のボックスはドキュメントがある構造体やクラスを表しますが、"
+	  "指定されたサイズに収まらないために継承・包含関係をすべて図示する"
+	  "ことができなかったことを示します。"
         "</ul>\n"
-        "����ˤϼ��Τ褦�ʰ�̣������ޤ���\n"
+        "矢印には次のような意味があります。\n"
         "<ul>\n"
-        "<li>�Ĥ��������ĤΥ��饹�֤� public �Ѿ��ط��򼨤��ޤ���\n"
-        "<li>�Ф������ protected �Ѿ��ط��򼨤��ޤ���\n"
-        "<li>�֤������ private �Ѿ��ط��򼨤��ޤ���\n"
-        "<li>�����������ϡ����Υ��饹��¾�Υ��饹�˴ޤޤ�Ƥ����ꡢ"
-	  "���Ѥ���Ƥ��뤳�Ȥ򼨤��ޤ����ޤ���������ؤ��Ƥ��륯�饹�乽¤�Τ�"
-	  "�ɤ��ѿ��ǥ��������Ǥ��뤫������Υ�٥�Ȥ��Ƽ����Ƥ��ޤ���\n"
-        "</ul>\n");
+        "<li>青い矢印は二つのクラス間の public 継承関係を示します。\n"
+        "<li>緑の矢印は protected 継承関係を示します。\n"
+        "<li>赤の矢印は private 継承関係を示します。\n"
+        "<li>紫の破線矢印は、そのクラスが他のクラスに含まれていたり、"
+	  "利用されていることを示します。また、矢印が指しているクラスや構造体を"
+	  "どの変数でアクセスできるかを矢印のラベルとして示しています。\n"
+        "</ul>\n";
     }
     /*! text for the link to the legend page */
     virtual QCString trLegend()
     {
-      return decode("����");
+      return "凡例";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1062,12 +1040,12 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
     /*! Used as a marker that is put before a test item */
     virtual QCString trTest()
     {
-      return decode("�ƥ���");
+      return "テスト";
     }
     /*! Used as the header of the test list */
     virtual QCString trTestList()
     {
-      return decode("�ƥ��Ȱ���");
+      return "テスト一覧";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1077,7 +1055,7 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
     /*! Used as a section header for KDE-2 IDL methods */
     virtual QCString trDCOPMethods()
     {
-      return decode("DCOP�᥽�å�");
+      return "DCOPメソッド";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1087,12 +1065,12 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
     /*! Used as a section header for IDL properties */
     virtual QCString trProperties()
     {
-      return decode("�ץ��ѥƥ�");
+      return "プロパティ";
     }
     /*! Used as a section header for IDL property documentation */
     virtual QCString trPropertyDocumentation()
     {
-      return decode("�ץ��ѥƥ�");
+      return "プロパティ";
     }
 
 
@@ -1103,49 +1081,49 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
     /*! Used for Java interfaces in the summary section of Java packages */
     virtual QCString trInterfaces()
     {
-      return decode("���󥿡��ե�����");
+      return "インターフェース";
     }
     /*! Used for Java classes in the summary section of Java packages */
     virtual QCString trClasses()
     {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
 	{
-	  return decode("�ǡ�����¤");
+	  return "データ構造";
 	}
       else
 	{
-	  return decode("���饹");
+	  return "クラス";
 	}
     }
     /*! Used as the title of a Java package */
     virtual QCString trPackage(const char *name)
     {
-      return (QCString)decode("�ѥå����� ")+name;
+      return (QCString)"パッケージ "+name;
     }
     /*! Title of the package index page */
     virtual QCString trPackageList()
     {
-      return decode("�ѥå���������");
+      return "パッケージ一覧";
     }
     /*! The description of the package index page */
     virtual QCString trPackageListDescription()
     {
-      return decode("����ϥѥå����������Ǥ���");
+      return "これはパッケージ一覧です。";
     }
     /*! The link name in the Quick links header for each page */
     virtual QCString trPackages()
     {
-      return decode("�ѥå�����");
+      return "パッケージ";
     }
     /*! Used as a chapter title for Latex & RTF output */
     virtual QCString trPackageDocumentation()
     {
-      return decode("�ѥå�����");
+      return "パッケージ";
     }
     /*! Text shown before a multi-line define */
     virtual QCString trDefineValue()
     {
-      return decode("��:");
+      return "値:";
     }
 
 
@@ -1156,12 +1134,12 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
     /*! Used as a marker that is put before a \\bug item */
     virtual QCString trBug()
     {
-      return decode("�Х�");
+      return "バグ";
     }
     /*! Used as the header of the bug list */
     virtual QCString trBugList()
     {
-      return decode("������");
+      return "バグ一覧";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1210,7 +1188,7 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
     /*! Used as header RTF general index */
     virtual QCString trRTFGeneralIndex()
     {
-      return decode("����");
+      return "索引";
     }
 
     /*! This is used for translation of the word that will possibly
@@ -1219,8 +1197,7 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
      */
     virtual QCString trClass(bool /*first_capital*/, bool /*singular*/)
     {
-      QCString result(decode("���饹"));
-      return result;
+      return "クラス";
     }
 
     /*! This is used for translation of the word that will possibly
@@ -1229,8 +1206,7 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
      */
     virtual QCString trFile(bool /*first_capital*/, bool /*singular*/)
     {
-      QCString result(decode("�ե�����"));
-      return result;
+      return "ファイル";
     }
 
     /*! This is used for translation of the word that will possibly
@@ -1239,8 +1215,7 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
      */
     virtual QCString trNamespace(bool /*first_capital*/, bool /*singular*/)
     {
-      QCString result(decode("�͡��ॹ�ڡ���"));
-      return result;
+      return "ネームスペース";
     }
 
     /*! This is used for translation of the word that will possibly
@@ -1249,8 +1224,7 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
      */
     virtual QCString trGroup(bool /*first_capital*/, bool /*singular*/)
     {
-      QCString result(decode("���롼��"));
-      return result;
+      return "グループ";
     }
 
     /*! This is used for translation of the word that will possibly
@@ -1259,8 +1233,7 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
      */
     virtual QCString trPage(bool /*first_capital*/, bool /*singular*/)
     {
-      QCString result(decode("�ڡ���"));
-      return result;
+      return "ページ";
     }
 
     /*! This is used for translation of the word that will possibly
@@ -1269,8 +1242,7 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
      */
     virtual QCString trMember(bool /*first_capital*/, bool /*singular*/)
     {
-      QCString result(decode("����"));
-      return result;
+      return "メンバ";
     }
 
     /*! This is used for translation of the word that will possibly
@@ -1279,8 +1251,7 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
      */
     virtual QCString trField(bool /*first_capital*/, bool /*singular*/)
     {
-      QCString result(decode("�ե������"));
-      return result;
+      return "フィールド";
     }
 
     /*! This is used for translation of the word that will possibly
@@ -1289,8 +1260,7 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
      */
     virtual QCString trGlobal(bool /*first_capital*/, bool /*singular*/)
     {
-      QCString result(decode("��������"));
-      return result;
+      return "グローバル";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1301,8 +1271,7 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
      *  for the author section in man pages. */
     virtual QCString trAuthor(bool /*first_capital*/, bool /*singular*/)
     {
-      QCString result(decode("���"));
-      return result;
+      return "作者";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1313,7 +1282,7 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
      */
     virtual QCString trReferences()
     {
-      return decode("������");
+      return "参照先";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1325,7 +1294,7 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
      */
     virtual QCString trImplementedFromList(int numEntries)
     {
-      return trWriteList(numEntries)+decode("��������Ƥ��ޤ���");
+      return trWriteList(numEntries)+"を実装しています。";
     }
 
     /*! used in member documentation blocks to produce a list of
@@ -1333,7 +1302,7 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
      */
     virtual QCString trImplementedInList(int numEntries)
     {
-      return trWriteList(numEntries)+decode("�Ǽ�������Ƥ��ޤ���");
+      return trWriteList(numEntries)+"で実装されています。";
     }
 //////////////////////////////////////////////////////////////////////////
 // new since 1.2.16
@@ -1344,36 +1313,36 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
      */
     virtual QCString trRTFTableOfContents()
     {
-      return decode("�ܼ�");
+      return "目次";
     }
 
 //////////////////////////////////////////////////////////////////////////
 // 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 decode("��侩����");
+      return "非推奨一覧";
     }
 
 //////////////////////////////////////////////////////////////////////////
 // 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 decode("���٥��");
+      return "イベント";
     }
     /*! Header used for the documentation section of a class' events. */
     virtual QCString trEventDocumentation()
     {
-      return decode("���٥��");
+      return "イベント";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1383,79 +1352,79 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
     /*! Used as a heading for a list of Java class types with package scope.
      */
     virtual QCString trPackageTypes()
-    { 
-      return decode("�ѥå�������η����");
+    {
+      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 decode("�ؿ�");
+    {
+      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 decode("�����ƥ��å��ؿ�");
+    {
+      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 decode("�ѿ�");
+    {
+      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 decode("�����ƥ��å��ѿ�");
+    {
+      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 decode("����");
+      return "全て";
     }
     /*! Put in front of the call graph for a function. */
     virtual QCString trCallGraph()
     {
-      return decode("�ؿ��θƤӽФ������:");
+      return "関数の呼び出しグラフ:";
     }
 
 //////////////////////////////////////////////////////////////////////////
 // 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()
     {
-      return decode("����");
+      return "検索";
     }
     /*! This string is used as the title for the page listing the search
      *  results.
      */
     virtual QCString trSearchResultsTitle()
     {
-      return decode("�������");
+      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.
      */
@@ -1463,24 +1432,24 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
     {
       if (numDocuments==0)
       {
-        return decode("���Ϥ��줿���˥ޥå�����ɥ�����Ȥ�����ޤ���Ǥ���.");
+        return "入力された条件にマッチするドキュメントがありませんでした.";
       }
       else if (numDocuments==1)
       {
-        return decode("���Ϥ��줿���˥ޥå�����ɥ�����Ȥ� <b>1</b> ��ߤĤ���ޤ���.");
+        return "入力された条件にマッチするドキュメントが <b>1</b> 件みつかりました.";
       }
-      else 
+      else
       {
-        return decode("���Ϥ��줿���˥ޥå�����ɥ�����Ȥ� <b>$num</b> ��ߤĤ���ޤ���. "
-                      "�Ǥ���פ��Ƥ����Τ���ɽ������ޤ�.");
+        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()
     {
-      return decode("�ޥå�����ñ��:");
+      return "マッチした単語:";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1491,7 +1460,7 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
      */
     virtual QCString trSourceFile(QCString& filename)
     {
-      return filename + decode(" �������ե�����");
+      return filename + " ソースファイル";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1502,40 +1471,40 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
      *  hierarchy.
      */
     virtual QCString trDirIndex()
-    { return decode("�ǥ��쥯�ȥ����"); }
+    { return "ディレクトリ索引"; }
 
     /*! This is used as the name of the chapter containing the documentation
      *  of the directories.
      */
     virtual QCString trDirDocumentation()
-    { return decode("�ǥ��쥯�ȥ깽��"); }
+    { return "ディレクトリ構成"; }
 
     /*! This is used as the title of the directory index and also in the
      *  Quick links of an HTML page, to link to the directory hierarchy.
      */
     virtual QCString trDirectories()
-    { return decode("�ǥ��쥯�ȥ�"); }
+    { 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 decode("���Υǥ��쥯�ȥ�����Ϥ����ޤ��ˤϥ����Ȥ���Ƥ��ޤ�����"
-		    "�����˥���ե��٥åȽ�ǥ����Ȥ���ƤϤ��ޤ���");
+    { return "このディレクトリ一覧はおおまかにはソートされていますが、"
+             "完全にアルファベット順でソートされてはいません。";
     }
 
     /*! This returns the title of a directory page. The name of the
      *  directory is passed via \a dirName.
      */
     virtual QCString trDirReference(const char *dirName)
-    { QCString result=dirName; result+=decode(" �ǥ��쥯�ȥ��ե����"); return result; }
+    { QCString result=dirName; result+=" ディレクトリリファレンス"; return result; }
 
     /*! This returns the word directory with or without starting capital
      *  (\a first_capital) and in sigular or plural form (\a singular).
      */
     virtual QCString trDir(bool, bool)
-    { 
-      return decode("�ǥ��쥯�ȥ�");
+    {
+      return "ディレクトリ";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1547,9 +1516,9 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
      */
     virtual QCString trOverloadText()
     {
-       return decode("����ϥ����С������ɤ��줿���дؿ��Ǥ���"
-		     "�������Τ�����Ѱդ���Ƥ��ޤ���"
-		     "���δؿ��Ȥΰ㤤�ϰ������ΤߤǤ���");
+       return "これはオーバーロードされたメンバ関数です。"
+              "利便性のために用意されています。"
+              "元の関数との違いは引き数のみです。";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1560,90 +1529,90 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
     virtual QCString trCallerGraph()
     {
       // return "Here is the caller graph for this function:";
-      return decode("�ƽФ������:");
+      return "呼出しグラフ:";
     }
 
     /*! This is used in the documentation of a file/namespace before the list
      *  of documentation blocks for enumeration values
      */
     virtual QCString trEnumerationValueDocumentation()
-    { return decode("���"); }
+    { return "列挙型"; }
 
 
 //////////////////////////////////////////////////////////////////////////
 // new since 1.5.4 (mainly for Fortran)
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! header that is put before the list of member subprograms (Fortran). */
     virtual QCString trMemberFunctionDocumentationFortran()
-    { return decode("�ؿ�/���֥롼����"); }
+    { 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 decode("�ǡ�����"); }
+    { return "データ型"; }
 
     /*! This is put above each page as a link to all members of compounds (Fortran). */
     virtual QCString trCompoundMembersFortran()
-    { return decode("�ǡ����ե������"); }
-    
+    { return "データフィールド"; }
+
     /*! This is an introduction to the annotated compound list (Fortran). */
     virtual QCString trCompoundListDescriptionFortran()
-    { return decode("����ϥǡ������ΰ����Ǥ�"); }
-    
+    { return "これはデータ型の一覧です"; }
+
     /*! This is an introduction to the page with all data types (Fortran). */
     virtual QCString trCompoundMembersDescriptionFortran(bool extractAll)
     {
-	  QCString result=decode("�����");
-	  result+=decode("�ե�����ɤΰ����Ǥ������줾��");
+	  QCString result="これは";
+	  result+="フィールドの一覧です。それぞれ";
 	  if (extractAll)
 	  {
-	  	result+=decode("��°���Ƥ���ǡ�����");
+	  	result+="が属しているデータ型";
 	  }
-	  result+=decode("�������إ�󥯤��Ƥ��ޤ���");
+	  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()
-    { return decode("�ǡ���������"); }
+    { return "データ型索引"; }
 
     /*! This is used in LaTeX as the title of the chapter containing
      *  the documentation of all data types (Fortran).
      */
     virtual QCString trTypeDocumentation()
-    { return decode("�ǡ�����"); }
+    { 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 decode("�ؿ�/���֥롼����"); }
+    { 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 decode("�ؿ�/���֥롼����"); }
+    { 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 decode("�ǡ�����"); }
-    
+    { return "データ型"; }
+
     /*! used as the title of page containing all the index of all modules (Fortran). */
     virtual QCString trModulesList()
-    { return decode("�⥸�塼�����"); }
+    { return "モジュール一覧"; }
 
     /*! used as an introduction to the modules list (Fortran) */
     virtual QCString trModulesListDescription(bool extractAll)
     {
-      QCString result=decode("�����");
-      if (!extractAll) result+=decode("�������줿");
-      result+=decode("�⥸�塼������Ǥ�");
+      QCString result="これは";
+      if (!extractAll) result+="生成された";
+      result+="モジュール一覧です";
       return result;
     }
 
@@ -1655,16 +1624,16 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
       QCString result="";
       switch(compType)
       {
-        case ClassDef::Class:      result+=decode("�⥸�塼�� "); break;
-        case ClassDef::Struct:     result+=decode("TYPE "); break;
-        case ClassDef::Union:      result+=decode("������ "); break;
-        case ClassDef::Interface:  result+=decode("���󥿡��ե����� "); break;
-        case ClassDef::Protocol:   result+=decode("�ץ��ȥ��� "); break;
-        case ClassDef::Category:   result+=decode("���ƥ��� "); break;
-        case ClassDef::Exception:  result+=decode("�㳰 "); break;
+        case ClassDef::Class:      result+="モジュール "; break;
+        case ClassDef::Struct:     result+="TYPE "; break;
+        case ClassDef::Union:      result+="共用体 "; break;
+        case ClassDef::Interface:  result+="インターフェース "; break;
+        case ClassDef::Protocol:   result+="プロトコル "; break;
+        case ClassDef::Category:   result+="カテゴリ "; break;
+        case ClassDef::Exception:  result+="例外 "; break;
         default: break;
       }
-      if (isTemplate) result += decode("�ƥ�ץ졼�� ");
+      if (isTemplate) result += "テンプレート ";
       result+=(QCString)clName;
       return result;
     }
@@ -1672,39 +1641,39 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
     virtual QCString trModuleReference(const char *namespaceName)
     {
       QCString result=namespaceName;
-      result+=decode("�⥸�塼��");        
+      result+="モジュール";
       return result;
     }
-    
+
     /*! This is put above each page as a link to all members of modules. (Fortran) */
     virtual QCString trModulesMembers()
-    { return decode("�⥸�塼�����"); }
+    { return "モジュールメンバ"; }
 
     /*! This is an introduction to the page with all modules members (Fortran) */
     virtual QCString trModulesMemberDescription(bool extractAll)
-    { 
-      QCString result=decode("����ϥ⥸�塼����а����Ǥ������줾�� ");
-      if (extractAll) 
+    {
+      QCString result="これはモジュールメンバ一覧です。それぞれ ";
+      if (extractAll)
       {
-        result+=decode("°���Ƥ���⥸�塼��");
+        result+="属しているモジュール";
       }
-	  result+=decode("�������إ�󥯤��Ƥ��ޤ���");
+      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 decode("�⥸�塼�����"); }
-    
+    { 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*/)
-    {       
-      return decode("�⥸�塼��");
+    {
+      return "モジュール";
     }
     /*! 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.
@@ -1716,41 +1685,41 @@ class TranslatorJapanese : public TranslatorAdapter_1_6_0
       QCString result="";
       switch(compType)
       {
-        case ClassDef::Class:      result+=decode("�⥸�塼��"); break;
-        case ClassDef::Struct:     result+=decode("TYPE"); break;
-        case ClassDef::Union:      result+=decode("������"); break;
-        case ClassDef::Interface:  result+=decode("���󥿡��ե�����"); break;
-        case ClassDef::Protocol:   result+=decode("�ץ��ȥ���"); break;
-        case ClassDef::Category:   result+=decode("���ƥ���"); break;
-        case ClassDef::Exception:  result+=decode("�㳰"); break;
+        case ClassDef::Class:      result+="モジュール"; break;
+        case ClassDef::Struct:     result+="TYPE"; break;
+        case ClassDef::Union:      result+="共用体"; break;
+        case ClassDef::Interface:  result+="インターフェース"; break;
+        case ClassDef::Protocol:   result+="プロトコル"; break;
+        case ClassDef::Category:   result+="カテゴリ"; break;
+        case ClassDef::Exception:  result+="例外"; break;
         default: break;
       }
-      result+=decode(decode("�������ϼ��Υե����뤫����������ޤ���:"));
+      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 trType(bool /*first_capital*/, bool /*singular*/)
-    { 
-      QCString result = decode("TYPE");
-      return result; 
+    {
+      QCString result = "TYPE";
+      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 = decode("���֥ץ������");
-      return result; 
+    {
+      QCString result = "サブプログラム";
+      return result;
     }
 
     /*! C# Type Constraint list */
     virtual QCString trTypeConstraints()
     {
-      return decode("������");
+      return "型制約";
     }
 
 };
diff --git a/src/translator_si.h b/src/translator_si.h
index 7295e44..8568b1e 100644
--- a/src/translator_si.h
+++ b/src/translator_si.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.
  *
@@ -22,7 +22,6 @@
 
 
 class TranslatorSlovene : public TranslatorAdapter_1_4_6
-//public TranslatorAdapter_1_2_16
 {
   protected:
     friend class TranslatorAdapterBase;
@@ -40,12 +39,8 @@ class TranslatorSlovene : public TranslatorAdapter_1_4_6
       return "\\usepackage[slovene]{babel}\n\\usepackage[T1]{fontenc}\n";
     }
     QCString idLanguageCharset()
-    { 
-//#ifdef _WIN32
-      return "windows-1250"; 
-//#else
-//      return "iso-8859-2"; 
-//#endif
+    {
+      return "utf-8";
     }
     QCString trRelatedFunctions()
     { return "Povezane funkcije"; }
@@ -54,11 +49,11 @@ class TranslatorSlovene : public TranslatorAdapter_1_4_6
     QCString trDetailedDescription()
     { return "Podroben opis"; }
     QCString trMemberTypedefDocumentation()
-    { return "Opis uporabni¹ko definiranih tipov"; }
+    { return "Opis uporabniško definiranih tipov"; }
     QCString trMemberEnumerationDocumentation()
-    { return "Opis komponent  na¹tevnih tipov"; }
+    { return "Opis komponent  naštevnih tipov"; }
 /*     QCString trEnumerationValueDocumentation() */
-/*     { return "Opis vrednosti na¹tevnih tipov (enum) "; } */
+/*     { return "Opis vrednosti naštevnih tipov (enum) "; } */
     QCString trMemberFunctionDocumentation()
     { return "Opis metod"; }
     QCString trMemberDataDocumentation()
@@ -72,17 +67,17 @@ class TranslatorSlovene : public TranslatorAdapter_1_4_6
     QCString trThisIsTheListOfAllMembers()
     { return "Seznam metod razreda "; }
     QCString trIncludingInheritedMembers()
-    { return ", vkljuèujoè dedovane metode in atribute."; }
+    { return ", vključujoč dedovane metode in atribute."; }
     QCString trGeneratedAutomatically(const char *s)
-    { QCString result="zgenerirano z Doxygen-om"; 
+    { QCString result="zgenerirano z Doxygen-om";
       if (s) result+=(QCString)" za "+s;
-      result+=" iz izvorne kode."; 
+      result+=" iz izvorne kode.";
       return result;
     }
     QCString trEnumName()
-    { return "na¹tevno ime"; }
+    { return "naštevno ime"; }
     QCString trEnumValue()
-    { return "na¹tevna vrednost"; }
+    { return "naštevna vrednost"; }
     QCString trDefinedIn()
     { return "definirano v"; }
     QCString trModules()
@@ -104,9 +99,9 @@ class TranslatorSlovene : public TranslatorAdapter_1_4_6
     QCString trExamples()
     { return "Primeri"; }
     QCString trSearch()
-    { return "I¹èi"; }
+    { return "Išči"; }
     QCString trClassHierarchyDescription()
-      { return "Hierarhièno drevo je (okvirno) sortirano po abecedi. ";
+      { return "Hierarhično drevo je (okvirno) sortirano po abecedi. ";
     }
     QCString trFileListDescription(bool extractAll)
     {
@@ -116,8 +111,8 @@ class TranslatorSlovene : public TranslatorAdapter_1_4_6
       return result;
     }
     QCString trCompoundListDescription()
-    { return "Seznam razredov, mno¾ic in struktur "
-             "s kratkim opisom :"; 
+    { return "Seznam razredov, množic in struktur "
+             "s kratkim opisom :";
     }
     QCString trCompoundMembersDescription(bool extractAll)
     {
@@ -153,10 +148,10 @@ class TranslatorSlovene : public TranslatorAdapter_1_4_6
     QCString trModuleIndex()
     { return "seznam modulov"; }
     QCString trHierarchicalIndex()
-    { return "Hierarhièni indeks"; }
+    { return "Hierarhični indeks"; }
     QCString trCompoundIndex()
     { return "abecedni seznam"; }
-    QCString trFileIndex() 
+    QCString trFileIndex()
     { return "seznam datotek"; }
     QCString trModuleDocumentation()
     { return "Dokumentacija modulov"; }
@@ -169,30 +164,30 @@ class TranslatorSlovene : public TranslatorAdapter_1_4_6
     QCString trPageDocumentation()
     { return "Opis povezanih strani"; }
     QCString trReferenceManual()
-    { return "Priroènik"; }
+    { return "Priročnik"; }
 
     QCString trDefines()
     { return "Makro deklaracije"; }
     QCString trFuncProtos()
     { return "Prototipi funkcij"; }
     QCString trTypedefs()
-    { return "Uporabni¹ko definirani tipi"; }
+    { return "Uporabniško definirani tipi"; }
     QCString trEnumerations()
-    { return "Na¹tevni tipi"; }
+    { return "Naštevni tipi"; }
     QCString trFunctions()
     { return "Funkcije"; }
     QCString trVariables()
     { return "Spremenljivke"; }
     QCString trEnumerationValues()
-    { return "Vrednosti na¹tevnih tipov"; }
+    { return "Vrednosti naštevnih tipov"; }
     QCString trDefineDocumentation()
     { return "Opis makro definicije"; }
     QCString trFunctionPrototypeDocumentation()
     { return "Opis prototipa funkcije"; }
     QCString trTypedefDocumentation()
-    { return "Opis uporabni¹ko definiranega tipa"; }
+    { return "Opis uporabniško definiranega tipa"; }
     QCString trEnumerationTypeDocumentation()
-    { return "Opis na¹tevnega (enum) tipa"; }
+    { return "Opis naštevnega (enum) tipa"; }
     QCString trFunctionDocumentation()
     { return "Opis funkcije"; }
     QCString trVariableDocumentation()
@@ -200,7 +195,7 @@ class TranslatorSlovene : public TranslatorAdapter_1_4_6
     QCString trCompounds()
     { return "Strukture"; }
     QCString trGeneratedAt(const char *date,const char *projName)
-    { 
+    {
       QCString result=(QCString)"Generirano "+date;
       if (projName) result+=(QCString)" projekt: "+projName;
       result+=(QCString)" generator: ";
@@ -237,12 +232,12 @@ class TranslatorSlovene : public TranslatorAdapter_1_4_6
     QCString trExceptions()
     { return "Prekinitve"; }
     QCString trGeneratedBy()
-    { return "Izdelano s pomoèjo"; }
-    
+    { return "Izdelano s pomočjo"; }
+
 //////////////////////////////////////////////////////////////////////////
-// new since 0.49-990307 
+// new since 0.49-990307
 //////////////////////////////////////////////////////////////////////////
-    
+
     QCString trNamespaceList()
     { return "imenski prostori"; }
     QCString trNamespaceListDescription(bool extractAll)
@@ -258,10 +253,10 @@ class TranslatorSlovene : public TranslatorAdapter_1_4_6
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990405
 //////////////////////////////////////////////////////////////////////////
-    
+
     QCString trRelatedFunctionDocumentation()
     { return "Podatki o poveznih funkcijah"; }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990425
 //////////////////////////////////////////////////////////////////////////
@@ -276,7 +271,7 @@ class TranslatorSlovene : public TranslatorAdapter_1_4_6
       {
         case ClassDef::Class:  result+=" Razred "; break;
         case ClassDef::Struct: result+=" Struktura "; break;
-        case ClassDef::Union:  result+=" Mno¾ica "; break;
+        case ClassDef::Union:  result+=" Množica "; break;
         case ClassDef::Interface:  result+=" IDL vmesnik "; break;
         case ClassDef::Protocol:   result+=" protocol "; break; // translate me!
         case ClassDef::Category:   result+=" category "; break; // translate me!
@@ -284,13 +279,13 @@ class TranslatorSlovene : public TranslatorAdapter_1_4_6
         default: break;
       }
       result += (QCString)clName;
-      
+
       return result;
     }
     QCString trFileReference(const char *fileName)
       // used as the title of the HTML page of a file
     {
-      QCString result="Datoteka "; 
+      QCString result="Datoteka ";
 	  result+=fileName;
 	  return result;
     }
@@ -299,11 +294,11 @@ class TranslatorSlovene : public TranslatorAdapter_1_4_6
     {
       QCString result ="Imenski prostor ";
 	  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 "Javne metode"; }
     QCString trPublicSlots()
@@ -311,21 +306,21 @@ class TranslatorSlovene : public TranslatorAdapter_1_4_6
     QCString trSignals()
     { return "Programske prekinitve"; }
     QCString trStaticPublicMembers()
-    { return "Statiène javne metode in atributi"; }
+    { return "Statične javne metode in atributi"; }
     QCString trProtectedMembers()
-    { return "Za¹èitene metode in atributi"; }
+    { return "Zaščitene metode in atributi"; }
     QCString trProtectedSlots()
-    { return "Za¹èiteni sloti"; }
+    { return "Zaščiteni sloti"; }
     QCString trStaticProtectedMembers()
-    { return "Statiène za¹èitene metode in atributi"; }
+    { return "Statične zaščitene metode in atributi"; }
     QCString trPrivateMembers()
     { return "Skrite metode in atributi"; }
     QCString trPrivateSlots()
     { return "Skriti slotovi"; }
     QCString trStaticPrivateMembers()
-    { return "Statiène skrite metode in atributi"; }
-    // end of member sections 
-    
+    { return "Statične skrite metode in atributi"; }
+    // end of member sections
+
     QCString trWriteList(int numEntries)
     {
       // this function is used to produce a comma-separated list of items.
@@ -333,23 +328,23 @@ class TranslatorSlovene : 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+=" in ";
         }
       }
-      return result; 
+      return result;
     }
-    
+
     QCString trInheritsList(int numEntries)
       // used in class documentation to produce a list of base classes,
       // if class diagrams are disabled.
@@ -363,7 +358,7 @@ class TranslatorSlovene : public TranslatorAdapter_1_4_6
       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 "Skrije implementacijo iz "+trWriteList(numEntries)+".";
@@ -380,18 +375,18 @@ class TranslatorSlovene : public TranslatorAdapter_1_4_6
     { return "elementi imenskega prostora"; }
     QCString trNamespaceMemberDescription(bool extractAll)
       // This is an introduction to the page with all namespace members
-    { 
+    {
       QCString result="Seznam vseh ";
       if (!extractAll) result+="dokumentiranih ";
       result+="elementov imenskega prostora s povezavami na ";
-      if (extractAll) 
+      if (extractAll)
         result+="opis vsakega elementa:";
-      else 
+      else
         result+="imenski prostor, ki mu pripadajo:";
       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 "Indeks imenskih prostorov"; }
     QCString trNamespaceDocumentation()
@@ -458,7 +453,7 @@ class TranslatorSlovene : public TranslatorAdapter_1_4_6
     QCString trMainPage()
     { return "prva stran"; }
 
-    /*! 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()
@@ -504,16 +499,16 @@ class TranslatorSlovene : public TranslatorAdapter_1_4_6
     {
       return (QCString)"Graf prikazuje seznam datotek, "
           "ki jih datoteka \""+fName+"\" "
-          "direktno ali indirektno vkljuèuje. Pravokotniki ponazarjajo datoteke, pu¹èice "
+          "direktno ali indirektno vključuje. Pravokotniki ponazarjajo datoteke, puščice "
 	  "predstavljajo relacije med njimi. "
-	  "Èrn pravokotnik ponazarja datoteko "+fName+". Pu¹èice A->B ponazarjajo "
-	  "usmerjeno relacijo \"A vkljuèuje B\"."
+	  "črn pravokotnik ponazarja datoteko "+fName+". Puščice A->B ponazarjajo "
+	  "usmerjeno relacijo \"A vključuje B\"."
 ;
     }
     /*! header that is put before the list of constructor/destructors. */
     QCString trConstructorDocumentation()
     {
-      return "Opis konstruktorjev in destruktorjev "; 
+      return "Opis konstruktorjev in destruktorjev ";
     }
     /*! Used in the file documentation to point to the corresponding sources. */
     QCString trGotoSourceCode()
@@ -523,7 +518,7 @@ class TranslatorSlovene : public TranslatorAdapter_1_4_6
     /*! Used in the file sources to point to the corresponding documentation. */
     QCString trGotoDocumentation()
     {
-      return "dokumenacija tekoèe datoteke.";
+      return "dokumenacija tekoče datoteke.";
     }
     /*! Text for the \pre command */
     QCString trPrecondition()
@@ -543,7 +538,7 @@ class TranslatorSlovene : public TranslatorAdapter_1_4_6
     /*! Text shown before a multi-line variable/enum initialization */
     QCString trInitialValue()
     {
-      return "Zaèetna vrednost / definicija :";
+      return "Začetna vrednost / definicija :";
     }
     /*! Text used the source code in the file index */
     QCString trCode()
@@ -552,11 +547,11 @@ class TranslatorSlovene : public TranslatorAdapter_1_4_6
     }
     QCString trGraphicalHierarchy()
     {
-      return "Hierarhija razredov v grafièni obliki";
+      return "Hierarhija razredov v grafični obliki";
     }
     QCString trGotoGraphicalHierarchy()
     {
-      return "Dedovalna hierarhija v grafièni obliki";
+      return "Dedovalna hierarhija v grafični obliki";
     }
     QCString trGotoTextualHierarchy()
     {
@@ -570,7 +565,7 @@ class TranslatorSlovene : public TranslatorAdapter_1_4_6
 //////////////////////////////////////////////////////////////////////////
 // new since 1.1.0
 //////////////////////////////////////////////////////////////////////////
-    
+
     QCString trNote()
     {
       return "Opomba";
@@ -585,19 +580,19 @@ class TranslatorSlovene : public TranslatorAdapter_1_4_6
     }
     QCString trStaticPublicAttribs()
     {
-      return "Statièni javni atributi";
+      return "Statični javni atributi";
     }
     QCString trProtectedTypes()
     {
-      return "Za¹èiteni tipi";
+      return "Zaščiteni tipi";
     }
     QCString trProtectedAttribs()
     {
-      return "Za¹èiteni atributi";
+      return "Zaščiteni atributi";
     }
     QCString trStaticProtectedAttribs()
     {
-      return "Statièni za¹èiteni tipi";
+      return "Statični zaščiteni tipi";
     }
     QCString trPrivateTypes()
     {
@@ -609,7 +604,7 @@ class TranslatorSlovene : public TranslatorAdapter_1_4_6
     }
     QCString trStaticPrivateAttribs()
     {
-      return "Statièni skriti atributi";
+      return "Statični skriti atributi";
     }
 //////////////////////////////////////////////////////////////////////////
 // new since 1.1.3
@@ -623,7 +618,7 @@ class TranslatorSlovene : public TranslatorAdapter_1_4_6
     /*! Used as the header of the todo list */
     virtual QCString trTodoList()
     {
-      return "Seznam nedokonèanih opravil";
+      return "Seznam nedokončanih opravil";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -645,12 +640,12 @@ class TranslatorSlovene : public TranslatorAdapter_1_4_6
     virtual QCString trInclByDepGraph()
     {
       return "Graf prikazuje datoteke, ki posredno ali neposredno "
-             "vkljuèujejo tekoèo datoteko. Pravokotniki simbolizirajo datoteke, "
-             "pu¹èice pa relacije med datotekami. Tekoèa datoteka je prikazana "
-	     "kot pravokotnik s èrno podlago, ostale pa kot pravokotnik brez podlage. "
-	     "Smer pu¹èice A->B definira relacijo \"A vkljuèuje B\". "
-	     "Vse datoteke, ki torej mejijo na tekoèo (t.j. obstaja povezava med èrnim in "
-	     "praznim pravokotnikom), jo direktno vkljuèujejo, medtem, ko jo ostale vkljuèujejo "
+             "vključujejo tekočo datoteko. Pravokotniki simbolizirajo datoteke, "
+             "puščice pa relacije med datotekami. Tekoča datoteka je prikazana "
+	     "kot pravokotnik s črno podlago, ostale pa kot pravokotnik brez podlage. "
+	     "Smer puščice A->B definira relacijo \"A vključuje B\". "
+	     "Vse datoteke, ki torej mejijo na tekočo (t.j. obstaja povezava med črnim in "
+	     "praznim pravokotnikom), jo direktno vključujejo, medtem, ko jo ostale vključujejo "
 	     "le posredno. "
 	;
     }
@@ -668,13 +663,13 @@ class TranslatorSlovene : public TranslatorAdapter_1_4_6
     {
       return "Legenda grafa";
     }
-    /*! 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 
-        "Tekoèa stran pojasnjuje naèin interpretacije grafov, ki jih izri¹e "
+      return
+        "Tekoča stran pojasnjuje način interpretacije grafov, ki jih izriše "
         "doxygen.<p>\n"
         "Poglejmo si naslednji primer:\n"
         "\\code\n"
@@ -684,13 +679,13 @@ class TranslatorSlovene : public TranslatorAdapter_1_4_6
         "class Truncated : public Invisible { };\n\n"
         "/* razred, ki ni opisan z doxygen komentarji */\n"
         "class Undocumented { };\n\n"
-        "/*! Razred, ki ga dedujemo s pomoèjo javnega dedovanja */\n"
+        "/*! Razred, ki ga dedujemo s pomočjo javnega dedovanja */\n"
         "class PublicBase : public Truncated { };\n\n"
         "/*! A template class */\n"
         "template<class T> class Templ { };\n\n"
-        "/*! Razred, ki ga dedujemo s pomoèjo za¹èitenega dedovanja */\n"
+        "/*! Razred, ki ga dedujemo s pomočjo zaščitenega dedovanja */\n"
         "class ProtectedBase { };\n\n"
-        "/*! Razred, ki ga dedujemo s pomoèjo skritega dedovanja */\n"
+        "/*! Razred, ki ga dedujemo s pomočjo skritega dedovanja */\n"
         "class PrivateBase { };\n\n"
         "/*! Razred, ki ga uporablja dedovani razred */\n"
         "class Used { };\n\n"
@@ -735,11 +730,11 @@ class TranslatorSlovene : public TranslatorAdapter_1_4_6
     {
       return "legenda";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.2.0
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! Used as a marker that is put before a test item */
     virtual QCString trTest()
     {
@@ -827,11 +822,11 @@ class TranslatorSlovene : public TranslatorAdapter_1_4_6
     {
       return "Vrednost:";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.2.5
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! Used as a marker that is put before a \\bug item */
     virtual QCString trBug()
     {
@@ -847,9 +842,9 @@ class TranslatorSlovene : 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
@@ -870,15 +865,15 @@ class TranslatorSlovene : public TranslatorAdapter_1_4_6
      * GB2313_CHARSET          134 (x86)             936
      * CHINESEBIG5_CHARSET     136 (x88)             950
      * </pre>
-     * 
+     *
      */
     virtual QCString trRTFansicp()
     {
       return "1250";
     }
-    
 
-    /*! Used as ansicpg for RTF fcharset 
+
+    /*! Used as ansicpg for RTF fcharset
      *  \see trRTFansicp() for a table of possible values.
      */
     virtual QCString trRTFCharSet()
@@ -891,76 +886,76 @@ class TranslatorSlovene : public TranslatorAdapter_1_4_6
     {
       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 ? "Razred" : "razred"));
       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 trFile(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Datotek" : "datotek"));
       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 ? "Imenski prostor" : "imenski prostor"));
       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 trGroup(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Skupina" : "skupina"));
       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 ? "Stran" : "stran"));
       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 trMember(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Element" : "element"));
       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 trField(bool first_capital, bool singular) */
@@ -972,14 +967,14 @@ class TranslatorSlovene : public TranslatorAdapter_1_4_6
 /*     } */
 
     /*! 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;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -989,10 +984,10 @@ class TranslatorSlovene : 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((first_capital ? "Avtor" : "avtor"));
       if (!singular)  result+="ji";
-      return result; 
+      return result;
     }
 //////////////////////////////////////////////////////////////////////////
 // new since 1.2.11
@@ -1008,7 +1003,7 @@ class TranslatorSlovene : 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)
@@ -1040,8 +1035,8 @@ class TranslatorSlovene : 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()
     {
@@ -1052,7 +1047,7 @@ class TranslatorSlovene : 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()
@@ -1072,43 +1067,43 @@ class TranslatorSlovene : public TranslatorAdapter_1_4_6
     /*! Used as a heading for a list of Java class types with package scope.
      */
     virtual QCString trPackageTypes()
-    { 
+    {
       return "Tipi paketov";
     }
-    /*! 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 paketa";   /* don't know the context */
     }
-    /*! 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čne funkcije paketa";
     }
-    /*! 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 paketa";
     }
-    /*! 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čni atributi paketa";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // 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()
@@ -1125,9 +1120,9 @@ class TranslatorSlovene : 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()
     {
@@ -1144,7 +1139,7 @@ class TranslatorSlovene : 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.
      */
@@ -1162,13 +1157,13 @@ class TranslatorSlovene : public TranslatorAdapter_1_4_6
       {
         return "Našel sem <b>2</b> dokumenta, ki ustrezata vašemu povpraševanju.";
       }
-      else 
+      else
       {
         return "Našel sem <b>$num</b> dokumentov, ki ustrezajo vašemu povpraševanju. "
                "Dokumenti z najboljšo stopnjo ujemanja se nahajajo na začetku.";
       }
     }
-    /*! 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()
@@ -1209,7 +1204,7 @@ class TranslatorSlovene : public TranslatorAdapter_1_4_6
     virtual QCString trDirectories()
     { return "Imeniki"; }
 
-    /*! 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()
@@ -1220,19 +1215,19 @@ class TranslatorSlovene : public TranslatorAdapter_1_4_6
      *  directory is passed via \a dirName.
      */
     virtual QCString trDirReference(const char *dirName)
-    { QCString result=dirName; 
+    { QCString result=dirName;
       result+=" imeniške reference"; /* not sure for context */
-      return result; 
+      return result;
     }
 
     /*! This returns the word directory with or without starting capital
      *  (\a first_capital) and in sigular or plural form (\a singular).
      */
     virtual QCString trDir(bool first_capital, bool singular)
-    { 
+    {
       QCString result((first_capital ? "Imenik" : "imenik"));
       if (singular) result+="i"; else result+="";
-      return result; 
+      return result;
     }
 
 //////////////////////////////////////////////////////////////////////////
diff --git a/src/translator_sr.h b/src/translator_sr.h
index 7311eac..c2d37e2 100644
--- a/src/translator_sr.h
+++ b/src/translator_sr.h
@@ -26,17 +26,6 @@
 
 class TranslatorSerbian : public TranslatorAdapter_1_6_0
 {                                
-private:
-   QCString decode(const QCString& sInput)
-   { 
-//#ifdef _WIN32
-//     return ISO88592ToWin1250(sInput);
-//#else
-     return sInput;
-//#endif
-   }
-
-
   public:
 
     // --- Language control methods -------------------
@@ -73,11 +62,7 @@ private:
     /*! return the language charset. This will be used for the HTML output */
     virtual QCString idLanguageCharset()
     {
-//#ifdef _WIN32
-//        { return "windows-1250"; }
-//#else
-        { return "UTF-8"; }
-//#endif
+        return "utf-8";
     }
 
     // --- Language translation methods -------------------
@@ -86,61 +71,61 @@ private:
     virtual QCString trRelatedFunctions()
     //! Č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 decode( "Relevantne funkcije" ); }  
+    { return "Relevantne funkcije"; }  
 
     /*! subscript for the related functions. */
     virtual QCString trRelatedSubscript()
-    { return decode( "(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()
-    { return decode( "Opširniji opis" ); }
+    { return "Opširniji opis"; }
 
     /*! header that is put before the list of typedefs. */
     virtual QCString trMemberTypedefDocumentation()
-    { return decode( "Dokumentacija unutrašnjih definicija tipa" ); }
+    { 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 decode( "Dokumentacija unutrašnjih nabrajanja" ); }
+    { return "Dokumentacija unutrašnjih nabrajanja"; }
     
     /*! header that is put before the list of member functions. */
     virtual QCString trMemberFunctionDocumentation()
-    { return decode( "Dokumentacija funkcija članica" ); }
+    { 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 decode( "Dokumentacija polja" ); 
+        return "Dokumentacija polja"; 
       }
       else
       {
-        return decode( "Dokumentacija atributa" ); 
+        return "Dokumentacija atributa"; 
       }
     }
 
     /*! this is the text of a link put after brief descriptions. */
     virtual QCString trMore() 
-    { return decode( "Još..." ); }
+    { return "Još..."; }
 
     /*! put in the class documentation */
     virtual QCString trListOfAllMembers()
-    { return decode( "Spisak svih članova" ); }
+    { return "Spisak svih članova"; }
 
     /*! used as the title of the "list of all members" page of a class */
     virtual QCString trMemberList()
-    { return decode( "Spisak članova" ); }
+    { return "Spisak članova"; }
 
     /*! this is the first part of a sentence that is followed by a class name */
     virtual QCString trThisIsTheListOfAllMembers()
-    { return decode( "Ovo je spisak svih članova " ); }
+    { return "Ovo je spisak svih članova "; }
 
     /*! this is the remainder of the sentence after the class name */
     virtual QCString trIncludingInheritedMembers()
-    { return decode( ", uključujući nasleđene članove." ); }
+    { 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.
@@ -149,20 +134,20 @@ private:
     { QCString result="Napravljeno automatski korišćenjem alata Doxygen";
       if( s ) result+=(QCString)" za projekat " + s;
       result+=" od izvornog koda."; 
-      return decode( result );
+      return result;
     }
 
     /*! put after an enum name in the list of all members */
     virtual QCString trEnumName()
-    { return decode( "ime nabrajanja " ); }
+    { return "ime nabrajanja "; }
     
     /*! put after an enum value in the list of all members */
     virtual QCString trEnumValue()
-    { return decode( "vrednost nabrojane konstante" ); }
+    { return "vrednost nabrojane konstante"; }
     
     /*! put after an undocumented member in the list of all members */
     virtual QCString trDefinedIn()
-    { return decode( "definicija u" ); }
+    { return "definicija u"; }
 
     // quick reference sections
 
@@ -170,39 +155,39 @@ private:
      *  compounds or files (see the \\group command).
      */
     virtual QCString trModules()
-    { return decode( "Moduli" ); }
+    { return "Moduli"; }
     
     /*! This is put above each page as a link to the class hierarchy */
     virtual QCString trClassHierarchy()
-    { return decode( "Hijerarhija klasa" ); }
+    { 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 decode( "Spisak struktura" );
+        return "Spisak struktura";
       }
       else
       {
-        return decode( "Spisak klasa" ); 
+        return "Spisak klasa"; 
       }
     }
     
     /*! This is put above each page as a link to the list of documented files */
     virtual QCString trFileList()
-    { return decode( "Spisak datoteka" ); }
+    { 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 decode( "Sva polja struktura" ); 
+        return "Sva polja struktura"; 
       }
       else
       {
-        return decode( "Svi članovi klasa" ); 
+        return "Svi članovi klasa"; 
       }
     }
 
@@ -211,31 +196,29 @@ private:
     { 
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-       return decode( "Članovi datoteke" ); 
+       return "Članovi datoteke"; 
       }
       else
       {
-       return decode( "Članovi datoteke" ); 
+       return "Članovi datoteke"; 
       }
     }
 
     /*! This is put above each page as a link to all related pages. */
     virtual QCString trRelatedPages()
-    { return decode( "Stranice koje imaju veze sa ovom stranicom" ); }
+    { return "Stranice koje imaju veze sa ovom stranicom"; }
 
     /*! This is put above each page as a link to all examples. */
     virtual QCString trExamples()
-    { return decode( "Primeri" ); }
+    { return "Primeri"; }
 
     /*! This is put above each page as a link to the search engine. */
     virtual QCString trSearch()
-    { return decode( "Traži" ); }
+    { return "Traži"; }
 
     /*! This is an introduction to the class hierarchy. */
     virtual QCString trClassHierarchyDescription()
-    { return decode( "Hijerahija klasa uređena približno "
-                     "po abecedi:" ); 
-	}
+    { return "Hijerahija klasa uređena približno po abecedi:"; }
 
     /*! This is an introduction to the list with all files. */
     virtual QCString trFileListDescription(bool extractAll)
@@ -243,7 +226,7 @@ private:
       QCString result="Spisak svih ";
       if (!extractAll) result+="dokumentovanih ";
       result+="datoteka, sa kratkim opisima:";
-      return decode( result );
+      return result;
     }
 
     /*! This is an introduction to the annotated compound list. */
@@ -252,12 +235,11 @@ private:
       
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return decode( "Spisak struktura sa kratkim opisima:" ); 
+        return "Spisak struktura sa kratkim opisima:"; 
       }
       else
       {
-        return decode( "Spisak klasa, struktura, "
-                       "unija i interfejsa sa kratkim opisima:" );
+        return "Spisak klasa, struktura, unija i interfejsa sa kratkim opisima:";
       }
     }
 
@@ -300,7 +282,7 @@ private:
           result+="klasama kojima pripadaju:"; 
         }
       }
-      return decode( result );
+      return result;
     }
 
     /*! This is an introduction to the page with all file members. */
@@ -322,38 +304,38 @@ private:
         result+="datotekama u kojima se nalaze:";
       else 
         result+="dokumentaciji:";
-      return decode( result );
+      return result;
     }
 
     /*! This is an introduction to the page with the list of all examples */
     virtual QCString trExamplesDescription()
-    { return decode( "Spisak svih primera:" ); }
+    { return "Spisak svih primera:"; }
 
     /*! This is an introduction to the page with the list of related pages */
     virtual QCString trRelatedPagesDescription()
-    { return decode( "Spisak stranica koje imaju veze sa ovom stranicom:" ); }
+    { return "Spisak stranica koje imaju veze sa ovom stranicom:"; }
 
     /*! This is an introduction to the page with the list of class/file groups */
     virtual QCString trModulesDescription()
-    { return decode( "Spisak svih modula:" ); }
+    { return "Spisak svih modula:"; }
 
     // index titles (the project name is prepended for these) 
 
     /*! This is used in HTML as the title of index.html. */
     virtual QCString trDocumentation()
-    { return decode("Dokumentacija" ); }
+    { return "Dokumentacija"; }
 
     /*! This is used in LaTeX as the title of the chapter with the 
      * index of all groups.
      */
     virtual QCString trModuleIndex()
-    { return decode( "Indeks modula" ); }
+    { return "Indeks modula"; }
 
     /*! This is used in LaTeX as the title of the chapter with the 
      * class hierarchy.
      */
     virtual QCString trHierarchicalIndex()
-    { return decode( "Hijerarhijski sadržaj" ); }
+    { return "Hijerarhijski sadržaj"; }
 
     /*! This is used in LaTeX as the title of the chapter with the 
      * annotated compound index.
@@ -362,11 +344,11 @@ private:
     {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       { 
-        return decode( "Spisak struktura/unija" ); 
+        return "Spisak struktura/unija"; 
       }
       else
       {
-        return decode( "Spisak klasa" ); 
+        return "Spisak klasa"; 
       }
     }
 
@@ -374,13 +356,13 @@ private:
      * list of all files.
      */
     virtual QCString trFileIndex() 
-    { return decode( "Indeks datoteka" ); }
+    { return "Indeks datoteka"; }
 
     /*! This is used in LaTeX as the title of the chapter containing
      *  the documentation of all groups.
      */
     virtual QCString trModuleDocumentation()
-    { return decode( "Dokumentacija modula" ); }
+    { return "Dokumentacija modula"; }
 
     /*! This is used in LaTeX as the title of the chapter containing
      *  the documentation of all classes, structs and unions.
@@ -389,11 +371,11 @@ private:
     { 
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return decode( "Dokumentacija stuktura/unija" ); 
+        return "Dokumentacija stuktura/unija"; 
       }
       else
       {
-        return decode( "Dokumentacija klasa" ); 
+        return "Dokumentacija klasa"; 
       }
     }
 
@@ -401,101 +383,101 @@ private:
      *  the documentation of all files.
      */
     virtual QCString trFileDocumentation()
-    { return decode( "Dokumentacija datoteke" ); }
+    { return "Dokumentacija datoteke"; }
 
     /*! This is used in LaTeX as the title of the chapter containing
      *  the documentation of all examples.
      */
     virtual QCString trExampleDocumentation()
-    { return decode( "Dokumentacija primera" ); }
+    { return "Dokumentacija primera"; }
 
     /*! This is used in LaTeX as the title of the chapter containing
      *  the documentation of all related pages.
      */
     virtual QCString trPageDocumentation()
-    { return decode( "Dokumentacija stranice" ); }
+    { return "Dokumentacija stranice"; }
 
     /*! This is used in LaTeX as the title of the document */
     virtual QCString trReferenceManual()
-    { return decode( "Priručnik" ); }
+    { return "Priručnik"; }
     
     /*! This is used in the documentation of a file as a header before the 
      *  list of defines
      */
     virtual QCString trDefines()
-    { return decode( "Makro zamene" ); }
+    { return "Makro zamene"; }
 
     /*! This is used in the documentation of a file as a header before the 
      *  list of function prototypes
      */
     virtual QCString trFuncProtos()
-    { return decode( "Deklaracije funkcija" ); }
+    { return "Deklaracije funkcija"; }
 
     /*! This is used in the documentation of a file as a header before the 
      *  list of typedefs
      */
     virtual QCString trTypedefs()
-    { return decode( "Definicije tipa" ); }
+    { return "Definicije tipa"; }
 
     /*! This is used in the documentation of a file as a header before the 
      *  list of enumerations
      */
     virtual QCString trEnumerations()
-    { return decode( "Nabrajanja" ); }
+    { return "Nabrajanja"; }
 
     /*! This is used in the documentation of a file as a header before the 
      *  list of (global) functions
      */
     virtual QCString trFunctions()
-    { return decode( "Funkcije" ); }
+    { return "Funkcije"; }
 
     /*! This is used in the documentation of a file as a header before the 
      *  list of (global) variables
      */
     virtual QCString trVariables()
-    { return decode( "Promenljive" ); }
+    { return "Promenljive"; }
 
     /*! This is used in the documentation of a file as a header before the 
      *  list of (global) variables
      */
     virtual QCString trEnumerationValues()
-    { return decode( "Vrednosti nabrojanih konstanti" ); }
+    { 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 decode( "Dokumentacija makro zamene" ); }
+    { return "Dokumentacija makro zamene"; }
 
     /*! This is used in the documentation of a file/namespace before the list 
      *  of documentation blocks for function prototypes
      */
     virtual QCString trFunctionPrototypeDocumentation()
-    { return decode( "Dokumentacija deklaracije funkcije" ); }
+    { return "Dokumentacija deklaracije funkcije"; }
 
     /*! This is used in the documentation of a file/namespace before the list 
      *  of documentation blocks for typedefs
      */
     virtual QCString trTypedefDocumentation()
-    { return decode( "Dokumentacija definicije tipa" ); }
+    { return "Dokumentacija definicije tipa"; }
 
     /*! This is used in the documentation of a file/namespace before the list 
      *  of documentation blocks for enumeration types
      */
     virtual QCString trEnumerationTypeDocumentation()
-    { return decode( "Dokumentacija nabrajanja" ); }
+    { return "Dokumentacija nabrajanja"; }
 
     /*! This is used in the documentation of a file/namespace before the list 
      *  of documentation blocks for functions
      */
     virtual QCString trFunctionDocumentation()
-    { return decode( "Dokumentacija funkcije" ); }
+    { return "Dokumentacija funkcije"; }
 
     /*! This is used in the documentation of a file/namespace before the list 
      *  of documentation blocks for variables
      */
     virtual QCString trVariableDocumentation()
-    { return decode( "Dokumentacija promenljive" ); }
+    { return "Dokumentacija promenljive"; }
 
     /*! This is used in the documentation of a file/namespace/group before 
      *  the list of links to documented compounds
@@ -504,11 +486,11 @@ private:
     { 
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return decode( "Strukture i unije" );  
+        return "Strukture i unije";  
       }
       else
       {
-        return decode( "Klase, strukture i unije" );   
+        return "Klase, strukture i unije";   
       }
     }
 
@@ -520,56 +502,56 @@ private:
       QCString result=(QCString)"[" + date + "] Napravljeno automatski ";
       if ( projName ) result+=(QCString)" za projekat " + projName;
 	  result+=(QCString)" upotrebom ";
-      return decode( result );
+      return result;
     }
     /*! This is part of the sentence used in the standard footer of each page.
      */
     virtual QCString trWrittenBy()
     {
-      return decode( "napisao" );
+      return "napisao";
     }
 
     /*! this text is put before a class diagram */
     virtual QCString trClassDiagram(const char *clName)
     {
-      return decode( QCString("Dijagram nasleđivanja za klasu ") + clName + ":" );
+      return QCString("Dijagram nasleđivanja za klasu ") + clName + ":";
     }
     
     /*! this text is generated when the \\internal command is used. */
     virtual QCString trForInternalUseOnly()
-    { return decode( "Samo za unutrašnju upotrebu." ); }
+    { return "Samo za unutrašnju upotrebu."; }
 
     /*! this text is generated when the \\warning command is used. */
     virtual QCString trWarning()
-    { return decode( "Upozorenje" ); }
+    { return "Upozorenje"; }
 
     /*! this text is generated when the \\version command is used. */
     virtual QCString trVersion()
-    { return decode( "Verzija" ); }
+    { return "Verzija"; }
 
     /*! this text is generated when the \\date command is used. */
     virtual QCString trDate()
-    { return decode( "Datum" ); }
+    { return "Datum"; }
 
     /*! this text is generated when the \\return command is used. */
     virtual QCString trReturns()
-    { return decode( "Vrednost funkcije" ); }
+    { return "Vrednost funkcije"; }
 
     /*! this text is generated when the \\sa command is used. */
     virtual QCString trSeeAlso()
-    { return decode( "Takođe pogledati" ); }
+    { return "Takođe pogledati"; }
 
     /*! this text is generated when the \\param command is used. */
     virtual QCString trParameters()
-    { return decode( "Parametri" ); }
+    { return "Parametri"; }
 
     /*! this text is generated when the \\exception command is used. */
     virtual QCString trExceptions()
-    { return decode( "Izuzeci" ); }
+    { return "Izuzeci"; }
     
     /*! this text is used in the title page of a LaTeX document. */
     virtual QCString trGeneratedBy()
-    { return decode( "Napravio" ); }
+    { return "Napravio"; }
 
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990307
@@ -577,7 +559,7 @@ private:
     
     /*! used as the title of page containing all the index of all namespaces. */
     virtual QCString trNamespaceList()
-    { return decode( "Spisak prostora imena" ); }
+    { return "Spisak prostora imena"; }
 
     /*! used as an introduction to the namespace list */
     virtual QCString trNamespaceListDescription(bool extractAll)
@@ -585,14 +567,14 @@ private:
       QCString result="Spisak svih ";
       if (!extractAll) result+="dokumentovanih ";
       result+="prostora imena sa kratkim opisom:";
-      return decode( result );
+      return result;
     }
 
     /*! used in the class documentation as a header before the list of all
      *  friends of a class
      */
     virtual QCString trFriends()
-    { return decode( "Prijatelji" ); }
+    { return "Prijatelji"; }
     
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990405
@@ -602,7 +584,7 @@ private:
      * related classes 
      */
     virtual QCString trRelatedFunctionDocumentation()
-    { return decode( "Dokumentacija prijatelja i relevantnih funkcija" ); }
+    { return "Dokumentacija prijatelja i relevantnih funkcija"; }
     
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990425
@@ -627,7 +609,7 @@ private:
       }
       if (isTemplate) result += "šablona ";  
       result += clName;
-      return decode( result );
+      return result;
     }
 
     /*! used as the title of the HTML page of a file */
@@ -635,7 +617,7 @@ private:
     {
       QCString result = "Opis datoteke ";
       result += fileName; 
-      return decode( result );
+      return result;
     }
 
     /*! used as the title of the HTML page of a namespace */
@@ -643,29 +625,29 @@ private:
     {
       QCString result="Opis prostora imena ";
       result += namespaceName;
-      return decode( result );
+      return result;
     }
     
     virtual QCString trPublicMembers()
-    { return decode("Javni članovi"); }
+    { return "Javni članovi"; }
     virtual QCString trPublicSlots()
-    { return decode( "Javni slotovi" ); }
+    { return "Javni slotovi"; }
     virtual QCString trSignals()
-    { return decode( "Signali" ); }
+    { return "Signali"; }
     virtual QCString trStaticPublicMembers()
-    { return decode("Zajednički javni članovi"); }
+    { return "Zajednički javni članovi"; }
     virtual QCString trProtectedMembers()
-    { return decode("Zaštićeni članovi");  }
+    { return "Zaštićeni članovi";  }
     virtual QCString trProtectedSlots()
-    { return decode("Zaštićeni slotovi"); }
+    { return "Zaštićeni slotovi"; }
     virtual QCString trStaticProtectedMembers()
-    { return decode("Zajednički zaštićeni članovi"); }
+    { return "Zajednički zaštićeni članovi"; }
     virtual QCString trPrivateMembers()
-    { return decode("Privatni članovi"); }
+    { return "Privatni članovi"; }
     virtual QCString trPrivateSlots()
-    { return decode("Privatni slotovi"); }
+    { return "Privatni slotovi"; }
     virtual QCString trStaticPrivateMembers()
-    { return decode("Zajednički privatni članovi"); }
+    { 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.
@@ -697,7 +679,7 @@ private:
      */
     virtual QCString trInheritsList(int numEntries)
     {
-      return decode("Spisak osnovnih klasa: "+trWriteList(numEntries)+".");
+      return "Spisak osnovnih klasa: ";
     }
 
     /*! used in class documentation to produce a list of derived classes,
@@ -705,7 +687,7 @@ private:
      */
     virtual QCString trInheritedByList(int numEntries)
     {
-      return decode( "Spisak izvedenih klasa: "+trWriteList(numEntries)+"." );
+      return "Spisak izvedenih klasa: ";
     }
 
     /*! used in member documentation blocks to produce a list of 
@@ -713,7 +695,7 @@ private:
      */
     virtual QCString trReimplementedFromList(int numEntries)
     {
-      return decode("Menja definiciju iz "+trWriteList(numEntries)+"." );
+      return "Menja definiciju iz "+trWriteList(numEntries)+".";
     }
 
     /*! used in member documentation blocks to produce a list of
@@ -721,12 +703,12 @@ private:
      */
     virtual QCString trReimplementedInList(int numEntries)
     { //! Ako već ne možemo jednu reč (redefinicija), da uskladimo sa prethodnim i izbacimo upotrebu roda
-      return decode("Definicija je izmenjena u "+trWriteList(numEntries)+"." );
+      return "Definicija je izmenjena u "+trWriteList(numEntries)+".";
     }
 
     /*! This is put above each page as a link to all members of namespaces. */
     virtual QCString trNamespaceMembers()
-    { return decode("Članovi prostora imena"); }
+    { return "Članovi prostora imena"; }
 
     /*! This is an introduction to the page with all namespace members */
     virtual QCString trNamespaceMemberDescription(bool extractAll)
@@ -738,19 +720,19 @@ private:
         result+="dokumentaciji svakog člana prostora imena: ";
       else 
         result+="prostorima imena kojima pripadaju: ";
-      return decode( result );
+      return result;
     }
     /*! This is used in LaTeX as the title of the chapter with the 
      *  index of all namespaces.
      */
     virtual QCString trNamespaceIndex()
-    { return decode( "Indeks prostora imena" ); }
+    { return "Indeks prostora imena"; }
 
     /*! This is used in LaTeX as the title of the chapter containing
      *  the documentation of all namespaces.
      */
     virtual QCString trNamespaceDocumentation()
-    { return decode( "Dokumentacija prostora imena" ); }
+    { return "Dokumentacija prostora imena"; }
 
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990522
@@ -760,7 +742,7 @@ private:
      *  namespaces in a file.
      */
     virtual QCString trNamespaces()
-    { return decode( "Prostori imena" ); }
+    { return "Prostori imena"; }
 
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990728
@@ -787,14 +769,14 @@ private:
       }
       result+=" je napravljena na osnovu ";
       if (single) result+="datoteke "; else result+="sledećih datoteka:";
-      return decode( result );
+      return result;
     }
 
     /*! This is in the (quick) index as a link to the alphabetical compound
      * list.
      */
     virtual QCString trAlphabeticalList()
-    { return decode( "Abecedni spisak" ); }
+    { return "Abecedni spisak"; }
 
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990901
@@ -802,18 +784,18 @@ private:
 
     /*! This is used as the heading text for the retval command. */
     virtual QCString trReturnValues()
-    { return decode( "Karakteristične vrednosti funkcije" ); }
+    { return "Karakteristične vrednosti funkcije"; }
 
     /*! This is in the (quick) index as a link to the main page (index.html)
      */
     virtual QCString trMainPage()
-    { return decode( "Glavna strana" ); }
+    { return "Glavna strana"; }
 
     /*! This is used in references to page that are put in the LaTeX 
      *  documentation. It should be an abbreviation of the word page.
      */
     virtual QCString trPageAbbreviation()
-    { return decode( "str." ); }
+    { return "str."; }
 
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-991003
@@ -821,11 +803,11 @@ private:
 
     virtual QCString trDefinedAtLineInSourceFile()
     { //! Izbacujemo rod
-      return decode( "Definicija je u redu @0 datoteke @1." );
+      return "Definicija je u redu @0 datoteke @1.";
     }
     virtual QCString trDefinedInSourceFile()
     { //! Izbacujemo rod
-      return decode( "Definicija je u datoteci @0." );
+      return "Definicija je u datoteci @0.";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -834,7 +816,7 @@ private:
 
     virtual QCString trDeprecated()
     {
-      return decode( "Zastarelo" );
+      return "Zastarelo";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -844,68 +826,68 @@ private:
     /*! this text is put before a collaboration diagram */
     virtual QCString trCollaborationDiagram(const char *clName)
     {
-      return decode( (QCString)"Klasni dijagram za "+clName+":" );
+      return (QCString)"Klasni dijagram za "+clName+":";
     }
     /*! this text is put before an include dependency graph */
     virtual QCString trInclDepGraph(const char *fName)
     {
-      return decode( (QCString)"Graf zavisnosti datoteka za "+fName+":" );
+      return (QCString)"Graf zavisnosti datoteka za "+fName+":";
     }
     /*! header that is put before the list of constructor/destructors. */
     virtual QCString trConstructorDocumentation()
     {
-      return decode( "Dokumentacija konstruktora i destruktora" ); 
+      return "Dokumentacija konstruktora i destruktora"; 
     }
     /*! Used in the file documentation to point to the corresponding sources. */
     virtual QCString trGotoSourceCode()
     {
-      return decode( "Izvorni kod." );
+      return "Izvorni kod.";
     }
     /*! Used in the file sources to point to the corresponding documentation. */
     virtual QCString trGotoDocumentation()
     {
-      return decode( "Dokumentacija." );
+      return "Dokumentacija.";
     }
     /*! Text for the \\pre command */
     virtual QCString trPrecondition()
     {
-      return decode( "Preduslovi" );
+      return "Preduslovi";
     }
     /*! Text for the \\post command */
     virtual QCString trPostcondition()
     {
-      return decode( "Stanje po izvršenju" );
+      return "Stanje po izvršenju";
     }
     /*! Text for the \\invariant command */
     virtual QCString trInvariant()
     {
-      return decode( "Invarijanta" );
+      return "Invarijanta";
     }
     /*! Text shown before a multi-line variable/enum initialization */
     virtual QCString trInitialValue()
     {
-      return decode( "Početna vrednost:" );
+      return "Početna vrednost:";
     }
     /*! Text used the source code in the file index */
     virtual QCString trCode()
     {
-      return decode( "programski kod" );
+      return "programski kod";
     }
     virtual QCString trGraphicalHierarchy()
     {
-      return decode( "Hijerarhija klasa u obliku grafa" );
+      return "Hijerarhija klasa u obliku grafa";
     }
     virtual QCString trGotoGraphicalHierarchy()
     {
-      return decode( "Prikaz hijerarhije klasa u obliku grafa" );
+      return "Prikaz hijerarhije klasa u obliku grafa";
     }
     virtual QCString trGotoTextualHierarchy()
     {
-      return decode( "Prikaz hijerarhije klasa u obliku nazubljenog teksta" );
+      return "Prikaz hijerarhije klasa u obliku nazubljenog teksta";
     }
     virtual QCString trPageIndex()
     {
-      return decode( "Indeks stranice" );
+      return "Indeks stranice";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -914,50 +896,50 @@ private:
     
     virtual QCString trNote()
     {
-      return decode( "Beleška" ); 
+      return "Beleška"; 
     }
     virtual QCString trPublicTypes()
     {
-      return decode( "Javni tipovi" );
+      return "Javni tipovi";
     }
     virtual QCString trPublicAttribs()
     {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return decode( "Polja" );        
+        return "Polja";        
       }
       else
       {
-        return decode( "Javni članovi" );
+        return "Javni članovi";
       }
     }
     virtual QCString trStaticPublicAttribs()
     {
-      return decode( "Zajednički javni članovi");
+      return "Zajednički javni članovi";
     }
     virtual QCString trProtectedTypes()
     {
-      return decode( "Zaštićeni tipovi" );
+      return "Zaštićeni tipovi";
     }
     virtual QCString trProtectedAttribs()
     {
-      return decode( "Zaštićeni članovi" );
+      return "Zaštićeni članovi";
     }
     virtual QCString trStaticProtectedAttribs()
     {
-      return decode( "Zajednički zaštićeni članovi" );
+      return "Zajednički zaštićeni članovi";
     }
     virtual QCString trPrivateTypes()
     {
-      return decode( "Privatni tipovi" );
+      return "Privatni tipovi";
     }
     virtual QCString trPrivateAttribs()
     {
-      return decode( "Privatni članovi" );
+      return "Privatni članovi";
     }
     virtual QCString trStaticPrivateAttribs()
     {
-      return decode( "Zajednički privatni članovi" );
+      return "Zajednički privatni članovi";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -967,12 +949,12 @@ private:
     /*! Used as a marker that is put before a \\todo item */
     virtual QCString trTodo()
     {
-      return decode( "Uraditi" );
+      return "Uraditi";
     }
     /*! Used as the header of the todo list */
     virtual QCString trTodoList()
     {
-      return decode("Spisak stvari koje treba uraditi");
+      return "Spisak stvari koje treba uraditi";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -981,24 +963,24 @@ private:
 
     virtual QCString trReferencedBy()
     { //! Izbegavanje roda. Uskladjivanje sa trReferences
-      return decode( "Korisnici: " ); 
+      return "Korisnici: "; 
     }
     virtual QCString trRemarks()
     {
-      return decode( "Napomene" );
+      return "Napomene";
     }
     virtual QCString trAttention()
     {
-      return decode( "Pažnja" );
+      return "Pažnja";
     }
     virtual QCString trInclByDepGraph()
     {
-      return decode("Ovaj graf pokazuje koje datoteke direktno "
-      "ili indirektno uključuju ovu datoteku: ");
+      return "Ovaj graf pokazuje koje datoteke direktno "
+             "ili indirektno uključuju ovu datoteku: ";
     }
     virtual QCString trSince()
     {
-      return decode( "Od" );
+      return "Od";
     }
     
 //////////////////////////////////////////////////////////////////////////
@@ -1008,15 +990,15 @@ private:
     /*! title of the graph legend page */
     virtual QCString trLegendTitle()
     {
-      return decode( "Objašnjenje korišćenih simbola" );
+      return "Objašnjenje korišćenih simbola";
     }
     /*! 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 decode(        
-       "Ova stranica objašnjava kako tumačiti grafikone koje je napravio "
+      return
+        "Ova stranica objašnjava kako tumačiti grafikone koje je napravio "
         "doxygen.<p>\n"
         "Na primer:\n"
         "\\code\n"
@@ -1072,12 +1054,12 @@ private:
           " šablona klase od kojeg je primerak napravljen. "
           "Strelica je označena stvarnim argumentima šablona.\n"
         "</ul>\n"
-         );
+        ;
     }
     /*! text for the link to the legend page */
     virtual QCString trLegend()
     {
-      return decode( "Objašnjenje korišćenih simbola" );
+      return "Objašnjenje korišćenih simbola";
     }
     
 //////////////////////////////////////////////////////////////////////////
@@ -1087,12 +1069,12 @@ private:
     /*! Used as a marker that is put before a test item */
     virtual QCString trTest()
     {
-      return decode( "Test" );
+      return "Test";
     }
     /*! Used as the header of the test list */
     virtual QCString trTestList()
     {
-      return decode( "Spisak testova" );
+      return "Spisak testova";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1102,7 +1084,7 @@ private:
     /*! Used as a section header for KDE-2 IDL methods */
     virtual QCString trDCOPMethods()
     {
-      return decode( "DCOP metode" );
+      return "DCOP metode";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1112,12 +1094,12 @@ private:
     /*! Used as a section header for IDL properties */
     virtual QCString trProperties()
     {
-      return decode( "Osobine" );
+      return "Osobine";
     }
     /*! Used as a section header for IDL property documentation */
     virtual QCString trPropertyDocumentation()
     {
-      return decode( "Dokumentacija osobina" );
+      return "Dokumentacija osobina";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1129,11 +1111,11 @@ private:
     {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return decode( "Strukture i unije" );
+        return "Strukture i unije";
       }
       else
       {
-        return decode( "Klase" );
+        return "Klase";
       }
     }
     /*! Used as the title of a Java package */
@@ -1144,22 +1126,22 @@ private:
     /*! Title of the package index page */
     virtual QCString trPackageList()
     {
-      return decode( "Spisak paketa" );
+      return "Spisak paketa";
     }
     /*! The description of the package index page */
     virtual QCString trPackageListDescription()
     {
-      return decode( "Paketi s kratkim opisom (ukoliko postoji):" );
+      return "Paketi s kratkim opisom (ukoliko postoji):";
     }
     /*! The link name in the Quick links header for each page */
     virtual QCString trPackages()
     {
-      return decode( "Paketi" );
+      return "Paketi";
     }
     /*! Text shown before a multi-line define */
     virtual QCString trDefineValue()
     {
-      return decode( "Vrednost:" );
+      return "Vrednost:";
     }
     
 //////////////////////////////////////////////////////////////////////////
@@ -1169,12 +1151,12 @@ private:
     /*! Used as a marker that is put before a \\bug item */
     virtual QCString trBug()
     {
-      return decode( "Greška" );
+      return "Greška";
     }
     /*! Used as the header of the bug list */
     virtual QCString trBugList()
     {
-      return decode( "Spisak grešaka" );
+      return "Spisak grešaka";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1223,7 +1205,7 @@ private:
     /*! Used as header RTF general index */
     virtual QCString trRTFGeneralIndex()
     {
-      return decode( "Sadržaj" );
+      return "Sadržaj";
     }
    
     /*! This is used for translation of the word that will possibly
@@ -1234,7 +1216,7 @@ private:
     { 
       QCString result( (first_capital ? "Klas" : "klas") );
       result+= (singular ? "a" : "e");
-      return decode( result ); 
+      return result; 
     }
 
     /*! This is used for translation of the word that will possibly
@@ -1245,7 +1227,7 @@ private:
     { 
       QCString result((first_capital ? "Datotek" : "datotek"));
       result+= (singular ? "a" : "e");
-      return decode( result ); 
+      return result; 
     }
 
     /*! This is used for translation of the word that will possibly
@@ -1257,7 +1239,7 @@ private:
       QCString result((first_capital ? "Prostor" : "prostor"));
       result += (singular ? "" : "i"); 
       result += " imena";
-      return decode( result ); 
+      return result; 
     }
 
     /*! This is used for translation of the word that will possibly
@@ -1268,7 +1250,7 @@ private:
     { 
       QCString result((first_capital ? "Grup" : "grup"));
       result+= (singular ? "a" : "e");
-      return decode( result ); 
+      return result; 
     }
 
     /*! This is used for translation of the word that will possibly
@@ -1279,7 +1261,7 @@ private:
     { 
       QCString result((first_capital ? "Stran" : "stran"));
       result+= (singular ? "a" : "e");
-      return decode( result ); 
+      return result; 
     }
 
     /*! This is used for translation of the word that will possibly
@@ -1290,7 +1272,7 @@ private:
     { 
       QCString result((first_capital ? "Član" : "član"));
       result+= (singular ? "" : "ovi");
-      return decode( result ); 
+      return result; 
     }
    
     /*! This is used for translation of the word that will possibly
@@ -1301,7 +1283,7 @@ private:
     { 
       QCString result((first_capital ? "Globalni " : "globalni "));
       result+= (singular ? "podatak" : "podaci");
-      return decode( result ); 
+      return result; 
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1314,7 +1296,7 @@ private:
     {                                                                         
       QCString result((first_capital ? "Autor" : "autor"));
       result+= (singular ? "" : "i");
-      return decode( result ); 
+      return result; 
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1325,7 +1307,7 @@ private:
      */
     virtual QCString trReferences()
     {
-      return decode( "Koristi" );
+      return "Koristi";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1337,7 +1319,7 @@ private:
      */
     virtual QCString trImplementedFromList(int numEntries)
     { //! "Definiše" je previše kratko, ispada sa de definišu same apstraktne klase
-      return decode( "Definiše apstraktnu funkciju deklarisanu u "+trWriteList(numEntries)+"." );
+      return "Definiše apstraktnu funkciju deklarisanu u ";
     }
 
     /*! used in member documentation blocks to produce a list of
@@ -1345,7 +1327,7 @@ private:
      */
     virtual QCString trImplementedInList(int numEntries)
     { //! Izbegavanje roda
-      return decode( "Definicija u " + trWriteList(numEntries) + "." );
+      return "Definicija u ";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1357,7 +1339,7 @@ private:
          */
     virtual QCString trRTFTableOfContents()
      {
-      return decode( "Sadržaj" );
+      return "Sadržaj";
      }
      
 //////////////////////////////////////////////////////////////////////////
@@ -1369,7 +1351,7 @@ private:
      */
     virtual QCString trDeprecatedList()
     {
-      return decode( "Spisak zastarelih stvari" );
+      return "Spisak zastarelih stvari";
     } 
 
 //////////////////////////////////////////////////////////////////////////
@@ -1381,12 +1363,12 @@ private:
      */
     virtual QCString trEvents()
     {
-      return decode( "Događaji" );
+      return "Događaji";
     }
     /*! Header used for the documentation section of a class' events. */
     virtual QCString trEventDocumentation()
     {
-      return decode( "Dokumentacija događaja" );
+      return "Dokumentacija događaja";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1397,35 +1379,35 @@ private:
      */
     virtual QCString trPackageTypes()
     { 
-      return decode( "Tipovi u paketu" );
+      return "Tipovi u paketu";
     }
     /*! Used as a heading for a list of Java class functions with package 
      * scope. 
      */
     virtual QCString trPackageMembers()
     { 
-      return decode( "Funkcije u paketu" );
+      return "Funkcije u paketu";
     }
     /*! Used as a heading for a list of static Java class functions with 
      *  package scope.
      */
     virtual QCString trStaticPackageMembers()
     { 
-      return decode( "Statičke funkcije u paketu" );  // Zajednicke funkcije u paketu
+      return "Statičke funkcije u paketu";  // Zajednicke funkcije u paketu
     }
     /*! Used as a heading for a list of Java class variables with package 
      * scope.
      */
     virtual QCString trPackageAttribs()
     { 
-      return decode( "Atributi u paketu" ); // Clanovi u paketu
+      return "Atributi u paketu"; // Clanovi u paketu
     }
     /*! Used as a heading for a list of static Java class variables with 
      * package scope.
      */
     virtual QCString trStaticPackageAttribs()
     { 
-      return decode( "Statički atributi u paketu" );  // Zajednicki clanovi u paketu
+      return "Statički atributi u paketu";  // Zajednicki clanovi u paketu
     }
     
 //////////////////////////////////////////////////////////////////////////
@@ -1437,12 +1419,12 @@ private:
      */
     virtual QCString trAll()
     {
-      return decode( "Sve" );
+      return "Sve";
     }
     /*! Put in front of the call graph for a function. */
     virtual QCString trCallGraph()
     {
-      return decode( "Graf poziva iz ove funkcije:" );
+      return "Graf poziva iz ove funkcije:";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1455,14 +1437,14 @@ private:
      */
     virtual QCString trSearchForIndex()
     {
-      return decode("Traži");
+      return "Traži";
     }
     /*! This string is used as the title for the page listing the search
      *  results.
      */
     virtual QCString trSearchResultsTitle()
     {
-      return decode( "Rezultati pretraživanja" );
+      return "Rezultati pretraživanja";
     }
     /*! This string is put just before listing the search results. The
      *  text can be different depending on the number of documents found.
@@ -1476,16 +1458,16 @@ private:
     {
       if (numDocuments==0)
       {
-        return decode("Nema dokumenata koji odgovaraju Vašem upitu.");
+        return "Nema dokumenata koji odgovaraju Vašem upitu.";
       }
       else if (numDocuments==1)
-      { return decode("Nađen je <b>1</b> dokument koji odgovara vašem upitu."); }
+      { return "Nađen je <b>1</b> dokument koji odgovara vašem upitu."; }
       else if (numDocuments<5) 
-      { return decode("Nađena su <b>$num</b> dokumenta koji odgovaraju vašem upitu."
-                    "Najbolji su prikazani prvi."); }
+      { return "Nađena su <b>$num</b> dokumenta koji odgovaraju vašem upitu."
+               " Najbolji su prikazani prvi."; }
       else
-      { return decode("Nađeno je <b>$num</b> dokumenata koji odgovaraju vašem upitu."
-        "Najbolji su prikazani prvi.");
+      { return "Nađeno je <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 
@@ -1493,7 +1475,7 @@ private:
      */
     virtual QCString trSearchMatches()
     {
-      return decode( "Pronađeno:" );
+      return "Pronađeno:";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1504,7 +1486,7 @@ private:
      */
     virtual QCString trSourceFile(QCString& filename)
     {
-      return decode( "Izvorni kod datoteke " + filename ) ;
+      return "Izvorni kod datoteke " + filename;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1515,33 +1497,31 @@ private:
      *  hierarchy.
      */
     virtual QCString trDirIndex()
-    { return decode( "Hijerarhija direktorijuma" ); }
+    { return "Hijerarhija direktorijuma"; }
 
     /*! This is used as the name of the chapter containing the documentation
      *  of the directories.
      */
     virtual QCString trDirDocumentation()
-    { return decode( "Dokumentacija direktorijuma" ); }
+    { return "Dokumentacija direktorijuma"; }
 
     /*! This is used as the title of the directory index and also in the
      *  Quick links of a HTML page, to link to the directory hierarchy.
      */
     virtual QCString trDirectories()
-    { return decode( "Direktorijumi" ); }
+    { return "Direktorijumi"; }
 
     /*! This returns a sentences that introduces the directory hierarchy. 
      *  and the fact that it is sorted alphabetically per level
      */
     virtual QCString trDirDescription()
-    { return decode( "Hijerarhija direktorijuma uređena približno "
-                     "po abecedi:" );
-    }
+    { return "Hijerarhija direktorijuma uređena približno po abecedi:"; }
 
     /*! This returns the title of a directory page. The name of the
      *  directory is passed via \a dirName.
      */
     virtual QCString trDirReference(const char *dirName)
-    { QCString result=dirName; result+="Opis direktorijuma"; return decode( result ); }
+    { QCString result=dirName; result+="Opis direktorijuma"; return result; }
 
     /*! This returns the word directory with or without starting capital
      *  (\a first_capital) and in sigular or plural form (\a singular).
@@ -1550,7 +1530,7 @@ private:
     { 
       QCString result((first_capital ? "Direktorijum" : "direktorijum"));
       if (!singular) result+="i"; 
-      return decode( result ); 
+      return result; 
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1562,8 +1542,8 @@ private:
      */
     virtual QCString trOverloadText()
     {
-       return decode ( "Ovo je funkcija prekopljenog imena, razlikuje se "
-              "od gore navedene samo po argumentima koje prihvata." );
+       return "Ovo je funkcija prekopljenog imena, razlikuje se "
+              "od gore navedene samo po argumentima koje prihvata.";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1573,14 +1553,14 @@ private:
     /*! This is used to introduce a caller (or called-by) graph */
     virtual QCString trCallerGraph()
     { //! Možda je bolje "Graf pozivalaca ove funkcije"
-      return decode( "Graf funkcija koje pozivaju ovu funkciju:" );
+      return "Graf funkcija koje pozivaju ovu funkciju:";
     }
 
     /*! This is used in the documentation of a file/namespace before the list 
      *  of documentation blocks for enumeration values
      */
     virtual QCString trEnumerationValueDocumentation()
-    { return decode( "Dokumentacija enum vrednosti" ); }
+    { return "Dokumentacija enum vrednosti"; }
 
 //////////////////////////////////////////////////////////////////////////
 // new since 1.5.4 (mainly for Fortran)
@@ -1789,17 +1769,17 @@ private:
 
 //      /*! This is put above each page as a link to the list of all verbatim headers */
 //     virtual QCString trHeaderFiles()
-//     { return decode( "Zaglavlja" ); }
+//     { return "Zaglavlja"; }
 // 
 //     /*! This is an introduction to the page with the list of all header files. */
 //     virtual QCString trHeaderFilesDescription()
-//     { return decode( "Zaglavlja koje izgraduju API:" ); }
+//     { return "Zaglavlja koje izgraduju API:"; }
 // 
 //     /*! This sentences is used in the annotated class/file lists if no brief
 //      * description is given. 
 //      */
 //     virtual QCString trNoDescriptionAvailable()
-//     { return decode( "Opis nije dostupan" ); }
+//     { return "Opis nije dostupan"; }
 //     
 //     /*! this text is generated when the \\reimp command is used. */
 //     virtual QCString trReimplementedForInternalReasons()
@@ -1807,7 +1787,7 @@ private:
 // 
 //     /*! this text is generated when the \\bug command is used. */
 //     virtual QCString trBugsAndLimitations()
-//     { return decode( "Greske i ogranicenja" ); }
+//     { return "Greske i ogranicenja"; }
 // 
 //     virtual QCString trSources()
 //     {
@@ -1817,13 +1797,13 @@ private:
 //     /*! Used for Java interfaces in the summary section of Java packages */
 //     virtual QCString trInterfaces()
 //     {
-//       return decode( "Interfejsi" );  //!< Radna okruzenja. Ali to je dve reci.
+//       return "Interfejsi";  //!< Radna okruzenja. Ali to je dve reci.
 //     }
 // 
 //     /*! Used as a chapter title for Latex & RTF output */
 //     virtual QCString trPackageDocumentation()
 //     {
-//       return decode( "Dokumentacija paketa" );
+//       return "Dokumentacija paketa";
 //     }
 //  
 //     /*! This is used for translation of the word that will possibly
@@ -1834,7 +1814,7 @@ private:
 //     { 
 //       QCString result((first_capital ? "Polj" : "polj"));
 //       result+= (singular ? "e" : "a");
-//       return decode( result ); 
+//       return result; 
 //     }
 
 };
diff --git a/src/translator_sv.h b/src/translator_sv.h
index b6bb3d7..35baf88 100644
--- a/src/translator_sv.h
+++ b/src/translator_sv.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,8 +17,8 @@
 
 /*
 ==================================================================================
-Svensk �vers�ttning av:
-Samuel H�gglund      <sahag96@ite.mh.se>
+Svensk översättning av:
+Samuel Hägglund      <sahag96@ite.mh.se>
 Xet Erixon           <xet@xeqt.com>
 Mikael Hallin        <mikaelhallin@yahoo.se>           2003-07-28
 ==================================================================================
@@ -26,17 +26,17 @@ Uppdateringar.
 1999/04/29
 *  Omskrivningar av en hel del ordval, t.ex.
    ENG                  INNAN          EFTER
-   compound             inh�ngnad      sammansatt
+   compound             inhängnad      sammansatt
    structs              structs        strukter
    unions               unions         unioner
 
    osv...
 
-*  Alla �vers�ttnings-str�ngar returnerar i alla fall en n�got s� n�r vettig
-   f�rklaring...
+*  Alla översättnings-strängar returnerar i alla fall en något så när vettig
+   förklaring...
 
 1999/05/27
-*  Det verkade som vi gl�mt en del mellanslag i vissa str�ngar vilket resulterade
+*  Det verkade som vi glömt en del mellanslag i vissa strängar vilket resulterade
    i att en del ord blev ihopskrivna.
 
 *  Bytt en del ordval igen...
@@ -44,26 +44,26 @@ Uppdateringar.
    reference manual          Uppslagsbok    referensmanual
 
 *  Skrivit ihop en del ord som innan hade bindestreck
-*  En del nya �vers�ttningar �r tillagda.
-*  Gamla �vers�ttningar borttagna
+*  En del nya översättningar är tillagda.
+*  Gamla översättningar borttagna
 
 ===================================================================================
 Problem!
-   Slot: n�n hygglig svensk �vers�ttning???
+   Slot: nån hygglig svensk översättning???
 
-   Skicka g�rna synpunkter.
+   Skicka gärna synpunkter.
 ===================================================================================
 1999/09/01
-*  Det verkar som om "namnrymd" �r en hyggligt vedertagen svensk �vers�ttning
-   av "namespace", s� jag k�r med det fr�n och med nu.
-*  "interface" heter numera "gr�nssnitt"
+*  Det verkar som om "namnrymd" är en hyggligt vedertagen svensk översättning
+   av "namespace", så jag kör med det från och med nu.
+*  "interface" heter numera "gränssnitt"
 
 2003/07/28
-*  Jag har updaterat �vers�ttningen efter ett par �rs tr�da..
+*  Jag har updaterat översättningen efter ett par års träda..
 Problem!
-   Deprecated: n�n hygglig svensk �vers�ttning???
+   Deprecated: nån hygglig svensk översättning???
 
-   Skicka g�rna synpunkter.
+   Skicka gärna synpunkter.
 */
 
 #ifndef TRANSLATOR_SE_H
@@ -76,9 +76,9 @@ class TranslatorSwedish : public TranslatorAdapter_1_6_0
     virtual QCString idLanguage()
     { return "swedish"; }
 
-    /*! 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
@@ -86,7 +86,7 @@ class TranslatorSwedish : 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.
      */
@@ -98,14 +98,14 @@ class TranslatorSwedish : public TranslatorAdapter_1_6_0
     /*! return the language charset. This will be used for the HTML output */
     virtual QCString idLanguageCharset()
     {
-      return "iso-8859-1";
+      return "utf-8";
     }
 
     virtual QCString trRelatedFunctions()
-    { return "Besl�ktade funktioner"; }
+    { return "Besläktade funktioner"; }
 
     virtual QCString trRelatedSubscript()
-    { return "(Observera att dessa inte �r medlemsfunktioner)"; }
+    { return "(Observera att dessa inte är medlemsfunktioner)"; }
 
     virtual QCString trDetailedDescription()
     { return "Detaljerad beskrivning"; }
@@ -114,7 +114,7 @@ class TranslatorSwedish : public TranslatorAdapter_1_6_0
     { return "Dokumentation av typdefinierade medlemmar"; }
 
     virtual QCString trMemberEnumerationDocumentation()
-    { return "Dokumentation av egenuppr�knande medlemmar"; }
+    { return "Dokumentation av egenuppräknande medlemmar"; }
 
     virtual QCString trMemberFunctionDocumentation()
     { return "Dokumentation av medlemsfunktioner"; }
@@ -123,7 +123,7 @@ class TranslatorSwedish : public TranslatorAdapter_1_6_0
     {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "F�lt dokumentation"; 
+        return "Fält dokumentation";
       }
       else
       {
@@ -135,21 +135,21 @@ class TranslatorSwedish : public TranslatorAdapter_1_6_0
     { return "Mer..."; }
 
     virtual QCString trListOfAllMembers()
-    { return "Lista �ver alla medlemmar"; }
+    { return "Lista över alla medlemmar"; }
 
     virtual QCString trMemberList()
     { return "Medlemslista"; }
 
     virtual QCString trThisIsTheListOfAllMembers()
-    { return "Det h�r �r en fullst�ndig lista �ver medlemmar f�r "; }
+    { return "Det här är en fullständig lista över medlemmar för "; }
 
     virtual QCString trIncludingInheritedMembers()
-    { return " med alla �rvda medlemmar."; }
+    { return " med alla ärvda medlemmar."; }
 
     virtual QCString trGeneratedAutomatically(const char *s)
     { QCString result="Automatiskt skapad av Doxygen";
-      if (s) result+=(QCString)" f�r "+s;
-      result+=" fr�n k�llkoden."; 
+      if (s) result+=(QCString)" för "+s;
+      result+=" från källkoden.";
       return result;
     }
 
@@ -157,14 +157,14 @@ class TranslatorSwedish : public TranslatorAdapter_1_6_0
     { return "enum namn"; }
 
     virtual QCString trEnumValue()
-    { return "enum v�rde"; }
+    { return "enum värde"; }
 
     virtual QCString trDefinedIn()
     { return "definierad i"; }
 
 /*
     QCString trVerbatimText(const char *f)
-    { return (QCString)"Detta �r den ordagranna texten fr�n inkluderingsfilen "+f; }
+    { return (QCString)"Detta är den ordagranna texten från inkluderingsfilen "+f; }
 */
     virtual QCString trModules()
     { return "Moduler"; }
@@ -191,7 +191,7 @@ class TranslatorSwedish : public TranslatorAdapter_1_6_0
     {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Data f�lt"; 
+        return "Data fält";
       }
       else
       {
@@ -200,10 +200,10 @@ class TranslatorSwedish : public TranslatorAdapter_1_6_0
     }
 
     virtual QCString trFileMembers()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Globala symboler"; 
+        return "Globala symboler";
       }
       else
       {
@@ -212,78 +212,78 @@ class TranslatorSwedish : public TranslatorAdapter_1_6_0
     }
 
     virtual QCString trRelatedPages()
-    { return "Besl�ktade sidor"; }
+    { return "Besläktade sidor"; }
 
     virtual QCString trExamples()
     { return "Exempel"; }
 
     virtual QCString trSearch()
-    { return "S�k"; }
+    { return "Sök"; }
 
     virtual QCString trClassHierarchyDescription()
-    { return "Denna lista �ver arv �r grovt, men inte helt, "
+    { return "Denna lista över arv är grovt, men inte helt, "
              "sorterad i alfabetisk ordning:";
     }
 
     virtual QCString trFileListDescription(bool extractAll)
     {
-      QCString result="H�r f�ljer en lista �ver alla ";
+      QCString result="Här följer en lista över alla ";
       if (!extractAll) result+="dokumenterade ";
       result+="filer, med en kort beskrivning:";
       return result;
     }
 
     virtual QCString trCompoundListDescription()
-    { 
-      
+    {
+
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "H�r f�ljer datastrukturerna med korta beskrivningar:";
+        return "Här följer datastrukturerna med korta beskrivningar:";
       }
       else
       {
-        return "H�r f�ljer klasserna, strukterna, unionerna och "
-               "gr�nssnitten med korta beskrivningar:"; 
+        return "Här följer klasserna, strukterna, unionerna och "
+               "gränssnitten med korta beskrivningar:";
       }
     }
 
     /*! This is an introduction to the page with all class members. */
     virtual QCString trCompoundMembersDescription(bool extractAll)
     {
-      QCString result="H�r �r en lista �ver alla ";
+      QCString result="Här är en lista över alla ";
       if (!extractAll)
       {
         result+="dokumenterade ";
       }
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        result+="struktur- och unions-f�lt";
+        result+="struktur- och unions-fält";
       }
       else
       {
         result+="klassmedlemmar";
       }
-      result+=" med l�nkar till ";
-      if (!extractAll) 
+      result+=" med länkar till ";
+      if (!extractAll)
       {
         if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
         {
-          result+="struktur/unions-dokumentationen f�r varje f�lt:";
+          result+="struktur/unions-dokumentationen för varje fält:";
         }
         else
         {
-          result+="klassdokumentationen f�r varje medlem:";
+          result+="klassdokumentationen för varje medlem:";
         }
       }
-      else 
+      else
       {
         if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
         {
-          result+=" strukturerna/unionerna de tillh�r:";
+          result+=" strukturerna/unionerna de tillhör:";
         }
         else
         {
-          result+="klasserna de tillh�r:";
+          result+="klasserna de tillhör:";
         }
       }
       return result;
@@ -291,7 +291,7 @@ class TranslatorSwedish : public TranslatorAdapter_1_6_0
 
     virtual QCString trFileMembersDescription(bool extractAll)
     {
-      QCString result="H�r f�ljer en lista �ver alla ";
+      QCString result="Här följer en lista över alla ";
       if (!extractAll) result+="dokumenterade ";
 
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
@@ -303,22 +303,22 @@ class TranslatorSwedish : public TranslatorAdapter_1_6_0
       {
         result+= "filmedlemmar";
       }
-      result+= " med l�nkar till ";
+      result+= " med länkar till ";
       if (extractAll)
-        result+= "filerna som de tillh�r:";
+        result+= "filerna som de tillhör:";
       else
         result+= "dokumentationen:";
       return result;
     }
 
     virtual QCString trExamplesDescription()
-    { return "H�r f�ljer en lista med alla exempel:"; }
+    { return "Här följer en lista med alla exempel:"; }
 
     virtual QCString trRelatedPagesDescription()
-    { return "H�r f�ljer en lista �ver alla besl�ktade dokumentationssidor:";}
+    { return "Här följer en lista över alla besläktade dokumentationssidor:";}
 
     virtual QCString trModulesDescription()
-    { return "H�r f�ljer en lista �ver alla moduler:"; }
+    { return "Här följer en lista över alla moduler:"; }
 
     virtual QCString trDocumentation()
     { return "Dokumentation"; }
@@ -335,9 +335,9 @@ class TranslatorSwedish : public TranslatorAdapter_1_6_0
     virtual QCString trCompoundIndex()
     {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) {
-        return "Index �ver datastrukturer";
+        return "Index över datastrukturer";
       } else {
-        return "Index �ver sammensatta typer";
+        return "Index över sammensatta typer";
       }
     }
 
@@ -345,28 +345,28 @@ class TranslatorSwedish : public TranslatorAdapter_1_6_0
     { return "Filindex"; }
 
     virtual QCString trModuleDocumentation()
-    { return "Dokumentation �ver moduler"; }
+    { return "Dokumentation över moduler"; }
 
     /*! This is used in LaTeX as the title of the chapter containing
      *  the documentation of all classes, structs and unions.
      */
     virtual QCString trClassDocumentation()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Dokumentation �ver datastrukturer";
+        return "Dokumentation över datastrukturer";
       }
       else
       {
-        return "Documentation �ver klasser";
+        return "Documentation över klasser";
       }
     }
 
     virtual QCString trFileDocumentation()
-    { return "Dokumentation �ver filer"; }
+    { return "Dokumentation över filer"; }
 
     virtual QCString trExampleDocumentation()
-    { return "Dokumentation �ver exempel"; }
+    { return "Dokumentation över exempel"; }
 
     virtual QCString trPageDocumentation()
     { return "Dokumentation av sidor"; }
@@ -381,52 +381,52 @@ class TranslatorSwedish : public TranslatorAdapter_1_6_0
     virtual QCString trTypedefs()
     { return "Typdefinitioner"; }
     virtual QCString trEnumerations()
-    { return "Egenuppr�knande typer"; }
+    { return "Egenuppräknande typer"; }
     virtual QCString trFunctions()
     { return "Funktioner"; }
     virtual QCString trVariables()
     { return "Variabler"; }
 
     virtual QCString trEnumerationValues()
-    { return "Egenuppr�knade typers v�rden"; }
+    { return "Egenuppräknade typers värden"; }
 
     virtual QCString trDefineDocumentation()
-    { return "Dokumentation �ver definitioner"; }
+    { return "Dokumentation över definitioner"; }
 
     virtual QCString trFunctionPrototypeDocumentation()
-    { return "Dokumentation �ver funktionsprototyper"; }
+    { return "Dokumentation över funktionsprototyper"; }
 
     virtual QCString trTypedefDocumentation()
-    { return "Dokumentation �ver typdefinitioner"; }
+    { return "Dokumentation över typdefinitioner"; }
 
     virtual QCString trEnumerationTypeDocumentation()
-    { return "Dokumentation �ver egenuppr�knande typer"; }
+    { return "Dokumentation över egenuppräknande typer"; }
 
     virtual QCString trFunctionDocumentation()
-    { return "Dokumentation �ver funktioner"; }
+    { return "Dokumentation över funktioner"; }
 
     virtual QCString trVariableDocumentation()
-    { return "Dokumentation �ver variabler"; }
+    { return "Dokumentation över variabler"; }
 
-    /*! 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 "Datastrukturer";
       }
       else
       {
-        return "Sammans�ttning";
+        return "Sammansättning";
       }
     }
 
     virtual QCString trGeneratedAt(const char *date,const char *projName)
     {
       QCString result=(QCString)"Skapad "+date;
-      if (projName) result+=(QCString)" f�r "+projName;
+      if (projName) result+=(QCString)" för "+projName;
       result+=(QCString)" av";
       return result;
     }
@@ -438,11 +438,11 @@ class TranslatorSwedish : public TranslatorAdapter_1_6_0
 
     virtual QCString trClassDiagram(const char *clName)
     {
-      return (QCString)"Klassdiagram f�r "+clName;
+      return (QCString)"Klassdiagram för "+clName;
     }
 
     virtual QCString trForInternalUseOnly()
-    { return "Endast f�r internt bruk."; }
+    { return "Endast för internt bruk."; }
 
     virtual QCString trWarning()
     { return "Varning"; }
@@ -457,7 +457,7 @@ class TranslatorSwedish : public TranslatorAdapter_1_6_0
     { return "Returnerar"; }
 
     virtual QCString trSeeAlso()
-    { return "Se �ven"; }
+    { return "Se även"; }
 
     virtual QCString trParameters()
     { return "Parametrar"; }
@@ -475,21 +475,21 @@ class TranslatorSwedish : public TranslatorAdapter_1_6_0
 
     virtual QCString trNamespaceListDescription(bool extractAll)
     {
-      QCString result="H�r �r en lista �ver alla ";
+      QCString result="Här är en lista över alla ";
       if (!extractAll) result+="dokumenterade ";
       result+="namnrymder med en kort beskrivning:";
       return result;
     }
 
     virtual QCString trFriends()
-    { return "V�nner"; }
+    { return "Vänner"; }
 
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990405
 //////////////////////////////////////////////////////////////////////////
 
     virtual QCString trRelatedFunctionDocumentation()
-    { return "V�nners och besl�ktade funktioners dokumentation"; }
+    { return "Vänners och besläktade funktioners dokumentation"; }
 
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990425
@@ -505,7 +505,7 @@ class TranslatorSwedish : public TranslatorAdapter_1_6_0
         case ClassDef::Class:  result+=" klass"; break;
         case ClassDef::Struct: result+=" strukt"; break;
         case ClassDef::Union:  result+=" union"; break;
-        case ClassDef::Interface:  result+=" gr�nssnitt"; break;
+        case ClassDef::Interface:  result+=" gränssnitt"; break;
         case ClassDef::Protocol:   result+=" protocol"; break; // translate me!
         case ClassDef::Category:   result+=" category"; break; // translate me!
         case ClassDef::Exception:  result+=" undantag"; break;
@@ -580,38 +580,38 @@ class TranslatorSwedish : public TranslatorAdapter_1_6_0
       // used in class documentation to produce a list of base classes,
       // if class diagrams are disabled.
     {
-      return "�rver "+trWriteList(numEntries)+".";
+      return "Ärver "+trWriteList(numEntries)+".";
     }
     virtual QCString trInheritedByList(int numEntries)
       // used in class documentation to produce a list of super classes,
       // if class diagrams are disabled.
     {
-      return "�rvd av "+trWriteList(numEntries)+".";
+      return "Ärvd av "+trWriteList(numEntries)+".";
     }
     virtual QCString trReimplementedFromList(int numEntries)
       // used in member documentation blocks to produce a list of
       // members that are hidden by this one.
     {
-      return "�terskapad fr�n "+trWriteList(numEntries)+".";
+      return "Återskapad från "+trWriteList(numEntries)+".";
     }
     virtual QCString trReimplementedInList(int numEntries)
     {
       // used in member documentation blocks to produce a list of
       // all member that overwrite the implementation of this member.
-      return "�terskapad i "+trWriteList(numEntries)+".";
+      return "Återskapad i "+trWriteList(numEntries)+".";
     }
 
     virtual QCString trNamespaceMembers()
     { return "Namnrymdsmedlemmar"; }
     virtual QCString trNamespaceMemberDescription(bool extractAll)
     {
-      QCString result="H�r �r en lista �ver alla ";
+      QCString result="Här är en lista över alla ";
       if (!extractAll) result+="dokumenterade ";
-      result+="namnrymdsmedlemmar med l�nkar till ";
+      result+="namnrymdsmedlemmar med länkar till ";
       if (extractAll)
-        result+=" namnrymd-dokumentationen f�r varje medlem:";
+        result+=" namnrymd-dokumentationen för varje medlem:";
       else
-        result+="de namnrymder de tillh�r:";
+        result+="de namnrymder de tillhör:";
       return result;
     }
 
@@ -641,19 +641,19 @@ class TranslatorSwedish : public TranslatorAdapter_1_6_0
         bool single)
     { // here s is one of " Class", " Struct" or " Union"
       // single is true implies a single file
-      QCString result=(QCString)"Dokumentationen f�r ";
+      QCString result=(QCString)"Dokumentationen för ";
       switch(compType)
       {
         case ClassDef::Class:      result+="denna klass "; break;
         case ClassDef::Struct:     result+="denna strukt "; break;
         case ClassDef::Union:      result+="denna union "; break;
-        case ClassDef::Interface:  result+="detta gr�nssnitt "; break;
+        case ClassDef::Interface:  result+="detta gränssnitt "; break;
         case ClassDef::Protocol:   result+="protocol"; break; // translate me!
         case ClassDef::Category:   result+="category"; break; // translate me!
         case ClassDef::Exception:  result+="detta undantag "; break;
         default: break;
       }
-      result+="var genererad fr�n f�ljande fil";
+      result+="var genererad från följande fil";
       if (single) result+=":"; else result+="er:";
       return result;
     }
@@ -671,14 +671,14 @@ class TranslatorSwedish : public TranslatorAdapter_1_6_0
 
     /*! This is used as the heading text for the retval command. */
     virtual QCString trReturnValues()
-    { return "Returv�rden"; }
+    { return "Returvärden"; }
 
     /*! This is in the (quick) index as a link to the main page (index.html)
      */
     virtual QCString trMainPage()
     { return "Huvudsida"; }
 
-    /*! 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()
@@ -690,7 +690,7 @@ class TranslatorSwedish : public TranslatorAdapter_1_6_0
 
     virtual QCString trDefinedAtLineInSourceFile()
     {
-      return "Definition p� rad @0 i filen @1.";
+      return "Definition på rad @0 i filen @1.";
     }
     virtual QCString trDefinedInSourceFile()
     {
@@ -703,7 +703,7 @@ class TranslatorSwedish : public TranslatorAdapter_1_6_0
 
     virtual QCString trDeprecated()
     {
-      return "F�r�ldrad";
+      return "Föråldrad";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -713,37 +713,37 @@ class TranslatorSwedish : public TranslatorAdapter_1_6_0
     /*! this text is put before a collaboration diagram */
     virtual QCString trCollaborationDiagram(const char *clName)
     {
-      return (QCString)"Samarbetsdiagram f�r "+clName+":";
+      return (QCString)"Samarbetsdiagram för "+clName+":";
     }
-    
+
     /*! this text is put before an include dependency graph */
     virtual QCString trInclDepGraph(const char *fName)
     {
-      return (QCString)"Include-beroendediagram f�r "+fName+":";
+      return (QCString)"Include-beroendediagram för "+fName+":";
     }
-    
+
     /*! header that is put before the list of constructor/destructors. */
     virtual QCString trConstructorDocumentation()
     {
-      return "Dokumentation av konstruktorer och destruktorer"; 
+      return "Dokumentation av konstruktorer och destruktorer";
     }
 
     /*! Used in the file documentation to point to the corresponding sources. */
     virtual QCString trGotoSourceCode()
     {
-      return "G� till denna fils k�llkod.";
+      return "Gå till denna fils källkod.";
     }
 
     /*! Used in the file sources to point to the corresponding documentation. */
     virtual QCString trGotoDocumentation()
     {
-      return "G� till denna fils dokumentation.";
+      return "Gå till denna fils dokumentation.";
     }
 
     /*! Text for the \\pre command */
     virtual QCString trPrecondition()
     {
-      return "F�rhandsvillkor";
+      return "Förhandsvillkor";
     }
 
     /*! Text for the \\post command */
@@ -761,12 +761,12 @@ class TranslatorSwedish : public TranslatorAdapter_1_6_0
     /*! Text shown before a multi-line variable/enum initialization */
     virtual QCString trInitialValue()
     {
-      return "Begynnelsev�rde:";
+      return "Begynnelsevärde:";
     }
     /*! Text used the source code in the file index */
     virtual QCString trCode()
     {
-      return "k�llkod";
+      return "källkod";
     }
 
     virtual QCString trGraphicalHierarchy()
@@ -775,21 +775,21 @@ class TranslatorSwedish : public TranslatorAdapter_1_6_0
     }
     virtual QCString trGotoGraphicalHierarchy()
     {
-      return "G� till den grafiska klasshierarkin";
+      return "Gå till den grafiska klasshierarkin";
     }
     virtual QCString trGotoTextualHierarchy()
     {
-      return "G� till den textbaserade klasshierarkin";
+      return "Gå till den textbaserade klasshierarkin";
     }
     virtual QCString trPageIndex()
     {
       return "Sidindex";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.1.0
 //////////////////////////////////////////////////////////////////////////
-    
+
     virtual QCString trNote()
     {
       return "Notera";
@@ -802,7 +802,7 @@ class TranslatorSwedish : public TranslatorAdapter_1_6_0
     {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Dataf�lt";
+        return "Datafält";
       }
       else
       {
@@ -845,12 +845,12 @@ class TranslatorSwedish : public TranslatorAdapter_1_6_0
     /*! Used as a marker that is put before a \\todo item */
     virtual QCString trTodo()
     {
-      return "Att-g�ra";
+      return "Att-göra";
     }
     /*! Used as the header of the todo list */
     virtual QCString trTodoList()
     {
-      return "Att-g�ra lista";
+      return "Att-göra lista";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -863,7 +863,7 @@ class TranslatorSwedish : public TranslatorAdapter_1_6_0
     }
     virtual QCString trRemarks()
     {
-      return "L�gg m�rke till";
+      return "Lägg märke till";
     }
     virtual QCString trAttention()
     {
@@ -871,7 +871,7 @@ class TranslatorSwedish : public TranslatorAdapter_1_6_0
     }
     virtual QCString trInclByDepGraph()
     {
-      return "Den h�r grafen visar vilka filer som direkt eller "
+      return "Den här grafen visar vilka filer som direkt eller "
 	      "indirekt inkluderar denna filen.";
     }
     virtual QCString trSince()
@@ -886,36 +886,36 @@ class TranslatorSwedish : public TranslatorAdapter_1_6_0
     /*! title of the graph legend page */
     virtual QCString trLegendTitle()
     {
-      return "Graff�rklaring";
+      return "Grafförklaring";
     }
 
-    /*! 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 
-        "Den h�r sidan f�rklarar hur man ska tolka de grafer som doxygen "
+      return
+        "Den här sidan förklarar hur man ska tolka de grafer som doxygen "
         "genererar.<p>\n"
-        "Tag f�ljande exempel:\n"
+        "Tag följande exempel:\n"
         "\\code\n"
-	"/*! Osynlig klass p� grund av stympning */\n"
+	"/*! Osynlig klass på grund av stympning */\n"
         "class Invisible { };\n\n"
-	"/*! Stympad klass, �rvningsrelationen �r dold */\n"
+	"/*! Stympad klass, ärvningsrelationen är dold */\n"
         "class Truncated : public Invisible { };\n\n"
 	"/* Klass utan doxygen-kommentarer */\n"
         "class Undocumented { };\n\n"
-	"/*! Klass som �rvs med publikt arv */\n"
+	"/*! Klass som ärvs med publikt arv */\n"
         "class PublicBase : public Truncated { };\n\n"
         "/*! En template-klass */\n"
         "template<class T> class Templ { };\n\n"
-	"/*! Klass som �rvs med skyddat arv */\n"
+	"/*! Klass som ärvs med skyddat arv */\n"
         "class ProtectedBase { };\n\n"
-	"/*! Klass som �rvs med privat arv */\n"
+	"/*! Klass som ärvs med privat arv */\n"
         "class PrivateBase { };\n\n"
-	"/*! Klass som anv�nds av Inherited klassen */\n"
+	"/*! Klass som används av Inherited klassen */\n"
         "class Used { };\n\n"
-	"/*! Super klassen som �rver ett antal andra klasser */\n"
+	"/*! Super klassen som ärver ett antal andra klasser */\n"
         "class Inherited : public PublicBase,\n"
         "                  protected ProtectedBase,\n"
         "                  private PrivateBase,\n"
@@ -926,47 +926,47 @@ class TranslatorSwedish : public TranslatorAdapter_1_6_0
         "    Used *m_usedClass;\n"
         "};\n"
         "\\endcode\n"
-	"Om \\c MAX_DOT_GRAPH_HEIGHT �r satt till 240 i konfigurationsfilen, "
-	"kommer f�ljande graf att generas:"
+	"Om \\c MAX_DOT_GRAPH_HEIGHT är satt till 240 i konfigurationsfilen, "
+	"kommer följande graf att generas:"
         "<p><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n"
         "<p>\n"
-	"Rektanglarna i den ovanst�ende grafen har f�ljande betydelser:\n"
+	"Rektanglarna i den ovanstående grafen har följande betydelser:\n"
         "<ul>\n"
 	"<li>%En fylld svart rektangel representerar den strukt eller klass "
 	"som har genererat grafen.\n"
 	"<li>%En rektangel med svart kant symboliserar en dokumenterad "
 	"strukt eller klass.\n"
-	"<li>%En rektangel med gr� kant symboliserar en odokumenterad strukt "
+	"<li>%En rektangel med grå kant symboliserar en odokumenterad strukt "
 	"eller klass.\n"
-	"<li>%En klass med r�d kant symboliserar en strukt eller klass d�r "
-	"alla dess relationer inte visas. %En graf stympas om den inte f�r "
-	"plats inom de givna gr�nserna.\n"
+	"<li>%En klass med röd kant symboliserar en strukt eller klass där "
+	"alla dess relationer inte visas. %En graf stympas om den inte får "
+	"plats inom de givna gränserna.\n"
         "</ul>\n"
-	"Pilarna har f�ljande betydelser:\n"
+	"Pilarna har följande betydelser:\n"
         "<ul>\n"
-	"<li>%En m�rkbl� pil anv�nds f�r att visualisera en publik arvrelation "
-	"mellan tv� klasser.\n"
-	"<li>%En m�rkgr�n pil anv�nds f�r en skyddad arvsrelation.\n"
-	"<li>%En m�rkr�d pil anv�nds f�r en privat arvsrelation.\n"
-	"<li>%En str�ckad lila pil anv�nds om en klass �r innesluten eller "
-	"anv�nd av en annan klass. Vid pilen st�r namnet p� den eller de "
-	"variabler som klassen pilen pekar p� kommer �t.\n"
-	"<li>%En str�ckad gul pil symboliserar f�rh�llandet mellan en "
-	"template-instans och template-klassen, som den instantierades fr�n.\n"
-	"Vid pilen st�r instansens template-parametrar.\n"
+	"<li>%En mörkblå pil används för att visualisera en publik arvrelation "
+	"mellan två klasser.\n"
+	"<li>%En mörkgrön pil används för en skyddad arvsrelation.\n"
+	"<li>%En mörkröd pil används för en privat arvsrelation.\n"
+	"<li>%En sträckad lila pil används om en klass är innesluten eller "
+	"använd av en annan klass. Vid pilen står namnet på den eller de "
+	"variabler som klassen pilen pekar på kommer åt.\n"
+	"<li>%En sträckad gul pil symboliserar förhållandet mellan en "
+	"template-instans och template-klassen, som den instantierades från.\n"
+	"Vid pilen står instansens template-parametrar.\n"
         "</ul>\n";
     }
 
     /*! text for the link to the legend page */
     virtual QCString trLegend()
     {
-      return "f�rklaring";
+      return "förklaring";
     }
 
 //////////////////////////////////////////////////////////////////////////
 // new since 1.2.0
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! Used as a marker that is put before a test item */
     virtual QCString trTest()
     {
@@ -1032,8 +1032,8 @@ class TranslatorSwedish : public TranslatorAdapter_1_6_0
     /*! The description of the package index page */
     virtual QCString trPackageListDescription()
     {
-      return "H�r �r en lista �ver paketen med en kort beskrivning "
-             "(om s�dan finns):";
+      return "Här är en lista över paketen med en kort beskrivning "
+             "(om sådan finns):";
     }
     /*! The link name in the Quick links header for each page */
     virtual QCString trPackages()
@@ -1043,13 +1043,13 @@ class TranslatorSwedish : public TranslatorAdapter_1_6_0
     /*! Text shown before a multi-line define */
     virtual QCString trDefineValue()
     {
-      return "V�rde:";
+      return "Värde:";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.2.5
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! Used as a marker that is put before a \\bug item */
     virtual QCString trBug()
     {
@@ -1091,83 +1091,83 @@ class TranslatorSwedish : public TranslatorAdapter_1_6_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)
-    { 
+    {
       QCString result((first_capital ? "Klass" : "klass"));
       if (!singular)  result+="er";
-      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 ? "Fil" : "fil"));
       if (!singular)  result+="er";
-      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 ? "Namnrymd" : "namnrynd"));
       if (!singular)  result+="er";
-      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 ? "Grupp" : "grupp"));
       if (!singular)  result+="er";
-      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 ? "Sid" : "sid"));
       if (singular)
          result+="a";
       else
          result+="or";
-      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 ? "Medlem" : "medlem"));
       if (!singular)  result+="mar";
-      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+="er";
-      return result; 
+      return result;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1178,8 +1178,8 @@ class TranslatorSwedish : public TranslatorAdapter_1_6_0
      *  for the author section in man pages. */
     virtual QCString trAuthor(bool first_capital, bool /*singular*/)
     {
-      QCString result((first_capital ? "F�rfattare" : "f�rfattare"));
-      return result; 
+      QCString result((first_capital ? "Författare" : "författare"));
+      return result;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1197,7 +1197,7 @@ class TranslatorSwedish : 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)
@@ -1222,36 +1222,36 @@ class TranslatorSwedish : public TranslatorAdapter_1_6_0
      */
     virtual QCString trRTFTableOfContents()
     {
-      return "Inneh�llsf�rteckning";
+      return "Innehållsförteckning";
     }
 
 //////////////////////////////////////////////////////////////////////////
 // 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 "Lista �ver f�r�ldrade";
+      return "Lista över föråldrade";
     }
 
 //////////////////////////////////////////////////////////////////////////
 // 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 "H�ndelser";
+      return "Händelser";
     }
     /*! Header used for the documentation section of a class' events. */
     virtual QCString trEventDocumentation()
     {
-      return "H�ndelse Dokumentation";
+      return "Händelse Dokumentation";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1261,43 +1261,43 @@ class TranslatorSwedish : public TranslatorAdapter_1_6_0
     /*! Used as a heading for a list of Java class types with package scope.
      */
     virtual QCString trPackageTypes()
-    { 
+    {
       return "Paket typer";
     }
-    /*! 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 "Paket funktioner";
     }
-    /*! 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 "Statiska paket funktioner";
     }
-    /*! 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 "Paket attribut";
     }
-    /*! 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 "Statiska paket attribut";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // 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()
@@ -1307,33 +1307,33 @@ class TranslatorSwedish : public TranslatorAdapter_1_6_0
     /*! Put in front of the call graph for a function. */
     virtual QCString trCallGraph()
     {
-      return "H�r �r anropnings diagrammet f�r den h�r funktionen:";
+      return "Här är anropnings diagrammet för den här funktionen:";
     }
 
 //////////////////////////////////////////////////////////////////////////
 // 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()
     {
-      return "S�k efter";
+      return "Sök efter";
     }
     /*! This string is used as the title for the page listing the search
      *  results.
      */
     virtual QCString trSearchResultsTitle()
     {
-      return "S�kresultat";
+      return "Sökresultat";
     }
     /*! 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.
      */
@@ -1341,24 +1341,24 @@ class TranslatorSwedish : public TranslatorAdapter_1_6_0
     {
       if (numDocuments==0)
       {
-        return "Tyv�rr finns det inga dokument som matchar din s�kning.";
+        return "Tyvärr finns det inga dokument som matchar din sökning.";
       }
       else if (numDocuments==1)
       {
-        return "Hittade <b>1</b> dokument som matchar din s�kning.";
+        return "Hittade <b>1</b> dokument som matchar din sökning.";
       }
-      else 
+      else
       {
-        return "Hittade <b>$num</b> dokument som matchar din s�kning. "
-               "Visar de b�sta tr�ffarna f�rst.";
+        return "Hittade <b>$num</b> dokument som matchar din sökning. "
+               "Visar de bästa träffarna först.";
       }
     }
-    /*! 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()
     {
-      return "Tr�ffar:";
+      return "Träffar:";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1369,7 +1369,7 @@ class TranslatorSwedish : public TranslatorAdapter_1_6_0
      */
     virtual QCString trSourceFile(QCString& filename)
     {
-      return "K�llkodsfilen " + filename;
+      return "Källkodsfilen " + filename;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1394,11 +1394,11 @@ class TranslatorSwedish : public TranslatorAdapter_1_6_0
     virtual QCString trDirectories()
     { return "Kataloger"; }
 
-    /*! 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 "Den h�r katalogen �r grovt sorterad, "
+	{ return "Den här katalogen är grovt sorterad, "
              "men inte helt, i alfabetisk ordning:";
     }
 
@@ -1412,10 +1412,10 @@ class TranslatorSwedish : 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 ? "Katalog" : "katalog"));
       if (!singular) result+="er";
-      return result; 
+      return result;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1427,9 +1427,9 @@ class TranslatorSwedish : public TranslatorAdapter_1_6_0
      */
     virtual QCString trOverloadText()
     {
-      return "Det h�r �r en �verlagrad medlemsfunktion "
-             "tillhandah�llen f�r bekv�mlighet. Den enda som "
-             "skiljer sig fr�n ovanst�ende funktion �r vilka "
+      return "Det här är en överlagrad medlemsfunktion "
+             "tillhandahållen för bekvämlighet. Den enda som "
+             "skiljer sig från ovanstående funktion är vilka "
              "argument den tar emot.";
     }
 
@@ -1440,7 +1440,7 @@ class TranslatorSwedish : public TranslatorAdapter_1_6_0
     /*! This is used to introduce a caller (or called-by) graph */
     virtual QCString trCallerGraph()
     {
-      return "H�r �r katalog-grafen f�r denna funktion:";
+      return "Här är katalog-grafen för denna funktion:";
     }
 
     /*! This is used in the documentation of a file/namespace before the list
@@ -1448,7 +1448,7 @@ class TranslatorSwedish : public TranslatorAdapter_1_6_0
      */
     virtual QCString trEnumerationValueDocumentation()
     {
-      return "Uppr�knings-dokumentation";
+      return "Uppräknings-dokumentation";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1465,29 +1465,29 @@ class TranslatorSwedish : public TranslatorAdapter_1_6_0
 
     /*! This is put above each page as a link to all members of compounds (Fortran). */
     virtual QCString trCompoundMembersFortran()
-    { return "Data f�lt"; }
+    { return "Data fält"; }
 
     /*! This is an introduction to the annotated compound list (Fortran). */
     virtual QCString trCompoundListDescriptionFortran()
-    { return "H�r �r datatyperna med en kort beskrivning:"; }
+    { return "Här är datatyperna med en kort beskrivning:"; }
 
     /*! This is an introduction to the page with all data types (Fortran). */
     virtual QCString trCompoundMembersDescriptionFortran(bool extractAll)
     {
-      QCString result="H�r �r en lista av alla ";
+      QCString result="Här är en lista av alla ";
       if (!extractAll)
       {
         result+="dokumenterade ";
       }
       result+="datatyps medlemmar";
-      result+=" med l�nkar till ";
+      result+=" med länkar till ";
       if (!extractAll)
       {
-         result+="datastrukturs documentation f�r varje medlem";
+         result+="datastrukturs documentation för varje medlem";
       }
       else
       {
-         result+="klasserna de h�r till:";
+         result+="klasserna de hör till:";
       }
       return result;
     }
@@ -1529,7 +1529,7 @@ class TranslatorSwedish : public TranslatorAdapter_1_6_0
     /*! used as an introduction to the modules list (Fortran) */
     virtual QCString trModulesListDescription(bool extractAll)
     {
-      QCString result="H�r �r en lista p� alla ";
+      QCString result="Här är en lista på alla ";
       if (!extractAll) result+="dokumenterade ";
       result+="moduler med en kort beskrivning:";
       return result;
@@ -1546,7 +1546,7 @@ class TranslatorSwedish : public TranslatorAdapter_1_6_0
         case ClassDef::Class:      result+=" Modul"; break;
         case ClassDef::Struct:     result+=" Typ"; break;
         case ClassDef::Union:      result+=" Union"; break;
-        case ClassDef::Interface:  result+=" Gr�nssnitt"; break;
+        case ClassDef::Interface:  result+=" Gränssnitt"; break;
         case ClassDef::Protocol:   result+=" Protokoll"; break;
         case ClassDef::Category:   result+=" Kategori"; break;
         case ClassDef::Exception:  result+=" Undantag"; break;
@@ -1571,16 +1571,16 @@ class TranslatorSwedish : public TranslatorAdapter_1_6_0
     /*! This is an introduction to the page with all modules members (Fortran) */
     virtual QCString trModulesMemberDescription(bool extractAll)
     {
-      QCString result="H�r �r en lista p� alla ";
+      QCString result="Här är en lista på alla ";
       if (!extractAll) result+="documented ";
-      result+="modul medlemmar med l�nkar till ";
+      result+="modul medlemmar med länkar till ";
       if (extractAll)
       {
-        result+="modul dokumentationen f�r varje medlem:";
+        result+="modul dokumentationen för varje medlem:";
       }
       else
       {
-        result+="modulerna de h�r till:";
+        result+="modulerna de hör till:";
       }
       return result;
     }
@@ -1606,19 +1606,19 @@ class TranslatorSwedish : public TranslatorAdapter_1_6_0
         bool single)
     {
       // single is true implies a single file
-      QCString result=(QCString)"Dokumentationen f�r denna ";
+      QCString result=(QCString)"Dokumentationen för denna ";
       switch(compType)
       {
         case ClassDef::Class:      result+="modul"; break;
         case ClassDef::Struct:     result+="typ"; break;
         case ClassDef::Union:      result+="union"; break;
-        case ClassDef::Interface:  result+="gr�nssnitt"; break;
+        case ClassDef::Interface:  result+="gränssnitt"; break;
         case ClassDef::Protocol:   result+="protokoll"; break;
         case ClassDef::Category:   result+="kategori"; break;
         case ClassDef::Exception:  result+="undantag"; break;
         default: break;
       }
-      result+=" genererades fr�n f�ljade fil";
+      result+=" genererades från följade fil";
       if (single) result+=":"; else result+="er:";
       return result;
     }
@@ -1643,7 +1643,7 @@ class TranslatorSwedish : public TranslatorAdapter_1_6_0
     /*! C# Type Constraint list */
     virtual QCString trTypeConstraints()
     {
-      return "Typbegr�nsningar";
+      return "Typbegränsningar";
     }
 
 /*---------- For internal use: ----------------------------------------*/
@@ -1660,7 +1660,7 @@ class TranslatorSwedish : public TranslatorAdapter_1_6_0
       return result;
     }
 
-	
+
 };
 
 #endif
diff --git a/src/translator_tw.h b/src/translator_tw.h
index 29f2cd3..48629fe 100644
--- a/src/translator_tw.h
+++ b/src/translator_tw.h
@@ -41,7 +41,7 @@
 // Translator class (by the local maintainer) when the localized
 // translator is made up-to-date again.
 
-class TranslatorChinesetraditional : public TranslatorAdapter_1_8_0
+class TranslatorChinesetraditional : public Translator
 {
   public:
 
@@ -78,7 +78,7 @@ class TranslatorChinesetraditional : public TranslatorAdapter_1_8_0
     /*! return the language charset. This will be used for the HTML output */
     virtual QCString idLanguageCharset()
     {
-      return "big5";
+      return "utf-8";
     }
 
     // --- Language translation methods -------------------
@@ -624,7 +624,7 @@ class TranslatorChinesetraditional : public TranslatorAdapter_1_8_0
         case ClassDef::Struct:     result+=" 結構"; break;
         case ClassDef::Union:      result+=" 聯合"; break;
         case ClassDef::Interface:  result+=" 介面"; break;
-        case ClassDef::Protocol:   result+=" 協定"; break; 
+        case ClassDef::Protocol:   result+=" 協定"; break;
         case ClassDef::Category:   result+=" 分類"; break;
         case ClassDef::Exception:  result+=" 例外"; break;
         default: break;
@@ -1495,7 +1495,7 @@ class TranslatorChinesetraditional : public TranslatorAdapter_1_8_0
     {
       return filename + " 原始程式檔";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.3.9
 //////////////////////////////////////////////////////////////////////////
@@ -1518,7 +1518,7 @@ class TranslatorChinesetraditional : 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()
@@ -1538,7 +1538,7 @@ class TranslatorChinesetraditional : public TranslatorAdapter_1_8_0
     {
       return QCString("目錄");
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.4.1
 //////////////////////////////////////////////////////////////////////////
@@ -1565,12 +1565,12 @@ class TranslatorChinesetraditional : 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 "成員函數/子程序 文件"; }
 
-    /*! 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 "資料型態列表"; }
 
@@ -1592,18 +1592,18 @@ class TranslatorChinesetraditional : 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()
@@ -1615,24 +1615,24 @@ class TranslatorChinesetraditional : 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 "模組列表"; }
@@ -1674,42 +1674,42 @@ class TranslatorChinesetraditional : public TranslatorAdapter_1_8_0
       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("模組");
-      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.
@@ -1734,22 +1734,22 @@ class TranslatorChinesetraditional : 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("型別");
-      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("子程式");
-      return result; 
+      return result;
     }
 
     /*! C# Type Constraint list */
@@ -1757,7 +1757,7 @@ class TranslatorChinesetraditional : public TranslatorAdapter_1_8_0
     {
       return "型別限制條件";
     }
-	
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.6.0 (mainly for the new search engine)
 //////////////////////////////////////////////////////////////////////////
@@ -1820,7 +1820,7 @@ class TranslatorChinesetraditional : public TranslatorAdapter_1_8_0
       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
@@ -1863,6 +1863,165 @@ class TranslatorChinesetraditional : public TranslatorAdapter_1_8_0
     virtual QCString trDirDepGraph(const char *name)
     { return QCString(name)+"的目錄關連圖"+":"; }
 
+//////////////////////////////////////////////////////////////////////////
+// new since 1.8.0
+//////////////////////////////////////////////////////////////////////////
+
+    /*! Detail level selector shown for hierarchical indices */
+    virtual QCString trDetailLevel()
+    { return "詳細程度"; }
+
+    /*! Section header for list of template parameters */
+    virtual QCString trTemplateParameters()
+    { return "樣版參數"; }
+
+    /*! Used in dot graph when UML_LOOK is enabled and there are many fields */
+    virtual QCString trAndMore(const QCString &number)
+    { return "及 "+number+" 個更多..."; }
+
+    /*! Used file list for a Java enum */
+    virtual QCString trEnumGeneratedFromFiles(bool single)
+    { QCString result = "此列舉型態的文件是由下列檔案所產生";
+      if (!single) result += "";
+      result+=":";
+      return result;
+    }
+
+    /*! Header of a Java enum page (Java enums are represented as classes). */
+    virtual QCString trEnumReference(const char *name)
+    { return QCString(name)+" 列舉型態參考"; }
+
+    /*! Used for a section containing inherited members */
+    virtual QCString trInheritedFrom(const char *members,const char *what)
+    { return QCString(members)+" 繼承自 "+what; }
+
+    /*! Header of the sections with inherited members specific for the
+     *  base class(es)
+     */
+    virtual QCString trAdditionalInheritedMembers()
+    { return "額外的繼承成員"; }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.8.2
+//////////////////////////////////////////////////////////////////////////
+
+    /*! Used as a tooltip for the toggle button that appears in the
+     *  navigation tree in the HTML output when GENERATE_TREEVIEW is
+     *  enabled. This tooltip explains the meaning of the button.
+     */
+    virtual QCString trPanelSynchronisationTooltip(bool enable)
+    {
+      QCString opt = enable ? "啟用" : "停用";
+      return "點擊 "+opt+" 面板進行同步";
+    }
+
+    /*! Used in a method of an Objective-C class that is declared in a
+     *  a category. Note that the @1 marker is required and is replaced
+     *  by a link.
+     */
+    virtual QCString trProvidedByCategory()
+    {
+      return "由 @1 分類所提供.";
+    }
+
+    /*! Used in a method of an Objective-C category that extends a class.
+     *  Note that the @1 marker is required and is replaced by a link to
+     *  the class method.
+     */
+    virtual QCString trExtendsClass()
+    {
+      return "延伸 @1 類別 .";
+    }
+
+    /*! Used as the header of a list of class methods in Objective-C.
+     *  These are similar to static public member functions in C++.
+     */
+    virtual QCString trClassMethods()
+    {
+      return "類別方法";
+    }
+
+    /*! Used as the header of a list of instance methods in Objective-C.
+     *  These are similar to public member functions in C++.
+     */
+    virtual QCString trInstanceMethods()
+    {
+      return "實體方法";
+    }
+
+    /*! Used as the header of the member functions of an Objective-C class.
+     */
+    virtual QCString trMethodDocumentation()
+    {
+      return "方法文件";
+    }
+
+    /*! Used as the title of the design overview picture created for the
+     *  VHDL output.
+     */
+    virtual QCString trDesignOverview()
+    {
+      return "設計概述";
+    }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.8.4
+//////////////////////////////////////////////////////////////////////////
+
+    /** old style UNO IDL services: implemented interfaces */
+    virtual QCString trInterfaces()
+    { return "導出介面"; }
+
+    /** old style UNO IDL services: inherited services */
+    virtual QCString trServices()
+    { return "引入的服務"; }
+
+    /** UNO IDL constant groups */
+    virtual QCString trConstantGroups()
+    { return "常數群組"; }
+
+    /** UNO IDL constant groups */
+    virtual QCString trConstantGroupReference(const char *namespaceName)
+    {
+      QCString result=namespaceName;
+      result+="常數群組參考";
+      return result;
+    }
+    /** UNO IDL service page title */
+    virtual QCString trServiceReference(const char *sName)
+    {
+      QCString result=(QCString)sName;
+      result+="服務參考";
+      return result;
+    }
+    /** UNO IDL singleton page title */
+    virtual QCString trSingletonReference(const char *sName)
+    {
+      QCString result=(QCString)sName;
+      result+="Singleton參考";
+      return result;
+    }
+    /** UNO IDL service page */
+    virtual QCString trServiceGeneratedFromFiles(bool single)
+    {
+      // single is true implies a single file
+      QCString result=(QCString)"本服務的文件由以下的檔案"
+                                "所產生";
+      if (single) result+=":"; else result+=":";
+      return result;
+    }
+    /** UNO IDL singleton page */
+    virtual QCString trSingletonGeneratedFromFiles(bool single)
+    {
+      // single is true implies a single file
+      QCString result=(QCString)"本singleton的文件由下面的檔案"
+                                "所產生";
+      if (single) result+=":"; else result+=":";
+      return result;
+    }
+
+//////////////////////////////////////////////////////////////////////////
+
 };
 
 #endif
diff --git a/src/translator_za.h b/src/translator_za.h
index eb278d6..af4ba41 100644
--- a/src/translator_za.h
+++ b/src/translator_za.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 @@
 
  /*
  *  Bronne vir hierdie vertaling (Sources for this translation):
- *  Die Stigting vir Afrikaans se rekenaartermelys: 
+ *  Die Stigting vir Afrikaans se rekenaartermelys:
  *      - http://www.afrikaans.com/rekenaarterme.html
  *  Werkgroep vir Afrikaanse IT-terme:
  *      - http://www.vertaal.org/index.html
@@ -31,19 +31,19 @@ class TranslatorAfrikaans : 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 "afrikaans"; }
-    
-    /*! 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
@@ -51,7 +51,7 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
      *  "\\usepackage[latin2]{inputenc}\n"
      *  "\\usepackage[T1]{fontenc}\n"
      *  </pre>
-     * 
+     *
      * The Afrikaans LaTeX does not use such commands.  Because of this
      * the empty string is returned in this implementation.
      */
@@ -65,7 +65,7 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
     /*! return the language charset. This will be used for the HTML output */
     virtual QCString idLanguageCharset()
     {
-      return "iso-8859-1";
+      return "utf-8";
     }
 
     // --- Language translation methods -------------------
@@ -85,30 +85,30 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
     /*! header that is put before the list of typedefs. */
     virtual QCString trMemberTypedefDocumentation()
     { return "Lede Typedef Dokumentasie"; }
-    
+
     /*! header that is put before the list of enumerations. */
     virtual QCString trMemberEnumerationDocumentation()
     { return "Lede Enumerasie Dokumentasie"; }
-    
+
     /*! header that is put before the list of member functions. */
     virtual QCString trMemberFunctionDocumentation()
     { return "Lede Funksie Dokumentasie"; }
-    
+
     /*! header that is put before the list of member attributes. */
     virtual QCString trMemberDataDocumentation()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Veld Dokumentasie"; 
+        return "Veld Dokumentasie";
       }
       else
       {
-        return "Lede Data Dokumentasie"; 
+        return "Lede Data Dokumentasie";
       }
     }
 
     /*! this is the text of a link put after brief descriptions. */
-    virtual QCString trMore() 
+    virtual QCString trMore()
     { return "Meer detail..."; }
 
     /*! put in the class documentation */
@@ -126,81 +126,81 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
     /*! this is the remainder of the sentence after the class name */
     virtual QCString trIncludingInheritedMembers()
     { return ", insluitend alle afgeleide lede."; }
-    
+
     /*! 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="Automaties gegenereer deur Doxygen";
       if (s) result+=(QCString)" vir "+s;
-      result+=" van die bron kode af."; 
+      result+=" van die bron kode af.";
       return result;
     }
 
     /*! put after an enum name in the list of all members */
     virtual QCString trEnumName()
     { return "enum naam"; }
-    
+
     /*! put after an enum value in the list of all members */
     virtual QCString trEnumValue()
     { return "enum waarde"; }
-    
+
     /*! put after an undocumented member in the list of all members */
     virtual QCString trDefinedIn()
-    { return "gedefinie&euml;r in"; }
+    { return "gedefinieër 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 "Klas Hierargie"; }
-    
+
     /*! 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 Strukture";
       }
       else
       {
-        return "Klas Lys"; 
+        return "Klas Lys";
       }
     }
-    
+
     /*! This is put above each page as a link to the list of documented files */
     virtual QCString trFileList()
-    { return "Le&euml;r Lys"; }
+    { return "Leër Lys"; }
 
     /*! 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 Velde"; 
+        return "Data Velde";
       }
       else
       {
-        return "Klas Lede"; 
+        return "Klas Lede";
       }
     }
 
     /*! 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 "Le&euml;r Lede"; 
+        return "Leër Lede";
       }
     }
 
@@ -218,7 +218,7 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
 
     /*! This is an introduction to the class hierarchy. */
     virtual QCString trClassHierarchyDescription()
-    { 
+    {
       return "Hierdie afgeleide lys word rofweg gesorteer: ";
     }
 
@@ -227,22 +227,22 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
     {
       QCString result="Hier is 'n lys van alle  ";
       if (!extractAll) result+="gedokumenteerde ";
-      result+="le&euml;rs met kort beskrywings:";
+      result+="leërs met kort beskrywings:";
       return result;
     }
 
     /*! This is an introduction to the annotated compound list. */
     virtual QCString trCompoundListDescription()
-    { 
-      
+    {
+
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return " Data strukture met kort beskrywings:"; 
+        return " Data strukture met kort beskrywings:";
       }
       else
       {
         return "Klasse, structs, "
-               "unions en intervlakke met kort beskrywings:"; 
+               "unions en intervlakke met kort beskrywings:";
       }
     }
 
@@ -263,7 +263,7 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
         result+="klas lede";
       }
       result+=" met skakels na ";
-      if (!extractAll) 
+      if (!extractAll)
       {
         if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
         {
@@ -274,7 +274,7 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
           result+="die klas dokumentasie vir elke lid:";
         }
       }
-      else 
+      else
       {
         if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
         {
@@ -293,19 +293,19 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
     {
       QCString result="'n Lys van alle ";
       if (!extractAll) result+="gedokumenteerde ";
-      
+
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
         result+="funksies, veranderlikes, defines, enums, en typedefs";
       }
       else
       {
-        result+="le&euml;r lede";
+        result+="leër lede";
       }
       result+=" met skakels na ";
-      if (extractAll) 
-        result+="die le&euml;rs waaraan hulle behoort:";
-      else 
+      if (extractAll)
+        result+="die leërs waaraan hulle behoort:";
+      else
         result+="die dokumentasie:";
       return result;
     }
@@ -326,38 +326,38 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
     virtual QCString trDocumentation()
     { return "Dokumentasie"; }
 
-    /*! 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 Indeks"; }
 
-    /*! 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 "Hierargiese Indeks"; }
 
-    /*! 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 Strukture Indeks";
       }
       else
       {
-        return "Klas Indeks"; 
+        return "Klas Indeks";
       }
     }
 
     /*! This is used in LaTeX as the title of the chapter with the
      * list of all files.
      */
-    virtual QCString trFileIndex() 
-    { return "Le&euml;r Indeks"; }
+    virtual QCString trFileIndex()
+    { return "Leër Indeks"; }
 
     /*! This is used in LaTeX as the title of the chapter containing
      *  the documentation of all groups.
@@ -369,14 +369,14 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
      *  the documentation of all classes, structs and unions.
      */
     virtual QCString trClassDocumentation()
-    { 
+    {
       if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
       {
-        return "Data Strukture Dokumentasie"; 
+        return "Data Strukture Dokumentasie";
       }
       else
       {
-        return "Klas Dokumentasie"; 
+        return "Klas Dokumentasie";
       }
     }
 
@@ -384,7 +384,7 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
      *  the documentation of all files.
      */
     virtual QCString trFileDocumentation()
-    { return "Le&euml;r Dokumentasie"; }
+    { return "Leër Dokumentasie"; }
 
     /*! This is used in LaTeX as the title of the chapter containing
      *  the documentation of all examples.
@@ -401,105 +401,105 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
     /*! This is used in LaTeX as the title of the document */
     virtual QCString trReferenceManual()
     { return "Verwysings Handleiding"; }
-    
-    /*! 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 "Definiesies"; }
 
-    /*! 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 "Funksie Prototipes"; }
 
-    /*! 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 "Funksies"; }
 
-    /*! 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 "Veranderlikes"; }
 
-    /*! 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 "Enumeration waardes"; }
-    
+
     /*! 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 "Funksie Prototipe Dokumentasie"; }
 
-    /*! 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 Dokumentasie"; }
 
-    /*! 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 Dokumentasie"; }
 
-    /*! 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 "Funksie Dokumentasie"; }
 
-    /*! 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 "Veranderlike Dokumentasie"; }
 
-    /*! 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 Strukture"; 
+        return "Data Strukture";
       }
       else
       {
-        return "Klasse"; 
+        return "Klasse";
       }
     }
 
-    /*! 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)"Gegenereer op "+date;
       if (projName) result+=(QCString)" vir "+projName;
       result+=(QCString)" deur";
@@ -517,7 +517,7 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
     {
       return (QCString)"Afleidings diagram vir "+clName+":";
     }
-    
+
     /*! this text is generated when the \\internal command is used. */
     virtual QCString trForInternalUseOnly()
     { return "Slegs vir interne gebruik."; }
@@ -549,7 +549,7 @@ class TranslatorAfrikaans : 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 "Gegenereer deur"; }
@@ -557,7 +557,7 @@ class TranslatorAfrikaans : 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 "Namespace Lys"; }
@@ -576,17 +576,17 @@ class TranslatorAfrikaans : 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 "Friends En Verwante Funksie Dokumentasie"; }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990425
 //////////////////////////////////////////////////////////////////////////
@@ -617,7 +617,7 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
     virtual QCString trFileReference(const char *fileName)
     {
       QCString result=fileName;
-      result+=" Le&euml;r Verwysing"; 
+      result+=" Leër Verwysing";
       return result;
     }
 
@@ -628,7 +628,7 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
       result+=" Namespace Verwysing";
       return result;
     }
-    
+
     virtual QCString trPublicMembers()
     { return "Publieke Lede Funksies"; }
     virtual QCString trPublicSlots()
@@ -649,7 +649,7 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
     { return "Private Slots"; }
     virtual QCString trStaticPrivateMembers()
     { return "Statiese Private Lede Funksies"; }
-    
+
     /*! this function is used to produce a comma-separated list of items.
      *  use generateMarker(i) to indicate where item i should be put.
      */
@@ -658,23 +658,23 @@ class TranslatorAfrikaans : 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+=", en ";
         }
       }
-      return result; 
+      return result;
     }
-    
+
     /*! used in class documentation to produce a list of base classes,
      *  if class diagrams are disabled.
      */
@@ -691,7 +691,7 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
       return "Afgelei van"+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)
@@ -713,17 +713,17 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
 
     /*! This is an introduction to the page with all namespace members */
     virtual QCString trNamespaceMemberDescription(bool extractAll)
-    { 
+    {
       QCString result="'n Lys van alle ";
       if (!extractAll) result+="gedokumenteerde ";
       result+="namespace lede met skakels na ";
-      if (extractAll) 
+      if (extractAll)
         result+="die namespace dokumentasie vir elke lid:";
-      else 
+      else
         result+="die namespaces waaraan hulle behoort:";
       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()
@@ -768,7 +768,7 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
         case ClassDef::Exception:  result+="eksepsie"; break;
         default: break;
       }
-      result+=" is gegenereer vanaf die volgende le&euml;r";
+      result+=" is gegenereer vanaf die volgende leër";
       if (single) result+=":"; else result+="s:";
       return result;
     }
@@ -792,7 +792,7 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
     virtual QCString trMainPage()
     { return "Hoof Bladsy"; }
 
-    /*! 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()
@@ -804,11 +804,11 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
 
     virtual QCString trDefinedAtLineInSourceFile()
     {
-      return "Gedefinie&euml;r by lyn @0 van le&euml;r @1.";
+      return "Gedefinieër by lyn @0 van leër @1.";
     }
     virtual QCString trDefinedInSourceFile()
     {
-      return "Definisie in le&euml;r @0.";
+      return "Definisie in leër @0.";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -837,17 +837,17 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
     /*! header that is put before the list of constructor/destructors. */
     virtual QCString trConstructorDocumentation()
     {
-      return "Konstruktor & Destruktor Dokumentasie"; 
+      return "Konstruktor & Destruktor Dokumentasie";
     }
     /*! Used in the file documentation to point to the corresponding sources. */
     virtual QCString trGotoSourceCode()
     {
-      return "Skakel na die bron kode van hierdie le&euml;r.";
+      return "Skakel na die bron kode van hierdie leër.";
     }
     /*! Used in the file sources to point to the corresponding documentation. */
     virtual QCString trGotoDocumentation()
     {
-      return "Skakel na die dokumentasie van hierdie le&euml;r.";
+      return "Skakel na die dokumentasie van hierdie leër.";
     }
     /*! Text for the \\pre command */
     virtual QCString trPrecondition()
@@ -894,7 +894,7 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
 //////////////////////////////////////////////////////////////////////////
 // new since 1.1.0
 //////////////////////////////////////////////////////////////////////////
-    
+
     virtual QCString trNote()
     {
       return "Nota";
@@ -976,14 +976,14 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
     }
     virtual QCString trInclByDepGraph()
     {
-      return "Hierdie diagram verduidelik watter le&euml;rs direk of"
-             "indirek hierdie le&euml;r insluit:";
+      return "Hierdie diagram verduidelik watter leërs direk of"
+             "indirek hierdie leër insluit:";
     }
     virtual QCString trSince()
     {
       return "Sederd";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.1.5
 //////////////////////////////////////////////////////////////////////////
@@ -993,12 +993,12 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
     {
       return "Diagram beskrywing";
     }
-    /*! 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
         "Hierdie bladsy beskryf die diagram konvensies wat gebruik word "
         "deur doxygen.<p>\n"
         "in hierdie voorbeeld:\n"
@@ -1030,7 +1030,7 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
         "    Used *m_usedClass;\n"
         "};\n"
         "\\endcode\n"
-        "As die \\c MAX_DOT_GRAPH_HEIGHT merker in die konfigurasie le&euml;r "
+        "As die \\c MAX_DOT_GRAPH_HEIGHT merker in die konfigurasie leër "
         "aan 240 gelyk gestel is, word die volgende diagram geproduseer:"
         "<p><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n"
         "<p>\n"
@@ -1063,11 +1063,11 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
     {
       return "beskrywing";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.2.0
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! Used as a marker that is put before a test item */
     virtual QCString trTest()
     {
@@ -1145,11 +1145,11 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
     {
       return "Waarde:";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // new since 1.2.5
 //////////////////////////////////////////////////////////////////////////
-    
+
     /*! Used as a marker that is put before a \\bug item */
     virtual QCString trBug()
     {
@@ -1165,9 +1165,9 @@ class TranslatorAfrikaans : 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 +1188,15 @@ class TranslatorAfrikaans : 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()
@@ -1209,82 +1209,82 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
     {
       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"));
       if (!singular)  result+="se";
-      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 ? "Le&euml;r" : "le&euml;r"));
+    {
+      QCString result((first_capital ? "Leër" : "leër"));
       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 ? "Groep" : "groep"));
       if (!singular)  result+="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 ? "Bladsy" : "bladsy"));
       if (!singular)  result+="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 ? "Lid" : "lid"));
       if (!singular)  result = (first_capital ? "Lede" : "lede");
-      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;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1294,10 +1294,10 @@ class TranslatorAfrikaans : 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 ? "Outeur" : "outeur"));
       if (!singular)  result+="s";
-      return result; 
+      return result;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1315,7 +1315,7 @@ class TranslatorAfrikaans : 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 +1347,8 @@ class TranslatorAfrikaans : 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 +1359,7 @@ class TranslatorAfrikaans : 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 +1379,43 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
     /*! Used as a heading for a list of Java class types with package scope.
      */
     virtual QCString trPackageTypes()
-    { 
+    {
       return "Pakket Tipes";
     }
-    /*! 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 "Pakket Funksies";
     }
-    /*! 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 "Statiese Pakket Funksies";
     }
-    /*! 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 "Pakket Eienskappe";
     }
-    /*! 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 "Statiese Pakket Eienskappe";
     }
-    
+
 //////////////////////////////////////////////////////////////////////////
 // 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 +1432,9 @@ class TranslatorAfrikaans : 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 +1451,7 @@ class TranslatorAfrikaans : 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 +1465,13 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
       {
         return "Die soektog het <b>1</b> dokument gevind na gelang van jou navraag.";
       }
-      else 
+      else
       {
         return "Die soektog het <b>$num</b> dokumente gevind na gelang van jou navraag. "
                "Beste resultate eerste.";
       }
     }
-    /*! 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()
@@ -1487,7 +1487,7 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
      */
     virtual QCString trSourceFile(QCString& filename)
     {
-      return filename + " Bron kode Le&euml;r";
+      return filename + " Bron kode Leër";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1498,7 +1498,7 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
      *  hierarchy.
      */
     virtual QCString trDirIndex()
-    { return "Directory Hi&euml;rargie"; }
+    { return "Directory Hiërargie"; }
 
     /*! This is used as the name of the chapter containing the documentation
      *  of the directories.
@@ -1512,11 +1512,11 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
     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()
-    { return "Hierdie directory hi&euml;rargie is min of meer alfabeties "
+    { return "Hierdie directory hiërargie is min of meer alfabeties "
              "gesorteer:";
     }
 
@@ -1530,10 +1530,10 @@ class TranslatorAfrikaans : 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 ? "Director" : "director"));
       if (singular) result+="y"; else result+="ies";
-      return result; 
+      return result;
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1560,7 +1560,7 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
       return "Hier is die roep skema vir die funksie:";
     }
 
-    /*! 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()
@@ -1569,12 +1569,12 @@ class TranslatorAfrikaans : 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 "Lede Funksie/Subroetine Dokumentasie"; }
 
-    /*! 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 Tipes Lys"; }
 
@@ -1596,18 +1596,18 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
       }
       result+="data tipe lede";
       result+=" met skakels na ";
-      if (!extractAll) 
+      if (!extractAll)
       {
          result+="die data strukture dokumentasie vir elke lid";
       }
-      else 
+      else
       {
          result+="die data tipes waaraan hulle behoort:";
       }
       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()
@@ -1619,24 +1619,24 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
     virtual QCString trTypeDocumentation()
     { return "Data Tipe Dokumentasie"; }
 
-    /*! 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 "Funksies/Subroetines"; }
 
-    /*! 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 "Funksies/Subroetine Dokumentasie"; }
 
-    /*! 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 Tipes"; }
-    
+
     /*! used as the title of page containing all the index of all modules (Fortran). */
     virtual QCString trModulesList()
     { return "Modules Lys"; }
@@ -1675,46 +1675,46 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
     virtual QCString trModuleReference(const char *namespaceName)
     {
       QCString result=namespaceName;
-      result+=" Module Bron";        
+      result+=" Module Bron";
       return result;
     }
-    
+
     /*! This is put above each page as a link to all members of modules. (Fortran) */
     virtual QCString trModulesMembers()
     { return "Module Lede"; }
 
     /*! This is an introduction to the page with all modules members (Fortran) */
     virtual QCString trModulesMemberDescription(bool extractAll)
-    { 
+    {
       QCString result="Hier is 'n lys van alle ";
       if (!extractAll) result+="gedokumenteerde ";
       result+="module lede met skakels na ";
-      if (extractAll) 
+      if (extractAll)
       {
         result+="die module dokumentasie vir elke lid:";
       }
-      else 
+      else
       {
         result+="die modules waaraan hulle behoort:";
       }
       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 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 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
      *  followed by a list of files that were used to generate the page.
@@ -1740,24 +1740,24 @@ class TranslatorAfrikaans : 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 ? "Tipe" : "tipe"));
       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+="me";
-      return result; 
+      return result;
     }
 
     /*! C# Type Constraint list */