summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-12-19 11:51:55 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-12-19 11:51:55 -0300
commitfe95c15c5d1fcf6996da57cfb78bbb2d9b13d260 (patch)
tree33e6acc3e7f2f91ca7e2f53a3ec80be8fc60c9ec
parent833e27a3ecf1af862b1c2174bcbd11de32615135 (diff)
downloadabslibre-fe95c15c5d1fcf6996da57cfb78bbb2d9b13d260.tar.gz
abslibre-fe95c15c5d1fcf6996da57cfb78bbb2d9b13d260.tar.bz2
abslibre-fe95c15c5d1fcf6996da57cfb78bbb2d9b13d260.zip
konqueror: minor fix
-rw-r--r--libre/konqueror/PKGBUILD2
-rw-r--r--libre/konqueror/konq-about-fsdg.diff14
2 files changed, 9 insertions, 7 deletions
diff --git a/libre/konqueror/PKGBUILD b/libre/konqueror/PKGBUILD
index 426126bdd..8e544c0bf 100644
--- a/libre/konqueror/PKGBUILD
+++ b/libre/konqueror/PKGBUILD
@@ -20,7 +20,7 @@ source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgve
'konq-about-fsdg.diff')
md5sums=('364cad4bbea9ff403fc288609b4e4463'
'SKIP'
- 'f7dd7c4177454bdbd538c1aea92356f0')
+ '31c3d842ccc31ddcde2730813dc667da')
validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aacid@kde.org>
prepare() {
diff --git a/libre/konqueror/konq-about-fsdg.diff b/libre/konqueror/konq-about-fsdg.diff
index 8b508c79f..90bcd1dfb 100644
--- a/libre/konqueror/konq-about-fsdg.diff
+++ b/libre/konqueror/konq-about-fsdg.diff
@@ -1,24 +1,26 @@
diff --git a/about/konq_aboutpage.cpp b/about/konq_aboutpage.cpp
-index 0178758..184c810 100644
+index 0178758..fc95efa 100644
--- a/about/konq_aboutpage.cpp
+++ b/about/konq_aboutpage.cpp
-@@ -219,13 +219,10 @@ QString KonqAboutPageSingleton::specs()
+@@ -219,14 +219,11 @@ 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<SUP>&reg;</SUP> support"),
++ QStringLiteral("about:plugins"))
.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"),
-+ .arg(i18n("Netscape Communicator<SUP>&reg;</SUP> <A HREF=\"%1\">plugins</A>",
- QStringLiteral("about:plugins")))
+- QStringLiteral("about:plugins")))
++ .arg(i18n("Netscape Communicator<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"))