diff options
| author | Márcio Alexandre Silva Delgado <coadde@adinet.com.uy> | 2012-09-07 17:07:54 -0300 |
|---|---|---|
| committer | Márcio Alexandre Silva Delgado <coadde@adinet.com.uy> | 2012-09-07 17:07:54 -0300 |
| commit | b30c16972d82a5e38abc806c5ff7ff8fa6092078 (patch) | |
| tree | c3bb807cb224df230d480d2459ade2d85deabd73 /libre-testing/kdebase-konqueror-libre/konq-about-fsdg.diff | |
| parent | 2ed9ad7c09499c2a5c7c7686d94e4feb99d301b1 (diff) | |
| parent | ff63cc25b625225f1469985eaefa611ae7623811 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'libre-testing/kdebase-konqueror-libre/konq-about-fsdg.diff')
| -rw-r--r-- | libre-testing/kdebase-konqueror-libre/konq-about-fsdg.diff | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/libre-testing/kdebase-konqueror-libre/konq-about-fsdg.diff b/libre-testing/kdebase-konqueror-libre/konq-about-fsdg.diff deleted file mode 100644 index 06b2103c3..000000000 --- a/libre-testing/kdebase-konqueror-libre/konq-about-fsdg.diff +++ /dev/null @@ -1,33 +0,0 @@ -diff -ru kde-baseapps-4.8.0.orig/konqueror/about/konq_aboutpage.cc kde-baseapps-4.8.0/konqueror/about/konq_aboutpage.cc ---- kde-baseapps-4.8.0.orig/konqueror/about/konq_aboutpage.cc 2012-01-30 19:28:59.506176399 +0100 -+++ kde-baseapps-4.8.0/konqueror/about/konq_aboutpage.cc 2012-01-30 19:34:50.695537153 +0100 -@@ -214,14 +214,11 @@ - QString("http://www.ecma-international.org/publications/standards/ECMA-262.HTM")) ) - .arg( i18n("JavaScript disabled (globally). Enable JavaScript <A HREF=\"%1\">here</A>.", QString("exec:/kcmshell4 khtml_java_js")) ) - .arg( i18n("JavaScript enabled (globally). Configure JavaScript <A HREF=\\\"%1\\\">here</A>.", QString("exec:/kcmshell4 khtml_java_js")) ) // leave the double backslashes here, they are necessary for javascript ! -- .arg( i18n("Secure <A HREF=\"%1\">Java</A><SUP>®</SUP> support", QString("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>)", -- QString("http://www.ibm.com"), QString("http://www.oracle.com/technetwork/java/index.html")) ) -+ .arg( i18n("Secure Java<SUP>®</SUP> support") ) -+ .arg( i18n("JDK 1.2.0 (Java 2) compatible VM") ) - .arg( i18n("Enable Java (globally) <A HREF=\"%1\">here</A>.", QString("exec:/kcmshell4 khtml_java_js")) ) // TODO Maybe test if Java is enabled ? -- .arg( i18n("Netscape Communicator<SUP>®</SUP> <A HREF=\"%4\">plugins</A> (for viewing <A HREF=\"%1\">Flash<SUP>®</SUP></A>, <A HREF=\"%2\">Real<SUP>®</SUP></A>Audio, <A HREF=\"%3\">Real<SUP>®</SUP></A>Video, etc.)", -- QString("http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash"), -- QString("http://www.real.com"), QString("http://www.real.com"), -- QString("about:plugins")) ) -+ .arg( i18n("Netscape Communicator<SUP>®</SUP> <A HREF=\"%1\">plugins</A> ", -+ QString("about:plugins")) ) - .arg( i18n("built-in") ) - .arg( i18n("Secure Sockets Layer") ) - .arg( i18n("(TLS/SSL v2/3) for secure communications up to 168bit") ) -@@ -293,8 +290,8 @@ - .arg( i18n( "Tips" ) ) - .arg( i18n( "Specifications" ) ) - .arg( i18n( "Tips & Tricks" ) ) -- .arg( i18n( "Use Web-Shortcuts: by typing \"gg: KDE\" one can search the Internet, " -- "using Google, for the search phrase \"KDE\". There are a lot of " -+ .arg( i18n( "Use Web-Shortcuts: by typing \"dd: KDE\" one can search the Internet, " -+ "using DuckDuckGo, for the search phrase \"KDE\". There are a lot of " - "Web-Shortcuts predefined to make searching for software or looking " - "up certain words in an encyclopedia a breeze. You can even " - "<a href=\"%1\">create your own</a> Web-Shortcuts." , QString("exec:/kcmshell4 ebrowsing")) ) |