Merge pull request #9 from pepr/master

Several TranslatorXxxx files converted to UTF-8

doc/language.doc

@@ -12,7 +12,6 @@
  * Documents produced by Doxygen are derivative works derived from the
  * input used in their production; they are not affected by this license.
  *
- * $Id$
  */
 /*! \page langhowto Internationalization
 
@@ -60,8 +59,8 @@ when the translator was updated.
   </tr>
   <tr bgcolor="#ffffff">
     <td>Arabic</td>
-    <td>Moaz Reyad<br/><span style="color: red; background-color: yellow">-- searching for the maintainer --</span></td>
-    <td><span style="color: brown">[resigned]</span><br/><span style="color: brown">[Please, try to help to find someone.]</span></td>
+    <td>Moaz Reyad<br/>Muhammad Bashir Al-Noimi</td>
+    <td><span style="color: brown">[resigned]</span><br/>mbnoimi at gmail dot com</td>
     <td>1.4.6</td>
   </tr>
   <tr bgcolor="#ffffff">
@@ -138,9 +137,9 @@ when the translator was updated.
   </tr>
   <tr bgcolor="#ffffff">
     <td>French</td>
-    <td>David Martinet<br/>Xavier Outhier</td>
-    <td>contact at e-concept-applications dot fr<br/>xouthier at yahoo dot fr</td>
-    <td>1.8.0</td>
+    <td>David Martinet<br/>Xavier Outhier<br/>Benoît BROSSE</td>
+    <td>contact at e-concept-applications dot fr<br/>xouthier at yahoo dot fr<br/>Benoit dot BROSSE at ingenico dot com</td>
+    <td>up-to-date</td>
   </tr>
   <tr bgcolor="#ffffff">
     <td>German</td>
@@ -278,7 +277,7 @@ when the translator was updated.
     <td>Spanish</td>
     <td>Bartomeu<br/>Francisco Oltra Thennet<br/>David Vaquero</td>
     <td>bartomeu at loteria3cornella dot com<br/><span style="color: brown">[unreachable]</span><br/>david at grupoikusnet dot com</td>
-    <td>1.8.4</td>
+    <td>up-to-date</td>
   </tr>
   <tr bgcolor="#ffffff">
     <td>Swedish</td>
@@ -323,7 +322,7 @@ when the translator was updated.
   Afrikaans & Johan Prinsloo & {\tt\tiny johan at zippysnoek dot com} & 1.6.0 \\
   \hline
   Arabic & Moaz Reyad & {\tt\tiny [resigned] moazreyad at yahoo dot com} & 1.4.6 \\
-  ~ & -- searching for the maintainer -- & {\tt\tiny [Please, try to help to find someone.]} & ~ \\
+  ~ & Muhammad Bashir Al-Noimi & {\tt\tiny mbnoimi at gmail dot com} & ~ \\
   \hline
   Armenian & Armen Tangamyan & {\tt\tiny armen dot tangamyan at anu dot edu dot au} & 1.8.0 \\
   \hline
@@ -354,8 +353,9 @@ when the translator was updated.
   \hline
   Finnish & Antti Laine & {\tt\tiny antti dot a dot laine at tut dot fi} & 1.6.0 \\
   \hline
-  French & David Martinet & {\tt\tiny contact at e-concept-applications dot fr} & 1.8.0 \\
+  French & David Martinet & {\tt\tiny contact at e-concept-applications dot fr} & up-to-date \\
   ~ & Xavier Outhier & {\tt\tiny xouthier at yahoo dot fr} & ~ \\
+  ~ & Benoît BROSSE & {\tt\tiny Benoit dot BROSSE at ingenico dot com} & ~ \\
   \hline
   German & Peter Grotrian & {\tt\tiny Peter dot Grotrian at pdv-FS dot de} & 1.8.4 \\
   ~ & Jens Seidel & {\tt\tiny jensseidel at users dot sf dot net} & ~ \\
@@ -417,7 +417,7 @@ when the translator was updated.
   \hline
   Slovene & Matjaž Ostroveršnik & {\tt\tiny matjaz dot ostroversnik at ostri dot org} & 1.4.6 \\
   \hline
-  Spanish & Bartomeu & {\tt\tiny bartomeu at loteria3cornella dot com} & 1.8.4 \\
+  Spanish & Bartomeu & {\tt\tiny bartomeu at loteria3cornella dot com} & up-to-date \\
   ~ & Francisco Oltra Thennet & {\tt\tiny [unreachable] foltra at puc dot cl} & ~ \\
   ~ & David Vaquero & {\tt\tiny david at grupoikusnet dot com} & ~ \\
   \hline

doc/translator_report.txt

@@ -10,7 +10,7 @@ Macedonian, Norwegian, Persian, Polish, Portuguese, Romanian, Russian,
 Serbian, SerbianCyrilic, Slovak, Slovene, Spanish, Swedish, Turkish,
 Ukrainian, and Vietnamese.
 
-Of them, 7 translators are up-to-date, 33 translators are based on
+Of them, 9 translators are up-to-date, 31 translators are based on
 some adapter class, and 2 are English based.
 
 ----------------------------------------------------------------------
@@ -22,10 +22,12 @@ still may be some details listed even for them:
   TranslatorCzech
   TranslatorDutch
   TranslatorEnglish
-  TranslatorKorean -- Change the base class to Translator.
-  TranslatorLatvian -- Reimplementation using UTF-8 suggested.
-  TranslatorRomanian -- Reimplementation using UTF-8 suggested.
+  TranslatorFrench -- The MAX_DOT_GRAPH_HEIGHT found in trLegendDocs()
+  TranslatorKorean
+  TranslatorLatvian
+  TranslatorRomanian -- The MAX_DOT_GRAPH_HEIGHT found in trLegendDocs()
   TranslatorSlovak
+  TranslatorSpanish
 
 ----------------------------------------------------------------------
 The following translator classes need some maintenance (the most
@@ -34,7 +36,6 @@ version when the class was last updated and number of methods that
 must be implemented to become up-to-date:
 
   TranslatorUkrainian             1.8.4 	 8 methods to implement (3 %)
-  TranslatorSpanish               1.8.4 	 8 methods to implement (3 %)
   TranslatorGreek                 1.8.4 	 8 methods to implement (3 %)
   TranslatorGerman                1.8.4 	 8 methods to implement (3 %)
   TranslatorEsperanto             1.8.4 	 8 methods to implement (3 %)
@@ -46,12 +47,7 @@ must be implemented to become up-to-date:
   TranslatorIndonesian            1.8.0 	22 methods to implement (8 %)
 	Note: Reimplementation using UTF-8 suggested.
 
-  TranslatorFrench                1.8.0 	22 methods to implement (8 %)
-	Note: Reimplementation using UTF-8 suggested.
-
   TranslatorDanish                1.8.0 	22 methods to implement (8 %)
-	Note: Reimplementation using UTF-8 suggested.
-
   TranslatorChinesetraditional    1.8.0 	22 methods to implement (8 %)
 	Note: Reimplementation using UTF-8 suggested.
 
@@ -60,8 +56,6 @@ must be implemented to become up-to-date:
   TranslatorArmenian              1.8.0 	22 methods to implement (8 %)
   TranslatorTurkish               1.7.5 	25 methods to implement (10 %)
   TranslatorRussian               1.7.5 	25 methods to implement (10 %)
-	Note: Reimplementation using UTF-8 suggested.
-
   TranslatorPersian               1.7.5 	25 methods to implement (10 %)
   TranslatorVietnamese            1.6.0 	34 methods to implement (13 %)
   TranslatorSwedish               1.6.0 	34 methods to implement (13 %)
@@ -83,14 +77,8 @@ must be implemented to become up-to-date:
 	Note: Reimplementation using UTF-8 suggested.
 
   TranslatorNorwegian             1.4.6 	56 methods to implement (22 %)
-	Note: Reimplementation using UTF-8 suggested.
-
   TranslatorLithuanian            1.4.6 	58 methods to implement (23 %)
-	Note: Reimplementation using UTF-8 suggested.
-
   TranslatorHungarian             1.4.6 	58 methods to implement (23 %)
-	Note: Reimplementation using UTF-8 suggested.
-
   TranslatorArabic                1.4.6 	56 methods to implement (22 %)
 
 ----------------------------------------------------------------------
@@ -506,35 +494,10 @@ TranslatorFinnish   (TranslatorAdapter_1_6_0)  34 methods to implement (13 %)
     virtual QCString trInstanceMethods()
 
 
-TranslatorFrench   (TranslatorAdapter_1_8_0)  22 methods to implement (8 %)
+TranslatorFrench   (Translator)
 ----------------
 
-  Implements 228 of the required methods (91 %).
-
-  Missing methods (should be implemented):
-
-    virtual QCString trDetailLevel()
-    virtual QCString trTemplateParameters()
-    virtual QCString trServices()
-    virtual QCString trClassMethods()
-    virtual QCString trProvidedByCategory()
-    virtual QCString trSingletonGeneratedFromFiles(bool single)
-    virtual QCString trServiceReference(const char * sName)
-    virtual QCString trDesignOverview()
-    virtual QCString trAndMore(const QCString & number)
-    virtual QCString trConstantGroups()
-    virtual QCString trMethodDocumentation()
-    virtual QCString trEnumReference(const char * name)
-    virtual QCString trInheritedFrom(const char * members, const char * what)
-    virtual QCString trAdditionalInheritedMembers()
-    virtual QCString trInterfaces()
-    virtual QCString trServiceGeneratedFromFiles(bool single)
-    virtual QCString trEnumGeneratedFromFiles(bool single)
-    virtual QCString trConstantGroupReference(const char * namespaceName)
-    virtual QCString trPanelSynchronisationTooltip(bool enable)
-    virtual QCString trExtendsClass()
-    virtual QCString trSingletonReference(const char * sName)
-    virtual QCString trInstanceMethods()
+  Implements 250 of the required methods (100 %).
 
 
 TranslatorGerman   (TranslatorAdapter_1_8_4)  8 methods to implement (3 %)
@@ -760,12 +723,6 @@ TranslatorJapaneseEn   (TranslatorEnglish)  245 methods to implement (98 %)
     virtual QCString latexLanguageSupportCommand()
 
 
-TranslatorKorean   (TranslatorAdapter_1_7_5)
-----------------
-
-  Implements 250 of the required methods (100 %).
-
-
 TranslatorKoreanEn   (TranslatorEnglish)  245 methods to implement (98 %)
 ------------------
 
@@ -780,23 +737,6 @@ TranslatorKoreanEn   (TranslatorEnglish)  245 methods to implement (98 %)
     virtual QCString latexLanguageSupportCommand()
 
 
-TranslatorLatvian   (Translator)  8 methods to implement (3 %)
------------------
-
-  Implements 242 of the required methods (96 %).
-
-  Missing methods (should be implemented):
-
-    virtual QCString trServices()
-    virtual QCString trSingletonGeneratedFromFiles(bool single)
-    virtual QCString trServiceReference(const char * sName)
-    virtual QCString trConstantGroups()
-    virtual QCString trInterfaces()
-    virtual QCString trServiceGeneratedFromFiles(bool single)
-    virtual QCString trConstantGroupReference(const char * namespaceName)
-    virtual QCString trSingletonReference(const char * sName)
-
-
 TranslatorLithuanian   (TranslatorAdapter_1_4_6)  58 methods to implement (23 %)
 --------------------
 
@@ -1275,23 +1215,6 @@ TranslatorSlovene   (TranslatorAdapter_1_4_6)  58 methods to implement (23 %)
     virtual QCString trInstanceMethods()
 
 
-TranslatorSpanish   (TranslatorAdapter_1_8_4)  8 methods to implement (3 %)
------------------
-
-  Implements 242 of the required methods (96 %).
-
-  Missing methods (should be implemented):
-
-    virtual QCString trServices()
-    virtual QCString trSingletonGeneratedFromFiles(bool single)
-    virtual QCString trServiceReference(const char * sName)
-    virtual QCString trConstantGroups()
-    virtual QCString trInterfaces()
-    virtual QCString trServiceGeneratedFromFiles(bool single)
-    virtual QCString trConstantGroupReference(const char * namespaceName)
-    virtual QCString trSingletonReference(const char * sName)
-
-
 TranslatorSwedish   (TranslatorAdapter_1_6_0)  34 methods to implement (13 %)
 -----------------
 

src/language.cpp

@@ -249,7 +249,7 @@ bool setTranslator(const char *langName)
 #ifdef LANG_RU
   else if (L_EQUAL("russian"))
   {
-    theTranslator=new TranslatorDecoder(new TranslatorRussian);
+    theTranslator=new TranslatorRussian;
   }
 #endif
 #ifdef LANG_HR
@@ -273,13 +273,13 @@ bool setTranslator(const char *langName)
 #ifdef LANG_HU
   else if (L_EQUAL("hungarian"))
   {
-    theTranslator=new TranslatorDecoder(new TranslatorHungarian);
+    theTranslator=new TranslatorHungarian;
   }
 #endif
 #ifdef LANG_KR
   else if (L_EQUAL("korean"))
   {
-    theTranslator=new TranslatorDecoder(new TranslatorKorean);
+    theTranslator=new TranslatorKorean;
   }
 #endif
 #ifdef LANG_KE
@@ -291,7 +291,7 @@ bool setTranslator(const char *langName)
 #ifdef LANG_RO
   else if (L_EQUAL("romanian"))
   {
-    theTranslator=new TranslatorDecoder(new TranslatorRomanian);
+    theTranslator=new TranslatorRomanian;
   }
 #endif
 #ifdef LANG_SI
@@ -315,7 +315,7 @@ bool setTranslator(const char *langName)
 #ifdef LANG_NO
   else if (L_EQUAL("norwegian"))
   {
-    theTranslator=new TranslatorDecoder(new TranslatorNorwegian);
+    theTranslator=new TranslatorNorwegian;
   }
 #endif
 #ifdef LANG_BR
@@ -327,7 +327,7 @@ bool setTranslator(const char *langName)
 #ifdef LANG_DK
   else if (L_EQUAL("danish"))
   {
-    theTranslator=new TranslatorDecoder(new TranslatorDanish);
+    theTranslator=new TranslatorDanish;
   }
 #endif
 #ifdef LANG_SK
@@ -369,13 +369,13 @@ bool setTranslator(const char *langName)
 #ifdef LANG_LT
   else if (L_EQUAL("lithuanian"))
   {
-    theTranslator=new TranslatorDecoder(new TranslatorLithuanian);
+    theTranslator=new TranslatorLithuanian;
   }
 #endif
 #ifdef LANG_LV
   else if (L_EQUAL("latvian"))
   {
-    theTranslator=new TranslatorDecoder(new TranslatorLatvian);
+    theTranslator=new TranslatorLatvian;
   }
 #endif
 #ifdef LANG_ZA

src/translator_es.h

@@ -31,9 +31,10 @@
  * Updated to 1.6.4 by Bartomeu Creus Navarro (26-mayo-2010) [(16-jun-2010) grabado en UTF-8]
  * Updated to 1.8.0 by Bartomeu Creus Navarro (11-abril-2012)
  * Updated to 1.8.2 by Bartomeu Creus Navarro (01-julio-2012)
+ * Updated to 1.8.4 by Bartomeu Creus Navarro (17-julio-2013)
  */
 
