Skip to content

Commit 8a0c56c

Browse files
committed
Merge branch 'StackAndPointer-master'
2 parents 64d5266 + 2097388 commit 8a0c56c

18 files changed

Lines changed: 909 additions & 497 deletions

addon/doxywizard/expert.cpp

Lines changed: 164 additions & 163 deletions
Large diffs are not rendered by default.

addon/doxywizard/expert.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ class Expert : public QSplitter, public DocIntf
7373
void createTopics(const QDomElement &);
7474
void saveTopic(QTextStream &t,QDomElement &elem,TextCodecAdapter *codec,bool brief,bool dondensed,bool convert);
7575
void loadConfigXml();
76+
QString convertDoxyCmdToHtml(const QString &s) const;
77+
QString getDocsForNode(const QDomElement &child) const;
7678

7779
QSplitter *m_splitter;
7880
QTextBrowser *m_helper;

addon/doxywizard/translations/doxywizard_de.ts

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,30 @@
6565
<source>This tag requires that the tag %1 is set to &lt;code&gt;YES&lt;/code&gt;.</source>
6666
<translation>Dieses Tag erfordert, dass das Tag %1 auf &lt;code&gt;YES&lt;/code&gt; gesetzt ist.</translation>
6767
</message>
68+
<message>
69+
<source>Note:</source>
70+
<translation>Hinweis:</translation>
71+
</message>
72+
<message>
73+
<source>See also:</source>
74+
<translation>Siehe auch:</translation>
75+
</message>
76+
<message>
77+
<source>Doxygen usage</source>
78+
<translation>Doxygen-Verwendung</translation>
79+
</message>
80+
<message>
81+
<source>External Indexing and Searching</source>
82+
<translation>Externe Indizierung und Suche</translation>
83+
</message>
84+
<message>
85+
<source>Linking to external documentation</source>
86+
<translation>Verknüpfung mit externer Dokumentation</translation>
87+
</message>
88+
<message>
89+
<source>Including formulas</source>
90+
<translation>Formeln einbinden</translation>
91+
</message>
6892
</context>
6993
<context>
7094
<name>HelpLabel</name>

addon/doxywizard/translations/doxywizard_es.ts

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,30 @@
6565
<source>This tag requires that the tag %1 is set to &lt;code&gt;YES&lt;/code&gt;.</source>
6666
<translation>Esta etiqueta requiere que la etiqueta %1 esté establecida en &lt;code&gt;YES&lt;/code&gt;.</translation>
6767
</message>
68+
<message>
69+
<source>Note:</source>
70+
<translation>Nota:</translation>
71+
</message>
72+
<message>
73+
<source>See also:</source>
74+
<translation>Ver también:</translation>
75+
</message>
76+
<message>
77+
<source>Doxygen usage</source>
78+
<translation>Uso de Doxygen</translation>
79+
</message>
80+
<message>
81+
<source>External Indexing and Searching</source>
82+
<translation>Indexación y búsqueda externa</translation>
83+
</message>
84+
<message>
85+
<source>Linking to external documentation</source>
86+
<translation>Enlace a documentación externa</translation>
87+
</message>
88+
<message>
89+
<source>Including formulas</source>
90+
<translation>Inclusión de fórmulas</translation>
91+
</message>
6892
</context>
6993
<context>
7094
<name>HelpLabel</name>

addon/doxywizard/translations/doxywizard_fr.ts

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,30 @@
6565
<source>This tag requires that the tag %1 is set to &lt;code&gt;YES&lt;/code&gt;.</source>
6666
<translation>Cette balise nécessite que la balise %1 soit définie sur &lt;code&gt;YES&lt;/code&gt;.</translation>
6767
</message>
68+
<message>
69+
<source>Note:</source>
70+
<translation>Note :</translation>
71+
</message>
72+
<message>
73+
<source>See also:</source>
74+
<translation>Voir aussi :</translation>
75+
</message>
76+
<message>
77+
<source>Doxygen usage</source>
78+
<translation>Utilisation de Doxygen</translation>
79+
</message>
80+
<message>
81+
<source>External Indexing and Searching</source>
82+
<translation>Indexation et recherche externes</translation>
83+
</message>
84+
<message>
85+
<source>Linking to external documentation</source>
86+
<translation>Lien vers la documentation externe</translation>
87+
</message>
88+
<message>
89+
<source>Including formulas</source>
90+
<translation>Inclusion de formules</translation>
91+
</message>
6892
</context>
6993
<context>
7094
<name>HelpLabel</name>

addon/doxywizard/translations/doxywizard_ja.ts

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,30 @@
6565
<source>This tag requires that the tag %1 is set to &lt;code&gt;YES&lt;/code&gt;.</source>
6666
<translation>このタグはタグ %1 を &lt;code&gt;YES&lt;/code&gt; に設定する必要があります。</translation>
6767
</message>
68+
<message>
69+
<source>Note:</source>
70+
<translation>注:</translation>
71+
</message>
72+
<message>
73+
<source>See also:</source>
74+
<translation>参照:</translation>
75+
</message>
76+
<message>
77+
<source>Doxygen usage</source>
78+
<translation>Doxygenの使用方法</translation>
79+
</message>
80+
<message>
81+
<source>External Indexing and Searching</source>
82+
<translation>外部インデックス作成と検索</translation>
83+
</message>
84+
<message>
85+
<source>Linking to external documentation</source>
86+
<translation>外部ドキュメントへのリンク</translation>
87+
</message>
88+
<message>
89+
<source>Including formulas</source>
90+
<translation>数式の含め方</translation>
91+
</message>
6892
</context>
6993
<context>
7094
<name>HelpLabel</name>

