aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Wingerd <qt@adaptivetime.com>2018-12-10 16:15:31 -0500
committerGravis <qt@adaptivetime.com>2018-12-14 10:44:18 +0000
commitb8a4050bab8c51e1b4a16a0de9134ddedc69bb06 (patch)
tree25eff8fe1f7eb992d7072e2d2fa87ebe97b73402
parente3026623a3682cad7d89d97876cb3dd5b6d9de7e (diff)
help plugin: strip html from a translatable string
Change-Id: I4c147c969ae04c50ca2d6fd40143919236f97679 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
-rw-r--r--share/qtcreator/translations/qtcreator_cs.ts8
-rw-r--r--share/qtcreator/translations/qtcreator_da.ts8
-rw-r--r--share/qtcreator/translations/qtcreator_de.ts8
-rw-r--r--share/qtcreator/translations/qtcreator_fr.ts8
-rw-r--r--share/qtcreator/translations/qtcreator_ja.ts8
-rw-r--r--share/qtcreator/translations/qtcreator_pl.ts8
-rw-r--r--share/qtcreator/translations/qtcreator_ru.ts8
-rw-r--r--share/qtcreator/translations/qtcreator_sl.ts9
-rw-r--r--share/qtcreator/translations/qtcreator_uk.ts8
-rw-r--r--share/qtcreator/translations/qtcreator_zh_CN.ts8
-rw-r--r--share/qtcreator/translations/qtcreator_zh_TW.ts8
-rw-r--r--src/plugins/help/helpplugin.cpp10
12 files changed, 72 insertions, 27 deletions
diff --git a/share/qtcreator/translations/qtcreator_cs.ts b/share/qtcreator/translations/qtcreator_cs.ts
index 0b0ad9d144..f0ea644990 100644
--- a/share/qtcreator/translations/qtcreator_cs.ts
+++ b/share/qtcreator/translations/qtcreator_cs.ts
@@ -11172,8 +11172,12 @@ Přidat, upravit a odstranit dokumentové filtry, které v režimu nápovědy ur
<translation>Žádný filtr</translation>
</message>
<message>
- <source>&lt;html&gt;&lt;head&gt;&lt;title&gt;No Documentation&lt;/title&gt;&lt;/head&gt;&lt;body&gt;&lt;br/&gt;&lt;center&gt;&lt;b&gt;%1&lt;/b&gt;&lt;br/&gt;No documentation available.&lt;/center&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;title&gt;Dokumentace chybí&lt;/title&gt;&lt;/head&gt;&lt;body&gt;&lt;br/&gt;&lt;center&gt;&lt;b&gt;%1&lt;/b&gt;&lt;br/&gt;Není dostupná žádná dokumentace.&lt;/center&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <source>No Documentation</source>
+ <translation>Dokumentace chybí</translation>
+ </message>
+ <message>
+ <source>No documentation available.</source>
+ <translation>Není dostupná žádná dokumentace.</translation>
</message>
<message>
<source>Close current page</source>
diff --git a/share/qtcreator/translations/qtcreator_da.ts b/share/qtcreator/translations/qtcreator_da.ts
index 9f86f80192..41fd7c673c 100644
--- a/share/qtcreator/translations/qtcreator_da.ts
+++ b/share/qtcreator/translations/qtcreator_da.ts
@@ -19956,8 +19956,12 @@ Tilføj, ændr, og fjern dokumentfiltre, som beslutter hvilke dokumentationssæt
<translation>Ufiltreret</translation>
</message>
<message>
- <source>&lt;html&gt;&lt;head&gt;&lt;title&gt;No Documentation&lt;/title&gt;&lt;/head&gt;&lt;body&gt;&lt;br/&gt;&lt;center&gt;&lt;font color=&quot;%1&quot;&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/font&gt;&lt;br/&gt;&lt;font color=&quot;%3&quot;&gt;No documentation available.&lt;/font&gt;&lt;/center&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;title&gt;Ingen dokumentation&lt;/title&gt;&lt;/head&gt;&lt;body&gt;&lt;br/&gt;&lt;center&gt;&lt;font color=&quot;%1&quot;&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/font&gt;&lt;br/&gt;&lt;font color=&quot;%3&quot;&gt;Ingen tilgængelig dokumentation.&lt;/font&gt;&lt;/center&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <source>No Documentation</source>
+ <translation>Ingen dokumentation</translation>
+ </message>
+ <message>
+ <source>No documentation available.</source>
+ <translation>Ingen tilgængelig dokumentation.</translation>
</message>
<message>
<source>System Information</source>
diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts
index 005d2e5dbe..278c9f2afa 100644
--- a/share/qtcreator/translations/qtcreator_de.ts
+++ b/share/qtcreator/translations/qtcreator_de.ts
@@ -5630,8 +5630,12 @@ Add, modify, and remove document filters, which determine the documentation set
<translation>Systeminformationen...</translation>
</message>
<message>
- <source>&lt;html&gt;&lt;head&gt;&lt;title&gt;No Documentation&lt;/title&gt;&lt;/head&gt;&lt;body&gt;&lt;br/&gt;&lt;center&gt;&lt;font color=&quot;%1&quot;&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/font&gt;&lt;br/&gt;&lt;font color=&quot;%3&quot;&gt;No documentation available.&lt;/font&gt;&lt;/center&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;title&gt;Dokumentation fehlt&lt;/title&gt;&lt;/head&gt;&lt;body&gt;&lt;br/&gt;&lt;center&gt;&lt;font color=&quot;%1&quot;&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/font&gt;&lt;br/&gt;&lt;font color=&quot;%3&quot;&gt;Es ist keine Dokumentation verfügbar.&lt;/font&gt;&lt;/center&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <source>No Documentation</source>
+ <translation>Dokumentation fehlt</translation>
+ </message>
+ <message>
+ <source>No documentation available.</source>
+ <translation>Es ist keine Dokumentation verfügbar.</translation>
</message>
<message>
<source>System Information</source>
diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts
index 16d3b30473..f1677fa36e 100644
--- a/share/qtcreator/translations/qtcreator_fr.ts
+++ b/share/qtcreator/translations/qtcreator_fr.ts
@@ -12589,8 +12589,12 @@ Ajouter, modifier et supprimer des filtres de documents, lesquels déterminent l
<translation>Sans filtre</translation>
</message>
<message>
- <source>&lt;html&gt;&lt;head&gt;&lt;title&gt;No Documentation&lt;/title&gt;&lt;/head&gt;&lt;body&gt;&lt;br/&gt;&lt;center&gt;&lt;b&gt;%1&lt;/b&gt;&lt;br/&gt;No documentation available.&lt;/center&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;title&gt;Aucune documentation&lt;/title&gt;&lt;/head&gt;&lt;body&gt;&lt;br/&gt;&lt;center&gt;&lt;b&gt;%1&lt;/b&gt;&lt;br/&gt;Aucune documentation disponible.&lt;/center&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <source>No Documentation</source>
+ <translation>Aucune documentation</translation>
+ </message>
+ <message>
+ <source>No documentation available.</source>
+ <translation>Aucune documentation disponible.</translation>
</message>
<message>
<source>Close current page</source>
diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts
index 8d66d620dc..890908ed99 100644
--- a/share/qtcreator/translations/qtcreator_ja.ts
+++ b/share/qtcreator/translations/qtcreator_ja.ts
@@ -19383,8 +19383,12 @@ msysgit が、git bash 外で実行された時に自身のインストール先
<translation>バグの報告...</translation>
</message>
<message>
- <source>&lt;html&gt;&lt;head&gt;&lt;title&gt;No Documentation&lt;/title&gt;&lt;/head&gt;&lt;body&gt;&lt;br/&gt;&lt;center&gt;&lt;font color=&quot;%1&quot;&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/font&gt;&lt;br/&gt;&lt;font color=&quot;%3&quot;&gt;No documentation available.&lt;/font&gt;&lt;/center&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;title&gt;ドキュメントがありません&lt;/title&gt;&lt;/head&gt;&lt;body&gt;&lt;br/&gt;&lt;center&gt;&lt;font color=&quot;%1&quot;&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/font&gt;&lt;br/&gt;&lt;font color=&quot;%3&quot;&gt;使用可能なドキュメントがありません。&lt;/font&gt;&lt;/center&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <source>No Documentation</source>
+ <translation>ドキュメントがありません</translation>
+ </message>
+ <message>
+ <source>No documentation available.</source>
+ <translation>使用可能なドキュメントがありません。</translation>
</message>
<message>
<source>Open Pages</source>
diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts
index 4930bb60bc..a088b92e29 100644
--- a/share/qtcreator/translations/qtcreator_pl.ts
+++ b/share/qtcreator/translations/qtcreator_pl.ts
@@ -6945,8 +6945,12 @@ Dodaj, zmodyfikuj lub usuń filtry dokumentów, które determinują zestaw dokum
<translation>Informacje o systemie...</translation>
</message>
<message>
- <source>&lt;html&gt;&lt;head&gt;&lt;title&gt;No Documentation&lt;/title&gt;&lt;/head&gt;&lt;body&gt;&lt;br/&gt;&lt;center&gt;&lt;font color=&quot;%1&quot;&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/font&gt;&lt;br/&gt;&lt;font color=&quot;%3&quot;&gt;No documentation available.&lt;/font&gt;&lt;/center&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;title&gt;Brak dokumentacji&lt;/title&gt;&lt;/head&gt;&lt;body&gt;&lt;br/&gt;&lt;center&gt;&lt;font color=&quot;%1&quot;&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/font&gt;&lt;br/&gt;&lt;font color=&quot;%3&quot;&gt;Brak dostępnej dokumentacji.&lt;/font&gt;&lt;/center&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <source>No Documentation</source>
+ <translation>Brak dokumentacji</translation>
+ </message>
+ <message>
+ <source>No documentation available.</source>
+ <translation>Brak dostępnej dokumentacji.</translation>
</message>
<message>
<source>System Information</source>
diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts
index 12099db2d0..df0feda19c 100644
--- a/share/qtcreator/translations/qtcreator_ru.ts
+++ b/share/qtcreator/translations/qtcreator_ru.ts
@@ -21224,8 +21224,12 @@ Add, modify, and remove document filters, which determine the documentation set
<translation>Информация о системе...</translation>
</message>
<message>
- <source>&lt;html&gt;&lt;head&gt;&lt;title&gt;No Documentation&lt;/title&gt;&lt;/head&gt;&lt;body&gt;&lt;br/&gt;&lt;center&gt;&lt;font color=&quot;%1&quot;&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/font&gt;&lt;br/&gt;&lt;font color=&quot;%3&quot;&gt;No documentation available.&lt;/font&gt;&lt;/center&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;title&gt;Документация отсутствует&lt;/title&gt;&lt;/head&gt;&lt;body&gt;&lt;br/&gt;&lt;center&gt;&lt;font color=&quot;%1&quot;&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/font&gt;&lt;br/&gt;&lt;font color=&quot;%3&quot;&gt;Нет доступной документации.&lt;/font&gt;&lt;/center&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <source>No Documentation</source>
+ <translation>Документация отсутствует</translation>
+ </message>
+ <message>
+ <source>No documentation available.</source>
+ <translation>Нет доступной документации.</translation>
</message>
<message>
<source>System Information</source>
diff --git a/share/qtcreator/translations/qtcreator_sl.ts b/share/qtcreator/translations/qtcreator_sl.ts
index 8b7d3004e5..ca8f7d46bb 100644
--- a/share/qtcreator/translations/qtcreator_sl.ts
+++ b/share/qtcreator/translations/qtcreator_sl.ts
@@ -8144,9 +8144,12 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr
<translation>Nefiltrirano</translation>
</message>
<message>
- <location line="+359"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;title&gt;No Documentation&lt;/title&gt;&lt;/head&gt;&lt;body&gt;&lt;br/&gt;&lt;center&gt;&lt;b&gt;%1&lt;/b&gt;&lt;br/&gt;No documentation available.&lt;/center&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;title&gt;Ni dokumentacije&lt;/title&gt;&lt;/head&gt;&lt;body&gt;&lt;br/&gt;&lt;center&gt;&lt;b&gt;%1&lt;/b&gt;&lt;br/&gt;Na voljo ni nobene dokumentacije.&lt;/center&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <source>No Documentation</source>
+ <translation>Ni dokumentacije</translation>
+ </message>
+ <message>
+ <source>No documentation available.</source>
+ <translation>Na voljo ni nobene dokumentacije.</translation>
</message>
<message>
<location line="+99"/>
diff --git a/share/qtcreator/translations/qtcreator_uk.ts b/share/qtcreator/translations/qtcreator_uk.ts
index f7990954c0..f7de935b70 100644
--- a/share/qtcreator/translations/qtcreator_uk.ts
+++ b/share/qtcreator/translations/qtcreator_uk.ts
@@ -12589,8 +12589,12 @@ Add, modify, and remove document filters, which determine the documentation set
<translation>Повідомити про помилку...</translation>
</message>
<message>
- <source>&lt;html&gt;&lt;head&gt;&lt;title&gt;No Documentation&lt;/title&gt;&lt;/head&gt;&lt;body&gt;&lt;br/&gt;&lt;center&gt;&lt;font color=&quot;%1&quot;&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/font&gt;&lt;br/&gt;&lt;font color=&quot;%3&quot;&gt;No documentation available.&lt;/font&gt;&lt;/center&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;title&gt;Немає документації&lt;/title&gt;&lt;/head&gt;&lt;body&gt;&lt;br/&gt;&lt;center&gt;&lt;font color=&quot;%1&quot;&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/font&gt;&lt;br/&gt;&lt;font color=&quot;%3&quot;&gt;Немає доступної документації.&lt;/font&gt;&lt;/center&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <source>No Documentation</source>
+ <translation>Немає документації</translation>
+ </message>
+ <message>
+ <source>No documentation available.</source>
+ <translation>Немає доступної документації.</translation>
</message>
<message>
<source>Increase Font Size</source>
diff --git a/share/qtcreator/translations/qtcreator_zh_CN.ts b/share/qtcreator/translations/qtcreator_zh_CN.ts
index 74d7dac92c..8e6d46bd95 100644
--- a/share/qtcreator/translations/qtcreator_zh_CN.ts
+++ b/share/qtcreator/translations/qtcreator_zh_CN.ts
@@ -10514,8 +10514,12 @@ Add, modify, and remove document filters, which determine the documentation set
<translation>未过滤</translation>
</message>
<message>
- <source>&lt;html&gt;&lt;head&gt;&lt;title&gt;No Documentation&lt;/title&gt;&lt;/head&gt;&lt;body&gt;&lt;br/&gt;&lt;center&gt;&lt;b&gt;%1&lt;/b&gt;&lt;br/&gt;No documentation available.&lt;/center&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;title&gt;没有文档&lt;/title&gt;&lt;/head&gt;&lt;body&gt;&lt;br/&gt;&lt;center&gt;&lt;b&gt;%1&lt;/b&gt;&lt;br/&gt;没有可用文档。&lt;/center&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <source>No Documentation</source>
+ <translation>没有文档</translation>
+ </message>
+ <message>
+ <source>No documentation available.</source>
+ <translation>没有可用文档。</translation>
</message>
<message>
<source>Close current page</source>
diff --git a/share/qtcreator/translations/qtcreator_zh_TW.ts b/share/qtcreator/translations/qtcreator_zh_TW.ts
index 4e1339a0cd..253df6a449 100644
--- a/share/qtcreator/translations/qtcreator_zh_TW.ts
+++ b/share/qtcreator/translations/qtcreator_zh_TW.ts
@@ -6678,8 +6678,12 @@ Add, modify, and remove document filters, which determine the documentation set
<translation>未過濾</translation>
</message>
<message>
- <source>&lt;html&gt;&lt;head&gt;&lt;title&gt;No Documentation&lt;/title&gt;&lt;/head&gt;&lt;body&gt;&lt;br/&gt;&lt;center&gt;&lt;b&gt;%1&lt;/b&gt;&lt;br/&gt;No documentation available.&lt;/center&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;title&gt;沒有文件&lt;/title&gt;&lt;/head&gt;&lt;body&gt;&lt;br/&gt;&lt;center&gt;&lt;b&gt;%1&lt;/b&gt;&lt;br/&gt;沒有可用文件。&lt;/center&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <source>No Documentation</source>
+ <translation>沒有文件</translation>
+ </message>
+ <message>
+ <source>No documentation available.</source>
+ <translation>沒有可用文件。</translation>
</message>
<message>
<source>Close current page</source>
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index 78dcad316c..b8710006dc 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -685,14 +685,16 @@ void HelpPluginPrivate::showContextHelp(const QString &contextHelpId)
if (!source.isValid()) {
// No link found or no context object
showInHelpViewer(QUrl(Help::Constants::AboutBlank), viewer);
- viewer->setHtml(HelpPlugin::tr("<html><head><title>No Documentation</title>"
+ viewer->setHtml(QString("<html><head><title>%1</title>"
"</head><body><br/><center>"
- "<font color=\"%1\"><b>%2</b></font><br/>"
- "<font color=\"%3\">No documentation available.</font>"
+ "<font color=\"%2\"><b>%3</b></font><br/>"
+ "<font color=\"%4\">%5</font>"
"</center></body></html>")
+ .arg(HelpPlugin::tr("No Documentation"))
.arg(creatorTheme()->color(Theme::TextColorNormal).name())
.arg(contextHelpId)
- .arg(creatorTheme()->color(Theme::TextColorNormal).name()));
+ .arg(creatorTheme()->color(Theme::TextColorNormal).name())
+ .arg(HelpPlugin::tr("No documentation available.")));
} else {
showInHelpViewer(source, viewer); // triggers loadFinished which triggers id highlighting
}