Merge branch 'master' of github.com:doxygen/doxygen

doxygen · Sep 11, 2016 · ca38847 · ca38847
2 parents 6c6b847 + b38efd1
commit ca38847
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 7 deletions.
diff --git a/src/config.xml b/src/config.xml
@@ -3411,6 +3411,14 @@ to be found in the default search path.
  java can find the \c plantuml.jar file. If left blank, it is assumed PlantUML is not used or 
  called during a preprocessing step. Doxygen will generate a warning when it encounters a 
  \ref cmdstartuml "\\startuml" command in this case and will not generate output for the diagram.
+]]>
+      </docs>
+    </option>
+    <option type='string' id='PLANTUML_CFG_FILE' format='file' defval=''>
+      <docs>
+<![CDATA[
+ When using plantuml, the \c PLANTUML_CFG_FILE tag can be used to specify a configuration 
+ file for plantuml.
 ]]>
       </docs>
     </option>

diff --git a/src/plantuml.cpp b/src/plantuml.cpp
@@ -54,6 +54,7 @@ QCString writePlantUMLSource(const QCString &outDir,const QCString &fileName,con
 void generatePlantUMLOutput(const char *baseName,const char *outDir,PlantUMLOutputFormat format)
 {
   static QCString plantumlJarPath = Config_getString(PLANTUML_JAR_PATH);
+  static QCString plantumlConfigFile = Config_getString(PLANTUML_CFG_FILE);
 
   QCString pumlExe = "java";
   QCString pumlArgs = "";
@@ -74,6 +75,12 @@ void generatePlantUMLOutput(const char *baseName,const char *outDir,PlantUMLOutp
   }
   if (pumlIncludePathList.first()) pumlArgs += "\" ";
   pumlArgs += "-Djava.awt.headless=true -jar \""+plantumlJarPath+"plantuml.jar\" ";
+  if (plantumlConfigFile != "")
+  {
+    pumlArgs += "-config \"";
+    pumlArgs += plantumlConfigFile;
+    pumlArgs += "\" ";
+  }
   pumlArgs+="-o \"";
   pumlArgs+=outDir;
   pumlArgs+="\" ";

diff --git a/src/translator_pl.h b/src/translator_pl.h
@@ -863,11 +863,11 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
     }
     QCString trGotoGraphicalHierarchy()
     {
-      return "Idź do graficznej hierarchi klas";
+      return "Idź do graficznej hierarchii klas";
     }
     QCString trGotoTextualHierarchy()
     {
-      return "Idź do tekstowej hierarchi klas";
+      return "Idź do tekstowej hierarchii klas";
     }
     QCString trPageIndex()
     {
@@ -992,7 +992,7 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
         "class Nieudokumentowana { };\n\n"
         "/*! Klasa, która jest dziedziczona publicznie */\n"
         "class PublicznaBaza : public Okrojona { };\n\n"
-        "/*! A template class */\n"
+        "/*! Szablon klasy */\n"
         "template<class T> class Templ { };\n\n"
         "/*! Klasa, która jest dziedziczona przy użyciu dziedziczenia chronionego */\n"
         "class ChronionaBaza { };\n\n"
@@ -1380,7 +1380,7 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
      */
     virtual QCString trAll()
     {
-      return "All";
+      return "Wszystko";
     }
     /*! Put in front of the call graph for a function. */
     virtual QCString trCallGraph()
@@ -1475,7 +1475,7 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
      */
     virtual QCString trDirDescription()
     {
-      return "Ta struktura katalogów jest posortowana jest z grubsza, "
+      return "Ta struktura katalogów posortowana jest z grubsza, "
              "choć nie całkowicie, alfabetycznie:";
     }
 
@@ -1653,7 +1653,7 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
       }
       else
       {
-        result+="modułów do których składowe te należą:";
+        result+="modułów, do których składowe te należą:";
       }
       return result;
     }
@@ -1731,7 +1731,7 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2
     /*! directory relation for \a name */
     virtual QCString trDirRelation(const char *name)
     {
-      return "Relcja "+ QCString(name);
+      return "Relacja "+ QCString(name);
     }
 
     /*! Loading message shown when loading search results */