addon/doxywizard/translations/doxywizard_ko.ts

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,30 @@
6565
<source>This tag requires that the tag %1 is set to &lt;code&gt;YES&lt;/code&gt;.</source>
6666
<translation>이 태그는 태그 %1을 &lt;code&gt;YES&lt;/code&gt;로 설정해야 합니다.</translation>
6767
</message>
68+
<message>
69+
<source>Note:</source>
70+
<translation>참고:</translation>
71+
</message>
72+
<message>
73+
<source>See also:</source>
74+
<translation>참조:</translation>
75+
</message>
76+
<message>
77+
<source>Doxygen usage</source>
78+
<translation>Doxygen 사용법</translation>
79+
</message>
80+
<message>
81+
<source>External Indexing and Searching</source>
82+
<translation>외부 인덱싱 및 검색</translation>
83+
</message>
84+
<message>
85+
<source>Linking to external documentation</source>
86+
<translation>외부 문서 연결</translation>
87+
</message>
88+
<message>
89+
<source>Including formulas</source>
90+
<translation>수식 포함</translation>
91+
</message>
6892
</context>
6993
<context>
7094
<name>HelpLabel</name>

addon/doxywizard/translations/doxywizard_ru.ts

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,30 @@
6565
<source>This tag requires that the tag %1 is set to &lt;code&gt;YES&lt;/code&gt;.</source>
6666
<translation>Этот тег требует, чтобы тег %1 был установлен в &lt;code&gt;YES&lt;/code&gt;.</translation>
6767
</message>
68+
<message>
69+
<source>Note:</source>
70+
<translation>Примечание:</translation>
71+
</message>
72+
<message>
73+
<source>See also:</source>
74+
<translation>См. также:</translation>
75+
</message>
76+
<message>
77+
<source>Doxygen usage</source>
78+
<translation>Использование Doxygen</translation>
79+
</message>
80+
<message>
81+
<source>External Indexing and Searching</source>
82+
<translation>Внешнее индексирование и поиск</translation>
83+
</message>
84+
<message>
85+
<source>Linking to external documentation</source>
86+
<translation>Ссылка на внешнюю документацию</translation>
87+
</message>
88+
<message>
89+
<source>Including formulas</source>
90+
<translation>Включение формул</translation>
91+
</message>
6892
</context>
6993
<context>
7094
<name>HelpLabel</name>

addon/doxywizard/translations/doxywizard_zh_CN.ts

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,30 @@
6565
<source>This tag requires that the tag %1 is set to &lt;code&gt;YES&lt;/code&gt;.</source>
6666
<translation>此标签要求标签 %1 设置为 &lt;code&gt;YES&lt;/code&gt;。</translation>
6767
</message>
68+
<message>
69+
<source>Note:</source>
70+
<translation>注意:</translation>
71+
</message>
72+
<message>
73+
<source>See also:</source>
74+
<translation>另请参阅:</translation>
75+
</message>
76+
<message>
77+
<source>Doxygen usage</source>
78+
<translation>Doxygen 用法</translation>
79+
</message>
80+
<message>
81+
<source>External Indexing and Searching</source>
82+
<translation>外部索引和搜索</translation>
83+
</message>
84+
<message>
85+
<source>Linking to external documentation</source>
86+
<translation>链接到外部文档</translation>
87+
</message>
88+
<message>
89+
<source>Including formulas</source>
90+
<translation>包含公式</translation>
91+
</message>
6892
</context>
6993
<context>
7094
<name>HelpLabel</name>

addon/doxywizard/translations/doxywizard_zh_TW.ts

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,30 @@
6565
<source>This tag requires that the tag %1 is set to &lt;code&gt;YES&lt;/code&gt;.</source>
6666
<translation>此標籤要求標籤 %1 設定為 &lt;code&gt;YES&lt;/code&gt;。</translation>
6767
</message>
68+
<message>
69+
<source>Note:</source>
70+
<translation>注意:</translation>
71+
</message>
72+
<message>
73+
<source>See also:</source>
74+
<translation>另請參閱:</translation>
75+
</message>
76+
<message>
77+
<source>Doxygen usage</source>
78+
<translation>Doxygen 用法</translation>
79+
</message>
80+
<message>
81+
<source>External Indexing and Searching</source>
82+
<translation>外部索引和搜尋</translation>
83+
</message>
84+
<message>
85+
<source>Linking to external documentation</source>
86+
<translation>連結到外部文件</translation>
87+
</message>
88+
<message>
89+
<source>Including formulas</source>
90+
<translation>包含公式</translation>
91+
</message>
6892
</context>
6993
<context>
7094
<name>HelpLabel</name>

0 commit comments

Comments
 (0)