summaryrefslogtreecommitdiff
path: root/libre/konqueror/libre.patch
diff options
context:
space:
mode:
Diffstat (limited to 'libre/konqueror/libre.patch')
-rw-r--r--libre/konqueror/libre.patch14
1 files changed, 6 insertions, 8 deletions
diff --git a/libre/konqueror/libre.patch b/libre/konqueror/libre.patch
index 81251960d..f772c625a 100644
--- a/libre/konqueror/libre.patch
+++ b/libre/konqueror/libre.patch
@@ -20,28 +20,26 @@ index 0b1c8782c..8a822fcf8 100644
add_subdirectory( about )
add_subdirectory( pics )
diff --git a/about/konq_aboutpage.cpp b/about/konq_aboutpage.cpp
-index 017875809..fc95efa89 100644
+index 017875809..86d8f0d4c 100644
--- a/about/konq_aboutpage.cpp
+++ b/about/konq_aboutpage.cpp
-@@ -219,14 +219,11 @@ QString KonqAboutPageSingleton::specs()
+@@ -219,13 +219,10 @@ QString KonqAboutPageSingleton::specs()
QStringLiteral("http://www.ecma-international.org/publications/standards/ECMA-262.HTM")))
.arg(i18n("JavaScript disabled (globally). Enable JavaScript <A HREF=\"%1\">here</A>.", QStringLiteral("exec:/kcmshell5 khtml_java_js")))
.arg(i18n("JavaScript enabled (globally). Configure JavaScript <A HREF=\\\"%1\\\">here</A>.", QStringLiteral("exec:/kcmshell5 khtml_java_js"))) // leave the double backslashes here, they are necessary for javascript !
- .arg(i18n("Secure <A HREF=\"%1\">Java</A><SUP>&reg;</SUP> support", QStringLiteral("http://www.oracle.com/technetwork/java/index.html")))
- .arg(i18n("JDK 1.2.0 (Java 2) compatible VM (<A HREF=\"%1\">IBM</A> or <A HREF=\"%2\">Sun/Oracle</A>)",
- QStringLiteral("http://www.ibm.com"), QStringLiteral("http://www.oracle.com/technetwork/java/index.html")))
-+ .arg(i18n("Secure Java<SUP>&reg;</SUP> support"),
-+ QStringLiteral("about:plugins"))
++ .arg(i18n("Secure Java support"))
++ .arg(i18n("JDK 1.2.0 (Java 2) compatible VM"))
.arg(i18n("Enable Java (globally) <A HREF=\"%1\">here</A>.", QStringLiteral("exec:/kcmshell5 khtml_java_js"))) // TODO Maybe test if Java is enabled ?
- .arg(i18n("Netscape Communicator<SUP>&reg;</SUP> <A HREF=\"%4\">plugins</A> (for viewing <A HREF=\"%1\">Flash<SUP>&reg;</SUP></A>, <A HREF=\"%2\">Real<SUP>&reg;</SUP></A>Audio, <A HREF=\"%3\">Real<SUP>&reg;</SUP></A>Video, etc.)",
- QStringLiteral("http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash"),
- QStringLiteral("http://www.real.com"), QStringLiteral("http://www.real.com"),
-- QStringLiteral("about:plugins")))
-+ .arg(i18n("Netscape Communicator<SUP>&reg;</SUP> <A HREF=\"%1\">plugins</A>"),
-+ QStringLiteral("about:plugins"))
++ .arg(i18n("NPAPI<SUP>&reg;</SUP> <A HREF=\"%1\">plugins</A>",
+ QStringLiteral("about:plugins")))
.arg(i18n("built-in"))
.arg(i18n("Secure Sockets Layer"))
- .arg(i18n("(TLS/SSL v2/3) for secure communications up to 168bit"))
@@ -301,8 +298,8 @@ QString KonqAboutPageSingleton::tips()
.arg(i18n("Tips"))
.arg(i18n("Specifications"))