diff --git a/src/core/kprotocolmanager.cpp b/src/core/kprotocolmanager.cpp --- a/src/core/kprotocolmanager.cpp +++ b/src/core/kprotocolmanager.cpp @@ -843,6 +843,8 @@ d->useragent += QString::number(KIO_VERSION_PATCH); d->useragent += QStringLiteral(" (like Gecko) Konqueror/"); d->useragent += QString::number(KIO_VERSION_MAJOR); + d->useragent += QStringLiteral(" kio_http/"); + d->useragent += QString::number(KIO_VERSION_MAJOR); d->useragent += QL1C('.'); d->useragent += QString::number(KIO_VERSION_MINOR); } else { diff --git a/src/kcms/kio/cache.cpp b/src/kcms/kio/cache.cpp --- a/src/kcms/kio/cache.cpp +++ b/src/kcms/kio/cache.cpp @@ -106,7 +106,7 @@ QString CacheConfigModule::quickHelp() const { return i18n( "

Cache

This module lets you configure your cache settings.

" - "

The cache is an internal memory in Konqueror where recently " + "

The cache is an internal memory where recently " "read web pages are stored. If you want to retrieve a web " "page again that you have recently read, it will not be " "downloaded from the Internet, but rather retrieved from the " diff --git a/src/kcms/kio/kcookiesmain.cpp b/src/kcms/kio/kcookiesmain.cpp --- a/src/kcms/kio/kcookiesmain.cpp +++ b/src/kcms/kio/kcookiesmain.cpp @@ -78,20 +78,20 @@ QString KCookiesMain::quickHelp() const { - return i18n ("

Cookies

Cookies contain information that Konqueror" - " (or other KDE applications using the HTTP protocol) stores on your" + return i18n ("

Cookies

Cookies contain information that KDE applications" + " using the HTTP protocol (like Konqueror) store on your" " computer, initiated by a remote Internet server. This means that" " a web server can store information about you and your browsing activities" " on your machine for later use. You might consider this an invasion of" " privacy.

However, cookies are useful in certain situations. For example, they" " are often used by Internet shops, so you can 'put things into a shopping basket'." " Some sites require you have a browser that supports cookies.

" " Because most people want a compromise between privacy and the benefits cookies offer," - " KDE offers you the ability to customize the way it handles cookies. So you might want" - " to set KDE's default policy to ask you whenever a server wants to set a cookie," + " the HTTP kioslave offers you the ability to customize the way it handles cookies. So you might want" + " to set the default policy to ask you whenever a server wants to set a cookie," " allowing you to decide. For your favorite shopping web sites that you trust, you might" " want to set the policy to accept, then you can access the web sites without being prompted" - " every time KDE receives a cookie.

"); + " every time a cookie is received.

"); } diff --git a/src/kcms/kio/kcookiespolicies.cpp b/src/kcms/kio/kcookiespolicies.cpp --- a/src/kcms/kio/kcookiespolicies.cpp +++ b/src/kcms/kio/kcookiespolicies.cpp @@ -430,8 +430,8 @@ QString KCookiesPolicies::quickHelp() const { - return i18n ("

Cookies

Cookies contain information that Konqueror" - " (or any other KDE application using the HTTP protocol) stores" + return i18n ("

Cookies

Cookies contain information that KDE" + " application using the HTTP protocol (like Konqueror) stores" " on your computer from a remote Internet server. This means" " that a web server can store information about you and your" " browsing activities on your machine for later use. You might" diff --git a/src/kcms/kio/smb.desktop b/src/kcms/kio/smb.desktop --- a/src/kcms/kio/smb.desktop +++ b/src/kcms/kio/smb.desktop @@ -95,7 +95,7 @@ Name[zh_CN]=Windows 共享 Name[zh_TW]=Windows 資源共享 -Comment=Use to configure which windows (SMB) filesystems you can browse +Comment=Credentials used to access SMB shares Comment[af]=Gebruik om te konfigureer watter Windows (SMB) lêerstelsels jy kan blaai Comment[ar]=استخدمها لضبط أيّة أنظمة وندوز (SMB) يمكنك تصفّحها Comment[ast]=Úsalo pa configurar qué sistemes de ficheros de Windows (SMB) pues restolar diff --git a/src/kcms/kio/smbrodlg.cpp b/src/kcms/kio/smbrodlg.cpp --- a/src/kcms/kio/smbrodlg.cpp +++ b/src/kcms/kio/smbrodlg.cpp @@ -173,21 +173,10 @@ QString SMBRoOptions::quickHelp() const { - return i18n("

Windows Shares

Konqueror is able to access shared " - "Microsoft Windows file systems, if properly configured. If there is a " - "specific computer from which you want to browse, fill in " - "the Browse server field. This is mandatory if you " - "are not running Samba locally. The Broadcast address " - "and WINS address fields will also be available, if you " - "use the native code, or the location of the 'smb.conf' file " - "from which the options are read, when using Samba. In any case, the " - "broadcast address (interfaces in smb.conf) must be set up if it " - "is guessed incorrectly or you have multiple cards. A WINS server " - "usually improves performance, and reduces the network load a lot.

" - "The bindings are used to assign a default user for a given server, " - "possibly with the corresponding password, or for accessing specific " - "shares. If you choose to, new bindings will be created for logins and " - "shares accessed during browsing. You can edit all of them from here. " + return i18n("

Windows Shares

Applications using the " + "SMB kioslave (like Konqueror) are able to access shared Microsoft " + "Windows file systems, if properly configured.

You can specify " + "here the credentils used to access the shared resources. " "Passwords will be stored locally, and scrambled so as to render them " "unreadable to the human eye. For security reasons, you may not want to " "do that, as entries with passwords are clearly indicated as such.

"); diff --git a/src/kcms/kio/useragent.desktop b/src/kcms/kio/useragent.desktop --- a/src/kcms/kio/useragent.desktop +++ b/src/kcms/kio/useragent.desktop @@ -96,7 +96,7 @@ Name[zh_CN]=浏览器识别 Name[zh_TW]=瀏覽器識別 -Comment=Configure the way Konqueror reports itself +Comment=Configure the User Agent exposed by the HTTP kioslave Comment[af]=Stel die manier waarop Konqueror homself raporteer op Comment[ar]=اضبط كيف يُخبر «كنكر» عن نفسه Comment[as]=Konqueror নিজৰ বিষয়ে প্ৰতিবেদন কৰাৰ ব্যৱহাৰ বিন্যাস কৰক diff --git a/src/kcms/kio/useragentdlg.cpp b/src/kcms/kio/useragentdlg.cpp --- a/src/kcms/kio/useragentdlg.cpp +++ b/src/kcms/kio/useragentdlg.cpp @@ -370,10 +370,11 @@ QString UserAgentDlg::quickHelp() const { - return i18n ("

Browser Identification

" - "The browser-identification module allows you to have full " - "control over how Konqueror will identify itself to web " - "sites you browse.

" + return i18n ("

Browser Identification

" + "

The browser-identification module allows you to have full " + "full control over how KDE applications using the HTTP " + "protocol (like Konqueror) will identify itself to web sites " + "you browse.

" "

This ability to fake identification is necessary because " "some web sites do not display properly when they detect that " "they are not talking to current versions of either Netscape "