summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
m---------admin0
m---------cmake0
-rw-r--r--doc/adminguide/groupware-kontact.docbook18
-rw-r--r--doc/faq/about.docbook19
-rw-r--r--doc/faq/filemng.docbook17
-rw-r--r--doc/faq/index.docbook15
-rw-r--r--doc/faq/nontdeapps.docbook18
-rw-r--r--doc/faq/panel.docbook18
-rw-r--r--doc/faq/questions.docbook18
-rw-r--r--doc/kate/index.docbook11
-rw-r--r--doc/kcontrol/index.docbook7
-rw-r--r--doc/keditbookmarks/bookmarks.docbook10
-rw-r--r--doc/keditbookmarks/index.docbook11
-rw-r--r--doc/kfind/index.docbook12
-rw-r--r--doc/khelpcenter/contact.docbook11
-rw-r--r--doc/khelpcenter/index.docbook12
-rw-r--r--doc/klipper/index.docbook18
-rw-r--r--doc/kmenuedit/index.docbook8
-rw-r--r--doc/knetattach/index.docbook13
-rw-r--r--doc/kompmgr/index.docbook8
-rw-r--r--doc/konqueror/basics.docbook11
-rw-r--r--doc/konqueror/bookmarks.docbook10
-rw-r--r--doc/konqueror/browser.docbook11
-rw-r--r--doc/konqueror/commands.docbook10
-rw-r--r--doc/konqueror/config.docbook10
-rw-r--r--doc/konqueror/credits.docbook10
-rw-r--r--doc/konqueror/faq.docbook10
-rw-r--r--doc/konqueror/filemanager.docbook10
-rw-r--r--doc/konqueror/index.docbook10
-rw-r--r--doc/konqueror/introduction.docbook11
-rw-r--r--doc/konqueror/man-kbookmarkmerger.1.docbook1
-rw-r--r--doc/konqueror/path-complete.docbook10
-rw-r--r--doc/konqueror/plugins.docbook10
-rw-r--r--doc/konqueror/save-settings.docbook10
-rw-r--r--doc/konqueror/sidebar.docbook10
-rw-r--r--doc/konsole/index.docbook11
-rw-r--r--doc/kpager/index.docbook9
-rw-r--r--doc/ksplashml/index.docbook12
-rw-r--r--doc/ksysguard/index.docbook8
-rw-r--r--doc/kwrite/index.docbook11
-rw-r--r--doc/kxkb/index.docbook8
-rw-r--r--doc/quickstart/index.docbook9
-rw-r--r--doc/releasenotes/r14.0.9.docbook26
-rw-r--r--doc/tdeprint/index.docbook12
-rw-r--r--doc/tdeprint/tech-overview.docbook15
-rw-r--r--doc/tdesu/index.docbook8
-rw-r--r--doc/tdm/index.docbook8
-rw-r--r--doc/userguide/accessibility.docbook18
-rw-r--r--doc/userguide/base-tde-applications.docbook18
-rw-r--r--doc/userguide/browser-fine-tuning.docbook18
-rw-r--r--doc/userguide/burning-cds.docbook18
-rw-r--r--doc/userguide/control-center.docbook19
-rw-r--r--doc/userguide/creating-graphics.docbook18
-rw-r--r--doc/userguide/credits-and-license.docbook17
-rw-r--r--doc/userguide/customizing-desktop.docbook18
-rw-r--r--doc/userguide/email.docbook18
-rw-r--r--doc/userguide/file-sharing.docbook18
-rw-r--r--doc/userguide/font-installation.docbook18
-rw-r--r--doc/userguide/getting-help.docbook18
-rw-r--r--doc/userguide/glossary.docbook18
-rw-r--r--doc/userguide/index.docbook18
-rw-r--r--doc/userguide/internet-shortcuts.docbook18
-rw-r--r--doc/userguide/konsole-intro.docbook18
-rw-r--r--doc/userguide/messaging-intro.docbook18
-rw-r--r--doc/userguide/migrator-dictionary.docbook18
-rw-r--r--doc/userguide/net-connection-setup.docbook20
-rw-r--r--doc/userguide/networking-with-windows.docbook18
-rw-r--r--doc/userguide/panel-and-desktop.docbook18
-rw-r--r--doc/userguide/pdf-files.docbook18
-rw-r--r--doc/userguide/playing-audiocds.docbook18
-rw-r--r--doc/userguide/playing-movies.docbook18
-rw-r--r--doc/userguide/playing-music.docbook18
-rw-r--r--doc/userguide/printer-setup.docbook18
-rw-r--r--doc/userguide/printing-from-apps.docbook18
-rw-r--r--doc/userguide/programs-and-documents.docbook18
-rw-r--r--doc/userguide/programs-controlling.docbook17
-rw-r--r--doc/userguide/removable-disks.docbook18
-rw-r--r--doc/userguide/screen-captures.docbook18
-rw-r--r--doc/userguide/shared-sessions.docbook18
-rw-r--r--doc/userguide/standard-menu-entries.docbook18
-rw-r--r--doc/userguide/switching-sessions.docbook18
-rw-r--r--doc/userguide/tde-as-root.docbook18
-rw-r--r--doc/userguide/tde-edutainment.docbook18
-rw-r--r--doc/userguide/the-filemanager.docbook20
-rw-r--r--doc/userguide/troubleshooting-no-open.docbook18
-rw-r--r--doc/userguide/under-the-hood.docbook18
-rw-r--r--doc/userguide/usenet.docbook18
-rw-r--r--doc/userguide/where-next.docbook18
-rw-r--r--doc/userguide/windows-how-to.docbook17
-rw-r--r--doc/userguide/your-tde-account.docbook18
-rw-r--r--kate/app/kateapp.cpp2
-rw-r--r--kate/app/kateappIface.cpp2
-rw-r--r--kate/app/katedocmanager.cpp2
-rw-r--r--kate/app/katedocmanager.h1
-rw-r--r--kate/app/kateexternaltools.cpp1
-rw-r--r--kate/app/katefilelist.cpp3
-rw-r--r--kate/app/katefilelist.h1
-rw-r--r--kate/app/katefileselector.cpp1
-rw-r--r--kate/app/katefileselector.h1
-rw-r--r--kate/app/katemain.cpp2
-rw-r--r--kate/app/katemainwindow.cpp2
-rw-r--r--kate/app/katemainwindow.h2
-rw-r--r--kate/app/katemdi.cpp2
-rw-r--r--kate/app/katemdi.h2
-rw-r--r--kate/app/katemwmodonhddialog.cpp2
-rw-r--r--kate/app/katemwmodonhddialog.h1
-rw-r--r--kate/app/katesession.cpp2
-rw-r--r--kate/app/kateviewmanager.cpp2
-rw-r--r--kate/app/kateviewspace.cpp1
-rw-r--r--kate/app/kateviewspace.h1
-rw-r--r--kate/app/kateviewspacecontainer.cpp2
-rw-r--r--kate/app/kwritemain.cpp1
-rw-r--r--kate/app/kwritemain.h1
-rw-r--r--kate/interfaces/mainwindow.cpp2
-rw-r--r--kate/interfaces/mainwindow.h2
-rw-r--r--kcontrol/background/bgadvanced.cpp2
-rw-r--r--kcontrol/background/bgadvanced.h2
-rw-r--r--kcontrol/background/bgdefaults.h2
-rw-r--r--kcontrol/background/bgdialog.cpp1
-rw-r--r--kcontrol/background/bgmonitor.cpp3
-rw-r--r--kcontrol/background/bgmonitor.h3
-rw-r--r--kcontrol/background/bgrender.cpp3
-rw-r--r--kcontrol/background/bgrender.h3
-rw-r--r--kcontrol/background/bgsettings.cpp3
-rw-r--r--kcontrol/background/bgsettings.h3
-rw-r--r--kcontrol/background/bgwallpaper.cpp2
-rw-r--r--kcontrol/background/bgwallpaper.h2
-rw-r--r--kcontrol/background/crossfade.h3
-rw-r--r--kcontrol/background/main.cpp2
-rw-r--r--kcontrol/background/main.h2
-rw-r--r--kcontrol/componentchooser/componentchooser.cpp2
-rw-r--r--kcontrol/displayconfig/displayconfig.cpp21
-rw-r--r--kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.cpp2
-rw-r--r--kcontrol/energy/energy.cpp5
-rw-r--r--kcontrol/energy/energy.h5
-rw-r--r--kcontrol/fonts/fonts.cpp2
-rw-r--r--kcontrol/hwmanager/CMakeLists.txt4
-rw-r--r--kcontrol/hwmanager/devicepropsdlg.cpp101
-rw-r--r--kcontrol/hwmanager/devicepropsdlg.h11
-rw-r--r--kcontrol/hwmanager/devicepropsdlgbase.ui31
-rw-r--r--kcontrol/hwmanager/hwdevicetray_bindings.cpp1
-rw-r--r--kcontrol/hwmanager/passworddlg.cpp59
-rw-r--r--kcontrol/hwmanager/passworddlg.h58
-rw-r--r--kcontrol/hwmanager/unlockdialog.ui161
-rw-r--r--kcontrol/icons/icons.cpp2
-rw-r--r--kcontrol/icons/icons.h2
-rw-r--r--kcontrol/input/core/themepage.cpp2
-rw-r--r--kcontrol/input/core/themepage.h2
-rw-r--r--kcontrol/input/xcursor/previewwidget.cpp3
-rw-r--r--kcontrol/input/xcursor/previewwidget.h2
-rw-r--r--kcontrol/input/xcursor/themepage.cpp3
-rw-r--r--kcontrol/input/xcursor/themepage.h2
-rw-r--r--kcontrol/kcontrol/about/kcontrol.css3
-rw-r--r--kcontrol/kcontrol/about/main.html1
-rw-r--r--kcontrol/kcontrol/proxywidget.cpp2
-rw-r--r--kcontrol/konq/desktop.cpp1
-rw-r--r--kcontrol/konqhtml/appearance.h1
-rw-r--r--kcontrol/kthememanager/knewthemedlg.cpp1
-rw-r--r--kcontrol/kthememanager/knewthemedlg.h1
-rw-r--r--kcontrol/kthememanager/ktheme.cpp1
-rw-r--r--kcontrol/kthememanager/ktheme.h1
-rw-r--r--kcontrol/kthememanager/kthememanager.cpp1
-rw-r--r--kcontrol/kthememanager/kthememanager.h1
-rw-r--r--kcontrol/locale/TIMEZONES2
-rw-r--r--kcontrol/randr/configdialog.cpp1
-rw-r--r--kcontrol/randr/configdialog.h1
-rw-r--r--kcontrol/randr/tderandrbindings.cpp1
-rw-r--r--kcontrol/style/kcmstyle.cpp2
-rw-r--r--kcontrol/style/kcmstyle.h2
-rw-r--r--kcontrol/style/menupreview.cpp3
-rw-r--r--kcontrol/style/menupreview.h1
-rw-r--r--kcontrol/style/stylepreview.ui.h2
-rw-r--r--kcontrol/tdm/background.cpp2
-rw-r--r--kcontrol/tdm/background.h2
-rw-r--r--kdesktop/bgmanager.cc3
-rw-r--r--kdesktop/bgmanager.h2
-rw-r--r--kdesktop/minicli.cpp3
-rw-r--r--kdesktop/pixmapserver.cc2
-rw-r--r--kdesktop/pixmapserver.h2
-rw-r--r--khelpcenter/DESIGN2
-rw-r--r--khelpcenter/application.cpp2
-rw-r--r--khelpcenter/application.h1
-rw-r--r--khelpcenter/docentry.cpp1
-rw-r--r--khelpcenter/docentry.h1
-rw-r--r--khelpcenter/docentrytraverser.cpp1
-rw-r--r--khelpcenter/docentrytraverser.h1
-rw-r--r--khelpcenter/docmetainfo.cpp1
-rw-r--r--khelpcenter/docmetainfo.h1
-rw-r--r--khelpcenter/fontdialog.cpp1
-rw-r--r--khelpcenter/fontdialog.h1
-rw-r--r--khelpcenter/formatter.cpp2
-rw-r--r--khelpcenter/formatter.h2
-rw-r--r--khelpcenter/glossary.cpp1
-rw-r--r--khelpcenter/glossary.h1
-rw-r--r--khelpcenter/history.cpp1
-rw-r--r--khelpcenter/history.h1
-rw-r--r--khelpcenter/htmlsearch.cpp2
-rw-r--r--khelpcenter/htmlsearch.h1
-rw-r--r--khelpcenter/htmlsearchconfig.cpp1
-rw-r--r--khelpcenter/htmlsearchconfig.h1
-rw-r--r--khelpcenter/infotree.cpp1
-rw-r--r--khelpcenter/infotree.h1
-rw-r--r--khelpcenter/kcmhelpcenter.cpp2
-rw-r--r--khelpcenter/kcmhelpcenter.h1
-rw-r--r--khelpcenter/khc_indexbuilder.cpp2
-rw-r--r--khelpcenter/khc_indexbuilder.h2
-rw-r--r--khelpcenter/mainwindow.cpp2
-rw-r--r--khelpcenter/mainwindow.h1
-rw-r--r--khelpcenter/navigator.cpp2
-rw-r--r--khelpcenter/navigator.h1
-rw-r--r--khelpcenter/navigatorappitem.cpp2
-rw-r--r--khelpcenter/navigatorappitem.h1
-rw-r--r--khelpcenter/navigatoritem.cpp2
-rw-r--r--khelpcenter/navigatoritem.h2
-rw-r--r--khelpcenter/plugintraverser.cpp2
-rw-r--r--khelpcenter/plugintraverser.h1
-rw-r--r--khelpcenter/scopeitem.h1
-rw-r--r--khelpcenter/scrollkeepertreebuilder.cpp1
-rw-r--r--khelpcenter/scrollkeepertreebuilder.h1
-rw-r--r--khelpcenter/searchengine.cpp2
-rw-r--r--khelpcenter/searchengine.h1
-rw-r--r--khelpcenter/searchwidget.cpp2
-rw-r--r--khelpcenter/searchwidget.h1
-rw-r--r--khelpcenter/testmetainfo.cpp1
-rw-r--r--khelpcenter/toc.cpp1
-rw-r--r--khelpcenter/toc.h1
-rw-r--r--khelpcenter/treebuilder.cpp2
-rw-r--r--khelpcenter/treebuilder.h1
-rw-r--r--khelpcenter/version.h1
-rw-r--r--khelpcenter/view.cpp1
-rw-r--r--khelpcenter/view.h2
-rw-r--r--kicker/extensions/kasbar/kasaboutdlg.h2
-rw-r--r--kicker/extensions/kasbar/kasbar.h5
-rw-r--r--kicker/extensions/kasbar/kasbarextension.h2
-rw-r--r--kicker/extensions/kasbar/kasclockitem.h3
-rw-r--r--kicker/extensions/kasbar/kasgrouper.h2
-rw-r--r--kicker/extensions/kasbar/kasgroupitem.h5
-rw-r--r--kicker/extensions/kasbar/kasitem.h2
-rw-r--r--kicker/extensions/kasbar/kasloaditem.h3
-rw-r--r--kicker/extensions/kasbar/kaspopup.h2
-rw-r--r--kicker/extensions/kasbar/kasprefsdlg.h4
-rw-r--r--kicker/extensions/kasbar/kasresources.h2
-rw-r--r--kicker/extensions/kasbar/kasstartupitem.h3
-rw-r--r--kicker/extensions/kasbar/kastasker.h2
-rw-r--r--kicker/extensions/kasbar/kastaskitem.h3
-rw-r--r--kicker/extensions/kasbar/kastaskpopup.h2
-rw-r--r--kicker/kicker/ui/browser_mnu.cpp2
-rw-r--r--kicker/kicker/ui/hidebutton.cpp2
-rw-r--r--kicker/kicker/ui/hidebutton.h2
-rw-r--r--kicker/kicker/ui/itemview.cpp2
-rw-r--r--kicker/kicker/ui/k_new_mnu.cpp2
-rw-r--r--kicker/kicker/ui/kickoff_bar.cpp1
-rw-r--r--kicker/libkicker/simplebutton.cpp2
-rw-r--r--kicker/libkicker/simplebutton.h2
-rw-r--r--kicker/menuext/kate/katesessionmenu.cpp2
-rw-r--r--kicker/menuext/kate/katesessionmenu.h2
-rw-r--r--klipper/applet.cpp1
-rw-r--r--klipper/applet.h1
-rw-r--r--klipper/clipboardpoll.cpp1
-rw-r--r--klipper/clipboardpoll.h1
-rw-r--r--klipper/configdialog.cpp1
-rw-r--r--klipper/configdialog.h1
-rw-r--r--klipper/history.cpp1
-rw-r--r--klipper/history.h1
-rw-r--r--klipper/historyimageitem.cpp1
-rw-r--r--klipper/historyimageitem.h1
-rw-r--r--klipper/historyitem.cpp1
-rw-r--r--klipper/historyitem.h1
-rw-r--r--klipper/historystringitem.cpp1
-rw-r--r--klipper/historystringitem.h1
-rw-r--r--klipper/historyurlitem.cpp1
-rw-r--r--klipper/historyurlitem.h1
-rw-r--r--klipper/klipperbindings.cpp1
-rw-r--r--klipper/klipperpopup.cpp1
-rw-r--r--klipper/klipperpopup.h1
-rw-r--r--klipper/main.cpp1
-rw-r--r--klipper/popupproxy.cpp1
-rw-r--r--klipper/popupproxy.h1
-rw-r--r--klipper/toplevel.cpp1
-rw-r--r--klipper/toplevel.h1
-rw-r--r--klipper/urlgrabber.cpp1
-rw-r--r--klipper/urlgrabber.h1
-rw-r--r--klipper/version.h1
-rw-r--r--knetattach/knetattach.ui.h2
-rw-r--r--konqueror/about/intro.html1
-rw-r--r--konqueror/about/launch.html1
-rw-r--r--konqueror/about/specs.html1
-rw-r--r--konqueror/about/tips.html1
-rw-r--r--konqueror/delayedinitializer.cc3
-rw-r--r--konqueror/delayedinitializer.h2
-rw-r--r--konqueror/keditbookmarks/actionsimpl.cpp2
-rw-r--r--konqueror/keditbookmarks/actionsimpl.h2
-rw-r--r--konqueror/keditbookmarks/bookmarkinfo.cpp1
-rw-r--r--konqueror/keditbookmarks/bookmarkinfo.h1
-rw-r--r--konqueror/keditbookmarks/bookmarkiterator.cpp2
-rw-r--r--konqueror/keditbookmarks/bookmarkiterator.h2
-rw-r--r--konqueror/keditbookmarks/commands.cpp2
-rw-r--r--konqueror/keditbookmarks/commands.h1
-rw-r--r--konqueror/keditbookmarks/dcop.cpp2
-rw-r--r--konqueror/keditbookmarks/dcop.h2
-rw-r--r--konqueror/keditbookmarks/exporters.cpp2
-rw-r--r--konqueror/keditbookmarks/favicons.cpp2
-rw-r--r--konqueror/keditbookmarks/favicons.h2
-rw-r--r--konqueror/keditbookmarks/importers.cpp2
-rw-r--r--konqueror/keditbookmarks/importers.h2
-rw-r--r--konqueror/keditbookmarks/kinsertionsort.h2
-rw-r--r--konqueror/keditbookmarks/listview.cpp2
-rw-r--r--konqueror/keditbookmarks/listview.h1
-rw-r--r--konqueror/keditbookmarks/main.cpp2
-rw-r--r--konqueror/keditbookmarks/testlink.cpp2
-rw-r--r--konqueror/keditbookmarks/toplevel.cpp2
-rw-r--r--konqueror/keditbookmarks/toplevel.h2
-rw-r--r--konqueror/keditbookmarks/updater.cpp2
-rw-r--r--konqueror/keditbookmarks/updater.h2
-rw-r--r--konqueror/konq_extensionmanager.cc2
-rw-r--r--konqueror/konq_extensionmanager.h2
-rw-r--r--konqueror/konq_mainwindow.cc32
-rw-r--r--konqueror/konq_mainwindow.h2
-rw-r--r--konqueror/konq_view.cc2
-rw-r--r--konqueror/konq_view.h2
-rw-r--r--konqueror/konq_viewmgr.cc1
-rw-r--r--konsole/konsole/fontembedder.cpp2
-rw-r--r--konsole/konsole/konsole_part.h2
-rw-r--r--kpersonalizer/stylepreview.ui.h2
-rw-r--r--ksysguard/gui/SensorDisplayLib/ListViewSettings.cc4
-rw-r--r--ksysguard/gui/SensorDisplayLib/ListViewSettings.h3
-rw-r--r--ksysguard/gui/SensorDisplayLib/MultiMeterSettings.cc4
-rw-r--r--ksysguard/gui/SensorDisplayLib/MultiMeterSettings.h4
-rw-r--r--ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.cc4
-rw-r--r--ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.h4
-rw-r--r--ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.cc4
-rw-r--r--ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.h3
-rw-r--r--ksystraycmd/ksystraycmd.h2
-rw-r--r--libkonq/favicons/favicons.cpp2
-rw-r--r--libkonq/favicons/favicons.h2
-rw-r--r--libkonq/konq_iconviewwidget.cc2
-rw-r--r--libkonq/konq_popupmenu.cc76
-rw-r--r--libkonq/konq_sound.cc2
-rw-r--r--libkonq/konq_sound.h2
-rw-r--r--libkonq/konq_xmlguiclient.cc17
-rw-r--r--libkonq/konq_xmlguiclient.h22
-rw-r--r--libkonq/tdefileivi.cc27
-rw-r--r--nsplugins/nspluginloader.cpp2
-rw-r--r--nsplugins/sdk/jni_md.h2
-rw-r--r--nsplugins/sdk/jri.h1
-rw-r--r--nsplugins/sdk/jri_md.h1
-rw-r--r--nsplugins/sdk/jritypes.h1
-rw-r--r--nsplugins/sdk/npapi.h1
-rw-r--r--nsplugins/sdk/npruntime.h1
-rw-r--r--nsplugins/sdk/npupp.h1
-rw-r--r--nsplugins/sdk/obsolete/protypes.h1
-rw-r--r--nsplugins/sdk/prcpucfg.h1
-rw-r--r--nsplugins/sdk/prtypes.h1
-rw-r--r--nsplugins/viewer/nsplugin.cpp1
-rw-r--r--tdeioslave/man/man2html.cpp2
-rw-r--r--tdeioslave/media/libmediacommon/medium.cpp225
-rw-r--r--tdeioslave/media/libmediacommon/medium.h105
-rw-r--r--tdeioslave/media/mediaimpl.cpp10
-rw-r--r--tdeioslave/media/mediamanager/dialog.cpp2
-rw-r--r--tdeioslave/media/mediamanager/fstabbackend.cpp12
-rw-r--r--tdeioslave/media/mediamanager/halbackend.cpp138
-rw-r--r--tdeioslave/media/mediamanager/medialist.cpp50
-rw-r--r--tdeioslave/media/mediamanager/mediamanager.cpp7
-rw-r--r--tdeioslave/media/mediamanager/removablebackend.cpp7
-rw-r--r--tdeioslave/media/mediamanager/tdehardwarebackend.cpp505
-rw-r--r--tdeioslave/media/mediamanager/tdehardwarebackend.h12
-rw-r--r--tdeioslave/media/mimetypes/cd-r_encrypted_locked.desktop1
-rw-r--r--tdeioslave/media/mimetypes/cd-r_encrypted_unlocked.desktop1
-rw-r--r--tdeioslave/media/mimetypes/cd-rw_encrypted_locked.desktop1
-rw-r--r--tdeioslave/media/mimetypes/cd-rw_encrypted_unlocked.desktop1
-rw-r--r--tdeioslave/media/mimetypes/cdrom_encrypted_locked.desktop1
-rw-r--r--tdeioslave/media/mimetypes/cdrom_encrypted_unlocked.desktop1
-rw-r--r--tdeioslave/media/mimetypes/dvd_encrypted_locked.desktop1
-rw-r--r--tdeioslave/media/mimetypes/dvd_encrypted_unlocked.desktop1
-rw-r--r--tdeioslave/media/mimetypes/hdd_encrypted_locked.desktop1
-rw-r--r--tdeioslave/media/mimetypes/hdd_encrypted_unlocked.desktop1
-rw-r--r--tdeioslave/media/mimetypes/removable_encrypted_locked.desktop1
-rw-r--r--tdeioslave/media/mimetypes/removable_encrypted_unlocked.desktop1
-rw-r--r--tdeioslave/media/mounthelper/dialog.cpp11
-rw-r--r--tdeioslave/media/mounthelper/dialog.h3
-rw-r--r--tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp468
-rw-r--r--tdeioslave/media/mounthelper/tdeio_media_mounthelper.h30
-rw-r--r--tdeioslave/media/mounthelper/unlockdialog.ui42
-rw-r--r--tdeioslave/media/services/CMakeLists.txt3
-rw-r--r--tdeioslave/media/services/Makefile.am2
-rw-r--r--tdeioslave/media/services/media_decrypt.desktop11
-rw-r--r--tdeioslave/media/services/media_eject.desktop6
-rw-r--r--tdeioslave/media/services/media_lock.desktop10
-rw-r--r--tdeioslave/media/services/media_mount.desktop6
-rw-r--r--tdeioslave/media/services/media_safelyremove.desktop6
-rw-r--r--tdeioslave/media/services/media_unlock.desktop11
-rw-r--r--tdeioslave/media/services/media_unmount.desktop6
-rw-r--r--tdeioslave/settings/tdeio_settings.cc2
-rw-r--r--tdeioslave/sftp/process.cpp2
-rw-r--r--tdeioslave/sftp/process.h2
-rw-r--r--tdeioslave/sftp/sftpfileattr.cpp1
-rw-r--r--tdeioslave/smtp/capabilities.cc2
-rw-r--r--tdeioslave/smtp/capabilities.h2
-rw-r--r--tdeioslave/smtp/command.cc2
-rw-r--r--tdeioslave/smtp/command.h2
-rw-r--r--tdeioslave/smtp/interactivesmtpserver.cc2
-rw-r--r--tdeioslave/smtp/interactivesmtpserver.h3
-rw-r--r--tdeioslave/smtp/request.cc2
-rw-r--r--tdeioslave/smtp/request.h2
-rw-r--r--tdeioslave/smtp/response.cc2
-rw-r--r--tdeioslave/smtp/response.h2
-rw-r--r--tdeioslave/smtp/smtp.h2
-rw-r--r--tdeioslave/smtp/transactionstate.cc2
-rw-r--r--tdeioslave/smtp/transactionstate.h2
-rw-r--r--tdeioslave/tar/tar.cc2
-rw-r--r--tdepasswd/passwd.cpp2
-rw-r--r--tdepasswd/passwd.h2
-rw-r--r--tdepasswd/passwddlg.cpp2
-rw-r--r--tdepasswd/passwddlg.h2
-rw-r--r--tdepasswd/tdepasswd.cpp2
-rw-r--r--tdesu/tdesu/sudlg.cpp2
-rw-r--r--tdesu/tdesu/sudlg.h2
-rw-r--r--tdesu/tdesu/tdesu.cpp2
-rw-r--r--tdesu/tdesud/handler.h2
-rw-r--r--tdesu/tdesud/lexer.cpp2
-rw-r--r--tdesu/tdesud/lexer.h2
-rw-r--r--tdesu/tdesud/repo.cpp2
-rw-r--r--tdesu/tdesud/repo.h2
-rw-r--r--tdesu/tdesud/secure.cpp2
-rw-r--r--tdesu/tdesud/secure.h2
-rw-r--r--tdesu/tdesud/tdesud.cpp2
-rw-r--r--tdm/backend/consolekit.c2
-rw-r--r--tdm/backend/consolekit.h2
-rw-r--r--translations/desktop_files/applnk-compat/cs.po21
-rw-r--r--translations/desktop_files/applnk-compat/sk.po21
-rw-r--r--translations/desktop_files/applnk-directories/cs.po30
-rw-r--r--translations/desktop_files/applnk-directories/sk.po53
-rw-r--r--translations/desktop_files/drkonqi-presets/cs.po21
-rw-r--r--translations/desktop_files/drkonqi-presets/sk.po27
-rw-r--r--translations/desktop_files/kappfinder-data/sk.po122
-rw-r--r--translations/desktop_files/kappfinder.desktop/cs.po15
-rw-r--r--translations/desktop_files/kappfinder.desktop/pl.po16
-rw-r--r--translations/desktop_files/kappfinder.desktop/sk.po15
-rw-r--r--translations/desktop_files/kate-desktops/cs.po17
-rw-r--r--translations/desktop_files/kate-desktops/sk.po17
-rw-r--r--translations/desktop_files/kcontrol-color-schemes/sk.po33
-rw-r--r--translations/desktop_files/kcontrol-desktops/cs.po21
-rw-r--r--translations/desktop_files/kcontrol-desktops/mk.po12
-rw-r--r--translations/desktop_files/kcontrol-desktops/pl.po45
-rw-r--r--translations/desktop_files/kcontrol-desktops/uz.po8
-rw-r--r--translations/desktop_files/kcontrol-desktops/uz@cyrillic.po8
-rw-r--r--translations/desktop_files/kdcop.desktop/cs.po28
-rw-r--r--translations/desktop_files/kdesktop-icons/cs.po45
-rw-r--r--translations/desktop_files/khelpcenter-desktops/cs.po20
-rw-r--r--translations/desktop_files/kicker-desktops/cs.po37
-rw-r--r--translations/desktop_files/kicker-desktops/pl.po23
-rw-r--r--translations/desktop_files/klipper-desktops/cs.po19
-rw-r--r--translations/desktop_files/kmenuedit.desktop/cs.po16
-rw-r--r--translations/desktop_files/knetattach.desktop/cs.po15
-rw-r--r--translations/desktop_files/konqueror-desktops/cs.po39
-rw-r--r--translations/desktop_files/konqueror-desktops/pl.po34
-rw-r--r--translations/desktop_files/konsole-desktops/cs.po17
-rw-r--r--translations/desktop_files/konsole-desktops/pl.po43
-rw-r--r--translations/desktop_files/konsole-eventsrc/cs.po35
-rw-r--r--translations/desktop_files/kpager.desktop/cs.po15
-rw-r--r--translations/desktop_files/kpager.desktop/pl.po16
-rw-r--r--translations/desktop_files/kpersonalizer.desktop/cs.po15
-rw-r--r--translations/desktop_files/kpersonalizer.desktop/pl.po16
-rw-r--r--translations/desktop_files/ksplash-desktops/cs.po25
-rw-r--r--translations/desktop_files/ksplash-desktops/pl.po17
-rw-r--r--translations/desktop_files/ksplash-themes/cs.po75
-rw-r--r--translations/desktop_files/ksysguard-desktops/cs.po16
-rw-r--r--translations/desktop_files/ksysguard-desktops/pl.po15
-rw-r--r--translations/desktop_files/ksysguard-eventsrc/cs.po18
-rw-r--r--translations/desktop_files/ktip.desktop/cs.po15
-rw-r--r--translations/desktop_files/ktip.desktop/pl.po16
-rw-r--r--translations/desktop_files/l10n-desktops/pl.po16
-rw-r--r--translations/desktop_files/libkonq-desktops/cs.po17
-rw-r--r--translations/desktop_files/libkonq-desktops/pl.po16
-rw-r--r--translations/desktop_files/tde_release_notes.desktop/cs.po23
-rw-r--r--translations/desktop_files/tdeintegration.desktop/cs.po28
-rw-r--r--translations/desktop_files/tdeioslave-desktops/af.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/ar.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/az.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/be.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/bg.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/bn.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/br.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/bs.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/ca.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/ca@valencia.po21
-rw-r--r--translations/desktop_files/tdeioslave-desktops/cs.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/csb.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/cy.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/da.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/de.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/el.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/en_GB.po21
-rw-r--r--translations/desktop_files/tdeioslave-desktops/eo.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/es.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/et.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/eu.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/fa.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/fi.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/fr.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/fy.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/ga.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/gl.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/he.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/hi.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/hr.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/hsb.po21
-rw-r--r--translations/desktop_files/tdeioslave-desktops/hu.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/ia.po21
-rw-r--r--translations/desktop_files/tdeioslave-desktops/id.po21
-rw-r--r--translations/desktop_files/tdeioslave-desktops/is.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/it.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/ja.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/ka.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/kk.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/km.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/kn.po21
-rw-r--r--translations/desktop_files/tdeioslave-desktops/ko.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/lo.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/lt.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/lv.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/mk.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/ml.po21
-rw-r--r--translations/desktop_files/tdeioslave-desktops/mn.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/ms.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/mt.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/nb.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/nds.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/ne.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/nl.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/nn.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/nso.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/oc.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/pa.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/pl.po74
-rw-r--r--translations/desktop_files/tdeioslave-desktops/pt.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/pt_BR.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/ro.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/ru.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/rw.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/se.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/sk.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/sl.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/sr.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/sr@Latn.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/sr@ijekavian.po21
-rw-r--r--translations/desktop_files/tdeioslave-desktops/sr@ijekavianlatin.po21
-rw-r--r--translations/desktop_files/tdeioslave-desktops/sr@latin.po21
-rw-r--r--translations/desktop_files/tdeioslave-desktops/ss.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/sv.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/ta.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/tdeioslave-desktops.pot21
-rw-r--r--translations/desktop_files/tdeioslave-desktops/te.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/tg.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/th.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/tr.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/tt.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/uk.po29
-rw-r--r--translations/desktop_files/tdeioslave-desktops/uz.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/uz@cyrillic.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/ven.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/vi.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/wa.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/xh.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/zh_CN.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/zh_TW.po25
-rw-r--r--translations/desktop_files/tdeioslave-desktops/zu.po25
-rw-r--r--translations/desktop_files/tdeprint-desktops/cs.po22
-rw-r--r--translations/desktop_files/tdeprint-desktops/pl.po16
-rw-r--r--translations/desktop_files/tdm-sessions/cs.po17
-rw-r--r--translations/desktop_files/tdm-sessions/pl.po16
-rw-r--r--translations/desktop_files/tdm-themes/cs.po21
-rw-r--r--translations/desktop_files/tdm-themes/pl.po22
-rw-r--r--translations/desktop_files/twin-clients-desktops/cs.po25
-rw-r--r--translations/desktop_files/twin-clients-desktops/pl.po24
-rw-r--r--translations/desktop_files/twin-clients-desktops/sk.po27
-rw-r--r--translations/desktop_files/twin-desktops/cs.po31
-rw-r--r--translations/desktop_files/twin-desktops/pl.po30
-rw-r--r--translations/desktop_files/twin-desktops/sk.po50
-rw-r--r--translations/desktop_files/twin-eventsrc/sk.po31
-rw-r--r--translations/desktop_files/wallpapers-desktops/pl.po40
-rw-r--r--translations/desktop_files/wallpapers-desktops/sk.po47
-rw-r--r--twin/clients/b2/b2client.cpp3
-rw-r--r--twin/clients/b2/config/config.cpp1
-rw-r--r--twin/clients/b2/config/config.h2
-rw-r--r--twin/clients/default/config/config.cpp1
-rw-r--r--twin/clients/default/config/config.h1
-rw-r--r--twin/clients/default/kdedefault.cpp3
-rw-r--r--twin/clients/default/kdedefault.h2
-rw-r--r--twin/clients/keramik/config/config.cpp2
-rw-r--r--twin/clients/keramik/config/config.h2
-rw-r--r--twin/clients/keramik/embedtool.cpp4
-rw-r--r--twin/clients/keramik/keramik.cpp4
-rw-r--r--twin/clients/keramik/keramik.h2
-rw-r--r--twin/clients/laptop/laptopclient.cpp2
-rw-r--r--twin/clients/modernsystem/modernsys.cpp2
-rw-r--r--twin/clients/quartz/config/config.cpp1
-rw-r--r--twin/clients/quartz/config/config.h2
-rw-r--r--twin/clients/quartz/quartz.cpp2
-rw-r--r--twin/clients/quartz/quartz.h2
-rw-r--r--twin/clients/redmond/redmond.cpp2
-rw-r--r--twin/clients/redmond/redmond.h2
-rw-r--r--twin/clients/web/Web.cpp2
-rw-r--r--twin/clients/web/Web.h2
-rw-r--r--twin/clients/web/WebButton.cpp3
-rw-r--r--twin/clients/web/WebButton.h3
-rw-r--r--twin/kcmtwin/twindecoration/buttons.cpp2
-rw-r--r--twin/kcmtwin/twindecoration/buttons.h2
-rw-r--r--twin/kcmtwin/twindecoration/pixmaps.h2
-rw-r--r--twin/kcmtwin/twindecoration/twindecoration.cpp3
-rw-r--r--twin/kcmtwin/twindecoration/twindecoration.h2
-rw-r--r--twin/tools/decobenchmark/main.cpp2
-rw-r--r--twin/tools/decobenchmark/main.h2
613 files changed, 3825 insertions, 4315 deletions
diff --git a/admin b/admin
-Subproject ae96f3ea4882e243513827da7c2ab889af3b160
+Subproject 65b6c5ac6f39c266c114d1fdc452d92442f776c
diff --git a/cmake b/cmake
-Subproject 63b5532a298ccf95e310ae853ff53ade506daf7
+Subproject 35d01987874772b6d83189d302186b881dbf2e3
diff --git a/doc/adminguide/groupware-kontact.docbook b/doc/adminguide/groupware-kontact.docbook
index 273ba4f5..e1a8db62 100644
--- a/doc/adminguide/groupware-kontact.docbook
+++ b/doc/adminguide/groupware-kontact.docbook
@@ -594,21 +594,3 @@ in #cyrus channel:</para>
</sect1>
</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "chapter")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/faq/about.docbook b/doc/faq/about.docbook
index d1055df2..76967f78 100644
--- a/doc/faq/about.docbook
+++ b/doc/faq/about.docbook
@@ -45,22 +45,3 @@ us an email at <email>trinity-devel@lists.pearsoncomputing.net</email>.
</qandaentry>
</qandaset>
</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "chapter")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
-
diff --git a/doc/faq/filemng.docbook b/doc/faq/filemng.docbook
index f91275f2..7620b0f0 100644
--- a/doc/faq/filemng.docbook
+++ b/doc/faq/filemng.docbook
@@ -184,20 +184,3 @@ MenuBar=Disabled
</qandaset>
</chapter>
-
-<!--Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "chapter")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/faq/index.docbook b/doc/faq/index.docbook
index 275a2055..47858841 100644
--- a/doc/faq/index.docbook
+++ b/doc/faq/index.docbook
@@ -113,18 +113,3 @@ maintainers, Rainer Endres, Mr. Lee Wee Tiong, and J. Hall.</para>
&documentation.index;
</book>
-
-<!--
-Local Variables:
-sgml-minimize-attributes:nil
-sgml-general-insert-case:lower
-sgml-omittag:t
-sgml-shorttag:t
-sgml-namecase-general:t
-sgml-always-quote-attributes:t
-sgml-indent-step:2
-sgml-indent-data:nil
-sgml-parent-document:nil
-sgml-exposed-tags:nil
-End:
--->
diff --git a/doc/faq/nontdeapps.docbook b/doc/faq/nontdeapps.docbook
index ec04e11b..9fc3d70a 100644
--- a/doc/faq/nontdeapps.docbook
+++ b/doc/faq/nontdeapps.docbook
@@ -82,21 +82,3 @@ be found <ulink url="http://www.mozilla.org/build">here</ulink>.
</qandaset>
</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "chapter")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
---> \ No newline at end of file
diff --git a/doc/faq/panel.docbook b/doc/faq/panel.docbook
index ab571ccc..68330ac9 100644
--- a/doc/faq/panel.docbook
+++ b/doc/faq/panel.docbook
@@ -153,21 +153,3 @@ change should now be applied every time you start &tde;.</para>
</qandaset>
</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "chapter")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/faq/questions.docbook b/doc/faq/questions.docbook
index 9fac3c2b..b24bfa32 100644
--- a/doc/faq/questions.docbook
+++ b/doc/faq/questions.docbook
@@ -135,21 +135,3 @@ people who do this for free with your politeness and appreciation. :-)</para>
&tde; &FAQ; Maintainer, at <email>trinity-devel@lists.pearsoncomputing.net</email></para>
</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "chapter")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/kate/index.docbook b/doc/kate/index.docbook
index 01835025..b1f98b27 100644
--- a/doc/kate/index.docbook
+++ b/doc/kate/index.docbook
@@ -279,14 +279,3 @@ configure / settings / preferences
-->
</book>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-namecase-general: t
-sgml-namecase-entity: nil
-sgml-general-insert-case: lower
-sgml-minimize-attributes: nil
-sgml-omittag: nil
-End:
--->
diff --git a/doc/kcontrol/index.docbook b/doc/kcontrol/index.docbook
index f55b3e8e..7bf88c28 100644
--- a/doc/kcontrol/index.docbook
+++ b/doc/kcontrol/index.docbook
@@ -628,10 +628,3 @@ class="username">root</systemitem> permissions.
</chapter>
</book>
-
-<!--
-Local Variables:
-mode: sgml
-End:
--->
-
diff --git a/doc/keditbookmarks/bookmarks.docbook b/doc/keditbookmarks/bookmarks.docbook
index 0e19b325..d13d9b17 100644
--- a/doc/keditbookmarks/bookmarks.docbook
+++ b/doc/keditbookmarks/bookmarks.docbook
@@ -75,13 +75,3 @@ the <guilabel>Bookmark Editor</guilabel>.
</chapter>
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-shorttag: t
-sgml-minimize-attributes: nil
-sgml-general-insert-case: lower
-sgml-parent-document:("index.docbook" "book" "chapter")
-End:
--->
diff --git a/doc/keditbookmarks/index.docbook b/doc/keditbookmarks/index.docbook
index e530a228..ca3f7c63 100644
--- a/doc/keditbookmarks/index.docbook
+++ b/doc/keditbookmarks/index.docbook
@@ -48,14 +48,3 @@
&documentation.index;
</book>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-shorttag: t
-sgml-minimize-attributes: nil
-sgml-general-insert-case: lower
-End:
--->
-
diff --git a/doc/kfind/index.docbook b/doc/kfind/index.docbook
index 3e123be7..2bb5376a 100644
--- a/doc/kfind/index.docbook
+++ b/doc/kfind/index.docbook
@@ -349,15 +349,3 @@ In order to successfully use &kfind;, you need &tde; 3.x.
&documentation.index;
</book>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-minimize-attributes:nil
-sgml-general-insert-case:lower
-sgml-indent-step:0
-sgml-indent-data:nil
-End:
-
-// vim:ts=0:sw=2:tw=78:noet
--->
diff --git a/doc/khelpcenter/contact.docbook b/doc/khelpcenter/contact.docbook
index 9b9f7d07..5f06860d 100644
--- a/doc/khelpcenter/contact.docbook
+++ b/doc/khelpcenter/contact.docbook
@@ -70,14 +70,3 @@ found in the documentation of their individual application.</para>
</sect2>
</sect1>
</chapter>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:nil
-sgml-namecase-general:t
-sgml-general-insert-case:lower
-sgml-always-quote-attributes:t
-sgml-parent-document:index.docbook
-End:
--->
diff --git a/doc/khelpcenter/index.docbook b/doc/khelpcenter/index.docbook
index efd05100..e2321c56 100644
--- a/doc/khelpcenter/index.docbook
+++ b/doc/khelpcenter/index.docbook
@@ -69,15 +69,3 @@ professional graphical design along with the technical advantages of
&support;
</book>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:nil
-sgml-namecase-general:t
-sgml-general-insert-case:lower
-sgml-always-quote-attributes:t
-End:
--->
-
diff --git a/doc/klipper/index.docbook b/doc/klipper/index.docbook
index 8f121091..be8ab83f 100644
--- a/doc/klipper/index.docbook
+++ b/doc/klipper/index.docbook
@@ -491,21 +491,3 @@ The latter will keep the system installation intact and only prevent
&documentation.index;
</book>
-<!--
-Local Variables:
-mode: sgml
-sgml-minimize-attributes: nil
-sgml-general-insert-case: lower
-sgml-indent-step: 0
-End:
--->
-
-
-
-
-
-
-
-
-
-
diff --git a/doc/kmenuedit/index.docbook b/doc/kmenuedit/index.docbook
index 1fce0a1a..11e09af3 100644
--- a/doc/kmenuedit/index.docbook
+++ b/doc/kmenuedit/index.docbook
@@ -511,11 +511,3 @@ work.</para></footnote>.</para>
&documentation.index;
</book>
-<!--
-Local Variables:
-mode: sgml
-sgml-minimize-attributes: nil
-sgml-general-insert-case: lower
-End:
--->
-
diff --git a/doc/knetattach/index.docbook b/doc/knetattach/index.docbook
index 339e9854..2a889055 100644
--- a/doc/knetattach/index.docbook
+++ b/doc/knetattach/index.docbook
@@ -334,16 +334,3 @@ Documentation Copyright &copy; 2005 &Orville.Bennett; &Orville.Bennett.mail;
&documentation.index;
</book>
-
-<!--
-Local Variables:
-mode: xml
-sgml-minimize-attributes:nil
-sgml-general-insert-case:lower
-sgml-indent-step:0
-sgml-indent-data:nil
-End:
-
-vim:tabstop=2:shiftwidth=2:expandtab
-kate: space-indent on; indent-width 2; tab-width 2; indent-mode none;
--->
diff --git a/doc/kompmgr/index.docbook b/doc/kompmgr/index.docbook
index 192c7dd8..62eb1137 100644
--- a/doc/kompmgr/index.docbook
+++ b/doc/kompmgr/index.docbook
@@ -423,11 +423,3 @@ translucent videos isn't fast anyway.</para>
</chapter>
</book>
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-shorttag: t
-End:
--->
-
diff --git a/doc/konqueror/basics.docbook b/doc/konqueror/basics.docbook
index 4212090e..6ca1cd4c 100644
--- a/doc/konqueror/basics.docbook
+++ b/doc/konqueror/basics.docbook
@@ -370,14 +370,3 @@ http://docs.kde.org</ulink>.</para></note>
</sect1>
</chapter>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-shorttag: t
-sgml-minimize-attributes: nil
-sgml-general-insert-case: lower
-sgml-parent-document:("index.docbook" "book" "chapter")
-End:
--->
diff --git a/doc/konqueror/bookmarks.docbook b/doc/konqueror/bookmarks.docbook
index 6797f449..3237547f 100644
--- a/doc/konqueror/bookmarks.docbook
+++ b/doc/konqueror/bookmarks.docbook
@@ -117,13 +117,3 @@ the <guilabel>Bookmark Editor</guilabel>.
</chapter>
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-shorttag: t
-sgml-minimize-attributes: nil
-sgml-general-insert-case: lower
-sgml-parent-document:("index.docbook" "book" "chapter")
-End:
--->
diff --git a/doc/konqueror/browser.docbook b/doc/konqueror/browser.docbook
index c6c8ecbb..a3200e63 100644
--- a/doc/konqueror/browser.docbook
+++ b/doc/konqueror/browser.docbook
@@ -469,14 +469,3 @@ to <filename>$TDEDIR/share/config/tdeio_httprc
</chapter>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-shorttag: t
-sgml-minimize-attributes: nil
-sgml-general-insert-case: lower
-sgml-parent-document:("index.docbook" "book" "chapter")
-End:
--->
diff --git a/doc/konqueror/commands.docbook b/doc/konqueror/commands.docbook
index 945fd11c..e34e1325 100644
--- a/doc/konqueror/commands.docbook
+++ b/doc/konqueror/commands.docbook
@@ -973,13 +973,3 @@ you are running.</para></listitem>
</chapter>
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-shorttag: t
-sgml-minimize-attributes: nil
-sgml-general-insert-case: lower
-sgml-parent-document:("index.docbook" "book" "chapter")
-End:
--->
diff --git a/doc/konqueror/config.docbook b/doc/konqueror/config.docbook
index 90a1a521..75e7c33c 100644
--- a/doc/konqueror/config.docbook
+++ b/doc/konqueror/config.docbook
@@ -125,13 +125,3 @@ use the <link linkend="bubble">What's This?</link> feature.</para>
</chapter>
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-shorttag: t
-sgml-minimize-attributes: nil
-sgml-general-insert-case: lower
-sgml-parent-document:("index.docbook" "book" "chapter")
-End:
--->
diff --git a/doc/konqueror/credits.docbook b/doc/konqueror/credits.docbook
index 02155b3f..1ee11b2e 100644
--- a/doc/konqueror/credits.docbook
+++ b/doc/konqueror/credits.docbook
@@ -170,13 +170,3 @@ to applet support)</para></listitem>
&underGPL;
</chapter>
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-shorttag: t
-sgml-minimize-attributes: nil
-sgml-general-insert-case: lower
-sgml-parent-document:("index.docbook" "book" "chapter")
-End:
--->
diff --git a/doc/konqueror/faq.docbook b/doc/konqueror/faq.docbook
index f85f1931..863298a9 100644
--- a/doc/konqueror/faq.docbook
+++ b/doc/konqueror/faq.docbook
@@ -157,13 +157,3 @@ http://www.konqueror.org/konq-java.html</ulink>.</para>
</qandaset>
</chapter>
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-shorttag: t
-sgml-minimize-attributes: nil
-sgml-general-insert-case: lower
-sgml-parent-document:("index.docbook" "book" "chapter")
-End:
--->
diff --git a/doc/konqueror/filemanager.docbook b/doc/konqueror/filemanager.docbook
index ee73d796..9774213b 100644
--- a/doc/konqueror/filemanager.docbook
+++ b/doc/konqueror/filemanager.docbook
@@ -886,13 +886,3 @@ you make in the normal file manager view.</para>
</sect1>
</chapter>
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-shorttag: t
-sgml-minimize-attributes: nil
-sgml-general-insert-case: lower
-sgml-parent-document:("index.docbook" "book" "chapter")
-End:
--->
diff --git a/doc/konqueror/index.docbook b/doc/konqueror/index.docbook
index a48974b8..f7c3b17a 100644
--- a/doc/konqueror/index.docbook
+++ b/doc/konqueror/index.docbook
@@ -98,13 +98,3 @@ url="http://www.kde.org">http://www.kde.org</ulink>.</para>
&documentation.index;
</book>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-shorttag: t
-sgml-minimize-attributes: nil
-sgml-general-insert-case: lower
-End:
--->
diff --git a/doc/konqueror/introduction.docbook b/doc/konqueror/introduction.docbook
index fc57dbaa..82684dbf 100644
--- a/doc/konqueror/introduction.docbook
+++ b/doc/konqueror/introduction.docbook
@@ -51,14 +51,3 @@ saved for easy recall as needed.
</para>
</chapter>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-shorttag: t
-sgml-minimize-attributes: nil
-sgml-general-insert-case: lower
-sgml-parent-document:("index.docbook" "book" "chapter")
-End:
--->
diff --git a/doc/konqueror/man-kbookmarkmerger.1.docbook b/doc/konqueror/man-kbookmarkmerger.1.docbook
index dc041c71..1a5fbeae 100644
--- a/doc/konqueror/man-kbookmarkmerger.1.docbook
+++ b/doc/konqueror/man-kbookmarkmerger.1.docbook
@@ -1,5 +1,4 @@
<?xml version="1.0" ?>
-<!-- vim:set ts=4 noet syntax=xml: -->
<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
<!ENTITY % English "INCLUDE">
<!ENTITY kbookmarkmerger "<command>kbookmarkmerger</command>">
diff --git a/doc/konqueror/path-complete.docbook b/doc/konqueror/path-complete.docbook
index a05f0845..832b976a 100644
--- a/doc/konqueror/path-complete.docbook
+++ b/doc/konqueror/path-complete.docbook
@@ -70,13 +70,3 @@ Text Completion function can be viewed and edited in the <guilabel>History
</chapter>
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-shorttag: t
-sgml-minimize-attributes: nil
-sgml-general-insert-case: lower
-sgml-parent-document:("index.docbook" "book" "chapter")
-End:
--->
diff --git a/doc/konqueror/plugins.docbook b/doc/konqueror/plugins.docbook
index 4cb56795..2e36d36a 100644
--- a/doc/konqueror/plugins.docbook
+++ b/doc/konqueror/plugins.docbook
@@ -150,13 +150,3 @@ Navigation Panel. You can drag songs or videos onto this page to play them.
</chapter>
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-shorttag: t
-sgml-minimize-attributes: nil
-sgml-general-insert-case: lower
-sgml-parent-document:("index.docbook" "book" "chapter")
-End:
--->
diff --git a/doc/konqueror/save-settings.docbook b/doc/konqueror/save-settings.docbook
index 2eab552e..63ef2fa5 100644
--- a/doc/konqueror/save-settings.docbook
+++ b/doc/konqueror/save-settings.docbook
@@ -80,13 +80,3 @@ suitable icon.</para></note>
</sect1>
</chapter>
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-shorttag: t
-sgml-minimize-attributes: nil
-sgml-general-insert-case: lower
-sgml-parent-document:("index.docbook" "book" "chapter")
-End:
--->
diff --git a/doc/konqueror/sidebar.docbook b/doc/konqueror/sidebar.docbook
index 14e82bcd..b2597684 100644
--- a/doc/konqueror/sidebar.docbook
+++ b/doc/konqueror/sidebar.docbook
@@ -189,13 +189,3 @@ change the &URL; (path) of the folder viewed in that page.</para></listitem>
</chapter>
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-shorttag: t
-sgml-minimize-attributes: nil
-sgml-general-insert-case: lower
-sgml-parent-document:("index.docbook" "book" "chapter")
-End:
--->
diff --git a/doc/konsole/index.docbook b/doc/konsole/index.docbook
index c39af3e1..a11c0dd1 100644
--- a/doc/konsole/index.docbook
+++ b/doc/konsole/index.docbook
@@ -1452,14 +1452,3 @@ FreeBSD</ulink></para></listitem>
&documentation.index;
</book>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-shorttag: t
-sgml-general-insert-case: lower
-End:
--->
-
-
diff --git a/doc/kpager/index.docbook b/doc/kpager/index.docbook
index 25f47af0..b618c415 100644
--- a/doc/kpager/index.docbook
+++ b/doc/kpager/index.docbook
@@ -370,12 +370,3 @@ installation of the main &tde; packages.</para>
&documentation.index;
</book>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-minimize-attributes: nil
-sgml-general-insert-case: lower
-End:
--->
-
diff --git a/doc/ksplashml/index.docbook b/doc/ksplashml/index.docbook
index f92e36a9..5f3350c7 100644
--- a/doc/ksplashml/index.docbook
+++ b/doc/ksplashml/index.docbook
@@ -1350,15 +1350,3 @@ KPixmapEffect::HorizontalGradient );
&documentation.index;
</book>
-
-<!--
-Local Variables:
-mode: xml
-sgml-minimize-attributes:nil
-sgml-general-insert-case:lower
-sgml-indent-step:0
-sgml-indent-data:nil
-End:
-
-vim:tabstop=2:shiftwidth=2:expandtab
--->
diff --git a/doc/ksysguard/index.docbook b/doc/ksysguard/index.docbook
index c596315e..06c87e53 100644
--- a/doc/ksysguard/index.docbook
+++ b/doc/ksysguard/index.docbook
@@ -486,11 +486,3 @@ have worked on <application>KTop</application>:</para>
</chapter>
</book>
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-shorttag: t
-End:
--->
-
diff --git a/doc/kwrite/index.docbook b/doc/kwrite/index.docbook
index 8b8d1d38..08a3e3bc 100644
--- a/doc/kwrite/index.docbook
+++ b/doc/kwrite/index.docbook
@@ -2947,14 +2947,3 @@ Converted to docbook/proofreading by &Lauri.Watts; &Lauri.Watts.mail;
&documentation.index;
</book>
-<!--
-Local Variables:
-mode: sgml
-sgml-namecase-general: t
-sgml-namecase-entity: nil
-sgml-general-insert-case: lower
-sgml-minimize-attributes: nil
-sgml-omittag: nil
-End:
--->
-
diff --git a/doc/kxkb/index.docbook b/doc/kxkb/index.docbook
index 88e858fe..278f588a 100644
--- a/doc/kxkb/index.docbook
+++ b/doc/kxkb/index.docbook
@@ -348,11 +348,3 @@ have worked on <application>kxkb</application>:</para>
</chapter>
</book>
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-shorttag: t
-End:
--->
-
diff --git a/doc/quickstart/index.docbook b/doc/quickstart/index.docbook
index 4f083fad..a70ab467 100644
--- a/doc/quickstart/index.docbook
+++ b/doc/quickstart/index.docbook
@@ -1333,12 +1333,3 @@ Editor</para></listitem>
</sect1>
</chapter>
</book>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-shorttag: t
-End:
--->
-
diff --git a/doc/releasenotes/r14.0.9.docbook b/doc/releasenotes/r14.0.9.docbook
index bf2f4924..91373133 100644
--- a/doc/releasenotes/r14.0.9.docbook
+++ b/doc/releasenotes/r14.0.9.docbook
@@ -1,5 +1,5 @@
<sect1 id="release-notes-r14.0.9">
-<title>R14.0.9 Release Notes (Draft)</title>
+<title>R14.0.9 Release Notes</title>
<para>R14.0.9 is the ninth maintenance release of the R14.0 series,
and is built on and improves the previous R14.0.8 version.</para>
@@ -17,13 +17,19 @@ release.</para>
<listitem>
<para>New applications</para>
<itemizedlist>
- <listitem><para>Domino TDE style - a smooth style with a soft look.</para></listitem>
+ <listitem><para>Codeine - a video player with a simple, uncluttered interface.</para></listitem>
<listitem><para>KEximDB plugin for converting MS Access MDB databases.</para></listitem>
<listitem><para>KoolDock - a cool application launcher.</para></listitem>
<listitem><para>KXMLEditor - an editor for XML files.</para></listitem>
+ <listitem><para>Mathemagics - a RPN scientific calculator.</para></listitem>
+ <listitem><para>Qalculate - a small, simple to use, yet powerful calculator.</para></listitem>
<listitem><para>TastyMenu - an alternative TDE menu.</para></listitem>
+ <listitem><para>TDE style Baghira - Apple's MacOS X's style for TDE.</para></listitem>
+ <listitem><para>TDE style Domino - a smooth style with a soft look.</para></listitem>
+ <listitem><para>TDE style Ia Ora - Mandriva Ia Ora theme for TDE.</para></listitem>
+ <listitem><para>TDEDocker - dock any application to the system tray.</para></listitem>
+ <listitem><para>TDEpacman - a pacman game clone.</para></listitem>
<listitem><para>Transcode added to dependency repository for Debian-like distros.</para></listitem>
- <listitem><para></para></listitem>
</itemizedlist>
</listitem>
<listitem>
@@ -34,7 +40,6 @@ release.</para>
<listitem><para>Autostart TCC module no longer crashes when non-service entries are used.</para></listitem>
<listitem><para>Fixed Konqueror's kdiff3 preview plugin functionality.</para></listitem>
<listitem><para>Various fixes related to compiling and linking.</para></listitem>
- <listitem><para></para></listitem>
</itemizedlist>
</listitem>
<listitem>
@@ -48,13 +53,13 @@ release.</para>
<listitem><para>Added brightness control in kmilo generic monitor.</para></listitem>
<listitem><para>Improved support for bluray discs.</para></listitem>
<listitem><para>Added support for xine 1.2.10.</para></listitem>
- <listitem><para></para></listitem>
+ <listitem><para>Changed CDDB database from freedb.org (no longer working) to gnudb.org.</para></listitem>
</itemizedlist>
</listitem>
<listitem>
<para>Security</para>
<itemizedlist>
- <listitem><para></para></listitem>
+ <listitem><para>CVE-2020-17507: Fix buffer overflow in XBM parser.</para></listitem>
</itemizedlist>
</listitem>
</itemizedlist>
@@ -64,6 +69,7 @@ release.</para>
<listitem><para><ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/29">TGW issue list.</ulink></para></listitem>
<listitem><para><ulink url="https://bugs.trinitydesktop.org/showdependencytree.cgi?id=3085&amp;hide_resolved=0">Bugzilla bug list.</ulink></para></listitem>
<listitem><para><ulink url="https://wiki.trinitydesktop.org/Changelog_For_R14.0.9">Detailed commit change log.</ulink></para></listitem>
+ <listitem><para><ulink url="https://wiki.trinitydesktop.org/Release_Notes_For_R14.0.9">Full release notes on TDE wiki.</ulink></para></listitem>
</itemizedlist>
</sect2>
@@ -94,7 +100,6 @@ potential problems.</para>
</listitem>
</itemizedlist>
</para>
-
</sect3>
<sect3 id="release-notes-r14.0.9-hints-knotes-global-shortcuts">
@@ -119,7 +124,14 @@ and then assign the following key combinations.
</listitem>
</itemizedlist>
</para>
+</sect3>
+<sect3 id="release-notes-r14.0.9-hints-arch-support">
+<title>Restriction of supported distros/architectures</title>
+<para>Starting from this TDE release, apt sources for i386 architecture are no longer provided for Ubuntu 20.04 onwards.</para>
+<para>If you have a multi-arch system that includes i386 as well, you need to either remove i386 from the list of known architectures or
+remove that architecture from your apt sources.</para>
+<para>For example, if you have both i386 and amd64, you need to add [arch=amd64] in your apt sources.list file to make sure i386 is not used.</para>
</sect3>
</sect2>
diff --git a/doc/tdeprint/index.docbook b/doc/tdeprint/index.docbook
index a574b229..22546988 100644
--- a/doc/tdeprint/index.docbook
+++ b/doc/tdeprint/index.docbook
@@ -184,15 +184,3 @@ settings</phrase></textobject>
</chapter>
</book>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-minimize-attributes:nil
-sgml-general-insert-case:lower
-sgml-indent-step:0
-sgml-indent-data:nil
-End:
-
-// vim:ts=2:sw=2:tw=78:noet
--->
diff --git a/doc/tdeprint/tech-overview.docbook b/doc/tdeprint/tech-overview.docbook
index 51e7cc98..e15652aa 100644
--- a/doc/tdeprint/tech-overview.docbook
+++ b/doc/tdeprint/tech-overview.docbook
@@ -263,18 +263,3 @@ drawing)</para></caption>
</sect1>
</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-namecase-general:t
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:"index.docbook" "book"
-End:
--->
diff --git a/doc/tdesu/index.docbook b/doc/tdesu/index.docbook
index b8199ba5..c2f61a8d 100644
--- a/doc/tdesu/index.docbook
+++ b/doc/tdesu/index.docbook
@@ -310,11 +310,3 @@ have a suggestion, feel free to contact me.</para>
</chapter>
</book>
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-shorttag: t
-End:
--->
-
diff --git a/doc/tdm/index.docbook b/doc/tdm/index.docbook
index 78f74486..50565271 100644
--- a/doc/tdm/index.docbook
+++ b/doc/tdm/index.docbook
@@ -1522,11 +1522,3 @@ unpredictability. This is used during the generation of random numbers.</para></
</glossary>
</book>
-<!--
-Local Variables:
-mode: xml
-sgml-omittag: nil
-sgml-shorttag: t
-End:
--->
-
diff --git a/doc/userguide/accessibility.docbook b/doc/userguide/accessibility.docbook
index 1d0f5000..d5ac064e 100644
--- a/doc/userguide/accessibility.docbook
+++ b/doc/userguide/accessibility.docbook
@@ -148,21 +148,3 @@ automatically</secondary></indexterm>
</sect1>
</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "chapter")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/base-tde-applications.docbook b/doc/userguide/base-tde-applications.docbook
index d687b8d1..dc3074b8 100644
--- a/doc/userguide/base-tde-applications.docbook
+++ b/doc/userguide/base-tde-applications.docbook
@@ -421,21 +421,3 @@
</sect1>
</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "chapter")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/browser-fine-tuning.docbook b/doc/userguide/browser-fine-tuning.docbook
index 8883a14b..34a45e60 100644
--- a/doc/userguide/browser-fine-tuning.docbook
+++ b/doc/userguide/browser-fine-tuning.docbook
@@ -51,21 +51,3 @@ stylesheet defined in "Customize" tab</guilabel>, then go to the
</sect1>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/burning-cds.docbook b/doc/userguide/burning-cds.docbook
index 901709ff..21f5214f 100644
--- a/doc/userguide/burning-cds.docbook
+++ b/doc/userguide/burning-cds.docbook
@@ -18,21 +18,3 @@
<para>Brief overview of k3b</para>
</sect1>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/control-center.docbook b/doc/userguide/control-center.docbook
index 6b66ea26..5446cd0b 100644
--- a/doc/userguide/control-center.docbook
+++ b/doc/userguide/control-center.docbook
@@ -901,22 +901,3 @@ driver to use this section.</para></listitem>
</itemizedlist>-->
</sect1>
</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "chapter")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
-
diff --git a/doc/userguide/creating-graphics.docbook b/doc/userguide/creating-graphics.docbook
index 7fd0f169..61c9b545 100644
--- a/doc/userguide/creating-graphics.docbook
+++ b/doc/userguide/creating-graphics.docbook
@@ -28,21 +28,3 @@
</sect1>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/credits-and-license.docbook b/doc/userguide/credits-and-license.docbook
index c88ba487..9ca864af 100644
--- a/doc/userguide/credits-and-license.docbook
+++ b/doc/userguide/credits-and-license.docbook
@@ -297,20 +297,3 @@ Administrator Guide</ulink>.</para>
</para>
</sect1>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/customizing-desktop.docbook b/doc/userguide/customizing-desktop.docbook
index 800496a2..a8ed7cb4 100644
--- a/doc/userguide/customizing-desktop.docbook
+++ b/doc/userguide/customizing-desktop.docbook
@@ -345,21 +345,3 @@ interface: buttons, scrollbars, menus, tabs, &etc;</para></glossdef>
</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "chapter")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/email.docbook b/doc/userguide/email.docbook
index 376f4e56..8f69e5e6 100644
--- a/doc/userguide/email.docbook
+++ b/doc/userguide/email.docbook
@@ -234,21 +234,3 @@ latest news, tips and tricks, and plenty more.</para>
</sect1>
</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "chapter")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/file-sharing.docbook b/doc/userguide/file-sharing.docbook
index 395e7b9e..1ab5c4f6 100644
--- a/doc/userguide/file-sharing.docbook
+++ b/doc/userguide/file-sharing.docbook
@@ -89,21 +89,3 @@ Samba, local cgi? nfs devices
</sect2>-->
</sect1>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/font-installation.docbook b/doc/userguide/font-installation.docbook
index df810d55..1248f660 100644
--- a/doc/userguide/font-installation.docbook
+++ b/doc/userguide/font-installation.docbook
@@ -59,21 +59,3 @@ choose <guibutton>Delete</guibutton>.</para>
<para>tdefontinst and tdefontview should probably get a mention too, since
they don't seem to have any existing docs.</para>
</sect1>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/getting-help.docbook b/doc/userguide/getting-help.docbook
index 6c2ebfaf..facea078 100644
--- a/doc/userguide/getting-help.docbook
+++ b/doc/userguide/getting-help.docbook
@@ -153,21 +153,3 @@ respective application's handbook or official &tde; documentation.</para>
</sect2>
</sect1>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/glossary.docbook b/doc/userguide/glossary.docbook
index 8e5dcd59..dda9f666 100644
--- a/doc/userguide/glossary.docbook
+++ b/doc/userguide/glossary.docbook
@@ -18,21 +18,3 @@
<para>TDE/GUI/UNIX terms that are worth explaining.</para>
</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "chapter")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/index.docbook b/doc/userguide/index.docbook
index f292c454..2ffdc84f 100644
--- a/doc/userguide/index.docbook
+++ b/doc/userguide/index.docbook
@@ -580,21 +580,3 @@ started.</para>
&documentation.index;
</book>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:nil
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/internet-shortcuts.docbook b/doc/userguide/internet-shortcuts.docbook
index ab513310..a4cfa1e6 100644
--- a/doc/userguide/internet-shortcuts.docbook
+++ b/doc/userguide/internet-shortcuts.docbook
@@ -60,21 +60,3 @@ search for &tde;.</para>
</sect1>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/konsole-intro.docbook b/doc/userguide/konsole-intro.docbook
index 3b534bf0..35c49519 100644
--- a/doc/userguide/konsole-intro.docbook
+++ b/doc/userguide/konsole-intro.docbook
@@ -106,21 +106,3 @@ Handbook has much more information about the features available in
</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "chapter")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/messaging-intro.docbook b/doc/userguide/messaging-intro.docbook
index 54efbdcc..f5e26e22 100644
--- a/doc/userguide/messaging-intro.docbook
+++ b/doc/userguide/messaging-intro.docbook
@@ -168,21 +168,3 @@ Instant Messenger will start a conversation with the contact.</para>
</sect1>
</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "chapter")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/migrator-dictionary.docbook b/doc/userguide/migrator-dictionary.docbook
index 4bd2efa5..d92c328c 100644
--- a/doc/userguide/migrator-dictionary.docbook
+++ b/doc/userguide/migrator-dictionary.docbook
@@ -18,21 +18,3 @@
<para>Tables of terminology differences</para>
</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "chapter")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/net-connection-setup.docbook b/doc/userguide/net-connection-setup.docbook
index af53d196..4e59dab4 100644
--- a/doc/userguide/net-connection-setup.docbook
+++ b/doc/userguide/net-connection-setup.docbook
@@ -216,23 +216,3 @@ bar in &konqueror;.</para>
</sect1>
</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "chapter")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
-
-
diff --git a/doc/userguide/networking-with-windows.docbook b/doc/userguide/networking-with-windows.docbook
index 546313b7..08d57e81 100644
--- a/doc/userguide/networking-with-windows.docbook
+++ b/doc/userguide/networking-with-windows.docbook
@@ -108,21 +108,3 @@ examples see the entire &lisa; manual by entering
</sect2>
</sect1>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/panel-and-desktop.docbook b/doc/userguide/panel-and-desktop.docbook
index f0e189ce..c89a2539 100644
--- a/doc/userguide/panel-and-desktop.docbook
+++ b/doc/userguide/panel-and-desktop.docbook
@@ -296,21 +296,3 @@ features in &tde;. You can read it in &khelpcenter; or by entering
</sect1>
</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/pdf-files.docbook b/doc/userguide/pdf-files.docbook
index 0dd83c2e..73d951e1 100644
--- a/doc/userguide/pdf-files.docbook
+++ b/doc/userguide/pdf-files.docbook
@@ -20,21 +20,3 @@
<para>Viewing pdf files</para>
</sect1>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/playing-audiocds.docbook b/doc/userguide/playing-audiocds.docbook
index 300a2bad..26e7e494 100644
--- a/doc/userguide/playing-audiocds.docbook
+++ b/doc/userguide/playing-audiocds.docbook
@@ -122,21 +122,3 @@ latest news and information about <application>amaroK</application>.</para>
<!-- it's fixed :-) -->
</sect2>
</sect1>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/playing-movies.docbook b/doc/userguide/playing-movies.docbook
index 89e986cb..135289a0 100644
--- a/doc/userguide/playing-movies.docbook
+++ b/doc/userguide/playing-movies.docbook
@@ -28,21 +28,3 @@
</sect1>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/playing-music.docbook b/doc/userguide/playing-music.docbook
index 956bff22..2b8c529e 100644
--- a/doc/userguide/playing-music.docbook
+++ b/doc/userguide/playing-music.docbook
@@ -130,21 +130,3 @@ also make useful music players.</para>
</sect2>
</sect1>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/printer-setup.docbook b/doc/userguide/printer-setup.docbook
index 658be16a..216c9e81 100644
--- a/doc/userguide/printer-setup.docbook
+++ b/doc/userguide/printer-setup.docbook
@@ -27,21 +27,3 @@ big manual if there is trouble</para>
</sect1>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/printing-from-apps.docbook b/doc/userguide/printing-from-apps.docbook
index 21394211..96443118 100644
--- a/doc/userguide/printing-from-apps.docbook
+++ b/doc/userguide/printing-from-apps.docbook
@@ -20,21 +20,3 @@
<para>Printing from non-TDE apps</para>
</sect1>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/programs-and-documents.docbook b/doc/userguide/programs-and-documents.docbook
index 60ced60d..b56f486b 100644
--- a/doc/userguide/programs-and-documents.docbook
+++ b/doc/userguide/programs-and-documents.docbook
@@ -520,21 +520,3 @@ is.</para>
</sect1>
</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/programs-controlling.docbook b/doc/userguide/programs-controlling.docbook
index a1f072e6..5d170f3a 100644
--- a/doc/userguide/programs-controlling.docbook
+++ b/doc/userguide/programs-controlling.docbook
@@ -20,20 +20,3 @@
<para>Keybindings</para>
</sect1>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/removable-disks.docbook b/doc/userguide/removable-disks.docbook
index 34f16e4b..92929dcb 100644
--- a/doc/userguide/removable-disks.docbook
+++ b/doc/userguide/removable-disks.docbook
@@ -120,21 +120,3 @@ removable devices one can also unmount with <guimenuitem>Safely Remove</guimenui
</sect1>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/screen-captures.docbook b/doc/userguide/screen-captures.docbook
index 35d1a726..b6ea1da1 100644
--- a/doc/userguide/screen-captures.docbook
+++ b/doc/userguide/screen-captures.docbook
@@ -18,21 +18,3 @@
<para>Grabbing screen caps</para>
</sect1>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/shared-sessions.docbook b/doc/userguide/shared-sessions.docbook
index 688a4b93..5712bf81 100644
--- a/doc/userguide/shared-sessions.docbook
+++ b/doc/userguide/shared-sessions.docbook
@@ -26,21 +26,3 @@
</sect1>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/standard-menu-entries.docbook b/doc/userguide/standard-menu-entries.docbook
index 5e8a4efe..379b0fa0 100644
--- a/doc/userguide/standard-menu-entries.docbook
+++ b/doc/userguide/standard-menu-entries.docbook
@@ -299,21 +299,3 @@ change settings relating to how the application works in general.
&help.menu.documentation;
</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "chapter")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/switching-sessions.docbook b/doc/userguide/switching-sessions.docbook
index e23e2287..0c15df8e 100644
--- a/doc/userguide/switching-sessions.docbook
+++ b/doc/userguide/switching-sessions.docbook
@@ -61,21 +61,3 @@ above.</para>
</sect1>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/tde-as-root.docbook b/doc/userguide/tde-as-root.docbook
index ec866638..c7e9b966 100644
--- a/doc/userguide/tde-as-root.docbook
+++ b/doc/userguide/tde-as-root.docbook
@@ -32,21 +32,3 @@
</sect1>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/tde-edutainment.docbook b/doc/userguide/tde-edutainment.docbook
index b3cbe824..0cafe8f0 100644
--- a/doc/userguide/tde-edutainment.docbook
+++ b/doc/userguide/tde-edutainment.docbook
@@ -322,21 +322,3 @@ information about all the &tde; Edutainment applications.</para>
</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "chapter")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/the-filemanager.docbook b/doc/userguide/the-filemanager.docbook
index 6957da0d..20e4dedf 100644
--- a/doc/userguide/the-filemanager.docbook
+++ b/doc/userguide/the-filemanager.docbook
@@ -254,23 +254,3 @@ has much more information about the features available in
</sect2>
</sect1>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
-
-
diff --git a/doc/userguide/troubleshooting-no-open.docbook b/doc/userguide/troubleshooting-no-open.docbook
index 682f4b67..80046478 100644
--- a/doc/userguide/troubleshooting-no-open.docbook
+++ b/doc/userguide/troubleshooting-no-open.docbook
@@ -29,21 +29,3 @@ be that the launcher itself is wrong.</para>
</varlistentry>
</variablelist>
</sect1>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/under-the-hood.docbook b/doc/userguide/under-the-hood.docbook
index 331f41ce..0f7dbe11 100644
--- a/doc/userguide/under-the-hood.docbook
+++ b/doc/userguide/under-the-hood.docbook
@@ -468,21 +468,3 @@ encountered anyway.</para>
</sect2>
</sect1>
</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "chapter")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/usenet.docbook b/doc/userguide/usenet.docbook
index 6b27b2a3..a307e45f 100644
--- a/doc/userguide/usenet.docbook
+++ b/doc/userguide/usenet.docbook
@@ -231,21 +231,3 @@ lists, so you can read them with &knode;.</para>
</sect1>
</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "chapter")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/where-next.docbook b/doc/userguide/where-next.docbook
index 2da8d3e8..840bf308 100644
--- a/doc/userguide/where-next.docbook
+++ b/doc/userguide/where-next.docbook
@@ -20,21 +20,3 @@
<para>Books</para>
</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/windows-how-to.docbook b/doc/userguide/windows-how-to.docbook
index c6d1020d..25dc3ba8 100644
--- a/doc/userguide/windows-how-to.docbook
+++ b/doc/userguide/windows-how-to.docbook
@@ -498,20 +498,3 @@ Windows</primary></indexterm> item.</para>
</sect2>
</sect1>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/your-tde-account.docbook b/doc/userguide/your-tde-account.docbook
index 6b351b20..96ec4b71 100644
--- a/doc/userguide/your-tde-account.docbook
+++ b/doc/userguide/your-tde-account.docbook
@@ -60,21 +60,3 @@ more information about the directories that &tde; uses.</para>
</sect1>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/kate/app/kateapp.cpp b/kate/app/kateapp.cpp
index 57c27463..0176545f 100644
--- a/kate/app/kateapp.cpp
+++ b/kate/app/kateapp.cpp
@@ -479,5 +479,3 @@ KateMainWindow *KateApp::mainWindow (uint n)
return 0;
}
-
-// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/kateappIface.cpp b/kate/app/kateappIface.cpp
index bc06f1b7..9214c3c0 100644
--- a/kate/app/kateappIface.cpp
+++ b/kate/app/kateappIface.cpp
@@ -101,5 +101,3 @@ const TQString& KateAppDCOPIface::session() const
{
return m_app->sessionManager()->getActiveSessionName();
}
-
-// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/katedocmanager.cpp b/kate/app/katedocmanager.cpp
index 6cca9efe..aac535a7 100644
--- a/kate/app/katedocmanager.cpp
+++ b/kate/app/katedocmanager.cpp
@@ -608,5 +608,3 @@ bool KateDocManager::computeUrlMD5(const KURL &url, TQCString &result)
return true;
}
-
-// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/katedocmanager.h b/kate/app/katedocmanager.h
index 1eaef7f9..569aa985 100644
--- a/kate/app/katedocmanager.h
+++ b/kate/app/katedocmanager.h
@@ -154,4 +154,3 @@ class KateDocManager : public TQObject
};
#endif
-// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/kateexternaltools.cpp b/kate/app/kateexternaltools.cpp
index 3bb21c93..0b592b03 100644
--- a/kate/app/kateexternaltools.cpp
+++ b/kate/app/kateexternaltools.cpp
@@ -869,4 +869,3 @@ void KateExternalToolsConfigWidget::slotMoveDown()
m_changed = true;
}
//END KateExternalToolsConfigWidget
-// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/katefilelist.cpp b/kate/app/katefilelist.cpp
index 9cf4b172..9dd958a5 100644
--- a/kate/app/katefilelist.cpp
+++ b/kate/app/katefilelist.cpp
@@ -756,6 +756,3 @@ void KFLConfigPage::slotMyChanged()
}
//END KFLConfigPage
-
-
-// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/katefilelist.h b/kate/app/katefilelist.h
index 75d93915..24a62c7a 100644
--- a/kate/app/katefilelist.h
+++ b/kate/app/katefilelist.h
@@ -198,4 +198,3 @@ class KFLConfigPage : public Kate::ConfigPage {
#endif
-// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/katefileselector.cpp b/kate/app/katefileselector.cpp
index a5711577..4bba68de 100644
--- a/kate/app/katefileselector.cpp
+++ b/kate/app/katefileselector.cpp
@@ -718,4 +718,3 @@ void KFSConfigPage::slotMyChanged()
slotChanged();
}
//END KFSConfigPage
-// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/katefileselector.h b/kate/app/katefileselector.h
index 33482fab..5de8f74c 100644
--- a/kate/app/katefileselector.h
+++ b/kate/app/katefileselector.h
@@ -169,4 +169,3 @@ class KFSConfigPage : public Kate::ConfigPage {
#endif //__KATE_FILESELECTOR_H__
-// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/katemain.cpp b/kate/app/katemain.cpp
index 8cdd3a52..2291a866 100644
--- a/kate/app/katemain.cpp
+++ b/kate/app/katemain.cpp
@@ -263,5 +263,3 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
// execute ourself ;)
return app.exec();
}
-
-// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off;
diff --git a/kate/app/katemainwindow.cpp b/kate/app/katemainwindow.cpp
index 298b455e..906bac6f 100644
--- a/kate/app/katemainwindow.cpp
+++ b/kate/app/katemainwindow.cpp
@@ -951,5 +951,3 @@ void KateSessionListActionMenu::slotAboutToShow()
popupMenu()->insertItem(sessions[idx]->getSessionName(), m_mainWindow, TQT_SLOT(activateSession(int)), 0, idx);
}
}
-
-// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/katemainwindow.h b/kate/app/katemainwindow.h
index 48f4129d..f458bd70 100644
--- a/kate/app/katemainwindow.h
+++ b/kate/app/katemainwindow.h
@@ -236,5 +236,3 @@ class KateSessionListActionMenu : public TDEActionMenu
};
#endif
-
-// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/katemdi.cpp b/kate/app/katemdi.cpp
index adf29756..473d2601 100644
--- a/kate/app/katemdi.cpp
+++ b/kate/app/katemdi.cpp
@@ -966,5 +966,3 @@ void MainWindow::saveSession (TDEConfig *config, const TQString &group)
//END MAIN WINDOW
} // namespace KateMDI
-
-// kate: space-indent on; indent-width 2;
diff --git a/kate/app/katemdi.h b/kate/app/katemdi.h
index a291ebb8..f37d56ef 100644
--- a/kate/app/katemdi.h
+++ b/kate/app/katemdi.h
@@ -444,5 +444,3 @@ class MainWindow : public KParts::MainWindow
}
#endif
-
-// kate: space-indent on; indent-width 2;
diff --git a/kate/app/katemwmodonhddialog.cpp b/kate/app/katemwmodonhddialog.cpp
index 508e0aad..c908b361 100644
--- a/kate/app/katemwmodonhddialog.cpp
+++ b/kate/app/katemwmodonhddialog.cpp
@@ -277,5 +277,3 @@ void KateMwModOnHdDialog::slotPDone( TDEProcess *p )
delete m_tmpfile;
m_tmpfile = 0;
}
-
-// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/katemwmodonhddialog.h b/kate/app/katemwmodonhddialog.h
index 3ae4d072..ff2f4989 100644
--- a/kate/app/katemwmodonhddialog.h
+++ b/kate/app/katemwmodonhddialog.h
@@ -58,4 +58,3 @@ class KateMwModOnHdDialog : public KDialogBase
};
#endif // _KATE_MW_MODONHD_DIALOG_H_
-// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/katesession.cpp b/kate/app/katesession.cpp
index 51d52b7c..bab8dce5 100644
--- a/kate/app/katesession.cpp
+++ b/kate/app/katesession.cpp
@@ -897,5 +897,3 @@ void KateSessionChooser::slotSelectionChanged()
//END KateSessionChooser
#include "katesession.moc"
-
-// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off;
diff --git a/kate/app/kateviewmanager.cpp b/kate/app/kateviewmanager.cpp
index 47ece527..7682b6cf 100644
--- a/kate/app/kateviewmanager.cpp
+++ b/kate/app/kateviewmanager.cpp
@@ -509,5 +509,3 @@ void KateViewManager::restoreViewConfiguration (TDEConfig *config, const TQStrin
KateMainWindow *KateViewManager::mainWindow() {
return m_mainWindow;
}
-
-// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/kateviewspace.cpp b/kate/app/kateviewspace.cpp
index a4066ee5..7278d7d2 100644
--- a/kate/app/kateviewspace.cpp
+++ b/kate/app/kateviewspace.cpp
@@ -421,4 +421,3 @@ bool KateVSStatusBar::eventFilter(TQObject*,TQEvent *e)
return false;
}
//END KateVSStatusBar
-// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/kateviewspace.h b/kate/app/kateviewspace.h
index 0407d35f..7c4674ec 100644
--- a/kate/app/kateviewspace.h
+++ b/kate/app/kateviewspace.h
@@ -118,4 +118,3 @@ class KateViewSpace : public TQVBox
};
#endif
-// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/kateviewspacecontainer.cpp b/kate/app/kateviewspacecontainer.cpp
index de9309f5..6e2b5d0e 100644
--- a/kate/app/kateviewspacecontainer.cpp
+++ b/kate/app/kateviewspacecontainer.cpp
@@ -754,5 +754,3 @@ void KateViewSpaceContainer::restoreSplitter( TDEConfig* config, const TQString
KateMainWindow *KateViewSpaceContainer::mainWindow() {
return m_viewManager->mainWindow();
}
-
-// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/kwritemain.cpp b/kate/app/kwritemain.cpp
index 5fc602de..00eb85a6 100644
--- a/kate/app/kwritemain.cpp
+++ b/kate/app/kwritemain.cpp
@@ -713,4 +713,3 @@ void KWriteEditorChooser::slotOk() {
m_chooser->writeAppSetting();
KDialogBase::slotOk();
}
-// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off;
diff --git a/kate/app/kwritemain.h b/kate/app/kwritemain.h
index fc47c652..5718d1e6 100644
--- a/kate/app/kwritemain.h
+++ b/kate/app/kwritemain.h
@@ -137,4 +137,3 @@ class KWriteEditorChooser: public KDialogBase
};
#endif
-// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off;
diff --git a/kate/interfaces/mainwindow.cpp b/kate/interfaces/mainwindow.cpp
index 4596cacb..2a53f5c0 100644
--- a/kate/interfaces/mainwindow.cpp
+++ b/kate/interfaces/mainwindow.cpp
@@ -78,5 +78,3 @@ ToolViewManager *MainWindow::toolViewManager () const
}
}
-
-// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/interfaces/mainwindow.h b/kate/interfaces/mainwindow.h
index bb40ffb9..27a847ac 100644
--- a/kate/interfaces/mainwindow.h
+++ b/kate/interfaces/mainwindow.h
@@ -61,5 +61,3 @@ class KDE_EXPORT MainWindow : public TQObject
}
#endif
-
-// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kcontrol/background/bgadvanced.cpp b/kcontrol/background/bgadvanced.cpp
index 69783679..2a80db02 100644
--- a/kcontrol/background/bgadvanced.cpp
+++ b/kcontrol/background/bgadvanced.cpp
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
This file is part of the KDE project, module kcmbackground.
diff --git a/kcontrol/background/bgadvanced.h b/kcontrol/background/bgadvanced.h
index cc1ba7bf..15fcae5f 100644
--- a/kcontrol/background/bgadvanced.h
+++ b/kcontrol/background/bgadvanced.h
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
This file is part of the KDE project, module kcmbackground.
diff --git a/kcontrol/background/bgdefaults.h b/kcontrol/background/bgdefaults.h
index d64c6e54..bde81071 100644
--- a/kcontrol/background/bgdefaults.h
+++ b/kcontrol/background/bgdefaults.h
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
*
* This file is part of the KDE project, module kdesktop.
* Copyright (C) 1999 Geert Jansen <g.t.jansen@stud.tue.nl>
diff --git a/kcontrol/background/bgdialog.cpp b/kcontrol/background/bgdialog.cpp
index e903b7bc..f82ccdd8 100644
--- a/kcontrol/background/bgdialog.cpp
+++ b/kcontrol/background/bgdialog.cpp
@@ -1,5 +1,4 @@
/*
- kate: space-indent on; indent-width 3; indent-mode cstyle;
This file is part of the KDE libraries
diff --git a/kcontrol/background/bgmonitor.cpp b/kcontrol/background/bgmonitor.cpp
index c05e70e5..1cf601be 100644
--- a/kcontrol/background/bgmonitor.cpp
+++ b/kcontrol/background/bgmonitor.cpp
@@ -1,5 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
- kate: space-indent on; indent-width 4; indent-mode cstyle;
+/*
This file is part of the KDE project, module kcmbackground.
diff --git a/kcontrol/background/bgmonitor.h b/kcontrol/background/bgmonitor.h
index 4a86ea3d..5d2e1fc4 100644
--- a/kcontrol/background/bgmonitor.h
+++ b/kcontrol/background/bgmonitor.h
@@ -1,5 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
- kate: space-indent on; indent-width 4; indent-mode cstyle;
+/*
This file is part of the KDE project, module kcmbackground.
diff --git a/kcontrol/background/bgrender.cpp b/kcontrol/background/bgrender.cpp
index d8cc53c9..e6c8fccc 100644
--- a/kcontrol/background/bgrender.cpp
+++ b/kcontrol/background/bgrender.cpp
@@ -1,5 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
- * kate: space-indent on; tab-width 8; indent-width 4; indent-mode cstyle;
+/*
*
* This file is part of the KDE project, module kdesktop.
* Copyright (C) 1999 Geert Jansen <g.t.jansen@stud.tue.nl>
diff --git a/kcontrol/background/bgrender.h b/kcontrol/background/bgrender.h
index 5ab1cc6c..56ce3076 100644
--- a/kcontrol/background/bgrender.h
+++ b/kcontrol/background/bgrender.h
@@ -1,5 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
- * kate: space-indent on; tab-width 8; indent-width 4; indent-mode cstyle;
+/*
*
* This file is part of the KDE project, module kdesktop.
* Copyright (C) 1999 Geert Jansen <g.t.jansen@stud.tue.nl>
diff --git a/kcontrol/background/bgsettings.cpp b/kcontrol/background/bgsettings.cpp
index 1ee452ac..278a250c 100644
--- a/kcontrol/background/bgsettings.cpp
+++ b/kcontrol/background/bgsettings.cpp
@@ -1,5 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
- * kate: space-indent on; indent-width 4; indent-mode cstyle;
+/*
*
* This file is part of the KDE project, module kdesktop.
* Copyright (C) 1999 Geert Jansen <g.t.jansen@stud.tue.nl>
diff --git a/kcontrol/background/bgsettings.h b/kcontrol/background/bgsettings.h
index a49873af..348446c8 100644
--- a/kcontrol/background/bgsettings.h
+++ b/kcontrol/background/bgsettings.h
@@ -1,5 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
- * kate: space-indent on; indent-width 4; indent-mode cstyle;
+/*
*
* This file is part of the KDE project, module kdesktop.
* Copyright (C) 1999 Geert Jansen <g.t.jansen@stud.tue.nl>
diff --git a/kcontrol/background/bgwallpaper.cpp b/kcontrol/background/bgwallpaper.cpp
index 5e43caa4..b10c3707 100644
--- a/kcontrol/background/bgwallpaper.cpp
+++ b/kcontrol/background/bgwallpaper.cpp
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
This file is part of the KDE project, module kcmbackground.
diff --git a/kcontrol/background/bgwallpaper.h b/kcontrol/background/bgwallpaper.h
index dfee2066..32f0784f 100644
--- a/kcontrol/background/bgwallpaper.h
+++ b/kcontrol/background/bgwallpaper.h
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
This file is part of the KDE project, module kcmbackground.
diff --git a/kcontrol/background/crossfade.h b/kcontrol/background/crossfade.h
index da589aac..4a9bc2b3 100644
--- a/kcontrol/background/crossfade.h
+++ b/kcontrol/background/crossfade.h
@@ -1,5 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
- * kate: space-indent on; tab-width 8; indent-width 4; indent-mode cstyle;
+/*
*
* This file is part of the KDE project, module kdesktop.
* Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org>
diff --git a/kcontrol/background/main.cpp b/kcontrol/background/main.cpp
index 2f6832dc..75ed2226 100644
--- a/kcontrol/background/main.cpp
+++ b/kcontrol/background/main.cpp
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
* This file is part of the KDE project, module kcmbackground.
* Copyright (C) 1999 Geert Jansen <g.t.jansen@stud.tue.nl>
* Copyright (C) 2003 Waldo Bastian <bastian@kde.org>
diff --git a/kcontrol/background/main.h b/kcontrol/background/main.h
index 9fdba57b..79e72d5a 100644
--- a/kcontrol/background/main.h
+++ b/kcontrol/background/main.h
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
*
* This file is part of the KDE project, module kcmdisplay.
* Copyright (C) 1999 Geert Jansen <g.t.jansen@stud.tue.nl>
diff --git a/kcontrol/componentchooser/componentchooser.cpp b/kcontrol/componentchooser/componentchooser.cpp
index c084c2fc..e7b80732 100644
--- a/kcontrol/componentchooser/componentchooser.cpp
+++ b/kcontrol/componentchooser/componentchooser.cpp
@@ -570,5 +570,3 @@ void ComponentChooser::restoreDefault() {
emitChanged(false);
*/
}
-
-// vim: sw=4 ts=4 noet
diff --git a/kcontrol/displayconfig/displayconfig.cpp b/kcontrol/displayconfig/displayconfig.cpp
index dacb5cc8..8311b428 100644
--- a/kcontrol/displayconfig/displayconfig.cpp
+++ b/kcontrol/displayconfig/displayconfig.cpp
@@ -449,8 +449,7 @@ void KDisplayConfig::updateDraggableMonitorInformationInternal (int monitor_id,
return;
}
- TQString rotationDesired = *screendata->rotations.at(screendata->current_rotation_index);
- bool isvisiblyrotated = ((rotationDesired == ROTATION_90_DEGREES_STRING) || (rotationDesired == ROTATION_270_DEGREES_STRING));
+ bool isvisiblyrotated = (screendata->current_rotation_index == ROTATION_90_DEGREES_INDEX) || (screendata->current_rotation_index == ROTATION_270_DEGREES_INDEX);
if (screendata->is_extended) {
moved_monitor->show();
@@ -987,7 +986,7 @@ void KDisplayConfig::loadProfileFromDiskHelper(bool forceReload) {
void KDisplayConfig::selectProfile (int slotNumber) {
TQString selectedProfile = base->displayProfileList->currentText();
- if (selectedProfile == "<default>") {
+ if (selectedProfile == i18n("<default>")) {
selectedProfile = "";
}
activeProfileName = selectedProfile;
@@ -1142,7 +1141,7 @@ void KDisplayConfig::updateStartupProfileLabel()
{
TQString friendlyName = startupProfileName;
if (friendlyName == "") {
- friendlyName = "<default>";
+ friendlyName = i18n("<default>");
}
base->startupDisplayProfileList->setCurrentItem(friendlyName, false);
@@ -1151,7 +1150,7 @@ void KDisplayConfig::updateStartupProfileLabel()
void KDisplayConfig::selectDefaultProfile(int slotNumber)
{
TQString selectedProfile = base->startupDisplayProfileList->currentText();
- if (selectedProfile == "<default>") {
+ if (selectedProfile == i18n("<default>")) {
selectedProfile = "";
}
@@ -1233,11 +1232,10 @@ void KDisplayConfig::updateDisplayedInformation () {
base->orientationVFlip->setChecked(screendata->has_y_flip);
}
else {
- base->rotationSelectDD->insertItem(ROTATION_0_DEGREES_STRING, 0);
+ base->rotationSelectDD->insertItem(screendata->rotations[ROTATION_0_DEGREES_INDEX], ROTATION_0_DEGREES_INDEX);
base->rotationSelectDD->setCurrentItem(0);
base->orientationHFlip->hide();
base->orientationVFlip->hide();
-
}
base->rotationSelectDD->blockSignals(false);
base->orientationHFlip->blockSignals(false);
@@ -1350,8 +1348,7 @@ void KDisplayConfig::updateDragDropDisplay() {
for (i=0;i<numberOfScreens;i++) {
screendata = m_screenInfoArray[activeProfileName].at(i);
if (((j==0) && (screendata->is_primary==true)) || ((j==1) && (screendata->is_primary==false))) { // This ensures that the primary monitor is always the first one created and placed on the configuration widget
- TQString rotationDesired = *screendata->rotations.at(screendata->current_rotation_index);
- bool isvisiblyrotated = ((rotationDesired == ROTATION_90_DEGREES_STRING) || (rotationDesired == ROTATION_270_DEGREES_STRING));
+ bool isvisiblyrotated = ((screendata->current_rotation_index == ROTATION_90_DEGREES_INDEX) || (screendata->current_rotation_index == ROTATION_270_DEGREES_INDEX));
DraggableMonitor *m = new DraggableMonitor( base->monitorPhyArrange, 0, WStyle_Customize | WDestructiveClose | WStyle_NoBorder | WX11BypassWM );
connect(m, TQT_SIGNAL(workspaceRelayoutNeeded()), this, TQT_SLOT(layoutDragDropDisplay()));
connect(m, TQT_SIGNAL(monitorSelected(int)), this, TQT_SLOT(selectScreen(int)));
@@ -1698,7 +1695,7 @@ void KDisplayConfig::createHotplugRulesGrid() {
}
KComboBox* combo = new KComboBox(base->profileRulesGridWidget, (TQString("%1").arg(i)).ascii());
connect(combo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changed()));
- combo->insertItem("<default>");
+ combo->insertItem(i18n("<default>"));
for (TQStringList::Iterator it3 = availableProfileNames.begin(); it3 != availableProfileNames.end(); ++it3) {
combo->insertItem(*it3);
}
@@ -1803,8 +1800,8 @@ void KDisplayConfig::profileListChanged() {
// Clear and reload the combo boxes
base->displayProfileList->clear();
base->startupDisplayProfileList->clear();
- base->displayProfileList->insertItem("<default>");
- base->startupDisplayProfileList->insertItem("<default>");
+ base->displayProfileList->insertItem(i18n("<default>"));
+ base->startupDisplayProfileList->insertItem(i18n("<default>"));
for (TQStringList::Iterator it = availableProfileNames.begin(); it != availableProfileNames.end(); ++it) {
base->displayProfileList->insertItem(*it);
base->startupDisplayProfileList->insertItem(*it);
diff --git a/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.cpp b/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.cpp
index 46499f2b..cae4c5ab 100644
--- a/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.cpp
+++ b/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.cpp
@@ -1,4 +1,4 @@
-/* -*- c-basic-offset: 2 -*-
+/*
tdeshorturifilter.h
diff --git a/kcontrol/energy/energy.cpp b/kcontrol/energy/energy.cpp
index 60be2cc1..34a9404a 100644
--- a/kcontrol/energy/energy.cpp
+++ b/kcontrol/energy/energy.cpp
@@ -1,7 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
- *
- *
- *
+/*
* This file is part of the KDE project, module kcontrol.
* Copyright (C) 1999 Geert Jansen <g.t.jansen@stud.tue.nl>
*
diff --git a/kcontrol/energy/energy.h b/kcontrol/energy/energy.h
index 765fdb2b..d8181067 100644
--- a/kcontrol/energy/energy.h
+++ b/kcontrol/energy/energy.h
@@ -1,7 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
- *
- *
- *
+/*
* This file is part of the KDE project, module kcontrol.
* Copyright (C) 1999 Geert Jansen <g.t.jansen@stud.tue.nl>
*
diff --git a/kcontrol/fonts/fonts.cpp b/kcontrol/fonts/fonts.cpp
index c5b4c335..4d108336 100644
--- a/kcontrol/fonts/fonts.cpp
+++ b/kcontrol/fonts/fonts.cpp
@@ -798,5 +798,3 @@ void TDEFonts::slotCfgAa()
emit changed(true);
}
}
-
-// vim:ts=2:sw=2:tw=78
diff --git a/kcontrol/hwmanager/CMakeLists.txt b/kcontrol/hwmanager/CMakeLists.txt
index be8d3f2c..bd06bd93 100644
--- a/kcontrol/hwmanager/CMakeLists.txt
+++ b/kcontrol/hwmanager/CMakeLists.txt
@@ -48,7 +48,7 @@ set_property( SOURCE hwmanager.cpp APPEND PROPERTY COMPILE_DEFINITIONS KDE_CONFD
tde_add_kpart( kcm_hwmanager AUTOMOC
SOURCES
hwmanager.cpp deviceiconview.cpp devicepropsdlg.cpp devicepropsdlgbase.ui hwmanagerbase.ui
- cryptpassworddlg.cpp cryptpassworddlgbase.ui hwmanager.skel
+ cryptpassworddlg.cpp unlockdialog.ui passworddlg.cpp cryptpassworddlgbase.ui hwmanager.skel
LINK tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
@@ -61,4 +61,4 @@ tde_add_executable( tdehwdevicetray AUTOMOC
hwdevicetray_configdialog.cpp
LINK tdeio-shared tdeutils-shared tdeui-shared
DESTINATION ${BIN_INSTALL_DIR}
-) \ No newline at end of file
+)
diff --git a/kcontrol/hwmanager/devicepropsdlg.cpp b/kcontrol/hwmanager/devicepropsdlg.cpp
index 18ac13f7..bb37695b 100644
--- a/kcontrol/hwmanager/devicepropsdlg.cpp
+++ b/kcontrol/hwmanager/devicepropsdlg.cpp
@@ -29,6 +29,8 @@
#include <tqpainter.h>
#include <tqstyle.h>
#include <tqinternal_p.h>
+#include <dcopclient.h>
+#include <dcopref.h>
#undef Unsorted // Required for --enable-final (tqdir.h)
#include <tqfiledialog.h>
@@ -45,6 +47,7 @@
#include <ksslcertificate.h>
#include "cryptpassworddlg.h"
+#include "passworddlg.h"
#include "devicepropsdlg.h"
@@ -250,7 +253,7 @@ void SensorDisplayWidget::updateDisplay() {
}
DevicePropertiesDialog::DevicePropertiesDialog(TDEGenericDevice* device, TQWidget *parent)
- : KDialogBase(Plain, TQString::null, Ok|Cancel, Ok, parent, 0L, true, true)
+ : KDialogBase(Plain, TQString::null, Ok|Cancel, Ok, parent, 0L, true, true), m_passDlg(NULL)
{
m_device = device;
enableButtonOK( false );
@@ -301,6 +304,8 @@ DevicePropertiesDialog::DevicePropertiesDialog(TDEGenericDevice* device, TQWidge
TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(m_device);
connect(base->buttonDiskMount, TQT_SIGNAL(clicked()), this, TQT_SLOT(mountDisk()));
connect(base->buttonDiskUnmount, TQT_SIGNAL(clicked()), this, TQT_SLOT(unmountDisk()));
+ connect(base->buttonDiskUnlock, TQT_SIGNAL(clicked()), this, TQT_SLOT(unlockDisk()));
+ connect(base->buttonDiskLock, TQT_SIGNAL(clicked()), this, TQT_SLOT(lockDisk()));
if (sdevice->isDiskOfType(TDEDiskDeviceType::LUKS)) {
connect(base->cryptLUKSAddKey, TQT_SIGNAL(clicked()), this, TQT_SLOT(cryptLUKSAddKey()));
connect(base->cryptLUKSDelKey, TQT_SIGNAL(clicked()), this, TQT_SLOT(cryptLUKSDelKey()));
@@ -345,6 +350,10 @@ DevicePropertiesDialog::DevicePropertiesDialog(TDEGenericDevice* device, TQWidge
DevicePropertiesDialog::~DevicePropertiesDialog()
{
+ if (m_passDlg)
+ {
+ delete m_passDlg;
+ }
}
void DevicePropertiesDialog::processHardwareRemoved(TDEGenericDevice* dev) {
@@ -416,6 +425,10 @@ void DevicePropertiesDialog::populateDeviceInformation() {
if (volUUID == "") volUUID = i18n("<none>");
base->labelDiskUUID->setText(formatDisplayString(volUUID));
+ TQString mappedName = sdevice->mappedName();
+ if (mappedName == "") mappedName = i18n("<none>");
+ base->labelMappedName->setText(formatDisplayString(mappedName));
+
// Show status
TQString status_text = "<qt>";
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Mountable)) {
@@ -446,16 +459,32 @@ void DevicePropertiesDialog::populateDeviceInformation() {
status_text += "Hidden<br>";
}
if (status_text == "<qt>") {
- status_text += "<i>Unavailable</i>";
+ status_text += "<i>Unknown</i>";
}
status_text += "</qt>";
base->labelDiskStatus->setText(status_text);
// Update mount/unmount button status
+ base->buttonDiskMount->setEnabled(false);
+ base->buttonDiskUnmount->setEnabled(false);
+ base->buttonDiskUnlock->setEnabled(false);
+ base->buttonDiskLock->setEnabled(false);
+ base->buttonDiskMount->setHidden(true);
+ base->buttonDiskUnmount->setHidden(true);
+ base->buttonDiskUnlock->setHidden(true);
+ base->buttonDiskLock->setHidden(true);
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Mountable)) {
base->groupDiskActions->show();
base->buttonDiskMount->setEnabled((sdevice->mountPath() == ""));
base->buttonDiskUnmount->setEnabled((sdevice->mountPath() != ""));
+ base->buttonDiskMount->setHidden(false);
+ base->buttonDiskUnmount->setHidden(false);
+ }
+ else if (sdevice->isDiskOfType(TDEDiskDeviceType::LUKS)) {
+ base->buttonDiskUnlock->setEnabled(!sdevice->isDiskOfType(TDEDiskDeviceType::UnlockedCrypt));
+ base->buttonDiskLock->setEnabled(sdevice->isDiskOfType(TDEDiskDeviceType::UnlockedCrypt));
+ base->buttonDiskUnlock->setHidden(false);
+ base->buttonDiskLock->setHidden(false);
}
else {
base->groupDiskActions->hide();
@@ -924,6 +953,74 @@ void DevicePropertiesDialog::unmountDisk() {
populateDeviceInformation();
}
+void DevicePropertiesDialog::unlockDisk() {
+ TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(m_device);
+
+ if (!m_passDlg)
+ {
+ m_passDlg = new PasswordDlg(sdevice->deviceNode(), "drive-harddisk-locked");
+ connect(m_passDlg, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(doUnlockDisk()));
+ }
+ m_passDlg->show();
+}
+
+void DevicePropertiesDialog::doUnlockDisk() {
+ TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(m_device);
+
+ // Use DCOP call to unlock the disk to make sure the status and mime type of the underlying medium
+ // is correctly updated throughout TDE
+ TQString qerror;
+ DCOPRef mediamanager("kded", "mediamanager");
+ DCOPReply reply = mediamanager.call("unlockByNode", sdevice->deviceNode(), m_passDlg->getPassword());
+ TQStringVariantMap unlockResult;
+ if (reply.isValid()) {
+ reply.get(unlockResult);
+ }
+ if (!unlockResult.contains("result") || !unlockResult["result"].toBool()) {
+ qerror = i18n("<qt>Unable to unlock this device.<p>Potential reasons include:<br>Wrong password and/or user privilege level.<br>Corrupt data on storage device.");
+ TQString errStr = unlockResult.contains("errStr") ? unlockResult["errStr"].toString() : i18n("Unknown unlock error.");
+ if (!errStr.isEmpty()) {
+ qerror.append(i18n("<p>Technical details:<br>").append(errStr));
+ }
+ qerror.append("</qt>");
+ }
+ else {
+ m_passDlg->hide();
+ qerror = "";
+ }
+
+ if (qerror != "") KMessageBox::error(this, qerror, i18n("Unlock Failed"));
+
+ populateDeviceInformation();
+}
+
+void DevicePropertiesDialog::lockDisk() {
+ TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(m_device);
+
+ // Use DCOP call to lock the disk to make sure the status and mime type of the underlying medium
+ // is correctly updated throughout TDE
+ TQString qerror;
+ DCOPRef mediamanager("kded", "mediamanager");
+ DCOPReply reply = mediamanager.call("lockByNode", sdevice->deviceNode());
+ TQStringVariantMap lockResult;
+ if (reply.isValid()) {
+ reply.get(lockResult);
+ }
+ if (lockResult["result"].toBool() == false) {
+ // Lock failed!
+ qerror = "<qt>" + i18n("Unfortunately, the device could not be locked.");
+ TQString errStr = lockResult.contains("errStr") ? lockResult["errStr"].toString() : TQString::null;
+ if (!errStr.isEmpty()) {
+ qerror.append(i18n("<p>Technical details:<br>").append(errStr));
+ }
+ qerror.append("</qt>");
+ }
+
+ if (qerror != "") KMessageBox::error(this, qerror, i18n("Lock Failed"));
+
+ populateDeviceInformation();
+}
+
void DevicePropertiesDialog::cryptLUKSAddKey() {
int retcode;
diff --git a/kcontrol/hwmanager/devicepropsdlg.h b/kcontrol/hwmanager/devicepropsdlg.h
index e958d39b..50fd1cac 100644
--- a/kcontrol/hwmanager/devicepropsdlg.h
+++ b/kcontrol/hwmanager/devicepropsdlg.h
@@ -20,13 +20,13 @@
#define __devicepropsdlg_h__
#include <tqprogressbar.h>
-
#include <kdialogbase.h>
-
#include <tdehardwaredevices.h>
#include "devicepropsdlgbase.h"
+class PasswordDlg;
+
/**
*
* Simple sensor name and text label value display widget
@@ -190,6 +190,9 @@ private slots:
void mountDisk();
void unmountDisk();
+ void unlockDisk();
+ void doUnlockDisk();
+ void lockDisk();
void cryptLUKSAddKey();
void cryptLUKSDelKey();
@@ -204,9 +207,7 @@ private slots:
private:
TDEGenericDevice* m_device;
DevicePropertiesDialogBase* base;
-
- class DevicePropertiesDialogPrivate;
- DevicePropertiesDialogPrivate* d;
+ PasswordDlg *m_passDlg;
TQGridLayout* m_sensorDataGrid;
SensorDisplayWidgetList m_sensorDataGridWidgets;
diff --git a/kcontrol/hwmanager/devicepropsdlgbase.ui b/kcontrol/hwmanager/devicepropsdlgbase.ui
index 48fcf7d7..b5ffe362 100644
--- a/kcontrol/hwmanager/devicepropsdlgbase.ui
+++ b/kcontrol/hwmanager/devicepropsdlgbase.ui
@@ -302,13 +302,26 @@
<cstring>unnamed</cstring>
</property>
<property name="text">
+ <string>Mapped name:</string>
+ </property>
+ </widget>
+ <widget class="KActiveLabel" row="3" column="1" colspan="1">
+ <property name="name">
+ <cstring>labelMappedName</cstring>
+ </property>
+ </widget>
+ <widget class="TQLabel" row="4" column="0" colspan="1">
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <property name="text">
<string>Status:</string>
</property>
<property name="alignment">
<set>AlignTop|AlignLeft</set>
</property>
</widget>
- <widget class="KActiveLabel" row="3" column="1" colspan="1">
+ <widget class="KActiveLabel" row="4" column="1" colspan="1">
<property name="name">
<cstring>labelDiskStatus</cstring>
</property>
@@ -342,6 +355,22 @@
<string>Unmount</string>
</property>
</widget>
+ <widget class="KPushButton" row="0" column="0" colspan="1">
+ <property name="name">
+ <cstring>buttonDiskUnlock</cstring>
+ </property>
+ <property name="text">
+ <string>Unlock</string>
+ </property>
+ </widget>
+ <widget class="KPushButton" row="0" column="1" colspan="1">
+ <property name="name">
+ <cstring>buttonDiskLock</cstring>
+ </property>
+ <property name="text">
+ <string>Lock</string>
+ </property>
+ </widget>
</grid>
</widget>
<spacer row="8" column="0">
diff --git a/kcontrol/hwmanager/hwdevicetray_bindings.cpp b/kcontrol/hwmanager/hwdevicetray_bindings.cpp
index 08145cb9..bcbbbda1 100644
--- a/kcontrol/hwmanager/hwdevicetray_bindings.cpp
+++ b/kcontrol/hwmanager/hwdevicetray_bindings.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
/* This file is part of the KDE project
Copyright (C) by Andrew Stanley-Jones
diff --git a/kcontrol/hwmanager/passworddlg.cpp b/kcontrol/hwmanager/passworddlg.cpp
new file mode 100644
index 00000000..d9f1f54a
--- /dev/null
+++ b/kcontrol/hwmanager/passworddlg.cpp
@@ -0,0 +1,59 @@
+/* This file is part of the KDE project
+ * Copyright (C) 2007 Jan Klötzke <jan kloetzke at freenet de>
+ *
+ * Based on kryptomedia- Another KDE cryto media application.
+ * Copyright (C) 2006 Daniel Gollub <dgollub@suse.de>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "passworddlg.h"
+
+PasswordDlg::PasswordDlg(TQString url, TQString iconName) :
+ KDialogBase(NULL, "PasswordDlg", true, i18n("Unlock Storage Device"), (Cancel|User1), User1, false, KGuiItem(i18n("Unlock"), "unlocked" ))
+{
+ unlockDialog = new UnlockDialog(this);
+
+ unlockDialog->descLabel->setText(unlockDialog->descLabel->text().arg(url));
+ unlockDialog->descLabel->adjustSize();
+ unlockDialog->adjustSize();
+
+ enableButton( User1, false );
+
+ TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon(iconName, TDEIcon::NoGroup, TDEIcon::SizeLarge);
+ unlockDialog->encryptedIcon->setPixmap( pixmap );
+
+ connect(unlockDialog->passwordEdit, TQT_SIGNAL (textChanged(const TQString &)), this, TQT_SLOT (slotPasswordChanged(const TQString &)));
+
+ setMainWidget(unlockDialog);
+}
+
+PasswordDlg::~PasswordDlg()
+{
+ delete unlockDialog;
+}
+
+TQString PasswordDlg::getPassword()
+{
+ return unlockDialog->passwordEdit->text();
+}
+
+void PasswordDlg::slotPasswordChanged(const TQString &text)
+{
+ enableButton( User1, !text.isEmpty() );
+}
+
+#include "passworddlg.moc"
diff --git a/kcontrol/hwmanager/passworddlg.h b/kcontrol/hwmanager/passworddlg.h
new file mode 100644
index 00000000..77ee0680
--- /dev/null
+++ b/kcontrol/hwmanager/passworddlg.h
@@ -0,0 +1,58 @@
+/* This file is part of the KDE project
+ * Copyright (C) 2007 Jan Klötzke <jan kloetzke at freenet de>
+ *
+ * Based on kryptomedia- Another KDE cryto media application.
+ * Copyright (C) 2006 Daniel Gollub <dgollub@suse.de>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef DIALOG_H_
+#define DIALOG_H_
+
+#include <tdemessagebox.h>
+#include <tdelocale.h>
+#include <tdeconfig.h>
+#include <kdebug.h>
+#include <kdialogbase.h>
+#include <kiconloader.h>
+
+#include <tqlineedit.h>
+#include <tqlabel.h>
+#include <tqgroupbox.h>
+
+#include "unlockdialog.h"
+
+class PasswordDlg : public KDialogBase
+{
+
+ Q_OBJECT
+
+public:
+ PasswordDlg(TQString url, TQString iconName);
+ ~PasswordDlg();
+
+ TQString getPassword();
+
+public slots:
+ void slotPasswordChanged(const TQString &text);
+
+private:
+ UnlockDialog *unlockDialog;
+};
+
+#endif // DIALOG_H_
+
diff --git a/kcontrol/hwmanager/unlockdialog.ui b/kcontrol/hwmanager/unlockdialog.ui
new file mode 100644
index 00000000..7b78cdb4
--- /dev/null
+++ b/kcontrol/hwmanager/unlockdialog.ui
@@ -0,0 +1,161 @@
+<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
+<class>UnlockDialog</class>
+<widget class="TQWidget">
+ <property name="name">
+ <cstring>UnlockDialog</cstring>
+ </property>
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>207</width>
+ <height>172</height>
+ </rect>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>5</hsizetype>
+ <vsizetype>3</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="caption">
+ <string>Decrypting Storage Device</string>
+ </property>
+ <grid>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="TQLayoutWidget" row="0" column="0">
+ <property name="name">
+ <cstring>layout5</cstring>
+ </property>
+ <hbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="TQLayoutWidget">
+ <property name="name">
+ <cstring>layout4</cstring>
+ </property>
+ <vbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="TQLabel">
+ <property name="name">
+ <cstring>encryptedIcon</cstring>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>0</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>48</width>
+ <height>48</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>32</width>
+ <height>32</height>
+ </size>
+ </property>
+ <property name="scaledContents">
+ <bool>true</bool>
+ </property>
+ <property name="alignment">
+ <set>AlignTop</set>
+ </property>
+ </widget>
+ <spacer>
+ <property name="name">
+ <cstring>spacer2_2</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Expanding</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>31</width>
+ <height>41</height>
+ </size>
+ </property>
+ </spacer>
+ </vbox>
+ </widget>
+ <widget class="TQLabel">
+ <property name="name">
+ <cstring>descLabel</cstring>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>3</hsizetype>
+ <vsizetype>3</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>&lt;p&gt;&lt;b&gt;%1&lt;/b&gt; is an encrypted storage device.&lt;/p&gt;
+&lt;p&gt;Please enter the password to unlock the storage device.&lt;/p&gt;</string>
+ </property>
+ <property name="alignment">
+ <set>WordBreak|AlignTop</set>
+ </property>
+ </widget>
+ </hbox>
+ </widget>
+ <widget class="TQLayoutWidget" row="1" column="0">
+ <property name="name">
+ <cstring>layout4</cstring>
+ </property>
+ <hbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="TQLabel">
+ <property name="name">
+ <cstring>textLabel1</cstring>
+ </property>
+ <property name="text">
+ <string>&amp;Password:</string>
+ </property>
+ <property name="buddy" stdset="0">
+ <cstring>passwordEdit</cstring>
+ </property>
+ </widget>
+ <widget class="TQLineEdit">
+ <property name="name">
+ <cstring>passwordEdit</cstring>
+ </property>
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>5</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>1</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="echoMode">
+ <enum>Password</enum>
+ </property>
+ </widget>
+ </hbox>
+ </widget>
+ </grid>
+</widget>
+<layoutdefaults spacing="6" margin="11"/>
+</UI>
diff --git a/kcontrol/icons/icons.cpp b/kcontrol/icons/icons.cpp
index 56df77a5..667ecaa2 100644
--- a/kcontrol/icons/icons.cpp
+++ b/kcontrol/icons/icons.cpp
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
*
* This file is part of the KDE project, module kcmdisplay.
* Copyright (C) 2000 Geert Jansen <jansen@kde.org>
diff --git a/kcontrol/icons/icons.h b/kcontrol/icons/icons.h
index 1438a9f1..2c00a16e 100644
--- a/kcontrol/icons/icons.h
+++ b/kcontrol/icons/icons.h
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
*
* This file is part of the KDE project, module kcmdisplay.
* Copyright (C) 2000 Geert Jansen <jansen@kde.org>
diff --git a/kcontrol/input/core/themepage.cpp b/kcontrol/input/core/themepage.cpp
index 24b43d82..48b6711d 100644
--- a/kcontrol/input/core/themepage.cpp
+++ b/kcontrol/input/core/themepage.cpp
@@ -208,5 +208,3 @@ void ThemePage::fixCursorFile()
p.start(TDEProcess::Block);
}
}
-
-// vim: set noet ts=4 sw=4:
diff --git a/kcontrol/input/core/themepage.h b/kcontrol/input/core/themepage.h
index d1060797..47eb1a0f 100644
--- a/kcontrol/input/core/themepage.h
+++ b/kcontrol/input/core/themepage.h
@@ -54,5 +54,3 @@ class ThemePage : public TQWidget
};
#endif // __THEMEPAGE_H
-
-// vim: set noet ts=4 sw=4:
diff --git a/kcontrol/input/xcursor/previewwidget.cpp b/kcontrol/input/xcursor/previewwidget.cpp
index 2f0ea6ed..324bb2ae 100644
--- a/kcontrol/input/xcursor/previewwidget.cpp
+++ b/kcontrol/input/xcursor/previewwidget.cpp
@@ -348,6 +348,3 @@ void PreviewWidget::mouseMoveEvent( TQMouseEvent *e )
current = pos;
}
}
-
-
-// vim: set noet ts=4 sw=4:
diff --git a/kcontrol/input/xcursor/previewwidget.h b/kcontrol/input/xcursor/previewwidget.h
index a6412a90..26ed17bb 100644
--- a/kcontrol/input/xcursor/previewwidget.h
+++ b/kcontrol/input/xcursor/previewwidget.h
@@ -43,5 +43,3 @@ class PreviewWidget : public TQWidget
#endif
-
-// vim: set noet ts=4 sw=4:
diff --git a/kcontrol/input/xcursor/themepage.cpp b/kcontrol/input/xcursor/themepage.cpp
index cdffbd1b..c4c73396 100644
--- a/kcontrol/input/xcursor/themepage.cpp
+++ b/kcontrol/input/xcursor/themepage.cpp
@@ -639,6 +639,3 @@ TQPixmap ThemePage::createIcon( const TQString &theme, const TQString &sample )
return pix;
}
-
-
-// vim: set noet ts=4 sw=4:
diff --git a/kcontrol/input/xcursor/themepage.h b/kcontrol/input/xcursor/themepage.h
index 22bca16d..548ed006 100644
--- a/kcontrol/input/xcursor/themepage.h
+++ b/kcontrol/input/xcursor/themepage.h
@@ -72,5 +72,3 @@ class ThemePage : public TQWidget
};
#endif // __THEMEPAGE_H
-
-// vim: set noet ts=4 sw=4:
diff --git a/kcontrol/kcontrol/about/kcontrol.css b/kcontrol/kcontrol/about/kcontrol.css
index dac9f05b..9f888528 100644
--- a/kcontrol/kcontrol/about/kcontrol.css
+++ b/kcontrol/kcontrol/about/kcontrol.css
@@ -48,6 +48,3 @@
.kcm_link {
color: #000;
}
-
-/* vim:set sw=2 et nocindent smartindent: */
-
diff --git a/kcontrol/kcontrol/about/main.html b/kcontrol/kcontrol/about/main.html
index 23343ddd..90e88570 100644
--- a/kcontrol/kcontrol/about/main.html
+++ b/kcontrol/kcontrol/about/main.html
@@ -62,4 +62,3 @@
<div id="footer"><div id="footerL"/><div id="footerR"/></div>
</body>
</html>
-<!-- vim:set sw=2 et nocindent smartindent: -->
diff --git a/kcontrol/kcontrol/proxywidget.cpp b/kcontrol/kcontrol/proxywidget.cpp
index b0074175..893c75d7 100644
--- a/kcontrol/kcontrol/proxywidget.cpp
+++ b/kcontrol/kcontrol/proxywidget.cpp
@@ -340,5 +340,3 @@ const TDEAboutData *ProxyWidget::aboutData() const
{
return _client->aboutData();
}
-
-// vim: sw=2 sts=2 et
diff --git a/kcontrol/konq/desktop.cpp b/kcontrol/konq/desktop.cpp
index 973d9404..5d5305b0 100644
--- a/kcontrol/konq/desktop.cpp
+++ b/kcontrol/konq/desktop.cpp
@@ -1,4 +1,3 @@
-// -*- c-basic-offset: 2 -*-
/**
* Copyright (c) 2000 Matthias Elter <elter@kde.org>
*
diff --git a/kcontrol/konqhtml/appearance.h b/kcontrol/konqhtml/appearance.h
index 3c5131ab..46045479 100644
--- a/kcontrol/konqhtml/appearance.h
+++ b/kcontrol/konqhtml/appearance.h
@@ -1,4 +1,3 @@
-// -*- c-basic-offset: 2 -*-
// (c) Martin R. Jones 1996
// (c) Bernd Wuebben 1998
// KControl port & modifications
diff --git a/kcontrol/kthememanager/knewthemedlg.cpp b/kcontrol/kthememanager/knewthemedlg.cpp
index ee18c31c..76af5490 100644
--- a/kcontrol/kthememanager/knewthemedlg.cpp
+++ b/kcontrol/kthememanager/knewthemedlg.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 4; -*-
/* Copyright (C) 2003 Lukas Tinkl <lukas@kde.org>
This program is free software; you can redistribute it and/or modify
diff --git a/kcontrol/kthememanager/knewthemedlg.h b/kcontrol/kthememanager/knewthemedlg.h
index 5a0df045..5580c4d0 100644
--- a/kcontrol/kthememanager/knewthemedlg.h
+++ b/kcontrol/kthememanager/knewthemedlg.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 4; -*-
/* Copyright (C) 2003 Lukas Tinkl <lukas@kde.org>
This program is free software; you can redistribute it and/or modify
diff --git a/kcontrol/kthememanager/ktheme.cpp b/kcontrol/kthememanager/ktheme.cpp
index fc2d6e1c..1068eb32 100644
--- a/kcontrol/kthememanager/ktheme.cpp
+++ b/kcontrol/kthememanager/ktheme.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 4; -*-
/* Copyright (C) 2003 Lukas Tinkl <lukas@kde.org>
This program is free software; you can redistribute it and/or modify
diff --git a/kcontrol/kthememanager/ktheme.h b/kcontrol/kthememanager/ktheme.h
index 11fa6b05..1c2264f7 100644
--- a/kcontrol/kthememanager/ktheme.h
+++ b/kcontrol/kthememanager/ktheme.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 4; -*-
/* Copyright (C) 2003 Lukas Tinkl <lukas@kde.org>
This program is free software; you can redistribute it and/or modify
diff --git a/kcontrol/kthememanager/kthememanager.cpp b/kcontrol/kthememanager/kthememanager.cpp
index 6afd487e..5972efa2 100644
--- a/kcontrol/kthememanager/kthememanager.cpp
+++ b/kcontrol/kthememanager/kthememanager.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 4; -*-
/* Copyright (C) 2003 Lukas Tinkl <lukas@kde.org>
This program is free software; you can redistribute it and/or modify
diff --git a/kcontrol/kthememanager/kthememanager.h b/kcontrol/kthememanager/kthememanager.h
index 2c5e494f..ac9fa5dc 100644
--- a/kcontrol/kthememanager/kthememanager.h
+++ b/kcontrol/kthememanager/kthememanager.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 4; -*-
/* Copyright (C) 2003 Lukas Tinkl <lukas@kde.org>
This program is free software; you can redistribute it and/or modify
diff --git a/kcontrol/locale/TIMEZONES b/kcontrol/locale/TIMEZONES
index b2924c04..36a5aee6 100644
--- a/kcontrol/locale/TIMEZONES
+++ b/kcontrol/locale/TIMEZONES
@@ -103,7 +103,6 @@ i18n("America/El_Salvador");
i18n("America/Fort_Nelson");
i18n("America/Fortaleza");
i18n("America/Glace_Bay");
-i18n("America/Godthab");
i18n("America/Goose_Bay");
i18n("America/Grand_Turk");
i18n("America/Grenada");
@@ -157,6 +156,7 @@ i18n("America/Noronha");
i18n("America/North_Dakota/Beulah");
i18n("America/North_Dakota/Center");
i18n("America/North_Dakota/New_Salem");
+i18n("America/Nuuk");
i18n("America/Ojinaga");
i18n("America/Panama");
i18n("America/Pangnirtung");
diff --git a/kcontrol/randr/configdialog.cpp b/kcontrol/randr/configdialog.cpp
index 5ed71aa6..88ec261f 100644
--- a/kcontrol/randr/configdialog.cpp
+++ b/kcontrol/randr/configdialog.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
/* This file is part of the KDE project
Copyright (C) 2000 by Carsten Pfeiffer <pfeiffer@kde.org>
diff --git a/kcontrol/randr/configdialog.h b/kcontrol/randr/configdialog.h
index 0728146e..66281730 100644
--- a/kcontrol/randr/configdialog.h
+++ b/kcontrol/randr/configdialog.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
/* This file is part of the KDE project
Copyright (C) 2000 by Carsten Pfeiffer <pfeiffer@kde.org>
diff --git a/kcontrol/randr/tderandrbindings.cpp b/kcontrol/randr/tderandrbindings.cpp
index 07702633..b95441f0 100644
--- a/kcontrol/randr/tderandrbindings.cpp
+++ b/kcontrol/randr/tderandrbindings.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
/* This file is part of the KDE project
Copyright (C) by Andrew Stanley-Jones
diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp
index a51a63e6..49ca332d 100644
--- a/kcontrol/style/kcmstyle.cpp
+++ b/kcontrol/style/kcmstyle.cpp
@@ -1157,5 +1157,3 @@ TQString KCMStyle::handbookSection() const
}
#include "kcmstyle.moc"
-
-// vim: set noet ts=4:
diff --git a/kcontrol/style/kcmstyle.h b/kcontrol/style/kcmstyle.h
index 4fb1065b..ecb8d4c7 100644
--- a/kcontrol/style/kcmstyle.h
+++ b/kcontrol/style/kcmstyle.h
@@ -168,5 +168,3 @@ private:
};
#endif // __KCMSTYLE_H
-
-// vim: set noet ts=4:
diff --git a/kcontrol/style/menupreview.cpp b/kcontrol/style/menupreview.cpp
index 9b5edb67..145ec465 100644
--- a/kcontrol/style/menupreview.cpp
+++ b/kcontrol/style/menupreview.cpp
@@ -161,6 +161,3 @@ void MenuPreview::paintEvent( TQPaintEvent* /* pe */ )
}
#include "menupreview.moc"
-
-// vim: set noet ts=4:
-
diff --git a/kcontrol/style/menupreview.h b/kcontrol/style/menupreview.h
index e82b88f1..6e1ad8b4 100644
--- a/kcontrol/style/menupreview.h
+++ b/kcontrol/style/menupreview.h
@@ -56,6 +56,5 @@ private:
PreviewMode mode;
};
-// vim: set noet ts=4:
#endif // __MENUPREVIEW_H
diff --git a/kcontrol/style/stylepreview.ui.h b/kcontrol/style/stylepreview.ui.h
index edf38650..6ea29b37 100644
--- a/kcontrol/style/stylepreview.ui.h
+++ b/kcontrol/style/stylepreview.ui.h
@@ -65,5 +65,3 @@ bool StylePreview::eventFilter( TQObject* /* obj */, TQEvent* ev )
}
return FALSE;
}
-
-// vim: set noet ts=4:
diff --git a/kcontrol/tdm/background.cpp b/kcontrol/tdm/background.cpp
index 139ae90b..832940d7 100644
--- a/kcontrol/tdm/background.cpp
+++ b/kcontrol/tdm/background.cpp
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
*
* This file is part of the KDE project, module kcmdisplay.
* Copyright (C) 1999 Geert Jansen <g.t.jansen@stud.tue.nl>
diff --git a/kcontrol/tdm/background.h b/kcontrol/tdm/background.h
index d88629c3..ad708d48 100644
--- a/kcontrol/tdm/background.h
+++ b/kcontrol/tdm/background.h
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
*
* This file is part of the KDE project, module kcmdisplay.
* Copyright (C) 1999 Geert Jansen <g.t.jansen@stud.tue.nl>
diff --git a/kdesktop/bgmanager.cc b/kdesktop/bgmanager.cc
index 7c641dd9..7e90e8fc 100644
--- a/kdesktop/bgmanager.cc
+++ b/kdesktop/bgmanager.cc
@@ -1,5 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
- * kate: space-indent on; tab-width 8; indent-width 4; indent-mode cstyle;
+/*
*
* This file is part of the KDE project, module kdesktop.
* Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org>
diff --git a/kdesktop/bgmanager.h b/kdesktop/bgmanager.h
index 43e57a37..b852a4ad 100644
--- a/kdesktop/bgmanager.h
+++ b/kdesktop/bgmanager.h
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
*
* This file is part of the KDE project, module kdesktop.
* Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org>
diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp
index 769c4984..0f49229a 100644
--- a/kdesktop/minicli.cpp
+++ b/kdesktop/minicli.cpp
@@ -1094,6 +1094,3 @@ void Minicli::fontChange( const TQFont & )
{
adjustSize();
}
-
-// vim: set et ts=2 sts=2 sw=2:
-
diff --git a/kdesktop/pixmapserver.cc b/kdesktop/pixmapserver.cc
index 7a480cdb..56224f37 100644
--- a/kdesktop/pixmapserver.cc
+++ b/kdesktop/pixmapserver.cc
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
*
* This file is part of the KDE project, module kdesktop.
* Copyright (C) 1999 Geert Jansen <g.t.jansen@stud.tue.nl>
diff --git a/kdesktop/pixmapserver.h b/kdesktop/pixmapserver.h
index 3084cd0a..a0eadcdd 100644
--- a/kdesktop/pixmapserver.h
+++ b/kdesktop/pixmapserver.h
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
*
* This file is part of the KDE project, module kdesktop.
* Copyright (C) 1999 Geert Jansen <g.t.jansen@stud.tue.nl>
diff --git a/khelpcenter/DESIGN b/khelpcenter/DESIGN
index 68d762a5..39498732 100644
--- a/khelpcenter/DESIGN
+++ b/khelpcenter/DESIGN
@@ -429,5 +429,3 @@ Font Configuration
# FWIW I added a simple font configuration facility a while back, which should
# IMHO be sufficient for the vast majority of users.
-
-// vim:tw=78
diff --git a/khelpcenter/application.cpp b/khelpcenter/application.cpp
index 631818df..cb9f17ab 100644
--- a/khelpcenter/application.cpp
+++ b/khelpcenter/application.cpp
@@ -86,5 +86,3 @@ extern "C" int KDE_EXPORT kdemain( int argc, char **argv )
return app.exec();
}
-
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/application.h b/khelpcenter/application.h
index 642f4dfd..b908e2b0 100644
--- a/khelpcenter/application.h
+++ b/khelpcenter/application.h
@@ -42,4 +42,3 @@ class Application : public KUniqueApplication
extern "C" { int kdemain(int argc, char **argv); }
#endif // APPLICATION_H
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/docentry.cpp b/khelpcenter/docentry.cpp
index 220ed0f9..eba2fda2 100644
--- a/khelpcenter/docentry.cpp
+++ b/khelpcenter/docentry.cpp
@@ -345,4 +345,3 @@ void DocEntry::dump() const
kdDebug() << " <documenttype>" << mDocumentType << "</documenttype>" << endl;
kdDebug() << " </docentry>" << endl;
}
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/docentry.h b/khelpcenter/docentry.h
index d86cde9d..bca2b1d7 100644
--- a/khelpcenter/docentry.h
+++ b/khelpcenter/docentry.h
@@ -114,4 +114,3 @@ class DocEntry
}
#endif
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/docentrytraverser.cpp b/khelpcenter/docentrytraverser.cpp
index d6335d23..f89d1cf8 100644
--- a/khelpcenter/docentrytraverser.cpp
+++ b/khelpcenter/docentrytraverser.cpp
@@ -46,4 +46,3 @@ DocEntry *DocEntryTraverser::parentEntry()
{
return mParentEntry;
}
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/docentrytraverser.h b/khelpcenter/docentrytraverser.h
index d8c8cb15..84ec7d21 100644
--- a/khelpcenter/docentrytraverser.h
+++ b/khelpcenter/docentrytraverser.h
@@ -41,4 +41,3 @@ class DocEntryTraverser
}
#endif
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/docmetainfo.cpp b/khelpcenter/docmetainfo.cpp
index 8e254d90..e56062a0 100644
--- a/khelpcenter/docmetainfo.cpp
+++ b/khelpcenter/docmetainfo.cpp
@@ -284,4 +284,3 @@ void DocMetaInfo::endTraverseEntries( DocEntryTraverser *traverser )
traverser->finishTraversal();
}
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/docmetainfo.h b/khelpcenter/docmetainfo.h
index 9b6871fa..657dad27 100644
--- a/khelpcenter/docmetainfo.h
+++ b/khelpcenter/docmetainfo.h
@@ -77,4 +77,3 @@ class DocMetaInfo
}
#endif
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/fontdialog.cpp b/khelpcenter/fontdialog.cpp
index 1f0cc8f6..7acac556 100644
--- a/khelpcenter/fontdialog.cpp
+++ b/khelpcenter/fontdialog.cpp
@@ -209,4 +209,3 @@ void FontDialog::save()
}
#include "fontdialog.moc"
-// vim:ts=4:sw=4:noet
diff --git a/khelpcenter/fontdialog.h b/khelpcenter/fontdialog.h
index ef06f2b8..c38a54e2 100644
--- a/khelpcenter/fontdialog.h
+++ b/khelpcenter/fontdialog.h
@@ -63,4 +63,3 @@ class FontDialog : public KDialogBase
}
#endif // FONTDIALOG_H
-// vim:ts=4:sw=4:noet
diff --git a/khelpcenter/formatter.cpp b/khelpcenter/formatter.cpp
index 21e2abb2..c42aaaec 100644
--- a/khelpcenter/formatter.cpp
+++ b/khelpcenter/formatter.cpp
@@ -218,5 +218,3 @@ TQString Formatter::title( const TQString &title )
{
return "<h2>" + title + "</h2>";
}
-
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/formatter.h b/khelpcenter/formatter.h
index 9710a0dc..12621558 100644
--- a/khelpcenter/formatter.h
+++ b/khelpcenter/formatter.h
@@ -51,5 +51,3 @@ class Formatter
}
#endif
-
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/glossary.cpp b/khelpcenter/glossary.cpp
index 5a217025..093fcb8d 100644
--- a/khelpcenter/glossary.cpp
+++ b/khelpcenter/glossary.cpp
@@ -319,4 +319,3 @@ void Glossary::slotSelectGlossEntry( const TQString &id )
}
#include "glossary.moc"
-// vim:ts=4:sw=4:et
diff --git a/khelpcenter/glossary.h b/khelpcenter/glossary.h
index 616c51b8..1adf64e0 100644
--- a/khelpcenter/glossary.h
+++ b/khelpcenter/glossary.h
@@ -143,4 +143,3 @@ class Glossary : public TDEListView
}
#endif // KHC_GLOSSARY_H
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/history.cpp b/khelpcenter/history.cpp
index 0f0085a0..429fa48a 100644
--- a/khelpcenter/history.cpp
+++ b/khelpcenter/history.cpp
@@ -348,4 +348,3 @@ bool History::canGoForward() const
}
#include "history.moc"
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/history.h b/khelpcenter/history.h
index c7c4c953..3afa2104 100644
--- a/khelpcenter/history.h
+++ b/khelpcenter/history.h
@@ -104,4 +104,3 @@ class History : public TQObject
}
#endif // HISTORY_H
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/htmlsearch.cpp b/khelpcenter/htmlsearch.cpp
index 72eaa432..0598ae89 100644
--- a/khelpcenter/htmlsearch.cpp
+++ b/khelpcenter/htmlsearch.cpp
@@ -57,5 +57,3 @@ TQString HTMLSearch::defaultIndexTestFile( KHC::DocEntry *entry )
{
return entry->identifier() + ".exists";
}
-
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/htmlsearch.h b/khelpcenter/htmlsearch.h
index 1ca97488..a6c6c718 100644
--- a/khelpcenter/htmlsearch.h
+++ b/khelpcenter/htmlsearch.h
@@ -30,4 +30,3 @@ class HTMLSearch : public QObject
}
#endif
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/htmlsearchconfig.cpp b/khelpcenter/htmlsearchconfig.cpp
index a9eef3b4..230a7eb6 100644
--- a/khelpcenter/htmlsearchconfig.cpp
+++ b/khelpcenter/htmlsearchconfig.cpp
@@ -148,4 +148,3 @@ void HtmlSearchConfig::urlClicked(const TQString &url)
}
} // End namespace KHC
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/htmlsearchconfig.h b/khelpcenter/htmlsearchconfig.h
index 7f5742b1..27cff3d9 100644
--- a/khelpcenter/htmlsearchconfig.h
+++ b/khelpcenter/htmlsearchconfig.h
@@ -55,4 +55,3 @@ class HtmlSearchConfig : public TQWidget
}
#endif
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/infotree.cpp b/khelpcenter/infotree.cpp
index c0c5a9d9..2c71d2bb 100644
--- a/khelpcenter/infotree.cpp
+++ b/khelpcenter/infotree.cpp
@@ -181,4 +181,3 @@ void InfoTree::parseInfoDirFile( const TQString &infoDirFileName )
}
#include "infotree.moc"
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/infotree.h b/khelpcenter/infotree.h
index ab191181..71be683d 100644
--- a/khelpcenter/infotree.h
+++ b/khelpcenter/infotree.h
@@ -45,4 +45,3 @@ namespace KHC
}
#endif // KHC_INFOTREE_H
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/kcmhelpcenter.cpp b/khelpcenter/kcmhelpcenter.cpp
index df8f1b36..bb3c69db 100644
--- a/khelpcenter/kcmhelpcenter.cpp
+++ b/khelpcenter/kcmhelpcenter.cpp
@@ -683,5 +683,3 @@ void KCMHelpCenter::findWriteableIndexDir()
Prefs::setIndexDirectory( TDEGlobal::dirs()->saveLocation("data", "khelpcenter/index/") );
}
#include "kcmhelpcenter.moc"
-
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/kcmhelpcenter.h b/khelpcenter/kcmhelpcenter.h
index 0212a22c..b3205ad7 100644
--- a/khelpcenter/kcmhelpcenter.h
+++ b/khelpcenter/kcmhelpcenter.h
@@ -182,4 +182,3 @@ class KCMHelpCenter : public KDialogBase, virtual public KCMHelpCenterIface
};
#endif
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/khc_indexbuilder.cpp b/khelpcenter/khc_indexbuilder.cpp
index 9c605687..6fac581c 100644
--- a/khelpcenter/khc_indexbuilder.cpp
+++ b/khelpcenter/khc_indexbuilder.cpp
@@ -217,5 +217,3 @@ int main( int argc, char **argv )
}
#include "khc_indexbuilder.moc"
-
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/khc_indexbuilder.h b/khelpcenter/khc_indexbuilder.h
index 5eb84941..9dd0b3d7 100644
--- a/khelpcenter/khc_indexbuilder.h
+++ b/khelpcenter/khc_indexbuilder.h
@@ -57,5 +57,3 @@ class IndexBuilder : public QObject
}
#endif
-
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/mainwindow.cpp b/khelpcenter/mainwindow.cpp
index c2246232..8a79b536 100644
--- a/khelpcenter/mainwindow.cpp
+++ b/khelpcenter/mainwindow.cpp
@@ -463,5 +463,3 @@ void MainWindow::slotConfigureFonts()
}
#include "mainwindow.moc"
-
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/mainwindow.h b/khelpcenter/mainwindow.h
index 795b6e13..8db9247a 100644
--- a/khelpcenter/mainwindow.h
+++ b/khelpcenter/mainwindow.h
@@ -105,4 +105,3 @@ private:
}
#endif
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/navigator.cpp b/khelpcenter/navigator.cpp
index 9590ea54..f8e4c2b6 100644
--- a/khelpcenter/navigator.cpp
+++ b/khelpcenter/navigator.cpp
@@ -678,5 +678,3 @@ void Navigator::clearSearch()
}
#include "navigator.moc"
-
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/navigator.h b/khelpcenter/navigator.h
index f91de432..88769cee 100644
--- a/khelpcenter/navigator.h
+++ b/khelpcenter/navigator.h
@@ -150,4 +150,3 @@ class Navigator : public TQWidget
}
#endif
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/navigatorappitem.cpp b/khelpcenter/navigatorappitem.cpp
index 42f98e09..b4992ea3 100644
--- a/khelpcenter/navigatorappitem.cpp
+++ b/khelpcenter/navigatorappitem.cpp
@@ -172,5 +172,3 @@ TQString NavigatorAppItem::documentationURL( KService *s )
return TQString( "help:/" ) + docPath;
}
-
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/navigatorappitem.h b/khelpcenter/navigatorappitem.h
index c89e1de7..e751251b 100644
--- a/khelpcenter/navigatorappitem.h
+++ b/khelpcenter/navigatorappitem.h
@@ -56,4 +56,3 @@ class NavigatorAppItem : public NavigatorItem
}
#endif
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/navigatoritem.cpp b/khelpcenter/navigatoritem.cpp
index ad464bac..45760f0b 100644
--- a/khelpcenter/navigatoritem.cpp
+++ b/khelpcenter/navigatoritem.cpp
@@ -106,5 +106,3 @@ TQString NavigatorItem::key( int column, bool ascending ) const
{
return text( column ).lower();
}
-
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/navigatoritem.h b/khelpcenter/navigatoritem.h
index 7808b9cd..4c0f8fed 100644
--- a/khelpcenter/navigatoritem.h
+++ b/khelpcenter/navigatoritem.h
@@ -66,5 +66,3 @@ class NavigatorItem : public TQListViewItem
}
#endif
-
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/plugintraverser.cpp b/khelpcenter/plugintraverser.cpp
index ca33664d..80c2e33c 100644
--- a/khelpcenter/plugintraverser.cpp
+++ b/khelpcenter/plugintraverser.cpp
@@ -112,5 +112,3 @@ DocEntryTraverser *PluginTraverser::createChild( DocEntry * /*entry*/ )
kdDebug( 1400 ) << "ERROR! mCurrentItem is not set." << endl;
return 0;
}
-
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/plugintraverser.h b/khelpcenter/plugintraverser.h
index 93b48003..697b8a44 100644
--- a/khelpcenter/plugintraverser.h
+++ b/khelpcenter/plugintraverser.h
@@ -49,4 +49,3 @@ namespace KHC {
}
#endif // KHC_PLUGINTRAVERSER_H
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/scopeitem.h b/khelpcenter/scopeitem.h
index cabbab76..873ee5a7 100644
--- a/khelpcenter/scopeitem.h
+++ b/khelpcenter/scopeitem.h
@@ -47,4 +47,3 @@ class ScopeItem : public TQCheckListItem
}
#endif
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/scrollkeepertreebuilder.cpp b/khelpcenter/scrollkeepertreebuilder.cpp
index f96ab3f5..c16da7d5 100644
--- a/khelpcenter/scrollkeepertreebuilder.cpp
+++ b/khelpcenter/scrollkeepertreebuilder.cpp
@@ -197,4 +197,3 @@ void ScrollKeeperTreeBuilder::insertDoc( NavigatorItem *parent,
}
#include "scrollkeepertreebuilder.moc"
-// vim:sw=2:ts=2:et
diff --git a/khelpcenter/scrollkeepertreebuilder.h b/khelpcenter/scrollkeepertreebuilder.h
index 2761a10b..4b2c6c11 100644
--- a/khelpcenter/scrollkeepertreebuilder.h
+++ b/khelpcenter/scrollkeepertreebuilder.h
@@ -56,4 +56,3 @@ class ScrollKeeperTreeBuilder : public TQObject
}
#endif // KHC_SCROLLKEEPERTREEBUILDER_H
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/searchengine.cpp b/khelpcenter/searchengine.cpp
index 56b6e635..07aa8153 100644
--- a/khelpcenter/searchengine.cpp
+++ b/khelpcenter/searchengine.cpp
@@ -498,5 +498,3 @@ bool SearchEngine::needsIndex( DocEntry *entry )
}
#include "searchengine.moc"
-
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/searchengine.h b/khelpcenter/searchengine.h
index ac31a9e0..57ba9368 100644
--- a/khelpcenter/searchengine.h
+++ b/khelpcenter/searchengine.h
@@ -148,4 +148,3 @@ class SearchEngine : public TQObject
}
#endif
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/searchwidget.cpp b/khelpcenter/searchwidget.cpp
index 5040a7d8..c4ceb20b 100644
--- a/khelpcenter/searchwidget.cpp
+++ b/khelpcenter/searchwidget.cpp
@@ -388,5 +388,3 @@ int SearchWidget::scopeCount() const
}
#include "searchwidget.moc"
-
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/searchwidget.h b/khelpcenter/searchwidget.h
index 14801223..f9f39458 100644
--- a/khelpcenter/searchwidget.h
+++ b/khelpcenter/searchwidget.h
@@ -104,4 +104,3 @@ class SearchWidget : public TQWidget, public DCOPObject
}
#endif
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/testmetainfo.cpp b/khelpcenter/testmetainfo.cpp
index 2f77ff76..260ea77d 100644
--- a/khelpcenter/testmetainfo.cpp
+++ b/khelpcenter/testmetainfo.cpp
@@ -116,4 +116,3 @@ int main(int argc,char **argv)
DocMetaInfo::self()->startTraverseEntries( &a );
kdDebug() << "Async TRAVERSE end" << endl;
}
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/toc.cpp b/khelpcenter/toc.cpp
index abd8019f..83083da9 100644
--- a/khelpcenter/toc.cpp
+++ b/khelpcenter/toc.cpp
@@ -268,4 +268,3 @@ TQString TOCSectionItem::url()
}
#include "toc.moc"
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/toc.h b/khelpcenter/toc.h
index 0a38c2ad..72dc7d19 100644
--- a/khelpcenter/toc.h
+++ b/khelpcenter/toc.h
@@ -69,4 +69,3 @@ class TOC : public QObject
}
#endif // KHC_TOC_H
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/treebuilder.cpp b/khelpcenter/treebuilder.cpp
index b8a0096d..5463652d 100644
--- a/khelpcenter/treebuilder.cpp
+++ b/khelpcenter/treebuilder.cpp
@@ -31,5 +31,3 @@ void TreeBuilder::selectURL( const TQString & )
}
#include "treebuilder.moc"
-
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/treebuilder.h b/khelpcenter/treebuilder.h
index 44344469..00042589 100644
--- a/khelpcenter/treebuilder.h
+++ b/khelpcenter/treebuilder.h
@@ -46,4 +46,3 @@ class TreeBuilder : public TQObject
}
#endif // TREEBUILDER_H
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/version.h b/khelpcenter/version.h
index b8623dbf..f9dd26a8 100644
--- a/khelpcenter/version.h
+++ b/khelpcenter/version.h
@@ -4,4 +4,3 @@
#define HELPCENTER_VERSION TDE_VERSION_STRING
#endif
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/view.cpp b/khelpcenter/view.cpp
index cf6f90f6..725ce045 100644
--- a/khelpcenter/view.cpp
+++ b/khelpcenter/view.cpp
@@ -385,4 +385,3 @@ void View::slotReload( const KURL &url )
}
#include "view.moc"
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/view.h b/khelpcenter/view.h
index 2ad17af6..7742edae 100644
--- a/khelpcenter/view.h
+++ b/khelpcenter/view.h
@@ -90,5 +90,3 @@ class View : public TDEHTMLPart
}
#endif
-
-// vim:ts=2:sw=2:et
diff --git a/kicker/extensions/kasbar/kasaboutdlg.h b/kicker/extensions/kasbar/kasaboutdlg.h
index 0311202b..0eb1a13f 100644
--- a/kicker/extensions/kasbar/kasaboutdlg.h
+++ b/kicker/extensions/kasbar/kasaboutdlg.h
@@ -51,8 +51,6 @@
/*
** Bug reports and questions can be sent to kde-devel@kde.org
*/
-// -*- c++ -*-
-
#ifndef KASABOUTDLG_H
#define KASABOUTDLG_H
diff --git a/kicker/extensions/kasbar/kasbar.h b/kicker/extensions/kasbar/kasbar.h
index d875dd00..5d8ac326 100644
--- a/kicker/extensions/kasbar/kasbar.h
+++ b/kicker/extensions/kasbar/kasbar.h
@@ -1,5 +1,3 @@
-// -*- c++ -*-
-
/* kasbar.h
**
** Copyright (C) 2001-2004 Richard Moore <rich@kde.org>
@@ -53,9 +51,6 @@
/*
** Bug reports and questions can be sent to kde-devel@kde.org
*/
-// -*- c++ -*-
-
-
#ifndef __KASBAR_H
#define __KASBAR_H
diff --git a/kicker/extensions/kasbar/kasbarextension.h b/kicker/extensions/kasbar/kasbarextension.h
index 7fbb4fbc..e5700eee 100644
--- a/kicker/extensions/kasbar/kasbarextension.h
+++ b/kicker/extensions/kasbar/kasbarextension.h
@@ -51,8 +51,6 @@
/*
** Bug reports and questions can be sent to kde-devel@kde.org
*/
-// -*- c++ -*-
-
#ifndef KASBAREXTENSION_H
#define KASBAREXTENSION_H
diff --git a/kicker/extensions/kasbar/kasclockitem.h b/kicker/extensions/kasbar/kasclockitem.h
index a95ebac7..a020608b 100644
--- a/kicker/extensions/kasbar/kasclockitem.h
+++ b/kicker/extensions/kasbar/kasclockitem.h
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-
-
#ifndef KASCLOCKITEM_H
#define KASCLOCKITEM_H
diff --git a/kicker/extensions/kasbar/kasgrouper.h b/kicker/extensions/kasbar/kasgrouper.h
index c5beab3a..d134d892 100644
--- a/kicker/extensions/kasbar/kasgrouper.h
+++ b/kicker/extensions/kasbar/kasgrouper.h
@@ -1,5 +1,3 @@
-// -*- c++ -*-
-
/* kasgrouper.h
**
** Copyright (C) 2001-2004 Richard Moore <rich@kde.org>
diff --git a/kicker/extensions/kasbar/kasgroupitem.h b/kicker/extensions/kasbar/kasgroupitem.h
index e30260f5..33d91343 100644
--- a/kicker/extensions/kasbar/kasgroupitem.h
+++ b/kicker/extensions/kasbar/kasgroupitem.h
@@ -1,5 +1,3 @@
-// -*- c++ -*-
-
/* kasgroupitem.h
**
** Copyright (C) 2001-2004 Richard Moore <rich@kde.org>
@@ -53,9 +51,6 @@
/*
** Bug reports and questions can be sent to kde-devel@kde.org
*/
-// -*- c++ -*-
-
-
#ifndef KASGROUPITEM_H
#define KASGROUPITEM_H
diff --git a/kicker/extensions/kasbar/kasitem.h b/kicker/extensions/kasbar/kasitem.h
index 5c737882..4408227c 100644
--- a/kicker/extensions/kasbar/kasitem.h
+++ b/kicker/extensions/kasbar/kasitem.h
@@ -51,8 +51,6 @@
/*
** Bug reports and questions can be sent to kde-devel@kde.org
*/
-// -*- c++ -*-
-
#ifndef KASITEM_H
#define KASITEM_H
diff --git a/kicker/extensions/kasbar/kasloaditem.h b/kicker/extensions/kasbar/kasloaditem.h
index ba2fd5ff..0b7312ab 100644
--- a/kicker/extensions/kasbar/kasloaditem.h
+++ b/kicker/extensions/kasbar/kasloaditem.h
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-
-
#ifndef KASLOADITEM_H
#define KASLOADITEM_H
diff --git a/kicker/extensions/kasbar/kaspopup.h b/kicker/extensions/kasbar/kaspopup.h
index 38abbbc2..2de7ee6b 100644
--- a/kicker/extensions/kasbar/kaspopup.h
+++ b/kicker/extensions/kasbar/kaspopup.h
@@ -51,8 +51,6 @@
/*
** Bug reports and questions can be sent to kde-devel@kde.org
*/
-// -*- c++ -*-
-
#ifndef KASPOPUP_H
#define KASPOPUP_H
diff --git a/kicker/extensions/kasbar/kasprefsdlg.h b/kicker/extensions/kasbar/kasprefsdlg.h
index c3e8be13..05ad8c3a 100644
--- a/kicker/extensions/kasbar/kasprefsdlg.h
+++ b/kicker/extensions/kasbar/kasprefsdlg.h
@@ -1,5 +1,3 @@
-// -*- c++ -*-
-
/* kasprefsdlg.h
**
** Copyright (C) 2001-2004 Richard Moore <rich@kde.org>
@@ -53,8 +51,6 @@
/*
** Bug reports and questions can be sent to kde-devel@kde.org
*/
-// -*- c++ -*-
-
#ifndef KASPREFSDLG_H
#define KASPREFSDLG_H
diff --git a/kicker/extensions/kasbar/kasresources.h b/kicker/extensions/kasbar/kasresources.h
index bada9786..e82c1b9e 100644
--- a/kicker/extensions/kasbar/kasresources.h
+++ b/kicker/extensions/kasbar/kasresources.h
@@ -1,5 +1,3 @@
-// -*- c++ -*-
-
/* kasbar.h
**
** Copyright (C) 2001-2004 Richard Moore <rich@kde.org>
diff --git a/kicker/extensions/kasbar/kasstartupitem.h b/kicker/extensions/kasbar/kasstartupitem.h
index 16adcc68..4c0ade4e 100644
--- a/kicker/extensions/kasbar/kasstartupitem.h
+++ b/kicker/extensions/kasbar/kasstartupitem.h
@@ -51,9 +51,6 @@
/*
** Bug reports and questions can be sent to kde-devel@kde.org
*/
-// -*- c++ -*-
-
-
#ifndef KASSTARTUPITEM_H
#define KASSTARTUPITEM_H
diff --git a/kicker/extensions/kasbar/kastasker.h b/kicker/extensions/kasbar/kastasker.h
index 93cddd1c..c56015aa 100644
--- a/kicker/extensions/kasbar/kastasker.h
+++ b/kicker/extensions/kasbar/kastasker.h
@@ -1,5 +1,3 @@
-// -*- c++ -*-
-
/* kastasker.h
**
** Copyright (C) 2001-2004 Richard Moore <rich@kde.org>
diff --git a/kicker/extensions/kasbar/kastaskitem.h b/kicker/extensions/kasbar/kastaskitem.h
index b2b166ef..7c18685d 100644
--- a/kicker/extensions/kasbar/kastaskitem.h
+++ b/kicker/extensions/kasbar/kastaskitem.h
@@ -51,9 +51,6 @@
/*
** Bug reports and questions can be sent to kde-devel@kde.org
*/
-// -*- c++ -*-
-
-
#ifndef KASTASKITEM_H
#define KASTASKITEM_H
diff --git a/kicker/extensions/kasbar/kastaskpopup.h b/kicker/extensions/kasbar/kastaskpopup.h
index dcdc3310..00b390de 100644
--- a/kicker/extensions/kasbar/kastaskpopup.h
+++ b/kicker/extensions/kasbar/kastaskpopup.h
@@ -51,8 +51,6 @@
/*
** Bug reports and questions can be sent to kde-devel@kde.org
*/
-// -*- c++ -*-
-
#ifndef KASTASKPOPUP_H
#define KASTASKPOPUP_H
diff --git a/kicker/kicker/ui/browser_mnu.cpp b/kicker/kicker/ui/browser_mnu.cpp
index 9b629e16..c5b76569 100644
--- a/kicker/kicker/ui/browser_mnu.cpp
+++ b/kicker/kicker/ui/browser_mnu.cpp
@@ -544,5 +544,3 @@ void PanelBrowserMenu::initIconMap()
_icons->insert("exec", SmallIcon("application-x-executable"));
_icons->insert("chardevice", SmallIcon("chardevice"));
}
-
-// vim: sw=4 et
diff --git a/kicker/kicker/ui/hidebutton.cpp b/kicker/kicker/ui/hidebutton.cpp
index 04666659..97167935 100644
--- a/kicker/kicker/ui/hidebutton.cpp
+++ b/kicker/kicker/ui/hidebutton.cpp
@@ -198,5 +198,3 @@ void HideButton::resizeEvent(TQResizeEvent *)
}
#include "hidebutton.moc"
-
-// vim:ts=4:sw=4:et
diff --git a/kicker/kicker/ui/hidebutton.h b/kicker/kicker/ui/hidebutton.h
index bb68929a..c73c25ba 100644
--- a/kicker/kicker/ui/hidebutton.h
+++ b/kicker/kicker/ui/hidebutton.h
@@ -52,5 +52,3 @@ class HideButton : public TQButton
};
#endif // HIDEBUTTON_H
-
-// vim:ts=4:sw=4:et
diff --git a/kicker/kicker/ui/itemview.cpp b/kicker/kicker/ui/itemview.cpp
index ea789434..4ca9acb8 100644
--- a/kicker/kicker/ui/itemview.cpp
+++ b/kicker/kicker/ui/itemview.cpp
@@ -1256,5 +1256,3 @@ bool FavoritesItemView::acceptDrag (TQDropEvent* event) const
}
#include "itemview.moc"
-
-// vim:cindent:sw=4:
diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp
index 7ccb447b..8ea8e07c 100644
--- a/kicker/kicker/ui/k_new_mnu.cpp
+++ b/kicker/kicker/ui/k_new_mnu.cpp
@@ -3960,5 +3960,3 @@ void KMenu::runUserCommand()
kapp->dcopClient()->send( appname, "KDesktopIface",
"popupExecuteCommand()", data );
}
-
-// vim:cindent:sw=4:
diff --git a/kicker/kicker/ui/kickoff_bar.cpp b/kicker/kicker/ui/kickoff_bar.cpp
index e6e66b44..c13bffe1 100644
--- a/kicker/kicker/ui/kickoff_bar.cpp
+++ b/kicker/kicker/ui/kickoff_bar.cpp
@@ -235,4 +235,3 @@ void KickoffTabBar::mousePressEvent( TQMouseEvent * e )
}
#include "kickoff_bar.moc"
-// vim:cindent:sw=4:
diff --git a/kicker/libkicker/simplebutton.cpp b/kicker/libkicker/simplebutton.cpp
index 67c90b81..12d5085d 100644
--- a/kicker/libkicker/simplebutton.cpp
+++ b/kicker/libkicker/simplebutton.cpp
@@ -285,5 +285,3 @@ void SimpleArrowButton::leaveEvent( TQEvent *e )
}
#include "simplebutton.moc"
-
-// vim:ts=4:sw=4:et
diff --git a/kicker/libkicker/simplebutton.h b/kicker/libkicker/simplebutton.h
index bbfcbd79..e89571ef 100644
--- a/kicker/libkicker/simplebutton.h
+++ b/kicker/libkicker/simplebutton.h
@@ -87,5 +87,3 @@ class KDE_EXPORT SimpleArrowButton: public SimpleButton
#endif // HIDEBUTTON_H
-
-// vim:ts=4:sw=4:et
diff --git a/kicker/menuext/kate/katesessionmenu.cpp b/kicker/menuext/kate/katesessionmenu.cpp
index c2b3712c..c992cf85 100644
--- a/kicker/menuext/kate/katesessionmenu.cpp
+++ b/kicker/menuext/kate/katesessionmenu.cpp
@@ -175,5 +175,3 @@ void KateSessionMenu::reloadSessionsList()
reinitialize();
exec();
}
-
-// kate: space-indent: on; indent-width 2; replace-tabs on;
diff --git a/kicker/menuext/kate/katesessionmenu.h b/kicker/menuext/kate/katesessionmenu.h
index 2558ad70..78ab50e1 100644
--- a/kicker/menuext/kate/katesessionmenu.h
+++ b/kicker/menuext/kate/katesessionmenu.h
@@ -42,5 +42,3 @@ class KateSessionMenu : public KPanelMenu {
};
#endif // _KateSessionMenu_h_
-
-// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/klipper/applet.cpp b/klipper/applet.cpp
index aaaf9523..ac47f4d9 100644
--- a/klipper/applet.cpp
+++ b/klipper/applet.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
/* This file is part of the KDE project
Copyright (C) by Andrew Stanley-Jones
Copyright (C) 2000 by Carsten Pfeiffer <pfeiffer@kde.org>
diff --git a/klipper/applet.h b/klipper/applet.h
index 3f1ee336..7b7cf7a7 100644
--- a/klipper/applet.h
+++ b/klipper/applet.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
/* This file is part of the KDE project
Copyright (C) Andrew Stanley-Jones
diff --git a/klipper/clipboardpoll.cpp b/klipper/clipboardpoll.cpp
index cc2f3877..a4c4b46c 100644
--- a/klipper/clipboardpoll.cpp
+++ b/klipper/clipboardpoll.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
/* This file is part of the KDE project
Copyright (C) 2003 by Lubos Lunak <l.lunak@kde.org>
diff --git a/klipper/clipboardpoll.h b/klipper/clipboardpoll.h
index f0579a4c..17023285 100644
--- a/klipper/clipboardpoll.h
+++ b/klipper/clipboardpoll.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
/* This file is part of the KDE project
Copyright (C) 2003 by Lubos Lunak <l.lunak@kde.org>
diff --git a/klipper/configdialog.cpp b/klipper/configdialog.cpp
index ad1ad93f..25c095c2 100644
--- a/klipper/configdialog.cpp
+++ b/klipper/configdialog.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
/* This file is part of the KDE project
Copyright (C) 2000 by Carsten Pfeiffer <pfeiffer@kde.org>
diff --git a/klipper/configdialog.h b/klipper/configdialog.h
index 345a9f05..29aaa856 100644
--- a/klipper/configdialog.h
+++ b/klipper/configdialog.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
/* This file is part of the KDE project
Copyright (C) 2000 by Carsten Pfeiffer <pfeiffer@kde.org>
diff --git a/klipper/history.cpp b/klipper/history.cpp
index a02b3715..625fbef0 100644
--- a/klipper/history.cpp
+++ b/klipper/history.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
/* This file is part of the KDE project
Copyright (C) 2004 Esben Mose Hansen <kde@mosehansen.dk>
Copyright (C) by Andrew Stanley-Jones
diff --git a/klipper/history.h b/klipper/history.h
index 405041e0..cef62c95 100644
--- a/klipper/history.h
+++ b/klipper/history.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
/* This file is part of the KDE project
Copyright (C) 2004 Esben Mose Hansen <kde@mosehansen.dk>
Copyright (C) Andrew Stanley-Jones
diff --git a/klipper/historyimageitem.cpp b/klipper/historyimageitem.cpp
index 38767b42..7c1cd858 100644
--- a/klipper/historyimageitem.cpp
+++ b/klipper/historyimageitem.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
/* This file is part of the KDE project
Copyright (C) 2004 Esben Mose Hansen <kde@mosehansen.dk>
diff --git a/klipper/historyimageitem.h b/klipper/historyimageitem.h
index f9a79d89..fee81d1e 100644
--- a/klipper/historyimageitem.h
+++ b/klipper/historyimageitem.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
/* This file is part of the KDE project
Copyright (C) 2004 Esben Mose Hansen <kde@mosehansen.dk>
diff --git a/klipper/historyitem.cpp b/klipper/historyitem.cpp
index e035856d..9b592fb0 100644
--- a/klipper/historyitem.cpp
+++ b/klipper/historyitem.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
/* This file is part of the KDE project
Copyright (C) 2004 Esben Mose Hansen <kde@mosehansen.dk>
diff --git a/klipper/historyitem.h b/klipper/historyitem.h
index b0ab0bc5..2dba8a4e 100644
--- a/klipper/historyitem.h
+++ b/klipper/historyitem.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
/* This file is part of the KDE project
Copyright (C) 2004 Esben Mose Hansen <kde@mosehansen.dk>
diff --git a/klipper/historystringitem.cpp b/klipper/historystringitem.cpp
index 85a4ede4..154b8d53 100644
--- a/klipper/historystringitem.cpp
+++ b/klipper/historystringitem.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
/* This file is part of the KDE project
Copyright (C) 2004 Esben Mose Hansen <kde@mosehansen.dk>
diff --git a/klipper/historystringitem.h b/klipper/historystringitem.h
index a142fbe2..e4d80b03 100644
--- a/klipper/historystringitem.h
+++ b/klipper/historystringitem.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
/* This file is part of the KDE project
Copyright (C) 2004 Esben Mose Hansen <kde@mosehansen.dk>
diff --git a/klipper/historyurlitem.cpp b/klipper/historyurlitem.cpp
index ea8fb7ff..64808489 100644
--- a/klipper/historyurlitem.cpp
+++ b/klipper/historyurlitem.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
/* This file is part of the KDE project
Copyright (C) 2004 Esben Mose Hansen <kde@mosehansen.dk>
diff --git a/klipper/historyurlitem.h b/klipper/historyurlitem.h
index 7908721c..54a40c06 100644
--- a/klipper/historyurlitem.h
+++ b/klipper/historyurlitem.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
/* This file is part of the KDE project
Copyright (C) 2004 Esben Mose Hansen <kde@mosehansen.dk>
diff --git a/klipper/klipperbindings.cpp b/klipper/klipperbindings.cpp
index 7029d441..6e0e3335 100644
--- a/klipper/klipperbindings.cpp
+++ b/klipper/klipperbindings.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
/* This file is part of the KDE project
Copyright (C) by Andrew Stanley-Jones
diff --git a/klipper/klipperpopup.cpp b/klipper/klipperpopup.cpp
index 5ca29ef4..c3881a7a 100644
--- a/klipper/klipperpopup.cpp
+++ b/klipper/klipperpopup.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
/* This file is part of the KDE project
Copyright (C) 2004 Esben Mose Hansen <kde@mosehansen.dk>
Copyright (C) by Andrew Stanley-Jones
diff --git a/klipper/klipperpopup.h b/klipper/klipperpopup.h
index ea800c67..756f7a44 100644
--- a/klipper/klipperpopup.h
+++ b/klipper/klipperpopup.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
/* This file is part of the KDE project
Copyright (C) 2004 Esben Mose Hansen <kde@mosehansen.dk>
Copytight (C) by Andrew Stanley-Jones
diff --git a/klipper/main.cpp b/klipper/main.cpp
index 0cdc73af..6d0b5e9e 100644
--- a/klipper/main.cpp
+++ b/klipper/main.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
/* This file is part of the KDE project
Copyright (C) Andrew Stanley-Jones
diff --git a/klipper/popupproxy.cpp b/klipper/popupproxy.cpp
index 1c427834..71adba63 100644
--- a/klipper/popupproxy.cpp
+++ b/klipper/popupproxy.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
/* This file is part of the KDE project
Copyright (C) 2004 Esben Mose Hansen <kde@mosehansen.dk>
diff --git a/klipper/popupproxy.h b/klipper/popupproxy.h
index bc99daea..f56f0509 100644
--- a/klipper/popupproxy.h
+++ b/klipper/popupproxy.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
/* This file is part of the KDE project
Copyright (C) 2004 Esben Mose Hansen <kde@mosehansen.dk>
diff --git a/klipper/toplevel.cpp b/klipper/toplevel.cpp
index 278e74bb..a338216d 100644
--- a/klipper/toplevel.cpp
+++ b/klipper/toplevel.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
/* This file is part of the KDE project
Copyright (C) by Andrew Stanley-Jones
diff --git a/klipper/toplevel.h b/klipper/toplevel.h
index b8526e59..3dbdf440 100644
--- a/klipper/toplevel.h
+++ b/klipper/toplevel.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
/* This file is part of the KDE project
Copyright (C) by Andrew Stanley-Jones
Copyright (C) 2004 Esben Mose Hansen <kde@mosehansen.dk>
diff --git a/klipper/urlgrabber.cpp b/klipper/urlgrabber.cpp
index 684e08c2..b8b1cb03 100644
--- a/klipper/urlgrabber.cpp
+++ b/klipper/urlgrabber.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
/* This file is part of the KDE project
Copyright (C) (C) 2000,2001,2002 by Carsten Pfeiffer <pfeiffer@kde.org>
diff --git a/klipper/urlgrabber.h b/klipper/urlgrabber.h
index fd97067d..48ef020e 100644
--- a/klipper/urlgrabber.h
+++ b/klipper/urlgrabber.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
/* This file is part of the KDE project
Copyright (C) 2000 by Carsten Pfeiffer <pfeiffer@kde.org>
diff --git a/klipper/version.h b/klipper/version.h
index 758d59a6..ce44571f 100644
--- a/klipper/version.h
+++ b/klipper/version.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
/* This file is part of the KDE project
Copyright (C) Andrew Stanley-Jones
diff --git a/knetattach/knetattach.ui.h b/knetattach/knetattach.ui.h
index cd5353cf..f7124099 100644
--- a/knetattach/knetattach.ui.h
+++ b/knetattach/knetattach.ui.h
@@ -284,5 +284,3 @@ void KNetAttach::updateFinishButtonText(bool save)
finishButton()->setText(i18n("C&onnect"));
}
}
-
-// vim: ts=8 sw=4 noet
diff --git a/konqueror/about/intro.html b/konqueror/about/intro.html
index efa4d62a..d9a2943c 100644
--- a/konqueror/about/intro.html
+++ b/konqueror/about/intro.html
@@ -87,4 +87,3 @@
<div id="footer"><div id="footerL"/><div id="footerR"/></div>
</body>
</html>
-<!-- vim:set sw=2 et nocindent smartindent: -->
diff --git a/konqueror/about/launch.html b/konqueror/about/launch.html
index 6e84049a..a9d56935 100644
--- a/konqueror/about/launch.html
+++ b/konqueror/about/launch.html
@@ -131,4 +131,3 @@
<div id="footer"><div id="footerL"/><div id="footerR"/></div>
</body>
</html>
-<!-- vim:set sw=2 et nocindent smartindent: -->
diff --git a/konqueror/about/specs.html b/konqueror/about/specs.html
index 752c162d..be40c90b 100644
--- a/konqueror/about/specs.html
+++ b/konqueror/about/specs.html
@@ -204,4 +204,3 @@
<div id="footer"><div id="footerL"/><div id="footerR"/></div>
</body>
</html>
-<!-- vim:set sw=2 et nocindent smartindent: -->
diff --git a/konqueror/about/tips.html b/konqueror/about/tips.html
index cf4a3786..085b630a 100644
--- a/konqueror/about/tips.html
+++ b/konqueror/about/tips.html
@@ -124,4 +124,3 @@
<div id="footer"><div id="footerL"/><div id="footerR"/></div>
</body>
</html>
-<!-- vim:set sw=2 et nocindent smartindent: -->
diff --git a/konqueror/delayedinitializer.cc b/konqueror/delayedinitializer.cc
index c8ab8972..e30db3d2 100644
--- a/konqueror/delayedinitializer.cc
+++ b/konqueror/delayedinitializer.cc
@@ -50,6 +50,3 @@ void DelayedInitializer::slotInitialize()
}
#include "delayedinitializer.moc"
-
-/* vim: et sw=4
- */
diff --git a/konqueror/delayedinitializer.h b/konqueror/delayedinitializer.h
index a9119ba5..27953f20 100644
--- a/konqueror/delayedinitializer.h
+++ b/konqueror/delayedinitializer.h
@@ -41,5 +41,3 @@ private:
};
#endif
-/* vim: et sw=4
- */
diff --git a/konqueror/keditbookmarks/actionsimpl.cpp b/konqueror/keditbookmarks/actionsimpl.cpp
index 1313ccd3..246cbb0b 100644
--- a/konqueror/keditbookmarks/actionsimpl.cpp
+++ b/konqueror/keditbookmarks/actionsimpl.cpp
@@ -1,5 +1,3 @@
-// -*- indent-tabs-mode:nil -*-
-// vim: set ts=4 sts=4 sw=4 et:
/* This file is part of the KDE project
Copyright (C) 2000 David Faure <faure@kde.org>
Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org>
diff --git a/konqueror/keditbookmarks/actionsimpl.h b/konqueror/keditbookmarks/actionsimpl.h
index 11cd70d5..4e2ce3d2 100644
--- a/konqueror/keditbookmarks/actionsimpl.h
+++ b/konqueror/keditbookmarks/actionsimpl.h
@@ -1,5 +1,3 @@
-// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*-
-// vim: set ts=4 sts=4 sw=4 et:
/* This file is part of the KDE project
Copyright (C) 2003 Alexander Kellett <lypanov@kde.org>
diff --git a/konqueror/keditbookmarks/bookmarkinfo.cpp b/konqueror/keditbookmarks/bookmarkinfo.cpp
index 95ae0707..8a7e05c3 100644
--- a/konqueror/keditbookmarks/bookmarkinfo.cpp
+++ b/konqueror/keditbookmarks/bookmarkinfo.cpp
@@ -1,4 +1,3 @@
-// vim: set ts=4 sts=4 sw=4 et:
/* This file is part of the KDE project
Copyright (C) 2003 Alexander Kellett <lypanov@kde.org>
diff --git a/konqueror/keditbookmarks/bookmarkinfo.h b/konqueror/keditbookmarks/bookmarkinfo.h
index 8565616e..b1c00dc6 100644
--- a/konqueror/keditbookmarks/bookmarkinfo.h
+++ b/konqueror/keditbookmarks/bookmarkinfo.h
@@ -1,4 +1,3 @@
-// vim: set ts=4 sts=4 sw=4 et:
/* This file is part of the KDE project
Copyright (C) 2000 David Faure <faure@kde.org>
Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org>
diff --git a/konqueror/keditbookmarks/bookmarkiterator.cpp b/konqueror/keditbookmarks/bookmarkiterator.cpp
index c30d890e..41aa6299 100644
--- a/konqueror/keditbookmarks/bookmarkiterator.cpp
+++ b/konqueror/keditbookmarks/bookmarkiterator.cpp
@@ -1,5 +1,3 @@
-// -*- indent-tabs-mode:nil -*-
-// vim: set ts=4 sts=4 sw=4 et:
/* This file is part of the KDE project
Copyright (C) 2000 David Faure <faure@kde.org>
Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org>
diff --git a/konqueror/keditbookmarks/bookmarkiterator.h b/konqueror/keditbookmarks/bookmarkiterator.h
index 0931ccaf..e0ce24ea 100644
--- a/konqueror/keditbookmarks/bookmarkiterator.h
+++ b/konqueror/keditbookmarks/bookmarkiterator.h
@@ -1,5 +1,3 @@
-// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*-
-// vim: set ts=4 sts=4 sw=4 et:
/* This file is part of the KDE project
Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org>
diff --git a/konqueror/keditbookmarks/commands.cpp b/konqueror/keditbookmarks/commands.cpp
index f69c01ca..6f228e56 100644
--- a/konqueror/keditbookmarks/commands.cpp
+++ b/konqueror/keditbookmarks/commands.cpp
@@ -1,5 +1,3 @@
-// -*- indent-tabs-mode:nil -*-
-// vim: set ts=4 sts=4 sw=4 et:
/* This file is part of the KDE project
Copyright (C) 2000 David Faure <faure@kde.org>
Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org>
diff --git a/konqueror/keditbookmarks/commands.h b/konqueror/keditbookmarks/commands.h
index 84268a69..92e56bed 100644
--- a/konqueror/keditbookmarks/commands.h
+++ b/konqueror/keditbookmarks/commands.h
@@ -1,4 +1,3 @@
-// kate: space-indent on; indent-width 3; replace-tabs on;
/* This file is part of the KDE project
Copyright (C) 2000 David Faure <faure@kde.org>
Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org>
diff --git a/konqueror/keditbookmarks/dcop.cpp b/konqueror/keditbookmarks/dcop.cpp
index 570445ca..0d262bc7 100644
--- a/konqueror/keditbookmarks/dcop.cpp
+++ b/konqueror/keditbookmarks/dcop.cpp
@@ -1,5 +1,3 @@
-// -*- indent-tabs-mode:nil -*-
-// vim: set ts=4 sts=4 sw=4 et:
/* This file is part of the KDE project
Copyright (C) 2000 David Faure <faure@kde.org>
Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org>
diff --git a/konqueror/keditbookmarks/dcop.h b/konqueror/keditbookmarks/dcop.h
index 6914f2db..8e9ae1bf 100644
--- a/konqueror/keditbookmarks/dcop.h
+++ b/konqueror/keditbookmarks/dcop.h
@@ -1,5 +1,3 @@
-// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*-
-// vim: set ts=4 sts=4 sw=4 et:
/* This file is part of the KDE project
Copyright (C) 2003 Alexander Kellett <lypanov@kde.org>
diff --git a/konqueror/keditbookmarks/exporters.cpp b/konqueror/keditbookmarks/exporters.cpp
index 68188388..1865986b 100644
--- a/konqueror/keditbookmarks/exporters.cpp
+++ b/konqueror/keditbookmarks/exporters.cpp
@@ -1,5 +1,3 @@
-// -*- indent-tabs-mode:nil -*-
-// vim: set ts=4 sts=4 sw=4 et:
/* This file is part of the KDE project
Copyright (C) 2003 Alexander Kellett <lypanov@kde.org>
diff --git a/konqueror/keditbookmarks/favicons.cpp b/konqueror/keditbookmarks/favicons.cpp
index f4e2183e..a1ea018b 100644
--- a/konqueror/keditbookmarks/favicons.cpp
+++ b/konqueror/keditbookmarks/favicons.cpp
@@ -1,5 +1,3 @@
-// -*- indent-tabs-mode:nil -*-
-// vim: set ts=4 sts=4 sw=4 et:
/* This file is part of the KDE project
Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org>
diff --git a/konqueror/keditbookmarks/favicons.h b/konqueror/keditbookmarks/favicons.h
index 3be46d35..e857476e 100644
--- a/konqueror/keditbookmarks/favicons.h
+++ b/konqueror/keditbookmarks/favicons.h
@@ -1,5 +1,3 @@
-// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*-
-// vim: set ts=4 sts=4 sw=4 et:
/* This file is part of the KDE project
Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org>
diff --git a/konqueror/keditbookmarks/importers.cpp b/konqueror/keditbookmarks/importers.cpp
index e809a12e..104db004 100644
--- a/konqueror/keditbookmarks/importers.cpp
+++ b/konqueror/keditbookmarks/importers.cpp
@@ -1,5 +1,3 @@
-// -*- indent-tabs-mode:nil -*-
-// vim: set ts=4 sts=4 sw=4 et:
/* This file is part of the KDE project
Copyright (C) 2000 David Faure <faure@kde.org>
Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org>
diff --git a/konqueror/keditbookmarks/importers.h b/konqueror/keditbookmarks/importers.h
index 0550e46f..e831d6f4 100644
--- a/konqueror/keditbookmarks/importers.h
+++ b/konqueror/keditbookmarks/importers.h
@@ -1,5 +1,3 @@
-// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*-
-// vim: set ts=4 sts=4 sw=4 et:
/* This file is part of the KDE project
Copyright (C) 2000 David Faure <faure@kde.org>
Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org>
diff --git a/konqueror/keditbookmarks/kinsertionsort.h b/konqueror/keditbookmarks/kinsertionsort.h
index 5f71184e..67645db1 100644
--- a/konqueror/keditbookmarks/kinsertionsort.h
+++ b/konqueror/keditbookmarks/kinsertionsort.h
@@ -1,5 +1,3 @@
-// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*-
-// vim: set ts=4 sts=4 sw=4 et:
/* This file is part of the KDE project
Copyright (C) 2000 David Faure <faure@kde.org>
diff --git a/konqueror/keditbookmarks/listview.cpp b/konqueror/keditbookmarks/listview.cpp
index 92eb1c48..c533fa8c 100644
--- a/konqueror/keditbookmarks/listview.cpp
+++ b/konqueror/keditbookmarks/listview.cpp
@@ -1,5 +1,3 @@
-// -*- indent-tabs-mode:nil -*-
-// vim: set ts=4 sts=4 sw=4 et:
/* This file is part of the KDE project
Copyright (C) 2000 David Faure <faure@kde.org>
Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org>
diff --git a/konqueror/keditbookmarks/listview.h b/konqueror/keditbookmarks/listview.h
index f693c608..0a711e4d 100644
--- a/konqueror/keditbookmarks/listview.h
+++ b/konqueror/keditbookmarks/listview.h
@@ -1,4 +1,3 @@
-// kate: space-indent on; indent-width 3; replace-tabs on;
/* This file is part of the KDE project
Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org>
diff --git a/konqueror/keditbookmarks/main.cpp b/konqueror/keditbookmarks/main.cpp
index d64f6bce..94e08a35 100644
--- a/konqueror/keditbookmarks/main.cpp
+++ b/konqueror/keditbookmarks/main.cpp
@@ -1,5 +1,3 @@
-// -*- indent-tabs-mode:nil -*-
-// vim: set ts=4 sts=4 sw=4 et:
/* This file is part of the KDE project
Copyright (C) 2000 David Faure <faure@kde.org>
Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org>
diff --git a/konqueror/keditbookmarks/testlink.cpp b/konqueror/keditbookmarks/testlink.cpp
index 5a7b5ce0..767c15a5 100644
--- a/konqueror/keditbookmarks/testlink.cpp
+++ b/konqueror/keditbookmarks/testlink.cpp
@@ -1,5 +1,3 @@
-// -*- indent-tabs-mode:nil -*-
-// vim: set ts=4 sts=4 sw=4 et:
/* This file is part of the KDE project
Copyright (C) 2000 David Faure <faure@kde.org>
Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org>
diff --git a/konqueror/keditbookmarks/toplevel.cpp b/konqueror/keditbookmarks/toplevel.cpp
index d5a7c865..0c9e6638 100644
--- a/konqueror/keditbookmarks/toplevel.cpp
+++ b/konqueror/keditbookmarks/toplevel.cpp
@@ -1,5 +1,3 @@
-// -*- indent-tabs-mode:nil -*-
-// vim: set ts=4 sts=4 sw=4 et:
/* This file is part of the KDE project
Copyright (C) 2000 David Faure <faure@kde.org>
Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org>
diff --git a/konqueror/keditbookmarks/toplevel.h b/konqueror/keditbookmarks/toplevel.h
index 7dd056d8..bd176288 100644
--- a/konqueror/keditbookmarks/toplevel.h
+++ b/konqueror/keditbookmarks/toplevel.h
@@ -1,5 +1,3 @@
-// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*-
-// vim: set ts=4 sts=4 sw=4 et:
/* This file is part of the KDE project
Copyright (C) 2000 David Faure <faure@kde.org>
Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org>
diff --git a/konqueror/keditbookmarks/updater.cpp b/konqueror/keditbookmarks/updater.cpp
index ad55793e..9a0280df 100644
--- a/konqueror/keditbookmarks/updater.cpp
+++ b/konqueror/keditbookmarks/updater.cpp
@@ -1,5 +1,3 @@
-// -*- indent-tabs-mode:nil -*-
-// vim: set ts=4 sts=4 sw=4 et:
/* This file is part of the KDE project
Copyright (C) 2003 Alexander Kellett <lypanov@kde.org>
diff --git a/konqueror/keditbookmarks/updater.h b/konqueror/keditbookmarks/updater.h
index 44a19af4..af7031bb 100644
--- a/konqueror/keditbookmarks/updater.h
+++ b/konqueror/keditbookmarks/updater.h
@@ -1,5 +1,3 @@
-// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*-
-// vim: set ts=4 sts=4 sw=4 et:
/* This file is part of the KDE project
Copyright (C) 2003 Alexander Kellett <lypanov@kde.org>
diff --git a/konqueror/konq_extensionmanager.cc b/konqueror/konq_extensionmanager.cc
index ab508059..4ddfb887 100644
--- a/konqueror/konq_extensionmanager.cc
+++ b/konqueror/konq_extensionmanager.cc
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset:4 -*-
+/*
konq_extensionmanager.cc - Extension Manager for Konqueror
Copyright (c) 2003 by Martijn Klingens <klingens@kde.org>
diff --git a/konqueror/konq_extensionmanager.h b/konqueror/konq_extensionmanager.h
index ac1f466b..a986b6ab 100644
--- a/konqueror/konq_extensionmanager.h
+++ b/konqueror/konq_extensionmanager.h
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset:4 -*-
+/*
konq_extensionmanager.h - Extension Manager for Konqueror
diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc
index 10cf5c42..ebd9ab8d 100644
--- a/konqueror/konq_mainwindow.cc
+++ b/konqueror/konq_mainwindow.cc
@@ -476,11 +476,9 @@ void KonqMainWindow::openURL( KonqView *_view, const KURL &_url,
const TQString &_serviceType, KonqOpenURLRequest& req,
bool trustedSource )
{
-#ifndef NDEBUG // needed for req.debug()
kdDebug(1202) << "KonqMainWindow::openURL : url = '" << _url << "' "
<< "serviceType='" << _serviceType << "' req=" << req.debug()
<< " view=" << _view << endl;
-#endif
KURL url( _url );
if (url.url().startsWith("$(")) {
@@ -543,6 +541,27 @@ void KonqMainWindow::openURL( KonqView *_view, const KURL &_url,
return;
}
+ // Default action for media encrypted disks is either lock or unlock based on current status
+ TQString lockingAction = TQString::null;
+ if (serviceType.contains("encrypted_locked")) {
+ lockingAction = "konqueror/servicemenus/media_unlock.desktop";
+ }
+ else if (serviceType.contains("encrypted_unlocked")) {
+ lockingAction = "konqueror/servicemenus/media_lock.desktop";
+ }
+ if (!lockingAction.isEmpty()) {
+ TQString lockingService = TDEGlobal::dirs()->findResource("data", lockingAction);
+ if (!lockingService.isEmpty()) {
+ TQValueList<KDEDesktopMimeType::Service> serviceList = KDEDesktopMimeType::userDefinedServices(lockingService, url.isLocalFile());
+ if (serviceList.count() == 1) {
+ KURL::List m_lstURLs;
+ m_lstURLs.append(url);
+ KDEDesktopMimeType::executeService(m_lstURLs, serviceList[0]);
+ return;
+ }
+ }
+ }
+
TQString nameFilter = detectNameFilter( url );
if ( !nameFilter.isEmpty() )
{
@@ -4789,7 +4808,12 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa
connectActionCollection( pPopupMenu->actionCollection() );
- pPopupMenu->factory()->addClient( konqyMenuClient );
+ if (pPopupMenu->hasGroup("tabhandling"))
+ {
+ // "tabhandling" group in inserted in the popup menu if no encrypted media devices are part of "_items"
+ // see libkonq/konq_popupmenu.cc KonqPopupMenu::setup() method
+ pPopupMenu->factory()->addClient( konqyMenuClient );
+ }
if ( client )
pPopupMenu->factory()->addClient( client );
@@ -5972,5 +5996,3 @@ void KonqMainWindow::restoreWindowSize()
#include "konq_mainwindow.moc"
#include "konq_mainwindow_p.moc"
-/* vim: et sw=4 ts=4
- */
diff --git a/konqueror/konq_mainwindow.h b/konqueror/konq_mainwindow.h
index 3e9c71ac..fd8befe8 100644
--- a/konqueror/konq_mainwindow.h
+++ b/konqueror/konq_mainwindow.h
@@ -1,4 +1,4 @@
-/* -*- c-basic-offset:2 -*-
+/*
This file is part of the KDE project
Copyright (C) 1998, 1999 Simon Hausmann <hausmann@kde.org>
Copyright (C) 2000-2004 David Faure <faure@kde.org>
diff --git a/konqueror/konq_view.cc b/konqueror/konq_view.cc
index ecbac60c..3a970018 100644
--- a/konqueror/konq_view.cc
+++ b/konqueror/konq_view.cc
@@ -1,4 +1,4 @@
-/* -*- c-basic-offset: 2 -*-
+/*
This file is part of the KDE project
Copyright (C) 1998-2005 David Faure <faure@kde.org>
diff --git a/konqueror/konq_view.h b/konqueror/konq_view.h
index 55f0f106..aa702ff2 100644
--- a/konqueror/konq_view.h
+++ b/konqueror/konq_view.h
@@ -1,4 +1,4 @@
-/* -*- c-basic-offset: 2 -*-
+/*
* This file is part of the KDE project
* Copyright (C) 1998-2005 David Faure <faure@kde.org>
*
diff --git a/konqueror/konq_viewmgr.cc b/konqueror/konq_viewmgr.cc
index ad075a97..495d267e 100644
--- a/konqueror/konq_viewmgr.cc
+++ b/konqueror/konq_viewmgr.cc
@@ -1,4 +1,3 @@
-// -*- mode: c++; c-basic-offset: 2 -*-
/* This file is part of the KDE project
Copyright (C) 1999 Simon Hausmann <hausmann@kde.org>
diff --git a/konsole/konsole/fontembedder.cpp b/konsole/konsole/fontembedder.cpp
index 8b6da6d7..e4ededa5 100644
--- a/konsole/konsole/fontembedder.cpp
+++ b/konsole/konsole/fontembedder.cpp
@@ -115,5 +115,3 @@ int main(int argc, char **argv)
cout<<"};\n";
return 0;
}
-
-//kate: indent-width 4; tab-width 4; space-indent on;
diff --git a/konsole/konsole/konsole_part.h b/konsole/konsole/konsole_part.h
index 39b037b6..5f6ed977 100644
--- a/konsole/konsole/konsole_part.h
+++ b/konsole/konsole/konsole_part.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*-
+/*
This file is part of the KDE system
Copyright (C) 1999,2000 Boloni Laszlo <lboloni@cpe.ucf.edu>
diff --git a/kpersonalizer/stylepreview.ui.h b/kpersonalizer/stylepreview.ui.h
index 66388024..a36023fd 100644
--- a/kpersonalizer/stylepreview.ui.h
+++ b/kpersonalizer/stylepreview.ui.h
@@ -73,5 +73,3 @@ bool StylePreview::eventFilter( TQObject* /* obj */, TQEvent* ev )
}
return FALSE;
}
-
-// vim: set noet ts=4:
diff --git a/ksysguard/gui/SensorDisplayLib/ListViewSettings.cc b/ksysguard/gui/SensorDisplayLib/ListViewSettings.cc
index e8e8ca33..a3b1eb3a 100644
--- a/ksysguard/gui/SensorDisplayLib/ListViewSettings.cc
+++ b/ksysguard/gui/SensorDisplayLib/ListViewSettings.cc
@@ -71,7 +71,3 @@ void ListViewSettings::setGridColor( const TQColor &c )
}
#include "ListViewSettings.moc"
-
-/* vim: et sw=2 ts=2
-*/
-
diff --git a/ksysguard/gui/SensorDisplayLib/ListViewSettings.h b/ksysguard/gui/SensorDisplayLib/ListViewSettings.h
index 06a0b400..7fe1f488 100644
--- a/ksysguard/gui/SensorDisplayLib/ListViewSettings.h
+++ b/ksysguard/gui/SensorDisplayLib/ListViewSettings.h
@@ -52,6 +52,3 @@ class ListViewSettings : public KDialogBase
};
#endif // LISTVIEWSETTINGS_H
-
-/* vim: et sw=2 ts=2
-*/
diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeterSettings.cc b/ksysguard/gui/SensorDisplayLib/MultiMeterSettings.cc
index 90336988..63e8d1d3 100644
--- a/ksysguard/gui/SensorDisplayLib/MultiMeterSettings.cc
+++ b/ksysguard/gui/SensorDisplayLib/MultiMeterSettings.cc
@@ -121,7 +121,3 @@ void MultiMeterSettings::setMeterBackgroundColor( const TQColor &c )
}
#include "MultiMeterSettings.moc"
-
-/* vim: et sw=2 ts=2
-*/
-
diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeterSettings.h b/ksysguard/gui/SensorDisplayLib/MultiMeterSettings.h
index e05946a0..9eebaf56 100644
--- a/ksysguard/gui/SensorDisplayLib/MultiMeterSettings.h
+++ b/ksysguard/gui/SensorDisplayLib/MultiMeterSettings.h
@@ -62,7 +62,3 @@ class MultiMeterSettings : public KDialogBase
};
#endif // MULTIMETERSETTINGS_H
-
-/* vim: et sw=2 ts=2
-*/
-
diff --git a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.cc b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.cc
index 422c6a83..64c76f5b 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.cc
+++ b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.cc
@@ -100,7 +100,3 @@ void SensorLoggerDlg::setUpperLimit( double limit )
}
#include "SensorLoggerDlg.moc"
-
-/* vim: et sw=2 ts=2
-*/
-
diff --git a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.h b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.h
index e5061c72..fece0abc 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.h
+++ b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.h
@@ -56,7 +56,3 @@ class SensorLoggerDlg : public KDialogBase
};
#endif // SENSORLOGGERDLG_H
-
-/* vim: et sw=2 ts=2
-*/
-
diff --git a/ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.cc b/ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.cc
index e029d914..c2206e09 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.cc
+++ b/ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.cc
@@ -71,7 +71,3 @@ void SensorLoggerSettings::setAlarmColor( const TQColor &c )
}
#include "SensorLoggerSettings.moc"
-
-/* vim: et sw=2 ts=2
-*/
-
diff --git a/ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.h b/ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.h
index e3f93716..db90fbd8 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.h
+++ b/ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.h
@@ -52,6 +52,3 @@ class SensorLoggerSettings : public KDialogBase
};
#endif // SENSORLOGGERSETTINGS_H
-
-/* vim: et sw=2 ts=2
-*/
diff --git a/ksystraycmd/ksystraycmd.h b/ksystraycmd/ksystraycmd.h
index abad3ec5..826aa811 100644
--- a/ksystraycmd/ksystraycmd.h
+++ b/ksystraycmd/ksystraycmd.h
@@ -1,5 +1,3 @@
-// -*- c++ -*-
-
#ifndef KSYSTRAYCMD_H
#define KSYSTRAYCMD_H
diff --git a/libkonq/favicons/favicons.cpp b/libkonq/favicons/favicons.cpp
index 234bcf19..05bddec1 100644
--- a/libkonq/favicons/favicons.cpp
+++ b/libkonq/favicons/favicons.cpp
@@ -271,5 +271,3 @@ extern "C" {
return new FaviconsModule(obj);
}
}
-
-// vim: ts=4 sw=4 et
diff --git a/libkonq/favicons/favicons.h b/libkonq/favicons/favicons.h
index e42dace1..41802c9b 100644
--- a/libkonq/favicons/favicons.h
+++ b/libkonq/favicons/favicons.h
@@ -101,5 +101,3 @@ private:
};
#endif
-
-// vim: ts=4 sw=4 et
diff --git a/libkonq/konq_iconviewwidget.cc b/libkonq/konq_iconviewwidget.cc
index b51c8502..49c68712 100644
--- a/libkonq/konq_iconviewwidget.cc
+++ b/libkonq/konq_iconviewwidget.cc
@@ -1937,5 +1937,3 @@ void KonqIconViewWidget::updatePreviewMimeTypes()
}
#include "konq_iconviewwidget.moc"
-
-/* vim: set et sw=4 ts=8 softtabstop=4: */
diff --git a/libkonq/konq_popupmenu.cc b/libkonq/konq_popupmenu.cc
index 482c152c..6a562526 100644
--- a/libkonq/konq_popupmenu.cc
+++ b/libkonq/konq_popupmenu.cc
@@ -337,22 +337,22 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
m_ownActions.setWidget( this );
- const bool bIsLink = (kpf & IsLink);
- bool currentDir = false;
- bool sReading = true;
- bool sDeleting = ( d->m_itemFlags & KParts::BrowserExtension::NoDeletion ) == 0;
- bool sMoving = sDeleting;
- bool sWriting = sDeleting && m_lstItems.first()->isWritable();
- m_sMimeType = m_lstItems.first()->mimetype();
+ const bool bIsLink = (kpf & IsLink);
+ bool currentDir = false;
+ bool sReading = true;
+ bool sDeleting = ( d->m_itemFlags & KParts::BrowserExtension::NoDeletion ) == 0;
+ bool sMoving = sDeleting;
+ bool sWriting = sDeleting && m_lstItems.first()->isWritable();
+ m_sMimeType = m_lstItems.first()->mimetype();
TQString mimeGroup = m_sMimeType.left(m_sMimeType.find('/'));
- mode_t mode = m_lstItems.first()->mode();
- bool isDirectory = S_ISDIR(mode);
- bool bTrashIncluded = false;
- bool mediaFiles = false;
- bool isReallyLocal = m_lstItems.first()->isLocalFile();
- bool isLocal = isReallyLocal
- || m_lstItems.first()->url().protocol()=="media"
- || m_lstItems.first()->url().protocol()=="system";
+ mode_t mode = m_lstItems.first()->mode();
+ bool isDirectory = S_ISDIR(mode);
+ bool isMediaFile = false;
+ bool isEncryptedMediaFile = false;
+ bool isReallyLocal = m_lstItems.first()->isLocalFile();
+ bool isLocal = isReallyLocal || m_lstItems.first()->url().protocol()=="media" ||
+ m_lstItems.first()->url().protocol()=="system";
+ bool isTrashIncluded = false;
bool isTrashLink = false;
m_lstPopupURLs.clear();
int id = 0;
@@ -398,10 +398,10 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
if ( isLocal && !url.isLocalFile() && url.protocol() != "media" && url.protocol() != "system" )
isLocal = false;
- if ( !bTrashIncluded && (
+ if ( !isTrashIncluded && (
( url.protocol() == "trash" && url.path().length() <= 1 )
|| url.url() == "system:/trash" || url.url() == "system:/trash/" ) ) {
- bTrashIncluded = true;
+ isTrashIncluded = true;
isLocal = false;
}
@@ -416,8 +416,12 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
if ( sMoving )
sMoving = KProtocolInfo::supportsMoving( url );
- if ( (*it)->mimetype().startsWith("media/") )
- mediaFiles = true;
+ if ( (*it)->mimetype().startsWith("media/") ) {
+ isMediaFile = true;
+ if ( (*it)->mimetype().contains("encrypted")) {
+ isEncryptedMediaFile = true;
+ }
+ }
}
// If a local path is available, monitor that instead of the given remote URL...
@@ -469,13 +473,12 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
m_info.m_Writing = sWriting;
m_info.m_Deleting = sDeleting;
m_info.m_Moving = sMoving;
- m_info.m_TrashIncluded = bTrashIncluded;
+ m_info.m_TrashIncluded = isTrashIncluded;
// isCurrentTrash: popup on trash:/ itself, or on the trash.desktop link
- bool isCurrentTrash = ( m_lstItems.count() == 1 && bTrashIncluded ) || isTrashLink;
+ bool isCurrentTrash = ( m_lstItems.count() == 1 && isTrashIncluded ) || isTrashLink;
bool isIntoTrash = ( url.protocol() == "trash" || url.url().startsWith( "system:/trash" ) ) && !isCurrentTrash; // trashed file, not trash:/ itself
- //kdDebug() << "isLocal=" << isLocal << " url=" << url << " isCurrentTrash=" << isCurrentTrash << " isIntoTrash=" << isIntoTrash << " bTrashIncluded=" << bTrashIncluded << endl;
- bool isSingleMedium = m_lstItems.count() == 1 && mediaFiles;
+ //kdDebug() << "isLocal=" << isLocal << " url=" << url << " isCurrentTrash=" << isCurrentTrash << " isIntoTrash=" << isIntoTrash << " isTrashIncluded=" << isTrashIncluded << endl;
clear();
//////////////////////////////////////////////////////////////////////////
@@ -486,7 +489,6 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
addMerge( "konqueror" );
bool isKDesktop = TQCString( kapp->name() ) == "kdesktop";
- TDEAction *actNewWindow = 0;
if (( kpf & ShowProperties ) && isKDesktop &&
!kapp->authorize("editable_desktop_icons"))
@@ -496,20 +498,13 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
// Either 'newview' is in the actions we're given (probably in the tabhandling group)
// or we need to insert it ourselves (e.g. for kdesktop). In the first case, actNewWindow must remain 0.
- if ( ((kpf & ShowNewWindow) != 0) && sReading )
+ if ( ((kpf & ShowNewWindow) != 0) && sReading && !isEncryptedMediaFile)
{
TQString openStr = isKDesktop ? i18n( "&Open" ) : i18n( "Open in New &Window" );
- actNewWindow = new TDEAction( openStr, "window-new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewView() ), &m_ownActions, "newview" );
- }
-
- if ( actNewWindow && !isKDesktop )
- {
- if (isCurrentTrash)
- actNewWindow->setToolTip( i18n( "Open the trash in a new window" ) );
- else if (isSingleMedium)
- actNewWindow->setToolTip( i18n( "Open the medium in a new window") );
- else
- actNewWindow->setToolTip( i18n( "Open the document in a new window" ) );
+ TDEAction *actNewWindow = new TDEAction( openStr, "window-new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewView() ), &m_ownActions, "newview" );
+ actNewWindow->setToolTip( i18n( "Open item in a new window" ) );
+ addAction( actNewWindow );
+ addSeparator();
}
if ( S_ISDIR(mode) && sWriting && !isCurrentTrash ) // A dir, and we can create things into it
@@ -550,13 +545,10 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
addSeparator();
}
- // "open in new window" is either provided by us, or by the tabhandling group
- if (actNewWindow)
+ if (!isEncryptedMediaFile)
{
- addAction( actNewWindow );
- addSeparator();
+ addGroup( "tabhandling" ); // includes a separator
}
- addGroup( "tabhandling" ); // includes a separator
if ( !bIsLink )
{
@@ -995,7 +987,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
addPendingSeparator();
}
- if ( !isCurrentTrash && !isIntoTrash && !mediaFiles && sReading )
+ if ( !isCurrentTrash && !isIntoTrash && !isMediaFile && sReading )
addPlugins(); // now it's time to add plugins
if ( KPropertiesDialog::canDisplay( m_lstItems ) && (kpf & ShowProperties) )
diff --git a/libkonq/konq_sound.cc b/libkonq/konq_sound.cc
index 9e1ca66f..b40c3385 100644
--- a/libkonq/konq_sound.cc
+++ b/libkonq/konq_sound.cc
@@ -133,5 +133,3 @@ extern "C"
return new KonqSoundFactory();
}
}
-
-// vim: ts=4 sw=4 noet
diff --git a/libkonq/konq_sound.h b/libkonq/konq_sound.h
index c0139e76..9563984d 100644
--- a/libkonq/konq_sound.h
+++ b/libkonq/konq_sound.h
@@ -31,5 +31,3 @@ public:
};
#endif
-
-// vim: ts=4 sw=4 noet
diff --git a/libkonq/konq_xmlguiclient.cc b/libkonq/konq_xmlguiclient.cc
index c3c7215b..a12d237c 100644
--- a/libkonq/konq_xmlguiclient.cc
+++ b/libkonq/konq_xmlguiclient.cc
@@ -154,4 +154,21 @@ bool KonqXMLGUIClient::hasAction() const
return d->hasAction;
}
+bool KonqXMLGUIClient::hasGroup(const TQString &name) const
+{
+ if (name.isEmpty())
+ {
+ return false;
+ }
+ TQDomNodeList groups = m_doc.elementsByTagName("definegroup");
+ for (uint idx = 0; idx < groups.count(); ++idx)
+ {
+ TQDomElement group = groups.item(idx).toElement();
+ if (group.hasAttribute(d->attrName) && group.attribute(d->attrName) == name)
+ {
+ return true;
+ }
+ }
+ return false;
+}
diff --git a/libkonq/konq_xmlguiclient.h b/libkonq/konq_xmlguiclient.h
index 685b58a3..5696573d 100644
--- a/libkonq/konq_xmlguiclient.h
+++ b/libkonq/konq_xmlguiclient.h
@@ -34,24 +34,26 @@
class LIBKONQ_EXPORT KonqXMLGUIClient : public KXMLGUIClient
{
public:
- KonqXMLGUIClient( );
- KonqXMLGUIClient( KXMLGUIClient *parent );
- virtual ~KonqXMLGUIClient( );
+ KonqXMLGUIClient();
+ KonqXMLGUIClient(KXMLGUIClient *parent);
+ virtual ~KonqXMLGUIClient();
/**
* Reimplemented for internal purpose
*/
- TQDomDocument domDocument( ) const;
+ TQDomDocument domDocument() const;
+ TQDomElement DomElement() const; // KDE4: s/D/d/
- TQDomElement DomElement( ) const; // KDE4: s/D/d/
+ // @return true if the group named "name" exists
+ bool hasGroup(const TQString &name) const;
protected:
- void addAction( TDEAction *action, const TQDomElement &menu = TQDomElement() );
- void addAction( const char *name, const TQDomElement &menu = TQDomElement() );
- void addSeparator( const TQDomElement &menu = TQDomElement() );
+ void addAction(TDEAction *action, const TQDomElement &menu = TQDomElement());
+ void addAction(const char *name, const TQDomElement &menu = TQDomElement());
+ void addSeparator(const TQDomElement &menu = TQDomElement());
/// only add a separator if an action is added afterwards
void addPendingSeparator();
- void addGroup( const TQString &grp );
- void addMerge( const TQString &name );
+ void addGroup(const TQString &grp);
+ void addMerge(const TQString &name);
// @return true if addAction was called at least once
bool hasAction() const;
diff --git a/libkonq/tdefileivi.cc b/libkonq/tdefileivi.cc
index fa3a9557..ad2d743a 100644
--- a/libkonq/tdefileivi.cc
+++ b/libkonq/tdefileivi.cc
@@ -32,6 +32,8 @@
#include <kdebug.h>
#include <krun.h>
#include <kservice.h>
+#include <kmimetype.h> // for KDEDesktopMimeType
+#include <kstandarddirs.h>
#undef Bool
@@ -386,7 +388,28 @@ void KFileIVI::returnPressed()
if ( static_cast<KonqIconViewWidget*>(iconView())->isDesktop() ) {
KURL url = m_fileitem->url();
if (url.protocol() == "media") {
- (void) new KRun( url, m_fileitem->mode(), m_fileitem->isLocalFile() );
+ TQString mimetype = m_fileitem->mimetype();
+ TQString lockingAction = TQString::null;
+ if (mimetype.contains("encrypted_locked")) {
+ lockingAction = "konqueror/servicemenus/media_unlock.desktop";
+ }
+ else if (mimetype.contains("encrypted_unlocked")) {
+ lockingAction = "konqueror/servicemenus/media_lock.desktop";
+ }
+ if (!lockingAction.isEmpty()) {
+ TQString lockingService = TDEGlobal::dirs()->findResource("data", lockingAction);
+ if (!lockingService.isEmpty()) {
+ TQValueList<KDEDesktopMimeType::Service> serviceList = KDEDesktopMimeType::userDefinedServices(lockingService, m_fileitem->isLocalFile());
+ if (serviceList.count() == 1) {
+ KURL::List m_lstURLs;
+ m_lstURLs.append(m_fileitem->url());
+ KDEDesktopMimeType::executeService(m_lstURLs, serviceList[0]);
+ }
+ }
+ }
+ else {
+ (void) new KRun( url, m_fileitem->mode(), m_fileitem->isLocalFile() );
+ }
}
else {
// When clicking on a link to e.g. $HOME from the desktop, we want to open $HOME
@@ -596,5 +619,3 @@ void KFileIVI::mimeTypeAndIconDetermined()
{
updatePixmapSize();
}
-
-/* vim: set noet sw=4 ts=8 softtabstop=4: */
diff --git a/nsplugins/nspluginloader.cpp b/nsplugins/nspluginloader.cpp
index 8c9e6fe2..4a19140b 100644
--- a/nsplugins/nspluginloader.cpp
+++ b/nsplugins/nspluginloader.cpp
@@ -524,5 +524,3 @@ NSPluginInstance *NSPluginLoader::newInstance(TQWidget *parent, TQString url,
return plugin;
}
-
-// vim: ts=4 sw=4 et
diff --git a/nsplugins/sdk/jni_md.h b/nsplugins/sdk/jni_md.h
index c0aa1115..58738bbd 100644
--- a/nsplugins/sdk/jni_md.h
+++ b/nsplugins/sdk/jni_md.h
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+/*
*
* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
diff --git a/nsplugins/sdk/jri.h b/nsplugins/sdk/jri.h
index f29945b9..d80654f6 100644
--- a/nsplugins/sdk/jri.h
+++ b/nsplugins/sdk/jri.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: NPL 1.1/GPL 2.0/LGPL 2.1
*
diff --git a/nsplugins/sdk/jri_md.h b/nsplugins/sdk/jri_md.h
index 5ae741ed..8234addd 100644
--- a/nsplugins/sdk/jri_md.h
+++ b/nsplugins/sdk/jri_md.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: NPL 1.1/GPL 2.0/LGPL 2.1
*
diff --git a/nsplugins/sdk/jritypes.h b/nsplugins/sdk/jritypes.h
index ddeb6331..ed7769be 100644
--- a/nsplugins/sdk/jritypes.h
+++ b/nsplugins/sdk/jritypes.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: NPL 1.1/GPL 2.0/LGPL 2.1
*
diff --git a/nsplugins/sdk/npapi.h b/nsplugins/sdk/npapi.h
index 16c71b97..18992ae0 100644
--- a/nsplugins/sdk/npapi.h
+++ b/nsplugins/sdk/npapi.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: NPL 1.1/GPL 2.0/LGPL 2.1
*
diff --git a/nsplugins/sdk/npruntime.h b/nsplugins/sdk/npruntime.h
index 45f3f0a9..b5d65635 100644
--- a/nsplugins/sdk/npruntime.h
+++ b/nsplugins/sdk/npruntime.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* Copyright � 2004, Apple Computer, Inc. and The Mozilla Foundation.
* All rights reserved.
diff --git a/nsplugins/sdk/npupp.h b/nsplugins/sdk/npupp.h
index dff545d9..769897dc 100644
--- a/nsplugins/sdk/npupp.h
+++ b/nsplugins/sdk/npupp.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
diff --git a/nsplugins/sdk/obsolete/protypes.h b/nsplugins/sdk/obsolete/protypes.h
index e96cfcf6..5d9190aa 100644
--- a/nsplugins/sdk/obsolete/protypes.h
+++ b/nsplugins/sdk/obsolete/protypes.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/*
* The contents of this file are subject to the Mozilla Public
* License Version 1.1 (the "License"); you may not use this file
diff --git a/nsplugins/sdk/prcpucfg.h b/nsplugins/sdk/prcpucfg.h
index a8dd53fa..ae80d343 100644
--- a/nsplugins/sdk/prcpucfg.h
+++ b/nsplugins/sdk/prcpucfg.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
diff --git a/nsplugins/sdk/prtypes.h b/nsplugins/sdk/prtypes.h
index b6836108..842013ee 100644
--- a/nsplugins/sdk/prtypes.h
+++ b/nsplugins/sdk/prtypes.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/*
* The contents of this file are subject to the Mozilla Public
* License Version 1.1 (the "License"); you may not use this file
diff --git a/nsplugins/viewer/nsplugin.cpp b/nsplugins/viewer/nsplugin.cpp
index 4f3cb309..5b6b9267 100644
--- a/nsplugins/viewer/nsplugin.cpp
+++ b/nsplugins/viewer/nsplugin.cpp
@@ -1999,4 +1999,3 @@ void NSPluginStream::result(TDEIO::Job *job)
}
#include "nsplugin.moc"
-// vim: ts=4 sw=4 et
diff --git a/tdeioslave/man/man2html.cpp b/tdeioslave/man/man2html.cpp
index 8dd23dc6..a8c5751c 100644
--- a/tdeioslave/man/man2html.cpp
+++ b/tdeioslave/man/man2html.cpp
@@ -18,8 +18,6 @@
// End of verbatim comment
-// kate: space-indent on; indent-width 4; replace-tabs on;
-
/*
* man2html-linux-1.0/1.1
* This version modified for Redhat/Caldera linux - March 1996.
diff --git a/tdeioslave/media/libmediacommon/medium.cpp b/tdeioslave/media/libmediacommon/medium.cpp
index 77e32ba0..797c409b 100644
--- a/tdeioslave/media/libmediacommon/medium.cpp
+++ b/tdeioslave/media/libmediacommon/medium.cpp
@@ -23,68 +23,58 @@
const TQString Medium::SEPARATOR = "---";
+void Medium::initMedium()
+{
+ m_properties.clear();
+ m_properties += TQString::null; // ID
+ m_properties += TQString::null; // UUID
+ m_properties += TQString::null; // NAME
+ m_properties += TQString::null; // LABEL
+ m_properties += TQString::null; // USER_LABEL
+ m_properties += "false"; // MOUNTABLE
+ m_properties += TQString::null; // DEVICE_NODE
+ m_properties += TQString::null; // MOUNT_POINT
+ m_properties += TQString::null; // FS_TYPE
+ m_properties += "false"; // MOUNTED
+ m_properties += TQString::null; // BASE_URL
+ m_properties += TQString::null; // MIME_TYPE
+ m_properties += TQString::null; // ICON_NAME
+ m_properties += "false"; // ENCRYPTED
+ m_properties += TQString::null; // CLEAR_DEVICE_UDI
+ m_properties += "false"; // HIDDEN
+ m_properties += "false"; // SOFT_HIDDEN
+ m_properties += "false"; // LOCKED
+}
+
Medium::Medium(const TQString id, TQString uuid, const TQString name)
{
- m_properties+= id; /* ID */
- m_properties+= uuid; /* UUID */
- m_properties+= name; /* NAME */
- m_properties+= name; /* LABEL */
- m_properties+= TQString::null; /* USER_LABEL */
-
- m_properties+= "false"; /* MOUNTABLE */
- m_properties+= TQString::null; /* DEVICE_NODE */
- m_properties+= TQString::null; /* MOUNT_POINT */
- m_properties+= TQString::null; /* FS_TYPE */
- m_properties+= "false"; /* MOUNTED */
- m_properties+= TQString::null; /* BASE_URL */
- m_properties+= TQString::null; /* MIME_TYPE */
- m_properties+= TQString::null; /* ICON_NAME */
- m_properties+= "false"; /* ENCRYPTED */
- m_properties+= TQString::null; /* CLEAR_DEVICE_UDI */
- m_properties+= "false"; /* HIDDEN */
- m_properties+= "false"; /* SOFT_HIDDEN */
-
- loadUserLabel();
-
- m_halmounted = false;
+ initMedium();
+ if (!id.isEmpty() && !uuid.isEmpty())
+ {
+ m_properties[ID] = id;
+ m_properties[UUID] = uuid;
+ m_properties[NAME] = name;
+ m_properties[LABEL] = name;
+ loadUserLabel();
+ }
}
Medium::Medium()
{
- m_properties+= TQString::null; /* ID */
- m_properties+= TQString::null; /* UUID */
- m_properties+= TQString::null; /* NAME */
- m_properties+= TQString::null; /* LABEL */
- m_properties+= TQString::null; /* USER_LABEL */
-
- m_properties+= TQString::null; /* MOUNTABLE */
- m_properties+= TQString::null; /* DEVICE_NODE */
- m_properties+= TQString::null; /* MOUNT_POINT */
- m_properties+= TQString::null; /* FS_TYPE */
- m_properties+= TQString::null; /* MOUNTED */
- m_properties+= TQString::null; /* BASE_URL */
- m_properties+= TQString::null; /* MIME_TYPE */
- m_properties+= TQString::null; /* ICON_NAME */
- m_properties+= TQString::null; /* ENCRYPTED */
- m_properties+= TQString::null; /* CLEAR_DEVICE_UDI */
- m_properties+= "false"; /* HIDDEN */
- m_properties+= "false"; /* SOFT_HIDDEN */
-
- m_halmounted = false;
+ initMedium();
}
const Medium Medium::create(const TQStringList &properties)
{
Medium m;
- if ( properties.size() >= PROPERTIES_COUNT )
+ if (properties.size() >= PROPERTIES_COUNT)
{
m.m_properties[ID] = properties[ID];
m.m_properties[UUID] = properties[UUID];
m.m_properties[NAME] = properties[NAME];
m.m_properties[LABEL] = properties[LABEL];
m.m_properties[USER_LABEL] = properties[USER_LABEL];
-
m.m_properties[MOUNTABLE] = properties[MOUNTABLE];
m.m_properties[DEVICE_NODE] = properties[DEVICE_NODE];
m.m_properties[MOUNT_POINT] = properties[MOUNT_POINT];
@@ -97,6 +87,7 @@ const Medium Medium::create(const TQStringList &properties)
m.m_properties[CLEAR_DEVICE_UDI] = properties[CLEAR_DEVICE_UDI];
m.m_properties[HIDDEN] = properties[HIDDEN];
m.m_properties[SOFT_HIDDEN] = properties[SOFT_HIDDEN];
+ m.m_properties[LOCKED] = properties[LOCKED];
}
return m;
@@ -106,13 +97,12 @@ Medium::MList Medium::createList(const TQStringList &properties)
{
MList l;
- if ( properties.size() % (PROPERTIES_COUNT+1) == 0)
+ if (properties.size() % (PROPERTIES_COUNT+1) == 0)
{
- int media_count = properties.size()/(PROPERTIES_COUNT+1);
-
+ int media_count = properties.size() / (PROPERTIES_COUNT + 1);
TQStringList props = properties;
- for(int i=0; i<media_count; i++)
+ for (int i=0; i < media_count; i++)
{
const Medium m = create(props);
l.append(m);
@@ -127,7 +117,6 @@ Medium::MList Medium::createList(const TQStringList &properties)
return l;
}
-
void Medium::setName(const TQString &name)
{
m_properties[NAME] = name;
@@ -138,35 +127,22 @@ void Medium::setLabel(const TQString &label)
m_properties[LABEL] = label;
}
-void Medium::setEncrypted(bool state)
-{
- m_properties[ENCRYPTED] = ( state ? "true" : "false" );
-}
-
-void Medium::setHidden(bool state)
-{
- m_properties[HIDDEN] = ( state ? "true" : "false" );
-}
-
-void Medium::setSoftHidden(bool state)
-{
- m_properties[SOFT_HIDDEN] = ( state ? "true" : "false" );
-}
-
void Medium::setUserLabel(const TQString &label)
{
TDEConfig cfg("mediamanagerrc");
cfg.setGroup("UserLabels");
TQString entry_name = m_properties[UUID];
-
- if ( label.isNull() )
- {
- cfg.deleteEntry(entry_name);
- }
- else
+ if (!entry_name.isEmpty())
{
- cfg.writeEntry(entry_name, label);
+ if (label.isEmpty())
+ {
+ cfg.deleteEntry(entry_name);
+ }
+ else
+ {
+ cfg.writeEntry(entry_name, label);
+ }
}
m_properties[USER_LABEL] = label;
@@ -178,10 +154,9 @@ void Medium::loadUserLabel()
cfg.setGroup("UserLabels");
TQString entry_name = m_properties[UUID];
-
- if ( cfg.hasKey(entry_name) )
+ if (!entry_name.isEmpty())
{
- m_properties[USER_LABEL] = cfg.readEntry(entry_name);
+ m_properties[USER_LABEL] = cfg.readEntry(entry_name, TQString::null);
}
else
{
@@ -189,48 +164,52 @@ void Medium::loadUserLabel()
}
}
-
-bool Medium::mountableState(bool mounted)
+void Medium::setMountable(bool mountable)
{
- if ( m_properties[DEVICE_NODE].isEmpty()
- || ( mounted && m_properties[MOUNT_POINT].isEmpty() ) )
+ m_properties[MOUNTABLE] = mountable ? "true" : "false";
+ if (!mountable)
{
- return false;
+ setMountPoint(TQString::null);
+ setMounted(false);
}
+}
- m_properties[MOUNTABLE] = "true";
- m_properties[MOUNTED] = ( mounted ? "true" : "false" );
+void Medium::setDeviceNode(const TQString &deviceNode)
+{
+ m_properties[DEVICE_NODE] = deviceNode;
+}
- return true;
+void Medium::setMountPoint(const TQString &mountPoint)
+{
+ if (isMountable())
+ {
+ m_properties[MOUNT_POINT] = mountPoint;
+ }
+ else
+ {
+ m_properties[MOUNT_POINT] = TQString::null;
+ }
}
-void Medium::mountableState(const TQString &deviceNode,
- const TQString &mountPoint,
- const TQString &fsType, bool mounted)
+void Medium::setFsType(const TQString &fsType)
{
- m_properties[MOUNTABLE] = "true";
- m_properties[DEVICE_NODE] = deviceNode;
- m_properties[MOUNT_POINT] = mountPoint;
m_properties[FS_TYPE] = fsType;
- m_properties[MOUNTED] = ( mounted ? "true" : "false" );
}
-void Medium::mountableState(const TQString &deviceNode,
- const TQString &clearDeviceUdi,
- const TQString &mountPoint,
- const TQString &fsType, bool mounted)
+void Medium::setMounted(bool mounted)
{
- m_properties[MOUNTABLE] = "true";
- m_properties[DEVICE_NODE] = deviceNode;
- m_properties[CLEAR_DEVICE_UDI] = clearDeviceUdi;
- m_properties[MOUNT_POINT] = mountPoint;
- m_properties[FS_TYPE] = fsType;
- m_properties[MOUNTED] = ( mounted ? "true" : "false" );
+ if (isMountable())
+ {
+ m_properties[MOUNTED] = mounted ? "true" : "false";
+ }
+ else
+ {
+ m_properties[MOUNTED] = "false";
+ }
}
-void Medium::unmountableState(const TQString &baseURL)
+void Medium::setBaseURL(const TQString &baseURL)
{
- m_properties[MOUNTABLE] = "false";
m_properties[BASE_URL] = baseURL;
}
@@ -244,33 +223,51 @@ void Medium::setIconName(const TQString &iconName)
m_properties[ICON_NAME] = iconName;
}
-bool Medium::needMounting() const
+void Medium::setEncrypted(bool encrypted)
+{
+ m_properties[ENCRYPTED] = encrypted ? "true" : "false";
+ if (!encrypted)
+ {
+ setLocked(false);
+ }
+}
+
+void Medium::setClearDeviceUdi(const TQString &clearDeviceUdi)
{
- return isMountable() && !isMounted();
+ m_properties[CLEAR_DEVICE_UDI] = clearDeviceUdi;
}
-bool Medium::needDecryption() const
+void Medium::setHidden(bool state)
{
- return isEncrypted() && clearDeviceUdi().isEmpty();
+ m_properties[HIDDEN] = state ? "true" : "false";
+}
+
+void Medium::setSoftHidden(bool state)
+{
+ m_properties[SOFT_HIDDEN] = state ? "true" : "false";
+}
+
+void Medium::setLocked(bool locked)
+{
+ m_properties[LOCKED] = locked ? "true" : "false";
}
KURL Medium::prettyBaseURL() const
{
- if ( !baseURL().isEmpty() )
- return baseURL();
+ if (!baseURL().isEmpty())
+ {
+ return baseURL();
+ }
- return KURL( mountPoint() );
+ return KURL(mountPoint());
}
TQString Medium::prettyLabel() const
{
- if ( !userLabel().isEmpty() )
+ if (!userLabel().isEmpty())
{
return userLabel();
}
- else
- {
- return label();
- }
-}
+ return label();
+}
diff --git a/tdeioslave/media/libmediacommon/medium.h b/tdeioslave/media/libmediacommon/medium.h
index bf465fd0..3c9677c2 100644
--- a/tdeioslave/media/libmediacommon/medium.h
+++ b/tdeioslave/media/libmediacommon/medium.h
@@ -29,24 +29,25 @@ class Medium
public:
typedef TQValueList<Medium> MList;
- static const uint ID = 0;
- static const uint UUID = 1;
- static const uint NAME = 2;
- static const uint LABEL = 3;
- static const uint USER_LABEL = 4;
- static const uint MOUNTABLE = 5;
- static const uint DEVICE_NODE = 6;
- static const uint MOUNT_POINT = 7;
- static const uint FS_TYPE = 8;
- static const uint MOUNTED = 9;
- static const uint BASE_URL = 10;
- static const uint MIME_TYPE = 11;
- static const uint ICON_NAME = 12;
- static const uint ENCRYPTED = 13;
- static const uint CLEAR_DEVICE_UDI = 14;
- static const uint HIDDEN = 15;
- static const uint SOFT_HIDDEN = 16;
- static const uint PROPERTIES_COUNT = 17;
+ static const uint ID = 0;
+ static const uint UUID = 1;
+ static const uint NAME = 2;
+ static const uint LABEL = 3;
+ static const uint USER_LABEL = 4;
+ static const uint MOUNTABLE = 5;
+ static const uint DEVICE_NODE = 6;
+ static const uint MOUNT_POINT = 7;
+ static const uint FS_TYPE = 8;
+ static const uint MOUNTED = 9;
+ static const uint BASE_URL = 10;
+ static const uint MIME_TYPE = 11;
+ static const uint ICON_NAME = 12;
+ static const uint ENCRYPTED = 13;
+ static const uint CLEAR_DEVICE_UDI = 14;
+ static const uint HIDDEN = 15;
+ static const uint SOFT_HIDDEN = 16;
+ static const uint LOCKED = 17;
+ static const uint PROPERTIES_COUNT = 18;
static const TQString SEPARATOR;
Medium(const TQString id, TQString uuid, const TQString name);
@@ -60,71 +61,67 @@ public:
TQString name() const { return m_properties[NAME]; }
TQString label() const { return m_properties[LABEL]; }
TQString userLabel() const { return m_properties[USER_LABEL]; }
- bool isMountable() const { return m_properties[MOUNTABLE]=="true"; }
+ bool isMountable() const { return m_properties[MOUNTABLE] == "true"; }
TQString deviceNode() const { return m_properties[DEVICE_NODE]; }
TQString mountPoint() const { return m_properties[MOUNT_POINT]; }
TQString fsType() const { return m_properties[FS_TYPE]; }
- bool isMounted() const { return m_properties[MOUNTED]=="true"; }
+ bool isMounted() const { return m_properties[MOUNTED] == "true"; }
TQString baseURL() const { return m_properties[BASE_URL]; }
TQString mimeType() const { return m_properties[MIME_TYPE]; }
TQString iconName() const { return m_properties[ICON_NAME]; }
- bool isEncrypted() const { return m_properties[ENCRYPTED]=="true"; };
+ bool isEncrypted() const { return m_properties[ENCRYPTED] == "true"; };
TQString clearDeviceUdi() const { return m_properties[CLEAR_DEVICE_UDI]; };
- bool hidden() const { return m_properties[HIDDEN]=="true"; };
- bool softHidden() const { return m_properties[SOFT_HIDDEN]=="true"; };
+ bool hidden() const { return m_properties[HIDDEN] == "true"; };
+ bool softHidden() const { return m_properties[SOFT_HIDDEN] == "true"; };
+ bool isLocked() const { return m_properties[LOCKED] == "true"; };
- bool needMounting() const;
- bool needDecryption() const;
+ bool needMounting() const { return isMountable() && !isMounted(); };
+ bool needUnlocking() const { return isEncrypted() && isLocked(); }
KURL prettyBaseURL() const;
TQString prettyLabel() const;
void setName(const TQString &name);
void setLabel(const TQString &label);
void setUserLabel(const TQString &label);
- void setEncrypted(bool state);
- void setHidden(bool state);
- void setSoftHidden(bool state);
-
- bool mountableState(bool mounted);
- void mountableState(const TQString &deviceNode,
- const TQString &mountPoint,
- const TQString &fsType, bool mounted);
- void mountableState(const TQString &deviceNode,
- const TQString &clearDeviceUdi,
- const TQString &mountPoint,
- const TQString &fsType, bool mounted);
- void unmountableState(const TQString &baseURL = TQString::null);
-
+ void setMountable(bool mountable);
+ void setDeviceNode(const TQString &deviceNode);
+ void setMountPoint(const TQString &mountPoint);
+ void setFsType(const TQString &fsType);
+ void setMounted(bool mounted);
+ void setBaseURL(const TQString &baseURL);
void setMimeType(const TQString &mimeType);
void setIconName(const TQString &iconName);
- void setHalMounted(bool flag) const { m_halmounted = flag; }
- bool halMounted() const { return m_halmounted; }
+ void setEncrypted(bool encrypted);
+ void setClearDeviceUdi(const TQString &clearDeviceUdi);
+ void setHidden(bool state);
+ void setSoftHidden(bool state);
+ void setLocked(bool locked);
-//private:
Medium();
private:
+ void initMedium();
void loadUserLabel();
TQStringList m_properties;
- mutable bool m_halmounted;
-friend class TQValueListNode<const Medium>;
+ friend class TQValueListNode<const Medium>;
};
namespace MediaManagerUtils {
- static inline TQMap<TQString,TQString> splitOptions(const TQStringList & options)
- {
- TQMap<TQString,TQString> valids;
-
- for (TQStringList::ConstIterator it = options.begin(); it != options.end(); ++it)
+ static inline TQMap<TQString,TQString> splitOptions(const TQStringList &options)
{
- TQString key = (*it).left((*it).find('='));
- TQString value = (*it).mid((*it).find('=') + 1);
- valids[key] = value;
+ TQMap<TQString,TQString> valids;
+
+ for (TQStringList::ConstIterator it = options.begin(); it != options.end(); ++it)
+ {
+ int pos = (*it).find('=');
+ TQString key = (*it).left(pos);
+ TQString value = (*it).mid(pos + 1);
+ valids[key] = value;
+ }
+ return valids;
}
- return valids;
- }
}
#endif
diff --git a/tdeioslave/media/mediaimpl.cpp b/tdeioslave/media/mediaimpl.cpp
index b92757f9..ff66375a 100644
--- a/tdeioslave/media/mediaimpl.cpp
+++ b/tdeioslave/media/mediaimpl.cpp
@@ -127,7 +127,6 @@ bool MediaImpl::statMediumByLabel(const TQString &label, TDEIO::UDSEntry &entry)
return statMedium(name, entry);
}
-
bool MediaImpl::listMedia(TQValueList<TDEIO::UDSEntry> &list)
{
kdDebug(1219) << "MediaImpl::listMedia" << endl;
@@ -149,7 +148,7 @@ bool MediaImpl::listMedia(TQValueList<TDEIO::UDSEntry> &list)
Medium::MList::const_iterator it = media.begin();
Medium::MList::const_iterator end = media.end();
- for(; it!=end; ++it)
+ for(; it != end; ++it)
{
if (!(*it).hidden()) {
entry.clear();
@@ -366,6 +365,11 @@ void MediaImpl::slotStatResult(TDEIO::Job *job)
TDEIO::UDSEntry MediaImpl::extractUrlInfos(const KURL &url)
{
+ if (url.isEmpty())
+ {
+ return TDEIO::UDSEntry();
+ }
+
m_entryBuffer.clear();
TDEIO::StatJob *job = TDEIO::stat(url, false);
@@ -449,7 +453,7 @@ void MediaImpl::createMediumEntry(TDEIO::UDSEntry& entry,
else
{
KURL url = medium.prettyBaseURL();
- entry+= extractUrlInfos(url);
+ entry += extractUrlInfos(url);
}
}
diff --git a/tdeioslave/media/mediamanager/dialog.cpp b/tdeioslave/media/mediamanager/dialog.cpp
index 5f655ccc..b2e9ff5f 100644
--- a/tdeioslave/media/mediamanager/dialog.cpp
+++ b/tdeioslave/media/mediamanager/dialog.cpp
@@ -23,7 +23,7 @@
#include "dialog.h"
Dialog::Dialog(TQString url, TQString iconName) :
- KDialogBase(NULL, "Unlock", true, "Unlock Storage Device", (Cancel|User1), User1, false, KGuiItem(i18n("Unlock"), "unlocked" ))
+ KDialogBase(NULL, "Unlock", true, i18n("Unlock Storage Device"), (Cancel|User1), User1, false, KGuiItem(i18n("Unlock"), "unlocked" ))
{
unlockDialog = new UnlockDialog(this);
diff --git a/tdeioslave/media/mediamanager/fstabbackend.cpp b/tdeioslave/media/mediamanager/fstabbackend.cpp
index 8eca2177..acd1dced 100644
--- a/tdeioslave/media/mediamanager/fstabbackend.cpp
+++ b/tdeioslave/media/mediamanager/fstabbackend.cpp
@@ -220,7 +220,11 @@ void FstabBackend::handleMtabChange(bool allowNotification)
Medium *m = new Medium(id, name);
- m->mountableState(dev, mp, fs, true);
+ m->setMountable(true);
+ m->setDeviceNode(dev);
+ m->setMountPoint(mp);
+ m->setFsType(fs);
+ m->setMounted(true);
TQString mime, icon, label;
guess(dev, mp, fs, true, mime, icon, label);
@@ -293,7 +297,11 @@ void FstabBackend::handleFstabChange(bool allowNotification)
Medium *m = new Medium(id, id, name);
- m->mountableState(dev, mp, fs, false);
+ m->setMountable(true);
+ m->setDeviceNode(dev);
+ m->setMountPoint(mp);
+ m->setFsType(fs);
+ m->setMounted(false);
TQString mime, icon, label;
guess(dev, mp, fs, false, mime, icon, label);
diff --git a/tdeioslave/media/mediamanager/halbackend.cpp b/tdeioslave/media/mediamanager/halbackend.cpp
index 157f8921..3c6f38af 100644
--- a/tdeioslave/media/mediamanager/halbackend.cpp
+++ b/tdeioslave/media/mediamanager/halbackend.cpp
@@ -506,38 +506,45 @@ void HALBackend::setVolumeProperties(Medium* medium)
medium->setEncrypted(true);
char* clearUdi = libhal_volume_crypto_get_clear_volume_udi(m_halContext, halVolume);
- TQString clearUdiString;
+ TQString clearUdiString;
if (clearUdi != NULL) {
kdDebug(1219) << "HALBackend::setVolumeProperties : crypto clear volume avail - " << clearUdi << endl;
halClearVolume = libhal_volume_from_udi(m_halContext, clearUdi);
// ignore if halClearVolume is NULL -> just not unlocked in this case
- clearUdiString = clearUdi;
- libhal_free_string(clearUdi);
+ clearUdiString = clearUdi;
+ libhal_free_string(clearUdi);
}
if (halClearVolume)
- medium->mountableState(
- libhal_volume_get_device_file(halVolume), /* Device node */
- clearUdiString,
- libhal_volume_get_mount_point(halClearVolume), /* Mount point */
- libhal_volume_get_fstype(halClearVolume), /* Filesystem type */
- libhal_volume_is_mounted(halClearVolume) ); /* Mounted ? */
+ {
+ medium->setLocked(false);
+ medium->setMountable(true);
+ medium->setDeviceNode(libhal_volume_get_device_file(halVolume));
+ medium->setClearDeviceUdi(clearUdiString);
+ medium->setMountPoint(libhal_volume_get_mount_point(halClearVolume));
+ medium->setFsType(libhal_volume_get_fstype(halClearVolume));
+ medium->setMounted(libhal_volume_is_mounted(halClearVolume));
+ }
else
- medium->mountableState(
- libhal_volume_get_device_file(halVolume), /* Device node */
- TQString::null,
- TQString::null, /* Mount point */
- TQString::null, /* Filesystem type */
- false ); /* Mounted ? */
+ {
+ medium->setLocked(true);
+ medium->setMountable(false);
+ medium->setDeviceNode(libhal_volume_get_device_file(halVolume));
+ medium->setClearDeviceUdi(TQString::null);
+ medium->setMountPoint(TQString::null);
+ medium->setFsType(TQString::null);
+ medium->setMounted(false);
+ }
}
else
{
kdDebug(1219) << "HALBackend::setVolumeProperties : normal volume" << endl;
- medium->mountableState(
- libhal_volume_get_device_file(halVolume), /* Device node */
- TQString::fromUtf8(libhal_volume_get_mount_point(halVolume)), /* Mount point */
- libhal_volume_get_fstype(halVolume), /* Filesystem type */
- libhal_volume_is_mounted(halVolume) ); /* Mounted ? */
+ medium->setEncrypted(false);
+ medium->setMountable(true);
+ medium->setDeviceNode(libhal_volume_get_device_file(halVolume));
+ medium->setMountPoint(TQString::fromUtf8(libhal_volume_get_mount_point(halVolume)));
+ medium->setFsType(libhal_volume_get_fstype(halVolume));
+ medium->setMounted(libhal_volume_is_mounted(halVolume));
}
@@ -570,7 +577,8 @@ void HALBackend::setVolumeProperties(Medium* medium)
if (libhal_volume_disc_is_blank(halVolume))
{
mimeType = "media/blankcd";
- medium->unmountableState("");
+ medium->setMountable(false);
+ medium->setBaseURL(TQString::null);
}
else
{
@@ -584,7 +592,8 @@ void HALBackend::setVolumeProperties(Medium* medium)
if (libhal_volume_disc_is_blank(halVolume))
{
mimeType = "media/blankdvd";
- medium->unmountableState("");
+ medium->setMountable(false);
+ medium->setBaseURL(TQString::null);
}
else
{
@@ -609,7 +618,8 @@ void HALBackend::setVolumeProperties(Medium* medium)
if (libhal_volume_disc_has_audio(halVolume) && !libhal_volume_disc_has_data(halVolume))
{
mimeType = "media/audiocd";
- medium->unmountableState( "audiocd:/?device=" + TQString(libhal_volume_get_device_file(halVolume)) );
+ medium->setMountable(false);
+ medium->setBaseURL("audiocd:/?device=" + TQString(libhal_volume_get_device_file(halVolume)));
}
medium->setIconName(TQString::null);
@@ -653,12 +663,12 @@ void HALBackend::setVolumeProperties(Medium* medium)
case LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER:
{
medium->setIconName("ipod" + MOUNTED_ICON_SUFFIX);
-
if (libhal_device_get_property_QString(m_halContext, driveUdi.latin1(), "info.product") == "iPod" &&
- KProtocolInfo::isKnownProtocol( TQString("ipod") ) )
+ KProtocolInfo::isKnownProtocol( TQString("ipod") ) )
{
- medium->unmountableState( "ipod:/" );
- medium->mountableState( libhal_volume_is_mounted(halVolume) );
+ medium->setBaseURL("ipod:/");
+ medium->setMountable(true);
+ medium->setMounted(libhal_volume_is_mounted(halVolume));
}
break;
}
@@ -723,11 +733,11 @@ bool HALBackend::setFstabProperties( Medium *medium )
if ( fstype.isNull() )
fstype = "auto";
- medium->mountableState(
- medium->deviceNode(),
- mp, /* Mount point */
- fstype, /* Filesystem type */
- mounted ); /* Mounted ? */
+ medium->setMountable(true);
+ medium->setDeviceNode(medium->deviceNode());
+ medium->setMountPoint(mp);
+ medium->setFsType(fstype);
+ medium->setMounted(mounted);
return true;
}
@@ -768,7 +778,11 @@ bool HALBackend::setFloppyProperties(Medium* medium)
medium->setLabel(i18n("Unknown Drive"));
// HAL hates floppies - so we have to do it twice ;(
- medium->mountableState(libhal_drive_get_device_file(halDrive), TQString::null, TQString::null, false);
+ medium->setMountable(true);
+ medium->setDeviceNode(libhal_drive_get_device_file(halDrive));
+ medium->setMountPoint(TQString::null);
+ medium->setFsType(TQString::null);
+ medium->setMounted(false);
setFloppyMountState(medium);
if (drive_type == "floppy")
@@ -813,7 +827,11 @@ void HALBackend::setFloppyMountState( Medium *medium )
{
fstype = (*it)->mountType().isNull() ? (*it)->mountType() : "auto";
mountpoint = (*it)->mountPoint();
- medium->mountableState( medium->deviceNode(), mountpoint, fstype, true );
+ medium->setMountable(true);
+ medium->setDeviceNode(medium->deviceNode());
+ medium->setMountPoint(mountpoint);
+ medium->setFsType(fstype);
+ medium->setMounted(true);
return;
}
}
@@ -847,7 +865,8 @@ void HALBackend::setCameraProperties(Medium* medium)
libhal_free_string(cam);
/** @todo find the rest of this URL */
- medium->unmountableState(device);
+ medium->setMountable(false);
+ medium->setBaseURL(device);
medium->setMimeType("media/gphoto2camera");
medium->setIconName(TQString::null);
if (libhal_device_property_exists(m_halContext, udi, "usb_device.product", NULL))
@@ -1417,7 +1436,6 @@ void HALBackend::slotResult(TDEIO::Job *job)
if (job->error() == TDEIO::ERR_COULD_NOT_UNMOUNT) {
TQString proclist(listUsingProcesses(medium));
- qerror = "<qt>";
qerror += "<p>" + i18n("Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and "
"currently mounted at <b>%4</b> could not be unmounted. ").arg(
"system:/media/" + medium->name(),
@@ -1430,7 +1448,6 @@ void HALBackend::slotResult(TDEIO::Job *job)
if (!proclist.isEmpty()) {
qerror += proclist;
}
- qerror += "</qt>";
} else if (job->error()) {
qerror = job->errorText();
}
@@ -1471,8 +1488,14 @@ TQString HALBackend::isInFstab(const Medium *medium)
TQStringVariantMap HALBackend::mount(const Medium *medium)
{
TQStringVariantMap result;
- if (medium->isMounted()) {
- result["result"] = true;
+ if (!medium->isMountable()) {
+ result["errStr"] = i18n("%1 is not a mountable media.").arg(medium->deviceNode());
+ result["result"] = false;
+ return result;
+ }
+ else if (medium->isMounted()) {
+ result["errStr"] = i18n("%1 is already mounted to %2.").arg(medium->deviceNode()).arg(medium->mountPoint());
+ result["result"] = false;
return result;
}
@@ -1607,7 +1630,6 @@ TQStringVariantMap HALBackend::mount(const Medium *medium)
return result;
}
- medium->setHalMounted(true);
ResetProperties(medium->id().latin1());
result["result"] = true;
@@ -1650,14 +1672,19 @@ TQStringVariantMap HALBackend::unmount(const TQString &id)
result["result"] = false;
return result;
}
-
- if (!medium->isMounted()) {
- result["result"] = true;
+ else if (!medium->isMountable()) {
+ result["errStr"] = i18n("%1 is not a mountable media.").arg(medium->deviceNode());
+ result["result"] = false;
+ return result;
+ }
+ else if (!medium->isMounted()) {
+ result["errStr"] = i18n("%1 is already unmounted.").arg(medium->deviceNode());
+ result["result"] = false;
return result;
}
TQString mountPoint = isInFstab(medium);
- if (!mountPoint.isNull())
+ if (!mountPoint.isEmpty())
{
struct mount_job_data data;
data.completed = false;
@@ -1814,7 +1841,6 @@ TQStringVariantMap HALBackend::unmount(const TQString &id)
dbus_message_unref (reply);
}
- medium->setHalMounted(false);
ResetProperties(medium->id().latin1());
while (dbus_connection_dispatch(dbus_connection) == DBUS_DISPATCH_DATA_REMAINS) ;
@@ -1833,9 +1859,14 @@ TQStringVariantMap HALBackend::unlock(const TQString &id, const TQString &passwo
result["result"] = false;
return result;
}
-
- if (!medium->isEncrypted() || !medium->clearDeviceUdi().isNull()) {
- result["result"] = true;
+ else if (!medium->isEncrypted()) {
+ result["errStr"] = i18n("%1 is not an encrypted media.").arg(medium->deviceNode());
+ result["result"] = false;
+ return result;
+ }
+ else if (!medium->needUnlocking()) {
+ result["errStr"] = i18n("%1 is already unlocked.").arg(medium->deviceNode());
+ result["result"] = false;
return result;
}
@@ -1902,9 +1933,14 @@ TQStringVariantMap HALBackend::lock(const TQString &id)
result["result"] = false;
return result;
}
-
- if (!medium->isEncrypted() || !medium->clearDeviceUdi().isNull()) {
- result["result"] = true;
+ else if (!medium->isEncrypted()) {
+ result["errStr"] = i18n("%1 is not an encrypted media.").arg(medium->deviceNode());
+ result["result"] = false;
+ return result;
+ }
+ else if (medium->needUnlocking()) {
+ result["errStr"] = i18n("%1 is already locked.").arg(medium->deviceNode());
+ result["result"] = false;
return result;
}
diff --git a/tdeioslave/media/mediamanager/medialist.cpp b/tdeioslave/media/mediamanager/medialist.cpp
index b06824d0..8ea9aec5 100644
--- a/tdeioslave/media/mediamanager/medialist.cpp
+++ b/tdeioslave/media/mediamanager/medialist.cpp
@@ -128,42 +128,43 @@ bool MediaList::changeMediumState(const Medium &medium, bool allowNotification)
{
kdDebug(1219) << "MediaList::changeMediumState(const Medium &) for id " << medium.id() << endl;
- if ( !m_idMap.contains(medium.id()) ) return false;
+ if (!m_idMap.contains(medium.id())) return false;
Medium *m = m_idMap[medium.id()];
- if ( medium.isMountable() )
+ m->setEncrypted(medium.isEncrypted());
+ m->setLocked(medium.isLocked());
+ m->setMountable(medium.isMountable());
+ if (medium.isMountable())
{
- TQString device_node = medium.deviceNode();
- TQString clear_device_udi = medium.clearDeviceUdi();
- TQString mount_point = medium.mountPoint();
- TQString fs_type = medium.fsType();
- bool mounted = medium.isMounted();
-
- m->mountableState( device_node, clear_device_udi, mount_point, fs_type, mounted );
+ m->setDeviceNode(medium.deviceNode());
+ m->setClearDeviceUdi(medium.clearDeviceUdi());
+ m->setMountPoint(medium.mountPoint());
+ m->setFsType(medium.fsType());
+ m->setMounted(medium.isMounted());
}
else
{
- m->unmountableState( medium.baseURL() );
+ m->setBaseURL(medium.baseURL());
}
-
if (!medium.mimeType().isEmpty())
{
- m->setMimeType( medium.mimeType() );
+ m->setMimeType(medium.mimeType());
}
if (!medium.iconName().isEmpty())
{
- m->setIconName( medium.iconName() );
+ m->setIconName(medium.iconName());
}
if (!medium.label().isEmpty())
{
- m->setLabel( medium.label() );
+ m->setLabel(medium.label());
}
m->setHidden(medium.hidden());
+ m->setSoftHidden(medium.softHidden());
emit mediumStateChanged(m->id(), m->name(), !m->needMounting(), allowNotification);
return true;
@@ -184,7 +185,8 @@ bool MediaList::changeMediumState(const TQString &id,
Medium *medium = m_idMap[id];
- medium->unmountableState( baseURL );
+ medium->setMountable(false);
+ medium->setBaseURL(baseURL);
if (!mimeType.isEmpty())
{
@@ -225,7 +227,16 @@ bool MediaList::changeMediumState(const TQString &id,
Medium *medium = m_idMap[id];
- medium->mountableState( deviceNode, mountPoint, fsType, mounted );
+ if (medium->deviceNode().isEmpty() || !medium->isMountable())
+ {
+ return false;
+ }
+
+ medium->setMountable(true);
+ medium->setDeviceNode(deviceNode);
+ medium->setMountPoint(mountPoint);
+ medium->setFsType(fsType);
+ medium->setMounted(mounted);
if (!mimeType.isEmpty())
{
@@ -262,7 +273,12 @@ bool MediaList::changeMediumState(const TQString &id, bool mounted,
Medium *medium = m_idMap[id];
- if ( !medium->mountableState( mounted ) ) return false;
+ if (medium->deviceNode().isEmpty() || !medium->isMountable())
+ {
+ return false;
+ }
+
+ medium->setMounted(mounted);
if (!mimeType.isEmpty())
{
diff --git a/tdeioslave/media/mediamanager/mediamanager.cpp b/tdeioslave/media/mediamanager/mediamanager.cpp
index 7a8262ee..a74a887b 100644
--- a/tdeioslave/media/mediamanager/mediamanager.cpp
+++ b/tdeioslave/media/mediamanager/mediamanager.cpp
@@ -297,7 +297,6 @@ TQStringVariantMap MediaManager::unmount(const TQString &uid)
TQStringVariantMap MediaManager::unlock(const TQString &uid, const TQString &password)
{
TQStringVariantMap result;
-/*
#ifdef COMPILE_TDEHARDWAREBACKEND
if (!m_tdebackend) {
result["errStr"] = i18n("Feature only available with the TDE hardware backend");
@@ -306,15 +305,12 @@ TQStringVariantMap MediaManager::unlock(const TQString &uid, const TQString &pas
}
return m_tdebackend->unlock(uid, password);
#elif defined COMPILE_HALBACKEND
-*/
-#if defined COMPILE_HALBACKEND
if (!m_halbackend) {
result["errStr"] = i18n("Feature only available with HAL");
result["result"] = false;
return result;
}
return m_halbackend->unlock(uid, password);
-
#else
// if (!m_fstabbackend) {
result["errStr"] = i18n("Feature only available with HAL or TDE hardware backend");
@@ -328,7 +324,6 @@ TQStringVariantMap MediaManager::unlock(const TQString &uid, const TQString &pas
TQStringVariantMap MediaManager::lock(const TQString &uid)
{
TQStringVariantMap result;
-/*
#ifdef COMPILE_TDEHARDWAREBACKEND
if (!m_tdebackend) {
result["errStr"] = i18n("Feature only available with the TDE hardware backend");
@@ -337,8 +332,6 @@ TQStringVariantMap MediaManager::lock(const TQString &uid)
}
return m_tdebackend->lock(uid);
#elif defined COMPILE_HALBACKEND
-*/
-#if defined COMPILE_HALBACKEND
if (!m_halbackend) {
result["errStr"] = i18n("Feature only available with HAL");
result["result"] = false;
diff --git a/tdeioslave/media/mediamanager/removablebackend.cpp b/tdeioslave/media/mediamanager/removablebackend.cpp
index 54df3d6f..dacb9b70 100644
--- a/tdeioslave/media/mediamanager/removablebackend.cpp
+++ b/tdeioslave/media/mediamanager/removablebackend.cpp
@@ -63,8 +63,11 @@ bool RemovableBackend::plug(const TQString &devNode, const TQString &label)
if (!m_removableIds.contains(id))
{
Medium *medium = new Medium(id, id, name);
- medium->mountableState(devNode, TQString::null,
- TQString::null, false);
+ medium->setMountable(true);
+ medium->setDeviceNode(devNode);
+ medium->setMountPoint(TQString::null);
+ medium->setFsType(TQString::null);
+ medium->setMounted(false);
TQStringList words = TQStringList::split(" ", label);
diff --git a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
index c399d280..b7dc942b 100644
--- a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
+++ b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
@@ -49,7 +49,6 @@
TDEBackend::TDEBackend(MediaList &list, TQObject* parent)
: TQObject()
, BackendBase(list)
- , m_unlockDialog(0)
, m_parent(parent)
{
// Initialize the TDE device manager
@@ -146,22 +145,23 @@ void TDEBackend::AddDevice(TDEStorageDevice * sdevice, bool allowNotification)
// Add volume block devices
if (sdevice->isDiskOfType(TDEDiskDeviceType::HDD)) {
/* We only list volumes that...
- * - are encrypted with LUKS or
+ * - are encrypted or
* - have a filesystem or
* - have an audio track
*/
- if (!(sdevice->isDiskOfType(TDEDiskDeviceType::LUKS))
- && !(sdevice->checkDiskStatus(TDEDiskDeviceStatus::ContainsFilesystem))
- && !(sdevice->isDiskOfType(TDEDiskDeviceType::CDAudio))
- && !(sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank))
+ if (!sdevice->isDiskOfType(TDEDiskDeviceType::LUKS) &&
+ !sdevice->isDiskOfType(TDEDiskDeviceType::OtherCrypted) &&
+ !sdevice->checkDiskStatus(TDEDiskDeviceStatus::ContainsFilesystem) &&
+ !sdevice->isDiskOfType(TDEDiskDeviceType::CDAudio) &&
+ !sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)
) {
//
}
- /* We also don't display devices that underlie other devices;
- * e.g. the raw partition of a device mapper volume
- */
- else if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::UsedByDevice)
- || (sdevice->fileSystemUsage().upper() == "RAID")) {
+ // We also don't display devices that underlie other devices, unless they are encrypted devices
+ else if ((sdevice->checkDiskStatus(TDEDiskDeviceStatus::UsedByDevice) &&
+ !sdevice->isDiskOfType(TDEDiskDeviceType::LUKS) &&
+ !sdevice->isDiskOfType(TDEDiskDeviceType::OtherCrypted)) ||
+ sdevice->fileSystemUsage().upper() == "RAID") {
//
}
else {
@@ -169,16 +169,6 @@ void TDEBackend::AddDevice(TDEStorageDevice * sdevice, bool allowNotification)
Medium* medium = new Medium(sdevice->uniqueID(), driveUDIFromDeviceUID(sdevice->uniqueID()), "");
setVolumeProperties(medium);
- // Do not list the LUKS backend device if it has been unlocked elsewhere
- if (sdevice->isDiskOfType(TDEDiskDeviceType::LUKS)) {
- if (sdevice->holdingDevices().count() > 0) {
- medium->setHidden(true);
- }
- else {
- medium->setHidden(false);
- }
- }
-
// Hide udev hidden devices by default but allow the user to override if desired via Show Hidden Files
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Hidden)) {
medium->setSoftHidden(true);
@@ -266,33 +256,29 @@ void TDEBackend::AddDevice(TDEStorageDevice * sdevice, bool allowNotification)
}
/* We only list volumes that...
- * - are encrypted with LUKS or
+ * - are encrypted or
* - have a filesystem or
- * - are a floppy disk
+ * - have an audio track
*/
- if (!(sdevice->isDiskOfType(TDEDiskDeviceType::LUKS))
- && !(sdevice->checkDiskStatus(TDEDiskDeviceStatus::ContainsFilesystem))
- && !(sdevice->isDiskOfType(TDEDiskDeviceType::Floppy))
- && !(sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank))
+ if (!sdevice->isDiskOfType(TDEDiskDeviceType::LUKS) &&
+ !sdevice->isDiskOfType(TDEDiskDeviceType::OtherCrypted) &&
+ !sdevice->checkDiskStatus(TDEDiskDeviceStatus::ContainsFilesystem) &&
+ !sdevice->isDiskOfType(TDEDiskDeviceType::CDAudio) &&
+ !sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)
) {
//
}
+ // We also don't display devices that underlie other devices, unless they are encrypted devices
+ else if ((sdevice->checkDiskStatus(TDEDiskDeviceStatus::UsedByDevice) &&
+ !sdevice->isDiskOfType(TDEDiskDeviceType::LUKS) &&
+ !sdevice->isDiskOfType(TDEDiskDeviceType::OtherCrypted)) ||
+ sdevice->fileSystemUsage().upper() == "RAID") {
+ //
+ }
else {
// Create medium
Medium* medium = new Medium(sdevice->uniqueID(), driveUDIFromDeviceUID(sdevice->uniqueID()), "");
-
setFloppyProperties(medium);
-
- // Do not list the LUKS backend device if it has been unlocked elsewhere
- if (sdevice->isDiskOfType(TDEDiskDeviceType::LUKS)) {
- if (sdevice->holdingDevices().count() > 0) {
- medium->setHidden(true);
- }
- else {
- medium->setHidden(false);
- }
- }
-
m_mediaList.addMedium(medium, allowDialogNotification);
kdDebug(1219) << "TDEBackend::AddDevice inserted floppy medium for " << sdevice->uniqueID() << endl;
@@ -359,24 +345,28 @@ void TDEBackend::ResetProperties(TDEStorageDevice * sdevice, bool allowNotificat
Medium* m = new Medium(sdevice->uniqueID(), driveUDIFromDeviceUID(sdevice->uniqueID()), "");
// Keep these conditions in sync with ::AddDevice above, OR ELSE!!!
- // BEGIN
if (sdevice->isDiskOfType(TDEDiskDeviceType::HDD)) {
- if (!(sdevice->isDiskOfType(TDEDiskDeviceType::LUKS))
- && !(sdevice->checkDiskStatus(TDEDiskDeviceStatus::ContainsFilesystem))
- && !(sdevice->isDiskOfType(TDEDiskDeviceType::CDAudio))
- && !(sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank))
+ /* We only list volumes that...
+ * - are encrypted or
+ * - have a filesystem or
+ * - have an audio track
+ */
+ if (!sdevice->isDiskOfType(TDEDiskDeviceType::LUKS) &&
+ !sdevice->isDiskOfType(TDEDiskDeviceType::OtherCrypted) &&
+ !sdevice->checkDiskStatus(TDEDiskDeviceStatus::ContainsFilesystem) &&
+ !sdevice->isDiskOfType(TDEDiskDeviceType::CDAudio) &&
+ !sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)
) {
+ //
+ }
+ // We also don't display devices that underlie other devices, unless they are encrypted devices
+ else if ((sdevice->checkDiskStatus(TDEDiskDeviceStatus::UsedByDevice) &&
+ !sdevice->isDiskOfType(TDEDiskDeviceType::LUKS) &&
+ !sdevice->isDiskOfType(TDEDiskDeviceType::OtherCrypted)) ||
+ sdevice->fileSystemUsage().upper() == "RAID") {
+ //
}
else {
- // Do not list the LUKS backend device if it has been unlocked elsewhere
- if (sdevice->isDiskOfType(TDEDiskDeviceType::LUKS)) {
- if (sdevice->holdingDevices().count() > 0) {
- m->setHidden(true);
- }
- else {
- m->setHidden(false);
- }
- }
setVolumeProperties(m);
}
}
@@ -416,25 +406,27 @@ void TDEBackend::ResetProperties(TDEStorageDevice * sdevice, bool allowNotificat
(sdevice->isDiskOfType(TDEDiskDeviceType::Zip)) ||
(sdevice->isDiskOfType(TDEDiskDeviceType::Jaz))
) {
-
- if (!(sdevice->isDiskOfType(TDEDiskDeviceType::LUKS))
- && !(sdevice->checkDiskStatus(TDEDiskDeviceStatus::ContainsFilesystem))
- && !(sdevice->isDiskOfType(TDEDiskDeviceType::Floppy))
- && !(sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank))
+ /* We only list volumes that...
+ * - are encrypted or
+ * - have a filesystem or
+ * - have an audio track
+ */
+ if (!sdevice->isDiskOfType(TDEDiskDeviceType::LUKS) &&
+ !sdevice->isDiskOfType(TDEDiskDeviceType::OtherCrypted) &&
+ !sdevice->checkDiskStatus(TDEDiskDeviceStatus::ContainsFilesystem) &&
+ !sdevice->isDiskOfType(TDEDiskDeviceType::CDAudio) &&
+ !sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)
) {
//
}
+ // We also don't display devices that underlie other devices, unless they are encrypted devices
+ else if ((sdevice->checkDiskStatus(TDEDiskDeviceStatus::UsedByDevice) &&
+ !sdevice->isDiskOfType(TDEDiskDeviceType::LUKS) &&
+ !sdevice->isDiskOfType(TDEDiskDeviceType::OtherCrypted)) ||
+ sdevice->fileSystemUsage().upper() == "RAID") {
+ //
+ }
else {
- // Do not list the LUKS backend device if it has been unlocked elsewhere
- if (sdevice->isDiskOfType(TDEDiskDeviceType::LUKS)) {
- if (sdevice->holdingDevices().count() > 0) {
- m->setHidden(true);
- }
- else {
- m->setHidden(false);
- }
- }
-
setFloppyProperties(m);
}
}
@@ -443,8 +435,6 @@ void TDEBackend::ResetProperties(TDEStorageDevice * sdevice, bool allowNotificat
setCameraProperties(m);
}
- // END
-
if ((sdevice->checkDiskStatus(TDEDiskDeviceStatus::Removable)) && (!(sdevice->checkDiskStatus(TDEDiskDeviceStatus::Inserted)))) {
kdDebug(1219) << "TDEBackend::ResetProperties for " << sdevice->uniqueID() << " device was removed from system" << endl;
RemoveDevice(sdevice);
@@ -462,21 +452,33 @@ void TDEBackend::setVolumeProperties(Medium* medium)
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
- TDEStorageDevice * sdevice = hwdevices->findDiskByUID(medium->id());
+ TDEStorageDevice *sdevice = hwdevices->findDiskByUID(medium->id());
if (!sdevice) {
return;
}
medium->setName(generateName(sdevice->deviceNode()));
- if ((sdevice->isDiskOfType(TDEDiskDeviceType::LUKS)) || (sdevice->isDiskOfType(TDEDiskDeviceType::UnlockedCrypt))) {
+ if (sdevice->isDiskOfType(TDEDiskDeviceType::LUKS) || sdevice->isDiskOfType(TDEDiskDeviceType::OtherCrypted)) {
medium->setEncrypted(true);
+ medium->setLocked(!sdevice->isDiskOfType(TDEDiskDeviceType::UnlockedCrypt));
}
else {
medium->setEncrypted(false);
}
- // USAGE: mountableState(Device node, Mount point, Filesystem type, Mounted ?)
- medium->mountableState(sdevice->deviceNode(), sdevice->mountPath(), sdevice->fileSystemName(), !sdevice->mountPath().isNull());
+ if (sdevice->isDiskOfType(TDEDiskDeviceType::LUKS) || sdevice->isDiskOfType(TDEDiskDeviceType::OtherCrypted) ||
+ sdevice->fileSystemUsage().upper() == "RAID") {
+ // Encrypted disks or device underlying other devices are not mountable
+ medium->setMountable(false);
+ }
+ else {
+ medium->setMountable(true);
+ }
+
+ medium->setDeviceNode(sdevice->deviceNode());
+ medium->setMountPoint(sdevice->mountPath());
+ medium->setFsType(sdevice->fileSystemName());
+ medium->setMounted(!sdevice->mountPath().isEmpty());
TQString diskLabel = sdevice->diskLabel();
bool useDefaultLabel = diskLabel.isNull();
@@ -525,7 +527,8 @@ void TDEBackend::setVolumeProperties(Medium* medium)
mimeType = "media/cdrom" + MOUNT_MEDIA_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankcd";
- medium->unmountableState("");
+ medium->setMountable(false);
+ medium->setBaseURL(TQString::null);
diskLabel = i18n("Blank CD-ROM");
}
}
@@ -534,7 +537,8 @@ void TDEBackend::setVolumeProperties(Medium* medium)
mimeType = "media/cd-r" + MOUNT_MEDIA_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankcd";
- medium->unmountableState("");
+ medium->setMountable(false);
+ medium->setBaseURL(TQString::null);
diskLabel = i18n("Blank CD-R");
}
}
@@ -543,7 +547,8 @@ void TDEBackend::setVolumeProperties(Medium* medium)
mimeType = "media/cd-rw" + MOUNT_MEDIA_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankcd";
- medium->unmountableState("");
+ medium->setMountable(false);
+ medium->setBaseURL(TQString::null);
diskLabel = i18n("Blank CD-RW");
}
}
@@ -552,7 +557,8 @@ void TDEBackend::setVolumeProperties(Medium* medium)
mimeType = "media/cd-rw" + MOUNT_MEDIA_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankcd";
- medium->unmountableState("");
+ medium->setMountable(false);
+ medium->setBaseURL(TQString::null);
diskLabel = i18n("Blank Magneto-Optical CD");
}
}
@@ -561,7 +567,8 @@ void TDEBackend::setVolumeProperties(Medium* medium)
mimeType = "media/cd-rw" + MOUNT_MEDIA_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankcd";
- medium->unmountableState("");
+ medium->setMountable(false);
+ medium->setBaseURL(TQString::null);
diskLabel = i18n("Blank Mount Ranier CD-RW");
}
}
@@ -570,7 +577,8 @@ void TDEBackend::setVolumeProperties(Medium* medium)
mimeType = "media/cd-rw" + MOUNT_MEDIA_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankcd";
- medium->unmountableState("");
+ medium->setMountable(false);
+ medium->setBaseURL(TQString::null);
diskLabel = i18n("Blank Mount Ranier CD-RW-W");
}
}
@@ -579,7 +587,8 @@ void TDEBackend::setVolumeProperties(Medium* medium)
mimeType = "media/dvd" + MOUNT_MEDIA_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankdvd";
- medium->unmountableState("");
+ medium->setMountable(false);
+ medium->setBaseURL(TQString::null);
diskLabel = i18n("Blank DVD-ROM");
}
}
@@ -588,7 +597,8 @@ void TDEBackend::setVolumeProperties(Medium* medium)
mimeType = "media/dvd" + MOUNT_MEDIA_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankdvd";
- medium->unmountableState("");
+ medium->setMountable(false);
+ medium->setBaseURL(TQString::null);
diskLabel = i18n("Blank DVD-RAM");
}
}
@@ -597,7 +607,8 @@ void TDEBackend::setVolumeProperties(Medium* medium)
mimeType = "media/dvd" + MOUNT_MEDIA_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankdvd";
- medium->unmountableState("");
+ medium->setMountable(false);
+ medium->setBaseURL(TQString::null);
diskLabel = i18n("Blank DVD-R");
}
}
@@ -606,7 +617,8 @@ void TDEBackend::setVolumeProperties(Medium* medium)
mimeType = "media/dvd" + MOUNT_MEDIA_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankdvd";
- medium->unmountableState("");
+ medium->setMountable(false);
+ medium->setBaseURL(TQString::null);
diskLabel = i18n("Blank DVD-RW");
}
}
@@ -615,7 +627,8 @@ void TDEBackend::setVolumeProperties(Medium* medium)
mimeType = "media/dvd" + MOUNT_MEDIA_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankdvd";
- medium->unmountableState("");
+ medium->setMountable(false);
+ medium->setBaseURL(TQString::null);
diskLabel = i18n("Blank Dual Layer DVD-R");
}
}
@@ -624,7 +637,8 @@ void TDEBackend::setVolumeProperties(Medium* medium)
mimeType = "media/dvd" + MOUNT_MEDIA_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankdvd";
- medium->unmountableState("");
+ medium->setMountable(false);
+ medium->setBaseURL(TQString::null);
diskLabel = i18n("Blank Dual Layer DVD-RW");
}
}
@@ -633,7 +647,8 @@ void TDEBackend::setVolumeProperties(Medium* medium)
mimeType = "media/dvd" + MOUNT_MEDIA_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankdvd";
- medium->unmountableState("");
+ medium->setMountable(false);
+ medium->setBaseURL(TQString::null);
diskLabel = i18n("Blank DVD+R");
}
}
@@ -642,7 +657,8 @@ void TDEBackend::setVolumeProperties(Medium* medium)
mimeType = "media/dvd" + MOUNT_MEDIA_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankdvd";
- medium->unmountableState("");
+ medium->setMountable(false);
+ medium->setBaseURL(TQString::null);
diskLabel = i18n("Blank DVD+RW");
}
}
@@ -651,7 +667,8 @@ void TDEBackend::setVolumeProperties(Medium* medium)
mimeType = "media/dvd" + MOUNT_MEDIA_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankdvd";
- medium->unmountableState("");
+ medium->setMountable(false);
+ medium->setBaseURL(TQString::null);
diskLabel = i18n("Blank Dual Layer DVD+R");
}
}
@@ -660,7 +677,8 @@ void TDEBackend::setVolumeProperties(Medium* medium)
mimeType = "media/dvd" + MOUNT_MEDIA_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankdvd";
- medium->unmountableState("");
+ medium->setMountable(false);
+ medium->setBaseURL(TQString::null);
diskLabel = i18n("Blank Dual Layer DVD+RW");
}
}
@@ -669,7 +687,8 @@ void TDEBackend::setVolumeProperties(Medium* medium)
mimeType = "media/bluray" + MOUNT_MEDIA_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankbluray";
- medium->unmountableState("");
+ medium->setMountable(false);
+ medium->setBaseURL(TQString::null);
diskLabel = i18n("Blank BLURAY-ROM");
}
}
@@ -678,7 +697,8 @@ void TDEBackend::setVolumeProperties(Medium* medium)
mimeType = "media/bluray" + MOUNT_MEDIA_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankbluray";
- medium->unmountableState("");
+ medium->setMountable(false);
+ medium->setBaseURL(TQString::null);
diskLabel = i18n("Blank BLURAY-R");
}
}
@@ -687,7 +707,8 @@ void TDEBackend::setVolumeProperties(Medium* medium)
mimeType = "media/bluray" + MOUNT_MEDIA_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankbluray";
- medium->unmountableState("");
+ medium->setMountable(false);
+ medium->setBaseURL(TQString::null);
diskLabel = i18n("Blank BLURAY-RW");
}
}
@@ -696,7 +717,8 @@ void TDEBackend::setVolumeProperties(Medium* medium)
mimeType = "media/bluray" + MOUNT_MEDIA_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankbluray";
- medium->unmountableState("");
+ medium->setMountable(false);
+ medium->setBaseURL(TQString::null);
diskLabel = i18n("Blank HDDVD-ROM");
}
}
@@ -705,7 +727,8 @@ void TDEBackend::setVolumeProperties(Medium* medium)
mimeType = "media/bluray" + MOUNT_MEDIA_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankbluray";
- medium->unmountableState("");
+ medium->setMountable(false);
+ medium->setBaseURL(TQString::null);
diskLabel = i18n("Blank HDDVD-R");
}
}
@@ -714,14 +737,16 @@ void TDEBackend::setVolumeProperties(Medium* medium)
mimeType = "media/bluray" + MOUNT_MEDIA_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankbluray";
- medium->unmountableState("");
+ medium->setMountable(false);
+ medium->setBaseURL(TQString::null);
diskLabel = i18n("Blank HDDVD-RW");
}
}
if (sdevice->isDiskOfType(TDEDiskDeviceType::CDAudio)) {
mimeType = "media/audiocd";
- medium->unmountableState("audiocd:/?device=" + sdevice->deviceNode());
+ medium->setMountable(false);
+ medium->setBaseURL("audiocd:/?device=" + sdevice->deviceNode());
diskLabel = i18n("Audio CD");
}
@@ -769,9 +794,10 @@ void TDEBackend::setVolumeProperties(Medium* medium)
}
if (sdevice->isDiskOfType(TDEDiskDeviceType::MediaDevice)) {
medium->setIconName("ipod" + MOUNTED_ICON_SUFFIX);
- if (sdevice->vendorModel().upper().contains("IPOD") && KProtocolInfo::isKnownProtocol( TQString("ipod") ) ) {
- medium->unmountableState( "ipod:/" );
- medium->mountableState(!sdevice->mountPath().isNull());
+ if (sdevice->vendorModel().upper().contains("IPOD") && KProtocolInfo::isKnownProtocol(TQString("ipod"))) {
+ medium->setBaseURL("ipod:/");
+ medium->setMountable(true);
+ medium->setMounted(!sdevice->mountPath().isEmpty());
}
}
if (sdevice->isDiskOfType(TDEDiskDeviceType::Tape)) {
@@ -782,15 +808,6 @@ void TDEBackend::setVolumeProperties(Medium* medium)
}
}
- if (!medium->needMounting()) {
- if (sdevice->isDiskOfType(TDEDiskDeviceType::LUKS)) {
- if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::UsedByDevice)) {
- // Encrypted base devices must be set to this mimetype or they won't open when the base device node is passed to the tdeioslave
- mimeType = "media/removable_mounted";
- }
- }
- }
-
medium->setLabel(diskLabel);
medium->setMimeType(mimeType);
}
@@ -813,22 +830,38 @@ bool TDEBackend::setFloppyProperties(Medium* medium)
// Any more?
if ((sdevice->isDiskOfType(TDEDiskDeviceType::Zip)) || (sdevice->isDiskOfType(TDEDiskDeviceType::Jaz))) {
medium->setName(generateName(sdevice->deviceNode()));
- if ((sdevice->isDiskOfType(TDEDiskDeviceType::LUKS)) || (sdevice->isDiskOfType(TDEDiskDeviceType::UnlockedCrypt))) {
+ if (sdevice->isDiskOfType(TDEDiskDeviceType::LUKS) || sdevice->isDiskOfType(TDEDiskDeviceType::OtherCrypted)) {
medium->setEncrypted(true);
+ medium->setLocked(!sdevice->isDiskOfType(TDEDiskDeviceType::UnlockedCrypt));
}
else {
medium->setEncrypted(false);
}
- // USAGE: mountableState(Device node, Mount point, Filesystem type, Mounted ?)
- medium->mountableState(sdevice->deviceNode(), sdevice->mountPath(), sdevice->fileSystemName(), !sdevice->mountPath().isNull());
+ if (sdevice->isDiskOfType(TDEDiskDeviceType::LUKS) || sdevice->isDiskOfType(TDEDiskDeviceType::OtherCrypted) ||
+ sdevice->fileSystemUsage().upper() == "RAID") {
+ // Encrypted disks or device underlying other devices are not mountable
+ medium->setMountable(false);
+ }
+ else {
+ medium->setMountable(true);
+ }
+
+ medium->setDeviceNode(sdevice->deviceNode());
+ medium->setMountPoint(sdevice->mountPath());
+ medium->setFsType(sdevice->fileSystemName());
+ medium->setMounted(!sdevice->mountPath().isEmpty());
}
if (sdevice->isDiskOfType(TDEDiskDeviceType::Floppy)) {
setFloppyMountState(medium);
// We don't use the routine above as floppy disks are extremely slow (we don't want them accessed at all during media listing)
- medium->mountableState(sdevice->deviceNode(), sdevice->mountPath(), sdevice->fileSystemName(), !sdevice->mountPath().isNull());
+ medium->setMountable(true);
+ medium->setDeviceNode(sdevice->deviceNode());
+ medium->setMountPoint(sdevice->mountPath());
+ medium->setFsType(sdevice->fileSystemName());
+ medium->setMounted(!sdevice->mountPath().isEmpty());
if (sdevice->mountPath().isNull()) {
medium->setMimeType("media/floppy_unmounted");
@@ -885,7 +918,8 @@ void TDEBackend::setCameraProperties(Medium* medium)
device.sprintf("camera://@[usb:%s,%s]/", devNode0.ascii(), devNode1.ascii());
}
- medium->unmountableState(device);
+ medium->setMountable(false);
+ medium->setBaseURL(device);
medium->setMimeType("media/gphoto2camera");
medium->setIconName(TQString::null);
@@ -909,7 +943,11 @@ void TDEBackend::setFloppyMountState( Medium *medium )
if ((*it)->mountedFrom() == medium->deviceNode() ) {
fstype = (*it)->mountType().isNull() ? (*it)->mountType() : "auto";
mountpoint = (*it)->mountPoint();
- medium->mountableState( medium->deviceNode(), mountpoint, fstype, true );
+ medium->setMountable(true);
+ medium->setDeviceNode(medium->deviceNode());
+ medium->setMountPoint(mountpoint);
+ medium->setFsType(fstype);
+ medium->setMounted(true);
return;
}
}
@@ -1173,23 +1211,19 @@ bool TDEBackend::setMountoptions(const TQString &name, const TQStringList &optio
return true;
}
-void TDEBackend::slotPasswordReady() {
- m_decryptionPassword = m_unlockDialog->getPassword();
- m_decryptPasswordValid = true;
-}
-
-void TDEBackend::slotPasswordCancel() {
- m_decryptionPassword = TQString::null;
- m_decryptPasswordValid = true;
-}
-
TQStringVariantMap TDEBackend::mount(const Medium *medium)
{
kdDebug(1219) << "TDEBackend::mount for medium " << medium->name() << endl;
TQStringVariantMap result;
- if (medium->isMounted()) {
- result["result"] = true;
+ if (!medium->isMountable()) {
+ result["errStr"] = i18n("%1 is not a mountable media.").arg(medium->deviceNode());
+ result["result"] = false;
+ return result;
+ }
+ else if (medium->isMounted()) {
+ result["errStr"] = i18n("%1 is already mounted to %2.").arg(medium->deviceNode()).arg(medium->mountPoint());
+ result["result"] = false;
return result;
}
@@ -1222,7 +1256,7 @@ TQStringVariantMap TDEBackend::mount(const Medium *medium)
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
TDEStorageDevice *sdevice = hwdevices->findDiskByUID(medium->id());
if (!sdevice) {
- result["errStr"] = i18n("Internal error. Couldn't find medium.");
+ result["errStr"] = i18n("Internal error. Couldn't find medium id %1.").arg(medium->id());
result["result"] = false;
return result;
}
@@ -1242,99 +1276,13 @@ TQStringVariantMap TDEBackend::mount(const Medium *medium)
}
TQString qerror;
- if (!medium->isEncrypted()) {
- // normal volume
- TQStringVariantMap mountResult = sdevice->mountDevice(diskLabel, valids);
- TQString mountedPath = mountResult.contains("mountPath") ? mountResult["mountPath"].toString() : TQString::null;
- if (mountedPath.isEmpty()) {
- qerror = i18n("Unable to mount this device.");
- TQString errStr = mountResult.contains("errStr") ? mountResult["errStr"].toString() : TQString::null;
- if (!errStr.isEmpty()) {
- qerror.append(i18n("<p>Technical details:<br>").append(errStr));
- }
- }
- }
- else {
- TQString iconName = medium->iconName();
- if (iconName.isEmpty())
- {
- TQString mime = medium->mimeType();
- iconName = KMimeType::mimeType(mime)->icon(mime, false);
- }
-
- bool continue_trying_to_decrypt = true;
- while (continue_trying_to_decrypt == true) {
- m_decryptPasswordValid = false;
-
- m_unlockDialog = new Dialog(sdevice->deviceNode(), iconName);
- m_unlockDialog->show();
-
- connect(m_unlockDialog, TQT_SIGNAL (user1Clicked()), this, TQT_SLOT (slotPasswordReady()));
- connect(m_unlockDialog, TQT_SIGNAL (cancelClicked()), this, TQT_SLOT (slotPasswordCancel()));
- connect(this, TQT_SIGNAL (signalDecryptionPasswordError(TQString)), m_unlockDialog, TQT_SLOT (slotDialogError(TQString)));
-
- while (m_decryptPasswordValid == false) {
- tqApp->processEvents();
- }
-
- m_unlockDialog->setEnabled(false);
- tqApp->processEvents();
-
- if (m_decryptionPassword.isNull()) {
- delete m_unlockDialog;
- result["errStr"] = i18n("Decryption aborted");
- result["result"] = false;
- return result;
- }
- else {
- // Just for some added fun, if udev emits a medium change event, which I then forward, with mounted==0, it stops the MediaProtocol::listDir method dead in its tracks,
- // and therefore the media:/ tdeioslave won't refresh after the encrypted device mount
- // Therefore, I need to ignore all change events on this device during the mount process and hope nothing bad happens as a result!
- if (!m_ignoreDeviceChangeEvents.contains(sdevice->uniqueID())) {
- m_ignoreDeviceChangeEvents.append(sdevice->uniqueID());
- }
-
- // mount encrypted volume with password
- TQStringVariantMap mountResult = sdevice->mountEncryptedDevice(m_decryptionPassword, diskLabel, valids);
- TQString mountedPath = mountResult.contains("mountPath") ? mountResult["mountPath"].toString() : TQString::null;
- if (mountedPath.isEmpty()) {
- if (mountResult.contains("retCode") && mountResult["retCode"].toInt() == 0) {
- // Mounting was successful
- // Because the TDE hardware backend is event driven it might take a little while for the new enlock mapped device to show up
- // Wait up to 30 seconds for it to appear...
- for (int i=0;i<300;i++) {
- mountedPath = sdevice->mountPath();
- if (!mountedPath.isEmpty()) {
- break;
- }
- tqApp->processEvents(50);
- usleep(50000);
- }
- }
- }
- if (mountedPath.isEmpty()) {
- if (mountResult.contains("retCode") && mountResult["retCode"].toInt() == 25600) {
- // Probable LUKS failure
- // Retry
- m_unlockDialog->setEnabled(true);
- continue_trying_to_decrypt = true;
- }
- else {
- qerror = i18n("Cannot mount encrypted locked drives!");
- qerror = i18n("Unable to mount this device.");
- TQString errStr = mountResult.contains("errStr") ? mountResult["errStr"].toString() : TQString::null;
- if (!errStr.isEmpty()) {
- qerror.append(i18n("<p>Technical details:<br>").append(errStr));
- }
- continue_trying_to_decrypt = false;
- }
- }
- else {
- continue_trying_to_decrypt = false;
- }
-
- delete m_unlockDialog;
- }
+ TQStringVariantMap mountResult = sdevice->mountDevice(diskLabel, valids);
+ TQString mountedPath = mountResult.contains("mountPath") ? mountResult["mountPath"].toString() : TQString::null;
+ if (mountedPath.isEmpty()) {
+ qerror = i18n("Unable to mount this device.");
+ TQString errStr = mountResult.contains("errStr") ? mountResult["errStr"].toString() : TQString::null;
+ if (!errStr.isEmpty()) {
+ qerror.append(i18n("<p>Technical details:<br>").append(errStr));
}
}
@@ -1373,16 +1321,20 @@ TQStringVariantMap TDEBackend::unmount(const TQString &id)
kdDebug(1219) << "TDEBackend::unmount for id " << id << endl;
TQStringVariantMap result;
-
- const Medium* medium = m_mediaList.findById(id);
+ const Medium *medium = m_mediaList.findById(id);
if (!medium) {
result["errStr"] = i18n("No such medium: %1").arg(id);
result["result"] = false;
return result;
}
-
- if (!medium->isMounted()) {
- result["result"] = true;
+ else if (!medium->isMountable()) {
+ result["errStr"] = i18n("%1 is not a mountable media.").arg(medium->deviceNode());
+ result["result"] = false;
+ return result;
+ }
+ else if (!medium->isMounted()) {
+ result["errStr"] = i18n("%1 is already unmounted.").arg(medium->deviceNode());
+ result["result"] = false;
return result;
}
@@ -1415,7 +1367,7 @@ TQStringVariantMap TDEBackend::unmount(const TQString &id)
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
TDEStorageDevice *sdevice = hwdevices->findDiskByUID(medium->id());
if (!sdevice) {
- result["errStr"] = i18n("Internal error. Couldn't find medium.");
+ result["errStr"] = i18n("Internal error. Couldn't find medium id %1.").arg(medium->id());
result["result"] = false;
return result;
}
@@ -1441,7 +1393,7 @@ TQStringVariantMap TDEBackend::unmount(const TQString &id)
// Failed as BUSY
TQString processesUsingDev = listUsingProcesses(medium);
if (!processesUsingDev.isNull()) {
- if (KMessageBox::warningYesNo(0, i18n("<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently "
+ if (KMessageBox::warningYesNo(0, i18n("The device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to forcibly "
"terminate these processes?</b><br><i>All unsaved data would be lost</i>").arg("system:/media/" +
medium->name()).arg(medium->deviceNode()).arg(medium->prettyLabel()).arg(medium->prettyBaseURL().pathOrURL())
@@ -1480,6 +1432,101 @@ TQStringVariantMap TDEBackend::unmount(const TQString &id)
return result;
}
+TQStringVariantMap TDEBackend::unlock(const TQString &id, const TQString &password)
+{
+ kdDebug(1219) << "TDEBackend::unlock for id " << id << endl;
+
+ TQStringVariantMap result;
+ const Medium *medium = m_mediaList.findById(id);
+ if (!medium) {
+ result["errStr"] = i18n("No such medium: %1").arg(id);
+ result["result"] = false;
+ return result;
+ }
+ else if (!medium->isEncrypted()) {
+ result["errStr"] = i18n("%1 is not an encrypted media.").arg(medium->deviceNode());
+ result["result"] = false;
+ return result;
+ }
+ else if (!medium->needUnlocking()) {
+ result["errStr"] = i18n("%1 is already unlocked.").arg(medium->deviceNode());
+ result["result"] = false;
+ return result;
+ }
+
+ TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
+ TDEStorageDevice *sdevice = hwdevices->findDiskByUID(medium->id());
+ if (!sdevice) {
+ result["errStr"] = i18n("Internal error. Couldn't find medium id %1.").arg(medium->id());
+ result["result"] = false;
+ return result;
+ }
+
+ TQStringVariantMap unlockResult = sdevice->unlockDevice(password);
+ if (unlockResult["result"].toBool() == false) {
+ TQString qerror = i18n("Unable to unlock the device.");
+ TQString errStr = unlockResult.contains("errStr") ? unlockResult["errStr"].toString() : TQString::null;
+ if (!errStr.isEmpty()) {
+ qerror.append(i18n("<p>Technical details:<br>").append(errStr));
+ result["errStr"] = qerror;
+ result["result"] = false;
+ return result;
+ }
+ }
+
+ ResetProperties(sdevice, false, true);
+ result["result"] = unlockResult["unlockedDevice"];
+ result["result"] = true;
+ return result;
+}
+
+TQStringVariantMap TDEBackend::lock(const TQString &id)
+{
+ kdDebug(1219) << "TDEBackend::lock for id " << id << endl;
+
+ TQStringVariantMap result;
+
+ const Medium *medium = m_mediaList.findById(id);
+ if (!medium) {
+ result["errStr"] = i18n("No such medium: %1").arg(id);
+ result["result"] = false;
+ return result;
+ }
+ else if (!medium->isEncrypted()) {
+ result["errStr"] = i18n("%1 is not an encrypted media.").arg(medium->deviceNode());
+ result["result"] = false;
+ return result;
+ }
+ else if (medium->needUnlocking()) {
+ result["errStr"] = i18n("%1 is already locked.").arg(medium->deviceNode());
+ result["result"] = false;
+ return result;
+ }
+
+ TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
+ TDEStorageDevice *sdevice = hwdevices->findDiskByUID(medium->id());
+ if (!sdevice) {
+ result["errStr"] = i18n("Internal error. Couldn't find medium id %1.").arg(medium->id());
+ result["result"] = false;
+ return result;
+ }
+
+ TQStringVariantMap lockResult = sdevice->lockDevice();
+ if (lockResult["result"].toBool() == false) {
+ TQString qerror = i18n("Unable to lock the device.");
+ TQString errStr = lockResult.contains("errStr") ? lockResult["errStr"].toString() : TQString::null;
+ if (!errStr.isEmpty()) {
+ qerror.append(i18n("<p>Technical details:<br>").append(errStr));
+ result["errStr"] = qerror;
+ result["result"] = false;
+ return result;
+ }
+ }
+
+ result["result"] = true;
+ return result;
+}
+
void TDEBackend::slotResult(TDEIO::Job *job)
{
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
@@ -1491,7 +1538,6 @@ void TDEBackend::slotResult(TDEIO::Job *job)
if (job->error() == TDEIO::ERR_COULD_NOT_UNMOUNT) {
TQString proclist(listUsingProcesses(medium));
- qerror = "<qt>";
qerror += "<p>" + i18n("Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and "
"currently mounted at <b>%4</b> could not be unmounted. ").arg(
"system:/media/" + medium->name(),
@@ -1504,7 +1550,6 @@ void TDEBackend::slotResult(TDEIO::Job *job)
if (!proclist.isEmpty()) {
qerror += proclist;
}
- qerror += "</qt>";
} else if (job->error()) {
qerror = job->errorText();
}
diff --git a/tdeioslave/media/mediamanager/tdehardwarebackend.h b/tdeioslave/media/mediamanager/tdehardwarebackend.h
index 5c6ce126..449d6369 100644
--- a/tdeioslave/media/mediamanager/tdehardwarebackend.h
+++ b/tdeioslave/media/mediamanager/tdehardwarebackend.h
@@ -71,8 +71,8 @@ public:
TQStringVariantMap mount(const TQString &id);
TQStringVariantMap mount(const Medium *medium);
TQStringVariantMap unmount(const TQString &id);
-// TQStringVariantMap unlock(const TQString &id, const TQString &password);
-// TQStringVariantMap lock(const TQString &id);
+ TQStringVariantMap unlock(const TQString &id, const TQString &password);
+ TQStringVariantMap lock(const TQString &id);
private:
/**
@@ -103,9 +103,6 @@ private slots:
void RemoveDeviceHandler(TDEGenericDevice* device);
void ModifyDeviceHandler(TDEGenericDevice* device);
- void slotPasswordReady();
- void slotPasswordCancel();
-
signals:
void signalDecryptionPasswordError(TQString);
@@ -137,11 +134,6 @@ private:
TQString driveUDIFromDeviceUID(TQString uuid);
- // Decryption
- Dialog* m_unlockDialog;
- TQString m_decryptionPassword;
- bool m_decryptPasswordValid;
-
private slots:
void slotResult(TDEIO::Job *job);
diff --git a/tdeioslave/media/mimetypes/cd-r_encrypted_locked.desktop b/tdeioslave/media/mimetypes/cd-r_encrypted_locked.desktop
index f4f288d1..50a23de7 100644
--- a/tdeioslave/media/mimetypes/cd-r_encrypted_locked.desktop
+++ b/tdeioslave/media/mimetypes/cd-r_encrypted_locked.desktop
@@ -9,4 +9,3 @@ Comment=Encrypted Locked CD-R
Patterns=
X-TDE-AutoEmbed=true
-X-TDE-IsAlso=inode/directory
diff --git a/tdeioslave/media/mimetypes/cd-r_encrypted_unlocked.desktop b/tdeioslave/media/mimetypes/cd-r_encrypted_unlocked.desktop
index 4826eddf..c410a4e4 100644
--- a/tdeioslave/media/mimetypes/cd-r_encrypted_unlocked.desktop
+++ b/tdeioslave/media/mimetypes/cd-r_encrypted_unlocked.desktop
@@ -9,4 +9,3 @@ Comment=Encrypted Unlocked CD-R
Patterns=
X-TDE-AutoEmbed=true
-X-TDE-IsAlso=inode/directory
diff --git a/tdeioslave/media/mimetypes/cd-rw_encrypted_locked.desktop b/tdeioslave/media/mimetypes/cd-rw_encrypted_locked.desktop
index b5d3cabf..5edac87e 100644
--- a/tdeioslave/media/mimetypes/cd-rw_encrypted_locked.desktop
+++ b/tdeioslave/media/mimetypes/cd-rw_encrypted_locked.desktop
@@ -9,4 +9,3 @@ Comment=Encrypted Locked CD-RW
Patterns=
X-TDE-AutoEmbed=true
-X-TDE-IsAlso=inode/directory
diff --git a/tdeioslave/media/mimetypes/cd-rw_encrypted_unlocked.desktop b/tdeioslave/media/mimetypes/cd-rw_encrypted_unlocked.desktop
index c64bb19f..6dd0de84 100644
--- a/tdeioslave/media/mimetypes/cd-rw_encrypted_unlocked.desktop
+++ b/tdeioslave/media/mimetypes/cd-rw_encrypted_unlocked.desktop
@@ -9,4 +9,3 @@ Comment=Encrypted Unlocked CD-RW
Patterns=
X-TDE-AutoEmbed=true
-X-TDE-IsAlso=inode/directory
diff --git a/tdeioslave/media/mimetypes/cdrom_encrypted_locked.desktop b/tdeioslave/media/mimetypes/cdrom_encrypted_locked.desktop
index e5b7e80c..6dc794df 100644
--- a/tdeioslave/media/mimetypes/cdrom_encrypted_locked.desktop
+++ b/tdeioslave/media/mimetypes/cdrom_encrypted_locked.desktop
@@ -9,4 +9,3 @@ Comment=Encrypted Locked CD-ROM
Patterns=
X-TDE-AutoEmbed=true
-X-TDE-IsAlso=inode/directory
diff --git a/tdeioslave/media/mimetypes/cdrom_encrypted_unlocked.desktop b/tdeioslave/media/mimetypes/cdrom_encrypted_unlocked.desktop
index 4731ffe4..011228a8 100644
--- a/tdeioslave/media/mimetypes/cdrom_encrypted_unlocked.desktop
+++ b/tdeioslave/media/mimetypes/cdrom_encrypted_unlocked.desktop
@@ -9,4 +9,3 @@ Comment=Encrypted Unlocked CD-ROM
Patterns=
X-TDE-AutoEmbed=true
-X-TDE-IsAlso=inode/directory
diff --git a/tdeioslave/media/mimetypes/dvd_encrypted_locked.desktop b/tdeioslave/media/mimetypes/dvd_encrypted_locked.desktop
index 0450a29e..d4e3b25b 100644
--- a/tdeioslave/media/mimetypes/dvd_encrypted_locked.desktop
+++ b/tdeioslave/media/mimetypes/dvd_encrypted_locked.desktop
@@ -9,4 +9,3 @@ Comment=Encrypted Locked DVD
Patterns=
X-TDE-AutoEmbed=true
-X-TDE-IsAlso=inode/directory
diff --git a/tdeioslave/media/mimetypes/dvd_encrypted_unlocked.desktop b/tdeioslave/media/mimetypes/dvd_encrypted_unlocked.desktop
index 16e0a86a..a4a66904 100644
--- a/tdeioslave/media/mimetypes/dvd_encrypted_unlocked.desktop
+++ b/tdeioslave/media/mimetypes/dvd_encrypted_unlocked.desktop
@@ -9,4 +9,3 @@ Comment=Encrypted Unlocked DVD
Patterns=
X-TDE-AutoEmbed=true
-X-TDE-IsAlso=inode/directory
diff --git a/tdeioslave/media/mimetypes/hdd_encrypted_locked.desktop b/tdeioslave/media/mimetypes/hdd_encrypted_locked.desktop
index 7de6c35c..d4cc6d26 100644
--- a/tdeioslave/media/mimetypes/hdd_encrypted_locked.desktop
+++ b/tdeioslave/media/mimetypes/hdd_encrypted_locked.desktop
@@ -9,4 +9,3 @@ Comment=Encrypted Locked Hard Disk Volume
Patterns=
X-TDE-AutoEmbed=true
-X-TDE-IsAlso=inode/directory
diff --git a/tdeioslave/media/mimetypes/hdd_encrypted_unlocked.desktop b/tdeioslave/media/mimetypes/hdd_encrypted_unlocked.desktop
index 9e944ef5..7c91927a 100644
--- a/tdeioslave/media/mimetypes/hdd_encrypted_unlocked.desktop
+++ b/tdeioslave/media/mimetypes/hdd_encrypted_unlocked.desktop
@@ -9,4 +9,3 @@ Comment=Encrypted Unlocked Hard Disk Volume
Patterns=
X-TDE-AutoEmbed=true
-X-TDE-IsAlso=inode/directory
diff --git a/tdeioslave/media/mimetypes/removable_encrypted_locked.desktop b/tdeioslave/media/mimetypes/removable_encrypted_locked.desktop
index 66671c16..d97745e1 100644
--- a/tdeioslave/media/mimetypes/removable_encrypted_locked.desktop
+++ b/tdeioslave/media/mimetypes/removable_encrypted_locked.desktop
@@ -9,4 +9,3 @@ Comment=Encrypted Locked Removable Medium
Patterns=
X-TDE-AutoEmbed=true
-X-TDE-IsAlso=inode/directory
diff --git a/tdeioslave/media/mimetypes/removable_encrypted_unlocked.desktop b/tdeioslave/media/mimetypes/removable_encrypted_unlocked.desktop
index 94e81353..fd98df9c 100644
--- a/tdeioslave/media/mimetypes/removable_encrypted_unlocked.desktop
+++ b/tdeioslave/media/mimetypes/removable_encrypted_unlocked.desktop
@@ -9,4 +9,3 @@ Comment=Encrypted Unlocked Removable Medium
Patterns=
X-TDE-AutoEmbed=true
-X-TDE-IsAlso=inode/directory
diff --git a/tdeioslave/media/mounthelper/dialog.cpp b/tdeioslave/media/mounthelper/dialog.cpp
index f2cdb6b5..d16c6d97 100644
--- a/tdeioslave/media/mounthelper/dialog.cpp
+++ b/tdeioslave/media/mounthelper/dialog.cpp
@@ -23,11 +23,10 @@
#include "dialog.h"
Dialog::Dialog(TQString url, TQString iconName) :
- KDialogBase(NULL, "Dialog", true, "Unlock Storage Device", (Cancel|User1), User1, false, KGuiItem(i18n("Unlock"), "unlocked" ))
+ KDialogBase(NULL, "Dialog", true, i18n("Unlock Storage Device"), (Cancel|User1), User1, false, KGuiItem(i18n("Unlock"), "unlocked" ))
{
unlockDialog = new UnlockDialog(this);
- unlockDialog->errorBox->hide();
unlockDialog->descLabel->setText(unlockDialog->descLabel->text().arg(url));
unlockDialog->descLabel->adjustSize();
unlockDialog->adjustSize();
@@ -52,14 +51,6 @@ TQString Dialog::getPassword()
return unlockDialog->passwordEdit->text();
}
-void Dialog::slotDialogError(TQString errorMsg)
-{
- kdDebug() << __func__ << "(" << errorMsg << " )" << endl;
-
- unlockDialog->errorLabel->setText(TQString("<b>%1</b>").arg(errorMsg));
- unlockDialog->errorBox->show();
-}
-
void Dialog::slotPasswordChanged(const TQString &text)
{
enableButton( User1, !text.isEmpty() );
diff --git a/tdeioslave/media/mounthelper/dialog.h b/tdeioslave/media/mounthelper/dialog.h
index 8444ec7d..a80a9c69 100644
--- a/tdeioslave/media/mounthelper/dialog.h
+++ b/tdeioslave/media/mounthelper/dialog.h
@@ -36,8 +36,6 @@
#include "unlockdialog.h"
-class KryptoMedia;
-
class Dialog : public KDialogBase
{
@@ -50,7 +48,6 @@ public:
TQString getPassword();
public slots:
- void slotDialogError(TQString errorMsg);
void slotPasswordChanged(const TQString &text);
private:
diff --git a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp
index 65b53a0f..9d3da6d0 100644
--- a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp
+++ b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp
@@ -25,7 +25,6 @@
#include <kurl.h>
#include <tdemessagebox.h>
#include <dcopclient.h>
-#include <dcopref.h>
#include <tqtimer.h>
#include <stdlib.h>
#include <kdebug.h>
@@ -40,179 +39,146 @@
#include "dialog.h"
#include "tdeio_media_mounthelper.h"
-const Medium MountHelper::findMedium(const KURL &url)
+const Medium MountHelper::findMedium(const TQString &device)
{
- DCOPRef mediamanager("kded", "mediamanager");
-
- // Try filename first
- DCOPReply reply = mediamanager.call( "properties", url.fileName() );
- if ( !reply.isValid() ) {
- m_errorStr = i18n("The TDE mediamanager is not running.")+"\n";
+ DCOPReply reply = m_mediamanager.call("properties", device);
+ if (!reply.isValid())
+ {
+ m_errorStr = i18n("The TDE mediamanager is not running.\n");
return Medium(TQString::null, TQString::null, TQString::null);
}
- const Medium& medium = Medium::create(reply);
- if ( medium.id().isEmpty() ) {
- // Try full URL now
- reply = mediamanager.call( "properties", url.prettyURL() );
- if ( !reply.isValid() ) {
- m_errorStr = i18n("Internal Error");
- return Medium(TQString::null, TQString::null, TQString::null);
- }
- return Medium::create(reply);
- } else {
- return medium;
- }
+ const Medium &medium = Medium::create(reply);
+ return medium;
}
-MountHelper::MountHelper() : TDEApplication()
+void MountHelper::mount(const Medium &medium)
{
- TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
-
- m_errorStr = TQString::null;
-
- KURL url(args->url(0));
- const Medium medium = findMedium(url);
-
- if (medium.id().isEmpty())
- {
- if (m_errorStr.isEmpty()) {
- m_errorStr+= i18n("%1 cannot be found.").arg(url.prettyURL());
- }
- TQTimer::singleShot(0, this, TQT_SLOT(error()) );
- return;
+ if (medium.id().isEmpty()) {
+ m_errorStr = i18n("Try to mount an unknown medium.");
+ errorAndExit();
+ }
+ TQString device = medium.deviceNode();
+ if (!medium.isMountable()) {
+ m_errorStr = i18n("%1 is not a mountable media.").arg(device);
+ errorAndExit();
+ }
+ else if (medium.isMounted()) {
+ m_errorStr = i18n("%1 is already mounted to %2.").arg(device).arg(medium.mountPoint());
+ errorAndExit();
}
- if (!medium.isMountable() && !args->isSet("e") && !args->isSet("s"))
- {
- m_errorStr = i18n("%1 is not a mountable media.").arg(url.prettyURL());
- TQTimer::singleShot(0, this, TQT_SLOT(error()) );
- return;
+ DCOPReply reply = m_mediamanager.call("mount", medium.id());
+ TQStringVariantMap mountResult;
+ if (reply.isValid()) {
+ reply.get(mountResult);
}
+ if (!mountResult.contains("result") || !mountResult["result"].toBool()) {
+ m_errorStr = mountResult.contains("errStr") ? mountResult["errStr"].toString() : i18n("Unknown mount error.");
+ errorAndExit();
+ }
+}
+void MountHelper::unmount(const Medium &medium)
+{
+ if (medium.id().isEmpty()) {
+ m_errorStr = i18n("Try to unmount an unknown medium.");
+ errorAndExit();
+ }
TQString device = medium.deviceNode();
- TQString mount_point = medium.mountPoint();
+ if (!medium.isMountable()) {
+ m_errorStr = i18n("%1 is not a mountable media.").arg(device);
+ errorAndExit();
+ }
+ else if (!medium.isMounted()) {
+ m_errorStr = i18n("%1 is already unmounted.").arg(device);
+ errorAndExit();
+ }
- m_isCdrom = medium.mimeType().find("dvd") != -1 || medium.mimeType().find("cd") != -1;
+ DCOPReply reply = m_mediamanager.call("unmount", medium.id());
+ TQStringVariantMap unmountResult;
+ if (reply.isValid()) {
+ reply.get(unmountResult);
+ }
+ if (!unmountResult.contains("result") || !unmountResult["result"].toBool()) {
+ m_errorStr = unmountResult.contains("errStr") ? unmountResult["errStr"].toString() : i18n("Unknown unmount error.");
+ kdDebug() << "medium unmount " << m_errorStr << endl;
+ errorAndExit();
+ }
+}
- if (args->isSet("d"))
+void MountHelper::unlock(const Medium &medium)
+{
+ if (medium.id().isEmpty()) {
+ m_errorStr = i18n("Try to unlock an unknown medium.");
+ errorAndExit();
+ }
+ TQString device = medium.deviceNode();
+ if (!medium.isEncrypted())
{
- if (!medium.isEncrypted())
- {
- m_errorStr = i18n("%1 is not an encrypted media.").arg(url.prettyURL());
- TQTimer::singleShot(0, this, TQT_SLOT(error()) );
- return;
- }
- if (!medium.needDecryption())
- {
- m_errorStr = i18n("%1 is already unlocked.").arg(url.prettyURL());
- TQTimer::singleShot(0, this, TQT_SLOT(error()));
- return;
- }
-
- TQString iconName = medium.iconName();
- if (iconName.isEmpty())
- {
- TQString mime = medium.mimeType();
- iconName = KMimeType::mimeType(mime)->icon(mime, false);
- }
+ m_errorStr = i18n("%1 is not an encrypted media.").arg(device);
+ errorAndExit();
+ }
+ if (!medium.needUnlocking())
+ {
+ m_errorStr = i18n("%1 is already unlocked.").arg(device);
+ errorAndExit();
+ }
- m_mediumId = medium.id();
- dialog = new Dialog(url.prettyURL(), iconName);
- dialog->show();
+ TQString iconName = medium.iconName();
+ if (iconName.isEmpty())
+ {
+ TQString mime = medium.mimeType();
+ iconName = KMimeType::mimeType(mime)->icon(mime, false);
+ }
+ m_mediumId = medium.id();
+ m_dialog = new Dialog(device, iconName);
+ connect(m_dialog, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotSendPassword()));
+ connect(m_dialog, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(slotCancel()));
+ m_dialog->show();
+}
- connect(dialog, TQT_SIGNAL (user1Clicked()), this, TQT_SLOT (slotSendPassword()));
- connect(dialog, TQT_SIGNAL (cancelClicked()), this, TQT_SLOT (slotCancel()));
- connect(this, TQT_SIGNAL (signalPasswordError(TQString)), dialog, TQT_SLOT (slotDialogError(TQString)));
+void MountHelper::lock(const Medium &medium)
+{
+ if (medium.id().isEmpty())
+ {
+ m_errorStr = i18n("Try to lock an unknown medium.");
+ errorAndExit();
}
- else if (args->isSet("u"))
+ TQString device = medium.deviceNode();
+ if (!medium.isEncrypted())
{
- DCOPRef mediamanager("kded", "mediamanager");
- DCOPReply reply = mediamanager.call("unmount", medium.id());
- TQStringVariantMap unmountResult;
- if (reply.isValid()) {
- reply.get(unmountResult);
- }
- if (unmountResult.contains("result") && unmountResult["result"].toBool()) {
- ::exit(0);
- }
- else {
- m_errorStr = unmountResult.contains("errStr") ? unmountResult["errStr"].toString() : i18n("Unknown unmount error.");
- kdDebug() << "medium unmount " << m_errorStr << endl;
- error();
- }
- }
- else if (args->isSet("s") || args->isSet("e"))
+ m_errorStr = i18n("%1 is not an encrypted media.").arg(device);
+ errorAndExit();
+ }
+ if (medium.needUnlocking())
{
- DCOPRef mediamanager("kded", "mediamanager");
-
- /*
- * We want to call mediamanager unmount before invoking eject. That's
- * because unmount would provide an informative error message in case of
- * failure. However, there are cases when unmount would fail
- * (supermount, slackware, see bug#116209) but eject would succeed.
- * Thus if unmount fails, save unmount error message and invokeEject()
- * anyway. Only if both unmount and eject fail, notify the user by
- * displaying the saved error message (see ejectFinished()).
- */
- TQStringVariantMap unmountResult;
- if (medium.isMounted())
- {
- DCOPReply reply = mediamanager.call( "unmount", medium.id());
- if (reply.isValid()) {
- reply.get(unmountResult);
- if (unmountResult["result"].toBool()) {
- reply.get(m_errorStr);
- }
- }
- }
+ m_errorStr = i18n("%1 is already locked.").arg(device);
+ errorAndExit();
+ }
- // If this is an unlocked encrypted volume and there is no error yet, we try to lock it
- if (unmountResult.contains("result") && unmountResult["result"].toBool() &&
- medium.isEncrypted() && !medium.clearDeviceUdi().isNull())
- {
- DCOPReply reply = mediamanager.call( "undecrypt", medium.id());
- if (reply.isValid()) {
- TQStringVariantMap undecryptResult;
- reply.get(undecryptResult);
- if (undecryptResult["result"].toBool()) {
- reply.get(m_errorStr);
- }
- }
- }
+ // Release children devices
+ releaseHolders(medium);
- if (m_errorStr.isNull()) {
- invokeEject(device, true);
- }
- else {
- error();
- }
+ DCOPReply reply = m_mediamanager.call("lock", medium.id());
+ TQStringVariantMap lockResult;
+ if (reply.isValid()) {
+ reply.get(lockResult);
}
- else
- {
- DCOPRef mediamanager("kded", "mediamanager");
- DCOPReply reply = mediamanager.call("mount", medium.id());
- TQStringVariantMap mountResult;
- if (reply.isValid()) {
- reply.get(mountResult);
- }
- if (mountResult.contains("result") && mountResult["result"].toBool()) {
- ::exit(0);
- }
- else {
- m_errorStr = mountResult.contains("errStr") ? mountResult["errStr"].toString() : i18n("Unknown mount error.");
- error();
- }
+ if (!lockResult.contains("result") || !lockResult["result"].toBool()) {
+ m_errorStr = lockResult.contains("errStr") ? lockResult["errStr"].toString() : i18n("Unknown lock error.");
+ kdDebug() << "medium lock " << m_errorStr << endl;
+ errorAndExit();
}
}
-void MountHelper::invokeEject(const TQString &device, bool quiet)
+void MountHelper::eject(const TQString &device, bool quiet)
{
#ifdef __TDE_HAVE_TDEHWLIB
// Try TDE HW library eject first...
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
TDEGenericDevice *hwdevice = hwdevices->findByDeviceNode(device);
if (hwdevice->type() == TDEGenericDeviceType::Disk) {
- TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(hwdevice);
+ TDEStorageDevice *sdevice = static_cast<TDEStorageDevice*>(hwdevice);
if (sdevice->ejectDrive()) {
// Success!
::exit(0);
@@ -220,7 +186,7 @@ void MountHelper::invokeEject(const TQString &device, bool quiet)
}
#endif
- // Then fall back to tdeeject if needed
+ // Otherwise fall back to tdeeject
TDEProcess *proc = new TDEProcess(TQT_TQOBJECT(this));
*proc << "tdeeject";
if (quiet)
@@ -228,28 +194,175 @@ void MountHelper::invokeEject(const TQString &device, bool quiet)
*proc << "-q";
}
*proc << device;
- connect( proc, TQT_SIGNAL(processExited(TDEProcess *)),
- this, TQT_SLOT( ejectFinished(TDEProcess *) ) );
+ connect(proc, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(ejectFinished(TDEProcess*)));
proc->start();
}
-void MountHelper::ejectFinished(TDEProcess* proc)
+void MountHelper::releaseHolders(const Medium &medium, bool handleThis)
+{
+#ifdef __TDE_HAVE_TDEHWLIB
+ if (medium.id().isEmpty())
+ {
+ m_errorStr = i18n("Try to release holders from an unknown medium.");
+ return;
+ }
+
+ // Scan the holding devices and unmount/lock them if possible
+ TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
+ TDEStorageDevice *sdevice = hwdevices->findDiskByUID(medium.id());
+ if (sdevice)
+ {
+ TQStringList holdingDeviceList = sdevice->holdingDevices();
+ for (TQStringList::Iterator holdingDevIt = holdingDeviceList.begin(); holdingDevIt != holdingDeviceList.end(); ++holdingDevIt)
+ {
+ TDEGenericDevice *hwHolderDevice = hwdevices->findBySystemPath(*holdingDevIt);
+ if (hwHolderDevice->type() == TDEGenericDeviceType::Disk)
+ {
+ TDEStorageDevice *holderSDevice = static_cast<TDEStorageDevice*>(hwHolderDevice);
+ const Medium holderMedium = findMedium(holderSDevice->deviceNode());
+ if (!holderMedium.id().isEmpty())
+ {
+ releaseHolders(holderMedium, true);
+ }
+ }
+ }
+ }
+
+ if (handleThis)
+ {
+ // Unmount if necessary
+ if (medium.isMountable() && medium.isMounted())
+ {
+ unmount(medium);
+ }
+ // Lock if necessary.
+ if (medium.isEncrypted() && !medium.isLocked())
+ {
+ lock(medium);
+ }
+ }
+#endif
+}
+
+void MountHelper::safeRemoval(const Medium &medium)
{
/*
- * If eject failed, report the error stored in m_errorStr
+ * Safely remove will performs the following tasks:
+ * 1) release children devices (if tdehw is available)
+ * 2) if the medium is mounted, unmount it
+ * 3) if the medium is encrypted and unlocked, lock it
+ * 4) invoke eject to release the medium.
+ * If any of the above steps fails, the procedure will interrupt and an
+ * error message will be displayed to the user.
+ *
+ * Note: previously eject was invoked also in case of unmount failure. This
+ * could lead to data loss and therefore the behaviour has been changed.
+ * If a user really wants to eject the medium, he needs to either unmount it
+ * first or invoke eject manually.
*/
+ if (medium.id().isEmpty())
+ {
+ m_errorStr = i18n("Try to safe remove an unknown medium.");
+ errorAndExit();
+ }
+
+ // Release children devices
+ releaseHolders(medium);
+
+ TQStringVariantMap opResult;
+ TQString device = medium.deviceNode();
+
+ // Unmount if necessary
+ if (medium.isMountable() && medium.isMounted())
+ {
+ unmount(medium);
+ }
+ // Lock if necessary.
+ if (medium.isEncrypted() && !medium.isLocked())
+ {
+ lock(medium);
+ }
+}
+
+MountHelper::MountHelper() : TDEApplication(), m_mediamanager("kded", "mediamanager")
+{
+ TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
+ m_errorStr = TQString::null;
+
+ const Medium medium = findMedium(args->arg(0));
+ if (medium.id().isEmpty())
+ {
+ if (m_errorStr.isEmpty()) {
+ m_errorStr+= i18n("%1 cannot be found.").arg(args->arg(0));
+ }
+ errorAndExit();
+ }
+
+ TQString device = medium.deviceNode();
+ if (!medium.isMountable() && !medium.isEncrypted() && !args->isSet("e") && !args->isSet("s"))
+ {
+ m_errorStr = i18n("%1 is not a mountable or encrypted media.").arg(device);
+ errorAndExit();
+ }
+
+ if (args->isSet("m"))
+ {
+ mount(medium);
+ ::exit(0);
+ }
+ else if (args->isSet("u"))
+ {
+ unmount(medium);
+ ::exit(0);
+ }
+ else if (args->isSet("k"))
+ {
+ unlock(medium);
+ // No call to ::exit() here because this will open up the password dialog
+ // ::exit() is handled in the invoked code.
+ }
+ else if (args->isSet("l"))
+ {
+ lock(medium);
+ ::exit(0);
+ }
+ else if (args->isSet("e"))
+ {
+ eject(device, true);
+ ::exit(0);
+ }
+ else if (args->isSet("s"))
+ {
+ safeRemoval(medium);
+ eject(device, true);
+ ::exit(0);
+ }
+ else
+ {
+ TDECmdLineArgs::usage();
+ ::exit(0);
+ }
+}
+
+MountHelper::~MountHelper()
+{
+ if (m_dialog)
+ {
+ delete m_dialog;
+ }
+}
+
+void MountHelper::ejectFinished(TDEProcess *proc)
+{
+ //If eject failed, report the error stored in m_errorStr
if (proc->normalExit() && proc->exitStatus() == 0) {
::exit(0);
- } else {
- if (m_errorStr.isEmpty()) {
- if (m_isCdrom)
- m_errorStr = i18n("The device was successfully unmounted, but the tray could not be opened");
- else
- m_errorStr = i18n("The device was successfully unmounted, but could not be ejected");
+ }
+ else {
+ if (!m_errorStr.isEmpty()) {
+ errorAndExit();
}
-//X Comment this because the error is useless as long as the unmount is successful.
-//X TQTimer::singleShot(0, this, TQT_SLOT(error()));
- ::exit(0);
+ ::exit(0);
}
}
@@ -262,25 +375,27 @@ void MountHelper::error()
}
}
KMessageBox::error(0, prettyErrorString);
+}
+
+void MountHelper::errorAndExit()
+{
+ error();
::exit(1);
}
void MountHelper::slotSendPassword()
{
- DCOPRef mediamanager("kded", "mediamanager");
-
- DCOPReply reply = mediamanager.call( "decrypt", m_mediumId, dialog->getPassword() );
- TQStringVariantMap decryptResult;
+ DCOPReply reply = m_mediamanager.call("unlock", m_mediumId, m_dialog->getPassword());
+ TQStringVariantMap unlockResult;
if (reply.isValid()) {
- reply.get(decryptResult);
+ reply.get(unlockResult);
}
- if (decryptResult.contains("result") && decryptResult["result"].toBool()) {
+ if (unlockResult.contains("result") && unlockResult["result"].toBool()) {
::exit(0);
}
else {
- m_errorStr = decryptResult.contains("errStr") ? decryptResult["errStr"].toString() : i18n("Unknown decrypt error.");
- kdDebug() << "medium decrypt " << m_errorStr << endl;
- emit signalPasswordError(m_errorStr);
+ m_errorStr = unlockResult.contains("errStr") ? unlockResult["errStr"].toString() : i18n("Unknown unlock error.");
+ kdDebug() << "medium unlock " << m_errorStr << endl;
error();
}
}
@@ -292,12 +407,13 @@ void MountHelper::slotCancel()
static TDECmdLineOptions options[] =
{
- { "d", I18N_NOOP("Decrypt given URL"), 0 },
+ { "m", I18N_NOOP("Mount given URL"), 0 },
{ "u", I18N_NOOP("Unmount given URL"), 0 },
- { "m", I18N_NOOP("Mount given URL (default)"), 0 },
- { "e", I18N_NOOP("Eject given URL via tdeeject"), 0},
- { "s", I18N_NOOP("Unmount and Eject given URL (necessary for some USB devices)"), 0},
- {"!+URL", I18N_NOOP("media:/ URL to mount/unmount/eject/remove"), 0 },
+ { "k", I18N_NOOP("Unlock given URL"), 0 },
+ { "l", I18N_NOOP("Lock given URL"), 0 },
+ { "e", I18N_NOOP("Eject given URL"), 0},
+ { "s", I18N_NOOP("Safely remove (unmount and eject) given URL"), 0},
+ {"!+URL", I18N_NOOP("media:/URL to mount/unmount/unlock/lock/eject/remove"), 0 },
TDECmdLineLastOption
};
@@ -308,13 +424,15 @@ int main(int argc, char **argv)
"tdeio_media_mounthelper", "tdeio_media_mounthelper",
"0.1");
- TDECmdLineArgs::addCmdLineOptions( options );
+ TDECmdLineArgs::addCmdLineOptions(options);
TDEGlobal::locale()->setMainCatalogue("tdeio_media");
TDEApplication::addCmdLineOptions();
+ if (TDECmdLineArgs::parsedArgs()->count()==0)
+ {
+ TDECmdLineArgs::usage();
+ }
- if (TDECmdLineArgs::parsedArgs()->count()==0) TDECmdLineArgs::usage();
- TDEApplication *app = new MountHelper();
-
+ TDEApplication *app = new MountHelper();
TDEStartupInfo::appStarted();
app->dcopClient()->attach();
return app->exec();
diff --git a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.h b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.h
index 97df6b7e..59dba6e5 100644
--- a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.h
+++ b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.h
@@ -1,5 +1,5 @@
/* This file is part of the KDE project
- Copyright (c) 2004 Kvin Ottens <ervin ipsquad net>
+ Copyright (c) 2004 Kévin Ottens <ervin ipsquad net>
Parts of this file are
Copyright 2003 Waldo Bastian <bastian@kde.org>
@@ -25,33 +25,43 @@
#include <tdeapplication.h>
#include <tqstring.h>
#include <tdeio/job.h>
+#include <dcopref.h>
#include "medium.h"
class Dialog;
+class TDEProcess;
class MountHelper : public TDEApplication
{
- Q_OBJECT
+ Q_OBJECT
+
public:
MountHelper();
+ ~MountHelper();
private:
- const Medium findMedium(const KURL &url);
- void invokeEject(const TQString &device, bool quiet=false);
TQString m_errorStr;
- bool m_isCdrom;
TQString m_mediumId;
- Dialog *dialog;
+ Dialog *m_dialog;
+ DCOPRef m_mediamanager;
+
+ const Medium findMedium(const TQString &device);
+ void error();
+
+ void mount(const Medium &medium);
+ void unmount(const Medium &medium);
+ void unlock(const Medium &medium);
+ void lock(const Medium &medium);
+ void eject(const TQString &device, bool quiet=false);
+ void safeRemoval(const Medium &medium);
+ void releaseHolders(const Medium &medium, bool handleThis = false);
private slots:
void slotSendPassword();
void slotCancel();
void ejectFinished(TDEProcess* proc);
- void error();
-
-signals:
- void signalPasswordError(TQString errorMsg);
+ void errorAndExit();
};
#endif
diff --git a/tdeioslave/media/mounthelper/unlockdialog.ui b/tdeioslave/media/mounthelper/unlockdialog.ui
index 99a46a9a..7b78cdb4 100644
--- a/tdeioslave/media/mounthelper/unlockdialog.ui
+++ b/tdeioslave/media/mounthelper/unlockdialog.ui
@@ -107,7 +107,7 @@
</property>
<property name="text">
<string>&lt;p&gt;&lt;b&gt;%1&lt;/b&gt; is an encrypted storage device.&lt;/p&gt;
-&lt;p&gt;Please enter the password to decrypt the storage device.&lt;/p&gt;</string>
+&lt;p&gt;Please enter the password to unlock the storage device.&lt;/p&gt;</string>
</property>
<property name="alignment">
<set>WordBreak|AlignTop</set>
@@ -155,46 +155,6 @@
</widget>
</hbox>
</widget>
- <widget class="TQGroupBox" row="2" column="0">
- <property name="name">
- <cstring>errorBox</cstring>
- </property>
- <property name="sizePolicy">
- <sizepolicy>
- <hsizetype>3</hsizetype>
- <vsizetype>3</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="title">
- <string>Error</string>
- </property>
- <grid>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
- <widget class="TQLabel" row="0" column="0">
- <property name="name">
- <cstring>errorLabel</cstring>
- </property>
- <property name="sizePolicy">
- <sizepolicy>
- <hsizetype>3</hsizetype>
- <vsizetype>3</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string></string>
- </property>
- <property name="alignment">
- <set>WordBreak|AlignTop</set>
- </property>
- </widget>
- </grid>
- </widget>
</grid>
</widget>
<layoutdefaults spacing="6" margin="11"/>
diff --git a/tdeioslave/media/services/CMakeLists.txt b/tdeioslave/media/services/CMakeLists.txt
index b550409b..9b66bd7a 100644
--- a/tdeioslave/media/services/CMakeLists.txt
+++ b/tdeioslave/media/services/CMakeLists.txt
@@ -13,7 +13,8 @@
tde_create_translated_desktop(
SOURCE
- media_decrypt.desktop media_mount.desktop media_unmount.desktop
+ media_mount.desktop media_unmount.desktop
+ media_unlock.desktop media_lock.desktop
media_eject.desktop media_safelyremove.desktop
DESTINATION ${DATA_INSTALL_DIR}/konqueror/servicemenus
PO_DIR tdeioslave-desktops
diff --git a/tdeioslave/media/services/Makefile.am b/tdeioslave/media/services/Makefile.am
index c744934f..5dc9155c 100644
--- a/tdeioslave/media/services/Makefile.am
+++ b/tdeioslave/media/services/Makefile.am
@@ -1,3 +1,3 @@
servicesdir = $(kde_datadir)/konqueror/servicemenus
-services_DATA = media_decrypt.desktop media_mount.desktop media_unmount.desktop media_eject.desktop media_safelyremove.desktop
+services_DATA = media_mount.desktop media_unmount.desktop media_unlock.desktop media_lock.desktop media_eject.desktop media_safelyremove.desktop
diff --git a/tdeioslave/media/services/media_decrypt.desktop b/tdeioslave/media/services/media_decrypt.desktop
deleted file mode 100644
index ee48f2e6..00000000
--- a/tdeioslave/media/services/media_decrypt.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-X-TDE-ServiceTypes=media/removable_encrypted_locked,media/hdd_encrypted_locked,media/bluray_encrypted_locked,media/cdrom_encrypted_locked,media/cd-r_encrypted_locked,media/cd-rw_encrypted_locked,media/dvd_encrypted_locked
-Actions=MediaUnlock;
-X-TDE-Priority=TopLevel
-X-TDE-MediaNotifierHide=true
-
-[Desktop Action MediaUnlock]
-Name=Unlock
-
-Exec=tdeio_media_mounthelper -k %u
-Icon=decrypted
diff --git a/tdeioslave/media/services/media_eject.desktop b/tdeioslave/media/services/media_eject.desktop
index ad289fd3..0bb12865 100644
--- a/tdeioslave/media/services/media_eject.desktop
+++ b/tdeioslave/media/services/media_eject.desktop
@@ -1,10 +1,10 @@
[Desktop Entry]
-X-TDE-ServiceTypes=media/bluray_mounted,media/bluray_unmounted,media/bluray_encrypted_unlocked,media/bluray_encrypted_locked,media/cdrom_mounted,media/cdrom_unmounted,media/cdrom_encrypted_unlocked,media/cdrom_encrypted_locked,media/cd-r_mounted,media/cd-r_unmounted,media/cd-r_encrypted_unlocked,media/cd-r_encrypted_locked,media/cd-rw_mounted,media/cd-rw_unmounted,media/cd-rw_encrypted_unlocked,media/cd-rw_encrypted_locked,media/dvd_mounted,media/dvd_unmounted,media/dvd_encrypted_unlocked,media/dvd_encrypted_locked,media/audiocd,media/blankbluray,media/blankcd,media/blankdvd,media/blurayvideo,media/dvdvideo,media/svcd,media/vcd
+X-TDE-ServiceTypes=media/bluray_mounted,media/bluray_unmounted,media/bluray_encrypted_locked,media/bluray_encrypted_unlocked,media/cdrom_mounted,media/cdrom_unmounted,media/cdrom_encrypted_locked,media/cdrom_encrypted_unlocked,media/cd-r_mounted,media/cd-r_unmounted,media/cd-r_encrypted_locked,media/cd-r_encrypted_unlocked,media/cd-rw_mounted,media/cd-rw_unmounted,media/cd-rw_encrypted_locked,media/cd-rw_encrypted_unlocked,media/dvd_mounted,media/dvd_unmounted,media/dvd_encrypted_locked,media/dvd_encrypted_unlocked,media/audiocd,media/blankbluray,media/blankcd,media/blankdvd,media/dvdvideo,media/svcd,media/vcd
Actions=MediaEject;
X-TDE-Priority=TopLevel
X-TDE-MediaNotifierHide=true
[Desktop Action MediaEject]
-Name=Eject
-
Exec=tdeio_media_mounthelper -e %u
+Icon=player_eject
+Name=Eject
diff --git a/tdeioslave/media/services/media_lock.desktop b/tdeioslave/media/services/media_lock.desktop
new file mode 100644
index 00000000..d5756531
--- /dev/null
+++ b/tdeioslave/media/services/media_lock.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+X-TDE-ServiceTypes=media/bluray_encrypted_unlocked,media/cdrom_encrypted_unlocked,media/cd-r_encrypted_unlocked,media/cd-rw_encrypted_unlocked,media/dvd_encrypted_unlocked,media/hdd_encrypted_unlocked,media/removable_encrypted_unlocked
+Actions=MediaLock;
+X-TDE-Priority=TopLevel
+X-TDE-MediaNotifierHide=true
+
+[Desktop Action MediaLock]
+Exec=tdeio_media_mounthelper -l %u
+Icon=encrypted
+Name=Lock
diff --git a/tdeioslave/media/services/media_mount.desktop b/tdeioslave/media/services/media_mount.desktop
index d0f164bb..d6fe01dc 100644
--- a/tdeioslave/media/services/media_mount.desktop
+++ b/tdeioslave/media/services/media_mount.desktop
@@ -1,10 +1,10 @@
[Desktop Entry]
-X-TDE-ServiceTypes=media/bluray_unmounted,media/bluray_encrypted_unlocked,media/cdrom_unmounted,media/cdrom_encrypted_unlocked,media/cd-r_unmounted,media/cd-r_encrypted_unlocked,media/cd-rw_unmounted,media/cd-rw_encrypted_unlocked,media/dvd_unmounted,media/dvd_encrypted_unlocked,media/floppy5_unmounted,media/floppy_unmounted,media/hdd_unmounted,media/hdd_encrypted_unlocked,media/nfs_unmounted,media/removable_unmounted,media/removable_encrypted_unlocked,media/smb_unmounted,media/zip_unmounted,media/camera_unmounted
+X-TDE-ServiceTypes=media/bluray_unmounted,media/camera_unmounted,media/cdrom_unmounted,media/cd-r_unmounted,media/cd-rw_unmounted,media/dvd_unmounted,media/floppy5_unmounted,media/floppy_unmounted,media/hdd_unmounted,media/nfs_unmounted,media/removable_unmounted,media/smb_unmounted,media/zip_unmounted,media/audiocd,media/blurayvideo,media/dvdvideo,media/svcd,media/vcd
Actions=MediaMount;
X-TDE-Priority=TopLevel
X-TDE-MediaNotifierHide=true
[Desktop Action MediaMount]
-Name=Mount
-
Exec=tdeio_media_mounthelper -m %u
+Icon=drive-harddisk-mounted
+Name=Mount
diff --git a/tdeioslave/media/services/media_safelyremove.desktop b/tdeioslave/media/services/media_safelyremove.desktop
index 5abfdcd8..cf7191c8 100644
--- a/tdeioslave/media/services/media_safelyremove.desktop
+++ b/tdeioslave/media/services/media_safelyremove.desktop
@@ -1,10 +1,10 @@
[Desktop Entry]
-X-TDE-ServiceTypes=media/removable_mounted,media/removable_unmounted,media/removable_encrypted_unlocked,media/camera_mounted,media/camera_unmounted
+X-TDE-ServiceTypes=media/bluray_mounted,media/bluray_unmounted,media/bluray_encrypted_locked,media/bluray_encrypted_unlocked,media/cdrom_mounted,media/cdrom_unmounted,media/cdrom_encrypted_locked,media/cdrom_encrypted_unlocked,media/cd-r_mounted,media/cd-r_unmounted,media/cd-r_encrypted_locked,media/cd-r_encrypted_unlocked,media/cd-rw_mounted,media/cd-rw_unmounted,media/cd-rw_encrypted_locked,media/cd-rw_encrypted_unlocked,media/dvd_mounted,media/dvd_unmounted,media/dvd_encrypted_locked,media/dvd_encrypted_unlocked,media/audiocd,media/blankbluray,media/blankcd,media/blankdvd,media/dvdvideo,media/svcd,media/vcd,media/camera_mounted,media/camera_unmounted,media/removable_mounted,media/removable_unmounted,media/removable_encrypted_locked,media/removable_encrypted_unlocked
Actions=MediaSafelyRemove;
X-TDE-Priority=TopLevel
X-TDE-MediaNotifierHide=true
[Desktop Action MediaSafelyRemove]
-Name=Safely Remove
-
Exec=tdeio_media_mounthelper -s %u
+Icon=player_safe_removal
+Name=Safely Remove
diff --git a/tdeioslave/media/services/media_unlock.desktop b/tdeioslave/media/services/media_unlock.desktop
new file mode 100644
index 00000000..85b25199
--- /dev/null
+++ b/tdeioslave/media/services/media_unlock.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+X-TDE-ServiceTypes=media/bluray_encrypted_locked,media/cdrom_encrypted_locked,media/cd-r_encrypted_locked,media/cd-rw_encrypted_locked,media/dvd_encrypted_locked,media/hdd_encrypted_locked,media/removable_encrypted_locked
+Actions=MediaLock;
+Actions=MediaUnlock;
+X-TDE-Priority=TopLevel
+X-TDE-MediaNotifierHide=true
+
+[Desktop Action MediaUnlock]
+Exec=tdeio_media_mounthelper -k %u
+Icon=decrypted
+Name=Unlock
diff --git a/tdeioslave/media/services/media_unmount.desktop b/tdeioslave/media/services/media_unmount.desktop
index 32bd5840..38370dd2 100644
--- a/tdeioslave/media/services/media_unmount.desktop
+++ b/tdeioslave/media/services/media_unmount.desktop
@@ -1,10 +1,10 @@
[Desktop Entry]
-X-TDE-ServiceTypes=media/removable_mounted,media/bluray_mounted,media/cdrom_mounted,media/cd-r_mounted,media/cd-rw_mounted,media/dvd_mounted,media/floppy5_mounted,media/floppy_mounted,media/hdd_mounted,media/nfs_mounted,media/smb_mounted,media/zip_mounted,media/blurayvideo,media/dvdvideo,media/svcd,media/vcd,media/camera_mounted
+X-TDE-ServiceTypes=media/bluray_mounted,media/camera_mounted,media/cdrom_mounted,media/cd-r_mounted,media/cd-rw_mounted,media/dvd_mounted,media/floppy5_mounted,media/floppy_mounted,media/hdd_mounted,media/nfs_mounted,media/removable_mounted,media/smb_mounted,media/zip_mounted,media/audiocd,media/blurayvideo,media/dvdvideo,media/svcd,media/vcd
Actions=MediaUnmount;
X-TDE-Priority=TopLevel
X-TDE-MediaNotifierHide=true
[Desktop Action MediaUnmount]
-Name=Unmount
-
Exec=tdeio_media_mounthelper -u %u
+Icon=drive-harddisk-unmounted
+Name=Unmount
diff --git a/tdeioslave/settings/tdeio_settings.cc b/tdeioslave/settings/tdeio_settings.cc
index db797fab..5d1e67a0 100644
--- a/tdeioslave/settings/tdeio_settings.cc
+++ b/tdeioslave/settings/tdeio_settings.cc
@@ -294,5 +294,3 @@ void SettingsProtocol::listDir(const KURL& url)
listEntry(entry, true);
finished();
}
-
-// vim: ts=4 sw=4 et
diff --git a/tdeioslave/sftp/process.cpp b/tdeioslave/sftp/process.cpp
index bcb686df..16412149 100644
--- a/tdeioslave/sftp/process.cpp
+++ b/tdeioslave/sftp/process.cpp
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
*
*
* This file is part of the KDE project, module tdesu.
diff --git a/tdeioslave/sftp/process.h b/tdeioslave/sftp/process.h
index 215c51ea..ca154f45 100644
--- a/tdeioslave/sftp/process.h
+++ b/tdeioslave/sftp/process.h
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
*
*
* This file is part of the KDE project, module tdesu.
diff --git a/tdeioslave/sftp/sftpfileattr.cpp b/tdeioslave/sftp/sftpfileattr.cpp
index 4c25909d..ddd94bbe 100644
--- a/tdeioslave/sftp/sftpfileattr.cpp
+++ b/tdeioslave/sftp/sftpfileattr.cpp
@@ -343,4 +343,3 @@ void sftpFileAttr::setEncoding( KRemoteEncoding* encoding )
{
mEncoding = encoding;
}
-// vim:ts=4:sw=4
diff --git a/tdeioslave/smtp/capabilities.cc b/tdeioslave/smtp/capabilities.cc
index f4f20fa7..f56d7739 100644
--- a/tdeioslave/smtp/capabilities.cc
+++ b/tdeioslave/smtp/capabilities.cc
@@ -1,4 +1,4 @@
-/* -*- c++ -*-
+/*
capabilities.cc
This file is part of tdeio_smtp, the KDE SMTP tdeioslave.
diff --git a/tdeioslave/smtp/capabilities.h b/tdeioslave/smtp/capabilities.h
index 1af13e36..eef6cc91 100644
--- a/tdeioslave/smtp/capabilities.h
+++ b/tdeioslave/smtp/capabilities.h
@@ -1,4 +1,4 @@
-/* -*- c++ -*-
+/*
capabilities.h
This file is part of tdeio_smtp, the KDE SMTP tdeioslave.
diff --git a/tdeioslave/smtp/command.cc b/tdeioslave/smtp/command.cc
index 41bd8d58..4d58a152 100644
--- a/tdeioslave/smtp/command.cc
+++ b/tdeioslave/smtp/command.cc
@@ -1,4 +1,4 @@
-/* -*- c++ -*-
+/*
command.cc
This file is part of tdeio_smtp, the KDE SMTP tdeioslave.
diff --git a/tdeioslave/smtp/command.h b/tdeioslave/smtp/command.h
index c634d1a8..1f20be0e 100644
--- a/tdeioslave/smtp/command.h
+++ b/tdeioslave/smtp/command.h
@@ -1,4 +1,4 @@
-/* -*- c++ -*-
+/*
command.h
This file is part of tdeio_smtp, the KDE SMTP tdeioslave.
diff --git a/tdeioslave/smtp/interactivesmtpserver.cc b/tdeioslave/smtp/interactivesmtpserver.cc
index 5f25ca1c..337299d2 100644
--- a/tdeioslave/smtp/interactivesmtpserver.cc
+++ b/tdeioslave/smtp/interactivesmtpserver.cc
@@ -1,4 +1,4 @@
-/* -*- c++ -*-
+/*
interactivesmtpserver.cc
Code based on the serverSocket example by Jesper Pedersen.
diff --git a/tdeioslave/smtp/interactivesmtpserver.h b/tdeioslave/smtp/interactivesmtpserver.h
index b4731d44..62eb9a7a 100644
--- a/tdeioslave/smtp/interactivesmtpserver.h
+++ b/tdeioslave/smtp/interactivesmtpserver.h
@@ -1,7 +1,6 @@
#ifndef INTERACTIVESMTPSERVER_H
#define INTERACTIVESMTPSERVER_H
-
-/* -*- c++ -*-
+/*
interactivesmtpserver.h
Code based on the serverSocket example by Jesper Pedersen.
diff --git a/tdeioslave/smtp/request.cc b/tdeioslave/smtp/request.cc
index 4e3cde0e..4e4e2bf8 100644
--- a/tdeioslave/smtp/request.cc
+++ b/tdeioslave/smtp/request.cc
@@ -1,4 +1,4 @@
-/* -*- c++ -*-
+/*
request.cc
This file is part of tdeio_smtp, the KDE SMTP tdeioslave.
diff --git a/tdeioslave/smtp/request.h b/tdeioslave/smtp/request.h
index 37d74d2d..a007e3ab 100644
--- a/tdeioslave/smtp/request.h
+++ b/tdeioslave/smtp/request.h
@@ -1,4 +1,4 @@
-/* -*- c++ -*-
+/*
request.h
This file is part of tdeio_smtp, the KDE SMTP tdeioslave.
diff --git a/tdeioslave/smtp/response.cc b/tdeioslave/smtp/response.cc
index b630051d..3ae5d8aa 100644
--- a/tdeioslave/smtp/response.cc
+++ b/tdeioslave/smtp/response.cc
@@ -1,4 +1,4 @@
-/* -*- c++ -*-
+/*
response.cc
This file is part of tdeio_smtp, the KDE SMTP tdeioslave.
diff --git a/tdeioslave/smtp/response.h b/tdeioslave/smtp/response.h
index 97220661..e65406ae 100644
--- a/tdeioslave/smtp/response.h
+++ b/tdeioslave/smtp/response.h
@@ -1,4 +1,4 @@
-/* -*- c++ -*-
+/*
response.h
This file is part of tdeio_smtp, the KDE SMTP tdeioslave.
diff --git a/tdeioslave/smtp/smtp.h b/tdeioslave/smtp/smtp.h
index e9d9b833..853ff3ec 100644
--- a/tdeioslave/smtp/smtp.h
+++ b/tdeioslave/smtp/smtp.h
@@ -1,4 +1,4 @@
-/* -*- c++ -*-
+/*
* Copyright (c) 2000, 2001 Alex Zepeda <zipzippy@sonic.net>
* Copyright (c) 2001 Michael H�ckel <Michael@Haeckel.Net>
* All rights reserved.
diff --git a/tdeioslave/smtp/transactionstate.cc b/tdeioslave/smtp/transactionstate.cc
index 58e5adf5..c33d6b63 100644
--- a/tdeioslave/smtp/transactionstate.cc
+++ b/tdeioslave/smtp/transactionstate.cc
@@ -1,4 +1,4 @@
-/* -*- c++ -*-
+/*
transactionstate.cc
This file is part of tdeio_smtp, the KDE SMTP tdeioslave.
diff --git a/tdeioslave/smtp/transactionstate.h b/tdeioslave/smtp/transactionstate.h
index ec39e3ac..bf8a2a3b 100644
--- a/tdeioslave/smtp/transactionstate.h
+++ b/tdeioslave/smtp/transactionstate.h
@@ -1,4 +1,4 @@
-/* -*- c++ -*-
+/*
transactionstate.h
This file is part of tdeio_smtp, the KDE SMTP tdeioslave.
diff --git a/tdeioslave/tar/tar.cc b/tdeioslave/tar/tar.cc
index 6d71d8b2..b7ba7068 100644
--- a/tdeioslave/tar/tar.cc
+++ b/tdeioslave/tar/tar.cc
@@ -619,5 +619,3 @@ debug("void TARProtocol::filterData");
}
}
*/
-
-// kate: space-indent on; indent-width 4; replace-tabs on;
diff --git a/tdepasswd/passwd.cpp b/tdepasswd/passwd.cpp
index ab0e913a..3db14efb 100644
--- a/tdepasswd/passwd.cpp
+++ b/tdepasswd/passwd.cpp
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
*
* $Id$
*
diff --git a/tdepasswd/passwd.h b/tdepasswd/passwd.h
index 83bde9a8..80c8fb35 100644
--- a/tdepasswd/passwd.h
+++ b/tdepasswd/passwd.h
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
*
* $Id$
*
diff --git a/tdepasswd/passwddlg.cpp b/tdepasswd/passwddlg.cpp
index eb897dc9..4a2b7d4b 100644
--- a/tdepasswd/passwddlg.cpp
+++ b/tdepasswd/passwddlg.cpp
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
*
* $Id$
*
diff --git a/tdepasswd/passwddlg.h b/tdepasswd/passwddlg.h
index 1fef792a..3284e332 100644
--- a/tdepasswd/passwddlg.h
+++ b/tdepasswd/passwddlg.h
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
*
* $Id$
*
diff --git a/tdepasswd/tdepasswd.cpp b/tdepasswd/tdepasswd.cpp
index a6015eac..398d6d6b 100644
--- a/tdepasswd/tdepasswd.cpp
+++ b/tdepasswd/tdepasswd.cpp
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
*
* $Id$
*
diff --git a/tdesu/tdesu/sudlg.cpp b/tdesu/tdesu/sudlg.cpp
index 59ab64b0..0ed2dfc9 100644
--- a/tdesu/tdesu/sudlg.cpp
+++ b/tdesu/tdesu/sudlg.cpp
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
*
* This file is part of the KDE project, module tdesu.
* Copyright (C) 2000 Geert Jansen <jansen@kde.org>
diff --git a/tdesu/tdesu/sudlg.h b/tdesu/tdesu/sudlg.h
index 08f4e608..2cc8dbe7 100644
--- a/tdesu/tdesu/sudlg.h
+++ b/tdesu/tdesu/sudlg.h
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
*
* This file is part of the KDE project, module tdesu.
* Copyright (C) 2000 Geert Jansen <jansen@kde.org>
diff --git a/tdesu/tdesu/tdesu.cpp b/tdesu/tdesu/tdesu.cpp
index f2635925..b36b0513 100644
--- a/tdesu/tdesu/tdesu.cpp
+++ b/tdesu/tdesu/tdesu.cpp
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
*
* This file is part of the KDE project, module tdesu.
* Copyright (C) 1998 Pietro Iglio <iglio@fub.it>
diff --git a/tdesu/tdesud/handler.h b/tdesu/tdesud/handler.h
index 8728efe7..70412a32 100644
--- a/tdesu/tdesud/handler.h
+++ b/tdesu/tdesud/handler.h
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
*
* This file is part of the KDE project, module tdesu.
* Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org>
diff --git a/tdesu/tdesud/lexer.cpp b/tdesu/tdesud/lexer.cpp
index f1932f07..75535ec9 100644
--- a/tdesu/tdesud/lexer.cpp
+++ b/tdesu/tdesud/lexer.cpp
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
*
* This file is part of the KDE project, module tdesu.
* Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org>
diff --git a/tdesu/tdesud/lexer.h b/tdesu/tdesud/lexer.h
index d8f529cd..a2b42c7a 100644
--- a/tdesu/tdesud/lexer.h
+++ b/tdesu/tdesud/lexer.h
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
*
* This file is part of the KDE project, module tdesu.
* Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org>
diff --git a/tdesu/tdesud/repo.cpp b/tdesu/tdesud/repo.cpp
index 29619943..e3f6f7e0 100644
--- a/tdesu/tdesud/repo.cpp
+++ b/tdesu/tdesud/repo.cpp
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
*
* This file is part of the KDE project, module tdesu.
* Copyright (C) 1999,2000 Geert Jansen <g.t.jansen@stud.tue.nl>
diff --git a/tdesu/tdesud/repo.h b/tdesu/tdesud/repo.h
index 70027793..88e9e519 100644
--- a/tdesu/tdesud/repo.h
+++ b/tdesu/tdesud/repo.h
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
*
* This file is part of the KDE project, module tdesu.
* Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org>
diff --git a/tdesu/tdesud/secure.cpp b/tdesu/tdesud/secure.cpp
index 9b30ab4e..dd778575 100644
--- a/tdesu/tdesud/secure.cpp
+++ b/tdesu/tdesud/secure.cpp
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
*
* This file is part of the KDE project, module tdesu.
* Copyright (C) 1999,2000 Geert Jansen <g.t.jansen@stud.tue.nl>
diff --git a/tdesu/tdesud/secure.h b/tdesu/tdesud/secure.h
index edf58d9c..9e7a2690 100644
--- a/tdesu/tdesud/secure.h
+++ b/tdesu/tdesud/secure.h
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
*
* This file is part of the KDE project, module tdesu.
* Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org>
diff --git a/tdesu/tdesud/tdesud.cpp b/tdesu/tdesud/tdesud.cpp
index a4959b36..d463a400 100644
--- a/tdesu/tdesud/tdesud.cpp
+++ b/tdesu/tdesud/tdesud.cpp
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
*
* This file is part of the KDE project, module tdesu.
* Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org>
diff --git a/tdm/backend/consolekit.c b/tdm/backend/consolekit.c
index 61d0b165..9a6729b9 100644
--- a/tdm/backend/consolekit.c
+++ b/tdm/backend/consolekit.c
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
Copyright (C) 2006-2007 William Jon McCann <mccann@jhu.edu>
Copyright (C) 2007 Kevin Kofler <Kevin@tigcc.ticalc.org>
diff --git a/tdm/backend/consolekit.h b/tdm/backend/consolekit.h
index e385e3f9..12b5462d 100644
--- a/tdm/backend/consolekit.h
+++ b/tdm/backend/consolekit.h
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
Copyright (C) 2006 William Jon McCann <mccann@jhu.edu>
Copyright (C) 2007 Kevin Kofler <Kevin@tigcc.ticalc.org>
diff --git a/translations/desktop_files/applnk-compat/cs.po b/translations/desktop_files/applnk-compat/cs.po
index 87297baf..840f6acb 100644
--- a/translations/desktop_files/applnk-compat/cs.po
+++ b/translations/desktop_files/applnk-compat/cs.po
@@ -1,20 +1,21 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2020.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-08 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2020-09-24 00:40+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/applnk-compat/cs/>\n"
"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Weblate 4.2.2\n"
#. Name
#: battery.desktop:2 bwarning.desktop:2 cwarning.desktop:2 power.desktop:2
@@ -24,7 +25,7 @@ msgstr "Notebook"
#. Name
#: email.desktop:10
msgid "Email"
-msgstr ""
+msgstr "Email"
#. Comment
#: email.desktop:11
@@ -51,7 +52,7 @@ msgstr "Správce souborů"
#. Name
#: kcmkxmlrpcd.desktop:2
msgid "XML RPC Daemon"
-msgstr "TDE XML RPC démon"
+msgstr "XML RPC démon"
#. Name
#: konqhtml.desktop:2
@@ -71,12 +72,12 @@ msgstr "Nastavení hesel"
#. Keywords
#: passwords.desktop:15
msgid "Passwords;tdesu;Echo characters;Remember passwords;Timeout;"
-msgstr "Heslo;tdesu;Zapamatování hesla;Prodleva;"
+msgstr "Heslo;tdesu;Zobrazování znaků;Zapamatování hesla;Prodleva;"
#. Name
#: socks.desktop:2
msgid "Socks"
-msgstr ""
+msgstr "Socks"
#. Name
#: userinfo.desktop:13
diff --git a/translations/desktop_files/applnk-compat/sk.po b/translations/desktop_files/applnk-compat/sk.po
index 2f5a203f..d08002e3 100644
--- a/translations/desktop_files/applnk-compat/sk.po
+++ b/translations/desktop_files/applnk-compat/sk.po
@@ -1,25 +1,26 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Marek Mlynar <marek.inq.mlynar@gmail.com>, 2020.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-08 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2020-10-16 13:31+0000\n"
+"Last-Translator: Marek Mlynar <marek.inq.mlynar@gmail.com>\n"
+"Language-Team: Slovak <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/applnk-compat/sk/>\n"
"Language: sk\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Weblate 4.2.2\n"
#. Name
#: battery.desktop:2 bwarning.desktop:2 cwarning.desktop:2 power.desktop:2
msgid "Laptop"
-msgstr ""
+msgstr "Notebook"
#. Name
#: email.desktop:10
@@ -58,7 +59,7 @@ msgstr "XML RPC démon"
#. Name
#: konqhtml.desktop:2
msgid "Konqueror Browser"
-msgstr "Web priehliadač Konqueror"
+msgstr "Prehliadač Konqueror"
#. Name
#: passwords.desktop:11
@@ -78,7 +79,7 @@ msgstr "Heslá;tdesu;zobrazované znaky;zapamätanie hesiel;Timeout;"
#. Name
#: socks.desktop:2
msgid "Socks"
-msgstr ""
+msgstr "Socks"
#. Name
#: userinfo.desktop:13
@@ -88,7 +89,7 @@ msgstr "Používateľský účet"
#. Comment
#: userinfo.desktop:14
msgid "Change your account information"
-msgstr "Nastavenie informácií o vašom účte"
+msgstr "Nastavenie informácií o Vašom účte"
#. Keywords
#: userinfo.desktop:15
diff --git a/translations/desktop_files/applnk-directories/cs.po b/translations/desktop_files/applnk-directories/cs.po
index a2fc8d91..635e0ee5 100644
--- a/translations/desktop_files/applnk-directories/cs.po
+++ b/translations/desktop_files/applnk-directories/cs.po
@@ -1,20 +1,21 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2020.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-08 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2020-09-24 00:40+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/applnk-directories/cs/>\n"
"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Weblate 4.2.2\n"
#. Name
#: .directory:2
@@ -38,7 +39,7 @@ msgstr "Webový vývoj"
#: kde-science.directory:5 kde-settingsmenu.directory:4 kde-system.directory:4
#: kde-utilities.directory:4
msgid "KDE"
-msgstr ""
+msgstr "KDE"
#. Name
#: kde-editors.directory:4 tde-editors.directory:4
@@ -48,17 +49,17 @@ msgstr "Editory"
#. Name
#: kde-edu-languages.directory:4
msgid "Languages"
-msgstr ""
+msgstr "Jazyky"
#. Name
#: kde-edu-mathematics.directory:4
msgid "Mathematics"
-msgstr ""
+msgstr "Matematika"
#. Name
#: kde-edu-miscellaneous.directory:4
msgid "Miscellaneous"
-msgstr ""
+msgstr "Různé"
#. Name
#: kde-edu-science.directory:4 tde-science.directory:5
@@ -115,7 +116,7 @@ msgstr "Pracovní plocha"
#: kde-utilities-pim.directory:4 tde-utilities-pim.directory:4
#: tde-utilities-pim.directory:6
msgid "PIM"
-msgstr ""
+msgstr "PIM"
#. Name
#: tde-development-translation.directory:4
@@ -159,9 +160,8 @@ msgstr "Terminálové aplikace"
#. Name
#: tde-internet.directory:4
-#, fuzzy
msgid "Internet"
-msgstr "Internet a síť"
+msgstr "Internet"
#. Name
#: tde-main.directory:5
@@ -182,7 +182,7 @@ msgstr "Multimédia"
#. Comment
#: tde-office-pim.directory:4 tde-office-pim.directory:6
msgid "Personal Information Management"
-msgstr ""
+msgstr "Správa osobních informací"
#. Name
#: tde-office.directory:4
@@ -202,7 +202,7 @@ msgstr "Komponenty TDE"
#. Name
#: tde-settings-hardware.directory:4
msgid "Hardware"
-msgstr ""
+msgstr "Hardware"
#. Name
#: tde-settings-information.directory:4
diff --git a/translations/desktop_files/applnk-directories/sk.po b/translations/desktop_files/applnk-directories/sk.po
index 36c5af47..66c98e0d 100644
--- a/translations/desktop_files/applnk-directories/sk.po
+++ b/translations/desktop_files/applnk-directories/sk.po
@@ -1,25 +1,26 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Marek Mlynar <marek.inq.mlynar@gmail.com>, 2020.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-08 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2020-10-16 13:31+0000\n"
+"Last-Translator: Marek Mlynar <marek.inq.mlynar@gmail.com>\n"
+"Language-Team: Slovak <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/applnk-directories/sk/>\n"
"Language: sk\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Weblate 4.2.2\n"
#. Name
#: .directory:2
msgid "Default"
-msgstr "Štandardný"
+msgstr "Predvolený"
#. Name
#: hidden.directory:4
@@ -38,7 +39,7 @@ msgstr "Vývoj pre Web"
#: kde-science.directory:5 kde-settingsmenu.directory:4 kde-system.directory:4
#: kde-utilities.directory:4
msgid "KDE"
-msgstr ""
+msgstr "TDE"
#. Name
#: kde-editors.directory:4 tde-editors.directory:4
@@ -48,17 +49,17 @@ msgstr "Editory"
#. Name
#: kde-edu-languages.directory:4
msgid "Languages"
-msgstr ""
+msgstr "Jazyky"
#. Name
#: kde-edu-mathematics.directory:4
msgid "Mathematics"
-msgstr ""
+msgstr "Matematika"
#. Name
#: kde-edu-miscellaneous.directory:4
msgid "Miscellaneous"
-msgstr ""
+msgstr "Rôzne"
#. Name
#: kde-edu-science.directory:4 tde-science.directory:5
@@ -115,7 +116,7 @@ msgstr "Plocha"
#: kde-utilities-pim.directory:4 tde-utilities-pim.directory:4
#: tde-utilities-pim.directory:6
msgid "PIM"
-msgstr ""
+msgstr "PIM"
#. Name
#: tde-development-translation.directory:4
@@ -134,9 +135,8 @@ msgstr "Škola hrou"
#. Name
#: tde-games-logic.directory:4
-#, fuzzy
msgid "Logic Games"
-msgstr "Hry v štýle Rogue"
+msgstr "Logické hry"
#. Name
#: tde-games-roguelikes.directory:4
@@ -160,14 +160,13 @@ msgstr "Terminálové aplikácie"
#. Name
#: tde-internet.directory:4
-#, fuzzy
msgid "Internet"
-msgstr "Internet a sieť"
+msgstr "Internet"
#. Name
#: tde-main.directory:5
msgid "TDE Menu"
-msgstr "Menu TDE"
+msgstr "Ponuka TDE"
#. Name
#: tde-more.directory:5
@@ -183,7 +182,7 @@ msgstr "Multimédiá"
#. Comment
#: tde-office-pim.directory:4 tde-office-pim.directory:6
msgid "Personal Information Management"
-msgstr ""
+msgstr "Správa osobných informácií"
#. Name
#: tde-office.directory:4
@@ -193,22 +192,22 @@ msgstr "Kancelária"
#. Name
#: tde-settings-accessibility.directory:4
msgid "Regional & Accessibility"
-msgstr "Prístupnosť a regionálne nastavenie"
+msgstr "Prístupnosť a regionálne nastavenia"
#. Name
#: tde-settings-components.directory:4
msgid "TDE Components"
-msgstr "Komponenty TDE"
+msgstr "Súčasti TDE"
#. Name
#: tde-settings-hardware.directory:4
msgid "Hardware"
-msgstr ""
+msgstr "Hardvér"
#. Name
#: tde-settings-information.directory:4
msgid "Device Informations"
-msgstr ""
+msgstr "Informácie o zariadeniach"
#. Name
#: tde-settings-looknfeel.directory:4
@@ -230,7 +229,7 @@ msgstr "Periférie"
#. Name
#: tde-settings-power.directory:4
msgid "Power Control"
-msgstr "Ovládanie spotreby"
+msgstr "Správa napájania"
#. Name
#: tde-settings-security.directory:4
@@ -255,7 +254,7 @@ msgstr "Webový prehliadač"
#. Name
#: tde-settings.directory:4
msgid "Settings-Modules"
-msgstr "Moduly nastavenia"
+msgstr "Nastavenia modulov"
#. Name
#: tde-settingsmenu.directory:4
@@ -270,12 +269,12 @@ msgstr "Šetriče obrazovky"
#. Comment
#: tde-system-screensavers.directory:8
msgid "Screen saver demos"
-msgstr "Demo šetričov obrazovky"
+msgstr "Ukážky šetričov obrazovky"
#. Name
#: tde-system-su.directory:5
msgid "SuperUser"
-msgstr ""
+msgstr "Správca"
#. Name
#: tde-system.directory:4
@@ -296,7 +295,7 @@ msgstr "Súbor"
#. Name
#: tde-utilities-xutils.directory:4
msgid "X-Utilities"
-msgstr "Nastroje pre X"
+msgstr "Nástroje pre X"
#. Comment
#: tde-utilities-xutils.directory:6
diff --git a/translations/desktop_files/drkonqi-presets/cs.po b/translations/desktop_files/drkonqi-presets/cs.po
index 03641fd5..89a756f7 100644
--- a/translations/desktop_files/drkonqi-presets/cs.po
+++ b/translations/desktop_files/drkonqi-presets/cs.po
@@ -1,20 +1,21 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2020.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-19 03:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2020-09-13 17:05+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/drkonqi-presets/cs/>\n"
"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Weblate 4.2.2\n"
#. Name
#: developerrc:2
@@ -44,7 +45,7 @@ msgstr "Možná budete chtít opravit váš program. Klikněte na záložku lad
#. Name
#: developerrc:20 enduserrc:20
msgid "SIGILL"
-msgstr ""
+msgstr "SIGILL"
#. Comment
#: developerrc:21
@@ -54,7 +55,7 @@ msgstr "Neplatná instrukce."
#. Name
#: developerrc:24 enduserrc:24
msgid "SIGABRT"
-msgstr ""
+msgstr "SIGABRT"
#. Comment
#: developerrc:25
@@ -64,7 +65,7 @@ msgstr "Přerušeno."
#. Name
#: developerrc:28 enduserrc:28
msgid "SIGFPE"
-msgstr ""
+msgstr "SIGFPE"
#. Comment
#: developerrc:29
@@ -74,7 +75,7 @@ msgstr "Výjimka v plovoucí čárce."
#. Name
#: developerrc:32 enduserrc:32
msgid "SIGSEGV"
-msgstr ""
+msgstr "SIGSEGV"
#. Comment
#: developerrc:33
diff --git a/translations/desktop_files/drkonqi-presets/sk.po b/translations/desktop_files/drkonqi-presets/sk.po
index 39b846a5..626e6bcb 100644
--- a/translations/desktop_files/drkonqi-presets/sk.po
+++ b/translations/desktop_files/drkonqi-presets/sk.po
@@ -1,20 +1,21 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Marek Mlynar <marek.inq.mlynar@gmail.com>, 2020.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-19 03:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2020-10-16 13:31+0000\n"
+"Last-Translator: Marek Mlynar <marek.inq.mlynar@gmail.com>\n"
+"Language-Team: Slovak <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/drkonqi-presets/sk/>\n"
"Language: sk\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Weblate 4.2.2\n"
#. Name
#: developerrc:2
@@ -71,7 +72,7 @@ msgstr ""
#. Comment
#: developerrc:29
msgid "Floating point exception."
-msgstr "Výnimka."
+msgstr "Výnimka v desatinnej čiarke."
#. Name
#: developerrc:32 enduserrc:32
@@ -86,7 +87,7 @@ msgstr "Nesprávne adresovanie pamäti."
#. Name
#: developerrc:36 enduserrc:36
msgid "Unknown"
-msgstr "Neznámi"
+msgstr "Neznáme"
#. Comment
#: developerrc:37
@@ -96,12 +97,12 @@ msgstr "Tento signál je neznámy."
#. Name
#: enduserrc:2
msgid "End user"
-msgstr "Konečný používateľ"
+msgstr "Koncový používateľ"
#. Comment
#: enduserrc:3
msgid "Settings preferred for end users"
-msgstr "Preferované nastavenia pre konečných používateľov"
+msgstr "Uprednostňované nastavenia pre konečných používateľov"
#. Name
#: enduserrc:13
@@ -142,8 +143,8 @@ msgid ""
"An application terminates with a SIGABRT signal when it detects an internal "
"inconsistency caused by a bug in the program."
msgstr ""
-"Aplikácia bola ukončená SIGABRT signálom, keď program detekoval internú "
-"nezhodu spôsobenú chybou v programe."
+"Aplikácia bola ukončená SIGABRT signálom, keď program detekoval vnútornú "
+"nesúdržnosť spôsobenú chybou v programe."
#. Comment
#: enduserrc:29
@@ -152,7 +153,7 @@ msgid ""
"application. The application was asked to save its documents."
msgstr ""
"Aplikácia väčšinou dostane SIGFPE signál kvôli chybe v aplikácii. Tento "
-"signál žiada tiež aplikáciu, aby si uložila svoje dokumenty."
+"signál žiada aplikáciu, aby si uložila svoje dokumenty."
#. Comment
#: enduserrc:33
diff --git a/translations/desktop_files/kappfinder-data/sk.po b/translations/desktop_files/kappfinder-data/sk.po
index ea7edbea..1c11d40c 100644
--- a/translations/desktop_files/kappfinder-data/sk.po
+++ b/translations/desktop_files/kappfinder-data/sk.po
@@ -1,20 +1,21 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Marek Mlynar <marek.inq.mlynar@gmail.com>, 2020.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-17 22:13+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2020-10-16 15:13+0000\n"
+"Last-Translator: Marek Mlynar <marek.inq.mlynar@gmail.com>\n"
+"Language-Team: Slovak <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kappfinder-data/sk/>\n"
"Language: sk\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Weblate 4.2.2\n"
#. Name
#: Development/Forte.desktop:2
@@ -34,7 +35,7 @@ msgstr ""
#. GenericName
#: Development/assistant.desktop:3
msgid "Document Browser"
-msgstr "Prehliadač dokumentácie"
+msgstr ""
#. Name
#: Development/ddd.desktop:2
@@ -44,46 +45,42 @@ msgstr ""
#. GenericName
#: Development/ddd.desktop:3
msgid "Data Display Debugger"
-msgstr "Debugger zobrazujúci dáta"
+msgstr ""
#. Name
#: Development/designer.desktop:2
-#, fuzzy
msgid "Qt Designer"
-msgstr "Návrh rozhrania"
+msgstr ""
#. GenericName
#: Development/designer.desktop:3
msgid "Interface Designer"
-msgstr "Návrh rozhrania"
+msgstr ""
#. Name
#: Development/dlgedit.desktop:2
-#, fuzzy
msgid "Qt DlgEdit"
-msgstr "Editor dialógov"
+msgstr ""
#. GenericName
#: Development/dlgedit.desktop:3
msgid "Dialog Editor"
-msgstr "Editor dialógov"
+msgstr ""
#. Name
#: Development/eclipse.desktop:3
-#, fuzzy
msgid "Eclipse"
-msgstr "IDE Eclipse"
+msgstr ""
#. GenericName
#: Development/eclipse.desktop:4
msgid "Eclipse IDE"
-msgstr "IDE Eclipse"
+msgstr ""
#. Name
#: Development/fdesign.desktop:2
-#, fuzzy
msgid "FormDesigner"
-msgstr "Návrh rozhrania"
+msgstr ""
#. Name
#: Development/j2mewtk.desktop:2
@@ -103,7 +100,7 @@ msgstr ""
#. GenericName
#: Development/linguist.desktop:3
msgid "Translation Tool"
-msgstr "Prekladací nástroj"
+msgstr ""
#. Name
#: Development/pose.desktop:2
@@ -123,13 +120,12 @@ msgstr ""
#. GenericName
#: Development/sced.desktop:3
msgid "Scene Modeler"
-msgstr "Modelovanie scén"
+msgstr ""
#. Name
#: Games/Arcade/ClanBomber.desktop:2
-#, fuzzy
msgid "ClanBomber"
-msgstr "ClanBomber"
+msgstr ""
#. GenericName
#: Games/Arcade/ClanBomber.desktop:3 Games/Arcade/GnobotsII.desktop:3
@@ -140,7 +136,7 @@ msgstr "ClanBomber"
#: Games/Board/Gataxx.desktop:3 Games/Board/Gnotravex.desktop:3
#: Games/penguin-command.desktop:4
msgid "Arcade Game"
-msgstr "Dobrodružná hra"
+msgstr ""
#. Name
#: Games/Arcade/FrozenBubble.desktop:2
@@ -150,7 +146,7 @@ msgstr ""
#. GenericName
#: Games/Arcade/FrozenBubble.desktop:3
msgid "Tetris-Like Game"
-msgstr "Hra v štýle Tetris"
+msgstr ""
#. Name
#: Games/Arcade/Gnibbles.desktop:2
@@ -160,7 +156,7 @@ msgstr ""
#. GenericName
#: Games/Arcade/Gnibbles.desktop:3
msgid "GNOME Nibbles Game"
-msgstr "Hra GNOME Nibbles"
+msgstr ""
#. Name
#: Games/Arcade/GnobotsII.desktop:2
@@ -190,7 +186,7 @@ msgstr ""
#. GenericName
#: Games/Arcade/TuxRacer.desktop:3
msgid "Racing Game"
-msgstr "Závody"
+msgstr ""
#. Name
#: Games/Arcade/XKobo.desktop:2
@@ -281,13 +277,12 @@ msgstr ""
#. GenericName
#: Games/Board/Gmahjongg.desktop:3
msgid "Tile Game"
-msgstr "Stolová hra"
+msgstr "Hra s dlaždicami"
#. Name
#: Games/Board/Gmines.desktop:2
-#, fuzzy
msgid "GNOME Mines"
-msgstr "Hra GNOME Nibbles"
+msgstr ""
#. GenericName
#: Games/Board/Gmines.desktop:3
@@ -378,9 +373,8 @@ msgstr "ClanBomber"
#. Name
#: Games/Emulators/cmail.desktop:2
-#, fuzzy
msgid "ChessMail"
-msgstr "Šach"
+msgstr ""
#. GenericName
#: Games/Emulators/cmail.desktop:3
@@ -495,7 +489,7 @@ msgstr "Voľný klon Scorched Earth pre UNIX a X"
#. Name
#: Games/Toys/xeyes.desktop:2
msgid "X Eyes"
-msgstr "Oči"
+msgstr ""
#. Name
#: Games/Toys/xpinguin.desktop:2
@@ -714,9 +708,8 @@ msgstr ""
#. GenericName
#: Internet/BlueFish.desktop:3
-#, fuzzy
msgid "HTML Editor"
-msgstr "Textový editor"
+msgstr ""
#. Name
#: Internet/Dpsftp.desktop:2
@@ -764,9 +757,8 @@ msgstr "Upozornenie na poštu"
#. Name
#: Internet/Fetchmailconf.desktop:2
-#, fuzzy
msgid "Fetchmailconf"
-msgstr "Konfigurácia Fetchmail"
+msgstr ""
#. GenericName
#: Internet/Fetchmailconf.desktop:3
@@ -810,9 +802,8 @@ msgstr ""
#. Name
#: Internet/Netscapemessenger.desktop:2
-#, fuzzy
msgid "Netscape Messenger"
-msgstr "Kniha adries Nescape"
+msgstr ""
#. Name
#: Internet/Nmapfe.desktop:2
@@ -832,7 +823,7 @@ msgstr ""
#. GenericName
#: Internet/Pan.desktop:3 Internet/knews.desktop:3
msgid "Usenet News Reader"
-msgstr "Klient pre News"
+msgstr "Klient pre Usenet News"
#. Name
#: Internet/Sylpheed.desktop:2
@@ -993,9 +984,8 @@ msgstr ""
#. Name
#: Internet/gtelnet.desktop:2
-#, fuzzy
msgid "GNOME Telnet"
-msgstr "GNOME Výber farby"
+msgstr ""
#. GenericName
#: Internet/gtelnet.desktop:3
@@ -1010,7 +1000,7 @@ msgstr ""
#. GenericName
#: Internet/ickle.desktop:3
msgid "ICQ2000 Chat"
-msgstr "ICQ2000 chat"
+msgstr ""
#. Name
#: Internet/javaws.desktop:2
@@ -1079,9 +1069,8 @@ msgstr ""
#. Name
#: Internet/xchat.desktop:2
-#, fuzzy
msgid "XChat"
-msgstr "IRC chat"
+msgstr ""
#. GenericName
#: Internet/xchat.desktop:3
@@ -1213,9 +1202,8 @@ msgstr "Zvukový procesor"
#. Name
#: Multimedia/mplayer.desktop:2
-#, fuzzy
msgid "MPlayer"
-msgstr "Prehrávač MPEG"
+msgstr ""
#. Name
#: Multimedia/mtv.desktop:2
@@ -1234,9 +1222,8 @@ msgstr "DVD prehrávač"
#. Name
#: Multimedia/oqtplayer.desktop:2
-#, fuzzy
msgid "OQTPlayer"
-msgstr "DVD prehrávač"
+msgstr ""
#. GenericName
#: Multimedia/oqtplayer.desktop:3
@@ -1245,9 +1232,8 @@ msgstr "Video prehrávač MOV"
#. Name
#: Multimedia/realplayer.desktop:2
-#, fuzzy
msgid "RealPlayer"
-msgstr "Video prehrávač"
+msgstr ""
#. Name
#: Multimedia/rezound.desktop:2
@@ -1297,7 +1283,7 @@ msgstr ""
#. Name
#: Multimedia/xmms-enqueue.desktop:2
msgid "Enqueue in XMMS"
-msgstr "Enqueue v XMMS"
+msgstr "Zaradiť skladbu do XMMS"
#. GenericName
#: Multimedia/xmms-enqueue.desktop:3
@@ -1332,7 +1318,7 @@ msgstr ""
#. GenericName
#: Office/Dia.desktop:3 Office/Guppi.desktop:3
msgid "Program for Diagrams"
-msgstr "Diagramy"
+msgstr "Program pre Grafy"
#. Name
#: Office/Gnome-Cal.desktop:2
@@ -1356,9 +1342,8 @@ msgstr "Správca kontaktov"
#. Name
#: Office/GnomeTimeTracker.desktop:2
-#, fuzzy
msgid "GNOME Time Tracker"
-msgstr "Hra GNOME Nibbles"
+msgstr ""
#. Name
#: Office/Gnumeric.desktop:2
@@ -1473,9 +1458,8 @@ msgstr "Plánovací kalendár"
#. Name
#: Office/pybliographic.desktop:2
-#, fuzzy
msgid "Pybliographic"
-msgstr "Bibliografická databáza"
+msgstr ""
#. GenericName
#: Office/pybliographic.desktop:3
@@ -1560,7 +1544,7 @@ msgstr "Editor zdrojov X"
#. Name
#: System/sam.desktop:2
msgid "SAM System-Administration"
-msgstr "Systémový Administrátor"
+msgstr "Správca systému SAM"
#. Name
#: System/wine.desktop:2
@@ -1570,7 +1554,7 @@ msgstr ""
#. GenericName
#: System/wine.desktop:3
msgid "Run Windows Programs"
-msgstr "Beh aplikácií Windows"
+msgstr "Spustiť aplikácie Windows"
#. Name
#: System/xosview.desktop:2
@@ -1628,9 +1612,8 @@ msgstr ""
#. Name
#: Utilities/Editors/xedit.desktop:2
-#, fuzzy
msgid "X Editor"
-msgstr "Textový editor"
+msgstr ""
#. Name
#: Utilities/Editors/xemacs.desktop:2
@@ -1675,13 +1658,12 @@ msgstr ""
#. GenericName
#: Utilities/XUtilities/Xkill.desktop:3
msgid "Window Termination Tool"
-msgstr "Zatváranie okien"
+msgstr "Nástroj na zatváranie okien"
#. Name
#: Utilities/XUtilities/Xrefresh.desktop:2
-#, fuzzy
msgid "X Refresh"
-msgstr "Prekreslenie obrazovky"
+msgstr ""
#. GenericName
#: Utilities/XUtilities/Xrefresh.desktop:3
@@ -1710,9 +1692,8 @@ msgstr "Kalkulačka"
#. Name
#: Utilities/XUtilities/xclipboard.desktop:2
-#, fuzzy
msgid "X Clipboard"
-msgstr "Prehliadač schránky"
+msgstr ""
#. GenericName
#: Utilities/XUtilities/xclipboard.desktop:3
@@ -1721,9 +1702,8 @@ msgstr "Prehliadač schránky"
#. Name
#: Utilities/XUtilities/xclock.desktop:2
-#, fuzzy
msgid "X Clock"
-msgstr "Hodiny"
+msgstr ""
#. GenericName
#: Utilities/XUtilities/xclock.desktop:3 Utilities/oclock.desktop:3
@@ -1767,9 +1747,8 @@ msgstr "X Terminál"
#. Name
#: Utilities/calctool.desktop:2
-#, fuzzy
msgid "Calctool"
-msgstr "Kalkulačka"
+msgstr ""
#. Name
#: Utilities/e-notes.desktop:2
@@ -1783,9 +1762,8 @@ msgstr "Osobné poznámky"
#. Name
#: Utilities/oclock.desktop:2
-#, fuzzy
msgid "OClock"
-msgstr "Hodiny"
+msgstr ""
#. Name
#: Utilities/xgnokii.desktop:2
diff --git a/translations/desktop_files/kappfinder.desktop/cs.po b/translations/desktop_files/kappfinder.desktop/cs.po
index 57feeac9..44678e4e 100644
--- a/translations/desktop_files/kappfinder.desktop/cs.po
+++ b/translations/desktop_files/kappfinder.desktop/cs.po
@@ -1,25 +1,26 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2020.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-17 21:48+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2020-09-13 17:05+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/kappfinder-kappfinderdesktop/cs/>\n"
"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Weblate 4.2.2\n"
#. Name
#: kappfinder.desktop:2
msgid "KAppfinder"
-msgstr ""
+msgstr "KAppfinder"
#. GenericName
#: kappfinder.desktop:3
diff --git a/translations/desktop_files/kappfinder.desktop/pl.po b/translations/desktop_files/kappfinder.desktop/pl.po
index 54b47d54..a0e376ee 100644
--- a/translations/desktop_files/kappfinder.desktop/pl.po
+++ b/translations/desktop_files/kappfinder.desktop/pl.po
@@ -1,25 +1,27 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Jan Stolarek <jwstolarek@gmail.com>, 2020.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-17 21:48+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2020-08-12 23:04+0000\n"
+"Last-Translator: Jan Stolarek <jwstolarek@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kappfinder-kappfinderdesktop/pl/>\n"
"Language: pl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.1.1\n"
#. Name
#: kappfinder.desktop:2
msgid "KAppfinder"
-msgstr ""
+msgstr "Wyszukiwanie aplikacji"
#. GenericName
#: kappfinder.desktop:3
diff --git a/translations/desktop_files/kappfinder.desktop/sk.po b/translations/desktop_files/kappfinder.desktop/sk.po
index eb11432a..6d0c1efe 100644
--- a/translations/desktop_files/kappfinder.desktop/sk.po
+++ b/translations/desktop_files/kappfinder.desktop/sk.po
@@ -1,20 +1,21 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Marek Mlynar <marek.inq.mlynar@gmail.com>, 2020.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-17 21:48+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2020-10-16 15:13+0000\n"
+"Last-Translator: Marek Mlynar <marek.inq.mlynar@gmail.com>\n"
+"Language-Team: Slovak <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kappfinder-kappfinderdesktop/sk/>\n"
"Language: sk\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Weblate 4.2.2\n"
#. Name
#: kappfinder.desktop:2
@@ -24,4 +25,4 @@ msgstr ""
#. GenericName
#: kappfinder.desktop:3
msgid "Menu Updating Tool"
-msgstr "Nástroj na aktualizáciu menu"
+msgstr "Nástroj na aktualizáciu ponuky"
diff --git a/translations/desktop_files/kate-desktops/cs.po b/translations/desktop_files/kate-desktops/cs.po
index 899ebea5..86d2d950 100644
--- a/translations/desktop_files/kate-desktops/cs.po
+++ b/translations/desktop_files/kate-desktops/cs.po
@@ -1,20 +1,21 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2020.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-18 03:49+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2020-10-07 19:02+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/kate-desktop-files/cs/>\n"
"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Weblate 4.2.2\n"
#. GenericName
#: data/kate.desktop:2
@@ -24,7 +25,7 @@ msgstr "Pokročilý textový editor"
#. Name
#: data/kate.desktop:3
msgid "Kate"
-msgstr ""
+msgstr "Kate"
#. Comment
#: data/kateplugin.desktop:5
@@ -39,4 +40,4 @@ msgstr "Textový editor"
#. Name
#: data/kwrite.desktop:3
msgid "KWrite"
-msgstr ""
+msgstr "KWrite"
diff --git a/translations/desktop_files/kate-desktops/sk.po b/translations/desktop_files/kate-desktops/sk.po
index 41527201..ff925870 100644
--- a/translations/desktop_files/kate-desktops/sk.po
+++ b/translations/desktop_files/kate-desktops/sk.po
@@ -1,20 +1,21 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Marek Mlynar <marek.inq.mlynar@gmail.com>, 2020.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-18 03:49+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2020-10-22 06:05+0000\n"
+"Last-Translator: Marek Mlynar <marek.inq.mlynar@gmail.com>\n"
+"Language-Team: Slovak <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kate-desktop-files/sk/>\n"
"Language: sk\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Weblate 4.2.2\n"
#. GenericName
#: data/kate.desktop:2
@@ -24,7 +25,7 @@ msgstr "Pokročilý textový editor"
#. Name
#: data/kate.desktop:3
msgid "Kate"
-msgstr ""
+msgstr "Kate"
#. Comment
#: data/kateplugin.desktop:5
@@ -39,4 +40,4 @@ msgstr "Textový editor"
#. Name
#: data/kwrite.desktop:3
msgid "KWrite"
-msgstr ""
+msgstr "KWrite"
diff --git a/translations/desktop_files/kcontrol-color-schemes/sk.po b/translations/desktop_files/kcontrol-color-schemes/sk.po
index 500a8f88..f065401a 100644
--- a/translations/desktop_files/kcontrol-color-schemes/sk.po
+++ b/translations/desktop_files/kcontrol-color-schemes/sk.po
@@ -1,20 +1,21 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Marek Mlynar <marek.inq.mlynar@gmail.com>, 2020.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-18 21:04+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2020-10-16 13:31+0000\n"
+"Last-Translator: Marek Mlynar <marek.inq.mlynar@gmail.com>\n"
+"Language-Team: Slovak <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/color-schemes/sk/>\n"
"Language: sk\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Weblate 4.2.2\n"
#. Name
#: AtlasGreen.kcsrc:3
@@ -39,7 +40,7 @@ msgstr "Modrá bridlica"
#. Name
#: CDE.kcsrc:3
msgid "CDE"
-msgstr ""
+msgstr "CDE"
#. Name
#: DarkBlue.kcsrc:2
@@ -64,29 +65,27 @@ msgstr ""
#. Name
#: KDEOne.kcsrc:2
msgid "KDE 1"
-msgstr ""
+msgstr "KDE 1"
#. Name
#: KDETwo.kcsrc:2
msgid "KDE 2"
-msgstr ""
+msgstr "KDE 2"
#. Name
#: Keramik.kcsrc:2
-#, fuzzy
msgid "Keramik"
-msgstr "Keramik Biely"
+msgstr "Keramika"
#. Name
#: KeramikEmerald.kcsrc:2
-#, fuzzy
msgid "Keramik Emerald"
-msgstr "Keramik Biely"
+msgstr "Keramika Smaragd"
#. Name
#: KeramikWhite.kcsrc:2
msgid "Keramik White"
-msgstr "Keramik Biely"
+msgstr "Keramika Biela"
#. Name
#: MediaPeach.kcsrc:2
@@ -96,7 +95,7 @@ msgstr ""
#. Name
#: Next.kcsrc:2
msgid "Next"
-msgstr ""
+msgstr "Next"
#. Name
#: PaleGray.kcsrc:3
@@ -111,7 +110,7 @@ msgstr ""
#. Name
#: PointReyesGreen.kcsrc:2
msgid "Point Reyes Green"
-msgstr "Point Reyes zelená"
+msgstr "Point Reyes Zelená"
#. Name
#: Pumpkin.kcsrc:3
@@ -121,7 +120,7 @@ msgstr "Tekvica"
#. Name
#: SolarisCDE.kcsrc:2
msgid "Solaris"
-msgstr ""
+msgstr "Solaris"
#. Name
#: Storm.kcsrc:3
diff --git a/translations/desktop_files/kcontrol-desktops/cs.po b/translations/desktop_files/kcontrol-desktops/cs.po
index 5400e553..20b3ea63 100644
--- a/translations/desktop_files/kcontrol-desktops/cs.po
+++ b/translations/desktop_files/kcontrol-desktops/cs.po
@@ -1,20 +1,21 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2020.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-18 13:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2020-10-09 08:13+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/kcontrol-desktop-files/cs/>\n"
"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Weblate 4.2.2\n"
#. Name
#: access/kaccess.desktop:3
@@ -2110,17 +2111,17 @@ msgstr ""
#. Name
#: smserver/kcmsmserver.desktop:12
msgid "Session Manager"
-msgstr "Správce relace"
+msgstr "Správce sezení"
#. Comment
#: smserver/kcmsmserver.desktop:14
msgid "Configure the session manager and logout settings"
-msgstr "Nastavení správce relace a odhlašování"
+msgstr "Nastavení správce sezení a odhlašování"
#. Keywords
#: smserver/kcmsmserver.desktop:16
msgid "ksmserver;session;logout;confirmation;save;restore;"
-msgstr "Správce relace;Relace;Odhlášení;Potvrzení;Uložení;Obnovení;"
+msgstr "Správce sezení;Sezení;Odhlášení;Potvrzení;Uložení;Obnovení;"
#. Name
#: spellchecking/spellchecking.desktop:11
@@ -2429,7 +2430,7 @@ msgid ""
"fonts;background;wallpapers;sessions;shutdown;restart;"
msgstr ""
"tdm;Správce obrazovky;xdm;Uživatelé;Přihlášení;Uvítání;Logo;Styly;Jazyk;Země;"
-"Písma;pozadí;Tapety;Relace;Sezení;Vypnutí;Restart;"
+"Písma;pozadí;Tapety;Sezení;Vypnutí;Restart;"
#. Name
#: usbview/kcmusb.desktop:10
diff --git a/translations/desktop_files/kcontrol-desktops/mk.po b/translations/desktop_files/kcontrol-desktops/mk.po
index 17c9107c..ee42993a 100644
--- a/translations/desktop_files/kcontrol-desktops/mk.po
+++ b/translations/desktop_files/kcontrol-desktops/mk.po
@@ -237,8 +237,8 @@ msgstr "Криптографија"
#: crypto/crypto.desktop:12
msgid "Configure SSL, manage certificates, and other cryptography settings"
msgstr ""
-"Конфигурација на SSL, менаџмент на сертификати\n"
-"и други криптографски поставувања"
+"Конфигурација на SSL, менаџмент на сертификати и други криптографски "
+"поставувања"
#. Keywords
#: crypto/crypto.desktop:14
@@ -259,8 +259,8 @@ msgstr "Дизајни на страница"
#: css/kcmcss.desktop:14
msgid "Configure the stylesheets used to render web pages"
msgstr ""
-"Конфигурирајте ги страниците со дизајн\n"
-"што се користат за прикажување веб-страници"
+"Конфигурирајте ги страниците со дизајн што се користат за прикажување веб-"
+"страници"
#. Keywords
#: css/kcmcss.desktop:16
@@ -2081,8 +2081,8 @@ msgstr "Перформанси"
#: performance/kcmkonqyperformance.desktop:13
msgid "Configure settings that can improve Konqueror performance"
msgstr ""
-"Конфигурирајте ги поставувањата што може да ги\n"
-"подобрат перформансите на Konqueror"
+"Конфигурирајте ги поставувањата што може да ги подобрат перформансите на "
+"Konqueror"
#. Keywords
#: performance/kcmkonqyperformance.desktop:15
diff --git a/translations/desktop_files/kcontrol-desktops/pl.po b/translations/desktop_files/kcontrol-desktops/pl.po
index fe30b6f4..3f30268b 100644
--- a/translations/desktop_files/kcontrol-desktops/pl.po
+++ b/translations/desktop_files/kcontrol-desktops/pl.po
@@ -6,7 +6,7 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-18 13:00+0200\n"
-"PO-Revision-Date: 2020-07-23 00:37+0000\n"
+"PO-Revision-Date: 2020-08-07 18:36+0000\n"
"Last-Translator: Jan Stolarek <jwstolarek@gmail.com>\n"
"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
"projects/tdebase/kcontrol-desktop-files/pl/>\n"
@@ -182,14 +182,13 @@ msgstr "Menedżer plików"
#. Comment
#: componentchooser/componentservices/kcm_filemanager.desktop:3
-#, fuzzy
msgid ""
"This service allows you to configure your default file manager. All TDE "
"applications which invoke a file manager application should honor this "
"setting."
msgstr ""
-"Tu można wybrać domyślny emulator terminala. Wszystkie programy TDE, które "
-"korzystają z terminala, powinny używać tego ustawienia."
+"Tu można wybrać domyślny menedżer plików. Wszystkie programy TDE, które "
+"korzystają z menedżera plików, powinny używać tego ustawienia."
#. Name
#: componentchooser/componentservices/kcm_kemail.desktop:1
@@ -273,9 +272,8 @@ msgstr "Monitor i wyświetlanie"
#. Comment
#: displayconfig/displayconfig.desktop:14
-#, fuzzy
msgid "Configure display"
-msgstr "Konfiguracja wykrywania usług"
+msgstr "Konfiguracja wyświetlania"
#. Keywords
#: displayconfig/displayconfig.desktop:16
@@ -411,13 +409,12 @@ msgstr ""
#. Name
#: ebrowsing/plugins/ikws/searchproviders/backports.desktop:3
msgid "Debian Backports Search"
-msgstr "Wyszukiwanie starszych pakietów Debiana"
+msgstr "Wyszukiwanie nowszych pakietów w Debian Backports"
#. Query
#: ebrowsing/plugins/ikws/searchproviders/backports.desktop:4
-#, fuzzy
msgid "http://www.backports.org/package.php?search=\\{@}"
-msgstr "http://pl.wiktionary.org/wiki/Special:Search?search=\\{@}&go=Go"
+msgstr ""
#. Name
#: ebrowsing/plugins/ikws/searchproviders/bugft.desktop:3
@@ -559,9 +556,8 @@ msgstr "Open Directory - katalog stron WWW"
#. Query
#: ebrowsing/plugins/ikws/searchproviders/dmoz.desktop:6
-#, fuzzy
msgid "http://search.dmoz.org/cgi-bin/search?search=\\{@}"
-msgstr "http://pl.wikipedia.org/wiki/Special:Search?search=\\{@}&go=Go"
+msgstr ""
#. Name
#: ebrowsing/plugins/ikws/searchproviders/docbook.desktop:5
@@ -696,9 +692,8 @@ msgstr ""
#. Name
#: ebrowsing/plugins/ikws/searchproviders/froogle.desktop:3
-#, fuzzy
msgid "Froogle"
-msgstr "Google - wyszukiwarka stron WWW"
+msgstr "Froogle"
#. Query
#: ebrowsing/plugins/ikws/searchproviders/froogle.desktop:6
@@ -1319,9 +1314,8 @@ msgstr "tdehwdevicetray"
#. Name
#: hwmanager/hwdevicetray-autostart.desktop:4 hwmanager/hwdevicetray.desktop:2
#: hwmanager/hwdevicetray.desktop:4
-#, fuzzy
msgid "Device Monitor"
-msgstr "Wiele monitorów"
+msgstr "Monitor urządzeń"
#. Comment
#: hwmanager/hwdevicetray-autostart.desktop:6 hwmanager/hwdevicetray.desktop:6
@@ -1330,15 +1324,13 @@ msgstr "Monitoruj urządzenia sprzętowe z poziomu tacki systemowej"
#. Name
#: hwmanager/hwmanager.desktop:11
-#, fuzzy
msgid "Device Manager"
-msgstr "Menedżer usług"
+msgstr "Menedżer urządzeń"
#. Comment
#: hwmanager/hwmanager.desktop:13
-#, fuzzy
msgid "Configure hardware devices"
-msgstr "Konfiguracja zachowania przeglądarki"
+msgstr "Konfiguracja urządzeń w komputerze"
#. Keywords
#: hwmanager/hwmanager.desktop:15
@@ -1906,21 +1898,18 @@ msgstr "konqueror;kfm;przeglądarka;html;sieć www;www;java;javascript;"
#. Name
#: konqhtml/tdehtml_userinterface.desktop:11
-#, fuzzy
msgid "User Interface"
-msgstr "Interfejsy sieciowe"
+msgstr "Interfejs użytkownika"
#. Comment
#: konqhtml/tdehtml_userinterface.desktop:13
-#, fuzzy
msgid "Configure user interface options"
-msgstr "Konfiguracja ustawień bufora (cache'a)"
+msgstr "Konfiguruj opcje interfejsu użytkownika"
#. Keywords
#: konqhtml/tdehtml_userinterface.desktop:15
-#, fuzzy
msgid "konqueror;kfm;user;interface;tabbed;browsing;"
-msgstr "konqueror;ponowne użycie;wstępne wczytywanie;"
+msgstr "konqueror;kfm;interfejs;przeglądanie;"
#. Name
#: konsole/kcmkonsole.desktop:10
@@ -2081,7 +2070,7 @@ msgstr ""
#. Name
#: randr/tderandrtray-autostart.desktop:2 randr/tderandrtray.desktop:2
msgid "TDERandRTray"
-msgstr "TDERandRTray"
+msgstr "Aplet kontroli monitora"
#. GenericName
#: randr/tderandrtray-autostart.desktop:4 randr/tderandrtray.desktop:4
@@ -2095,9 +2084,8 @@ msgstr "Zmiana rozmiaru i orientacji ekranów."
#. Name
#: samba/smbstatus.desktop:12
-#, fuzzy
msgid "Samba Status"
-msgstr "Monitor stanu Samby"
+msgstr "Status Samby"
#. Comment
#: samba/smbstatus.desktop:14
@@ -2253,7 +2241,6 @@ msgstr "Pliki czcionek"
#. Name
#: tdefontinst/viewpart/tdefontview.desktop:2
-#, fuzzy
msgid "TDEFontView"
msgstr "Przeglądarka czcionek"
diff --git a/translations/desktop_files/kcontrol-desktops/uz.po b/translations/desktop_files/kcontrol-desktops/uz.po
index ebf15ec9..f4dafd44 100644
--- a/translations/desktop_files/kcontrol-desktops/uz.po
+++ b/translations/desktop_files/kcontrol-desktops/uz.po
@@ -1267,9 +1267,7 @@ msgstr ""
#. Name
#: filetypes/filetypes.desktop:12
msgid "File Associations"
-msgstr ""
-"Fayl turi bilan\n"
-"bogʻliqlar"
+msgstr "Fayl turi bilan bogʻliqlar"
#. Comment
#: filetypes/filetypes.desktop:14
@@ -1824,9 +1822,7 @@ msgstr "Konqueror fayl boshqaruvchisi sifatida qanday koʻrinishini moslash"
#. Name
#: konq/filepreviews.desktop:11
msgid "Previews & Metadata"
-msgstr ""
-"Koʻrib chiqish\n"
-"va meta-maʼlumot"
+msgstr "Koʻrib chiqish va meta-maʼlumot"
#. Comment
#: konq/filepreviews.desktop:13
diff --git a/translations/desktop_files/kcontrol-desktops/uz@cyrillic.po b/translations/desktop_files/kcontrol-desktops/uz@cyrillic.po
index 5048a76b..3e3c2327 100644
--- a/translations/desktop_files/kcontrol-desktops/uz@cyrillic.po
+++ b/translations/desktop_files/kcontrol-desktops/uz@cyrillic.po
@@ -1266,9 +1266,7 @@ msgstr ""
#. Name
#: filetypes/filetypes.desktop:12
msgid "File Associations"
-msgstr ""
-"Файл тури билан\n"
-"боғлиқлар"
+msgstr "Файл тури билан боғлиқлар"
#. Comment
#: filetypes/filetypes.desktop:14
@@ -1822,9 +1820,7 @@ msgstr "Konqueror файл бошқарувчиси сифатида қанда
#. Name
#: konq/filepreviews.desktop:11
msgid "Previews & Metadata"
-msgstr ""
-"Кўриб чиқиш\n"
-"ва мета-маълумот"
+msgstr "Кўриб чиқиш ва мета-маълумот"
#. Comment
#: konq/filepreviews.desktop:13
diff --git a/translations/desktop_files/kdcop.desktop/cs.po b/translations/desktop_files/kdcop.desktop/cs.po
new file mode 100644
index 00000000..e055cb85
--- /dev/null
+++ b/translations/desktop_files/kdcop.desktop/cs.po
@@ -0,0 +1,28 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2020.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-19 01:46+0200\n"
+"PO-Revision-Date: 2020-09-13 17:05+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/kdcop-kdcopdesktop/cs/>\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Weblate 4.2.2\n"
+
+#. Name
+#: kdcop.desktop:11
+msgid "KDCOP"
+msgstr "KDCOP"
+
+#. GenericName
+#: kdcop.desktop:13
+msgid "DCOP browser"
+msgstr "Prohlížeč DCOP"
diff --git a/translations/desktop_files/kdesktop-icons/cs.po b/translations/desktop_files/kdesktop-icons/cs.po
index e6060170..bbf4bc24 100644
--- a/translations/desktop_files/kdesktop-icons/cs.po
+++ b/translations/desktop_files/kdesktop-icons/cs.po
@@ -1,20 +1,21 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2020.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-19 02:29+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2020-09-24 00:40+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/kdesktop-icons/cs/>\n"
"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Weblate 4.2.2\n"
#. Name
#: Home.desktop:2
@@ -95,7 +96,7 @@ msgstr "Vysunout"
#. Name
#: Templates/Directory.desktop:2
msgid "Folder..."
-msgstr "Složka..."
+msgstr "Složka…"
#. Comment
#: Templates/Directory.desktop:3
@@ -110,7 +111,7 @@ msgstr "Formát"
#. Name
#: Templates/HTMLFile.desktop:2
msgid "HTML File..."
-msgstr "HTML soubor..."
+msgstr "HTML soubor…"
#. Comment
#: Templates/HTMLFile.desktop:3
@@ -120,7 +121,7 @@ msgstr "Zadejte název HTML souboru:"
#. Name
#: Templates/TextFile.desktop:2
msgid "Text File..."
-msgstr "Textový soubor..."
+msgstr "Textový soubor…"
#. Comment
#: Templates/TextFile.desktop:3
@@ -130,7 +131,7 @@ msgstr "Zadejte název textového souboru:"
#. Name
#: Templates/linkCAMERA.desktop:2
msgid "Camera Device..."
-msgstr "Kamera..."
+msgstr "Kamera…"
#. Comment
#: Templates/linkCAMERA.desktop:3
@@ -140,7 +141,7 @@ msgstr "Nová kamera"
#. Name
#: Templates/linkCDROM.desktop:2
msgid "CD-ROM Device..."
-msgstr "Jednotka CD-ROM..."
+msgstr "Jednotka CD-ROM…"
#. Comment
#: Templates/linkCDROM.desktop:3
@@ -150,7 +151,7 @@ msgstr "Nová jednotka CD-ROM"
#. Name
#: Templates/linkCDWRITER.desktop:2
msgid "CDWRITER Device..."
-msgstr "Vypalovačka CD..."
+msgstr "Vypalovačka CD…"
#. Comment
#: Templates/linkCDWRITER.desktop:3
@@ -160,7 +161,7 @@ msgstr "Nová vypalovačka CD"
#. Name
#: Templates/linkDVDROM.desktop:2
msgid "DVD-ROM Device..."
-msgstr "Jednotka DVD-ROM..."
+msgstr "Jednotka DVD-ROM…"
#. Comment
#: Templates/linkDVDROM.desktop:3
@@ -170,7 +171,7 @@ msgstr "Nová jednotka DVD-ROM"
#. Name
#: Templates/linkFloppy.desktop:2
msgid "Floppy Device..."
-msgstr "Disketová jednotka..."
+msgstr "Disketová jednotka…"
#. Comment
#: Templates/linkFloppy.desktop:3
@@ -180,7 +181,7 @@ msgstr "Nová disketová jednotka"
#. Name
#: Templates/linkHD.desktop:2
msgid "Hard Disc Device..."
-msgstr "Pevný disk..."
+msgstr "Pevný disk…"
#. Comment
#: Templates/linkHD.desktop:3
@@ -190,7 +191,7 @@ msgstr "Nový pevný disk"
#. Name
#: Templates/linkMO.desktop:2
msgid "MO Device..."
-msgstr "MO zařízení..."
+msgstr "MO zařízení…"
#. Comment
#: Templates/linkMO.desktop:3
@@ -200,7 +201,7 @@ msgstr "Nová MO mechanika"
#. Name
#: Templates/linkNFS.desktop:2
msgid "NFS..."
-msgstr ""
+msgstr "NFS…"
#. Comment
#: Templates/linkNFS.desktop:3
@@ -210,7 +211,7 @@ msgstr "Nový NFS odkaz"
#. Name
#: Templates/linkProgram.desktop:2
msgid "Link to Application..."
-msgstr "Odkaz na aplikaci..."
+msgstr "Odkaz na aplikaci…"
#. Comment
#: Templates/linkProgram.desktop:3
@@ -220,7 +221,7 @@ msgstr "Nový odkaz na aplikaci"
#. Name
#: Templates/linkURL.desktop:2
msgid "Link to Location (URL)..."
-msgstr "Odkaz na umístění (URL)..."
+msgstr "Odkaz na umístění (URL)…"
#. Comment
#: Templates/linkURL.desktop:3
@@ -230,7 +231,7 @@ msgstr "Zadejte odkaz na umístění (URL):"
#. Name
#: Templates/linkZIP.desktop:2
msgid "ZIP Device..."
-msgstr "ZIP jednotka..."
+msgstr "ZIP jednotka…"
#. Comment
#: Templates/linkZIP.desktop:3
@@ -261,12 +262,12 @@ msgstr "Prohlížení Internetu"
#. Name
#: directory.autostart:3
msgid "Autostart"
-msgstr ""
+msgstr "Po spuštění"
#. Name
#: directory.desktop:5
msgid "Desktop"
-msgstr "Pracovní plocha"
+msgstr "Plocha"
#. Name
#: directory.templates:3
diff --git a/translations/desktop_files/khelpcenter-desktops/cs.po b/translations/desktop_files/khelpcenter-desktops/cs.po
index 5c228096..5c9f16d6 100644
--- a/translations/desktop_files/khelpcenter-desktops/cs.po
+++ b/translations/desktop_files/khelpcenter-desktops/cs.po
@@ -1,20 +1,21 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2020.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-19 09:37+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2020-09-24 00:40+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/khelpcenter-desktop-files/cs/>\n"
"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Weblate 4.2.2\n"
#. Name
#: Help.desktop:10
@@ -114,9 +115,8 @@ msgstr "(n) Nové"
#. Name
#: plugins/adminguide.desktop:6
-#, fuzzy
msgid "TDE Admininstrator Guide"
-msgstr "Příručka uživatele TDE"
+msgstr "Příručka správce TDE"
#. Name
#: plugins/applets.desktop:6
@@ -136,7 +136,7 @@ msgstr "Často kladené dotazy TDE"
#. Name
#: plugins/hardwaremodules.desktop:6
msgid "Hardware"
-msgstr ""
+msgstr "Hardware"
#. Name
#: plugins/info.desktop:7
@@ -211,4 +211,4 @@ msgstr "Unixové manuálové stránky"
#. Name
#: plugins/Scrollkeeper/.directory:5
msgid "Scrollkeeper"
-msgstr ""
+msgstr "Scrollkeeper"
diff --git a/translations/desktop_files/kicker-desktops/cs.po b/translations/desktop_files/kicker-desktops/cs.po
index bb6fd1fd..b96c0502 100644
--- a/translations/desktop_files/kicker-desktops/cs.po
+++ b/translations/desktop_files/kicker-desktops/cs.po
@@ -1,20 +1,21 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2020.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-19 16:24+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2020-09-24 00:40+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/kicker-desktop-files/cs/>\n"
"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Weblate 4.2.2\n"
#. Name
#: applets/clock/clockapplet.desktop:4
@@ -44,7 +45,7 @@ msgstr "Tlačítka odhlášení/uzamčení"
#. Comment
#: applets/lockout/lockout.desktop:5
msgid "Adds buttons for locking screen and session logout"
-msgstr "Přidá tlačítka pro uzamčení obrazovky a odhlášení z relace"
+msgstr "Přidá tlačítka pro uzamčení obrazovky a odhlášení ze sezení"
#. Name
#: applets/media/mediaapplet.desktop:3
@@ -154,7 +155,7 @@ msgstr "Kasbar"
#. Comment
#: extensions/kasbar/kasbarextension.desktop:4
msgid "An alternative taskbar panel applet."
-msgstr "Applet s alternativním pruhem úloh"
+msgstr "Applet s alternativním pruhem úloh."
#. Name
#: extensions/sidebar/sidebarextension.desktop:2
@@ -164,7 +165,7 @@ msgstr "Univerzální postranní lišta"
#. Comment
#: extensions/sidebar/sidebarextension.desktop:4
msgid "Wrapper around Konqueror's navigation panel"
-msgstr ""
+msgstr "Obal kolem navigačního panelu Konqueroru"
#. Name
#: extensions/taskbar/taskbarextension.desktop:2
@@ -204,7 +205,7 @@ msgstr "Zobrazit plochu"
#. Comment
#: kicker/buttons/desktop.desktop:4
msgid "A button that gives quick access to the desktop when pressed"
-msgstr "Tlačítko s rychlým přístupem k pracovní ploše"
+msgstr "Tlačítko poskytující rychlý přístup k pracovní ploše"
#. Name
#: kicker/buttons/exec.desktop:2
@@ -239,7 +240,7 @@ msgstr "Nabídka se seznamem otevřených oken"
#. Name
#: kicker/core/childpanelextension.desktop:2
msgid "Panel"
-msgstr ""
+msgstr "Panel"
#. Comment
#: kicker/core/childpanelextension.desktop:4
@@ -249,7 +250,7 @@ msgstr "Rozšíření závislého panelu."
#. Comment
#: kicker/interfaces/kickoffsearchplugin.desktop:5
msgid "A search plugin for Kickoff"
-msgstr ""
+msgstr "Vyhledávací modul pro Kickoff"
#. Name
#: kicker/kcmkicker.desktop:10
@@ -284,12 +285,12 @@ msgstr "Vyhledávání na webu"
#. Name
#: menuext/kate/katesessionmenu.desktop:2
msgid "Kate Session Menu"
-msgstr "Nabídka relace Kate"
+msgstr "Nabídka sezení Kate"
#. Comment
#: menuext/kate/katesessionmenu.desktop:4
msgid "Allows you to open Kate with a specified session, or create a new one"
-msgstr "Umožňuje otevřít Kate s určitou relací nebo si vytvořit novou"
+msgstr "Umožňuje otevřít Kate s určitým sezením nebo si vytvořit nové"
#. Name
#: menuext/konq-profiles/konquerormenu.desktop:2
@@ -304,12 +305,12 @@ msgstr "Přístup k profilům Konqueroru"
#. Name
#: menuext/konsole/konsolemenu.desktop:2
msgid "Terminal Sessions"
-msgstr "Terminálové relace"
+msgstr "Terminálová sezení"
#. Comment
#: menuext/konsole/konsolemenu.desktop:4
msgid "Menu for starting a terminal emulator with a session or bookmark"
-msgstr "Nabídka pro spuštění teminálu s relací nebo záložkou"
+msgstr "Nabídka pro spuštění terminálu se sezením nebo záložkou"
#. Name
#: menuext/prefmenu/prefmenu.desktop:2
@@ -319,7 +320,7 @@ msgstr "Ovládací centrum"
#. Comment
#: menuext/prefmenu/prefmenu.desktop:4
msgid "Trinity Control Center modules menu"
-msgstr "Nabídka modulů Ovládacího centra"
+msgstr "Nabídka modulů Ovládacího centra Trinity"
#. Name
#: menuext/recentdocs/recentdocs.desktop:2
@@ -364,7 +365,7 @@ msgstr "Nabídka tiskového systému"
#. Name
#: menuext/tom/tom.desktop:2
msgid "TOM"
-msgstr ""
+msgstr "TOM"
#. Comment
#: menuext/tom/tom.desktop:4
diff --git a/translations/desktop_files/kicker-desktops/pl.po b/translations/desktop_files/kicker-desktops/pl.po
index f9c4e2c4..e6b128a7 100644
--- a/translations/desktop_files/kicker-desktops/pl.po
+++ b/translations/desktop_files/kicker-desktops/pl.po
@@ -1,20 +1,22 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Jan Stolarek <jwstolarek@gmail.com>, 2020.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-19 16:24+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2020-08-12 23:04+0000\n"
+"Last-Translator: Jan Stolarek <jwstolarek@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kicker-desktop-files/pl/>\n"
"Language: pl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.1.1\n"
#. Name
#: applets/clock/clockapplet.desktop:4
@@ -58,9 +60,8 @@ msgstr "Bezpośredni dostęp do Twoich urządzeń przechowywania danych"
#. Name
#: applets/menu/menuapplet.desktop:4
-#, fuzzy
msgid "Menu"
-msgstr "Menu TDE"
+msgstr "Menu"
#. Comment
#: applets/menu/menuapplet.desktop:6
@@ -241,7 +242,7 @@ msgstr "Menu pokazujące wszystkie otwarte okna"
#. Name
#: kicker/core/childpanelextension.desktop:2
msgid "Panel"
-msgstr ""
+msgstr "Panel"
#. Comment
#: kicker/core/childpanelextension.desktop:4
@@ -251,7 +252,7 @@ msgstr "Rozszerzenie panelu potomnego."
#. Comment
#: kicker/interfaces/kickoffsearchplugin.desktop:5
msgid "A search plugin for Kickoff"
-msgstr ""
+msgstr "Plugin wyszukiwania dla Kickoff"
#. Name
#: kicker/kcmkicker.desktop:10
@@ -366,7 +367,7 @@ msgstr "Menu systemu drukowania"
#. Name
#: menuext/tom/tom.desktop:2
msgid "TOM"
-msgstr ""
+msgstr "TOM"
#. Comment
#: menuext/tom/tom.desktop:4
diff --git a/translations/desktop_files/klipper-desktops/cs.po b/translations/desktop_files/klipper-desktops/cs.po
index 6fb13d17..4a926c41 100644
--- a/translations/desktop_files/klipper-desktops/cs.po
+++ b/translations/desktop_files/klipper-desktops/cs.po
@@ -1,25 +1,26 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2020.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-21 14:45+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2020-09-24 00:40+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/klipper-desktop-files/cs/>\n"
"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Weblate 4.2.2\n"
#. Name
#: klipper.desktop:2
msgid "Klipper"
-msgstr ""
+msgstr "Klipper"
#. GenericName
#: klipper.desktop:4
@@ -115,12 +116,12 @@ msgstr "Posl&at soubor"
#. Description
#: klipperrc.desktop:96
msgid "Gopher URL"
-msgstr ""
+msgstr "URL pro gopher"
#. Description
#: klipperrc.desktop:111
msgid "ftp URL"
-msgstr "FTP URL"
+msgstr "URL pro ftp"
#. Description
#: klipperrc.desktop:121
diff --git a/translations/desktop_files/kmenuedit.desktop/cs.po b/translations/desktop_files/kmenuedit.desktop/cs.po
index 0d2bbc3a..e217aaad 100644
--- a/translations/desktop_files/kmenuedit.desktop/cs.po
+++ b/translations/desktop_files/kmenuedit.desktop/cs.po
@@ -1,26 +1,26 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2020.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-21 14:56+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2020-09-24 00:40+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/kmenuedit-kmenueditdesktop/cs/>\n"
"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Weblate 4.2.2\n"
#. Name
#: kmenuedit.desktop:2
-#, fuzzy
msgid "KMenuEdit"
-msgstr "Editor nabídek"
+msgstr "KMenuEdit"
#. GenericName
#: kmenuedit.desktop:4
diff --git a/translations/desktop_files/knetattach.desktop/cs.po b/translations/desktop_files/knetattach.desktop/cs.po
index f7b5f3de..53329039 100644
--- a/translations/desktop_files/knetattach.desktop/cs.po
+++ b/translations/desktop_files/knetattach.desktop/cs.po
@@ -1,25 +1,26 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2020.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-21 14:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2020-09-24 00:40+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/knetattach-knetattachdesktop/cs/>\n"
"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Weblate 4.2.2\n"
#. Name
#: knetattach.desktop:2
msgid "KNetAttach"
-msgstr ""
+msgstr "KNetAttach"
#. GenericName
#: knetattach.desktop:4
diff --git a/translations/desktop_files/konqueror-desktops/cs.po b/translations/desktop_files/konqueror-desktops/cs.po
index 8e5c8be7..5b2085d3 100644
--- a/translations/desktop_files/konqueror-desktops/cs.po
+++ b/translations/desktop_files/konqueror-desktops/cs.po
@@ -1,20 +1,21 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2020.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-21 15:23+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2020-09-24 00:40+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/konqueror-desktop-files/cs/>\n"
"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Weblate 4.2.2\n"
#. Name
#: Home.desktop:7
@@ -46,12 +47,12 @@ msgstr "Vícesloupcový pohled"
#: kfmclient_war.desktop:9 konqbrowser.desktop:7 konqueror.desktop:6
#: konquerorsu.desktop:8
msgid "Konqueror"
-msgstr ""
+msgstr "Konqueror"
#. GenericName
#: konqbrowser.desktop:9
msgid "Web Browser"
-msgstr "WWW prohlížeč"
+msgstr "Webový prohlížeč"
#. Name
#: konqfilemgr.desktop:7
@@ -66,7 +67,7 @@ msgstr "Správce souborů a prohlížeč Webu pro prostředí TDE"
#. GenericName
#: konquerorsu.desktop:10
msgid "File Manager - Super User Mode"
-msgstr "Správce souborů - superuživatelský režim"
+msgstr "Správce souborů – režim správce"
#. Name
#: kttsplugin/tdehtmlkttsd.desktop:12
@@ -75,9 +76,8 @@ msgstr "Modul text-na-řeč"
#. Comment
#: kttsplugin/tdehtmlkttsd.desktop:14
-#, fuzzy
msgid "A plugin which enables texts to be read aloud on the web with KTTS"
-msgstr "Modul shellového příkazu pro Konqueror"
+msgstr "Modul, který umožňuje číst texty na webu nahlas pomocí KTTS"
#. Name
#: listview/konq_detailedlistview.desktop:3
@@ -112,7 +112,7 @@ msgstr "KDED modul pro načítání Konqueroru"
#. Comment
#: preloader/konqy_preloader.desktop:6
msgid "Reduces Konqueror startup time"
-msgstr "Redukuje čas pro spuštění Konqueroru"
+msgstr "Snižuje čas pro spuštění Konqueroru"
#. Name
#: profile_filemanagement.desktop:5
@@ -131,9 +131,8 @@ msgstr "Vývoj TDE"
#. Name
#: profile_midnightcommander.desktop:9
-#, fuzzy
msgid "Midnight Commander"
-msgstr "Modul shellového příkazu"
+msgstr "Midnight Commander"
#. Name
#: profile_simplebrowser.desktop:2
@@ -162,27 +161,27 @@ msgstr "Prohlížení internetu"
#: quickprint/text-tex-print.desktop:6 quickprint/text-xml-print.desktop:6
#: quickprint/text-xslt-print.desktop:6
msgid "Print..."
-msgstr "Tisknout..."
+msgstr "Tisknout…"
#. Name
#: remoteencodingplugin/kremoteencodingplugin.desktop:13
msgid "Remote Encoding"
-msgstr "Modul vzdáleného kódování"
+msgstr "Vzdálené kódování"
#. Comment
#: remoteencodingplugin/kremoteencodingplugin.desktop:15
msgid "A Plugin for setting the encoding of remote hosts (FTP, SSH, etc.)"
-msgstr "Modul vzdáleného kódování pro Konqueror"
+msgstr "Modul pro nastavení kódování vzdálený serverů (FTP, SSH, atd.)"
#. Name
#: shellcmdplugin/kshellcmdplugin.desktop:15
msgid "Run Command"
-msgstr "Modul shellového příkazu"
+msgstr "Spustit příkaz"
#. Comment
#: shellcmdplugin/kshellcmdplugin.desktop:17
msgid "A plugin which enables commands to be executed within folders"
-msgstr "Modul shellového příkazu pro Konqueror"
+msgstr "Modul umožňující provádění příkazů ve složkách"
#. Name
#: sidebar/konq_sidebartng.desktop:4
@@ -192,7 +191,7 @@ msgstr "Navigační panel"
#. Name
#: sidebar/test/test.desktop:5
msgid "Test"
-msgstr ""
+msgstr "Test"
#. Name
#: sidebar/trees/history_module/kcmhistory.desktop:10
diff --git a/translations/desktop_files/konqueror-desktops/pl.po b/translations/desktop_files/konqueror-desktops/pl.po
index 3fce2917..97607e35 100644
--- a/translations/desktop_files/konqueror-desktops/pl.po
+++ b/translations/desktop_files/konqueror-desktops/pl.po
@@ -1,20 +1,22 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Jan Stolarek <jwstolarek@gmail.com>, 2020.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-21 15:23+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2020-08-12 23:04+0000\n"
+"Last-Translator: Jan Stolarek <jwstolarek@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/konqueror-desktop-files/pl/>\n"
"Language: pl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.1.1\n"
#. Name
#: Home.desktop:7
@@ -46,7 +48,7 @@ msgstr "Widok wielokolumnowy"
#: kfmclient_war.desktop:9 konqbrowser.desktop:7 konqueror.desktop:6
#: konquerorsu.desktop:8
msgid "Konqueror"
-msgstr ""
+msgstr "Konqueror"
#. GenericName
#: konqbrowser.desktop:9
@@ -75,9 +77,8 @@ msgstr "Wtyczka odczytywania tekstu"
#. Comment
#: kttsplugin/tdehtmlkttsd.desktop:14
-#, fuzzy
msgid "A plugin which enables texts to be read aloud on the web with KTTS"
-msgstr "Wtyczka polecenia powłoki dla Konquerora"
+msgstr "Plugin umożliwiający syntezę mowy przy użyciu KTTS"
#. Name
#: listview/konq_detailedlistview.desktop:3
@@ -131,9 +132,8 @@ msgstr "Rozwijanie TDE"
#. Name
#: profile_midnightcommander.desktop:9
-#, fuzzy
msgid "Midnight Commander"
-msgstr "Wtyczka polecenia powłoki"
+msgstr "Midnight Commander"
#. Name
#: profile_simplebrowser.desktop:2
@@ -192,7 +192,7 @@ msgstr "Panel nawigacyjny"
#. Name
#: sidebar/test/test.desktop:5
msgid "Test"
-msgstr ""
+msgstr "Test"
#. Name
#: sidebar/trees/history_module/kcmhistory.desktop:10
@@ -251,7 +251,7 @@ msgstr "Katalog domowy"
#. Comment
#: sidebar/trees/init/home.desktop:8
msgid "This folder contains your personal files"
-msgstr "Ten katalog zawiera wszystkie twoje osobiste pliki."
+msgstr "Ten katalog zawiera wszystkie twoje osobiste pliki"
#. Name
#: sidebar/trees/init/remote.desktop:2 sidebar/trees/init/remote/.directory:2
@@ -322,7 +322,7 @@ msgstr "Ustawienia"
#. Name
#: sidebar/trees/init/system.desktop:6
msgid "System"
-msgstr ""
+msgstr "System"
#. Comment
#: sidebar/trees/init/system.desktop:8
@@ -333,15 +333,13 @@ msgstr ""
#. Name
#: sidebar/trees/init/trash.desktop:9
-#, fuzzy
msgid "Trash Folder"
-msgstr "Katalog"
+msgstr "Katalog kosza"
#. Comment
#: sidebar/trees/init/trash.desktop:11
-#, fuzzy
msgid "This folder displays the contents of your Trash Bin"
-msgstr "Ten katalog zawiera wszystkie twoje osobiste pliki."
+msgstr "Ten katalog wyświetla zawartość twojego Kosza"
#. Name
#: sidebar/web_module/webmodule_add.desktop:5
diff --git a/translations/desktop_files/konsole-desktops/cs.po b/translations/desktop_files/konsole-desktops/cs.po
index 48046a73..e8910362 100644
--- a/translations/desktop_files/konsole-desktops/cs.po
+++ b/translations/desktop_files/konsole-desktops/cs.po
@@ -1,20 +1,21 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2020.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-26 02:40+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2020-10-11 17:31+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/konsole-desktop-files/cs/>\n"
"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Weblate 4.2.2\n"
#. Name
#: kcmkonsole.desktop:9
@@ -92,12 +93,12 @@ msgstr "Nový Midnight Commander"
#. Name
#: other/screen.desktop:3
msgid "Screen Session"
-msgstr "Screen relace"
+msgstr "Sezení „screen“"
#. Comment
#: other/screen.desktop:4
msgid "New Screen Session"
-msgstr "Nová 'screen' relace"
+msgstr "Nové sezení „screen“"
#. Name
#. Title0
diff --git a/translations/desktop_files/konsole-desktops/pl.po b/translations/desktop_files/konsole-desktops/pl.po
index 912a23be..a7354e04 100644
--- a/translations/desktop_files/konsole-desktops/pl.po
+++ b/translations/desktop_files/konsole-desktops/pl.po
@@ -1,20 +1,22 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Jan Stolarek <jwstolarek@gmail.com>, 2020.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-26 02:40+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2020-08-12 23:04+0000\n"
+"Last-Translator: Jan Stolarek <jwstolarek@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/konsole-desktop-files/pl/>\n"
"Language: pl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.1.1\n"
#. Name
#: kcmkonsole.desktop:9
@@ -80,7 +82,6 @@ msgstr "Konsola linuksowa (nowa)"
#. Name
#: other/mc.desktop:3
-#, fuzzy
msgid "Midnight Commander"
msgstr "Midnight Commander"
@@ -124,7 +125,7 @@ msgstr "Nowa powłoka administratora"
#. Name
#: other/sumc.desktop.cmake:3
msgid "Root Midnight Commander"
-msgstr "Midnight Commander - tryb administratora"
+msgstr "Midnight Commander - tryb administratora"
#. Comment
#: other/sumc.desktop.cmake:4
@@ -133,9 +134,8 @@ msgstr "Midnight Commander - tryb administratora"
#. Name
#: terminalhere.desktop:6
-#, fuzzy
msgid "Terminal"
-msgstr "Program terminala"
+msgstr "Terminal"
#. Name
#: terminalhere.desktop:11
@@ -144,47 +144,40 @@ msgstr "Otwórz tutaj terminal"
#. Name
#: other/2shells:2
-#, fuzzy
msgid "Two consoles"
-msgstr "Konsola"
+msgstr "Dwa terminale"
#. Title1
#: other/2shells:7 other/3shells:7 other/4shells:7 other/5shells:7
-#, fuzzy
msgid "Shell No. 2"
-msgstr "Powłoka"
+msgstr "Powłoka nr 2"
#. Name
#: other/3shells:2
msgid "Three consoles"
-msgstr ""
+msgstr "Trzy terminale"
#. Title2
#: other/3shells:8 other/4shells:8 other/5shells:8
-#, fuzzy
msgid "Shell No. 3"
-msgstr "Powłoka"
+msgstr "Powłoka nr 3"
#. Name
#: other/4shells:2
-#, fuzzy
msgid "Four consoles"
-msgstr "Konsola linuksowa"
+msgstr "Cztery terminale"
#. Title3
#: other/4shells:9 other/5shells:9
-#, fuzzy
msgid "Shell No. 4"
-msgstr "Powłoka"
+msgstr "Powłoka nr 4"
#. Name
#: other/5shells:2
-#, fuzzy
msgid "Five consoles"
-msgstr "Konsola linuksowa"
+msgstr "Pięć terminali"
#. Title4
#: other/5shells:10
-#, fuzzy
msgid "Shell No. 5"
-msgstr "Powłoka"
+msgstr "Powłoka nr 5"
diff --git a/translations/desktop_files/konsole-eventsrc/cs.po b/translations/desktop_files/konsole-eventsrc/cs.po
index 1a9e1eee..13ea1e12 100644
--- a/translations/desktop_files/konsole-eventsrc/cs.po
+++ b/translations/desktop_files/konsole-eventsrc/cs.po
@@ -1,72 +1,73 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2020.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-21 15:54+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2020-10-11 17:31+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/konsole-events/cs/>\n"
"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Weblate 4.2.2\n"
#. Comment
#: eventsrc:3
msgid "Konsole"
-msgstr ""
+msgstr "Konsole"
#. Name
#: eventsrc:6
msgid "Bell in visible session"
-msgstr "Zvonek ve viditelné relaci"
+msgstr "Zvonek ve viditelném sezení"
#. Comment
#: eventsrc:7
msgid "Bell emitted within a visible session"
-msgstr "Vydán zvonek ve viditelné relaci"
+msgstr "Vydán zvonek ve viditelném sezení"
#. Name
#: eventsrc:12
msgid "Bell in non-visible session"
-msgstr "Zvonek v neviditelné relaci"
+msgstr "Zvonek v neviditelném sezení"
#. Comment
#: eventsrc:13
msgid "Bell emitted within a non-visible session"
-msgstr "Vydán zvonek v neviditelné relaci"
+msgstr "Vydán zvonek v neviditelném sezení"
#. Name
#: eventsrc:18
msgid "Activity in monitored session"
-msgstr "Aktivita v monitorované relaci"
+msgstr "Aktivita v monitorovaném sezení"
#. Comment
#: eventsrc:19
msgid "Activity detected in a monitored session"
-msgstr "Detekována aktivita v monitorované relaci"
+msgstr "Detekována aktivita v monitorovaném sezení"
#. Name
#: eventsrc:23
msgid "Silence in monitored session"
-msgstr "Ticho v monitorované relaci"
+msgstr "Ticho v monitorovaném sezení"
#. Comment
#: eventsrc:24
msgid "Silence detected in a monitored session"
-msgstr "Detekováno ticho v monitorované relaci"
+msgstr "Detekováno ticho v monitorovaném sezení"
#. Name
#: eventsrc:28
msgid "Session finished with non-zero status"
-msgstr "Relace ukončena s nenulovým stavem"
+msgstr "Sezení ukončeno s nenulovým stavem"
#. Comment
#: eventsrc:29
msgid "A session has exited with non-zero status"
-msgstr "Relace byla ukončena s nenulovým stavem"
+msgstr "Sezení bylo ukončeno s nenulovým stavem"
diff --git a/translations/desktop_files/kpager.desktop/cs.po b/translations/desktop_files/kpager.desktop/cs.po
index 694b972f..5e6c10cb 100644
--- a/translations/desktop_files/kpager.desktop/cs.po
+++ b/translations/desktop_files/kpager.desktop/cs.po
@@ -1,25 +1,26 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2020.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-21 16:16+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2020-09-24 00:40+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/kpager-kpagerdesktop/cs/>\n"
"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Weblate 4.2.2\n"
#. Name
#: kpager.desktop:2
msgid "KPager"
-msgstr ""
+msgstr "KPager"
#. GenericName
#: kpager.desktop:4
diff --git a/translations/desktop_files/kpager.desktop/pl.po b/translations/desktop_files/kpager.desktop/pl.po
index c42713b7..a141ac64 100644
--- a/translations/desktop_files/kpager.desktop/pl.po
+++ b/translations/desktop_files/kpager.desktop/pl.po
@@ -1,25 +1,27 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Jan Stolarek <jwstolarek@gmail.com>, 2020.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-21 16:16+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2020-08-12 23:04+0000\n"
+"Last-Translator: Jan Stolarek <jwstolarek@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kpager-kpagerdesktop/pl/>\n"
"Language: pl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.1.1\n"
#. Name
#: kpager.desktop:2
msgid "KPager"
-msgstr ""
+msgstr "Przełącznik pulpitów"
#. GenericName
#: kpager.desktop:4
diff --git a/translations/desktop_files/kpersonalizer.desktop/cs.po b/translations/desktop_files/kpersonalizer.desktop/cs.po
index de28432e..94a3d41c 100644
--- a/translations/desktop_files/kpersonalizer.desktop/cs.po
+++ b/translations/desktop_files/kpersonalizer.desktop/cs.po
@@ -1,25 +1,26 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2020.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-21 16:17+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2020-09-24 00:40+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/kpersonalizer-kpersonalizerdesktop/cs/>\n"
"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Weblate 4.2.2\n"
#. Name
#: kpersonalizer.desktop:7
msgid "KPersonalizer"
-msgstr ""
+msgstr "KPersonalizer"
#. GenericName
#: kpersonalizer.desktop:9
diff --git a/translations/desktop_files/kpersonalizer.desktop/pl.po b/translations/desktop_files/kpersonalizer.desktop/pl.po
index 10fe565b..bb8abeea 100644
--- a/translations/desktop_files/kpersonalizer.desktop/pl.po
+++ b/translations/desktop_files/kpersonalizer.desktop/pl.po
@@ -1,25 +1,27 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Jan Stolarek <jwstolarek@gmail.com>, 2020.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-21 16:17+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2020-08-12 23:04+0000\n"
+"Last-Translator: Jan Stolarek <jwstolarek@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kpersonalizer-kpersonalizerdesktop/pl/>\n"
"Language: pl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.1.1\n"
#. Name
#: kpersonalizer.desktop:7
msgid "KPersonalizer"
-msgstr ""
+msgstr "Personalizacja TDE"
#. GenericName
#: kpersonalizer.desktop:9
diff --git a/translations/desktop_files/ksplash-desktops/cs.po b/translations/desktop_files/ksplash-desktops/cs.po
index 7dea9d92..11d04e18 100644
--- a/translations/desktop_files/ksplash-desktops/cs.po
+++ b/translations/desktop_files/ksplash-desktops/cs.po
@@ -1,20 +1,21 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2020.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-21 19:16+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2020-09-24 00:40+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/ksplash-desktop-files/cs/>\n"
"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Weblate 4.2.2\n"
#. Name
#: kcmksplash/ksplashthememgr.desktop:12
@@ -29,18 +30,17 @@ msgstr "Správce motivů úvodních obrazovek"
#. Keywords
#: kcmksplash/ksplashthememgr.desktop:16
msgid "splash screen;splash theme;startup;"
-msgstr "úvodní obrazovka;splash;"
+msgstr "úvodní obrazovka;splash;spuštění;"
#. Name
#: ksplash.desktop:2
-#, fuzzy
msgid "KSplash"
-msgstr "Staré"
+msgstr "KSplash"
#. Name
#: themeengine/default/ksplashdefault.desktop:3
msgid "KSplashLegacy"
-msgstr "Staré"
+msgstr "Klasický"
#. Comment
#: themeengine/default/ksplashdefault.desktop:4
@@ -48,7 +48,7 @@ msgstr "Staré"
#: themeengine/standard/ksplashstandard.desktop:4
#: themeengine/unified/ksplashunified.desktop:4
msgid "KSplash Plugin"
-msgstr "Modul aplikaci KSplash"
+msgstr "Modul aplikace KSplash"
#. Name
#: themeengine/redmond/ksplashredmond.desktop:3
@@ -62,6 +62,5 @@ msgstr "Standardní"
#. Name
#: themeengine/unified/ksplashunified.desktop:3
-#, fuzzy
msgid "KSplashUnified"
-msgstr "Redmond"
+msgstr "Jednotný"
diff --git a/translations/desktop_files/ksplash-desktops/pl.po b/translations/desktop_files/ksplash-desktops/pl.po
index 9421c598..1e637ad0 100644
--- a/translations/desktop_files/ksplash-desktops/pl.po
+++ b/translations/desktop_files/ksplash-desktops/pl.po
@@ -1,20 +1,22 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Jan Stolarek <jwstolarek@gmail.com>, 2020.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-21 19:16+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2020-08-12 23:04+0000\n"
+"Last-Translator: Jan Stolarek <jwstolarek@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/ksplash-desktop-files/pl/>\n"
"Language: pl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.1.1\n"
#. Name
#: kcmksplash/ksplashthememgr.desktop:12
@@ -33,9 +35,8 @@ msgstr "ekran powitalny;motyw ekranu powitalnego;rozpoczęcie;start;"
#. Name
#: ksplash.desktop:2
-#, fuzzy
msgid "KSplash"
-msgstr "Wtyczka KSplash"
+msgstr "KSplash"
#. Name
#: themeengine/default/ksplashdefault.desktop:3
diff --git a/translations/desktop_files/ksplash-themes/cs.po b/translations/desktop_files/ksplash-themes/cs.po
new file mode 100644
index 00000000..b1165657
--- /dev/null
+++ b/translations/desktop_files/ksplash-themes/cs.po
@@ -0,0 +1,75 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2020.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-21 19:33+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Name
+#: TDE-Classic/Theme.rc:4 TDE-Classic/locolor/Theme.rc:4
+msgid "TDE 3.5 Splash Screen"
+msgstr ""
+
+#. Description
+#: TDE-Classic/Theme.rc:5 TDE-Classic/locolor/Theme.rc:5
+msgid "Waves of change"
+msgstr ""
+
+#. Name
+#: blue-bend/Theme.rc:6
+msgid "Blue-Bend KDE Splash Theme"
+msgstr ""
+
+#. Description
+#: blue-bend/Theme.rc:7
+msgid "Load Blue-Bend KDE KSplash theme."
+msgstr ""
+
+#. Name
+#: default/Theme.rc:6
+msgid "Refresh TDE Splash Theme"
+msgstr ""
+
+#. Description
+#: default/Theme.rc:7
+msgid "Load Refresh TDE KSplash theme."
+msgstr ""
+
+#. Name
+#: none/Theme.rc:4
+msgid "No Splash Screen"
+msgstr ""
+
+#. Description
+#: none/Theme.rc:5
+msgid "Splash Screen Turned Off"
+msgstr ""
+
+#. Name
+#: simple/Theme.rc:4
+msgid "Simple Splash Screen"
+msgstr ""
+
+#. Description
+#: simple/Theme.rc:5
+msgid "Very Simple Optimized Splash Screen"
+msgstr ""
+
+#. Name
+#: unified/Theme.rc:4
+msgid "Trinity Unified Splash Screen"
+msgstr ""
+
+#. Description
+#: unified/Theme.rc:5
+msgid "Unified system startup screen"
+msgstr ""
diff --git a/translations/desktop_files/ksysguard-desktops/cs.po b/translations/desktop_files/ksysguard-desktops/cs.po
index b5e17358..8a7d10de 100644
--- a/translations/desktop_files/ksysguard-desktops/cs.po
+++ b/translations/desktop_files/ksysguard-desktops/cs.po
@@ -1,26 +1,26 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2020.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-21 20:10+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2020-09-24 00:40+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/ksysguard-desktop-files/cs/>\n"
"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Weblate 4.2.2\n"
#. Name
#: gui/ksysguard.desktop:2
-#, fuzzy
msgid "KSysGuard"
-msgstr "Strážce systému"
+msgstr "KSysGuard"
#. GenericName
#: gui/ksysguard.desktop:4
diff --git a/translations/desktop_files/ksysguard-desktops/pl.po b/translations/desktop_files/ksysguard-desktops/pl.po
index dae36055..d2226266 100644
--- a/translations/desktop_files/ksysguard-desktops/pl.po
+++ b/translations/desktop_files/ksysguard-desktops/pl.po
@@ -1,24 +1,25 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Jan Stolarek <jwstolarek@gmail.com>, 2020.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-21 20:10+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2020-08-12 23:04+0000\n"
+"Last-Translator: Jan Stolarek <jwstolarek@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/ksysguard-desktop-files/pl/>\n"
"Language: pl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.1.1\n"
#. Name
#: gui/ksysguard.desktop:2
-#, fuzzy
msgid "KSysGuard"
msgstr "Strażnik Systemu"
diff --git a/translations/desktop_files/ksysguard-eventsrc/cs.po b/translations/desktop_files/ksysguard-eventsrc/cs.po
index f534d8a5..f7805e1e 100644
--- a/translations/desktop_files/ksysguard-eventsrc/cs.po
+++ b/translations/desktop_files/ksysguard-eventsrc/cs.po
@@ -1,20 +1,21 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2020.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-21 20:10+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2020-09-24 00:40+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/ksysguard-events/cs/>\n"
"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Weblate 4.2.2\n"
#. Comment
#: eventsrc:3
@@ -23,9 +24,8 @@ msgstr "Správce systému"
#. Name
#: eventsrc:6
-#, fuzzy
msgid "pattern_match"
-msgstr "Hledaný vzor odpovídá"
+msgstr "pattern_match"
#. Comment
#: eventsrc:7
@@ -35,7 +35,7 @@ msgstr "Hledaný vzor odpovídá"
#. Name
#: eventsrc:10
msgid "sensor_alarm"
-msgstr ""
+msgstr "sensor_alarm"
#. Comment
#: eventsrc:11
diff --git a/translations/desktop_files/ktip.desktop/cs.po b/translations/desktop_files/ktip.desktop/cs.po
index 332da87f..e3320016 100644
--- a/translations/desktop_files/ktip.desktop/cs.po
+++ b/translations/desktop_files/ktip.desktop/cs.po
@@ -1,25 +1,26 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2020.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-21 20:16+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2020-09-24 00:40+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/ktip-ktipdesktop/cs/>\n"
"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Weblate 4.2.2\n"
#. Name
#: ktip.desktop:2
msgid "KTip"
-msgstr ""
+msgstr "KTip"
#. GenericName
#: ktip.desktop:4
diff --git a/translations/desktop_files/ktip.desktop/pl.po b/translations/desktop_files/ktip.desktop/pl.po
index ef76cc85..2ca086aa 100644
--- a/translations/desktop_files/ktip.desktop/pl.po
+++ b/translations/desktop_files/ktip.desktop/pl.po
@@ -1,25 +1,27 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Jan Stolarek <jwstolarek@gmail.com>, 2020.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-21 20:16+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2020-08-12 23:04+0000\n"
+"Last-Translator: Jan Stolarek <jwstolarek@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/ktip-ktipdesktop/pl/>\n"
"Language: pl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.1.1\n"
#. Name
#: ktip.desktop:2
msgid "KTip"
-msgstr ""
+msgstr "Porady"
#. GenericName
#: ktip.desktop:4
diff --git a/translations/desktop_files/l10n-desktops/pl.po b/translations/desktop_files/l10n-desktops/pl.po
index 03d541db..cd223b39 100644
--- a/translations/desktop_files/l10n-desktops/pl.po
+++ b/translations/desktop_files/l10n-desktops/pl.po
@@ -1,20 +1,22 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Jan Stolarek <jwstolarek@gmail.com>, 2020.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-22 18:27+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2020-08-12 23:04+0000\n"
+"Last-Translator: Jan Stolarek <jwstolarek@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/l10n-desktop-files/pl/>\n"
"Language: pl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.1.1\n"
#. Name
#: caribbean.desktop:2
@@ -74,7 +76,7 @@ msgstr "Europa Północna"
#. Name
#: oceania.desktop:2
msgid "Oceania"
-msgstr ""
+msgstr "Oceania"
#. Name
#: southafrica.desktop:2
diff --git a/translations/desktop_files/libkonq-desktops/cs.po b/translations/desktop_files/libkonq-desktops/cs.po
index 047789c9..08406961 100644
--- a/translations/desktop_files/libkonq-desktops/cs.po
+++ b/translations/desktop_files/libkonq-desktops/cs.po
@@ -1,20 +1,21 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2020.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-22 18:52+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2020-09-24 00:40+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/libkonq-desktop-files/cs/>\n"
"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Weblate 4.2.2\n"
#. Name
#: directory_bookmarkbar.desktop:3
@@ -24,7 +25,7 @@ msgstr "Lišta se záložkami"
#. Name
#: favicons/favicons.desktop:3
msgid "KDED Favicon Module"
-msgstr "Modul KDEDu Favicon"
+msgstr "KDED modul favicon"
#. Comment
#: favicons/favicons.desktop:4
@@ -39,4 +40,4 @@ msgstr "Modul pro kontextovou nabídku Konqueroru"
#. Name
#: servicemenus/edit-as-root.desktop:6
msgid "Edit as system administrator"
-msgstr ""
+msgstr "Upravit jako správce"
diff --git a/translations/desktop_files/libkonq-desktops/pl.po b/translations/desktop_files/libkonq-desktops/pl.po
index 442c52bd..0ecc246b 100644
--- a/translations/desktop_files/libkonq-desktops/pl.po
+++ b/translations/desktop_files/libkonq-desktops/pl.po
@@ -1,20 +1,22 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Jan Stolarek <jwstolarek@gmail.com>, 2020.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-22 18:52+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2020-08-12 23:04+0000\n"
+"Last-Translator: Jan Stolarek <jwstolarek@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/libkonq-desktop-files/pl/>\n"
"Language: pl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.1.1\n"
#. Name
#: directory_bookmarkbar.desktop:3
@@ -39,4 +41,4 @@ msgstr "Wtyczka do menu (otwieranego przyciskiem myszy) Konquerora"
#. Name
#: servicemenus/edit-as-root.desktop:6
msgid "Edit as system administrator"
-msgstr ""
+msgstr "Edytuj jako administrator"
diff --git a/translations/desktop_files/tde_release_notes.desktop/cs.po b/translations/desktop_files/tde_release_notes.desktop/cs.po
new file mode 100644
index 00000000..41e0f455
--- /dev/null
+++ b/translations/desktop_files/tde_release_notes.desktop/cs.po
@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2020.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-17 20:22+0200\n"
+"PO-Revision-Date: 2020-09-13 17:05+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/tde_release_notesdesktop/cs/>\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Weblate 4.2.2\n"
+
+#. Name
+#: tde_release_notes.desktop:3
+msgid "tde_release_notes"
+msgstr "tde_release_notes"
diff --git a/translations/desktop_files/tdeintegration.desktop/cs.po b/translations/desktop_files/tdeintegration.desktop/cs.po
new file mode 100644
index 00000000..6dc7b6bc
--- /dev/null
+++ b/translations/desktop_files/tdeintegration.desktop/cs.po
@@ -0,0 +1,28 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2020.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-25 21:05+0200\n"
+"PO-Revision-Date: 2020-09-13 17:05+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/tdeintegrationdesktop/cs/>\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Weblate 4.2.2\n"
+
+#. Name
+#: tdeintegration.desktop:12
+msgid "TDE Integration Module"
+msgstr "Modul pro integraci s TDE"
+
+#. Comment
+#: tdeintegration.desktop:14
+msgid "Module for integrating UI of non-TDE applications"
+msgstr "Modul pro integraci uživatelského rozhraní pro ne-TDE aplikace"
diff --git a/translations/desktop_files/tdeioslave-desktops/af.po b/translations/desktop_files/tdeioslave-desktops/af.po
index 08125f4a..b8e1fcfc 100644
--- a/translations/desktop_files/tdeioslave-desktops/af.po
+++ b/translations/desktop_files/tdeioslave-desktops/af.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\n"
+"POT-Creation-Date: 2020-10-18 11:52+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -368,27 +368,32 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
msgstr ""
#. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
msgid "Eject"
msgstr "Uitskiet"
#. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
msgid "Mount"
msgstr "Koppel"
#. Name
-#: media/services/media_safelyremove.desktop:8
+#: media/services/media_safelyremove.desktop:10
msgid "Safely Remove"
msgstr "Verwyder veilig"
#. Name
-#: media/services/media_unmount.desktop:8
+#: media/services/media_unlock.desktop:11
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
msgid "Unmount"
msgstr "Ontkopp