[kde-doc-english] [kde-baseapps/frameworks] /: Merge branch 'Applications/14.12' into frameworks

[Emmanuel Pescosta]

Git commit fec1ee0bf321d6f4d9937c597c1c1145e5da70a9 by Emmanuel Pescosta.
Committed on 28/01/2015 at 16:13.
Pushed by emmanuelp into branch 'frameworks'.

Merge branch 'Applications/14.12' into frameworks

Conflicts:
	dolphin/src/main.cpp
	kdepasswd/kcm/kcm_useraccount.desktop
	konqueror/settings/ebrowsing/ebrowsing.desktop
	konqueror/settings/kio/cache.desktop
	konqueror/settings/kio/cookies.desktop
	konqueror/settings/kio/netpref.desktop
	konqueror/settings/kio/proxy.desktop
	konqueror/settings/kio/smb.desktop
	konqueror/settings/kio/uasproviders/firefox30oncurrent.desktop
	konqueror/settings/kio/uasproviders/ie90onwinnt71.desktop
	konqueror/settings/kio/useragent.desktop
	lib/konq/konq_operations.cpp

R  +4    -4    dolphin/docs/index.docbook
M  +24   -0    dolphin/src/dolphin.appdata.xml
M  +2    -2    dolphin/src/kitemviews/kitemlistwidget.cpp
M  +6    -9    dolphin/src/panels/information/phononwidget.cpp
M  +1    -1    konqueror/konqbrowser.desktop
M  +3    -2    konqueror/settings/konq/fileappearance.desktop
M  +4    -4    konqueror/settings/konq/filebehavior.desktop
M  +3    -2    konqueror/settings/konq/webappearance.desktop
M  +3    -3    konqueror/settings/konq/webbehavior.desktop
M  +3    -2    konqueror/settings/konqhtml/css/kcmcss.desktop
M  +2    -2    konqueror/settings/konqhtml/khtml_appearance.desktop
M  +2    -2    konqueror/settings/konqhtml/khtml_behavior.desktop
M  +2    -2    konqueror/settings/konqhtml/khtml_general.desktop
M  +3    -3    konqueror/settings/konqhtml/khtml_java_js.desktop
M  +2    -2    konqueror/settings/performance/kcmkonqyperformance.desktop
M  +2    -2    konqueror/settings/performance/kcmperformance.desktop
M  +2    -2    konqueror/sidebar/history_module/kcmhistory.desktop
M  +1    -1    konqueror/src/konqmainwindow.cpp
R  +1    -1    lib/konq/src/konqdndpopupmenuplugin.desktop
M  +3    -2    nsplugins/khtml_plugins.desktop

http://commits.kde.org/kde-baseapps/fec1ee0bf321d6f4d9937c597c1c1145e5da70a9