diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-12-07 17:00:41 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-12-07 17:00:41 -0300 |
| commit | 3734b1ff855a5738195c6ff3def244d7b2e23e50 (patch) | |
| tree | a4afb881617539f17c75b0ddc58902569d847809 /libre/kdebase-konqueror-libre/konq-about-fsdg.diff | |
| parent | d4eb5f4f523f90878c8d5ab59e6012ca401ca355 (diff) | |
| parent | 7de07e40e2c0c078a35c5092e1f2defb65d1741e (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/znc/PKGBUILD
extra/hugin/PKGBUILD
extra/kdeplasma-addons/PKGBUILD
extra/postgresql/PKGBUILD
extra/talloc/PKGBUILD
Diffstat (limited to 'libre/kdebase-konqueror-libre/konq-about-fsdg.diff')
| -rw-r--r-- | libre/kdebase-konqueror-libre/konq-about-fsdg.diff | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libre/kdebase-konqueror-libre/konq-about-fsdg.diff b/libre/kdebase-konqueror-libre/konq-about-fsdg.diff index 06b2103c3..93ef4016a 100644 --- a/libre/kdebase-konqueror-libre/konq-about-fsdg.diff +++ b/libre/kdebase-konqueror-libre/konq-about-fsdg.diff @@ -16,7 +16,7 @@ diff -ru kde-baseapps-4.8.0.orig/konqueror/about/konq_aboutpage.cc kde-baseapps- - 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")) ) ++ QString("about:plugins")) ) .arg( i18n("built-in") ) .arg( i18n("Secure Sockets Layer") ) .arg( i18n("(TLS/SSL v2/3) for secure communications up to 168bit") ) @@ -27,7 +27,7 @@ diff -ru kde-baseapps-4.8.0.orig/konqueror/about/konq_aboutpage.cc kde-baseapps- - .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 " ++ "using DuckDuckGo HTML, 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")) ) |