-class TranslatorSpanish : public TranslatorAdapter_1_8_4
+class TranslatorSpanish : public Translator
 {
   public:
 
@@ -2055,6 +2056,62 @@ class TranslatorSpanish : public TranslatorAdapter_1_8_4
       return "Diseño información general";
     }
 
+//////////////////////////////////////////////////////////////////////////
+// new since 1.8.4
+//////////////////////////////////////////////////////////////////////////
+
+    /** old style UNO IDL services: implemented interfaces */
+    virtual QCString trInterfaces()
+    { return "Interface exportada"; }
+
+    /** old style UNO IDL services: inherited services */
+    virtual QCString trServices()
+    { return "Servicios incluidos"; }
+
+    /** UNO IDL constant groups */
+    virtual QCString trConstantGroups()
+    { return "Grupos constantes"; }
+
+    /** UNO IDL constant groups */
+    virtual QCString trConstantGroupReference(const char *namespaceName)
+    {
+      QCString result=namespaceName;
+      result+=" referencia de grupos constantes";
+      return result;
+    }
+    /** UNO IDL service page title */
+    virtual QCString trServiceReference(const char *sName)
+    {
+      QCString result=(QCString)sName;
+      result+=" Referencia servicio";
+      return result;
+    }
+    /** UNO IDL singleton page title */
+    virtual QCString trSingletonReference(const char *sName)
+    {
+      QCString result=(QCString)sName;
+      result+=" referencia Singleton";
+      return result;
+    }
+    /** UNO IDL service page */
+    virtual QCString trServiceGeneratedFromFiles(bool single)
+    {
+      // single is true implies a single file
+      QCString result=(QCString)"La documentacion para este servicio "
+                                "se ha generado desde ";
+      if (single) result+="el siguiente fichero:"; else result+="los siguientes ficheros:";
+      return result;
+    }
+    /** UNO IDL singleton page */
+    virtual QCString trSingletonGeneratedFromFiles(bool single)
+    {
+      // single is true implies a single file
+      QCString result=(QCString)"La documentación para este singleton "
+                                "se ha generado desde ";
+      if (single) result+="el siguiente fichero:"; else result+="los siguientes ficheros:";
+      return result;
+    }
+
 //////////////////////////////////////////////////////////////////////////
 
 };

src/translator_fr.h

@@ -103,7 +103,7 @@
 // Translator class (by the local maintainer) when the localized
 // translator is made up-to-date again.
 
-class TranslatorFrench : public TranslatorAdapter_1_8_0
+class TranslatorFrench : public Translator
 {
    public:
 

winbuild/.gitignore

+Debug/
+Debug64/
+Release/
+Release64/
+Doxygen.ncb
+Doxygen.suo
+*.user
\ No newline at end of file