From 3500b67a40d9a2123563e9876446533362de2f6e Mon Sep 17 00:00:00 2001
From: lars <lars@systemausfall.org>
Date: Thu, 7 Dec 2006 12:20:43 +0000
Subject: [PATCH] constant width of the main screen (works for mozilla/ff and
 ie55/60 refresh link for logs feature change default setting of
 UseConfigPartition to "0" README file rewritten README.samba added
 README.davfs added README.Debian rewritten event scripts for samba and
 apach2_dav improved do not redirect to "disks overview" after successful
 plugin execution (e.g. date, ...) unclean web dataset fixed removed some
 non-translateable strings from po and pot files automatically update the
 cryptobox version according to the debian package version number

---
 MANIFEST.in                                   |   2 +
 README                                        | 175 ++++++++++++++++--
 README.davfs                                  |  47 +++++
 README.samba                                  |  40 ++++
 bin/CryptoBoxRootActions                      |   2 +-
 bin/CryptoBoxWebserver                        |   4 +-
 conf-examples/apache2_dav-share.conf-template |   9 -
 conf-examples/apache2_dav.conf                |   6 +-
 conf-examples/cryptobox.conf                  |   3 +-
 conf-examples/samba-share.conf-template       |   6 -
 conf-examples/super.tab-example               |   1 +
 debian/README.Debian                          |  29 ++-
 debian/changelog                              |   9 +
 debian/cryptobox-server.docs                  |   2 +
 debian/cryptobox-server.postinst              |   2 +-
 event-scripts/README                          |   2 +-
 event-scripts/apache2_dav                     |  51 +++--
 event-scripts/samba                           |  56 +++++-
 intl/cryptobox-server.pot                     |  28 ++-
 intl/cs/cryptobox-server.po                   |  29 ++-
 intl/da/cryptobox-server.po                   |  29 ++-
 intl/de/cryptobox-server.po                   |  51 +++--
 intl/en/cryptobox-server.po                   |  87 ++++-----
 intl/es/cryptobox-server.po                   |  29 ++-
 intl/fi/cryptobox-server.po                   |  29 ++-
 intl/fr/cryptobox-server.po                   |  31 +++-
 intl/hu/cryptobox-server.po                   |  29 ++-
 intl/it/cryptobox-server.po                   |  29 ++-
 intl/ja/cryptobox-server.po                   |  29 ++-
 intl/nl/cryptobox-server.po                   |  29 ++-
 intl/pl/cryptobox-server.po                   |  29 ++-
 intl/pt/cryptobox-server.po                   |  29 ++-
 intl/ru/cryptobox-server.po                   |  29 ++-
 intl/sl/cryptobox-server.po                   |  31 +++-
 intl/sv/cryptobox-server.po                   |  29 ++-
 plugins/date/date.py                          |   2 +-
 .../intl/cs/cryptobox-server-feature-date.po  |   1 -
 .../intl/da/cryptobox-server-feature-date.po  |   1 -
 .../intl/de/cryptobox-server-feature-date.po  |   3 +-
 .../intl/en/cryptobox-server-feature-date.po  |   5 +-
 .../intl/es/cryptobox-server-feature-date.po  |   1 -
 .../intl/fi/cryptobox-server-feature-date.po  |   1 -
 .../intl/fr/cryptobox-server-feature-date.po  |   1 -
 .../intl/hu/cryptobox-server-feature-date.po  |   1 -
 .../intl/it/cryptobox-server-feature-date.po  |   1 -
 .../intl/ja/cryptobox-server-feature-date.po  |   1 -
 .../intl/nl/cryptobox-server-feature-date.po  |   1 -
 .../intl/pl/cryptobox-server-feature-date.po  |   1 -
 .../intl/pt/cryptobox-server-feature-date.po  |   1 -
 .../intl/ru/cryptobox-server-feature-date.po  |   1 -
 .../intl/sl/cryptobox-server-feature-date.po  |   1 -
 .../intl/sv/cryptobox-server-feature-date.po  |   1 -
 .../intl/cs/cryptobox-server-feature-disks.po |   1 -
 .../intl/da/cryptobox-server-feature-disks.po |   1 -
 .../intl/de/cryptobox-server-feature-disks.po |   1 -
 .../intl/en/cryptobox-server-feature-disks.po |   5 +-
 .../intl/es/cryptobox-server-feature-disks.po |   1 -
 .../intl/fi/cryptobox-server-feature-disks.po |   1 -
 .../intl/fr/cryptobox-server-feature-disks.po |   1 -
 .../intl/hu/cryptobox-server-feature-disks.po |   1 -
 .../intl/it/cryptobox-server-feature-disks.po |   1 -
 .../intl/ja/cryptobox-server-feature-disks.po |   1 -
 .../intl/nl/cryptobox-server-feature-disks.po |   1 -
 .../intl/pl/cryptobox-server-feature-disks.po |   1 -
 .../intl/pt/cryptobox-server-feature-disks.po |   1 -
 .../intl/ru/cryptobox-server-feature-disks.po |   1 -
 .../intl/sl/cryptobox-server-feature-disks.po |   1 -
 .../intl/sv/cryptobox-server-feature-disks.po |   1 -
 .../intl/cs/cryptobox-server-feature-help.po  |   1 -
 .../intl/da/cryptobox-server-feature-help.po  |   1 -
 .../intl/de/cryptobox-server-feature-help.po  |   1 -
 .../intl/en/cryptobox-server-feature-help.po  |   3 +-
 .../intl/es/cryptobox-server-feature-help.po  |   1 -
 .../intl/fi/cryptobox-server-feature-help.po  |   1 -
 .../intl/fr/cryptobox-server-feature-help.po  |   1 -
 .../intl/hu/cryptobox-server-feature-help.po  |   1 -
 .../intl/it/cryptobox-server-feature-help.po  |   1 -
 .../intl/ja/cryptobox-server-feature-help.po  |   1 -
 .../intl/nl/cryptobox-server-feature-help.po  |   1 -
 .../intl/pl/cryptobox-server-feature-help.po  |   1 -
 .../intl/pt/cryptobox-server-feature-help.po  |   1 -
 .../intl/ru/cryptobox-server-feature-help.po  |   1 -
 .../intl/sl/cryptobox-server-feature-help.po  |   1 -
 .../intl/sv/cryptobox-server-feature-help.po  |   1 -
 ...tobox-server-feature-language_selection.po |   1 -
 ...tobox-server-feature-language_selection.po |   1 -
 ...tobox-server-feature-language_selection.po |   1 -
 ...tobox-server-feature-language_selection.po |   3 +-
 ...tobox-server-feature-language_selection.po |   1 -
 ...tobox-server-feature-language_selection.po |   1 -
 ...tobox-server-feature-language_selection.po |   1 -
 ...tobox-server-feature-language_selection.po |   1 -
 ...tobox-server-feature-language_selection.po |   1 -
 ...tobox-server-feature-language_selection.po |   1 -
 ...tobox-server-feature-language_selection.po |   1 -
 ...tobox-server-feature-language_selection.po |   1 -
 ...tobox-server-feature-language_selection.po |   1 -
 ...tobox-server-feature-language_selection.po |   1 -
 ...tobox-server-feature-language_selection.po |   1 -
 ...tobox-server-feature-language_selection.po |   1 -
 .../intl/cryptobox-server-feature-logs.pot    |   4 +
 .../intl/cs/cryptobox-server-feature-logs.po  |   5 +-
 .../intl/da/cryptobox-server-feature-logs.po  |   5 +-
 .../intl/de/cryptobox-server-feature-logs.po  |   5 +-
 .../intl/en/cryptobox-server-feature-logs.po  |   9 +-
 .../intl/es/cryptobox-server-feature-logs.po  |   5 +-
 .../intl/fi/cryptobox-server-feature-logs.po  |   5 +-
 .../intl/fr/cryptobox-server-feature-logs.po  |   5 +-
 .../intl/hu/cryptobox-server-feature-logs.po  |   5 +-
 .../intl/it/cryptobox-server-feature-logs.po  |   5 +-
 .../intl/ja/cryptobox-server-feature-logs.po  |   5 +-
 .../intl/nl/cryptobox-server-feature-logs.po  |   5 +-
 .../intl/pl/cryptobox-server-feature-logs.po  |   5 +-
 .../intl/pt/cryptobox-server-feature-logs.po  |   5 +-
 .../intl/ru/cryptobox-server-feature-logs.po  |   5 +-
 .../intl/sl/cryptobox-server-feature-logs.po  |   5 +-
 .../intl/sv/cryptobox-server-feature-logs.po  |   5 +-
 plugins/logs/language.hdf                     |   5 +-
 plugins/logs/show_log.cs                      |   7 +
 .../cs/cryptobox-server-feature-network.po    |   1 -
 .../da/cryptobox-server-feature-network.po    |   1 -
 .../de/cryptobox-server-feature-network.po    |   1 -
 .../en/cryptobox-server-feature-network.po    |  13 +-
 .../es/cryptobox-server-feature-network.po    |   1 -
 .../fi/cryptobox-server-feature-network.po    |   1 -
 .../fr/cryptobox-server-feature-network.po    |   1 -
 .../hu/cryptobox-server-feature-network.po    |   1 -
 .../it/cryptobox-server-feature-network.po    |   1 -
 .../ja/cryptobox-server-feature-network.po    |   1 -
 .../nl/cryptobox-server-feature-network.po    |   1 -
 .../pl/cryptobox-server-feature-network.po    |   1 -
 .../pt/cryptobox-server-feature-network.po    |   1 -
 .../ru/cryptobox-server-feature-network.po    |   1 -
 .../sl/cryptobox-server-feature-network.po    |   1 -
 .../sv/cryptobox-server-feature-network.po    |   1 -
 plugins/network/network.py                    |   4 +-
 .../cryptobox-server-feature-partition.pot    |   4 +-
 .../cs/cryptobox-server-feature-partition.po  |   5 +-
 .../da/cryptobox-server-feature-partition.po  |   5 +-
 .../de/cryptobox-server-feature-partition.po  |   5 +-
 .../en/cryptobox-server-feature-partition.po  |  31 ++--
 .../es/cryptobox-server-feature-partition.po  |   5 +-
 .../fi/cryptobox-server-feature-partition.po  |   5 +-
 .../fr/cryptobox-server-feature-partition.po  |   5 +-
 .../hu/cryptobox-server-feature-partition.po  |   5 +-
 .../it/cryptobox-server-feature-partition.po  |   5 +-
 .../ja/cryptobox-server-feature-partition.po  |   5 +-
 .../nl/cryptobox-server-feature-partition.po  |   5 +-
 .../pl/cryptobox-server-feature-partition.po  |   5 +-
 .../pt/cryptobox-server-feature-partition.po  |   5 +-
 .../ru/cryptobox-server-feature-partition.po  |   5 +-
 .../sl/cryptobox-server-feature-partition.po  |   5 +-
 .../sv/cryptobox-server-feature-partition.po  |   5 +-
 plugins/partition/language.hdf                |   6 +
 ...cryptobox-server-feature-plugin_manager.po |   1 -
 ...cryptobox-server-feature-plugin_manager.po |   1 -
 ...cryptobox-server-feature-plugin_manager.po |   1 -
 ...cryptobox-server-feature-plugin_manager.po |   3 +-
 ...cryptobox-server-feature-plugin_manager.po |   1 -
 ...cryptobox-server-feature-plugin_manager.po |   1 -
 ...cryptobox-server-feature-plugin_manager.po |   1 -
 ...cryptobox-server-feature-plugin_manager.po |   1 -
 ...cryptobox-server-feature-plugin_manager.po |   1 -
 ...cryptobox-server-feature-plugin_manager.po |   1 -
 ...cryptobox-server-feature-plugin_manager.po |   1 -
 ...cryptobox-server-feature-plugin_manager.po |   1 -
 ...cryptobox-server-feature-plugin_manager.po |   1 -
 ...cryptobox-server-feature-plugin_manager.po |   1 -
 ...cryptobox-server-feature-plugin_manager.po |   1 -
 ...cryptobox-server-feature-plugin_manager.po |   1 -
 plugins/plugin_manager/plugin_manager.py      |   4 +-
 .../cs/cryptobox-server-feature-shutdown.po   |   1 -
 .../da/cryptobox-server-feature-shutdown.po   |   1 -
 .../de/cryptobox-server-feature-shutdown.po   |   1 -
 .../en/cryptobox-server-feature-shutdown.po   |  13 +-
 .../es/cryptobox-server-feature-shutdown.po   |   1 -
 .../fi/cryptobox-server-feature-shutdown.po   |   1 -
 .../fr/cryptobox-server-feature-shutdown.po   |   1 -
 .../hu/cryptobox-server-feature-shutdown.po   |   1 -
 .../it/cryptobox-server-feature-shutdown.po   |   1 -
 .../ja/cryptobox-server-feature-shutdown.po   |   1 -
 .../nl/cryptobox-server-feature-shutdown.po   |   1 -
 .../pl/cryptobox-server-feature-shutdown.po   |   1 -
 .../pt/cryptobox-server-feature-shutdown.po   |   1 -
 .../ru/cryptobox-server-feature-shutdown.po   |   1 -
 .../sl/cryptobox-server-feature-shutdown.po   |   1 -
 .../sv/cryptobox-server-feature-shutdown.po   |   1 -
 ...tobox-server-feature-system_preferences.po |   1 -
 ...tobox-server-feature-system_preferences.po |   1 -
 ...tobox-server-feature-system_preferences.po |   1 -
 ...tobox-server-feature-system_preferences.po |   5 +-
 ...tobox-server-feature-system_preferences.po |   1 -
 ...tobox-server-feature-system_preferences.po |   1 -
 ...tobox-server-feature-system_preferences.po |   1 -
 ...tobox-server-feature-system_preferences.po |   1 -
 ...tobox-server-feature-system_preferences.po |   1 -
 ...tobox-server-feature-system_preferences.po |   1 -
 ...tobox-server-feature-system_preferences.po |   1 -
 ...tobox-server-feature-system_preferences.po |   1 -
 ...tobox-server-feature-system_preferences.po |   1 -
 ...tobox-server-feature-system_preferences.po |   1 -
 ...tobox-server-feature-system_preferences.po |   1 -
 ...tobox-server-feature-system_preferences.po |   1 -
 .../cryptobox-server-feature-user_manager.pot |   8 +
 .../cryptobox-server-feature-user_manager.po  |   9 +-
 .../cryptobox-server-feature-user_manager.po  |   9 +-
 .../cryptobox-server-feature-user_manager.po  |   9 +-
 .../cryptobox-server-feature-user_manager.po  |  13 +-
 .../cryptobox-server-feature-user_manager.po  |   9 +-
 .../cryptobox-server-feature-user_manager.po  |   9 +-
 .../cryptobox-server-feature-user_manager.po  |   9 +-
 .../cryptobox-server-feature-user_manager.po  |   9 +-
 .../cryptobox-server-feature-user_manager.po  |   9 +-
 .../cryptobox-server-feature-user_manager.po  |   9 +-
 .../cryptobox-server-feature-user_manager.po  |   9 +-
 .../cryptobox-server-feature-user_manager.po  |   9 +-
 .../cryptobox-server-feature-user_manager.po  |   9 +-
 .../cryptobox-server-feature-user_manager.po  |   9 +-
 .../cryptobox-server-feature-user_manager.po  |   9 +-
 .../cryptobox-server-feature-user_manager.po  |   9 +-
 ...ptobox-server-feature-volume_automount.pot |  40 ++++
 ...yptobox-server-feature-volume_automount.po |  41 +++-
 ...yptobox-server-feature-volume_automount.po |  41 +++-
 ...yptobox-server-feature-volume_automount.po |  41 +++-
 ...yptobox-server-feature-volume_automount.po |  50 ++++-
 ...yptobox-server-feature-volume_automount.po |  41 +++-
 ...yptobox-server-feature-volume_automount.po |  41 +++-
 ...yptobox-server-feature-volume_automount.po |  41 +++-
 ...yptobox-server-feature-volume_automount.po |  41 +++-
 ...yptobox-server-feature-volume_automount.po |  41 +++-
 ...yptobox-server-feature-volume_automount.po |  41 +++-
 ...yptobox-server-feature-volume_automount.po |  41 +++-
 ...yptobox-server-feature-volume_automount.po |  41 +++-
 ...yptobox-server-feature-volume_automount.po |  41 +++-
 ...yptobox-server-feature-volume_automount.po |  41 +++-
 ...yptobox-server-feature-volume_automount.po |  41 +++-
 ...yptobox-server-feature-volume_automount.po |  41 +++-
 plugins/volume_automount/language.hdf         |  20 +-
 plugins/volume_automount/unittests.py         |  10 +-
 ...yptobox-server-feature-volume_chpasswd.pot |   4 +-
 ...ryptobox-server-feature-volume_chpasswd.po |   5 +-
 ...ryptobox-server-feature-volume_chpasswd.po |   5 +-
 ...ryptobox-server-feature-volume_chpasswd.po |   5 +-
 ...ryptobox-server-feature-volume_chpasswd.po |  25 ++-
 ...ryptobox-server-feature-volume_chpasswd.po |   5 +-
 ...ryptobox-server-feature-volume_chpasswd.po |   5 +-
 ...ryptobox-server-feature-volume_chpasswd.po |   5 +-
 ...ryptobox-server-feature-volume_chpasswd.po |   5 +-
 ...ryptobox-server-feature-volume_chpasswd.po |   5 +-
 ...ryptobox-server-feature-volume_chpasswd.po |   5 +-
 ...ryptobox-server-feature-volume_chpasswd.po |   5 +-
 ...ryptobox-server-feature-volume_chpasswd.po |   5 +-
 ...ryptobox-server-feature-volume_chpasswd.po |   5 +-
 ...ryptobox-server-feature-volume_chpasswd.po |   5 +-
 ...ryptobox-server-feature-volume_chpasswd.po |   5 +-
 ...ryptobox-server-feature-volume_chpasswd.po |   5 +-
 plugins/volume_chpasswd/language.hdf          |   2 +-
 ...ryptobox-server-feature-volume_details.pot |   8 +
 ...cryptobox-server-feature-volume_details.po |   9 +-
 ...cryptobox-server-feature-volume_details.po |   9 +-
 ...cryptobox-server-feature-volume_details.po |   9 +-
 ...cryptobox-server-feature-volume_details.po |  13 +-
 ...cryptobox-server-feature-volume_details.po |   9 +-
 ...cryptobox-server-feature-volume_details.po |   9 +-
 ...cryptobox-server-feature-volume_details.po |   9 +-
 ...cryptobox-server-feature-volume_details.po |   9 +-
 ...cryptobox-server-feature-volume_details.po |   9 +-
 ...cryptobox-server-feature-volume_details.po |   9 +-
 ...cryptobox-server-feature-volume_details.po |   9 +-
 ...cryptobox-server-feature-volume_details.po |   9 +-
 ...cryptobox-server-feature-volume_details.po |   9 +-
 ...cryptobox-server-feature-volume_details.po |   9 +-
 ...cryptobox-server-feature-volume_details.po |   9 +-
 ...cryptobox-server-feature-volume_details.po |   9 +-
 plugins/volume_details/language.hdf           |   4 +-
 ...ptobox-server-feature-volume_format_fs.pot |  28 +--
 ...yptobox-server-feature-volume_format_fs.po |  29 +--
 ...yptobox-server-feature-volume_format_fs.po |  29 +--
 ...yptobox-server-feature-volume_format_fs.po |  29 +--
 ...yptobox-server-feature-volume_format_fs.po |  56 +++---
 ...yptobox-server-feature-volume_format_fs.po |  29 +--
 ...yptobox-server-feature-volume_format_fs.po |  29 +--
 ...yptobox-server-feature-volume_format_fs.po |  29 +--
 ...yptobox-server-feature-volume_format_fs.po |  29 +--
 ...yptobox-server-feature-volume_format_fs.po |  29 +--
 ...yptobox-server-feature-volume_format_fs.po |  29 +--
 ...yptobox-server-feature-volume_format_fs.po |  29 +--
 ...yptobox-server-feature-volume_format_fs.po |  29 +--
 ...yptobox-server-feature-volume_format_fs.po |  29 +--
 ...yptobox-server-feature-volume_format_fs.po |  29 +--
 ...yptobox-server-feature-volume_format_fs.po |  29 +--
 ...yptobox-server-feature-volume_format_fs.po |  29 +--
 plugins/volume_format_fs/language.hdf         |   4 +
 plugins/volume_format_fs/volume_format_fs.py  |   4 +-
 .../cryptobox-server-feature-volume_mount.pot |  52 +++++-
 .../cryptobox-server-feature-volume_mount.po  |  53 +++++-
 .../cryptobox-server-feature-volume_mount.po  |  53 +++++-
 .../cryptobox-server-feature-volume_mount.po  |  53 +++++-
 .../cryptobox-server-feature-volume_mount.po  |  76 ++++++--
 .../cryptobox-server-feature-volume_mount.po  |  53 +++++-
 .../cryptobox-server-feature-volume_mount.po  |  53 +++++-
 .../cryptobox-server-feature-volume_mount.po  |  53 +++++-
 .../cryptobox-server-feature-volume_mount.po  |  53 +++++-
 .../cryptobox-server-feature-volume_mount.po  |  53 +++++-
 .../cryptobox-server-feature-volume_mount.po  |  53 +++++-
 .../cryptobox-server-feature-volume_mount.po  |  53 +++++-
 .../cryptobox-server-feature-volume_mount.po  |  53 +++++-
 .../cryptobox-server-feature-volume_mount.po  |  53 +++++-
 .../cryptobox-server-feature-volume_mount.po  |  53 +++++-
 .../cryptobox-server-feature-volume_mount.po  |  53 +++++-
 .../cryptobox-server-feature-volume_mount.po  |  53 +++++-
 plugins/volume_mount/language.hdf             |  28 +--
 plugins/volume_mount/unittests.py             |   2 +-
 plugins/volume_mount/volume_mount.py          |   6 +-
 .../cryptobox-server-feature-volume_props.po  |   1 -
 .../cryptobox-server-feature-volume_props.po  |   1 -
 .../cryptobox-server-feature-volume_props.po  |   1 -
 .../cryptobox-server-feature-volume_props.po  |   5 +-
 .../cryptobox-server-feature-volume_props.po  |   1 -
 .../cryptobox-server-feature-volume_props.po  |   1 -
 .../cryptobox-server-feature-volume_props.po  |   1 -
 .../cryptobox-server-feature-volume_props.po  |   1 -
 .../cryptobox-server-feature-volume_props.po  |   1 -
 .../cryptobox-server-feature-volume_props.po  |   1 -
 .../cryptobox-server-feature-volume_props.po  |   1 -
 .../cryptobox-server-feature-volume_props.po  |   1 -
 .../cryptobox-server-feature-volume_props.po  |   1 -
 .../cryptobox-server-feature-volume_props.po  |   1 -
 .../cryptobox-server-feature-volume_props.po  |   1 -
 .../cryptobox-server-feature-volume_props.po  |   1 -
 ...cryptobox-server-feature-volume_rename.pot |  24 +--
 .../cryptobox-server-feature-volume_rename.po |  25 +--
 .../cryptobox-server-feature-volume_rename.po |  25 +--
 .../cryptobox-server-feature-volume_rename.po |  25 +--
 .../cryptobox-server-feature-volume_rename.po |  56 +++---
 .../cryptobox-server-feature-volume_rename.po |  25 +--
 .../cryptobox-server-feature-volume_rename.po |  25 +--
 .../cryptobox-server-feature-volume_rename.po |  25 +--
 .../cryptobox-server-feature-volume_rename.po |  25 +--
 .../cryptobox-server-feature-volume_rename.po |  25 +--
 .../cryptobox-server-feature-volume_rename.po |  25 +--
 .../cryptobox-server-feature-volume_rename.po |  25 +--
 .../cryptobox-server-feature-volume_rename.po |  25 +--
 .../cryptobox-server-feature-volume_rename.po |  25 +--
 .../cryptobox-server-feature-volume_rename.po |  25 +--
 .../cryptobox-server-feature-volume_rename.po |  25 +--
 .../cryptobox-server-feature-volume_rename.po |  25 +--
 plugins/volume_rename/language.hdf            |   4 +-
 scripts/fetch_po_files.sh                     |  34 +++-
 scripts/update_po_files.py                    |  12 +-
 setup.py                                      |   6 +-
 src/cryptobox/__init__.py                     |   3 +-
 src/cryptobox/web/dataset.py                  |  17 ++
 src/cryptobox/web/sites.py                    |  25 ++-
 stuff/debian-package.txt                      |   3 +
 templates/header.cs                           |   5 +-
 templates/language.hdf                        |   7 +-
 www-data/cryptobox.css                        |  25 ++-
 358 files changed, 3265 insertions(+), 1414 deletions(-)
 create mode 100644 README.davfs
 create mode 100644 README.samba
 delete mode 100644 conf-examples/apache2_dav-share.conf-template
 delete mode 100644 conf-examples/samba-share.conf-template

diff --git a/MANIFEST.in b/MANIFEST.in
index d2ef8f6..b8640f5 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,6 @@
 include README
+include README.samba
+include README.davfs
 include LICENSE
 include changelog
 include copyright
diff --git a/README b/README
index 7161412..4295770 100644
--- a/README
+++ b/README
@@ -1,24 +1,167 @@
+********************************************
+*          CryptoBox v0.2.99               *
+********************************************
+
 $Id$
-CryptoBox version 0.3
 
-1) Documentation
-The documentation is available at https://systemausfall.org/trac/cryptobox/wiki/CryptoBoxUser
+This file describes the webserver CryptoBox.
+The CryptoBox enables you to control the plaintext or encrypted harddisks of
+your server via a webinterface.
+Read on if you want to install the CryptoBox-server package on your computer.
 
-2) Building a LiveCD
-try: "scripts/cbox-build.sh release"
-or look at the developer's documentation: https://systemausfall.org/trac/cryptobox/wiki/CryptoBoxDev
+For more information, see the website:
+	http://cryptobox.org
 
-3) Bug reporting
-Use our issue tracker at https://systemausfall.org/trac/cryptobox/newticket
+Table of contents:
+	1) Requirements
+	2) Installation
+	3) Setup
+	4) Usage
+	5) Development
+	6) Acknowledgements
+	7) Licence
 
-4) Licence
+--------------------------------------------
+
+1) Requirements
+	- Linux 2.6
+	- super (to selectively gain root privileges)
+	- Python 2.4
+	- some python packages:
+		clearsilver 0.10 for python
+		python-configobj 4.x
+		cherrypy 2.x
+
+
+2) Installation
+For Debian, Ubuntu and other derivates you should use the debian package:
+	see https://systemausfall.org/toolforge/debian/
+
+There are currently no official rpm packages of the CryptoBox.
+
+For source installation follow these steps:
+	Get the source:
+		http://cryptobox.org/download
+
+	Extract tarball and change to the new directory:
+		tar xzf cryptobox-0.?.?.tar.gz
+
+	Install the program:
+		python setup.by install
+
+The installed files can be found in your local python installation directory.
+The default location should be:
+	/usr/lib/python2.4/site-packages/cryptobox
+
+As some actions of the cryptobox require root privileges, you have to add the
+following line to /etc/super.tab:
+	CryptoBoxRootActions	/usr/bin/CryptoBoxRootActions	cryptobox
+The script /usr/bin/CryptoBoxRootActions is used to execute all actions
+requiring root privileges. Please check it to make sure, that your system will
+not get compromised.
+
+
+3) Setup
+
+ a) Start at bootup
+	Set NO_START in /etc/default/cryptobox-server to "0".
+	The CryptoBox webserver will get started by its runlevel control script
+	after during booting.
+
+ b) Define managed devices
+	You may restrict which blockdevices should be accessible to the CryptoBox.
+	Simply set [Main]->AllowedDevices in /etc/cryptobox-server/cryptobox.conf
+	to a comma separated list of device prefixes: e.g. /dev/sd gives access to
+	all SCSI devices, while /dev/hda3 restricts it to this single partition.
+	The user executing the webserver (by default: 'cryptobox') must have write
+	access to these devices. Usually the cryptobox user is member of the 'disk'
+	group. This gives control over most devices.
+	Be careful with this setting, as you may expose important data to public
+	read and write access.
+
+ c) Listening port and interface
+	By default, the CryptoBox webserver listens to tcp port 8080 on all network
+	interfaces. You can change this setting in /etc/default/cryptobox-server.
+	Also take a look at your firewall settings.
+
+ d) Disable plugins
+	The CryptoBox contains a lot of plugins. As some of them could expose
+	unwanted features to your users, you should carefully select which plugins
+	to disable.
+	Quite likely candidates for disabling are:
+		- shutdown: poweroff or reboot the computer
+		- network: change IP, gateway or dns settings of the server
+		- partition: partition blockdevices
+		- volume_format_fs: format a disk/partition (plaintext/encrypted)
+	Take a look at /usr/share/cryptobox-server/plugins for the list of
+	other plugins.
+	The setting [Main]->DisabledPlugins in /etc/cryptobox-server/cryptobox.conf
+	is a comma separated list of plugin names. Capitalization is important!
+
+ e) Separate configuration partition
+	The CryptoBox webserver requires a writeable directory for proper
+	operation. If your root filesystem is not writeable (e.g. booting from a
+	cdrom, read-only mounted flash memory, ...) you may use a seperated
+	partition to store runtime settings. The CryptoBox will automatically
+	creates it, when you use partition one of your disks with its interface.
+	The setting [Main]->UseConfigPartition (see
+	/etc/cryptobox-server/cryptobox.conf) defines, whether you want to use a
+	separate partition (value "1") or if you want to store your runtime
+	settings in the root filesystem (typically below
+	/var/cache/cryptobox-server).
+
+ f) Samba/WebDAV/NFS/??? integration (aka. event script handling)
+	The CryptoBox allows you to add event handling scripts for most of the
+	interesting events: bootup/shutdown of the webserver and mount/umount
+	of single volumes.
+	If you want to automatically publish your mounted volumes with samba
+	or similar fileservers, then you should take a closer look at the
+	example scripts for samba and apache-webdav in
+	/usr/share/doc/cryptobox-server/event-scripts.
+	You may also just publish the mount directory of the CryptoBox. This
+	will expose all mounted volumes very easily. Review the configuration
+	file for the setting [Locations]->MountParentDir.
+
+ g) Take a close look at the configuration file to check all other options
+	before you start the CryptoBox webserver.
+
+
+4) Usage
+Use your favourite web browser to go to http://localhost:8080 and browse the
+webinterface of the CryptoBox.
+Some parts of the interface are restricted to administrative access. The
+default access combination is the user 'admin' and the password 'admin'. Please
+change this setting immediately.
+The plugin 'user_manager' allows you to add users and to change passwords.
+The plugin 'plugin_manager' lets you configure, which plugins require
+administrative authentication.
+
+The user manual (available via the 'help' plugin) should give you exhaustive
+usage information.
+The current version of the online manual is available at:
+	https://systemausfall.org/trac/cryptobox/wiki/CryptoBoxUser
+
+
+5) Development
+bug reports: please use our issue tracker
+	https://systemausfall.org/trac/cryptobox/newticket
+
+email:
+	cryptobox@systemausfall.org
+
+The CryptoBox project is mainly driven by sense.lab (http://senselab.org).
+
+
+6) Acknowledgements
+Besides the core development team, these people helped a lot:
+Clavdia Horvat, Tadej Brce & Dušan Rebolj - slovenian translation
+rike - french translation
+
+We also want to thank the numerous developers of the Free Software, the
+CryptoBox depends on and that was used in development.
+
+
+7) Licence
 All scripts are GPL code (v2.0 or above).
 The documentation is licenced under "Creative Commons 2.5 share-alike" (http://creativecommons.org/licenses/by-sa/2.5/).
 
-5) Contributors
-Clavdia Horvat, Tadej Brce & Dušan Rebolj - slovenian translation
-
-6) Contact
-email: cryptobox@systemausfall.org
-
-The CryptoBox project is mainly driven by sense.lab (https://systemausfall.org/senselab).
diff --git a/README.davfs b/README.davfs
new file mode 100644
index 0000000..6687d23
--- /dev/null
+++ b/README.davfs
@@ -0,0 +1,47 @@
+Integration of apach2 as a (Web)DAV server into the CryptoBox
+
+This file describes how to expose the volumes that are managed by the CryptoBox
+through WebDAV shares.
+Apache2 including the dav_fs module is the most common server for the WebDAV
+filesystem. The following description will focus on this server.
+
+First you have to install apache2 and the dav_fs module.
+Use your favourite package manager to install them.
+(Note for debian: the dav_fs module is part of the apache2-common package.
+Just activate the module via 'a2enmod dav_fs'.)
+
+There are two different ways to do use dav shares:
+
+
+A) one share for all volumes together
+
+Just create a file with the following lines to your /etc/apache2/conf.d directory:
+	Alias   "/cryptobox" "/var/cache/cryptobox-server/mnt"
+	 <Location "/cryptobox">
+	 	Dav filesystem
+	 </Location>
+
+Reload the new apache2 configuration by calling:
+	invoke-rc.d apache2 reload
+
+
+
+B) one share for each volume
+
+Copy the example event script
+/usr/share/doc/cryptobox-server/event-script/apache2_dav to
+/etc/cryptobox-server/events.d/apache2_dav. This event handler will add and remove
+shares whenever a volume is mounted or unmounted via the CryptoBox webinterface.
+
+Copy the file /usr/share/doc/cryptobox-server/conf-examples/apache2_dav.conf to
+/etc/apache2/conf.d/apache2_dav.
+
+Create a directory for the apache share config files:
+	mkdir -p /var/cache/cryptobox-server/apache2_dav.conf.d
+
+Chown it to the cryptobox user:
+	chown cryptobox /var/cache/cryptobox-server/apache2_dav.conf.d
+
+Reload the new apache2 configuration by calling:
+	invoke-rc.d apache2 reload
+
diff --git a/README.samba b/README.samba
new file mode 100644
index 0000000..7c926f8
--- /dev/null
+++ b/README.samba
@@ -0,0 +1,40 @@
+Integration of samba into the CryptoBox
+
+This file describes how to expose the volumes that are managed by the CryptoBox
+through samba shares.
+
+There are two different ways to do this:
+
+
+A) one share for all volumes together
+
+Just add the following lines to your /etc/samba/smb.conf:
+	[cryptobox]
+		path = /var/cache/cryptobox-server/mnt
+		browseable = yes
+		read only = no
+		guest ok = yes
+
+Reload the new samba configuration by calling:
+	invoke-rc.d samba reload
+
+
+
+B) one share for each volume
+
+Copy the example event script /usr/share/doc/cryptobox-server/event-script/samba
+to /etc/cryptobox-server/events.d/samba. This event handler will add and remove
+shares whenever a volume is mounted or unmounted via the CryptoBox webinterface.
+
+Add the following line to your /etc/samba/smb.conf:
+	include = /var/cache/cryptobox-server/samba-include.conf
+
+Create this file:
+	touch /var/cache/cryptobox-server/samba-include.conf
+
+Chown it to the cryptobox user:
+	chown cryptobox /var/cache/cryptobox-server/samba-include.conf
+
+Reload the new samba configuration by calling:
+	invoke-rc.d samba reload
+
diff --git a/bin/CryptoBoxRootActions b/bin/CryptoBoxRootActions
index 6956b0f..405ee4b 100755
--- a/bin/CryptoBoxRootActions
+++ b/bin/CryptoBoxRootActions
@@ -50,7 +50,7 @@ allowedProgs = {
 
 
 DEV_TYPES = { "pipe":1, "char":2, "dir":4, "block":6, "file":8, "link":10, "socket":12}
-EVENT_MARKER = '_event_marker_'
+EVENT_MARKER = '_event_scripts_'
 
 
 def checkIfFileIsSafe(fname):
diff --git a/bin/CryptoBoxWebserver b/bin/CryptoBoxWebserver
index 2f17b87..71aa763 100755
--- a/bin/CryptoBoxWebserver
+++ b/bin/CryptoBoxWebserver
@@ -204,7 +204,9 @@ def parseOptions():
 	## we do not expect any remaining arguments
 	if len(args) != 0:
 		parser.error("unknown argument: %s" % str(args[0]))
-	if not os.access(options.logfile, os.W_OK):
+	if not ((not os.path.exists(options.logfile) \
+			and os.access(os.path.dirname(options.logfile), os.W_OK)) \
+			or os.access(options.logfile, os.W_OK)):
 		parser.error("could not write to logfile (%s)" % options.logfile)
 	if not os.path.isdir(options.datadir) or not os.access(options.datadir,os.X_OK):
 		parser.error("could not access the data directory (%s)" % options.datadir)
diff --git a/conf-examples/apache2_dav-share.conf-template b/conf-examples/apache2_dav-share.conf-template
deleted file mode 100644
index 9120e25..0000000
--- a/conf-examples/apache2_dav-share.conf-template
+++ /dev/null
@@ -1,9 +0,0 @@
-# this file is part of the CryptoBox
-# put it into /etc/cryptobox/apache2_dav-share.conf-template
-
-Alias	"/cryptobox/_VOLUME_NAME_" "_SHARE_DIR_"
-
-<Location "/cryptobox/_VOLUME_NAME_">
-	Dav filesystem
-</Location>
-
diff --git a/conf-examples/apache2_dav.conf b/conf-examples/apache2_dav.conf
index 5c2e6f2..d2309b4 100644
--- a/conf-examples/apache2_dav.conf
+++ b/conf-examples/apache2_dav.conf
@@ -1,11 +1,13 @@
 # this file is part of the CryptoBox
 # put it into /etc/apache2/conf.d/
+# you MUST create the directory given below - otherwise apache will not like it :(
+# do not forget to chown the directory to the cryptobox user
 
 <IfModule mod_dav_fs.c>
+	# include the dynamically managed configuration directory - IT MUST EXIST
+	Include /var/cache/cryptobox-server/settings/apache2_dav.conf.d/
 	# lock database - should be writeable for www-data
 	DavLockDB /tmp/dav_lock.db
 	# a longer value than the default (120) help for high-latency networks
 	DavMinTimeout 600
-	# include the configuration file, that will contain "include" lines for every share
-	Include /etc/cryptobox/apache2-include.conf
 </IfModule>
diff --git a/conf-examples/cryptobox.conf b/conf-examples/cryptobox.conf
index 800f898..a3d4872 100644
--- a/conf-examples/cryptobox.conf
+++ b/conf-examples/cryptobox.conf
@@ -2,10 +2,11 @@
 
 # comma separated list of possible prefixes for accesible devices
 # beware: .e.g "/dev/hd" grants access to _all_ harddisks
+# take care, that the user 'cryptobox' has write access to these devices
 AllowedDevices = /dev/loop, /dev/ubdb
 
 # use separate config partition? (1=yes / 0=no)
-UseConfigPartition = 1
+UseConfigPartition = 0
 
 # the default name prefix of not unnamed containers
 DefaultVolumePrefix = "Disk "
diff --git a/conf-examples/samba-share.conf-template b/conf-examples/samba-share.conf-template
deleted file mode 100644
index a8e516c..0000000
--- a/conf-examples/samba-share.conf-template
+++ /dev/null
@@ -1,6 +0,0 @@
-[_VOLUME_NAME_]
-	comment	= CryptoBox share
-	path	= _SHARE_DIR_
-	read only	= yes
-	guest ok	= yes
-
diff --git a/conf-examples/super.tab-example b/conf-examples/super.tab-example
index 03d21c0..43eae00 100644
--- a/conf-examples/super.tab-example
+++ b/conf-examples/super.tab-example
@@ -1,2 +1,3 @@
 # adapt the following line to your local setup and add it to /etc/super.tab
+# 'yourUserName' is typically 'cryptobox'
 CryptoBoxRootActions	/your/local/path/to/CryptoBoxRootActions.py	yourUserName
diff --git a/debian/README.Debian b/debian/README.Debian
index 6dc8846..5b7c519 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,5 +1,30 @@
 CryptoBox for Debian - installation notes
 
-be aware of one thing:
-1) you need cryptsetup with luks support (for now only in testing)
+The main configuration file of the CryptoBox webserver is:
+	/etc/cryptobox-server/cryptobox.conf
+All settings named [Foo]->Bar are defined in this file.
+
+1) Configure startup and network settings in /etc/default/cryptobox-server.
+Set 'NO_START' to "0" if the CryptoBox should start at every bootup.
+
+2) Define [Main]->AllowedDevices according to the devices that you want to
+publish via the cryptobox webinterface.
+
+3) Choose a list of plugins to disable in [Main]->DisabledPlugins.
+
+4) Use the username 'admin' and the password 'admin' to access protected
+parts of the CryptoBox. Please change the password soon in the 'user_manager'.
+You can use the 'plugin_manager' to define which parts of the CryptoBox should
+be restricted to administrative access.
+
+5) Read /usr/share/doc/cryptobox-server/event-scripts/README for information
+about event handlers. They can be used to integrate fileservers (samba,
+apache2-dav, nfs, ...) into the CryptoBox. Detailed information about
+integration with samba and apach2-dav can be found in README.samba and
+README.davfs.
+
+6) A line was automatically added to /etc/super.tab.
+This is necessary to gain root privileges for certain actions.
+Please inspect /usr/sbin/CryptoBoxRootActions carefully to make sure, that your
+system can not get compromised by this.
 
diff --git a/debian/changelog b/debian/changelog
index 5748b67..92c97e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+cryptobox (0.2.53-1) unstable; urgency=low
+
+  * constant screen width
+  * improved documentation
+  * improved event scripts
+  * changed default setting of 'UseConfigPartition'
+
+ -- Lars Kruse <devel@sumpfralle.de>  Thu,  7 Dec 2006 05:10:43 +0100
+
 cryptobox (0.2.52-1) unstable; urgency=low
 
   * format partitions in background
diff --git a/debian/cryptobox-server.docs b/debian/cryptobox-server.docs
index 448d85a..fffb547 100644
--- a/debian/cryptobox-server.docs
+++ b/debian/cryptobox-server.docs
@@ -1,4 +1,6 @@
 README
+README.samba
+README.davfs
 copyright
 changelog
 doc/html
diff --git a/debian/cryptobox-server.postinst b/debian/cryptobox-server.postinst
index d5468b1..145f0fa 100644
--- a/debian/cryptobox-server.postinst
+++ b/debian/cryptobox-server.postinst
@@ -27,7 +27,7 @@ create_user_home()
 	mkdir -p "$USER_HOME/settings"
 	chown -R ${CRYPTOBOX_USER}: "$USER_HOME"
 	# only members of the cryptobox group may access the user directory
-	chmod 750 "$USER_HOME"
+	chmod 755 "$USER_HOME"
 }
 
 create_add_super_permission()
diff --git a/event-scripts/README b/event-scripts/README
index 9bb6f9d..78737fe 100644
--- a/event-scripts/README
+++ b/event-scripts/README
@@ -22,5 +22,5 @@ Every event script has to fulfill the following conditions:
 	- be executable (for the cryptobox user and for root)
 	- be writeable for root only
 	- its parent directories must be writeable for root only
-	- the directory of the script must contain a file called '_event_script_' (to prevent abuse)
+	- the directory of the script must contain a file called '_event_scripts_' (to prevent abuse)
 
diff --git a/event-scripts/apache2_dav b/event-scripts/apache2_dav
index caad460..57118c1 100755
--- a/event-scripts/apache2_dav
+++ b/event-scripts/apache2_dav
@@ -20,13 +20,31 @@
 
 set -eu
 
+# ------------=-=-=- some settings -=-=-=-----------------
+# adapt this part of the file to your setup
+
 APACHE_SCRIPT=/etc/init.d/apache2
 APACHE_CONF_DIR=/var/cache/cryptobox/apache2_dav.conf.d
-TEMPLATE_CONF_FILE=/etc/cryptobox/apache2_dav-share.conf-template
-MAIN_APACHE_CONF_FILE=/etc/cryptobox/apache2-include.conf
+
+# this apache config snippet is used for every published volume
+# _VOLUME_NAME_ and _SHARE_DIR_ are replaced by their actual values
+APACHE_SHARE_TEMPLATE=$(cat - <<-"EOF"
+	# this file is part of the CryptoBox
+	Alias	"/cryptobox/_VOLUME_NAME_" "_SHARE_DIR_"
+	<Location "/cryptobox/_VOLUME_NAME_">
+		Dav filesystem
+	</Location>
+EOF
+)
+
+# -----=-=-=- check arguments and the environment -=-=-=----
 
 # exit if apache2 is not installed
-test -e "$APACHE_SCRIPT" || exit 0
+if test -x "$APACHE_SCRIPT"
+  then	true
+  else	echo "apache2 is not installed ('$APACHE_SCRIPT' not found)" >&2
+	exit 1
+ fi
 
 # create include-file directory
 mkdir -p "$APACHE_CONF_DIR"
@@ -39,16 +57,20 @@ if test "$#" -eq 0
 
 event=$1
 
-
 # ------------=-=-=- some functions -=-=-=-----------------
 
-update_include_conf_file()
+# remove invalid config files
+update_include_conf_dir()
 {
-	(	echo "# this file was automatically generated by the CryptoBox"
-		echo "# DO NOT EDIT - all changes will get lost!"
-		find "$APACHE_CONF_DIR" -type f -name "*.conf" | while read fname
-		  do	echo "Include '$fname'"
-		 done ) >"$MAIN_APACHE_CONF_FILE"
+	find "$APACHE_CONF_DIR" -type f -name "*.conf" | while read fname
+	  do	mdir=$(head -1 "$fname" | cut -f 4 -d '"')
+	  		test ! -d "$mdir" && rm "$fname"
+	 done
+}
+
+empty_conf_dir()
+{
+	find "$APACHE_CONF_DIR" -type f -name "*.conf" -print0 | xargs -0 rm
 }
 
 send_reload_command()
@@ -65,16 +87,19 @@ case "$event" in
 	postmount )
 		vol_name=$3
 		mount_dir=$5
-		sed "s#_SHARE_DIR_#$mount_dir#g; s#_VOLUME_NAME_#$vol_name#g" "$TEMPLATE_CONF_FILE" >"$APACHE_CONF_DIR/${vol_name}.conf"
-		update_include_conf_file
+		echo "$APACHE_SHARE_TEMPLATE" | sed "s#_SHARE_DIR_#$mount_dir#g; s#_VOLUME_NAME_#$vol_name#g" >"$APACHE_CONF_DIR/${vol_name}.conf"
+		update_include_conf_dir
 		send_reload_command
 		;;
 	preumount )
 		vol_name=$3
 		rm "$APACHE_CONF_DIR/${vol_name}.conf" || true
-		update_include_conf_file
+		update_include_conf_dir
 		send_reload_command
 		;;
+	shutdown | bootup )
+		empty_conf_dir
+		;;
 	* )
 		# ignore all events that we do not support
 		exit 0
diff --git a/event-scripts/samba b/event-scripts/samba
index bd0d6ad..2b7aabd 100755
--- a/event-scripts/samba
+++ b/event-scripts/samba
@@ -5,7 +5,9 @@
 #	- before umounting: disable and remove the samba share
 #
 # The following line _must_ be added to your /etc/samba/smb.conf:
-#	include = /etc/cryptobox/samba-include.conf
+#	include = /var/cache/cryptobox-server/samba-include.conf
+# and you should create this file and chown it to the cryptobox user:
+#	touch /var/cache/cryptobox-server/samba-include.conf
 #
 #
 # Params:	$event $volume_name $volume_type $mount_dir
@@ -19,17 +21,41 @@
 
 set -eu
 
+# --------------=-=-=- some settings -=-=-=----------------
+# adapt this part of the file to your needs
+
 SAMBA_CONTROL=smbcontrol
-SAMBA_CONF_DIR=/var/cache/cryptobox/samba.conf.d
-TEMPLATE_CONF_FILE=/etc/cryptobox/samba-share.conf-template
-MAIN_SAMBA_CONF_FILE=/etc/cryptobox/samba-include.conf
+SAMBA_CONF_DIR=/var/cache/cryptobox-server/samba.conf.d
+MAIN_SAMBA_CONF_FILE=/var/cache/cryptobox-server/samba-include.conf
+
+# this smb.conf snippet will get used for every published share
+# _VOLUME_NAME and _SHARE_DIR_ are replaced by their actual values
+# TODO: improve the later parsing of _SHARE_DIR_ in update_include_conf_file
+#	for now it depends on non existing whitespaces around the dirname
+SAMBA_SHARE_TEMPLATE=$(cat - <<-"EOF"
+	[_VOLUME_NAME_]
+		comment	= CryptoBox share
+		path	=_SHARE_DIR_
+		read only	= no
+		guest ok	= yes
+EOF
+)
+
+# -----=-=-=- check environment and parameters -=-=-=------
 
 # check if samba is installed
-test -z "$(which $SAMBA_CONTROL)" && exit 0
+if which "$SAMBA_CONTROL"
+  then	true
+  else	echo "samba not installed ('$SAMBA_CONTROL' not found)" >&2
+	exit 1
+ fi
 
 # create include-file directory
 mkdir -p "$SAMBA_CONF_DIR"
 
+# create the main include file
+touch "$MAIN_SAMBA_CONF_FILE"
+
 # check event argument
 if test "$#" -eq 0
   then	echo "Syntax: $(basename $0) EVENT [EVENT_INFORMATION]" >&2
@@ -38,7 +64,6 @@ if test "$#" -eq 0
 
 event=$1
 
-
 # ------------=-=-=- some functions -=-=-=-----------------
 
 update_include_conf_file()
@@ -46,7 +71,12 @@ update_include_conf_file()
 	(	echo "# this file was automatically generated by the CryptoBox"
 		echo "# DO NOT EDIT - all changes will get lost!"
 		find "$SAMBA_CONF_DIR" -type f -name "*.conf" | while read fname
-		  do	echo "include = $fname"
+		  do	mdir=$(cat "$fname" | grep "path.*=" | cut -f 2 -d "=")
+				# check if the mount directory still exists
+		  		if test -d "$mdir"
+		  		  then	echo "include = $fname"
+				  else	rm "$fname"
+				 fi
 		 done ) >"$MAIN_SAMBA_CONF_FILE"
 }
 
@@ -56,6 +86,11 @@ send_reload_command()
 	"$SAMBA_CONTROL" smbd reload-config
 }
 
+empty_conf_dir()
+{
+	find "$SAMBA_CONF_DIR" -type f -name "*.conf" -print0 | xargs -0 rm
+}
+
 send_close_share_command()
 {
 	# close all connections and deny further requests
@@ -70,7 +105,7 @@ case "$event" in
 	postmount )
 		vol_name=$3
 		mount_dir=$5
-		sed "s#_SHARE_DIR_#$mount_dir#g; s#_VOLUME_NAME_#$vol_name#g" "$TEMPLATE_CONF_FILE" >"$SAMBA_CONF_DIR/${vol_name}.conf"
+		echo "$SAMBA_SHARE_TEMPLATE" | sed "s#_SHARE_DIR_#$mount_dir#g; s#_VOLUME_NAME_#$vol_name#g" >"$SAMBA_CONF_DIR/${vol_name}.conf"
 		update_include_conf_file
 		send_reload_command
 		;;
@@ -81,8 +116,11 @@ case "$event" in
 		update_include_conf_file
 		send_reload_command
 		;;
+	shutdown|bootup )
+		empty_conf_dir
+		;;
 	* )
-		# ignore all events that we do not support
+		# ignore all unsupported events
 		exit 0
 		;;
   esac
diff --git a/intl/cryptobox-server.pot b/intl/cryptobox-server.pot
index dc20026..60af3a2 100644
--- a/intl/cryptobox-server.pot
+++ b/intl/cryptobox-server.pot
@@ -152,18 +152,30 @@ msgstr ""
 msgid "Use encrypted connection"
 msgstr ""
 
-#: WarningMessage.VolumeMayNotBeMounted.Link.Rel
-msgid "volume_mount"
+#: AdviceMessage.VolumeIsBusy.Title
+msgid "Disk is busy"
 msgstr ""
 
-#: WarningMessage.InvalidAction.Link.Rel
-msgid "logs"
+#: AdviceMessage.VolumeIsBusy.Text
+msgid "This disk is currently busy. Please wait for a moment."
 msgstr ""
 
-#: EnvironmentWarning.ReadOnlyConfig.Link.Rel
-msgid "partition"
+#: AdviceMessage.VolumeIsBusy.Link.Text
+msgid "Show all disks"
 msgstr ""
 
-#: EnvironmentWarning.NoSSL.Link.Prot
-msgid "https"
+#: WarningMessage.AccessDenied.Text
+msgid "Sorry - you did not enter the right credentials! (Try user 'admin' and password 'admin' and change this setting soon.)"
+msgstr ""
+
+#: WarningMessage.AccessDenied.Link.Text
+msgid "Change password now"
+msgstr ""
+
+#: Text.ContainerName
+msgid "Volume's name"
+msgstr ""
+
+#: WarningMessage.AccessDenied.Text
+msgid "Sorry - you did not enter the right credentials! (Maybe try the default setting: username=>'admin' / password=>'admin'.)"
 msgstr ""
diff --git a/intl/cs/cryptobox-server.po b/intl/cs/cryptobox-server.po
index 8e2b9b7..2afc8cf 100644
--- a/intl/cs/cryptobox-server.po
+++ b/intl/cs/cryptobox-server.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -154,18 +153,30 @@ msgstr ""
 msgid "Use encrypted connection"
 msgstr ""
 
-#: WarningMessage.VolumeMayNotBeMounted.Link.Rel
-msgid "volume_mount"
+#: AdviceMessage.VolumeIsBusy.Title
+msgid "Disk is busy"
 msgstr ""
 
-#: WarningMessage.InvalidAction.Link.Rel
-msgid "logs"
+#: AdviceMessage.VolumeIsBusy.Text
+msgid "This disk is currently busy. Please wait for a moment."
 msgstr ""
 
-#: EnvironmentWarning.ReadOnlyConfig.Link.Rel
-msgid "partition"
+#: AdviceMessage.VolumeIsBusy.Link.Text
+msgid "Show all disks"
 msgstr ""
 
-#: EnvironmentWarning.NoSSL.Link.Prot
-msgid "https"
+#: WarningMessage.AccessDenied.Text
+msgid "Sorry - you did not enter the right credentials! (Try user 'admin' and password 'admin' and change this setting soon.)"
+msgstr ""
+
+#: WarningMessage.AccessDenied.Link.Text
+msgid "Change password now"
+msgstr ""
+
+#: Text.ContainerName
+msgid "Volume's name"
+msgstr ""
+
+#: WarningMessage.AccessDenied.Text
+msgid "Sorry - you did not enter the right credentials! (Maybe try the default setting: username=>'admin' / password=>'admin'.)"
 msgstr ""
diff --git a/intl/da/cryptobox-server.po b/intl/da/cryptobox-server.po
index 8e2b9b7..2afc8cf 100644
--- a/intl/da/cryptobox-server.po
+++ b/intl/da/cryptobox-server.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -154,18 +153,30 @@ msgstr ""
 msgid "Use encrypted connection"
 msgstr ""
 
-#: WarningMessage.VolumeMayNotBeMounted.Link.Rel
-msgid "volume_mount"
+#: AdviceMessage.VolumeIsBusy.Title
+msgid "Disk is busy"
 msgstr ""
 
-#: WarningMessage.InvalidAction.Link.Rel
-msgid "logs"
+#: AdviceMessage.VolumeIsBusy.Text
+msgid "This disk is currently busy. Please wait for a moment."
 msgstr ""
 
-#: EnvironmentWarning.ReadOnlyConfig.Link.Rel
-msgid "partition"
+#: AdviceMessage.VolumeIsBusy.Link.Text
+msgid "Show all disks"
 msgstr ""
 
-#: EnvironmentWarning.NoSSL.Link.Prot
-msgid "https"
+#: WarningMessage.AccessDenied.Text
+msgid "Sorry - you did not enter the right credentials! (Try user 'admin' and password 'admin' and change this setting soon.)"
+msgstr ""
+
+#: WarningMessage.AccessDenied.Link.Text
+msgid "Change password now"
+msgstr ""
+
+#: Text.ContainerName
+msgid "Volume's name"
+msgstr ""
+
+#: WarningMessage.AccessDenied.Text
+msgid "Sorry - you did not enter the right credentials! (Maybe try the default setting: username=>'admin' / password=>'admin'.)"
 msgstr ""
diff --git a/intl/de/cryptobox-server.po b/intl/de/cryptobox-server.po
index 354958a..d0bbcd0 100644
--- a/intl/de/cryptobox-server.po
+++ b/intl/de/cryptobox-server.po
@@ -1,4 +1,3 @@
-# 
 msgid ""
 msgstr ""
 "Project-Id-Version: CryptoBox-Server 0.3\n"
@@ -11,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 0.10.1\n"
+"X-Generator: Translate Toolkit 0.10.1\n"
 
 #: Name
 msgid "English"
@@ -153,18 +152,42 @@ msgstr "Unverschlüsselte Netzwerk-Verbindung - Passworte können derzeit leicht
 msgid "Use encrypted connection"
 msgstr "Verschlüsselte Verbindung"
 
-#: WarningMessage.VolumeMayNotBeMounted.Link.Rel
-msgid "volume_mount"
-msgstr "volume_mount"
+#: AdviceMessage.VolumeIsBusy.Title
+msgid "Disk is busy"
+msgstr ""
 
-#: WarningMessage.InvalidAction.Link.Rel
-msgid "logs"
-msgstr "logs"
+#: AdviceMessage.VolumeIsBusy.Text
+msgid "This disk is currently busy. Please wait for a moment."
+msgstr ""
 
-#: EnvironmentWarning.ReadOnlyConfig.Link.Rel
-msgid "partition"
-msgstr "partition"
+#: AdviceMessage.VolumeIsBusy.Link.Text
+msgid "Show all disks"
+msgstr ""
 
-#: EnvironmentWarning.NoSSL.Link.Prot
-msgid "https"
-msgstr "https"
+#: WarningMessage.AccessDenied.Text
+msgid "Sorry - you did not enter the right credentials! (Try user 'admin' and password 'admin' and change this setting soon.)"
+msgstr ""
+
+#: WarningMessage.AccessDenied.Link.Text
+msgid "Change password now"
+msgstr ""
+
+#: Text.ContainerName
+msgid "Volume's name"
+msgstr ""
+
+#: WarningMessage.AccessDenied.Text
+msgid "Sorry - you did not enter the right credentials! (Maybe try the default setting: username=>'admin' / password=>'admin'.)"
+msgstr ""
+
+#~ msgid "volume_mount"
+#~ msgstr "volume_mount"
+
+#~ msgid "logs"
+#~ msgstr "logs"
+
+#~ msgid "partition"
+#~ msgstr "partition"
+
+#~ msgid "https"
+#~ msgstr "https"
diff --git a/intl/en/cryptobox-server.po b/intl/en/cryptobox-server.po
index 74b019e..09a31eb 100644
--- a/intl/en/cryptobox-server.po
+++ b/intl/en/cryptobox-server.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -12,7 +11,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 0.10.1\n"
+"X-Generator: Translate Toolkit 0.10.1\n"
 
 #: Name
 msgid "English"
@@ -111,12 +110,8 @@ msgid "The container is mounted"
 msgstr "The container is mounted"
 
 #: WarningMessage.VolumeMayNotBeMounted.Text
-msgid ""
-"This action is not available while the container is active. Please turn it "
-"off first."
-msgstr ""
-"This action is not available while the container is active. Please turn it "
-"off first."
+msgid "This action is not available while the container is active. Please turn it off first."
+msgstr "This action is not available while the container is active. Please turn it off first."
 
 #: WarningMessage.VolumeMayNotBeMounted.Link.Text
 msgid "Deactivate volume"
@@ -127,14 +122,8 @@ msgid "Invalid request"
 msgstr "Invalid request"
 
 #: WarningMessage.InvalidAction.Text
-msgid ""
-"Sorry - I do not know how to handle this request. If you think, that this is "
-"a bug, then you should send the most recent part of the CryptoBox log to "
-"info@cryptobox.org."
-msgstr ""
-"Sorry - I do not know how to handle this request. If you think, that this is "
-"a bug, then you should send the most recent part of the CryptoBox log to "
-"info@cryptobox.org."
+msgid "Sorry - I do not know how to handle this request. If you think, that this is a bug, then you should send the most recent part of the CryptoBox log to info@cryptobox.org."
+msgstr "Sorry - I do not know how to handle this request. If you think, that this is a bug, then you should send the most recent part of the CryptoBox log to info@cryptobox.org."
 
 #: WarningMessage.InvalidAction.Link.Text
 msgid "View log"
@@ -145,22 +134,12 @@ msgid "Something weird happened"
 msgstr "Something weird happened"
 
 #: WarningMessage.RuntimeError.Text
-msgid ""
-"We (the developer of the CryptoBox) would like to fix this problem for you "
-"and others. Please send the most recent part of the CryptoBox log to "
-"info@cryptobox.org. Thanks for your contribution!"
-msgstr ""
-"We (the developer of the CryptoBox) would like to fix this problem for you "
-"and others. Please send the most recent part of the CryptoBox log to "
-"info@cryptobox.org. Thanks for your contribution!"
+msgid "We (the developer of the CryptoBox) would like to fix this problem for you and others. Please send the most recent part of the CryptoBox log to info@cryptobox.org. Thanks for your contribution!"
+msgstr "We (the developer of the CryptoBox) would like to fix this problem for you and others. Please send the most recent part of the CryptoBox log to info@cryptobox.org. Thanks for your contribution!"
 
 #: EnvironmentWarning.ReadOnlyConfig.Text
-msgid ""
-"Read-only setup detected - probably you should create a configuration "
-"partition."
-msgstr ""
-"Read-only setup detected - probably you should create a configuration "
-"partition."
+msgid "Read-only setup detected - probably you should create a configuration partition."
+msgstr "Read-only setup detected - probably you should create a configuration partition."
 
 #: EnvironmentWarning.ReadOnlyConfig.Link.Text
 msgid "Initialize partition"
@@ -174,18 +153,42 @@ msgstr "The connection is not encrypted - passwords can be easily intercepted."
 msgid "Use encrypted connection"
 msgstr "Use encrypted connection"
 
-#: WarningMessage.VolumeMayNotBeMounted.Link.Rel
-msgid "volume_mount"
-msgstr "volume_mount"
+#: AdviceMessage.VolumeIsBusy.Title
+msgid "Disk is busy"
+msgstr ""
 
-#: WarningMessage.InvalidAction.Link.Rel
-msgid "logs"
-msgstr "logs"
+#: AdviceMessage.VolumeIsBusy.Text
+msgid "This disk is currently busy. Please wait for a moment."
+msgstr ""
 
-#: EnvironmentWarning.ReadOnlyConfig.Link.Rel
-msgid "partition"
-msgstr "partition"
+#: AdviceMessage.VolumeIsBusy.Link.Text
+msgid "Show all disks"
+msgstr ""
 
-#: EnvironmentWarning.NoSSL.Link.Prot
-msgid "https"
-msgstr "https"
+#: WarningMessage.AccessDenied.Text
+msgid "Sorry - you did not enter the right credentials! (Try user 'admin' and password 'admin' and change this setting soon.)"
+msgstr ""
+
+#: WarningMessage.AccessDenied.Link.Text
+msgid "Change password now"
+msgstr ""
+
+#: Text.ContainerName
+msgid "Volume's name"
+msgstr ""
+
+#: WarningMessage.AccessDenied.Text
+msgid "Sorry - you did not enter the right credentials! (Maybe try the default setting: username=>'admin' / password=>'admin'.)"
+msgstr ""
+
+#~ msgid "volume_mount"
+#~ msgstr "volume_mount"
+
+#~ msgid "logs"
+#~ msgstr "logs"
+
+#~ msgid "partition"
+#~ msgstr "partition"
+
+#~ msgid "https"
+#~ msgstr "https"
diff --git a/intl/es/cryptobox-server.po b/intl/es/cryptobox-server.po
index 8e2b9b7..2afc8cf 100644
--- a/intl/es/cryptobox-server.po
+++ b/intl/es/cryptobox-server.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -154,18 +153,30 @@ msgstr ""
 msgid "Use encrypted connection"
 msgstr ""
 
-#: WarningMessage.VolumeMayNotBeMounted.Link.Rel
-msgid "volume_mount"
+#: AdviceMessage.VolumeIsBusy.Title
+msgid "Disk is busy"
 msgstr ""
 
-#: WarningMessage.InvalidAction.Link.Rel
-msgid "logs"
+#: AdviceMessage.VolumeIsBusy.Text
+msgid "This disk is currently busy. Please wait for a moment."
 msgstr ""
 
-#: EnvironmentWarning.ReadOnlyConfig.Link.Rel
-msgid "partition"
+#: AdviceMessage.VolumeIsBusy.Link.Text
+msgid "Show all disks"
 msgstr ""
 
-#: EnvironmentWarning.NoSSL.Link.Prot
-msgid "https"
+#: WarningMessage.AccessDenied.Text
+msgid "Sorry - you did not enter the right credentials! (Try user 'admin' and password 'admin' and change this setting soon.)"
+msgstr ""
+
+#: WarningMessage.AccessDenied.Link.Text
+msgid "Change password now"
+msgstr ""
+
+#: Text.ContainerName
+msgid "Volume's name"
+msgstr ""
+
+#: WarningMessage.AccessDenied.Text
+msgid "Sorry - you did not enter the right credentials! (Maybe try the default setting: username=>'admin' / password=>'admin'.)"
 msgstr ""
diff --git a/intl/fi/cryptobox-server.po b/intl/fi/cryptobox-server.po
index 8e2b9b7..2afc8cf 100644
--- a/intl/fi/cryptobox-server.po
+++ b/intl/fi/cryptobox-server.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -154,18 +153,30 @@ msgstr ""
 msgid "Use encrypted connection"
 msgstr ""
 
-#: WarningMessage.VolumeMayNotBeMounted.Link.Rel
-msgid "volume_mount"
+#: AdviceMessage.VolumeIsBusy.Title
+msgid "Disk is busy"
 msgstr ""
 
-#: WarningMessage.InvalidAction.Link.Rel
-msgid "logs"
+#: AdviceMessage.VolumeIsBusy.Text
+msgid "This disk is currently busy. Please wait for a moment."
 msgstr ""
 
-#: EnvironmentWarning.ReadOnlyConfig.Link.Rel
-msgid "partition"
+#: AdviceMessage.VolumeIsBusy.Link.Text
+msgid "Show all disks"
 msgstr ""
 
-#: EnvironmentWarning.NoSSL.Link.Prot
-msgid "https"
+#: WarningMessage.AccessDenied.Text
+msgid "Sorry - you did not enter the right credentials! (Try user 'admin' and password 'admin' and change this setting soon.)"
+msgstr ""
+
+#: WarningMessage.AccessDenied.Link.Text
+msgid "Change password now"
+msgstr ""
+
+#: Text.ContainerName
+msgid "Volume's name"
+msgstr ""
+
+#: WarningMessage.AccessDenied.Text
+msgid "Sorry - you did not enter the right credentials! (Maybe try the default setting: username=>'admin' / password=>'admin'.)"
 msgstr ""
diff --git a/intl/fr/cryptobox-server.po b/intl/fr/cryptobox-server.po
index 78fa0ac..7b56570 100644
--- a/intl/fr/cryptobox-server.po
+++ b/intl/fr/cryptobox-server.po
@@ -1,4 +1,3 @@
-# 
 msgid ""
 msgstr ""
 "Project-Id-Version: CryptoBox-Server 0.3\n"
@@ -11,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Pootle 0.10.1\n"
+"X-Generator: Translate Toolkit 0.10.1\n"
 
 #: Name
 msgid "English"
@@ -153,18 +152,30 @@ msgstr ""
 msgid "Use encrypted connection"
 msgstr ""
 
-#: WarningMessage.VolumeMayNotBeMounted.Link.Rel
-msgid "volume_mount"
+#: AdviceMessage.VolumeIsBusy.Title
+msgid "Disk is busy"
 msgstr ""
 
-#: WarningMessage.InvalidAction.Link.Rel
-msgid "logs"
+#: AdviceMessage.VolumeIsBusy.Text
+msgid "This disk is currently busy. Please wait for a moment."
 msgstr ""
 
-#: EnvironmentWarning.ReadOnlyConfig.Link.Rel
-msgid "partition"
+#: AdviceMessage.VolumeIsBusy.Link.Text
+msgid "Show all disks"
 msgstr ""
 
-#: EnvironmentWarning.NoSSL.Link.Prot
-msgid "https"
+#: WarningMessage.AccessDenied.Text
+msgid "Sorry - you did not enter the right credentials! (Try user 'admin' and password 'admin' and change this setting soon.)"
+msgstr ""
+
+#: WarningMessage.AccessDenied.Link.Text
+msgid "Change password now"
+msgstr ""
+
+#: Text.ContainerName
+msgid "Volume's name"
+msgstr ""
+
+#: WarningMessage.AccessDenied.Text
+msgid "Sorry - you did not enter the right credentials! (Maybe try the default setting: username=>'admin' / password=>'admin'.)"
 msgstr ""
diff --git a/intl/hu/cryptobox-server.po b/intl/hu/cryptobox-server.po
index 8e2b9b7..2afc8cf 100644
--- a/intl/hu/cryptobox-server.po
+++ b/intl/hu/cryptobox-server.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -154,18 +153,30 @@ msgstr ""
 msgid "Use encrypted connection"
 msgstr ""
 
-#: WarningMessage.VolumeMayNotBeMounted.Link.Rel
-msgid "volume_mount"
+#: AdviceMessage.VolumeIsBusy.Title
+msgid "Disk is busy"
 msgstr ""
 
-#: WarningMessage.InvalidAction.Link.Rel
-msgid "logs"
+#: AdviceMessage.VolumeIsBusy.Text
+msgid "This disk is currently busy. Please wait for a moment."
 msgstr ""
 
-#: EnvironmentWarning.ReadOnlyConfig.Link.Rel
-msgid "partition"
+#: AdviceMessage.VolumeIsBusy.Link.Text
+msgid "Show all disks"
 msgstr ""
 
-#: EnvironmentWarning.NoSSL.Link.Prot
-msgid "https"
+#: WarningMessage.AccessDenied.Text
+msgid "Sorry - you did not enter the right credentials! (Try user 'admin' and password 'admin' and change this setting soon.)"
+msgstr ""
+
+#: WarningMessage.AccessDenied.Link.Text
+msgid "Change password now"
+msgstr ""
+
+#: Text.ContainerName
+msgid "Volume's name"
+msgstr ""
+
+#: WarningMessage.AccessDenied.Text
+msgid "Sorry - you did not enter the right credentials! (Maybe try the default setting: username=>'admin' / password=>'admin'.)"
 msgstr ""
diff --git a/intl/it/cryptobox-server.po b/intl/it/cryptobox-server.po
index 8e2b9b7..2afc8cf 100644
--- a/intl/it/cryptobox-server.po
+++ b/intl/it/cryptobox-server.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -154,18 +153,30 @@ msgstr ""
 msgid "Use encrypted connection"
 msgstr ""
 
-#: WarningMessage.VolumeMayNotBeMounted.Link.Rel
-msgid "volume_mount"
+#: AdviceMessage.VolumeIsBusy.Title
+msgid "Disk is busy"
 msgstr ""
 
-#: WarningMessage.InvalidAction.Link.Rel
-msgid "logs"
+#: AdviceMessage.VolumeIsBusy.Text
+msgid "This disk is currently busy. Please wait for a moment."
 msgstr ""
 
-#: EnvironmentWarning.ReadOnlyConfig.Link.Rel
-msgid "partition"
+#: AdviceMessage.VolumeIsBusy.Link.Text
+msgid "Show all disks"
 msgstr ""
 
-#: EnvironmentWarning.NoSSL.Link.Prot
-msgid "https"
+#: WarningMessage.AccessDenied.Text
+msgid "Sorry - you did not enter the right credentials! (Try user 'admin' and password 'admin' and change this setting soon.)"
+msgstr ""
+
+#: WarningMessage.AccessDenied.Link.Text
+msgid "Change password now"
+msgstr ""
+
+#: Text.ContainerName
+msgid "Volume's name"
+msgstr ""
+
+#: WarningMessage.AccessDenied.Text
+msgid "Sorry - you did not enter the right credentials! (Maybe try the default setting: username=>'admin' / password=>'admin'.)"
 msgstr ""
diff --git a/intl/ja/cryptobox-server.po b/intl/ja/cryptobox-server.po
index 8e2b9b7..2afc8cf 100644
--- a/intl/ja/cryptobox-server.po
+++ b/intl/ja/cryptobox-server.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -154,18 +153,30 @@ msgstr ""
 msgid "Use encrypted connection"
 msgstr ""
 
-#: WarningMessage.VolumeMayNotBeMounted.Link.Rel
-msgid "volume_mount"
+#: AdviceMessage.VolumeIsBusy.Title
+msgid "Disk is busy"
 msgstr ""
 
-#: WarningMessage.InvalidAction.Link.Rel
-msgid "logs"
+#: AdviceMessage.VolumeIsBusy.Text
+msgid "This disk is currently busy. Please wait for a moment."
 msgstr ""
 
-#: EnvironmentWarning.ReadOnlyConfig.Link.Rel
-msgid "partition"
+#: AdviceMessage.VolumeIsBusy.Link.Text
+msgid "Show all disks"
 msgstr ""
 
-#: EnvironmentWarning.NoSSL.Link.Prot
-msgid "https"
+#: WarningMessage.AccessDenied.Text
+msgid "Sorry - you did not enter the right credentials! (Try user 'admin' and password 'admin' and change this setting soon.)"
+msgstr ""
+
+#: WarningMessage.AccessDenied.Link.Text
+msgid "Change password now"
+msgstr ""
+
+#: Text.ContainerName
+msgid "Volume's name"
+msgstr ""
+
+#: WarningMessage.AccessDenied.Text
+msgid "Sorry - you did not enter the right credentials! (Maybe try the default setting: username=>'admin' / password=>'admin'.)"
 msgstr ""
diff --git a/intl/nl/cryptobox-server.po b/intl/nl/cryptobox-server.po
index 8e2b9b7..2afc8cf 100644
--- a/intl/nl/cryptobox-server.po
+++ b/intl/nl/cryptobox-server.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -154,18 +153,30 @@ msgstr ""
 msgid "Use encrypted connection"
 msgstr ""
 
-#: WarningMessage.VolumeMayNotBeMounted.Link.Rel
-msgid "volume_mount"
+#: AdviceMessage.VolumeIsBusy.Title
+msgid "Disk is busy"
 msgstr ""
 
-#: WarningMessage.InvalidAction.Link.Rel
-msgid "logs"
+#: AdviceMessage.VolumeIsBusy.Text
+msgid "This disk is currently busy. Please wait for a moment."
 msgstr ""
 
-#: EnvironmentWarning.ReadOnlyConfig.Link.Rel
-msgid "partition"
+#: AdviceMessage.VolumeIsBusy.Link.Text
+msgid "Show all disks"
 msgstr ""
 
-#: EnvironmentWarning.NoSSL.Link.Prot
-msgid "https"
+#: WarningMessage.AccessDenied.Text
+msgid "Sorry - you did not enter the right credentials! (Try user 'admin' and password 'admin' and change this setting soon.)"
+msgstr ""
+
+#: WarningMessage.AccessDenied.Link.Text
+msgid "Change password now"
+msgstr ""
+
+#: Text.ContainerName
+msgid "Volume's name"
+msgstr ""
+
+#: WarningMessage.AccessDenied.Text
+msgid "Sorry - you did not enter the right credentials! (Maybe try the default setting: username=>'admin' / password=>'admin'.)"
 msgstr ""
diff --git a/intl/pl/cryptobox-server.po b/intl/pl/cryptobox-server.po
index 8e2b9b7..2afc8cf 100644
--- a/intl/pl/cryptobox-server.po
+++ b/intl/pl/cryptobox-server.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -154,18 +153,30 @@ msgstr ""
 msgid "Use encrypted connection"
 msgstr ""
 
-#: WarningMessage.VolumeMayNotBeMounted.Link.Rel
-msgid "volume_mount"
+#: AdviceMessage.VolumeIsBusy.Title
+msgid "Disk is busy"
 msgstr ""
 
-#: WarningMessage.InvalidAction.Link.Rel
-msgid "logs"
+#: AdviceMessage.VolumeIsBusy.Text
+msgid "This disk is currently busy. Please wait for a moment."
 msgstr ""
 
-#: EnvironmentWarning.ReadOnlyConfig.Link.Rel
-msgid "partition"
+#: AdviceMessage.VolumeIsBusy.Link.Text
+msgid "Show all disks"
 msgstr ""
 
-#: EnvironmentWarning.NoSSL.Link.Prot
-msgid "https"
+#: WarningMessage.AccessDenied.Text
+msgid "Sorry - you did not enter the right credentials! (Try user 'admin' and password 'admin' and change this setting soon.)"
+msgstr ""
+
+#: WarningMessage.AccessDenied.Link.Text
+msgid "Change password now"
+msgstr ""
+
+#: Text.ContainerName
+msgid "Volume's name"
+msgstr ""
+
+#: WarningMessage.AccessDenied.Text
+msgid "Sorry - you did not enter the right credentials! (Maybe try the default setting: username=>'admin' / password=>'admin'.)"
 msgstr ""
diff --git a/intl/pt/cryptobox-server.po b/intl/pt/cryptobox-server.po
index 8e2b9b7..2afc8cf 100644
--- a/intl/pt/cryptobox-server.po
+++ b/intl/pt/cryptobox-server.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -154,18 +153,30 @@ msgstr ""
 msgid "Use encrypted connection"
 msgstr ""
 
-#: WarningMessage.VolumeMayNotBeMounted.Link.Rel
-msgid "volume_mount"
+#: AdviceMessage.VolumeIsBusy.Title
+msgid "Disk is busy"
 msgstr ""
 
-#: WarningMessage.InvalidAction.Link.Rel
-msgid "logs"
+#: AdviceMessage.VolumeIsBusy.Text
+msgid "This disk is currently busy. Please wait for a moment."
 msgstr ""
 
-#: EnvironmentWarning.ReadOnlyConfig.Link.Rel
-msgid "partition"
+#: AdviceMessage.VolumeIsBusy.Link.Text
+msgid "Show all disks"
 msgstr ""
 
-#: EnvironmentWarning.NoSSL.Link.Prot
-msgid "https"
+#: WarningMessage.AccessDenied.Text
+msgid "Sorry - you did not enter the right credentials! (Try user 'admin' and password 'admin' and change this setting soon.)"
+msgstr ""
+
+#: WarningMessage.AccessDenied.Link.Text
+msgid "Change password now"
+msgstr ""
+
+#: Text.ContainerName
+msgid "Volume's name"
+msgstr ""
+
+#: WarningMessage.AccessDenied.Text
+msgid "Sorry - you did not enter the right credentials! (Maybe try the default setting: username=>'admin' / password=>'admin'.)"
 msgstr ""
diff --git a/intl/ru/cryptobox-server.po b/intl/ru/cryptobox-server.po
index 8e2b9b7..2afc8cf 100644
--- a/intl/ru/cryptobox-server.po
+++ b/intl/ru/cryptobox-server.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -154,18 +153,30 @@ msgstr ""
 msgid "Use encrypted connection"
 msgstr ""
 
-#: WarningMessage.VolumeMayNotBeMounted.Link.Rel
-msgid "volume_mount"
+#: AdviceMessage.VolumeIsBusy.Title
+msgid "Disk is busy"
 msgstr ""
 
-#: WarningMessage.InvalidAction.Link.Rel
-msgid "logs"
+#: AdviceMessage.VolumeIsBusy.Text
+msgid "This disk is currently busy. Please wait for a moment."
 msgstr ""
 
-#: EnvironmentWarning.ReadOnlyConfig.Link.Rel
-msgid "partition"
+#: AdviceMessage.VolumeIsBusy.Link.Text
+msgid "Show all disks"
 msgstr ""
 
-#: EnvironmentWarning.NoSSL.Link.Prot
-msgid "https"
+#: WarningMessage.AccessDenied.Text
+msgid "Sorry - you did not enter the right credentials! (Try user 'admin' and password 'admin' and change this setting soon.)"
+msgstr ""
+
+#: WarningMessage.AccessDenied.Link.Text
+msgid "Change password now"
+msgstr ""
+
+#: Text.ContainerName
+msgid "Volume's name"
+msgstr ""
+
+#: WarningMessage.AccessDenied.Text
+msgid "Sorry - you did not enter the right credentials! (Maybe try the default setting: username=>'admin' / password=>'admin'.)"
 msgstr ""
diff --git a/intl/sl/cryptobox-server.po b/intl/sl/cryptobox-server.po
index b36c640..1696144 100644
--- a/intl/sl/cryptobox-server.po
+++ b/intl/sl/cryptobox-server.po
@@ -1,4 +1,3 @@
-# 
 msgid ""
 msgstr ""
 "Project-Id-Version: CryptoBox-Server 0.3\n"
@@ -11,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
-"X-Generator: Pootle 0.10.1\n"
+"X-Generator: Translate Toolkit 0.10.1\n"
 
 #: Name
 msgid "English"
@@ -153,18 +152,30 @@ msgstr ""
 msgid "Use encrypted connection"
 msgstr ""
 
-#: WarningMessage.VolumeMayNotBeMounted.Link.Rel
-msgid "volume_mount"
+#: AdviceMessage.VolumeIsBusy.Title
+msgid "Disk is busy"
 msgstr ""
 
-#: WarningMessage.InvalidAction.Link.Rel
-msgid "logs"
+#: AdviceMessage.VolumeIsBusy.Text
+msgid "This disk is currently busy. Please wait for a moment."
 msgstr ""
 
-#: EnvironmentWarning.ReadOnlyConfig.Link.Rel
-msgid "partition"
+#: AdviceMessage.VolumeIsBusy.Link.Text
+msgid "Show all disks"
 msgstr ""
 
-#: EnvironmentWarning.NoSSL.Link.Prot
-msgid "https"
+#: WarningMessage.AccessDenied.Text
+msgid "Sorry - you did not enter the right credentials! (Try user 'admin' and password 'admin' and change this setting soon.)"
+msgstr ""
+
+#: WarningMessage.AccessDenied.Link.Text
+msgid "Change password now"
+msgstr ""
+
+#: Text.ContainerName
+msgid "Volume's name"
+msgstr ""
+
+#: WarningMessage.AccessDenied.Text
+msgid "Sorry - you did not enter the right credentials! (Maybe try the default setting: username=>'admin' / password=>'admin'.)"
 msgstr ""
diff --git a/intl/sv/cryptobox-server.po b/intl/sv/cryptobox-server.po
index 8e2b9b7..2afc8cf 100644
--- a/intl/sv/cryptobox-server.po
+++ b/intl/sv/cryptobox-server.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -154,18 +153,30 @@ msgstr ""
 msgid "Use encrypted connection"
 msgstr ""
 
-#: WarningMessage.VolumeMayNotBeMounted.Link.Rel
-msgid "volume_mount"
+#: AdviceMessage.VolumeIsBusy.Title
+msgid "Disk is busy"
 msgstr ""
 
-#: WarningMessage.InvalidAction.Link.Rel
-msgid "logs"
+#: AdviceMessage.VolumeIsBusy.Text
+msgid "This disk is currently busy. Please wait for a moment."
 msgstr ""
 
-#: EnvironmentWarning.ReadOnlyConfig.Link.Rel
-msgid "partition"
+#: AdviceMessage.VolumeIsBusy.Link.Text
+msgid "Show all disks"
 msgstr ""
 
-#: EnvironmentWarning.NoSSL.Link.Prot
-msgid "https"
+#: WarningMessage.AccessDenied.Text
+msgid "Sorry - you did not enter the right credentials! (Try user 'admin' and password 'admin' and change this setting soon.)"
+msgstr ""
+
+#: WarningMessage.AccessDenied.Link.Text
+msgid "Change password now"
+msgstr ""
+
+#: Text.ContainerName
+msgid "Volume's name"
+msgstr ""
+
+#: WarningMessage.AccessDenied.Text
+msgid "Sorry - you did not enter the right credentials! (Maybe try the default setting: username=>'admin' / password=>'admin'.)"
 msgstr ""
diff --git a/plugins/date/date.py b/plugins/date/date.py
index 6206551..789bcef 100644
--- a/plugins/date/date.py
+++ b/plugins/date/date.py
@@ -53,7 +53,7 @@ class date(cryptobox.plugins.base.CryptoBoxPlugin):
 			if self.__set_date(date):
 				self.cbox.log.info("changed date to: %s" % date)
 				self.hdf["Data.Success"] = "Plugins.date.DateChanged"
-				return None
+				return "form_date"
 			else:
 				## a failure should usually be an invalid date (we do not check it really)
 				self.cbox.log.info("failed to set date: %s" % date)
diff --git a/plugins/date/intl/cs/cryptobox-server-feature-date.po b/plugins/date/intl/cs/cryptobox-server-feature-date.po
index da09f3a..ba38ae4 100644
--- a/plugins/date/intl/cs/cryptobox-server-feature-date.po
+++ b/plugins/date/intl/cs/cryptobox-server-feature-date.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/date/intl/da/cryptobox-server-feature-date.po b/plugins/date/intl/da/cryptobox-server-feature-date.po
index da09f3a..ba38ae4 100644
--- a/plugins/date/intl/da/cryptobox-server-feature-date.po
+++ b/plugins/date/intl/da/cryptobox-server-feature-date.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/date/intl/de/cryptobox-server-feature-date.po b/plugins/date/intl/de/cryptobox-server-feature-date.po
index eda61fe..4db0a53 100644
--- a/plugins/date/intl/de/cryptobox-server-feature-date.po
+++ b/plugins/date/intl/de/cryptobox-server-feature-date.po
@@ -1,4 +1,3 @@
-# 
 msgid ""
 msgstr ""
 "Project-Id-Version: CryptoBox-Server 0.3\n"
@@ -11,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 0.10.1\n"
+"X-Generator: Translate Toolkit 0.10.1\n"
 
 #: Name
 msgid "Change date and time"
diff --git a/plugins/date/intl/en/cryptobox-server-feature-date.po b/plugins/date/intl/en/cryptobox-server-feature-date.po
index 731d368..ff2703a 100644
--- a/plugins/date/intl/en/cryptobox-server-feature-date.po
+++ b/plugins/date/intl/en/cryptobox-server-feature-date.po
@@ -1,10 +1,9 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: CryptoBox-Server 0.3\n"
 "Report-Msgid-Bugs-To: translate@cryptobox.org\n"
-"POT-Creation-Date: 2006-11-28 05:03+0100\n"
+"POT-Creation-Date: 2006-11-28 05:04+0100\n"
 "PO-Revision-Date: 2006-11-29 19:31+0100\n"
 "Last-Translator: Lars Kruse <devel@sumpfralle.de>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -12,7 +11,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 0.10.1\n"
+"X-Generator: Translate Toolkit 0.10.1\n"
 
 #: Name
 msgid "Change date and time"
diff --git a/plugins/date/intl/es/cryptobox-server-feature-date.po b/plugins/date/intl/es/cryptobox-server-feature-date.po
index da09f3a..ba38ae4 100644
--- a/plugins/date/intl/es/cryptobox-server-feature-date.po
+++ b/plugins/date/intl/es/cryptobox-server-feature-date.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/date/intl/fi/cryptobox-server-feature-date.po b/plugins/date/intl/fi/cryptobox-server-feature-date.po
index da09f3a..ba38ae4 100644
--- a/plugins/date/intl/fi/cryptobox-server-feature-date.po
+++ b/plugins/date/intl/fi/cryptobox-server-feature-date.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/date/intl/fr/cryptobox-server-feature-date.po b/plugins/date/intl/fr/cryptobox-server-feature-date.po
index da09f3a..ba38ae4 100644
--- a/plugins/date/intl/fr/cryptobox-server-feature-date.po
+++ b/plugins/date/intl/fr/cryptobox-server-feature-date.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/date/intl/hu/cryptobox-server-feature-date.po b/plugins/date/intl/hu/cryptobox-server-feature-date.po
index da09f3a..ba38ae4 100644
--- a/plugins/date/intl/hu/cryptobox-server-feature-date.po
+++ b/plugins/date/intl/hu/cryptobox-server-feature-date.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/date/intl/it/cryptobox-server-feature-date.po b/plugins/date/intl/it/cryptobox-server-feature-date.po
index da09f3a..ba38ae4 100644
--- a/plugins/date/intl/it/cryptobox-server-feature-date.po
+++ b/plugins/date/intl/it/cryptobox-server-feature-date.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/date/intl/ja/cryptobox-server-feature-date.po b/plugins/date/intl/ja/cryptobox-server-feature-date.po
index da09f3a..ba38ae4 100644
--- a/plugins/date/intl/ja/cryptobox-server-feature-date.po
+++ b/plugins/date/intl/ja/cryptobox-server-feature-date.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/date/intl/nl/cryptobox-server-feature-date.po b/plugins/date/intl/nl/cryptobox-server-feature-date.po
index da09f3a..ba38ae4 100644
--- a/plugins/date/intl/nl/cryptobox-server-feature-date.po
+++ b/plugins/date/intl/nl/cryptobox-server-feature-date.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/date/intl/pl/cryptobox-server-feature-date.po b/plugins/date/intl/pl/cryptobox-server-feature-date.po
index da09f3a..ba38ae4 100644
--- a/plugins/date/intl/pl/cryptobox-server-feature-date.po
+++ b/plugins/date/intl/pl/cryptobox-server-feature-date.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/date/intl/pt/cryptobox-server-feature-date.po b/plugins/date/intl/pt/cryptobox-server-feature-date.po
index da09f3a..ba38ae4 100644
--- a/plugins/date/intl/pt/cryptobox-server-feature-date.po
+++ b/plugins/date/intl/pt/cryptobox-server-feature-date.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/date/intl/ru/cryptobox-server-feature-date.po b/plugins/date/intl/ru/cryptobox-server-feature-date.po
index da09f3a..ba38ae4 100644
--- a/plugins/date/intl/ru/cryptobox-server-feature-date.po
+++ b/plugins/date/intl/ru/cryptobox-server-feature-date.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/date/intl/sl/cryptobox-server-feature-date.po b/plugins/date/intl/sl/cryptobox-server-feature-date.po
index da09f3a..ba38ae4 100644
--- a/plugins/date/intl/sl/cryptobox-server-feature-date.po
+++ b/plugins/date/intl/sl/cryptobox-server-feature-date.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/date/intl/sv/cryptobox-server-feature-date.po b/plugins/date/intl/sv/cryptobox-server-feature-date.po
index da09f3a..ba38ae4 100644
--- a/plugins/date/intl/sv/cryptobox-server-feature-date.po
+++ b/plugins/date/intl/sv/cryptobox-server-feature-date.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/disks/intl/cs/cryptobox-server-feature-disks.po b/plugins/disks/intl/cs/cryptobox-server-feature-disks.po
index 09a844e..f3f5e67 100644
--- a/plugins/disks/intl/cs/cryptobox-server-feature-disks.po
+++ b/plugins/disks/intl/cs/cryptobox-server-feature-disks.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/disks/intl/da/cryptobox-server-feature-disks.po b/plugins/disks/intl/da/cryptobox-server-feature-disks.po
index 09a844e..f3f5e67 100644
--- a/plugins/disks/intl/da/cryptobox-server-feature-disks.po
+++ b/plugins/disks/intl/da/cryptobox-server-feature-disks.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/disks/intl/de/cryptobox-server-feature-disks.po b/plugins/disks/intl/de/cryptobox-server-feature-disks.po
index 09a844e..f3f5e67 100644
--- a/plugins/disks/intl/de/cryptobox-server-feature-disks.po
+++ b/plugins/disks/intl/de/cryptobox-server-feature-disks.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/disks/intl/en/cryptobox-server-feature-disks.po b/plugins/disks/intl/en/cryptobox-server-feature-disks.po
index aff56de..0b5cd9d 100644
--- a/plugins/disks/intl/en/cryptobox-server-feature-disks.po
+++ b/plugins/disks/intl/en/cryptobox-server-feature-disks.po
@@ -1,10 +1,9 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: CryptoBox-Server 0.3\n"
 "Report-Msgid-Bugs-To: translate@cryptobox.org\n"
-"POT-Creation-Date: 2006-11-28 05:03+0100\n"
+"POT-Creation-Date: 2006-11-28 05:04+0100\n"
 "PO-Revision-Date: 2006-11-29 19:31+0100\n"
 "Last-Translator: Lars Kruse <devel@sumpfralle.de>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -12,7 +11,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 0.10.1\n"
+"X-Generator: Translate Toolkit 0.10.1\n"
 
 #: Name
 msgid "Disk overview"
diff --git a/plugins/disks/intl/es/cryptobox-server-feature-disks.po b/plugins/disks/intl/es/cryptobox-server-feature-disks.po
index 09a844e..f3f5e67 100644
--- a/plugins/disks/intl/es/cryptobox-server-feature-disks.po
+++ b/plugins/disks/intl/es/cryptobox-server-feature-disks.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/disks/intl/fi/cryptobox-server-feature-disks.po b/plugins/disks/intl/fi/cryptobox-server-feature-disks.po
index 09a844e..f3f5e67 100644
--- a/plugins/disks/intl/fi/cryptobox-server-feature-disks.po
+++ b/plugins/disks/intl/fi/cryptobox-server-feature-disks.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/disks/intl/fr/cryptobox-server-feature-disks.po b/plugins/disks/intl/fr/cryptobox-server-feature-disks.po
index 09a844e..f3f5e67 100644
--- a/plugins/disks/intl/fr/cryptobox-server-feature-disks.po
+++ b/plugins/disks/intl/fr/cryptobox-server-feature-disks.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/disks/intl/hu/cryptobox-server-feature-disks.po b/plugins/disks/intl/hu/cryptobox-server-feature-disks.po
index 09a844e..f3f5e67 100644
--- a/plugins/disks/intl/hu/cryptobox-server-feature-disks.po
+++ b/plugins/disks/intl/hu/cryptobox-server-feature-disks.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/disks/intl/it/cryptobox-server-feature-disks.po b/plugins/disks/intl/it/cryptobox-server-feature-disks.po
index 09a844e..f3f5e67 100644
--- a/plugins/disks/intl/it/cryptobox-server-feature-disks.po
+++ b/plugins/disks/intl/it/cryptobox-server-feature-disks.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/disks/intl/ja/cryptobox-server-feature-disks.po b/plugins/disks/intl/ja/cryptobox-server-feature-disks.po
index 09a844e..f3f5e67 100644
--- a/plugins/disks/intl/ja/cryptobox-server-feature-disks.po
+++ b/plugins/disks/intl/ja/cryptobox-server-feature-disks.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/disks/intl/nl/cryptobox-server-feature-disks.po b/plugins/disks/intl/nl/cryptobox-server-feature-disks.po
index 09a844e..f3f5e67 100644
--- a/plugins/disks/intl/nl/cryptobox-server-feature-disks.po
+++ b/plugins/disks/intl/nl/cryptobox-server-feature-disks.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/disks/intl/pl/cryptobox-server-feature-disks.po b/plugins/disks/intl/pl/cryptobox-server-feature-disks.po
index 09a844e..f3f5e67 100644
--- a/plugins/disks/intl/pl/cryptobox-server-feature-disks.po
+++ b/plugins/disks/intl/pl/cryptobox-server-feature-disks.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/disks/intl/pt/cryptobox-server-feature-disks.po b/plugins/disks/intl/pt/cryptobox-server-feature-disks.po
index 09a844e..f3f5e67 100644
--- a/plugins/disks/intl/pt/cryptobox-server-feature-disks.po
+++ b/plugins/disks/intl/pt/cryptobox-server-feature-disks.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/disks/intl/ru/cryptobox-server-feature-disks.po b/plugins/disks/intl/ru/cryptobox-server-feature-disks.po
index 09a844e..f3f5e67 100644
--- a/plugins/disks/intl/ru/cryptobox-server-feature-disks.po
+++ b/plugins/disks/intl/ru/cryptobox-server-feature-disks.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/disks/intl/sl/cryptobox-server-feature-disks.po b/plugins/disks/intl/sl/cryptobox-server-feature-disks.po
index 09a844e..f3f5e67 100644
--- a/plugins/disks/intl/sl/cryptobox-server-feature-disks.po
+++ b/plugins/disks/intl/sl/cryptobox-server-feature-disks.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/disks/intl/sv/cryptobox-server-feature-disks.po b/plugins/disks/intl/sv/cryptobox-server-feature-disks.po
index 09a844e..f3f5e67 100644
--- a/plugins/disks/intl/sv/cryptobox-server-feature-disks.po
+++ b/plugins/disks/intl/sv/cryptobox-server-feature-disks.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/help/intl/cs/cryptobox-server-feature-help.po b/plugins/help/intl/cs/cryptobox-server-feature-help.po
index 90fe9ed..591e6ea 100644
--- a/plugins/help/intl/cs/cryptobox-server-feature-help.po
+++ b/plugins/help/intl/cs/cryptobox-server-feature-help.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/help/intl/da/cryptobox-server-feature-help.po b/plugins/help/intl/da/cryptobox-server-feature-help.po
index 90fe9ed..591e6ea 100644
--- a/plugins/help/intl/da/cryptobox-server-feature-help.po
+++ b/plugins/help/intl/da/cryptobox-server-feature-help.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/help/intl/de/cryptobox-server-feature-help.po b/plugins/help/intl/de/cryptobox-server-feature-help.po
index 90fe9ed..591e6ea 100644
--- a/plugins/help/intl/de/cryptobox-server-feature-help.po
+++ b/plugins/help/intl/de/cryptobox-server-feature-help.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/help/intl/en/cryptobox-server-feature-help.po b/plugins/help/intl/en/cryptobox-server-feature-help.po
index 97ea507..6c47bff 100644
--- a/plugins/help/intl/en/cryptobox-server-feature-help.po
+++ b/plugins/help/intl/en/cryptobox-server-feature-help.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -12,7 +11,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 0.10.1\n"
+"X-Generator: Translate Toolkit 0.10.1\n"
 
 #: Name
 msgid "User manual"
diff --git a/plugins/help/intl/es/cryptobox-server-feature-help.po b/plugins/help/intl/es/cryptobox-server-feature-help.po
index 90fe9ed..591e6ea 100644
--- a/plugins/help/intl/es/cryptobox-server-feature-help.po
+++ b/plugins/help/intl/es/cryptobox-server-feature-help.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/help/intl/fi/cryptobox-server-feature-help.po b/plugins/help/intl/fi/cryptobox-server-feature-help.po
index 90fe9ed..591e6ea 100644
--- a/plugins/help/intl/fi/cryptobox-server-feature-help.po
+++ b/plugins/help/intl/fi/cryptobox-server-feature-help.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/help/intl/fr/cryptobox-server-feature-help.po b/plugins/help/intl/fr/cryptobox-server-feature-help.po
index 90fe9ed..591e6ea 100644
--- a/plugins/help/intl/fr/cryptobox-server-feature-help.po
+++ b/plugins/help/intl/fr/cryptobox-server-feature-help.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/help/intl/hu/cryptobox-server-feature-help.po b/plugins/help/intl/hu/cryptobox-server-feature-help.po
index 90fe9ed..591e6ea 100644
--- a/plugins/help/intl/hu/cryptobox-server-feature-help.po
+++ b/plugins/help/intl/hu/cryptobox-server-feature-help.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/help/intl/it/cryptobox-server-feature-help.po b/plugins/help/intl/it/cryptobox-server-feature-help.po
index 90fe9ed..591e6ea 100644
--- a/plugins/help/intl/it/cryptobox-server-feature-help.po
+++ b/plugins/help/intl/it/cryptobox-server-feature-help.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/help/intl/ja/cryptobox-server-feature-help.po b/plugins/help/intl/ja/cryptobox-server-feature-help.po
index 90fe9ed..591e6ea 100644
--- a/plugins/help/intl/ja/cryptobox-server-feature-help.po
+++ b/plugins/help/intl/ja/cryptobox-server-feature-help.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/help/intl/nl/cryptobox-server-feature-help.po b/plugins/help/intl/nl/cryptobox-server-feature-help.po
index 90fe9ed..591e6ea 100644
--- a/plugins/help/intl/nl/cryptobox-server-feature-help.po
+++ b/plugins/help/intl/nl/cryptobox-server-feature-help.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/help/intl/pl/cryptobox-server-feature-help.po b/plugins/help/intl/pl/cryptobox-server-feature-help.po
index 90fe9ed..591e6ea 100644
--- a/plugins/help/intl/pl/cryptobox-server-feature-help.po
+++ b/plugins/help/intl/pl/cryptobox-server-feature-help.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/help/intl/pt/cryptobox-server-feature-help.po b/plugins/help/intl/pt/cryptobox-server-feature-help.po
index 90fe9ed..591e6ea 100644
--- a/plugins/help/intl/pt/cryptobox-server-feature-help.po
+++ b/plugins/help/intl/pt/cryptobox-server-feature-help.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/help/intl/ru/cryptobox-server-feature-help.po b/plugins/help/intl/ru/cryptobox-server-feature-help.po
index 90fe9ed..591e6ea 100644
--- a/plugins/help/intl/ru/cryptobox-server-feature-help.po
+++ b/plugins/help/intl/ru/cryptobox-server-feature-help.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/help/intl/sl/cryptobox-server-feature-help.po b/plugins/help/intl/sl/cryptobox-server-feature-help.po
index 90fe9ed..591e6ea 100644
--- a/plugins/help/intl/sl/cryptobox-server-feature-help.po
+++ b/plugins/help/intl/sl/cryptobox-server-feature-help.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/help/intl/sv/cryptobox-server-feature-help.po b/plugins/help/intl/sv/cryptobox-server-feature-help.po
index 90fe9ed..591e6ea 100644
--- a/plugins/help/intl/sv/cryptobox-server-feature-help.po
+++ b/plugins/help/intl/sv/cryptobox-server-feature-help.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/language_selection/intl/cs/cryptobox-server-feature-language_selection.po b/plugins/language_selection/intl/cs/cryptobox-server-feature-language_selection.po
index ead17a3..fcbd19a 100644
--- a/plugins/language_selection/intl/cs/cryptobox-server-feature-language_selection.po
+++ b/plugins/language_selection/intl/cs/cryptobox-server-feature-language_selection.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/language_selection/intl/da/cryptobox-server-feature-language_selection.po b/plugins/language_selection/intl/da/cryptobox-server-feature-language_selection.po
index ead17a3..fcbd19a 100644
--- a/plugins/language_selection/intl/da/cryptobox-server-feature-language_selection.po
+++ b/plugins/language_selection/intl/da/cryptobox-server-feature-language_selection.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/language_selection/intl/de/cryptobox-server-feature-language_selection.po b/plugins/language_selection/intl/de/cryptobox-server-feature-language_selection.po
index ead17a3..fcbd19a 100644
--- a/plugins/language_selection/intl/de/cryptobox-server-feature-language_selection.po
+++ b/plugins/language_selection/intl/de/cryptobox-server-feature-language_selection.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/language_selection/intl/en/cryptobox-server-feature-language_selection.po b/plugins/language_selection/intl/en/cryptobox-server-feature-language_selection.po
index 9b91857..75f714a 100644
--- a/plugins/language_selection/intl/en/cryptobox-server-feature-language_selection.po
+++ b/plugins/language_selection/intl/en/cryptobox-server-feature-language_selection.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -12,7 +11,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 0.10.1\n"
+"X-Generator: Translate Toolkit 0.10.1\n"
 
 #: Name
 msgid "Choose interface language"
diff --git a/plugins/language_selection/intl/es/cryptobox-server-feature-language_selection.po b/plugins/language_selection/intl/es/cryptobox-server-feature-language_selection.po
index ead17a3..fcbd19a 100644
--- a/plugins/language_selection/intl/es/cryptobox-server-feature-language_selection.po
+++ b/plugins/language_selection/intl/es/cryptobox-server-feature-language_selection.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/language_selection/intl/fi/cryptobox-server-feature-language_selection.po b/plugins/language_selection/intl/fi/cryptobox-server-feature-language_selection.po
index ead17a3..fcbd19a 100644
--- a/plugins/language_selection/intl/fi/cryptobox-server-feature-language_selection.po
+++ b/plugins/language_selection/intl/fi/cryptobox-server-feature-language_selection.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/language_selection/intl/fr/cryptobox-server-feature-language_selection.po b/plugins/language_selection/intl/fr/cryptobox-server-feature-language_selection.po
index ead17a3..fcbd19a 100644
--- a/plugins/language_selection/intl/fr/cryptobox-server-feature-language_selection.po
+++ b/plugins/language_selection/intl/fr/cryptobox-server-feature-language_selection.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/language_selection/intl/hu/cryptobox-server-feature-language_selection.po b/plugins/language_selection/intl/hu/cryptobox-server-feature-language_selection.po
index ead17a3..fcbd19a 100644
--- a/plugins/language_selection/intl/hu/cryptobox-server-feature-language_selection.po
+++ b/plugins/language_selection/intl/hu/cryptobox-server-feature-language_selection.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/language_selection/intl/it/cryptobox-server-feature-language_selection.po b/plugins/language_selection/intl/it/cryptobox-server-feature-language_selection.po
index ead17a3..fcbd19a 100644
--- a/plugins/language_selection/intl/it/cryptobox-server-feature-language_selection.po
+++ b/plugins/language_selection/intl/it/cryptobox-server-feature-language_selection.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/language_selection/intl/ja/cryptobox-server-feature-language_selection.po b/plugins/language_selection/intl/ja/cryptobox-server-feature-language_selection.po
index ead17a3..fcbd19a 100644
--- a/plugins/language_selection/intl/ja/cryptobox-server-feature-language_selection.po
+++ b/plugins/language_selection/intl/ja/cryptobox-server-feature-language_selection.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/language_selection/intl/nl/cryptobox-server-feature-language_selection.po b/plugins/language_selection/intl/nl/cryptobox-server-feature-language_selection.po
index ead17a3..fcbd19a 100644
--- a/plugins/language_selection/intl/nl/cryptobox-server-feature-language_selection.po
+++ b/plugins/language_selection/intl/nl/cryptobox-server-feature-language_selection.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/language_selection/intl/pl/cryptobox-server-feature-language_selection.po b/plugins/language_selection/intl/pl/cryptobox-server-feature-language_selection.po
index ead17a3..fcbd19a 100644
--- a/plugins/language_selection/intl/pl/cryptobox-server-feature-language_selection.po
+++ b/plugins/language_selection/intl/pl/cryptobox-server-feature-language_selection.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/language_selection/intl/pt/cryptobox-server-feature-language_selection.po b/plugins/language_selection/intl/pt/cryptobox-server-feature-language_selection.po
index ead17a3..fcbd19a 100644
--- a/plugins/language_selection/intl/pt/cryptobox-server-feature-language_selection.po
+++ b/plugins/language_selection/intl/pt/cryptobox-server-feature-language_selection.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/language_selection/intl/ru/cryptobox-server-feature-language_selection.po b/plugins/language_selection/intl/ru/cryptobox-server-feature-language_selection.po
index ead17a3..fcbd19a 100644
--- a/plugins/language_selection/intl/ru/cryptobox-server-feature-language_selection.po
+++ b/plugins/language_selection/intl/ru/cryptobox-server-feature-language_selection.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/language_selection/intl/sl/cryptobox-server-feature-language_selection.po b/plugins/language_selection/intl/sl/cryptobox-server-feature-language_selection.po
index ead17a3..fcbd19a 100644
--- a/plugins/language_selection/intl/sl/cryptobox-server-feature-language_selection.po
+++ b/plugins/language_selection/intl/sl/cryptobox-server-feature-language_selection.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/language_selection/intl/sv/cryptobox-server-feature-language_selection.po b/plugins/language_selection/intl/sv/cryptobox-server-feature-language_selection.po
index ead17a3..fcbd19a 100644
--- a/plugins/language_selection/intl/sv/cryptobox-server-feature-language_selection.po
+++ b/plugins/language_selection/intl/sv/cryptobox-server-feature-language_selection.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/logs/intl/cryptobox-server-feature-logs.pot b/plugins/logs/intl/cryptobox-server-feature-logs.pot
index fc5c845..3160284 100644
--- a/plugins/logs/intl/cryptobox-server-feature-logs.pot
+++ b/plugins/logs/intl/cryptobox-server-feature-logs.pot
@@ -27,3 +27,7 @@ msgstr ""
 #: Text.EmptyLog
 msgid "The logfile of the CryptoBox is empty."
 msgstr ""
+
+#: Text.Refresh
+msgid "Refresh"
+msgstr ""
diff --git a/plugins/logs/intl/cs/cryptobox-server-feature-logs.po b/plugins/logs/intl/cs/cryptobox-server-feature-logs.po
index cb7eec1..2c4bc52 100644
--- a/plugins/logs/intl/cs/cryptobox-server-feature-logs.po
+++ b/plugins/logs/intl/cs/cryptobox-server-feature-logs.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -29,3 +28,7 @@ msgstr ""
 #: Text.EmptyLog
 msgid "The logfile of the CryptoBox is empty."
 msgstr ""
+
+#: Text.Refresh
+msgid "Refresh"
+msgstr ""
diff --git a/plugins/logs/intl/da/cryptobox-server-feature-logs.po b/plugins/logs/intl/da/cryptobox-server-feature-logs.po
index cb7eec1..2c4bc52 100644
--- a/plugins/logs/intl/da/cryptobox-server-feature-logs.po
+++ b/plugins/logs/intl/da/cryptobox-server-feature-logs.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -29,3 +28,7 @@ msgstr ""
 #: Text.EmptyLog
 msgid "The logfile of the CryptoBox is empty."
 msgstr ""
+
+#: Text.Refresh
+msgid "Refresh"
+msgstr ""
diff --git a/plugins/logs/intl/de/cryptobox-server-feature-logs.po b/plugins/logs/intl/de/cryptobox-server-feature-logs.po
index cb7eec1..2c4bc52 100644
--- a/plugins/logs/intl/de/cryptobox-server-feature-logs.po
+++ b/plugins/logs/intl/de/cryptobox-server-feature-logs.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -29,3 +28,7 @@ msgstr ""
 #: Text.EmptyLog
 msgid "The logfile of the CryptoBox is empty."
 msgstr ""
+
+#: Text.Refresh
+msgid "Refresh"
+msgstr ""
diff --git a/plugins/logs/intl/en/cryptobox-server-feature-logs.po b/plugins/logs/intl/en/cryptobox-server-feature-logs.po
index cd8e02b..e4d27c6 100644
--- a/plugins/logs/intl/en/cryptobox-server-feature-logs.po
+++ b/plugins/logs/intl/en/cryptobox-server-feature-logs.po
@@ -1,10 +1,9 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: CryptoBox-Server 0.3\n"
 "Report-Msgid-Bugs-To: translate@cryptobox.org\n"
-"POT-Creation-Date: 2006-11-28 05:03+0100\n"
+"POT-Creation-Date: 2006-11-28 05:04+0100\n"
 "PO-Revision-Date: 2006-11-29 19:31+0100\n"
 "Last-Translator: Lars Kruse <devel@sumpfralle.de>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -12,7 +11,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 0.10.1\n"
+"X-Generator: Translate Toolkit 0.10.1\n"
 
 #: Name
 msgid "Show the content of the log file"
@@ -29,3 +28,7 @@ msgstr "CryptoBox logfiles"
 #: Text.EmptyLog
 msgid "The logfile of the CryptoBox is empty."
 msgstr "The logfile of the CryptoBox is empty."
+
+#: Text.Refresh
+msgid "Refresh"
+msgstr ""
diff --git a/plugins/logs/intl/es/cryptobox-server-feature-logs.po b/plugins/logs/intl/es/cryptobox-server-feature-logs.po
index cb7eec1..2c4bc52 100644
--- a/plugins/logs/intl/es/cryptobox-server-feature-logs.po
+++ b/plugins/logs/intl/es/cryptobox-server-feature-logs.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -29,3 +28,7 @@ msgstr ""
 #: Text.EmptyLog
 msgid "The logfile of the CryptoBox is empty."
 msgstr ""
+
+#: Text.Refresh
+msgid "Refresh"
+msgstr ""
diff --git a/plugins/logs/intl/fi/cryptobox-server-feature-logs.po b/plugins/logs/intl/fi/cryptobox-server-feature-logs.po
index cb7eec1..2c4bc52 100644
--- a/plugins/logs/intl/fi/cryptobox-server-feature-logs.po
+++ b/plugins/logs/intl/fi/cryptobox-server-feature-logs.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -29,3 +28,7 @@ msgstr ""
 #: Text.EmptyLog
 msgid "The logfile of the CryptoBox is empty."
 msgstr ""
+
+#: Text.Refresh
+msgid "Refresh"
+msgstr ""
diff --git a/plugins/logs/intl/fr/cryptobox-server-feature-logs.po b/plugins/logs/intl/fr/cryptobox-server-feature-logs.po
index cb7eec1..2c4bc52 100644
--- a/plugins/logs/intl/fr/cryptobox-server-feature-logs.po
+++ b/plugins/logs/intl/fr/cryptobox-server-feature-logs.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -29,3 +28,7 @@ msgstr ""
 #: Text.EmptyLog
 msgid "The logfile of the CryptoBox is empty."
 msgstr ""
+
+#: Text.Refresh
+msgid "Refresh"
+msgstr ""
diff --git a/plugins/logs/intl/hu/cryptobox-server-feature-logs.po b/plugins/logs/intl/hu/cryptobox-server-feature-logs.po
index cb7eec1..2c4bc52 100644
--- a/plugins/logs/intl/hu/cryptobox-server-feature-logs.po
+++ b/plugins/logs/intl/hu/cryptobox-server-feature-logs.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -29,3 +28,7 @@ msgstr ""
 #: Text.EmptyLog
 msgid "The logfile of the CryptoBox is empty."
 msgstr ""
+
+#: Text.Refresh
+msgid "Refresh"
+msgstr ""
diff --git a/plugins/logs/intl/it/cryptobox-server-feature-logs.po b/plugins/logs/intl/it/cryptobox-server-feature-logs.po
index cb7eec1..2c4bc52 100644
--- a/plugins/logs/intl/it/cryptobox-server-feature-logs.po
+++ b/plugins/logs/intl/it/cryptobox-server-feature-logs.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -29,3 +28,7 @@ msgstr ""
 #: Text.EmptyLog
 msgid "The logfile of the CryptoBox is empty."
 msgstr ""
+
+#: Text.Refresh
+msgid "Refresh"
+msgstr ""
diff --git a/plugins/logs/intl/ja/cryptobox-server-feature-logs.po b/plugins/logs/intl/ja/cryptobox-server-feature-logs.po
index cb7eec1..2c4bc52 100644
--- a/plugins/logs/intl/ja/cryptobox-server-feature-logs.po
+++ b/plugins/logs/intl/ja/cryptobox-server-feature-logs.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -29,3 +28,7 @@ msgstr ""
 #: Text.EmptyLog
 msgid "The logfile of the CryptoBox is empty."
 msgstr ""
+
+#: Text.Refresh
+msgid "Refresh"
+msgstr ""
diff --git a/plugins/logs/intl/nl/cryptobox-server-feature-logs.po b/plugins/logs/intl/nl/cryptobox-server-feature-logs.po
index cb7eec1..2c4bc52 100644
--- a/plugins/logs/intl/nl/cryptobox-server-feature-logs.po
+++ b/plugins/logs/intl/nl/cryptobox-server-feature-logs.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -29,3 +28,7 @@ msgstr ""
 #: Text.EmptyLog
 msgid "The logfile of the CryptoBox is empty."
 msgstr ""
+
+#: Text.Refresh
+msgid "Refresh"
+msgstr ""
diff --git a/plugins/logs/intl/pl/cryptobox-server-feature-logs.po b/plugins/logs/intl/pl/cryptobox-server-feature-logs.po
index cb7eec1..2c4bc52 100644
--- a/plugins/logs/intl/pl/cryptobox-server-feature-logs.po
+++ b/plugins/logs/intl/pl/cryptobox-server-feature-logs.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -29,3 +28,7 @@ msgstr ""
 #: Text.EmptyLog
 msgid "The logfile of the CryptoBox is empty."
 msgstr ""
+
+#: Text.Refresh
+msgid "Refresh"
+msgstr ""
diff --git a/plugins/logs/intl/pt/cryptobox-server-feature-logs.po b/plugins/logs/intl/pt/cryptobox-server-feature-logs.po
index cb7eec1..2c4bc52 100644
--- a/plugins/logs/intl/pt/cryptobox-server-feature-logs.po
+++ b/plugins/logs/intl/pt/cryptobox-server-feature-logs.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -29,3 +28,7 @@ msgstr ""
 #: Text.EmptyLog
 msgid "The logfile of the CryptoBox is empty."
 msgstr ""
+
+#: Text.Refresh
+msgid "Refresh"
+msgstr ""
diff --git a/plugins/logs/intl/ru/cryptobox-server-feature-logs.po b/plugins/logs/intl/ru/cryptobox-server-feature-logs.po
index cb7eec1..2c4bc52 100644
--- a/plugins/logs/intl/ru/cryptobox-server-feature-logs.po
+++ b/plugins/logs/intl/ru/cryptobox-server-feature-logs.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -29,3 +28,7 @@ msgstr ""
 #: Text.EmptyLog
 msgid "The logfile of the CryptoBox is empty."
 msgstr ""
+
+#: Text.Refresh
+msgid "Refresh"
+msgstr ""
diff --git a/plugins/logs/intl/sl/cryptobox-server-feature-logs.po b/plugins/logs/intl/sl/cryptobox-server-feature-logs.po
index cb7eec1..2c4bc52 100644
--- a/plugins/logs/intl/sl/cryptobox-server-feature-logs.po
+++ b/plugins/logs/intl/sl/cryptobox-server-feature-logs.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -29,3 +28,7 @@ msgstr ""
 #: Text.EmptyLog
 msgid "The logfile of the CryptoBox is empty."
 msgstr ""
+
+#: Text.Refresh
+msgid "Refresh"
+msgstr ""
diff --git a/plugins/logs/intl/sv/cryptobox-server-feature-logs.po b/plugins/logs/intl/sv/cryptobox-server-feature-logs.po
index cb7eec1..2c4bc52 100644
--- a/plugins/logs/intl/sv/cryptobox-server-feature-logs.po
+++ b/plugins/logs/intl/sv/cryptobox-server-feature-logs.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -29,3 +28,7 @@ msgstr ""
 #: Text.EmptyLog
 msgid "The logfile of the CryptoBox is empty."
 msgstr ""
+
+#: Text.Refresh
+msgid "Refresh"
+msgstr ""
diff --git a/plugins/logs/language.hdf b/plugins/logs/language.hdf
index f8a71de..d186a82 100644
--- a/plugins/logs/language.hdf
+++ b/plugins/logs/language.hdf
@@ -3,5 +3,8 @@ Link	= Show log file
 
 Title.Log	= CryptoBox logfiles
 
-Text.EmptyLog	= The logfile of the CryptoBox is empty.
+Text {
+	EmptyLog	= The logfile of the CryptoBox is empty.
+	Refresh	= Refresh
+}
 
diff --git a/plugins/logs/show_log.cs b/plugins/logs/show_log.cs
index d6f225a..8abc9c9 100644
--- a/plugins/logs/show_log.cs
+++ b/plugins/logs/show_log.cs
@@ -6,6 +6,13 @@
 
 <h1><?cs var:html_escape(Lang.Plugins.logs.Title.Log) ?></h1>
 
+<div align="center">
+		<?cs call:print_form_header("log-form", "logs") ?>
+		<button type="submit" value="refresh"><?cs
+			var:html_escape(Lang.Plugins.logs.Text.Refresh) ?></button>
+	</form>
+</div>
+
 <?cs call:handle_messages() ?>
 
 <div id="log">
diff --git a/plugins/network/intl/cs/cryptobox-server-feature-network.po b/plugins/network/intl/cs/cryptobox-server-feature-network.po
index d867f29..22201b6 100644
--- a/plugins/network/intl/cs/cryptobox-server-feature-network.po
+++ b/plugins/network/intl/cs/cryptobox-server-feature-network.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/network/intl/da/cryptobox-server-feature-network.po b/plugins/network/intl/da/cryptobox-server-feature-network.po
index d867f29..22201b6 100644
--- a/plugins/network/intl/da/cryptobox-server-feature-network.po
+++ b/plugins/network/intl/da/cryptobox-server-feature-network.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/network/intl/de/cryptobox-server-feature-network.po b/plugins/network/intl/de/cryptobox-server-feature-network.po
index d867f29..22201b6 100644
--- a/plugins/network/intl/de/cryptobox-server-feature-network.po
+++ b/plugins/network/intl/de/cryptobox-server-feature-network.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/network/intl/en/cryptobox-server-feature-network.po b/plugins/network/intl/en/cryptobox-server-feature-network.po
index bcda9f5..49d2b5e 100644
--- a/plugins/network/intl/en/cryptobox-server-feature-network.po
+++ b/plugins/network/intl/en/cryptobox-server-feature-network.po
@@ -1,10 +1,9 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: CryptoBox-Server 0.3\n"
 "Report-Msgid-Bugs-To: translate@cryptobox.org\n"
-"POT-Creation-Date: 2006-11-28 05:03+0100\n"
+"POT-Creation-Date: 2006-11-28 05:04+0100\n"
 "PO-Revision-Date: 2006-11-29 19:31+0100\n"
 "Last-Translator: Lars Kruse <devel@sumpfralle.de>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -12,7 +11,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 0.10.1\n"
+"X-Generator: Translate Toolkit 0.10.1\n"
 
 #: Name
 msgid "Configure network"
@@ -43,9 +42,5 @@ msgid "Network address changed"
 msgstr "Network address changed"
 
 #: SuccessMessage.IPChanged.Text
-msgid ""
-"The network address has been changed. In a few seconds you will get "
-"redirected to the new address."
-msgstr ""
-"The network address has been changed. In a few seconds you will get "
-"redirected to the new address."
+msgid "The network address has been changed. In a few seconds you will get redirected to the new address."
+msgstr "The network address has been changed. In a few seconds you will get redirected to the new address."
diff --git a/plugins/network/intl/es/cryptobox-server-feature-network.po b/plugins/network/intl/es/cryptobox-server-feature-network.po
index d867f29..22201b6 100644
--- a/plugins/network/intl/es/cryptobox-server-feature-network.po
+++ b/plugins/network/intl/es/cryptobox-server-feature-network.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/network/intl/fi/cryptobox-server-feature-network.po b/plugins/network/intl/fi/cryptobox-server-feature-network.po
index d867f29..22201b6 100644
--- a/plugins/network/intl/fi/cryptobox-server-feature-network.po
+++ b/plugins/network/intl/fi/cryptobox-server-feature-network.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/network/intl/fr/cryptobox-server-feature-network.po b/plugins/network/intl/fr/cryptobox-server-feature-network.po
index d867f29..22201b6 100644
--- a/plugins/network/intl/fr/cryptobox-server-feature-network.po
+++ b/plugins/network/intl/fr/cryptobox-server-feature-network.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/network/intl/hu/cryptobox-server-feature-network.po b/plugins/network/intl/hu/cryptobox-server-feature-network.po
index d867f29..22201b6 100644
--- a/plugins/network/intl/hu/cryptobox-server-feature-network.po
+++ b/plugins/network/intl/hu/cryptobox-server-feature-network.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/network/intl/it/cryptobox-server-feature-network.po b/plugins/network/intl/it/cryptobox-server-feature-network.po
index d867f29..22201b6 100644
--- a/plugins/network/intl/it/cryptobox-server-feature-network.po
+++ b/plugins/network/intl/it/cryptobox-server-feature-network.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/network/intl/ja/cryptobox-server-feature-network.po b/plugins/network/intl/ja/cryptobox-server-feature-network.po
index d867f29..22201b6 100644
--- a/plugins/network/intl/ja/cryptobox-server-feature-network.po
+++ b/plugins/network/intl/ja/cryptobox-server-feature-network.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/network/intl/nl/cryptobox-server-feature-network.po b/plugins/network/intl/nl/cryptobox-server-feature-network.po
index d867f29..22201b6 100644
--- a/plugins/network/intl/nl/cryptobox-server-feature-network.po
+++ b/plugins/network/intl/nl/cryptobox-server-feature-network.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/network/intl/pl/cryptobox-server-feature-network.po b/plugins/network/intl/pl/cryptobox-server-feature-network.po
index d867f29..22201b6 100644
--- a/plugins/network/intl/pl/cryptobox-server-feature-network.po
+++ b/plugins/network/intl/pl/cryptobox-server-feature-network.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/network/intl/pt/cryptobox-server-feature-network.po b/plugins/network/intl/pt/cryptobox-server-feature-network.po
index d867f29..22201b6 100644
--- a/plugins/network/intl/pt/cryptobox-server-feature-network.po
+++ b/plugins/network/intl/pt/cryptobox-server-feature-network.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/network/intl/ru/cryptobox-server-feature-network.po b/plugins/network/intl/ru/cryptobox-server-feature-network.po
index d867f29..22201b6 100644
--- a/plugins/network/intl/ru/cryptobox-server-feature-network.po
+++ b/plugins/network/intl/ru/cryptobox-server-feature-network.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/network/intl/sl/cryptobox-server-feature-network.po b/plugins/network/intl/sl/cryptobox-server-feature-network.po
index d867f29..22201b6 100644
--- a/plugins/network/intl/sl/cryptobox-server-feature-network.po
+++ b/plugins/network/intl/sl/cryptobox-server-feature-network.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/network/intl/sv/cryptobox-server-feature-network.po b/plugins/network/intl/sv/cryptobox-server-feature-network.po
index d867f29..22201b6 100644
--- a/plugins/network/intl/sv/cryptobox-server-feature-network.po
+++ b/plugins/network/intl/sv/cryptobox-server-feature-network.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/network/network.py b/plugins/network/network.py
index 01318c8..6992bce 100644
--- a/plugins/network/network.py
+++ b/plugins/network/network.py
@@ -48,7 +48,7 @@ class network(cryptobox.plugins.base.CryptoBoxPlugin):
 		self.cbox.log.debug("executing network plugin")
 		if redirected == "1":
 			self.cbox.log.debug("network plugin: redirected")
-			return None
+			return "form_network"
 		## request for IP change?
 		if store:
 			self.cbox.log.debug("network plugin: changing IP")
@@ -68,7 +68,7 @@ class network(cryptobox.plugins.base.CryptoBoxPlugin):
 				self.hdf["Data.Success"] = "Plugins.network.IPChanged"
 				self.hdf["Data.Redirect.URL"] = self.__get_redirect_destination(new_ip)
 				self.hdf["Data.Redirect.Delay"] = REDIRECT_DELAY
-				return None
+				return "form_network"
 			else:
 				self.cbox.log.warn("failed to change IP address to: %s" % new_ip)
 				self.hdf["Data.Warning"] = "Plugins.network.InvalidIP"
diff --git a/plugins/partition/intl/cryptobox-server-feature-partition.pot b/plugins/partition/intl/cryptobox-server-feature-partition.pot
index 3603c4f..6b5113c 100644
--- a/plugins/partition/intl/cryptobox-server-feature-partition.pot
+++ b/plugins/partition/intl/cryptobox-server-feature-partition.pot
@@ -164,6 +164,6 @@ msgstr ""
 msgid "The minimum size of a container is 10 megabytes."
 msgstr ""
 
-#: WarningMessage.DiskIsBusy.Link.Rel
-msgid "disks"
+#: WarningMessage.PartitioningFailed.Link.Text
+msgid "Show log messages"
 msgstr ""
diff --git a/plugins/partition/intl/cs/cryptobox-server-feature-partition.po b/plugins/partition/intl/cs/cryptobox-server-feature-partition.po
index 4286e22..08fb071 100644
--- a/plugins/partition/intl/cs/cryptobox-server-feature-partition.po
+++ b/plugins/partition/intl/cs/cryptobox-server-feature-partition.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -166,6 +165,6 @@ msgstr ""
 msgid "The minimum size of a container is 10 megabytes."
 msgstr ""
 
-#: WarningMessage.DiskIsBusy.Link.Rel
-msgid "disks"
+#: WarningMessage.PartitioningFailed.Link.Text
+msgid "Show log messages"
 msgstr ""
diff --git a/plugins/partition/intl/da/cryptobox-server-feature-partition.po b/plugins/partition/intl/da/cryptobox-server-feature-partition.po
index 4286e22..08fb071 100644
--- a/plugins/partition/intl/da/cryptobox-server-feature-partition.po
+++ b/plugins/partition/intl/da/cryptobox-server-feature-partition.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -166,6 +165,6 @@ msgstr ""
 msgid "The minimum size of a container is 10 megabytes."
 msgstr ""
 
-#: WarningMessage.DiskIsBusy.Link.Rel
-msgid "disks"
+#: WarningMessage.PartitioningFailed.Link.Text
+msgid "Show log messages"
 msgstr ""
diff --git a/plugins/partition/intl/de/cryptobox-server-feature-partition.po b/plugins/partition/intl/de/cryptobox-server-feature-partition.po
index 4286e22..08fb071 100644
--- a/plugins/partition/intl/de/cryptobox-server-feature-partition.po
+++ b/plugins/partition/intl/de/cryptobox-server-feature-partition.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -166,6 +165,6 @@ msgstr ""
 msgid "The minimum size of a container is 10 megabytes."
 msgstr ""
 
-#: WarningMessage.DiskIsBusy.Link.Rel
-msgid "disks"
+#: WarningMessage.PartitioningFailed.Link.Text
+msgid "Show log messages"
 msgstr ""
diff --git a/plugins/partition/intl/en/cryptobox-server-feature-partition.po b/plugins/partition/intl/en/cryptobox-server-feature-partition.po
index bf44f59..b5d9352 100644
--- a/plugins/partition/intl/en/cryptobox-server-feature-partition.po
+++ b/plugins/partition/intl/en/cryptobox-server-feature-partition.po
@@ -1,10 +1,9 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: CryptoBox-Server 0.3\n"
 "Report-Msgid-Bugs-To: translate@cryptobox.org\n"
-"POT-Creation-Date: 2006-11-28 05:03+0100\n"
+"POT-Creation-Date: 2006-11-28 05:04+0100\n"
 "PO-Revision-Date: 2006-11-29 19:31+0100\n"
 "Last-Translator: Lars Kruse <devel@sumpfralle.de>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -12,7 +11,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 0.10.1\n"
+"X-Generator: Translate Toolkit 0.10.1\n"
 
 #: Name
 msgid "Disk partitioning"
@@ -99,12 +98,8 @@ msgid "These disks will be destroyed, if you continue"
 msgstr "These disks will be destroyed, if you continue"
 
 #: AdviceMessage.DeviceDataIsLost.Text
-msgid ""
-"If you continue, you will destroy all data on the choosen disk. Please be "
-"VERY careful!"
-msgstr ""
-"If you continue, you will destroy all data on the choosen disk. Please be "
-"VERY careful!"
+msgid "If you continue, you will destroy all data on the choosen disk. Please be VERY careful!"
+msgstr "If you continue, you will destroy all data on the choosen disk. Please be VERY careful!"
 
 #: SuccessMessage.Partitioned.Title
 msgid "Partitioning complete"
@@ -127,10 +122,8 @@ msgid "No disks found"
 msgstr "No disks found"
 
 #: WarningMessage.NoDisksAvailable.Text
-msgid ""
-"No suitable disks found - please check your configuration and hardware setup."
-msgstr ""
-"No suitable disks found - please check your configuration and hardware setup."
+msgid "No suitable disks found - please check your configuration and hardware setup."
+msgstr "No suitable disks found - please check your configuration and hardware setup."
 
 #: WarningMessage.PartitioningFailed.Title
 msgid "Partitioning failed"
@@ -166,13 +159,15 @@ msgstr "Invalid size"
 
 #: WarningMessage.PartitionTooBig.Text
 msgid "The container size you entered exceeded the available size of the disk."
-msgstr ""
-"The container size you entered exceeded the available size of the disk."
+msgstr "The container size you entered exceeded the available size of the disk."
 
 #: WarningMessage.PartitionTooSmall.Text
 msgid "The minimum size of a container is 10 megabytes."
 msgstr "The minimum size of a container is 10 megabytes."
 
-#: WarningMessage.DiskIsBusy.Link.Rel
-msgid "disks"
-msgstr "disks"
+#: WarningMessage.PartitioningFailed.Link.Text
+msgid "Show log messages"
+msgstr ""
+
+#~ msgid "disks"
+#~ msgstr "disks"
diff --git a/plugins/partition/intl/es/cryptobox-server-feature-partition.po b/plugins/partition/intl/es/cryptobox-server-feature-partition.po
index 4286e22..08fb071 100644
--- a/plugins/partition/intl/es/cryptobox-server-feature-partition.po
+++ b/plugins/partition/intl/es/cryptobox-server-feature-partition.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -166,6 +165,6 @@ msgstr ""
 msgid "The minimum size of a container is 10 megabytes."
 msgstr ""
 
-#: WarningMessage.DiskIsBusy.Link.Rel
-msgid "disks"
+#: WarningMessage.PartitioningFailed.Link.Text
+msgid "Show log messages"
 msgstr ""
diff --git a/plugins/partition/intl/fi/cryptobox-server-feature-partition.po b/plugins/partition/intl/fi/cryptobox-server-feature-partition.po
index 4286e22..08fb071 100644
--- a/plugins/partition/intl/fi/cryptobox-server-feature-partition.po
+++ b/plugins/partition/intl/fi/cryptobox-server-feature-partition.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -166,6 +165,6 @@ msgstr ""
 msgid "The minimum size of a container is 10 megabytes."
 msgstr ""
 
-#: WarningMessage.DiskIsBusy.Link.Rel
-msgid "disks"
+#: WarningMessage.PartitioningFailed.Link.Text
+msgid "Show log messages"
 msgstr ""
diff --git a/plugins/partition/intl/fr/cryptobox-server-feature-partition.po b/plugins/partition/intl/fr/cryptobox-server-feature-partition.po
index 4286e22..08fb071 100644
--- a/plugins/partition/intl/fr/cryptobox-server-feature-partition.po
+++ b/plugins/partition/intl/fr/cryptobox-server-feature-partition.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -166,6 +165,6 @@ msgstr ""
 msgid "The minimum size of a container is 10 megabytes."
 msgstr ""
 
-#: WarningMessage.DiskIsBusy.Link.Rel
-msgid "disks"
+#: WarningMessage.PartitioningFailed.Link.Text
+msgid "Show log messages"
 msgstr ""
diff --git a/plugins/partition/intl/hu/cryptobox-server-feature-partition.po b/plugins/partition/intl/hu/cryptobox-server-feature-partition.po
index 4286e22..08fb071 100644
--- a/plugins/partition/intl/hu/cryptobox-server-feature-partition.po
+++ b/plugins/partition/intl/hu/cryptobox-server-feature-partition.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -166,6 +165,6 @@ msgstr ""
 msgid "The minimum size of a container is 10 megabytes."
 msgstr ""
 
-#: WarningMessage.DiskIsBusy.Link.Rel
-msgid "disks"
+#: WarningMessage.PartitioningFailed.Link.Text
+msgid "Show log messages"
 msgstr ""
diff --git a/plugins/partition/intl/it/cryptobox-server-feature-partition.po b/plugins/partition/intl/it/cryptobox-server-feature-partition.po
index 4286e22..08fb071 100644
--- a/plugins/partition/intl/it/cryptobox-server-feature-partition.po
+++ b/plugins/partition/intl/it/cryptobox-server-feature-partition.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -166,6 +165,6 @@ msgstr ""
 msgid "The minimum size of a container is 10 megabytes."
 msgstr ""
 
-#: WarningMessage.DiskIsBusy.Link.Rel
-msgid "disks"
+#: WarningMessage.PartitioningFailed.Link.Text
+msgid "Show log messages"
 msgstr ""
diff --git a/plugins/partition/intl/ja/cryptobox-server-feature-partition.po b/plugins/partition/intl/ja/cryptobox-server-feature-partition.po
index 4286e22..08fb071 100644
--- a/plugins/partition/intl/ja/cryptobox-server-feature-partition.po
+++ b/plugins/partition/intl/ja/cryptobox-server-feature-partition.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -166,6 +165,6 @@ msgstr ""
 msgid "The minimum size of a container is 10 megabytes."
 msgstr ""
 
-#: WarningMessage.DiskIsBusy.Link.Rel
-msgid "disks"
+#: WarningMessage.PartitioningFailed.Link.Text
+msgid "Show log messages"
 msgstr ""
diff --git a/plugins/partition/intl/nl/cryptobox-server-feature-partition.po b/plugins/partition/intl/nl/cryptobox-server-feature-partition.po
index 4286e22..08fb071 100644
--- a/plugins/partition/intl/nl/cryptobox-server-feature-partition.po
+++ b/plugins/partition/intl/nl/cryptobox-server-feature-partition.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -166,6 +165,6 @@ msgstr ""
 msgid "The minimum size of a container is 10 megabytes."
 msgstr ""
 
-#: WarningMessage.DiskIsBusy.Link.Rel
-msgid "disks"
+#: WarningMessage.PartitioningFailed.Link.Text
+msgid "Show log messages"
 msgstr ""
diff --git a/plugins/partition/intl/pl/cryptobox-server-feature-partition.po b/plugins/partition/intl/pl/cryptobox-server-feature-partition.po
index 4286e22..08fb071 100644
--- a/plugins/partition/intl/pl/cryptobox-server-feature-partition.po
+++ b/plugins/partition/intl/pl/cryptobox-server-feature-partition.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -166,6 +165,6 @@ msgstr ""
 msgid "The minimum size of a container is 10 megabytes."
 msgstr ""
 
-#: WarningMessage.DiskIsBusy.Link.Rel
-msgid "disks"
+#: WarningMessage.PartitioningFailed.Link.Text
+msgid "Show log messages"
 msgstr ""
diff --git a/plugins/partition/intl/pt/cryptobox-server-feature-partition.po b/plugins/partition/intl/pt/cryptobox-server-feature-partition.po
index 4286e22..08fb071 100644
--- a/plugins/partition/intl/pt/cryptobox-server-feature-partition.po
+++ b/plugins/partition/intl/pt/cryptobox-server-feature-partition.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -166,6 +165,6 @@ msgstr ""
 msgid "The minimum size of a container is 10 megabytes."
 msgstr ""
 
-#: WarningMessage.DiskIsBusy.Link.Rel
-msgid "disks"
+#: WarningMessage.PartitioningFailed.Link.Text
+msgid "Show log messages"
 msgstr ""
diff --git a/plugins/partition/intl/ru/cryptobox-server-feature-partition.po b/plugins/partition/intl/ru/cryptobox-server-feature-partition.po
index 4286e22..08fb071 100644
--- a/plugins/partition/intl/ru/cryptobox-server-feature-partition.po
+++ b/plugins/partition/intl/ru/cryptobox-server-feature-partition.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -166,6 +165,6 @@ msgstr ""
 msgid "The minimum size of a container is 10 megabytes."
 msgstr ""
 
-#: WarningMessage.DiskIsBusy.Link.Rel
-msgid "disks"
+#: WarningMessage.PartitioningFailed.Link.Text
+msgid "Show log messages"
 msgstr ""
diff --git a/plugins/partition/intl/sl/cryptobox-server-feature-partition.po b/plugins/partition/intl/sl/cryptobox-server-feature-partition.po
index 4286e22..08fb071 100644
--- a/plugins/partition/intl/sl/cryptobox-server-feature-partition.po
+++ b/plugins/partition/intl/sl/cryptobox-server-feature-partition.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -166,6 +165,6 @@ msgstr ""
 msgid "The minimum size of a container is 10 megabytes."
 msgstr ""
 
-#: WarningMessage.DiskIsBusy.Link.Rel
-msgid "disks"
+#: WarningMessage.PartitioningFailed.Link.Text
+msgid "Show log messages"
 msgstr ""
diff --git a/plugins/partition/intl/sv/cryptobox-server-feature-partition.po b/plugins/partition/intl/sv/cryptobox-server-feature-partition.po
index 4286e22..08fb071 100644
--- a/plugins/partition/intl/sv/cryptobox-server-feature-partition.po
+++ b/plugins/partition/intl/sv/cryptobox-server-feature-partition.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -166,6 +165,6 @@ msgstr ""
 msgid "The minimum size of a container is 10 megabytes."
 msgstr ""
 
-#: WarningMessage.DiskIsBusy.Link.Rel
-msgid "disks"
+#: WarningMessage.PartitioningFailed.Link.Text
+msgid "Show log messages"
 msgstr ""
diff --git a/plugins/partition/language.hdf b/plugins/partition/language.hdf
index efac695..a00ab29 100644
--- a/plugins/partition/language.hdf
+++ b/plugins/partition/language.hdf
@@ -57,11 +57,17 @@ WarningMessage {
 	PartitioningFailed {
 		Title	= Partitioning failed
 		Text	= The partitioning of the device failed for some reason - sorry!
+		Link.Text	=	Show log messages
+		Link.Attr1.name	= pattern
+		Link.Attr1.value	= ERROR
 	}
 
 	FormattingFailed {
 		Title	= Formatting failed
 		Text	= The formatting of the filesystems of the device failed - sorry!
+		Link.Text	=	Show log messages
+		Link.Attr1.name	= pattern
+		Link.Attr1.value	= ERROR
 	}
 
 	DiskIsBusy {
diff --git a/plugins/plugin_manager/intl/cs/cryptobox-server-feature-plugin_manager.po b/plugins/plugin_manager/intl/cs/cryptobox-server-feature-plugin_manager.po
index 4b46258..5ab21c9 100644
--- a/plugins/plugin_manager/intl/cs/cryptobox-server-feature-plugin_manager.po
+++ b/plugins/plugin_manager/intl/cs/cryptobox-server-feature-plugin_manager.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/plugin_manager/intl/da/cryptobox-server-feature-plugin_manager.po b/plugins/plugin_manager/intl/da/cryptobox-server-feature-plugin_manager.po
index 4b46258..5ab21c9 100644
--- a/plugins/plugin_manager/intl/da/cryptobox-server-feature-plugin_manager.po
+++ b/plugins/plugin_manager/intl/da/cryptobox-server-feature-plugin_manager.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/plugin_manager/intl/de/cryptobox-server-feature-plugin_manager.po b/plugins/plugin_manager/intl/de/cryptobox-server-feature-plugin_manager.po
index 4b46258..5ab21c9 100644
--- a/plugins/plugin_manager/intl/de/cryptobox-server-feature-plugin_manager.po
+++ b/plugins/plugin_manager/intl/de/cryptobox-server-feature-plugin_manager.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/plugin_manager/intl/en/cryptobox-server-feature-plugin_manager.po b/plugins/plugin_manager/intl/en/cryptobox-server-feature-plugin_manager.po
index 1953141..0ef7fdf 100644
--- a/plugins/plugin_manager/intl/en/cryptobox-server-feature-plugin_manager.po
+++ b/plugins/plugin_manager/intl/en/cryptobox-server-feature-plugin_manager.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -12,7 +11,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 0.10.1\n"
+"X-Generator: Translate Toolkit 0.10.1\n"
 
 #: Name
 msgid "Plugin Manager"
diff --git a/plugins/plugin_manager/intl/es/cryptobox-server-feature-plugin_manager.po b/plugins/plugin_manager/intl/es/cryptobox-server-feature-plugin_manager.po
index 4b46258..5ab21c9 100644
--- a/plugins/plugin_manager/intl/es/cryptobox-server-feature-plugin_manager.po
+++ b/plugins/plugin_manager/intl/es/cryptobox-server-feature-plugin_manager.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/plugin_manager/intl/fi/cryptobox-server-feature-plugin_manager.po b/plugins/plugin_manager/intl/fi/cryptobox-server-feature-plugin_manager.po
index 4b46258..5ab21c9 100644
--- a/plugins/plugin_manager/intl/fi/cryptobox-server-feature-plugin_manager.po
+++ b/plugins/plugin_manager/intl/fi/cryptobox-server-feature-plugin_manager.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/plugin_manager/intl/fr/cryptobox-server-feature-plugin_manager.po b/plugins/plugin_manager/intl/fr/cryptobox-server-feature-plugin_manager.po
index 4b46258..5ab21c9 100644
--- a/plugins/plugin_manager/intl/fr/cryptobox-server-feature-plugin_manager.po
+++ b/plugins/plugin_manager/intl/fr/cryptobox-server-feature-plugin_manager.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/plugin_manager/intl/hu/cryptobox-server-feature-plugin_manager.po b/plugins/plugin_manager/intl/hu/cryptobox-server-feature-plugin_manager.po
index 4b46258..5ab21c9 100644
--- a/plugins/plugin_manager/intl/hu/cryptobox-server-feature-plugin_manager.po
+++ b/plugins/plugin_manager/intl/hu/cryptobox-server-feature-plugin_manager.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/plugin_manager/intl/it/cryptobox-server-feature-plugin_manager.po b/plugins/plugin_manager/intl/it/cryptobox-server-feature-plugin_manager.po
index 4b46258..5ab21c9 100644
--- a/plugins/plugin_manager/intl/it/cryptobox-server-feature-plugin_manager.po
+++ b/plugins/plugin_manager/intl/it/cryptobox-server-feature-plugin_manager.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/plugin_manager/intl/ja/cryptobox-server-feature-plugin_manager.po b/plugins/plugin_manager/intl/ja/cryptobox-server-feature-plugin_manager.po
index 4b46258..5ab21c9 100644
--- a/plugins/plugin_manager/intl/ja/cryptobox-server-feature-plugin_manager.po
+++ b/plugins/plugin_manager/intl/ja/cryptobox-server-feature-plugin_manager.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/plugin_manager/intl/nl/cryptobox-server-feature-plugin_manager.po b/plugins/plugin_manager/intl/nl/cryptobox-server-feature-plugin_manager.po
index 4b46258..5ab21c9 100644
--- a/plugins/plugin_manager/intl/nl/cryptobox-server-feature-plugin_manager.po
+++ b/plugins/plugin_manager/intl/nl/cryptobox-server-feature-plugin_manager.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/plugin_manager/intl/pl/cryptobox-server-feature-plugin_manager.po b/plugins/plugin_manager/intl/pl/cryptobox-server-feature-plugin_manager.po
index 4b46258..5ab21c9 100644
--- a/plugins/plugin_manager/intl/pl/cryptobox-server-feature-plugin_manager.po
+++ b/plugins/plugin_manager/intl/pl/cryptobox-server-feature-plugin_manager.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/plugin_manager/intl/pt/cryptobox-server-feature-plugin_manager.po b/plugins/plugin_manager/intl/pt/cryptobox-server-feature-plugin_manager.po
index 4b46258..5ab21c9 100644
--- a/plugins/plugin_manager/intl/pt/cryptobox-server-feature-plugin_manager.po
+++ b/plugins/plugin_manager/intl/pt/cryptobox-server-feature-plugin_manager.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/plugin_manager/intl/ru/cryptobox-server-feature-plugin_manager.po b/plugins/plugin_manager/intl/ru/cryptobox-server-feature-plugin_manager.po
index 4b46258..5ab21c9 100644
--- a/plugins/plugin_manager/intl/ru/cryptobox-server-feature-plugin_manager.po
+++ b/plugins/plugin_manager/intl/ru/cryptobox-server-feature-plugin_manager.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/plugin_manager/intl/sl/cryptobox-server-feature-plugin_manager.po b/plugins/plugin_manager/intl/sl/cryptobox-server-feature-plugin_manager.po
index 4b46258..5ab21c9 100644
--- a/plugins/plugin_manager/intl/sl/cryptobox-server-feature-plugin_manager.po
+++ b/plugins/plugin_manager/intl/sl/cryptobox-server-feature-plugin_manager.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/plugin_manager/intl/sv/cryptobox-server-feature-plugin_manager.po b/plugins/plugin_manager/intl/sv/cryptobox-server-feature-plugin_manager.po
index 4b46258..5ab21c9 100644
--- a/plugins/plugin_manager/intl/sv/cryptobox-server-feature-plugin_manager.po
+++ b/plugins/plugin_manager/intl/sv/cryptobox-server-feature-plugin_manager.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/plugin_manager/plugin_manager.py b/plugins/plugin_manager/plugin_manager.py
index 61b918a..f40a3eb 100644
--- a/plugins/plugin_manager/plugin_manager.py
+++ b/plugins/plugin_manager/plugin_manager.py
@@ -64,7 +64,9 @@ class plugin_manager(cryptobox.plugins.base.CryptoBoxPlugin):
 
 
 	def get_status(self):
-		return "no status"
+		plugin_manager = cryptobox.plugins.manage.PluginManager(
+				self.cbox, self.cbox.prefs["Locations"]["PluginDir"])
+		return ":".join([e.get_name() for e in plugin_manager.get_plugins()])
 
 
 	def __sort_plugins(self):
diff --git a/plugins/shutdown/intl/cs/cryptobox-server-feature-shutdown.po b/plugins/shutdown/intl/cs/cryptobox-server-feature-shutdown.po
index e3f6eb4..9ed6e30 100644
--- a/plugins/shutdown/intl/cs/cryptobox-server-feature-shutdown.po
+++ b/plugins/shutdown/intl/cs/cryptobox-server-feature-shutdown.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/shutdown/intl/da/cryptobox-server-feature-shutdown.po b/plugins/shutdown/intl/da/cryptobox-server-feature-shutdown.po
index e3f6eb4..9ed6e30 100644
--- a/plugins/shutdown/intl/da/cryptobox-server-feature-shutdown.po
+++ b/plugins/shutdown/intl/da/cryptobox-server-feature-shutdown.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/shutdown/intl/de/cryptobox-server-feature-shutdown.po b/plugins/shutdown/intl/de/cryptobox-server-feature-shutdown.po
index e3f6eb4..9ed6e30 100644
--- a/plugins/shutdown/intl/de/cryptobox-server-feature-shutdown.po
+++ b/plugins/shutdown/intl/de/cryptobox-server-feature-shutdown.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/shutdown/intl/en/cryptobox-server-feature-shutdown.po b/plugins/shutdown/intl/en/cryptobox-server-feature-shutdown.po
index ce19fe1..19bee5f 100644
--- a/plugins/shutdown/intl/en/cryptobox-server-feature-shutdown.po
+++ b/plugins/shutdown/intl/en/cryptobox-server-feature-shutdown.po
@@ -1,10 +1,9 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: CryptoBox-Server 0.3\n"
 "Report-Msgid-Bugs-To: translate@cryptobox.org\n"
-"POT-Creation-Date: 2006-11-28 05:03+0100\n"
+"POT-Creation-Date: 2006-11-28 05:04+0100\n"
 "PO-Revision-Date: 2006-11-29 19:31+0100\n"
 "Last-Translator: Lars Kruse <devel@sumpfralle.de>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -12,7 +11,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 0.10.1\n"
+"X-Generator: Translate Toolkit 0.10.1\n"
 
 #: Name
 msgid "Shutdown or reboot the computer"
@@ -47,12 +46,8 @@ msgid "Shutting down the system"
 msgstr "Shutting down the system"
 
 #: SuccessMessage.Shutdown.Text
-msgid ""
-"If the computer does not turn off itself within a minute, then you should "
-"plug it off manually."
-msgstr ""
-"If the computer does not turn off itself within a minute, then you should "
-"plug it off manually."
+msgid "If the computer does not turn off itself within a minute, then you should plug it off manually."
+msgstr "If the computer does not turn off itself within a minute, then you should plug it off manually."
 
 #: SuccessMessage.Reboot.Title
 msgid "Rebooting the system"
diff --git a/plugins/shutdown/intl/es/cryptobox-server-feature-shutdown.po b/plugins/shutdown/intl/es/cryptobox-server-feature-shutdown.po
index e3f6eb4..9ed6e30 100644
--- a/plugins/shutdown/intl/es/cryptobox-server-feature-shutdown.po
+++ b/plugins/shutdown/intl/es/cryptobox-server-feature-shutdown.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/shutdown/intl/fi/cryptobox-server-feature-shutdown.po b/plugins/shutdown/intl/fi/cryptobox-server-feature-shutdown.po
index e3f6eb4..9ed6e30 100644
--- a/plugins/shutdown/intl/fi/cryptobox-server-feature-shutdown.po
+++ b/plugins/shutdown/intl/fi/cryptobox-server-feature-shutdown.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/shutdown/intl/fr/cryptobox-server-feature-shutdown.po b/plugins/shutdown/intl/fr/cryptobox-server-feature-shutdown.po
index e3f6eb4..9ed6e30 100644
--- a/plugins/shutdown/intl/fr/cryptobox-server-feature-shutdown.po
+++ b/plugins/shutdown/intl/fr/cryptobox-server-feature-shutdown.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/shutdown/intl/hu/cryptobox-server-feature-shutdown.po b/plugins/shutdown/intl/hu/cryptobox-server-feature-shutdown.po
index e3f6eb4..9ed6e30 100644
--- a/plugins/shutdown/intl/hu/cryptobox-server-feature-shutdown.po
+++ b/plugins/shutdown/intl/hu/cryptobox-server-feature-shutdown.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/shutdown/intl/it/cryptobox-server-feature-shutdown.po b/plugins/shutdown/intl/it/cryptobox-server-feature-shutdown.po
index e3f6eb4..9ed6e30 100644
--- a/plugins/shutdown/intl/it/cryptobox-server-feature-shutdown.po
+++ b/plugins/shutdown/intl/it/cryptobox-server-feature-shutdown.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/shutdown/intl/ja/cryptobox-server-feature-shutdown.po b/plugins/shutdown/intl/ja/cryptobox-server-feature-shutdown.po
index e3f6eb4..9ed6e30 100644
--- a/plugins/shutdown/intl/ja/cryptobox-server-feature-shutdown.po
+++ b/plugins/shutdown/intl/ja/cryptobox-server-feature-shutdown.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/shutdown/intl/nl/cryptobox-server-feature-shutdown.po b/plugins/shutdown/intl/nl/cryptobox-server-feature-shutdown.po
index e3f6eb4..9ed6e30 100644
--- a/plugins/shutdown/intl/nl/cryptobox-server-feature-shutdown.po
+++ b/plugins/shutdown/intl/nl/cryptobox-server-feature-shutdown.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/shutdown/intl/pl/cryptobox-server-feature-shutdown.po b/plugins/shutdown/intl/pl/cryptobox-server-feature-shutdown.po
index e3f6eb4..9ed6e30 100644
--- a/plugins/shutdown/intl/pl/cryptobox-server-feature-shutdown.po
+++ b/plugins/shutdown/intl/pl/cryptobox-server-feature-shutdown.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/shutdown/intl/pt/cryptobox-server-feature-shutdown.po b/plugins/shutdown/intl/pt/cryptobox-server-feature-shutdown.po
index e3f6eb4..9ed6e30 100644
--- a/plugins/shutdown/intl/pt/cryptobox-server-feature-shutdown.po
+++ b/plugins/shutdown/intl/pt/cryptobox-server-feature-shutdown.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/shutdown/intl/ru/cryptobox-server-feature-shutdown.po b/plugins/shutdown/intl/ru/cryptobox-server-feature-shutdown.po
index e3f6eb4..9ed6e30 100644
--- a/plugins/shutdown/intl/ru/cryptobox-server-feature-shutdown.po
+++ b/plugins/shutdown/intl/ru/cryptobox-server-feature-shutdown.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/shutdown/intl/sl/cryptobox-server-feature-shutdown.po b/plugins/shutdown/intl/sl/cryptobox-server-feature-shutdown.po
index e3f6eb4..9ed6e30 100644
--- a/plugins/shutdown/intl/sl/cryptobox-server-feature-shutdown.po
+++ b/plugins/shutdown/intl/sl/cryptobox-server-feature-shutdown.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/shutdown/intl/sv/cryptobox-server-feature-shutdown.po b/plugins/shutdown/intl/sv/cryptobox-server-feature-shutdown.po
index e3f6eb4..9ed6e30 100644
--- a/plugins/shutdown/intl/sv/cryptobox-server-feature-shutdown.po
+++ b/plugins/shutdown/intl/sv/cryptobox-server-feature-shutdown.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/system_preferences/intl/cs/cryptobox-server-feature-system_preferences.po b/plugins/system_preferences/intl/cs/cryptobox-server-feature-system_preferences.po
index 739dc01..607a309 100644
--- a/plugins/system_preferences/intl/cs/cryptobox-server-feature-system_preferences.po
+++ b/plugins/system_preferences/intl/cs/cryptobox-server-feature-system_preferences.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/system_preferences/intl/da/cryptobox-server-feature-system_preferences.po b/plugins/system_preferences/intl/da/cryptobox-server-feature-system_preferences.po
index 739dc01..607a309 100644
--- a/plugins/system_preferences/intl/da/cryptobox-server-feature-system_preferences.po
+++ b/plugins/system_preferences/intl/da/cryptobox-server-feature-system_preferences.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/system_preferences/intl/de/cryptobox-server-feature-system_preferences.po b/plugins/system_preferences/intl/de/cryptobox-server-feature-system_preferences.po
index 739dc01..607a309 100644
--- a/plugins/system_preferences/intl/de/cryptobox-server-feature-system_preferences.po
+++ b/plugins/system_preferences/intl/de/cryptobox-server-feature-system_preferences.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/system_preferences/intl/en/cryptobox-server-feature-system_preferences.po b/plugins/system_preferences/intl/en/cryptobox-server-feature-system_preferences.po
index 54dc4ca..adf2aeb 100644
--- a/plugins/system_preferences/intl/en/cryptobox-server-feature-system_preferences.po
+++ b/plugins/system_preferences/intl/en/cryptobox-server-feature-system_preferences.po
@@ -1,10 +1,9 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: CryptoBox-Server 0.3\n"
 "Report-Msgid-Bugs-To: translate@cryptobox.org\n"
-"POT-Creation-Date: 2006-11-28 05:03+0100\n"
+"POT-Creation-Date: 2006-11-28 05:04+0100\n"
 "PO-Revision-Date: 2006-11-29 19:31+0100\n"
 "Last-Translator: Lars Kruse <devel@sumpfralle.de>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -12,7 +11,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 0.10.1\n"
+"X-Generator: Translate Toolkit 0.10.1\n"
 
 #: Name
 msgid "System preferences"
diff --git a/plugins/system_preferences/intl/es/cryptobox-server-feature-system_preferences.po b/plugins/system_preferences/intl/es/cryptobox-server-feature-system_preferences.po
index 739dc01..607a309 100644
--- a/plugins/system_preferences/intl/es/cryptobox-server-feature-system_preferences.po
+++ b/plugins/system_preferences/intl/es/cryptobox-server-feature-system_preferences.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/system_preferences/intl/fi/cryptobox-server-feature-system_preferences.po b/plugins/system_preferences/intl/fi/cryptobox-server-feature-system_preferences.po
index 739dc01..607a309 100644
--- a/plugins/system_preferences/intl/fi/cryptobox-server-feature-system_preferences.po
+++ b/plugins/system_preferences/intl/fi/cryptobox-server-feature-system_preferences.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/system_preferences/intl/fr/cryptobox-server-feature-system_preferences.po b/plugins/system_preferences/intl/fr/cryptobox-server-feature-system_preferences.po
index 739dc01..607a309 100644
--- a/plugins/system_preferences/intl/fr/cryptobox-server-feature-system_preferences.po
+++ b/plugins/system_preferences/intl/fr/cryptobox-server-feature-system_preferences.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/system_preferences/intl/hu/cryptobox-server-feature-system_preferences.po b/plugins/system_preferences/intl/hu/cryptobox-server-feature-system_preferences.po
index 739dc01..607a309 100644
--- a/plugins/system_preferences/intl/hu/cryptobox-server-feature-system_preferences.po
+++ b/plugins/system_preferences/intl/hu/cryptobox-server-feature-system_preferences.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/system_preferences/intl/it/cryptobox-server-feature-system_preferences.po b/plugins/system_preferences/intl/it/cryptobox-server-feature-system_preferences.po
index 739dc01..607a309 100644
--- a/plugins/system_preferences/intl/it/cryptobox-server-feature-system_preferences.po
+++ b/plugins/system_preferences/intl/it/cryptobox-server-feature-system_preferences.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/system_preferences/intl/ja/cryptobox-server-feature-system_preferences.po b/plugins/system_preferences/intl/ja/cryptobox-server-feature-system_preferences.po
index 739dc01..607a309 100644
--- a/plugins/system_preferences/intl/ja/cryptobox-server-feature-system_preferences.po
+++ b/plugins/system_preferences/intl/ja/cryptobox-server-feature-system_preferences.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/system_preferences/intl/nl/cryptobox-server-feature-system_preferences.po b/plugins/system_preferences/intl/nl/cryptobox-server-feature-system_preferences.po
index 739dc01..607a309 100644
--- a/plugins/system_preferences/intl/nl/cryptobox-server-feature-system_preferences.po
+++ b/plugins/system_preferences/intl/nl/cryptobox-server-feature-system_preferences.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/system_preferences/intl/pl/cryptobox-server-feature-system_preferences.po b/plugins/system_preferences/intl/pl/cryptobox-server-feature-system_preferences.po
index 739dc01..607a309 100644
--- a/plugins/system_preferences/intl/pl/cryptobox-server-feature-system_preferences.po
+++ b/plugins/system_preferences/intl/pl/cryptobox-server-feature-system_preferences.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/system_preferences/intl/pt/cryptobox-server-feature-system_preferences.po b/plugins/system_preferences/intl/pt/cryptobox-server-feature-system_preferences.po
index 739dc01..607a309 100644
--- a/plugins/system_preferences/intl/pt/cryptobox-server-feature-system_preferences.po
+++ b/plugins/system_preferences/intl/pt/cryptobox-server-feature-system_preferences.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/system_preferences/intl/ru/cryptobox-server-feature-system_preferences.po b/plugins/system_preferences/intl/ru/cryptobox-server-feature-system_preferences.po
index 739dc01..607a309 100644
--- a/plugins/system_preferences/intl/ru/cryptobox-server-feature-system_preferences.po
+++ b/plugins/system_preferences/intl/ru/cryptobox-server-feature-system_preferences.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/system_preferences/intl/sl/cryptobox-server-feature-system_preferences.po b/plugins/system_preferences/intl/sl/cryptobox-server-feature-system_preferences.po
index 739dc01..607a309 100644
--- a/plugins/system_preferences/intl/sl/cryptobox-server-feature-system_preferences.po
+++ b/plugins/system_preferences/intl/sl/cryptobox-server-feature-system_preferences.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/system_preferences/intl/sv/cryptobox-server-feature-system_preferences.po b/plugins/system_preferences/intl/sv/cryptobox-server-feature-system_preferences.po
index 739dc01..607a309 100644
--- a/plugins/system_preferences/intl/sv/cryptobox-server-feature-system_preferences.po
+++ b/plugins/system_preferences/intl/sv/cryptobox-server-feature-system_preferences.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/user_manager/intl/cryptobox-server-feature-user_manager.pot b/plugins/user_manager/intl/cryptobox-server-feature-user_manager.pot
index cf0b04d..4970feb 100644
--- a/plugins/user_manager/intl/cryptobox-server-feature-user_manager.pot
+++ b/plugins/user_manager/intl/cryptobox-server-feature-user_manager.pot
@@ -87,3 +87,11 @@ msgstr ""
 #: WarningMessage.UserAlreadyExists.Text
 msgid "The choosen username does already exist. Please choose another one."
 msgstr ""
+
+#: WarningMessage.NeverRemoveReservedUser.Title
+msgid "Reserved user"
+msgstr ""
+
+#: WarningMessage.NeverRemoveReservedUser.Text
+msgid "You may not remove a reserved user. Sorry!"
+msgstr ""
diff --git a/plugins/user_manager/intl/cs/cryptobox-server-feature-user_manager.po b/plugins/user_manager/intl/cs/cryptobox-server-feature-user_manager.po
index d01ffd5..81ec34c 100644
--- a/plugins/user_manager/intl/cs/cryptobox-server-feature-user_manager.po
+++ b/plugins/user_manager/intl/cs/cryptobox-server-feature-user_manager.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -89,3 +88,11 @@ msgstr ""
 #: WarningMessage.UserAlreadyExists.Text
 msgid "The choosen username does already exist. Please choose another one."
 msgstr ""
+
+#: WarningMessage.NeverRemoveReservedUser.Title
+msgid "Reserved user"
+msgstr ""
+
+#: WarningMessage.NeverRemoveReservedUser.Text
+msgid "You may not remove a reserved user. Sorry!"
+msgstr ""
diff --git a/plugins/user_manager/intl/da/cryptobox-server-feature-user_manager.po b/plugins/user_manager/intl/da/cryptobox-server-feature-user_manager.po
index d01ffd5..81ec34c 100644
--- a/plugins/user_manager/intl/da/cryptobox-server-feature-user_manager.po
+++ b/plugins/user_manager/intl/da/cryptobox-server-feature-user_manager.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -89,3 +88,11 @@ msgstr ""
 #: WarningMessage.UserAlreadyExists.Text
 msgid "The choosen username does already exist. Please choose another one."
 msgstr ""
+
+#: WarningMessage.NeverRemoveReservedUser.Title
+msgid "Reserved user"
+msgstr ""
+
+#: WarningMessage.NeverRemoveReservedUser.Text
+msgid "You may not remove a reserved user. Sorry!"
+msgstr ""
diff --git a/plugins/user_manager/intl/de/cryptobox-server-feature-user_manager.po b/plugins/user_manager/intl/de/cryptobox-server-feature-user_manager.po
index d01ffd5..81ec34c 100644
--- a/plugins/user_manager/intl/de/cryptobox-server-feature-user_manager.po
+++ b/plugins/user_manager/intl/de/cryptobox-server-feature-user_manager.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -89,3 +88,11 @@ msgstr ""
 #: WarningMessage.UserAlreadyExists.Text
 msgid "The choosen username does already exist. Please choose another one."
 msgstr ""
+
+#: WarningMessage.NeverRemoveReservedUser.Title
+msgid "Reserved user"
+msgstr ""
+
+#: WarningMessage.NeverRemoveReservedUser.Text
+msgid "You may not remove a reserved user. Sorry!"
+msgstr ""
diff --git a/plugins/user_manager/intl/en/cryptobox-server-feature-user_manager.po b/plugins/user_manager/intl/en/cryptobox-server-feature-user_manager.po
index 27086ec..3f08b26 100644
--- a/plugins/user_manager/intl/en/cryptobox-server-feature-user_manager.po
+++ b/plugins/user_manager/intl/en/cryptobox-server-feature-user_manager.po
@@ -1,10 +1,9 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: CryptoBox-Server 0.3\n"
 "Report-Msgid-Bugs-To: translate@cryptobox.org\n"
-"POT-Creation-Date: 2006-11-28 05:03+0100\n"
+"POT-Creation-Date: 2006-11-28 05:04+0100\n"
 "PO-Revision-Date: 2006-11-29 19:31+0100\n"
 "Last-Translator: Lars Kruse <devel@sumpfralle.de>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -12,7 +11,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 0.10.1\n"
+"X-Generator: Translate Toolkit 0.10.1\n"
 
 #: Name
 msgid "User Manager"
@@ -89,3 +88,11 @@ msgstr "User exists"
 #: WarningMessage.UserAlreadyExists.Text
 msgid "The choosen username does already exist. Please choose another one."
 msgstr "The choosen username does already exist. Please choose another one."
+
+#: WarningMessage.NeverRemoveReservedUser.Title
+msgid "Reserved user"
+msgstr ""
+
+#: WarningMessage.NeverRemoveReservedUser.Text
+msgid "You may not remove a reserved user. Sorry!"
+msgstr ""
diff --git a/plugins/user_manager/intl/es/cryptobox-server-feature-user_manager.po b/plugins/user_manager/intl/es/cryptobox-server-feature-user_manager.po
index d01ffd5..81ec34c 100644
--- a/plugins/user_manager/intl/es/cryptobox-server-feature-user_manager.po
+++ b/plugins/user_manager/intl/es/cryptobox-server-feature-user_manager.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -89,3 +88,11 @@ msgstr ""
 #: WarningMessage.UserAlreadyExists.Text
 msgid "The choosen username does already exist. Please choose another one."
 msgstr ""
+
+#: WarningMessage.NeverRemoveReservedUser.Title
+msgid "Reserved user"
+msgstr ""
+
+#: WarningMessage.NeverRemoveReservedUser.Text
+msgid "You may not remove a reserved user. Sorry!"
+msgstr ""
diff --git a/plugins/user_manager/intl/fi/cryptobox-server-feature-user_manager.po b/plugins/user_manager/intl/fi/cryptobox-server-feature-user_manager.po
index d01ffd5..81ec34c 100644
--- a/plugins/user_manager/intl/fi/cryptobox-server-feature-user_manager.po
+++ b/plugins/user_manager/intl/fi/cryptobox-server-feature-user_manager.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -89,3 +88,11 @@ msgstr ""
 #: WarningMessage.UserAlreadyExists.Text
 msgid "The choosen username does already exist. Please choose another one."
 msgstr ""
+
+#: WarningMessage.NeverRemoveReservedUser.Title
+msgid "Reserved user"
+msgstr ""
+
+#: WarningMessage.NeverRemoveReservedUser.Text
+msgid "You may not remove a reserved user. Sorry!"
+msgstr ""
diff --git a/plugins/user_manager/intl/fr/cryptobox-server-feature-user_manager.po b/plugins/user_manager/intl/fr/cryptobox-server-feature-user_manager.po
index d01ffd5..81ec34c 100644
--- a/plugins/user_manager/intl/fr/cryptobox-server-feature-user_manager.po
+++ b/plugins/user_manager/intl/fr/cryptobox-server-feature-user_manager.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -89,3 +88,11 @@ msgstr ""
 #: WarningMessage.UserAlreadyExists.Text
 msgid "The choosen username does already exist. Please choose another one."
 msgstr ""
+
+#: WarningMessage.NeverRemoveReservedUser.Title
+msgid "Reserved user"
+msgstr ""
+
+#: WarningMessage.NeverRemoveReservedUser.Text
+msgid "You may not remove a reserved user. Sorry!"
+msgstr ""
diff --git a/plugins/user_manager/intl/hu/cryptobox-server-feature-user_manager.po b/plugins/user_manager/intl/hu/cryptobox-server-feature-user_manager.po
index d01ffd5..81ec34c 100644
--- a/plugins/user_manager/intl/hu/cryptobox-server-feature-user_manager.po
+++ b/plugins/user_manager/intl/hu/cryptobox-server-feature-user_manager.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -89,3 +88,11 @@ msgstr ""
 #: WarningMessage.UserAlreadyExists.Text
 msgid "The choosen username does already exist. Please choose another one."
 msgstr ""
+
+#: WarningMessage.NeverRemoveReservedUser.Title
+msgid "Reserved user"
+msgstr ""
+
+#: WarningMessage.NeverRemoveReservedUser.Text
+msgid "You may not remove a reserved user. Sorry!"
+msgstr ""
diff --git a/plugins/user_manager/intl/it/cryptobox-server-feature-user_manager.po b/plugins/user_manager/intl/it/cryptobox-server-feature-user_manager.po
index d01ffd5..81ec34c 100644
--- a/plugins/user_manager/intl/it/cryptobox-server-feature-user_manager.po
+++ b/plugins/user_manager/intl/it/cryptobox-server-feature-user_manager.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -89,3 +88,11 @@ msgstr ""
 #: WarningMessage.UserAlreadyExists.Text
 msgid "The choosen username does already exist. Please choose another one."
 msgstr ""
+
+#: WarningMessage.NeverRemoveReservedUser.Title
+msgid "Reserved user"
+msgstr ""
+
+#: WarningMessage.NeverRemoveReservedUser.Text
+msgid "You may not remove a reserved user. Sorry!"
+msgstr ""
diff --git a/plugins/user_manager/intl/ja/cryptobox-server-feature-user_manager.po b/plugins/user_manager/intl/ja/cryptobox-server-feature-user_manager.po
index d01ffd5..81ec34c 100644
--- a/plugins/user_manager/intl/ja/cryptobox-server-feature-user_manager.po
+++ b/plugins/user_manager/intl/ja/cryptobox-server-feature-user_manager.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -89,3 +88,11 @@ msgstr ""
 #: WarningMessage.UserAlreadyExists.Text
 msgid "The choosen username does already exist. Please choose another one."
 msgstr ""
+
+#: WarningMessage.NeverRemoveReservedUser.Title
+msgid "Reserved user"
+msgstr ""
+
+#: WarningMessage.NeverRemoveReservedUser.Text
+msgid "You may not remove a reserved user. Sorry!"
+msgstr ""
diff --git a/plugins/user_manager/intl/nl/cryptobox-server-feature-user_manager.po b/plugins/user_manager/intl/nl/cryptobox-server-feature-user_manager.po
index d01ffd5..81ec34c 100644
--- a/plugins/user_manager/intl/nl/cryptobox-server-feature-user_manager.po
+++ b/plugins/user_manager/intl/nl/cryptobox-server-feature-user_manager.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -89,3 +88,11 @@ msgstr ""
 #: WarningMessage.UserAlreadyExists.Text
 msgid "The choosen username does already exist. Please choose another one."
 msgstr ""
+
+#: WarningMessage.NeverRemoveReservedUser.Title
+msgid "Reserved user"
+msgstr ""
+
+#: WarningMessage.NeverRemoveReservedUser.Text
+msgid "You may not remove a reserved user. Sorry!"
+msgstr ""
diff --git a/plugins/user_manager/intl/pl/cryptobox-server-feature-user_manager.po b/plugins/user_manager/intl/pl/cryptobox-server-feature-user_manager.po
index d01ffd5..81ec34c 100644
--- a/plugins/user_manager/intl/pl/cryptobox-server-feature-user_manager.po
+++ b/plugins/user_manager/intl/pl/cryptobox-server-feature-user_manager.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -89,3 +88,11 @@ msgstr ""
 #: WarningMessage.UserAlreadyExists.Text
 msgid "The choosen username does already exist. Please choose another one."
 msgstr ""
+
+#: WarningMessage.NeverRemoveReservedUser.Title
+msgid "Reserved user"
+msgstr ""
+
+#: WarningMessage.NeverRemoveReservedUser.Text
+msgid "You may not remove a reserved user. Sorry!"
+msgstr ""
diff --git a/plugins/user_manager/intl/pt/cryptobox-server-feature-user_manager.po b/plugins/user_manager/intl/pt/cryptobox-server-feature-user_manager.po
index d01ffd5..81ec34c 100644
--- a/plugins/user_manager/intl/pt/cryptobox-server-feature-user_manager.po
+++ b/plugins/user_manager/intl/pt/cryptobox-server-feature-user_manager.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -89,3 +88,11 @@ msgstr ""
 #: WarningMessage.UserAlreadyExists.Text
 msgid "The choosen username does already exist. Please choose another one."
 msgstr ""
+
+#: WarningMessage.NeverRemoveReservedUser.Title
+msgid "Reserved user"
+msgstr ""
+
+#: WarningMessage.NeverRemoveReservedUser.Text
+msgid "You may not remove a reserved user. Sorry!"
+msgstr ""
diff --git a/plugins/user_manager/intl/ru/cryptobox-server-feature-user_manager.po b/plugins/user_manager/intl/ru/cryptobox-server-feature-user_manager.po
index d01ffd5..81ec34c 100644
--- a/plugins/user_manager/intl/ru/cryptobox-server-feature-user_manager.po
+++ b/plugins/user_manager/intl/ru/cryptobox-server-feature-user_manager.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -89,3 +88,11 @@ msgstr ""
 #: WarningMessage.UserAlreadyExists.Text
 msgid "The choosen username does already exist. Please choose another one."
 msgstr ""
+
+#: WarningMessage.NeverRemoveReservedUser.Title
+msgid "Reserved user"
+msgstr ""
+
+#: WarningMessage.NeverRemoveReservedUser.Text
+msgid "You may not remove a reserved user. Sorry!"
+msgstr ""
diff --git a/plugins/user_manager/intl/sl/cryptobox-server-feature-user_manager.po b/plugins/user_manager/intl/sl/cryptobox-server-feature-user_manager.po
index d01ffd5..81ec34c 100644
--- a/plugins/user_manager/intl/sl/cryptobox-server-feature-user_manager.po
+++ b/plugins/user_manager/intl/sl/cryptobox-server-feature-user_manager.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -89,3 +88,11 @@ msgstr ""
 #: WarningMessage.UserAlreadyExists.Text
 msgid "The choosen username does already exist. Please choose another one."
 msgstr ""
+
+#: WarningMessage.NeverRemoveReservedUser.Title
+msgid "Reserved user"
+msgstr ""
+
+#: WarningMessage.NeverRemoveReservedUser.Text
+msgid "You may not remove a reserved user. Sorry!"
+msgstr ""
diff --git a/plugins/user_manager/intl/sv/cryptobox-server-feature-user_manager.po b/plugins/user_manager/intl/sv/cryptobox-server-feature-user_manager.po
index d01ffd5..81ec34c 100644
--- a/plugins/user_manager/intl/sv/cryptobox-server-feature-user_manager.po
+++ b/plugins/user_manager/intl/sv/cryptobox-server-feature-user_manager.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -89,3 +88,11 @@ msgstr ""
 #: WarningMessage.UserAlreadyExists.Text
 msgid "The choosen username does already exist. Please choose another one."
 msgstr ""
+
+#: WarningMessage.NeverRemoveReservedUser.Title
+msgid "Reserved user"
+msgstr ""
+
+#: WarningMessage.NeverRemoveReservedUser.Text
+msgid "You may not remove a reserved user. Sorry!"
+msgstr ""
diff --git a/plugins/volume_automount/intl/cryptobox-server-feature-volume_automount.pot b/plugins/volume_automount/intl/cryptobox-server-feature-volume_automount.pot
index fc09a0a..5c7aff6 100644
--- a/plugins/volume_automount/intl/cryptobox-server-feature-volume_automount.pot
+++ b/plugins/volume_automount/intl/cryptobox-server-feature-volume_automount.pot
@@ -55,3 +55,43 @@ msgstr ""
 #: AdviceMessage.NoAutoMountForEncryptedVolumes.Text
 msgid "Automatic activation is not possible for encrypted volumes."
 msgstr ""
+
+#: Name
+msgid "Automatic opening"
+msgstr ""
+
+#: Link
+msgid "AutoOpen"
+msgstr ""
+
+#: Title.AutoMountVolume
+msgid "Open during startup"
+msgstr ""
+
+#: Button.AutoMountOn
+msgid "Enable automatic opening"
+msgstr ""
+
+#: Button.AutoMountOff
+msgid "Disable automatic opening"
+msgstr ""
+
+#: Text.AutoIsOn
+msgid "Currently automatic opening is enabled"
+msgstr ""
+
+#: Text.AutoIsOff
+msgid "Currently automatic opening is disabled"
+msgstr ""
+
+#: SuccessMessage.AutoMountEnabled.Text
+msgid "This volume will get opened during startup"
+msgstr ""
+
+#: SuccessMessage.AutoMountDisabled.Text
+msgid "This volume will not get opened during startup"
+msgstr ""
+
+#: AdviceMessage.NoAutoMountForEncryptedVolumes.Text
+msgid "Automatic opening is not possible for encrypted volumes."
+msgstr ""
diff --git a/plugins/volume_automount/intl/cs/cryptobox-server-feature-volume_automount.po b/plugins/volume_automount/intl/cs/cryptobox-server-feature-volume_automount.po
index f0173a3..e6e7b3e 100644
--- a/plugins/volume_automount/intl/cs/cryptobox-server-feature-volume_automount.po
+++ b/plugins/volume_automount/intl/cs/cryptobox-server-feature-volume_automount.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -57,3 +56,43 @@ msgstr ""
 #: AdviceMessage.NoAutoMountForEncryptedVolumes.Text
 msgid "Automatic activation is not possible for encrypted volumes."
 msgstr ""
+
+#: Name
+msgid "Automatic opening"
+msgstr ""
+
+#: Link
+msgid "AutoOpen"
+msgstr ""
+
+#: Title.AutoMountVolume
+msgid "Open during startup"
+msgstr ""
+
+#: Button.AutoMountOn
+msgid "Enable automatic opening"
+msgstr ""
+
+#: Button.AutoMountOff
+msgid "Disable automatic opening"
+msgstr ""
+
+#: Text.AutoIsOn
+msgid "Currently automatic opening is enabled"
+msgstr ""
+
+#: Text.AutoIsOff
+msgid "Currently automatic opening is disabled"
+msgstr ""
+
+#: SuccessMessage.AutoMountEnabled.Text
+msgid "This volume will get opened during startup"
+msgstr ""
+
+#: SuccessMessage.AutoMountDisabled.Text
+msgid "This volume will not get opened during startup"
+msgstr ""
+
+#: AdviceMessage.NoAutoMountForEncryptedVolumes.Text
+msgid "Automatic opening is not possible for encrypted volumes."
+msgstr ""
diff --git a/plugins/volume_automount/intl/da/cryptobox-server-feature-volume_automount.po b/plugins/volume_automount/intl/da/cryptobox-server-feature-volume_automount.po
index f0173a3..e6e7b3e 100644
--- a/plugins/volume_automount/intl/da/cryptobox-server-feature-volume_automount.po
+++ b/plugins/volume_automount/intl/da/cryptobox-server-feature-volume_automount.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -57,3 +56,43 @@ msgstr ""
 #: AdviceMessage.NoAutoMountForEncryptedVolumes.Text
 msgid "Automatic activation is not possible for encrypted volumes."
 msgstr ""
+
+#: Name
+msgid "Automatic opening"
+msgstr ""
+
+#: Link
+msgid "AutoOpen"
+msgstr ""
+
+#: Title.AutoMountVolume
+msgid "Open during startup"
+msgstr ""
+
+#: Button.AutoMountOn
+msgid "Enable automatic opening"
+msgstr ""
+
+#: Button.AutoMountOff
+msgid "Disable automatic opening"
+msgstr ""
+
+#: Text.AutoIsOn
+msgid "Currently automatic opening is enabled"
+msgstr ""
+
+#: Text.AutoIsOff
+msgid "Currently automatic opening is disabled"
+msgstr ""
+
+#: SuccessMessage.AutoMountEnabled.Text
+msgid "This volume will get opened during startup"
+msgstr ""
+
+#: SuccessMessage.AutoMountDisabled.Text
+msgid "This volume will not get opened during startup"
+msgstr ""
+
+#: AdviceMessage.NoAutoMountForEncryptedVolumes.Text
+msgid "Automatic opening is not possible for encrypted volumes."
+msgstr ""
diff --git a/plugins/volume_automount/intl/de/cryptobox-server-feature-volume_automount.po b/plugins/volume_automount/intl/de/cryptobox-server-feature-volume_automount.po
index f0173a3..e6e7b3e 100644
--- a/plugins/volume_automount/intl/de/cryptobox-server-feature-volume_automount.po
+++ b/plugins/volume_automount/intl/de/cryptobox-server-feature-volume_automount.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -57,3 +56,43 @@ msgstr ""
 #: AdviceMessage.NoAutoMountForEncryptedVolumes.Text
 msgid "Automatic activation is not possible for encrypted volumes."
 msgstr ""
+
+#: Name
+msgid "Automatic opening"
+msgstr ""
+
+#: Link
+msgid "AutoOpen"
+msgstr ""
+
+#: Title.AutoMountVolume
+msgid "Open during startup"
+msgstr ""
+
+#: Button.AutoMountOn
+msgid "Enable automatic opening"
+msgstr ""
+
+#: Button.AutoMountOff
+msgid "Disable automatic opening"
+msgstr ""
+
+#: Text.AutoIsOn
+msgid "Currently automatic opening is enabled"
+msgstr ""
+
+#: Text.AutoIsOff
+msgid "Currently automatic opening is disabled"
+msgstr ""
+
+#: SuccessMessage.AutoMountEnabled.Text
+msgid "This volume will get opened during startup"
+msgstr ""
+
+#: SuccessMessage.AutoMountDisabled.Text
+msgid "This volume will not get opened during startup"
+msgstr ""
+
+#: AdviceMessage.NoAutoMountForEncryptedVolumes.Text
+msgid "Automatic opening is not possible for encrypted volumes."
+msgstr ""
diff --git a/plugins/volume_automount/intl/en/cryptobox-server-feature-volume_automount.po b/plugins/volume_automount/intl/en/cryptobox-server-feature-volume_automount.po
index 666ae48..7379d47 100644
--- a/plugins/volume_automount/intl/en/cryptobox-server-feature-volume_automount.po
+++ b/plugins/volume_automount/intl/en/cryptobox-server-feature-volume_automount.po
@@ -1,10 +1,9 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: CryptoBox-Server 0.3\n"
 "Report-Msgid-Bugs-To: translate@cryptobox.org\n"
-"POT-Creation-Date: 2006-11-28 05:03+0100\n"
+"POT-Creation-Date: 2006-11-28 05:04+0100\n"
 "PO-Revision-Date: 2006-11-29 19:31+0100\n"
 "Last-Translator: Lars Kruse <devel@sumpfralle.de>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -12,7 +11,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 0.10.1\n"
+"X-Generator: Translate Toolkit 0.10.1\n"
 
 #: Name
 msgid "Automatic activation"
@@ -57,3 +56,48 @@ msgstr "This volume will not get activated during startup"
 #: AdviceMessage.NoAutoMountForEncryptedVolumes.Text
 msgid "Automatic activation is not possible for encrypted volumes."
 msgstr "Automatic activation is not possible for encrypted volumes."
+
+#: Name
+msgid "Automatic opening"
+msgstr ""
+
+#: Link
+msgid "AutoOpen"
+msgstr ""
+
+#: Title.AutoMountVolume
+msgid "Open during startup"
+msgstr ""
+
+#: Button.AutoMountOn
+msgid "Enable automatic opening"
+msgstr ""
+
+#: Button.AutoMountOff
+msgid "Disable automatic opening"
+msgstr ""
+
+#: Text.AutoIsOn
+#, fuzzy
+msgid "Currently automatic opening is enabled"
+msgstr "Currently automatic activation is enabled"
+
+#: Text.AutoIsOff
+#, fuzzy
+msgid "Currently automatic opening is disabled"
+msgstr "Currently automatic activation is disabled"
+
+#: SuccessMessage.AutoMountEnabled.Text
+#, fuzzy
+msgid "This volume will get opened during startup"
+msgstr "This volume will get activated during startup"
+
+#: SuccessMessage.AutoMountDisabled.Text
+#, fuzzy
+msgid "This volume will not get opened during startup"
+msgstr "This volume will not get activated during startup"
+
+#: AdviceMessage.NoAutoMountForEncryptedVolumes.Text
+#, fuzzy
+msgid "Automatic opening is not possible for encrypted volumes."
+msgstr "Automatic activation is not possible for encrypted volumes."
diff --git a/plugins/volume_automount/intl/es/cryptobox-server-feature-volume_automount.po b/plugins/volume_automount/intl/es/cryptobox-server-feature-volume_automount.po
index f0173a3..e6e7b3e 100644
--- a/plugins/volume_automount/intl/es/cryptobox-server-feature-volume_automount.po
+++ b/plugins/volume_automount/intl/es/cryptobox-server-feature-volume_automount.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -57,3 +56,43 @@ msgstr ""
 #: AdviceMessage.NoAutoMountForEncryptedVolumes.Text
 msgid "Automatic activation is not possible for encrypted volumes."
 msgstr ""
+
+#: Name
+msgid "Automatic opening"
+msgstr ""
+
+#: Link
+msgid "AutoOpen"
+msgstr ""
+
+#: Title.AutoMountVolume
+msgid "Open during startup"
+msgstr ""
+
+#: Button.AutoMountOn
+msgid "Enable automatic opening"
+msgstr ""
+
+#: Button.AutoMountOff
+msgid "Disable automatic opening"
+msgstr ""
+
+#: Text.AutoIsOn
+msgid "Currently automatic opening is enabled"
+msgstr ""
+
+#: Text.AutoIsOff
+msgid "Currently automatic opening is disabled"
+msgstr ""
+
+#: SuccessMessage.AutoMountEnabled.Text
+msgid "This volume will get opened during startup"
+msgstr ""
+
+#: SuccessMessage.AutoMountDisabled.Text
+msgid "This volume will not get opened during startup"
+msgstr ""
+
+#: AdviceMessage.NoAutoMountForEncryptedVolumes.Text
+msgid "Automatic opening is not possible for encrypted volumes."
+msgstr ""
diff --git a/plugins/volume_automount/intl/fi/cryptobox-server-feature-volume_automount.po b/plugins/volume_automount/intl/fi/cryptobox-server-feature-volume_automount.po
index f0173a3..e6e7b3e 100644
--- a/plugins/volume_automount/intl/fi/cryptobox-server-feature-volume_automount.po
+++ b/plugins/volume_automount/intl/fi/cryptobox-server-feature-volume_automount.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -57,3 +56,43 @@ msgstr ""
 #: AdviceMessage.NoAutoMountForEncryptedVolumes.Text
 msgid "Automatic activation is not possible for encrypted volumes."
 msgstr ""
+
+#: Name
+msgid "Automatic opening"
+msgstr ""
+
+#: Link
+msgid "AutoOpen"
+msgstr ""
+
+#: Title.AutoMountVolume
+msgid "Open during startup"
+msgstr ""
+
+#: Button.AutoMountOn
+msgid "Enable automatic opening"
+msgstr ""
+
+#: Button.AutoMountOff
+msgid "Disable automatic opening"
+msgstr ""
+
+#: Text.AutoIsOn
+msgid "Currently automatic opening is enabled"
+msgstr ""
+
+#: Text.AutoIsOff
+msgid "Currently automatic opening is disabled"
+msgstr ""
+
+#: SuccessMessage.AutoMountEnabled.Text
+msgid "This volume will get opened during startup"
+msgstr ""
+
+#: SuccessMessage.AutoMountDisabled.Text
+msgid "This volume will not get opened during startup"
+msgstr ""
+
+#: AdviceMessage.NoAutoMountForEncryptedVolumes.Text
+msgid "Automatic opening is not possible for encrypted volumes."
+msgstr ""
diff --git a/plugins/volume_automount/intl/fr/cryptobox-server-feature-volume_automount.po b/plugins/volume_automount/intl/fr/cryptobox-server-feature-volume_automount.po
index f0173a3..e6e7b3e 100644
--- a/plugins/volume_automount/intl/fr/cryptobox-server-feature-volume_automount.po
+++ b/plugins/volume_automount/intl/fr/cryptobox-server-feature-volume_automount.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -57,3 +56,43 @@ msgstr ""
 #: AdviceMessage.NoAutoMountForEncryptedVolumes.Text
 msgid "Automatic activation is not possible for encrypted volumes."
 msgstr ""
+
+#: Name
+msgid "Automatic opening"
+msgstr ""
+
+#: Link
+msgid "AutoOpen"
+msgstr ""
+
+#: Title.AutoMountVolume
+msgid "Open during startup"
+msgstr ""
+
+#: Button.AutoMountOn
+msgid "Enable automatic opening"
+msgstr ""
+
+#: Button.AutoMountOff
+msgid "Disable automatic opening"
+msgstr ""
+
+#: Text.AutoIsOn
+msgid "Currently automatic opening is enabled"
+msgstr ""
+
+#: Text.AutoIsOff
+msgid "Currently automatic opening is disabled"
+msgstr ""
+
+#: SuccessMessage.AutoMountEnabled.Text
+msgid "This volume will get opened during startup"
+msgstr ""
+
+#: SuccessMessage.AutoMountDisabled.Text
+msgid "This volume will not get opened during startup"
+msgstr ""
+
+#: AdviceMessage.NoAutoMountForEncryptedVolumes.Text
+msgid "Automatic opening is not possible for encrypted volumes."
+msgstr ""
diff --git a/plugins/volume_automount/intl/hu/cryptobox-server-feature-volume_automount.po b/plugins/volume_automount/intl/hu/cryptobox-server-feature-volume_automount.po
index f0173a3..e6e7b3e 100644
--- a/plugins/volume_automount/intl/hu/cryptobox-server-feature-volume_automount.po
+++ b/plugins/volume_automount/intl/hu/cryptobox-server-feature-volume_automount.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -57,3 +56,43 @@ msgstr ""
 #: AdviceMessage.NoAutoMountForEncryptedVolumes.Text
 msgid "Automatic activation is not possible for encrypted volumes."
 msgstr ""
+
+#: Name
+msgid "Automatic opening"
+msgstr ""
+
+#: Link
+msgid "AutoOpen"
+msgstr ""
+
+#: Title.AutoMountVolume
+msgid "Open during startup"
+msgstr ""
+
+#: Button.AutoMountOn
+msgid "Enable automatic opening"
+msgstr ""
+
+#: Button.AutoMountOff
+msgid "Disable automatic opening"
+msgstr ""
+
+#: Text.AutoIsOn
+msgid "Currently automatic opening is enabled"
+msgstr ""
+
+#: Text.AutoIsOff
+msgid "Currently automatic opening is disabled"
+msgstr ""
+
+#: SuccessMessage.AutoMountEnabled.Text
+msgid "This volume will get opened during startup"
+msgstr ""
+
+#: SuccessMessage.AutoMountDisabled.Text
+msgid "This volume will not get opened during startup"
+msgstr ""
+
+#: AdviceMessage.NoAutoMountForEncryptedVolumes.Text
+msgid "Automatic opening is not possible for encrypted volumes."
+msgstr ""
diff --git a/plugins/volume_automount/intl/it/cryptobox-server-feature-volume_automount.po b/plugins/volume_automount/intl/it/cryptobox-server-feature-volume_automount.po
index f0173a3..e6e7b3e 100644
--- a/plugins/volume_automount/intl/it/cryptobox-server-feature-volume_automount.po
+++ b/plugins/volume_automount/intl/it/cryptobox-server-feature-volume_automount.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -57,3 +56,43 @@ msgstr ""
 #: AdviceMessage.NoAutoMountForEncryptedVolumes.Text
 msgid "Automatic activation is not possible for encrypted volumes."
 msgstr ""
+
+#: Name
+msgid "Automatic opening"
+msgstr ""
+
+#: Link
+msgid "AutoOpen"
+msgstr ""
+
+#: Title.AutoMountVolume
+msgid "Open during startup"
+msgstr ""
+
+#: Button.AutoMountOn
+msgid "Enable automatic opening"
+msgstr ""
+
+#: Button.AutoMountOff
+msgid "Disable automatic opening"
+msgstr ""
+
+#: Text.AutoIsOn
+msgid "Currently automatic opening is enabled"
+msgstr ""
+
+#: Text.AutoIsOff
+msgid "Currently automatic opening is disabled"
+msgstr ""
+
+#: SuccessMessage.AutoMountEnabled.Text
+msgid "This volume will get opened during startup"
+msgstr ""
+
+#: SuccessMessage.AutoMountDisabled.Text
+msgid "This volume will not get opened during startup"
+msgstr ""
+
+#: AdviceMessage.NoAutoMountForEncryptedVolumes.Text
+msgid "Automatic opening is not possible for encrypted volumes."
+msgstr ""
diff --git a/plugins/volume_automount/intl/ja/cryptobox-server-feature-volume_automount.po b/plugins/volume_automount/intl/ja/cryptobox-server-feature-volume_automount.po
index f0173a3..e6e7b3e 100644
--- a/plugins/volume_automount/intl/ja/cryptobox-server-feature-volume_automount.po
+++ b/plugins/volume_automount/intl/ja/cryptobox-server-feature-volume_automount.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -57,3 +56,43 @@ msgstr ""
 #: AdviceMessage.NoAutoMountForEncryptedVolumes.Text
 msgid "Automatic activation is not possible for encrypted volumes."
 msgstr ""
+
+#: Name
+msgid "Automatic opening"
+msgstr ""
+
+#: Link
+msgid "AutoOpen"
+msgstr ""
+
+#: Title.AutoMountVolume
+msgid "Open during startup"
+msgstr ""
+
+#: Button.AutoMountOn
+msgid "Enable automatic opening"
+msgstr ""
+
+#: Button.AutoMountOff
+msgid "Disable automatic opening"
+msgstr ""
+
+#: Text.AutoIsOn
+msgid "Currently automatic opening is enabled"
+msgstr ""
+
+#: Text.AutoIsOff
+msgid "Currently automatic opening is disabled"
+msgstr ""
+
+#: SuccessMessage.AutoMountEnabled.Text
+msgid "This volume will get opened during startup"
+msgstr ""
+
+#: SuccessMessage.AutoMountDisabled.Text
+msgid "This volume will not get opened during startup"
+msgstr ""
+
+#: AdviceMessage.NoAutoMountForEncryptedVolumes.Text
+msgid "Automatic opening is not possible for encrypted volumes."
+msgstr ""
diff --git a/plugins/volume_automount/intl/nl/cryptobox-server-feature-volume_automount.po b/plugins/volume_automount/intl/nl/cryptobox-server-feature-volume_automount.po
index f0173a3..e6e7b3e 100644
--- a/plugins/volume_automount/intl/nl/cryptobox-server-feature-volume_automount.po
+++ b/plugins/volume_automount/intl/nl/cryptobox-server-feature-volume_automount.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -57,3 +56,43 @@ msgstr ""
 #: AdviceMessage.NoAutoMountForEncryptedVolumes.Text
 msgid "Automatic activation is not possible for encrypted volumes."
 msgstr ""
+
+#: Name
+msgid "Automatic opening"
+msgstr ""
+
+#: Link
+msgid "AutoOpen"
+msgstr ""
+
+#: Title.AutoMountVolume
+msgid "Open during startup"
+msgstr ""
+
+#: Button.AutoMountOn
+msgid "Enable automatic opening"
+msgstr ""
+
+#: Button.AutoMountOff
+msgid "Disable automatic opening"
+msgstr ""
+
+#: Text.AutoIsOn
+msgid "Currently automatic opening is enabled"
+msgstr ""
+
+#: Text.AutoIsOff
+msgid "Currently automatic opening is disabled"
+msgstr ""
+
+#: SuccessMessage.AutoMountEnabled.Text
+msgid "This volume will get opened during startup"
+msgstr ""
+
+#: SuccessMessage.AutoMountDisabled.Text
+msgid "This volume will not get opened during startup"
+msgstr ""
+
+#: AdviceMessage.NoAutoMountForEncryptedVolumes.Text
+msgid "Automatic opening is not possible for encrypted volumes."
+msgstr ""
diff --git a/plugins/volume_automount/intl/pl/cryptobox-server-feature-volume_automount.po b/plugins/volume_automount/intl/pl/cryptobox-server-feature-volume_automount.po
index f0173a3..e6e7b3e 100644
--- a/plugins/volume_automount/intl/pl/cryptobox-server-feature-volume_automount.po
+++ b/plugins/volume_automount/intl/pl/cryptobox-server-feature-volume_automount.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -57,3 +56,43 @@ msgstr ""
 #: AdviceMessage.NoAutoMountForEncryptedVolumes.Text
 msgid "Automatic activation is not possible for encrypted volumes."
 msgstr ""
+
+#: Name
+msgid "Automatic opening"
+msgstr ""
+
+#: Link
+msgid "AutoOpen"
+msgstr ""
+
+#: Title.AutoMountVolume
+msgid "Open during startup"
+msgstr ""
+
+#: Button.AutoMountOn
+msgid "Enable automatic opening"
+msgstr ""
+
+#: Button.AutoMountOff
+msgid "Disable automatic opening"
+msgstr ""
+
+#: Text.AutoIsOn
+msgid "Currently automatic opening is enabled"
+msgstr ""
+
+#: Text.AutoIsOff
+msgid "Currently automatic opening is disabled"
+msgstr ""
+
+#: SuccessMessage.AutoMountEnabled.Text
+msgid "This volume will get opened during startup"
+msgstr ""
+
+#: SuccessMessage.AutoMountDisabled.Text
+msgid "This volume will not get opened during startup"
+msgstr ""
+
+#: AdviceMessage.NoAutoMountForEncryptedVolumes.Text
+msgid "Automatic opening is not possible for encrypted volumes."
+msgstr ""
diff --git a/plugins/volume_automount/intl/pt/cryptobox-server-feature-volume_automount.po b/plugins/volume_automount/intl/pt/cryptobox-server-feature-volume_automount.po
index f0173a3..e6e7b3e 100644
--- a/plugins/volume_automount/intl/pt/cryptobox-server-feature-volume_automount.po
+++ b/plugins/volume_automount/intl/pt/cryptobox-server-feature-volume_automount.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -57,3 +56,43 @@ msgstr ""
 #: AdviceMessage.NoAutoMountForEncryptedVolumes.Text
 msgid "Automatic activation is not possible for encrypted volumes."
 msgstr ""
+
+#: Name
+msgid "Automatic opening"
+msgstr ""
+
+#: Link
+msgid "AutoOpen"
+msgstr ""
+
+#: Title.AutoMountVolume
+msgid "Open during startup"
+msgstr ""
+
+#: Button.AutoMountOn
+msgid "Enable automatic opening"
+msgstr ""
+
+#: Button.AutoMountOff
+msgid "Disable automatic opening"
+msgstr ""
+
+#: Text.AutoIsOn
+msgid "Currently automatic opening is enabled"
+msgstr ""
+
+#: Text.AutoIsOff
+msgid "Currently automatic opening is disabled"
+msgstr ""
+
+#: SuccessMessage.AutoMountEnabled.Text
+msgid "This volume will get opened during startup"
+msgstr ""
+
+#: SuccessMessage.AutoMountDisabled.Text
+msgid "This volume will not get opened during startup"
+msgstr ""
+
+#: AdviceMessage.NoAutoMountForEncryptedVolumes.Text
+msgid "Automatic opening is not possible for encrypted volumes."
+msgstr ""
diff --git a/plugins/volume_automount/intl/ru/cryptobox-server-feature-volume_automount.po b/plugins/volume_automount/intl/ru/cryptobox-server-feature-volume_automount.po
index f0173a3..e6e7b3e 100644
--- a/plugins/volume_automount/intl/ru/cryptobox-server-feature-volume_automount.po
+++ b/plugins/volume_automount/intl/ru/cryptobox-server-feature-volume_automount.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -57,3 +56,43 @@ msgstr ""
 #: AdviceMessage.NoAutoMountForEncryptedVolumes.Text
 msgid "Automatic activation is not possible for encrypted volumes."
 msgstr ""
+
+#: Name
+msgid "Automatic opening"
+msgstr ""
+
+#: Link
+msgid "AutoOpen"
+msgstr ""
+
+#: Title.AutoMountVolume
+msgid "Open during startup"
+msgstr ""
+
+#: Button.AutoMountOn
+msgid "Enable automatic opening"
+msgstr ""
+
+#: Button.AutoMountOff
+msgid "Disable automatic opening"
+msgstr ""
+
+#: Text.AutoIsOn
+msgid "Currently automatic opening is enabled"
+msgstr ""
+
+#: Text.AutoIsOff
+msgid "Currently automatic opening is disabled"
+msgstr ""
+
+#: SuccessMessage.AutoMountEnabled.Text
+msgid "This volume will get opened during startup"
+msgstr ""
+
+#: SuccessMessage.AutoMountDisabled.Text
+msgid "This volume will not get opened during startup"
+msgstr ""
+
+#: AdviceMessage.NoAutoMountForEncryptedVolumes.Text
+msgid "Automatic opening is not possible for encrypted volumes."
+msgstr ""
diff --git a/plugins/volume_automount/intl/sl/cryptobox-server-feature-volume_automount.po b/plugins/volume_automount/intl/sl/cryptobox-server-feature-volume_automount.po
index f0173a3..e6e7b3e 100644
--- a/plugins/volume_automount/intl/sl/cryptobox-server-feature-volume_automount.po
+++ b/plugins/volume_automount/intl/sl/cryptobox-server-feature-volume_automount.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -57,3 +56,43 @@ msgstr ""
 #: AdviceMessage.NoAutoMountForEncryptedVolumes.Text
 msgid "Automatic activation is not possible for encrypted volumes."
 msgstr ""
+
+#: Name
+msgid "Automatic opening"
+msgstr ""
+
+#: Link
+msgid "AutoOpen"
+msgstr ""
+
+#: Title.AutoMountVolume
+msgid "Open during startup"
+msgstr ""
+
+#: Button.AutoMountOn
+msgid "Enable automatic opening"
+msgstr ""
+
+#: Button.AutoMountOff
+msgid "Disable automatic opening"
+msgstr ""
+
+#: Text.AutoIsOn
+msgid "Currently automatic opening is enabled"
+msgstr ""
+
+#: Text.AutoIsOff
+msgid "Currently automatic opening is disabled"
+msgstr ""
+
+#: SuccessMessage.AutoMountEnabled.Text
+msgid "This volume will get opened during startup"
+msgstr ""
+
+#: SuccessMessage.AutoMountDisabled.Text
+msgid "This volume will not get opened during startup"
+msgstr ""
+
+#: AdviceMessage.NoAutoMountForEncryptedVolumes.Text
+msgid "Automatic opening is not possible for encrypted volumes."
+msgstr ""
diff --git a/plugins/volume_automount/intl/sv/cryptobox-server-feature-volume_automount.po b/plugins/volume_automount/intl/sv/cryptobox-server-feature-volume_automount.po
index f0173a3..e6e7b3e 100644
--- a/plugins/volume_automount/intl/sv/cryptobox-server-feature-volume_automount.po
+++ b/plugins/volume_automount/intl/sv/cryptobox-server-feature-volume_automount.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -57,3 +56,43 @@ msgstr ""
 #: AdviceMessage.NoAutoMountForEncryptedVolumes.Text
 msgid "Automatic activation is not possible for encrypted volumes."
 msgstr ""
+
+#: Name
+msgid "Automatic opening"
+msgstr ""
+
+#: Link
+msgid "AutoOpen"
+msgstr ""
+
+#: Title.AutoMountVolume
+msgid "Open during startup"
+msgstr ""
+
+#: Button.AutoMountOn
+msgid "Enable automatic opening"
+msgstr ""
+
+#: Button.AutoMountOff
+msgid "Disable automatic opening"
+msgstr ""
+
+#: Text.AutoIsOn
+msgid "Currently automatic opening is enabled"
+msgstr ""
+
+#: Text.AutoIsOff
+msgid "Currently automatic opening is disabled"
+msgstr ""
+
+#: SuccessMessage.AutoMountEnabled.Text
+msgid "This volume will get opened during startup"
+msgstr ""
+
+#: SuccessMessage.AutoMountDisabled.Text
+msgid "This volume will not get opened during startup"
+msgstr ""
+
+#: AdviceMessage.NoAutoMountForEncryptedVolumes.Text
+msgid "Automatic opening is not possible for encrypted volumes."
+msgstr ""
diff --git a/plugins/volume_automount/language.hdf b/plugins/volume_automount/language.hdf
index 7efa192..14efcb4 100644
--- a/plugins/volume_automount/language.hdf
+++ b/plugins/volume_automount/language.hdf
@@ -1,38 +1,38 @@
-Name	= Automatic activation
-Link	= Automatic activation
+Name	= Automatic opening
+Link	= AutoOpen
 
 Title {
-	AutoMountVolume	= Activate during startup
+	AutoMountVolume	= Open during startup
 }
 
 
 Button {
-	AutoMountOn	= Enable automatic activation
-	AutoMountOff	= Disable automatic activation
+	AutoMountOn	= Enable automatic opening
+	AutoMountOff	= Disable automatic opening
 }
 
 
 Text {
-	AutoIsOn	= Currently automatic activation is enabled
-	AutoIsOff	= Currently automatic activation is disabled
+	AutoIsOn	= Currently automatic opening is enabled
+	AutoIsOff	= Currently automatic opening is disabled
 }
 
 
 SuccessMessage {
 	AutoMountEnabled {
 		Title	= Automatic activation enabled
-		Text	= This volume will get activated during startup
+		Text	= This volume will get opened during startup
 	}
 
 	AutoMountDisabled {
 		Title	= Automatic activation disabled
-		Text	= This volume will not get activated during startup
+		Text	= This volume will not get opened during startup
 	}
 }
 
 AdviceMessage {
 	NoAutoMountForEncryptedVolumes {
-		Text	= Automatic activation is not possible for encrypted volumes.
+		Text	= Automatic opening is not possible for encrypted volumes.
 	}
 }
 
diff --git a/plugins/volume_automount/unittests.py b/plugins/volume_automount/unittests.py
index 6701cd1..0852414 100644
--- a/plugins/volume_automount/unittests.py
+++ b/plugins/volume_automount/unittests.py
@@ -29,7 +29,7 @@ class unittests(cryptobox.web.testclass.WebInterfaceTestClass):
 		url = self.url + "volume_automount?weblang=en&device=%2Fdev%2F" + self.device
 		self.register_auth(url)
 		self.cmd.go(url)
-		self.cmd.find('Activate during startup')
+		self.cmd.find('Opening during startup')
 
 
 	def test_toggle(self):
@@ -37,10 +37,10 @@ class unittests(cryptobox.web.testclass.WebInterfaceTestClass):
 		url = self.url + "volume_automount"
 		self.register_auth(url)
 		self.cmd.go(url + "?device=%%2Fdev%%2F%s&action=disable" % self.device)
-		self.cmd.find("Automatic activation disabled")
+		self.cmd.find("Automatic opening disabled")
 		self.cmd.find("is disabled")
 		self.cmd.go(url + "?device=%%2Fdev%%2F%s&action=enable" % self.device)
-		self.cmd.find("Automatic activation enabled")
+		self.cmd.find("Automatic opening enabled")
 		self.cmd.notfind("is disabled")
 		
 
@@ -49,6 +49,6 @@ class unittests(cryptobox.web.testclass.WebInterfaceTestClass):
 		url = self.url + "volume_automount"
 		self.register_auth(url)
 		self.cmd.go(url + "?device=%%2Fdev%%2F%s&action=foobar" % self.device)
-		self.cmd.notfind("Automatic activation disabled")
-		self.cmd.notfind("Automatic activation enabled")
+		self.cmd.notfind("Automatic opening disabled")
+		self.cmd.notfind("Automatic opening enabled")
 		
diff --git a/plugins/volume_chpasswd/intl/cryptobox-server-feature-volume_chpasswd.pot b/plugins/volume_chpasswd/intl/cryptobox-server-feature-volume_chpasswd.pot
index 2e4d89f..d6b50f4 100644
--- a/plugins/volume_chpasswd/intl/cryptobox-server-feature-volume_chpasswd.pot
+++ b/plugins/volume_chpasswd/intl/cryptobox-server-feature-volume_chpasswd.pot
@@ -56,6 +56,6 @@ msgstr ""
 msgid "The password of this volume could not be changed - sorry!"
 msgstr ""
 
-#: AdviceMessage.FormatForEncryptionSupport.Link.Rel
-msgid "volume_format_fs"
+#: AdviceMessage.FormatForEncryptionSupport.Text
+msgid "This volume is not encrypted. If you want to turn on encryption, then you have to format the volume. Beware: this will destroy all data of this volume."
 msgstr ""
diff --git a/plugins/volume_chpasswd/intl/cs/cryptobox-server-feature-volume_chpasswd.po b/plugins/volume_chpasswd/intl/cs/cryptobox-server-feature-volume_chpasswd.po
index 850ab4a..21f8909 100644
--- a/plugins/volume_chpasswd/intl/cs/cryptobox-server-feature-volume_chpasswd.po
+++ b/plugins/volume_chpasswd/intl/cs/cryptobox-server-feature-volume_chpasswd.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -58,6 +57,6 @@ msgstr ""
 msgid "The password of this volume could not be changed - sorry!"
 msgstr ""
 
-#: AdviceMessage.FormatForEncryptionSupport.Link.Rel
-msgid "volume_format_fs"
+#: AdviceMessage.FormatForEncryptionSupport.Text
+msgid "This volume is not encrypted. If you want to turn on encryption, then you have to format the volume. Beware: this will destroy all data of this volume."
 msgstr ""
diff --git a/plugins/volume_chpasswd/intl/da/cryptobox-server-feature-volume_chpasswd.po b/plugins/volume_chpasswd/intl/da/cryptobox-server-feature-volume_chpasswd.po
index 850ab4a..21f8909 100644
--- a/plugins/volume_chpasswd/intl/da/cryptobox-server-feature-volume_chpasswd.po
+++ b/plugins/volume_chpasswd/intl/da/cryptobox-server-feature-volume_chpasswd.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -58,6 +57,6 @@ msgstr ""
 msgid "The password of this volume could not be changed - sorry!"
 msgstr ""
 
-#: AdviceMessage.FormatForEncryptionSupport.Link.Rel
-msgid "volume_format_fs"
+#: AdviceMessage.FormatForEncryptionSupport.Text
+msgid "This volume is not encrypted. If you want to turn on encryption, then you have to format the volume. Beware: this will destroy all data of this volume."
 msgstr ""
diff --git a/plugins/volume_chpasswd/intl/de/cryptobox-server-feature-volume_chpasswd.po b/plugins/volume_chpasswd/intl/de/cryptobox-server-feature-volume_chpasswd.po
index 850ab4a..21f8909 100644
--- a/plugins/volume_chpasswd/intl/de/cryptobox-server-feature-volume_chpasswd.po
+++ b/plugins/volume_chpasswd/intl/de/cryptobox-server-feature-volume_chpasswd.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -58,6 +57,6 @@ msgstr ""
 msgid "The password of this volume could not be changed - sorry!"
 msgstr ""
 
-#: AdviceMessage.FormatForEncryptionSupport.Link.Rel
-msgid "volume_format_fs"
+#: AdviceMessage.FormatForEncryptionSupport.Text
+msgid "This volume is not encrypted. If you want to turn on encryption, then you have to format the volume. Beware: this will destroy all data of this volume."
 msgstr ""
diff --git a/plugins/volume_chpasswd/intl/en/cryptobox-server-feature-volume_chpasswd.po b/plugins/volume_chpasswd/intl/en/cryptobox-server-feature-volume_chpasswd.po
index 03a08d3..34357de 100644
--- a/plugins/volume_chpasswd/intl/en/cryptobox-server-feature-volume_chpasswd.po
+++ b/plugins/volume_chpasswd/intl/en/cryptobox-server-feature-volume_chpasswd.po
@@ -1,10 +1,9 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: CryptoBox-Server 0.3\n"
 "Report-Msgid-Bugs-To: translate@cryptobox.org\n"
-"POT-Creation-Date: 2006-11-28 05:03+0100\n"
+"POT-Creation-Date: 2006-11-28 05:04+0100\n"
 "PO-Revision-Date: 2006-11-29 19:31+0100\n"
 "Last-Translator: Lars Kruse <devel@sumpfralle.de>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -12,7 +11,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 0.10.1\n"
+"X-Generator: Translate Toolkit 0.10.1\n"
 
 #: Name
 msgid "Change volume password"
@@ -35,14 +34,8 @@ msgid "Format volume"
 msgstr "Format volume"
 
 #: AdviceMessage.FormatForEncryptionSupport.Text
-msgid ""
-"This volume is not encrypted. If you want to turn on encryption, then you "
-"have to format the volume. Beware: this will destroy all data of this "
-"container."
-msgstr ""
-"This volume is not encrypted. If you want to turn on encryption, then you "
-"have to format the volume. Beware: this will destroy all data of this "
-"container."
+msgid "This volume is not encrypted. If you want to turn on encryption, then you have to format the volume. Beware: this will destroy all data of this container."
+msgstr "This volume is not encrypted. If you want to turn on encryption, then you have to format the volume. Beware: this will destroy all data of this container."
 
 #: AdviceMessage.FormatForEncryptionSupport.Link.Text
 msgid "Format this volume"
@@ -64,6 +57,10 @@ msgstr "Could not change password"
 msgid "The password of this volume could not be changed - sorry!"
 msgstr "The password of this volume could not be changed - sorry!"
 
-#: AdviceMessage.FormatForEncryptionSupport.Link.Rel
-msgid "volume_format_fs"
-msgstr "volume_format_fs"
+#: AdviceMessage.FormatForEncryptionSupport.Text
+#, fuzzy
+msgid "This volume is not encrypted. If you want to turn on encryption, then you have to format the volume. Beware: this will destroy all data of this volume."
+msgstr "This volume is not encrypted. If you want to turn on encryption, then you have to format the volume. Beware: this will destroy all data of this container."
+
+#~ msgid "volume_format_fs"
+#~ msgstr "volume_format_fs"
diff --git a/plugins/volume_chpasswd/intl/es/cryptobox-server-feature-volume_chpasswd.po b/plugins/volume_chpasswd/intl/es/cryptobox-server-feature-volume_chpasswd.po
index 850ab4a..21f8909 100644
--- a/plugins/volume_chpasswd/intl/es/cryptobox-server-feature-volume_chpasswd.po
+++ b/plugins/volume_chpasswd/intl/es/cryptobox-server-feature-volume_chpasswd.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -58,6 +57,6 @@ msgstr ""
 msgid "The password of this volume could not be changed - sorry!"
 msgstr ""
 
-#: AdviceMessage.FormatForEncryptionSupport.Link.Rel
-msgid "volume_format_fs"
+#: AdviceMessage.FormatForEncryptionSupport.Text
+msgid "This volume is not encrypted. If you want to turn on encryption, then you have to format the volume. Beware: this will destroy all data of this volume."
 msgstr ""
diff --git a/plugins/volume_chpasswd/intl/fi/cryptobox-server-feature-volume_chpasswd.po b/plugins/volume_chpasswd/intl/fi/cryptobox-server-feature-volume_chpasswd.po
index 850ab4a..21f8909 100644
--- a/plugins/volume_chpasswd/intl/fi/cryptobox-server-feature-volume_chpasswd.po
+++ b/plugins/volume_chpasswd/intl/fi/cryptobox-server-feature-volume_chpasswd.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -58,6 +57,6 @@ msgstr ""
 msgid "The password of this volume could not be changed - sorry!"
 msgstr ""
 
-#: AdviceMessage.FormatForEncryptionSupport.Link.Rel
-msgid "volume_format_fs"
+#: AdviceMessage.FormatForEncryptionSupport.Text
+msgid "This volume is not encrypted. If you want to turn on encryption, then you have to format the volume. Beware: this will destroy all data of this volume."
 msgstr ""
diff --git a/plugins/volume_chpasswd/intl/fr/cryptobox-server-feature-volume_chpasswd.po b/plugins/volume_chpasswd/intl/fr/cryptobox-server-feature-volume_chpasswd.po
index 850ab4a..21f8909 100644
--- a/plugins/volume_chpasswd/intl/fr/cryptobox-server-feature-volume_chpasswd.po
+++ b/plugins/volume_chpasswd/intl/fr/cryptobox-server-feature-volume_chpasswd.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -58,6 +57,6 @@ msgstr ""
 msgid "The password of this volume could not be changed - sorry!"
 msgstr ""
 
-#: AdviceMessage.FormatForEncryptionSupport.Link.Rel
-msgid "volume_format_fs"
+#: AdviceMessage.FormatForEncryptionSupport.Text
+msgid "This volume is not encrypted. If you want to turn on encryption, then you have to format the volume. Beware: this will destroy all data of this volume."
 msgstr ""
diff --git a/plugins/volume_chpasswd/intl/hu/cryptobox-server-feature-volume_chpasswd.po b/plugins/volume_chpasswd/intl/hu/cryptobox-server-feature-volume_chpasswd.po
index 850ab4a..21f8909 100644
--- a/plugins/volume_chpasswd/intl/hu/cryptobox-server-feature-volume_chpasswd.po
+++ b/plugins/volume_chpasswd/intl/hu/cryptobox-server-feature-volume_chpasswd.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -58,6 +57,6 @@ msgstr ""
 msgid "The password of this volume could not be changed - sorry!"
 msgstr ""
 
-#: AdviceMessage.FormatForEncryptionSupport.Link.Rel
-msgid "volume_format_fs"
+#: AdviceMessage.FormatForEncryptionSupport.Text
+msgid "This volume is not encrypted. If you want to turn on encryption, then you have to format the volume. Beware: this will destroy all data of this volume."
 msgstr ""
diff --git a/plugins/volume_chpasswd/intl/it/cryptobox-server-feature-volume_chpasswd.po b/plugins/volume_chpasswd/intl/it/cryptobox-server-feature-volume_chpasswd.po
index 850ab4a..21f8909 100644
--- a/plugins/volume_chpasswd/intl/it/cryptobox-server-feature-volume_chpasswd.po
+++ b/plugins/volume_chpasswd/intl/it/cryptobox-server-feature-volume_chpasswd.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -58,6 +57,6 @@ msgstr ""
 msgid "The password of this volume could not be changed - sorry!"
 msgstr ""
 
-#: AdviceMessage.FormatForEncryptionSupport.Link.Rel
-msgid "volume_format_fs"
+#: AdviceMessage.FormatForEncryptionSupport.Text
+msgid "This volume is not encrypted. If you want to turn on encryption, then you have to format the volume. Beware: this will destroy all data of this volume."
 msgstr ""
diff --git a/plugins/volume_chpasswd/intl/ja/cryptobox-server-feature-volume_chpasswd.po b/plugins/volume_chpasswd/intl/ja/cryptobox-server-feature-volume_chpasswd.po
index 850ab4a..21f8909 100644
--- a/plugins/volume_chpasswd/intl/ja/cryptobox-server-feature-volume_chpasswd.po
+++ b/plugins/volume_chpasswd/intl/ja/cryptobox-server-feature-volume_chpasswd.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -58,6 +57,6 @@ msgstr ""
 msgid "The password of this volume could not be changed - sorry!"
 msgstr ""
 
-#: AdviceMessage.FormatForEncryptionSupport.Link.Rel
-msgid "volume_format_fs"
+#: AdviceMessage.FormatForEncryptionSupport.Text
+msgid "This volume is not encrypted. If you want to turn on encryption, then you have to format the volume. Beware: this will destroy all data of this volume."
 msgstr ""
diff --git a/plugins/volume_chpasswd/intl/nl/cryptobox-server-feature-volume_chpasswd.po b/plugins/volume_chpasswd/intl/nl/cryptobox-server-feature-volume_chpasswd.po
index 850ab4a..21f8909 100644
--- a/plugins/volume_chpasswd/intl/nl/cryptobox-server-feature-volume_chpasswd.po
+++ b/plugins/volume_chpasswd/intl/nl/cryptobox-server-feature-volume_chpasswd.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -58,6 +57,6 @@ msgstr ""
 msgid "The password of this volume could not be changed - sorry!"
 msgstr ""
 
-#: AdviceMessage.FormatForEncryptionSupport.Link.Rel
-msgid "volume_format_fs"
+#: AdviceMessage.FormatForEncryptionSupport.Text
+msgid "This volume is not encrypted. If you want to turn on encryption, then you have to format the volume. Beware: this will destroy all data of this volume."
 msgstr ""
diff --git a/plugins/volume_chpasswd/intl/pl/cryptobox-server-feature-volume_chpasswd.po b/plugins/volume_chpasswd/intl/pl/cryptobox-server-feature-volume_chpasswd.po
index 850ab4a..21f8909 100644
--- a/plugins/volume_chpasswd/intl/pl/cryptobox-server-feature-volume_chpasswd.po
+++ b/plugins/volume_chpasswd/intl/pl/cryptobox-server-feature-volume_chpasswd.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -58,6 +57,6 @@ msgstr ""
 msgid "The password of this volume could not be changed - sorry!"
 msgstr ""
 
-#: AdviceMessage.FormatForEncryptionSupport.Link.Rel
-msgid "volume_format_fs"
+#: AdviceMessage.FormatForEncryptionSupport.Text
+msgid "This volume is not encrypted. If you want to turn on encryption, then you have to format the volume. Beware: this will destroy all data of this volume."
 msgstr ""
diff --git a/plugins/volume_chpasswd/intl/pt/cryptobox-server-feature-volume_chpasswd.po b/plugins/volume_chpasswd/intl/pt/cryptobox-server-feature-volume_chpasswd.po
index 850ab4a..21f8909 100644
--- a/plugins/volume_chpasswd/intl/pt/cryptobox-server-feature-volume_chpasswd.po
+++ b/plugins/volume_chpasswd/intl/pt/cryptobox-server-feature-volume_chpasswd.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -58,6 +57,6 @@ msgstr ""
 msgid "The password of this volume could not be changed - sorry!"
 msgstr ""
 
-#: AdviceMessage.FormatForEncryptionSupport.Link.Rel
-msgid "volume_format_fs"
+#: AdviceMessage.FormatForEncryptionSupport.Text
+msgid "This volume is not encrypted. If you want to turn on encryption, then you have to format the volume. Beware: this will destroy all data of this volume."
 msgstr ""
diff --git a/plugins/volume_chpasswd/intl/ru/cryptobox-server-feature-volume_chpasswd.po b/plugins/volume_chpasswd/intl/ru/cryptobox-server-feature-volume_chpasswd.po
index 850ab4a..21f8909 100644
--- a/plugins/volume_chpasswd/intl/ru/cryptobox-server-feature-volume_chpasswd.po
+++ b/plugins/volume_chpasswd/intl/ru/cryptobox-server-feature-volume_chpasswd.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -58,6 +57,6 @@ msgstr ""
 msgid "The password of this volume could not be changed - sorry!"
 msgstr ""
 
-#: AdviceMessage.FormatForEncryptionSupport.Link.Rel
-msgid "volume_format_fs"
+#: AdviceMessage.FormatForEncryptionSupport.Text
+msgid "This volume is not encrypted. If you want to turn on encryption, then you have to format the volume. Beware: this will destroy all data of this volume."
 msgstr ""
diff --git a/plugins/volume_chpasswd/intl/sl/cryptobox-server-feature-volume_chpasswd.po b/plugins/volume_chpasswd/intl/sl/cryptobox-server-feature-volume_chpasswd.po
index 850ab4a..21f8909 100644
--- a/plugins/volume_chpasswd/intl/sl/cryptobox-server-feature-volume_chpasswd.po
+++ b/plugins/volume_chpasswd/intl/sl/cryptobox-server-feature-volume_chpasswd.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -58,6 +57,6 @@ msgstr ""
 msgid "The password of this volume could not be changed - sorry!"
 msgstr ""
 
-#: AdviceMessage.FormatForEncryptionSupport.Link.Rel
-msgid "volume_format_fs"
+#: AdviceMessage.FormatForEncryptionSupport.Text
+msgid "This volume is not encrypted. If you want to turn on encryption, then you have to format the volume. Beware: this will destroy all data of this volume."
 msgstr ""
diff --git a/plugins/volume_chpasswd/intl/sv/cryptobox-server-feature-volume_chpasswd.po b/plugins/volume_chpasswd/intl/sv/cryptobox-server-feature-volume_chpasswd.po
index 850ab4a..21f8909 100644
--- a/plugins/volume_chpasswd/intl/sv/cryptobox-server-feature-volume_chpasswd.po
+++ b/plugins/volume_chpasswd/intl/sv/cryptobox-server-feature-volume_chpasswd.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -58,6 +57,6 @@ msgstr ""
 msgid "The password of this volume could not be changed - sorry!"
 msgstr ""
 
-#: AdviceMessage.FormatForEncryptionSupport.Link.Rel
-msgid "volume_format_fs"
+#: AdviceMessage.FormatForEncryptionSupport.Text
+msgid "This volume is not encrypted. If you want to turn on encryption, then you have to format the volume. Beware: this will destroy all data of this volume."
 msgstr ""
diff --git a/plugins/volume_chpasswd/language.hdf b/plugins/volume_chpasswd/language.hdf
index 884782e..a73fa01 100644
--- a/plugins/volume_chpasswd/language.hdf
+++ b/plugins/volume_chpasswd/language.hdf
@@ -14,7 +14,7 @@ Button {
 
 AdviceMessage {
 	FormatForEncryptionSupport {
-		Text	= This volume is not encrypted. If you want to turn on encryption, then you have to format the volume. Beware: this will destroy all data of this container.
+		Text	= This volume is not encrypted. If you want to turn on encryption, then you have to format the volume. Beware: this will destroy all data of this volume.
 		Link.Text	= Format this volume
 		Link.Rel 	= volume_format_fs
 }
diff --git a/plugins/volume_details/intl/cryptobox-server-feature-volume_details.pot b/plugins/volume_details/intl/cryptobox-server-feature-volume_details.pot
index fb5d541..552f7ca 100644
--- a/plugins/volume_details/intl/cryptobox-server-feature-volume_details.pot
+++ b/plugins/volume_details/intl/cryptobox-server-feature-volume_details.pot
@@ -63,3 +63,11 @@ msgstr ""
 #: Text.Size.Used
 msgid "Used space of volume"
 msgstr ""
+
+#: Text.StatusActive
+msgid "open"
+msgstr ""
+
+#: Text.StatusPassive
+msgid "closed"
+msgstr ""
diff --git a/plugins/volume_details/intl/cs/cryptobox-server-feature-volume_details.po b/plugins/volume_details/intl/cs/cryptobox-server-feature-volume_details.po
index 6affb8f..2416052 100644
--- a/plugins/volume_details/intl/cs/cryptobox-server-feature-volume_details.po
+++ b/plugins/volume_details/intl/cs/cryptobox-server-feature-volume_details.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -65,3 +64,11 @@ msgstr ""
 #: Text.Size.Used
 msgid "Used space of volume"
 msgstr ""
+
+#: Text.StatusActive
+msgid "open"
+msgstr ""
+
+#: Text.StatusPassive
+msgid "closed"
+msgstr ""
diff --git a/plugins/volume_details/intl/da/cryptobox-server-feature-volume_details.po b/plugins/volume_details/intl/da/cryptobox-server-feature-volume_details.po
index 6affb8f..2416052 100644
--- a/plugins/volume_details/intl/da/cryptobox-server-feature-volume_details.po
+++ b/plugins/volume_details/intl/da/cryptobox-server-feature-volume_details.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -65,3 +64,11 @@ msgstr ""
 #: Text.Size.Used
 msgid "Used space of volume"
 msgstr ""
+
+#: Text.StatusActive
+msgid "open"
+msgstr ""
+
+#: Text.StatusPassive
+msgid "closed"
+msgstr ""
diff --git a/plugins/volume_details/intl/de/cryptobox-server-feature-volume_details.po b/plugins/volume_details/intl/de/cryptobox-server-feature-volume_details.po
index 6affb8f..2416052 100644
--- a/plugins/volume_details/intl/de/cryptobox-server-feature-volume_details.po
+++ b/plugins/volume_details/intl/de/cryptobox-server-feature-volume_details.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -65,3 +64,11 @@ msgstr ""
 #: Text.Size.Used
 msgid "Used space of volume"
 msgstr ""
+
+#: Text.StatusActive
+msgid "open"
+msgstr ""
+
+#: Text.StatusPassive
+msgid "closed"
+msgstr ""
diff --git a/plugins/volume_details/intl/en/cryptobox-server-feature-volume_details.po b/plugins/volume_details/intl/en/cryptobox-server-feature-volume_details.po
index 53326fb..9e9f68f 100644
--- a/plugins/volume_details/intl/en/cryptobox-server-feature-volume_details.po
+++ b/plugins/volume_details/intl/en/cryptobox-server-feature-volume_details.po
@@ -1,10 +1,9 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: CryptoBox-Server 0.3\n"
 "Report-Msgid-Bugs-To: translate@cryptobox.org\n"
-"POT-Creation-Date: 2006-11-28 05:03+0100\n"
+"POT-Creation-Date: 2006-11-28 05:04+0100\n"
 "PO-Revision-Date: 2006-11-29 19:31+0100\n"
 "Last-Translator: Lars Kruse <devel@sumpfralle.de>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -12,7 +11,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 0.10.1\n"
+"X-Generator: Translate Toolkit 0.10.1\n"
 
 #: Name
 msgid "Technical details of a volume"
@@ -65,3 +64,11 @@ msgstr "Available space of volume"
 #: Text.Size.Used
 msgid "Used space of volume"
 msgstr "Used space of volume"
+
+#: Text.StatusActive
+msgid "open"
+msgstr ""
+
+#: Text.StatusPassive
+msgid "closed"
+msgstr ""
diff --git a/plugins/volume_details/intl/es/cryptobox-server-feature-volume_details.po b/plugins/volume_details/intl/es/cryptobox-server-feature-volume_details.po
index 6affb8f..2416052 100644
--- a/plugins/volume_details/intl/es/cryptobox-server-feature-volume_details.po
+++ b/plugins/volume_details/intl/es/cryptobox-server-feature-volume_details.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -65,3 +64,11 @@ msgstr ""
 #: Text.Size.Used
 msgid "Used space of volume"
 msgstr ""
+
+#: Text.StatusActive
+msgid "open"
+msgstr ""
+
+#: Text.StatusPassive
+msgid "closed"
+msgstr ""
diff --git a/plugins/volume_details/intl/fi/cryptobox-server-feature-volume_details.po b/plugins/volume_details/intl/fi/cryptobox-server-feature-volume_details.po
index 6affb8f..2416052 100644
--- a/plugins/volume_details/intl/fi/cryptobox-server-feature-volume_details.po
+++ b/plugins/volume_details/intl/fi/cryptobox-server-feature-volume_details.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -65,3 +64,11 @@ msgstr ""
 #: Text.Size.Used
 msgid "Used space of volume"
 msgstr ""
+
+#: Text.StatusActive
+msgid "open"
+msgstr ""
+
+#: Text.StatusPassive
+msgid "closed"
+msgstr ""
diff --git a/plugins/volume_details/intl/fr/cryptobox-server-feature-volume_details.po b/plugins/volume_details/intl/fr/cryptobox-server-feature-volume_details.po
index 6affb8f..2416052 100644
--- a/plugins/volume_details/intl/fr/cryptobox-server-feature-volume_details.po
+++ b/plugins/volume_details/intl/fr/cryptobox-server-feature-volume_details.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -65,3 +64,11 @@ msgstr ""
 #: Text.Size.Used
 msgid "Used space of volume"
 msgstr ""
+
+#: Text.StatusActive
+msgid "open"
+msgstr ""
+
+#: Text.StatusPassive
+msgid "closed"
+msgstr ""
diff --git a/plugins/volume_details/intl/hu/cryptobox-server-feature-volume_details.po b/plugins/volume_details/intl/hu/cryptobox-server-feature-volume_details.po
index 6affb8f..2416052 100644
--- a/plugins/volume_details/intl/hu/cryptobox-server-feature-volume_details.po
+++ b/plugins/volume_details/intl/hu/cryptobox-server-feature-volume_details.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -65,3 +64,11 @@ msgstr ""
 #: Text.Size.Used
 msgid "Used space of volume"
 msgstr ""
+
+#: Text.StatusActive
+msgid "open"
+msgstr ""
+
+#: Text.StatusPassive
+msgid "closed"
+msgstr ""
diff --git a/plugins/volume_details/intl/it/cryptobox-server-feature-volume_details.po b/plugins/volume_details/intl/it/cryptobox-server-feature-volume_details.po
index 6affb8f..2416052 100644
--- a/plugins/volume_details/intl/it/cryptobox-server-feature-volume_details.po
+++ b/plugins/volume_details/intl/it/cryptobox-server-feature-volume_details.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -65,3 +64,11 @@ msgstr ""
 #: Text.Size.Used
 msgid "Used space of volume"
 msgstr ""
+
+#: Text.StatusActive
+msgid "open"
+msgstr ""
+
+#: Text.StatusPassive
+msgid "closed"
+msgstr ""
diff --git a/plugins/volume_details/intl/ja/cryptobox-server-feature-volume_details.po b/plugins/volume_details/intl/ja/cryptobox-server-feature-volume_details.po
index 6affb8f..2416052 100644
--- a/plugins/volume_details/intl/ja/cryptobox-server-feature-volume_details.po
+++ b/plugins/volume_details/intl/ja/cryptobox-server-feature-volume_details.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -65,3 +64,11 @@ msgstr ""
 #: Text.Size.Used
 msgid "Used space of volume"
 msgstr ""
+
+#: Text.StatusActive
+msgid "open"
+msgstr ""
+
+#: Text.StatusPassive
+msgid "closed"
+msgstr ""
diff --git a/plugins/volume_details/intl/nl/cryptobox-server-feature-volume_details.po b/plugins/volume_details/intl/nl/cryptobox-server-feature-volume_details.po
index 6affb8f..2416052 100644
--- a/plugins/volume_details/intl/nl/cryptobox-server-feature-volume_details.po
+++ b/plugins/volume_details/intl/nl/cryptobox-server-feature-volume_details.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -65,3 +64,11 @@ msgstr ""
 #: Text.Size.Used
 msgid "Used space of volume"
 msgstr ""
+
+#: Text.StatusActive
+msgid "open"
+msgstr ""
+
+#: Text.StatusPassive
+msgid "closed"
+msgstr ""
diff --git a/plugins/volume_details/intl/pl/cryptobox-server-feature-volume_details.po b/plugins/volume_details/intl/pl/cryptobox-server-feature-volume_details.po
index 6affb8f..2416052 100644
--- a/plugins/volume_details/intl/pl/cryptobox-server-feature-volume_details.po
+++ b/plugins/volume_details/intl/pl/cryptobox-server-feature-volume_details.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -65,3 +64,11 @@ msgstr ""
 #: Text.Size.Used
 msgid "Used space of volume"
 msgstr ""
+
+#: Text.StatusActive
+msgid "open"
+msgstr ""
+
+#: Text.StatusPassive
+msgid "closed"
+msgstr ""
diff --git a/plugins/volume_details/intl/pt/cryptobox-server-feature-volume_details.po b/plugins/volume_details/intl/pt/cryptobox-server-feature-volume_details.po
index 6affb8f..2416052 100644
--- a/plugins/volume_details/intl/pt/cryptobox-server-feature-volume_details.po
+++ b/plugins/volume_details/intl/pt/cryptobox-server-feature-volume_details.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -65,3 +64,11 @@ msgstr ""
 #: Text.Size.Used
 msgid "Used space of volume"
 msgstr ""
+
+#: Text.StatusActive
+msgid "open"
+msgstr ""
+
+#: Text.StatusPassive
+msgid "closed"
+msgstr ""
diff --git a/plugins/volume_details/intl/ru/cryptobox-server-feature-volume_details.po b/plugins/volume_details/intl/ru/cryptobox-server-feature-volume_details.po
index 6affb8f..2416052 100644
--- a/plugins/volume_details/intl/ru/cryptobox-server-feature-volume_details.po
+++ b/plugins/volume_details/intl/ru/cryptobox-server-feature-volume_details.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -65,3 +64,11 @@ msgstr ""
 #: Text.Size.Used
 msgid "Used space of volume"
 msgstr ""
+
+#: Text.StatusActive
+msgid "open"
+msgstr ""
+
+#: Text.StatusPassive
+msgid "closed"
+msgstr ""
diff --git a/plugins/volume_details/intl/sl/cryptobox-server-feature-volume_details.po b/plugins/volume_details/intl/sl/cryptobox-server-feature-volume_details.po
index 6affb8f..2416052 100644
--- a/plugins/volume_details/intl/sl/cryptobox-server-feature-volume_details.po
+++ b/plugins/volume_details/intl/sl/cryptobox-server-feature-volume_details.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -65,3 +64,11 @@ msgstr ""
 #: Text.Size.Used
 msgid "Used space of volume"
 msgstr ""
+
+#: Text.StatusActive
+msgid "open"
+msgstr ""
+
+#: Text.StatusPassive
+msgid "closed"
+msgstr ""
diff --git a/plugins/volume_details/intl/sv/cryptobox-server-feature-volume_details.po b/plugins/volume_details/intl/sv/cryptobox-server-feature-volume_details.po
index 6affb8f..2416052 100644
--- a/plugins/volume_details/intl/sv/cryptobox-server-feature-volume_details.po
+++ b/plugins/volume_details/intl/sv/cryptobox-server-feature-volume_details.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -65,3 +64,11 @@ msgstr ""
 #: Text.Size.Used
 msgid "Used space of volume"
 msgstr ""
+
+#: Text.StatusActive
+msgid "open"
+msgstr ""
+
+#: Text.StatusPassive
+msgid "closed"
+msgstr ""
diff --git a/plugins/volume_details/language.hdf b/plugins/volume_details/language.hdf
index 36a95ca..7d08b4b 100644
--- a/plugins/volume_details/language.hdf
+++ b/plugins/volume_details/language.hdf
@@ -6,8 +6,8 @@ Title.Details	= Technical details
 Text {
 	DeviceName	= Name of device
 	Status	= Status
-	StatusActive	= active
-	StatusPassive	= passive
+	StatusActive	= open
+	StatusPassive	= closed
 	EncryptionStatus	= Encryption
 	Yes	= Yes
 	No	= No
diff --git a/plugins/volume_format_fs/intl/cryptobox-server-feature-volume_format_fs.pot b/plugins/volume_format_fs/intl/cryptobox-server-feature-volume_format_fs.pot
index 2187ea5..f9155c6 100644
--- a/plugins/volume_format_fs/intl/cryptobox-server-feature-volume_format_fs.pot
+++ b/plugins/volume_format_fs/intl/cryptobox-server-feature-volume_format_fs.pot
@@ -60,22 +60,6 @@ msgstr ""
 msgid "Deactive volume now"
 msgstr ""
 
-#: AdviceMessage.UnmountBeforeInit.Link.Attr1.name
-msgid "action"
-msgstr ""
-
-#: AdviceMessage.UnmountBeforeInit.Link.Attr1.value
-msgid "umount"
-msgstr ""
-
-#: AdviceMessage.UnmountBeforeInit.Link.Attr2.name
-msgid "redirect"
-msgstr ""
-
-#: AdviceMessage.UnmountBeforeInit.Link.Attr2.value
-msgid "volume_format_fs"
-msgstr ""
-
 #: SuccessMessage.FormatSuccess.Title
 msgid "Formatting successful"
 msgstr ""
@@ -100,6 +84,14 @@ msgstr ""
 msgid "Formatting of the selected filesystem failed for unknown reasons - sorry!"
 msgstr ""
 
-#: AdviceMessage.UnmountBeforeInit.Link.Rel
-msgid "volume_mount"
+#: SuccessMessage.FormatSuccess.Title
+msgid "Formatting is running"
+msgstr ""
+
+#: SuccessMessage.FormatSuccess.Text
+msgid "The selected filesystem is being formatted in the background. This may take some time (depending on the size of your disk)."
+msgstr ""
+
+#: WarningMessage.FormatFailed.Link.Text
+msgid "View log messages"
 msgstr ""
diff --git a/plugins/volume_format_fs/intl/cs/cryptobox-server-feature-volume_format_fs.po b/plugins/volume_format_fs/intl/cs/cryptobox-server-feature-volume_format_fs.po
index df38971..41ce84f 100644
--- a/plugins/volume_format_fs/intl/cs/cryptobox-server-feature-volume_format_fs.po
+++ b/plugins/volume_format_fs/intl/cs/cryptobox-server-feature-volume_format_fs.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -62,22 +61,6 @@ msgstr ""
 msgid "Deactive volume now"
 msgstr ""
 
-#: AdviceMessage.UnmountBeforeInit.Link.Attr1.name
-msgid "action"
-msgstr ""
-
-#: AdviceMessage.UnmountBeforeInit.Link.Attr1.value
-msgid "umount"
-msgstr ""
-
-#: AdviceMessage.UnmountBeforeInit.Link.Attr2.name
-msgid "redirect"
-msgstr ""
-
-#: AdviceMessage.UnmountBeforeInit.Link.Attr2.value
-msgid "volume_format_fs"
-msgstr ""
-
 #: SuccessMessage.FormatSuccess.Title
 msgid "Formatting successful"
 msgstr ""
@@ -102,6 +85,14 @@ msgstr ""
 msgid "Formatting of the selected filesystem failed for unknown reasons - sorry!"
 msgstr ""
 
-#: AdviceMessage.UnmountBeforeInit.Link.Rel
-msgid "volume_mount"
+#: SuccessMessage.FormatSuccess.Title
+msgid "Formatting is running"
+msgstr ""
+
+#: SuccessMessage.FormatSuccess.Text
+msgid "The selected filesystem is being formatted in the background. This may take some time (depending on the size of your disk)."
+msgstr ""
+
+#: WarningMessage.FormatFailed.Link.Text
+msgid "View log messages"
 msgstr ""
diff --git a/plugins/volume_format_fs/intl/da/cryptobox-server-feature-volume_format_fs.po b/plugins/volume_format_fs/intl/da/cryptobox-server-feature-volume_format_fs.po
index df38971..41ce84f 100644
--- a/plugins/volume_format_fs/intl/da/cryptobox-server-feature-volume_format_fs.po
+++ b/plugins/volume_format_fs/intl/da/cryptobox-server-feature-volume_format_fs.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -62,22 +61,6 @@ msgstr ""
 msgid "Deactive volume now"
 msgstr ""
 
-#: AdviceMessage.UnmountBeforeInit.Link.Attr1.name
-msgid "action"
-msgstr ""
-
-#: AdviceMessage.UnmountBeforeInit.Link.Attr1.value
-msgid "umount"
-msgstr ""
-
-#: AdviceMessage.UnmountBeforeInit.Link.Attr2.name
-msgid "redirect"
-msgstr ""
-
-#: AdviceMessage.UnmountBeforeInit.Link.Attr2.value
-msgid "volume_format_fs"
-msgstr ""
-
 #: SuccessMessage.FormatSuccess.Title
 msgid "Formatting successful"
 msgstr ""
@@ -102,6 +85,14 @@ msgstr ""
 msgid "Formatting of the selected filesystem failed for unknown reasons - sorry!"
 msgstr ""
 
-#: AdviceMessage.UnmountBeforeInit.Link.Rel
-msgid "volume_mount"
+#: SuccessMessage.FormatSuccess.Title
+msgid "Formatting is running"
+msgstr ""
+
+#: SuccessMessage.FormatSuccess.Text
+msgid "The selected filesystem is being formatted in the background. This may take some time (depending on the size of your disk)."
+msgstr ""
+
+#: WarningMessage.FormatFailed.Link.Text
+msgid "View log messages"
 msgstr ""
diff --git a/plugins/volume_format_fs/intl/de/cryptobox-server-feature-volume_format_fs.po b/plugins/volume_format_fs/intl/de/cryptobox-server-feature-volume_format_fs.po
index df38971..41ce84f 100644
--- a/plugins/volume_format_fs/intl/de/cryptobox-server-feature-volume_format_fs.po
+++ b/plugins/volume_format_fs/intl/de/cryptobox-server-feature-volume_format_fs.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -62,22 +61,6 @@ msgstr ""
 msgid "Deactive volume now"
 msgstr ""
 
-#: AdviceMessage.UnmountBeforeInit.Link.Attr1.name
-msgid "action"
-msgstr ""
-
-#: AdviceMessage.UnmountBeforeInit.Link.Attr1.value
-msgid "umount"
-msgstr ""
-
-#: AdviceMessage.UnmountBeforeInit.Link.Attr2.name
-msgid "redirect"
-msgstr ""
-
-#: AdviceMessage.UnmountBeforeInit.Link.Attr2.value
-msgid "volume_format_fs"
-msgstr ""
-
 #: SuccessMessage.FormatSuccess.Title
 msgid "Formatting successful"
 msgstr ""
@@ -102,6 +85,14 @@ msgstr ""
 msgid "Formatting of the selected filesystem failed for unknown reasons - sorry!"
 msgstr ""
 
-#: AdviceMessage.UnmountBeforeInit.Link.Rel
-msgid "volume_mount"
+#: SuccessMessage.FormatSuccess.Title
+msgid "Formatting is running"
+msgstr ""
+
+#: SuccessMessage.FormatSuccess.Text
+msgid "The selected filesystem is being formatted in the background. This may take some time (depending on the size of your disk)."
+msgstr ""
+
+#: WarningMessage.FormatFailed.Link.Text
+msgid "View log messages"
 msgstr ""
diff --git a/plugins/volume_format_fs/intl/en/cryptobox-server-feature-volume_format_fs.po b/plugins/volume_format_fs/intl/en/cryptobox-server-feature-volume_format_fs.po
index 8fac256..99caa54 100644
--- a/plugins/volume_format_fs/intl/en/cryptobox-server-feature-volume_format_fs.po
+++ b/plugins/volume_format_fs/intl/en/cryptobox-server-feature-volume_format_fs.po
@@ -1,10 +1,9 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: CryptoBox-Server 0.3\n"
 "Report-Msgid-Bugs-To: translate@cryptobox.org\n"
-"POT-Creation-Date: 2006-11-28 05:03+0100\n"
+"POT-Creation-Date: 2006-11-28 05:04+0100\n"
 "PO-Revision-Date: 2006-11-29 19:31+0100\n"
 "Last-Translator: Lars Kruse <devel@sumpfralle.de>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -12,7 +11,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 0.10.1\n"
+"X-Generator: Translate Toolkit 0.10.1\n"
 
 #: Name
 msgid "Create filesystems"
@@ -62,22 +61,6 @@ msgstr "You must deactivate this volume before you may initialize it."
 msgid "Deactive volume now"
 msgstr "Deactive volume now"
 
-#: AdviceMessage.UnmountBeforeInit.Link.Attr1.name
-msgid "action"
-msgstr "action"
-
-#: AdviceMessage.UnmountBeforeInit.Link.Attr1.value
-msgid "umount"
-msgstr "umount"
-
-#: AdviceMessage.UnmountBeforeInit.Link.Attr2.name
-msgid "redirect"
-msgstr "redirect"
-
-#: AdviceMessage.UnmountBeforeInit.Link.Attr2.value
-msgid "volume_format_fs"
-msgstr "volume_format_fs"
-
 #: SuccessMessage.FormatSuccess.Title
 msgid "Formatting successful"
 msgstr "Formatting successful"
@@ -99,11 +82,32 @@ msgid "Formatting failed"
 msgstr "Formatting failed"
 
 #: WarningMessage.FormatFailed.Text
-msgid ""
-"Formatting of the selected filesystem failed for unknown reasons - sorry!"
-msgstr ""
-"Formatting of the selected filesystem failed for unknown reasons - sorry!"
+msgid "Formatting of the selected filesystem failed for unknown reasons - sorry!"
+msgstr "Formatting of the selected filesystem failed for unknown reasons - sorry!"
 
-#: AdviceMessage.UnmountBeforeInit.Link.Rel
-msgid "volume_mount"
-msgstr "volume_mount"
+#: SuccessMessage.FormatSuccess.Title
+msgid "Formatting is running"
+msgstr ""
+
+#: SuccessMessage.FormatSuccess.Text
+msgid "The selected filesystem is being formatted in the background. This may take some time (depending on the size of your disk)."
+msgstr ""
+
+#: WarningMessage.FormatFailed.Link.Text
+msgid "View log messages"
+msgstr ""
+
+#~ msgid "action"
+#~ msgstr "action"
+
+#~ msgid "umount"
+#~ msgstr "umount"
+
+#~ msgid "redirect"
+#~ msgstr "redirect"
+
+#~ msgid "volume_format_fs"
+#~ msgstr "volume_format_fs"
+
+#~ msgid "volume_mount"
+#~ msgstr "volume_mount"
diff --git a/plugins/volume_format_fs/intl/es/cryptobox-server-feature-volume_format_fs.po b/plugins/volume_format_fs/intl/es/cryptobox-server-feature-volume_format_fs.po
index df38971..41ce84f 100644
--- a/plugins/volume_format_fs/intl/es/cryptobox-server-feature-volume_format_fs.po
+++ b/plugins/volume_format_fs/intl/es/cryptobox-server-feature-volume_format_fs.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -62,22 +61,6 @@ msgstr ""
 msgid "Deactive volume now"
 msgstr ""
 
-#: AdviceMessage.UnmountBeforeInit.Link.Attr1.name
-msgid "action"
-msgstr ""
-
-#: AdviceMessage.UnmountBeforeInit.Link.Attr1.value
-msgid "umount"
-msgstr ""
-
-#: AdviceMessage.UnmountBeforeInit.Link.Attr2.name
-msgid "redirect"
-msgstr ""
-
-#: AdviceMessage.UnmountBeforeInit.Link.Attr2.value
-msgid "volume_format_fs"
-msgstr ""
-
 #: SuccessMessage.FormatSuccess.Title
 msgid "Formatting successful"
 msgstr ""
@@ -102,6 +85,14 @@ msgstr ""
 msgid "Formatting of the selected filesystem failed for unknown reasons - sorry!"
 msgstr ""
 
-#: AdviceMessage.UnmountBeforeInit.Link.Rel
-msgid "volume_mount"
+#: SuccessMessage.FormatSuccess.Title
+msgid "Formatting is running"
+msgstr ""
+
+#: SuccessMessage.FormatSuccess.Text
+msgid "The selected filesystem is being formatted in the background. This may take some time (depending on the size of your disk)."
+msgstr ""
+
+#: WarningMessage.FormatFailed.Link.Text
+msgid "View log messages"
 msgstr ""
diff --git a/plugins/volume_format_fs/intl/fi/cryptobox-server-feature-volume_format_fs.po b/plugins/volume_format_fs/intl/fi/cryptobox-server-feature-volume_format_fs.po
index df38971..41ce84f 100644
--- a/plugins/volume_format_fs/intl/fi/cryptobox-server-feature-volume_format_fs.po
+++ b/plugins/volume_format_fs/intl/fi/cryptobox-server-feature-volume_format_fs.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -62,22 +61,6 @@ msgstr ""
 msgid "Deactive volume now"
 msgstr ""
 
-#: AdviceMessage.UnmountBeforeInit.Link.Attr1.name
-msgid "action"
-msgstr ""
-
-#: AdviceMessage.UnmountBeforeInit.Link.Attr1.value
-msgid "umount"
-msgstr ""
-
-#: AdviceMessage.UnmountBeforeInit.Link.Attr2.name
-msgid "redirect"
-msgstr ""
-
-#: AdviceMessage.UnmountBeforeInit.Link.Attr2.value
-msgid "volume_format_fs"
-msgstr ""
-
 #: SuccessMessage.FormatSuccess.Title
 msgid "Formatting successful"
 msgstr ""
@@ -102,6 +85,14 @@ msgstr ""
 msgid "Formatting of the selected filesystem failed for unknown reasons - sorry!"
 msgstr ""
 
-#: AdviceMessage.UnmountBeforeInit.Link.Rel
-msgid "volume_mount"
+#: SuccessMessage.FormatSuccess.Title
+msgid "Formatting is running"
+msgstr ""
+
+#: SuccessMessage.FormatSuccess.Text
+msgid "The selected filesystem is being formatted in the background. This may take some time (depending on the size of your disk)."
+msgstr ""
+
+#: WarningMessage.FormatFailed.Link.Text
+msgid "View log messages"
 msgstr ""
diff --git a/plugins/volume_format_fs/intl/fr/cryptobox-server-feature-volume_format_fs.po b/plugins/volume_format_fs/intl/fr/cryptobox-server-feature-volume_format_fs.po
index df38971..41ce84f 100644
--- a/plugins/volume_format_fs/intl/fr/cryptobox-server-feature-volume_format_fs.po
+++ b/plugins/volume_format_fs/intl/fr/cryptobox-server-feature-volume_format_fs.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -62,22 +61,6 @@ msgstr ""
 msgid "Deactive volume now"
 msgstr ""
 
-#: AdviceMessage.UnmountBeforeInit.Link.Attr1.name
-msgid "action"
-msgstr ""
-
-#: AdviceMessage.UnmountBeforeInit.Link.Attr1.value
-msgid "umount"
-msgstr ""
-
-#: AdviceMessage.UnmountBeforeInit.Link.Attr2.name
-msgid "redirect"
-msgstr ""
-
-#: AdviceMessage.UnmountBeforeInit.Link.Attr2.value
-msgid "volume_format_fs"
-msgstr ""
-
 #: SuccessMessage.FormatSuccess.Title
 msgid "Formatting successful"
 msgstr ""
@@ -102,6 +85,14 @@ msgstr ""
 msgid "Formatting of the selected filesystem failed for unknown reasons - sorry!"
 msgstr ""
 
-#: AdviceMessage.UnmountBeforeInit.Link.Rel
-msgid "volume_mount"
+#: SuccessMessage.FormatSuccess.Title
+msgid "Formatting is running"
+msgstr ""
+
+#: SuccessMessage.FormatSuccess.Text
+msgid "The selected filesystem is being formatted in the background. This may take some time (depending on the size of your disk)."
+msgstr ""
+
+#: WarningMessage.FormatFailed.Link.Text
+msgid "View log messages"
 msgstr ""
diff --git a/plugins/volume_format_fs/intl/hu/cryptobox-server-feature-volume_format_fs.po b/plugins/volume_format_fs/intl/hu/cryptobox-server-feature-volume_format_fs.po
index df38971..41ce84f 100644
--- a/plugins/volume_format_fs/intl/hu/cryptobox-server-feature-volume_format_fs.po
+++ b/plugins/volume_format_fs/intl/hu/cryptobox-server-feature-volume_format_fs.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -62,22 +61,6 @@ msgstr ""
 msgid "Deactive volume now"
 msgstr ""
 
-#: AdviceMessage.UnmountBeforeInit.Link.Attr1.name
-msgid "action"
-msgstr ""
-
-#: AdviceMessage.UnmountBeforeInit.Link.Attr1.value
-msgid "umount"
-msgstr ""
-
-#: AdviceMessage.UnmountBeforeInit.Link.Attr2.name
-msgid "redirect"
-msgstr ""
-
-#: AdviceMessage.UnmountBeforeInit.Link.Attr2.value
-msgid "volume_format_fs"
-msgstr ""
-
 #: SuccessMessage.FormatSuccess.Title
 msgid "Formatting successful"
 msgstr ""
@@ -102,6 +85,14 @@ msgstr ""
 msgid "Formatting of the selected filesystem failed for unknown reasons - sorry!"
 msgstr ""
 
-#: AdviceMessage.UnmountBeforeInit.Link.Rel
-msgid "volume_mount"
+#: SuccessMessage.FormatSuccess.Title
+msgid "Formatting is running"
+msgstr ""
+
+#: SuccessMessage.FormatSuccess.Text
+msgid "The selected filesystem is being formatted in the background. This may take some time (depending on the size of your disk)."
+msgstr ""
+
+#: WarningMessage.FormatFailed.Link.Text
+msgid "View log messages"
 msgstr ""
diff --git a/plugins/volume_format_fs/intl/it/cryptobox-server-feature-volume_format_fs.po b/plugins/volume_format_fs/intl/it/cryptobox-server-feature-volume_format_fs.po
index df38971..41ce84f 100644
--- a/plugins/volume_format_fs/intl/it/cryptobox-server-feature-volume_format_fs.po
+++ b/plugins/volume_format_fs/intl/it/cryptobox-server-feature-volume_format_fs.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -62,22 +61,6 @@ msgstr ""
 msgid "Deactive volume now"
 msgstr ""
 
-#: AdviceMessage.UnmountBeforeInit.Link.Attr1.name
-msgid "action"
-msgstr ""
-
-#: AdviceMessage.UnmountBeforeInit.Link.Attr1.value
-msgid "umount"
-msgstr ""
-
-#: AdviceMessage.UnmountBeforeInit.Link.Attr2.name
-msgid "redirect"
-msgstr ""
-
-#: AdviceMessage.UnmountBeforeInit.Link.Attr2.value
-msgid "volume_format_fs"
-msgstr ""
-
 #: SuccessMessage.FormatSuccess.Title
 msgid "Formatting successful"
 msgstr ""
@@ -102,6 +85,14 @@ msgstr ""
 msgid "Formatting of the selected filesystem failed for unknown reasons - sorry!"
 msgstr ""
 
-#: AdviceMessage.UnmountBeforeInit.Link.Rel
-msgid "volume_mount"
+#: SuccessMessage.FormatSuccess.Title
+msgid "Formatting is running"
+msgstr ""
+
+#: SuccessMessage.FormatSuccess.Text
+msgid "The selected filesystem is being formatted in the background. This may take some time (depending on the size of your disk)."
+msgstr ""
+
+#: WarningMessage.FormatFailed.Link.Text
+msgid "View log messages"
 msgstr ""
diff --git a/plugins/volume_format_fs/intl/ja/cryptobox-server-feature-volume_format_fs.po b/plugins/volume_format_fs/intl/ja/cryptobox-server-feature-volume_format_fs.po
index df38971..41ce84f 100644
--- a/plugins/volume_format_fs/intl/ja/cryptobox-server-feature-volume_format_fs.po
+++ b/plugins/volume_format_fs/intl/ja/cryptobox-server-feature-volume_format_fs.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -62,22 +61,6 @@ msgstr ""
 msgid "Deactive volume now"
 msgstr ""
 
-#: AdviceMessage.UnmountBeforeInit.Link.Attr1.name
-msgid "action"
-msgstr ""
-
-#: AdviceMessage.UnmountBeforeInit.Link.Attr1.value
-msgid "umount"
-msgstr ""
-
-#: AdviceMessage.UnmountBeforeInit.Link.Attr2.name
-msgid "redirect"
-msgstr ""
-
-#: AdviceMessage.UnmountBeforeInit.Link.Attr2.value
-msgid "volume_format_fs"
-msgstr ""
-
 #: SuccessMessage.FormatSuccess.Title
 msgid "Formatting successful"
 msgstr ""
@@ -102,6 +85,14 @@ msgstr ""
 msgid "Formatting of the selected filesystem failed for unknown reasons - sorry!"
 msgstr ""
 
-#: AdviceMessage.UnmountBeforeInit.Link.Rel
-msgid "volume_mount"
+#: SuccessMessage.FormatSuccess.Title
+msgid "Formatting is running"
+msgstr ""
+
+#: SuccessMessage.FormatSuccess.Text
+msgid "The selected filesystem is being formatted in the background. This may take some time (depending on the size of your disk)."
+msgstr ""
+
+#: WarningMessage.FormatFailed.Link.Text
+msgid "View log messages"
 msgstr ""
diff --git a/plugins/volume_format_fs/intl/nl/cryptobox-server-feature-volume_format_fs.po b/plugins/volume_format_fs/intl/nl/cryptobox-server-feature-volume_format_fs.po
index df38971..41ce84f 100644
--- a/plugins/volume_format_fs/intl/nl/cryptobox-server-feature-volume_format_fs.po
+++ b/plugins/volume_format_fs/intl/nl/cryptobox-server-feature-volume_format_fs.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -62,22 +61,6 @@ msgstr ""
 msgid "Deactive volume now"
 msgstr ""
 
-#: AdviceMessage.UnmountBeforeInit.Link.Attr1.name
-msgid "action"
-msgstr ""
-
-#: AdviceMessage.UnmountBeforeInit.Link.Attr1.value
-msgid "umount"
-msgstr ""
-
-#: AdviceMessage.UnmountBeforeInit.Link.Attr2.name
-msgid "redirect"
-msgstr ""
-
-#: AdviceMessage.UnmountBeforeInit.Link.Attr2.value
-msgid "volume_format_fs"
-msgstr ""
-
 #: SuccessMessage.FormatSuccess.Title
 msgid "Formatting successful"
 msgstr ""
@@ -102,6 +85,14 @@ msgstr ""
 msgid "Formatting of the selected filesystem failed for unknown reasons - sorry!"
 msgstr ""
 
-#: AdviceMessage.UnmountBeforeInit.Link.Rel
-msgid "volume_mount"
+#: SuccessMessage.FormatSuccess.Title
+msgid "Formatting is running"
+msgstr ""
+
+#: SuccessMessage.FormatSuccess.Text
+msgid "The selected filesystem is being formatted in the background. This may take some time (depending on the size of your disk)."
+msgstr ""
+
+#: WarningMessage.FormatFailed.Link.Text
+msgid "View log messages"
 msgstr ""
diff --git a/plugins/volume_format_fs/intl/pl/cryptobox-server-feature-volume_format_fs.po b/plugins/volume_format_fs/intl/pl/cryptobox-server-feature-volume_format_fs.po
index df38971..41ce84f 100644
--- a/plugins/volume_format_fs/intl/pl/cryptobox-server-feature-volume_format_fs.po
+++ b/plugins/volume_format_fs/intl/pl/cryptobox-server-feature-volume_format_fs.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -62,22 +61,6 @@ msgstr ""
 msgid "Deactive volume now"
 msgstr ""
 
-#: AdviceMessage.UnmountBeforeInit.Link.Attr1.name
-msgid "action"
-msgstr ""
-
-#: AdviceMessage.UnmountBeforeInit.Link.Attr1.value
-msgid "umount"
-msgstr ""
-
-#: AdviceMessage.UnmountBeforeInit.Link.Attr2.name
-msgid "redirect"
-msgstr ""
-
-#: AdviceMessage.UnmountBeforeInit.Link.Attr2.value
-msgid "volume_format_fs"
-msgstr ""
-
 #: SuccessMessage.FormatSuccess.Title
 msgid "Formatting successful"
 msgstr ""
@@ -102,6 +85,14 @@ msgstr ""
 msgid "Formatting of the selected filesystem failed for unknown reasons - sorry!"
 msgstr ""
 
-#: AdviceMessage.UnmountBeforeInit.Link.Rel
-msgid "volume_mount"
+#: SuccessMessage.FormatSuccess.Title
+msgid "Formatting is running"
+msgstr ""
+
+#: SuccessMessage.FormatSuccess.Text
+msgid "The selected filesystem is being formatted in the background. This may take some time (depending on the size of your disk)."
+msgstr ""
+
+#: WarningMessage.FormatFailed.Link.Text
+msgid "View log messages"
 msgstr ""
diff --git a/plugins/volume_format_fs/intl/pt/cryptobox-server-feature-volume_format_fs.po b/plugins/volume_format_fs/intl/pt/cryptobox-server-feature-volume_format_fs.po
index df38971..41ce84f 100644
--- a/plugins/volume_format_fs/intl/pt/cryptobox-server-feature-volume_format_fs.po
+++ b/plugins/volume_format_fs/intl/pt/cryptobox-server-feature-volume_format_fs.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -62,22 +61,6 @@ msgstr ""
 msgid "Deactive volume now"
 msgstr ""
 
-#: AdviceMessage.UnmountBeforeInit.Link.Attr1.name
-msgid "action"
-msgstr ""
-
-#: AdviceMessage.UnmountBeforeInit.Link.Attr1.value
-msgid "umount"
-msgstr ""
-
-#: AdviceMessage.UnmountBeforeInit.Link.Attr2.name
-msgid "redirect"
-msgstr ""
-
-#: AdviceMessage.UnmountBeforeInit.Link.Attr2.value
-msgid "volume_format_fs"
-msgstr ""
-
 #: SuccessMessage.FormatSuccess.Title
 msgid "Formatting successful"
 msgstr ""
@@ -102,6 +85,14 @@ msgstr ""
 msgid "Formatting of the selected filesystem failed for unknown reasons - sorry!"
 msgstr ""
 
-#: AdviceMessage.UnmountBeforeInit.Link.Rel
-msgid "volume_mount"
+#: SuccessMessage.FormatSuccess.Title
+msgid "Formatting is running"
+msgstr ""
+
+#: SuccessMessage.FormatSuccess.Text
+msgid "The selected filesystem is being formatted in the background. This may take some time (depending on the size of your disk)."
+msgstr ""
+
+#: WarningMessage.FormatFailed.Link.Text
+msgid "View log messages"
 msgstr ""
diff --git a/plugins/volume_format_fs/intl/ru/cryptobox-server-feature-volume_format_fs.po b/plugins/volume_format_fs/intl/ru/cryptobox-server-feature-volume_format_fs.po
index df38971..41ce84f 100644
--- a/plugins/volume_format_fs/intl/ru/cryptobox-server-feature-volume_format_fs.po
+++ b/plugins/volume_format_fs/intl/ru/cryptobox-server-feature-volume_format_fs.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -62,22 +61,6 @@ msgstr ""
 msgid "Deactive volume now"
 msgstr ""
 
-#: AdviceMessage.UnmountBeforeInit.Link.Attr1.name
-msgid "action"
-msgstr ""
-
-#: AdviceMessage.UnmountBeforeInit.Link.Attr1.value
-msgid "umount"
-msgstr ""
-
-#: AdviceMessage.UnmountBeforeInit.Link.Attr2.name
-msgid "redirect"
-msgstr ""
-
-#: AdviceMessage.UnmountBeforeInit.Link.Attr2.value
-msgid "volume_format_fs"
-msgstr ""
-
 #: SuccessMessage.FormatSuccess.Title
 msgid "Formatting successful"
 msgstr ""
@@ -102,6 +85,14 @@ msgstr ""
 msgid "Formatting of the selected filesystem failed for unknown reasons - sorry!"
 msgstr ""
 
-#: AdviceMessage.UnmountBeforeInit.Link.Rel
-msgid "volume_mount"
+#: SuccessMessage.FormatSuccess.Title
+msgid "Formatting is running"
+msgstr ""
+
+#: SuccessMessage.FormatSuccess.Text
+msgid "The selected filesystem is being formatted in the background. This may take some time (depending on the size of your disk)."
+msgstr ""
+
+#: WarningMessage.FormatFailed.Link.Text
+msgid "View log messages"
 msgstr ""
diff --git a/plugins/volume_format_fs/intl/sl/cryptobox-server-feature-volume_format_fs.po b/plugins/volume_format_fs/intl/sl/cryptobox-server-feature-volume_format_fs.po
index df38971..41ce84f 100644
--- a/plugins/volume_format_fs/intl/sl/cryptobox-server-feature-volume_format_fs.po
+++ b/plugins/volume_format_fs/intl/sl/cryptobox-server-feature-volume_format_fs.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -62,22 +61,6 @@ msgstr ""
 msgid "Deactive volume now"
 msgstr ""
 
-#: AdviceMessage.UnmountBeforeInit.Link.Attr1.name
-msgid "action"
-msgstr ""
-
-#: AdviceMessage.UnmountBeforeInit.Link.Attr1.value
-msgid "umount"
-msgstr ""
-
-#: AdviceMessage.UnmountBeforeInit.Link.Attr2.name
-msgid "redirect"
-msgstr ""
-
-#: AdviceMessage.UnmountBeforeInit.Link.Attr2.value
-msgid "volume_format_fs"
-msgstr ""
-
 #: SuccessMessage.FormatSuccess.Title
 msgid "Formatting successful"
 msgstr ""
@@ -102,6 +85,14 @@ msgstr ""
 msgid "Formatting of the selected filesystem failed for unknown reasons - sorry!"
 msgstr ""
 
-#: AdviceMessage.UnmountBeforeInit.Link.Rel
-msgid "volume_mount"
+#: SuccessMessage.FormatSuccess.Title
+msgid "Formatting is running"
+msgstr ""
+
+#: SuccessMessage.FormatSuccess.Text
+msgid "The selected filesystem is being formatted in the background. This may take some time (depending on the size of your disk)."
+msgstr ""
+
+#: WarningMessage.FormatFailed.Link.Text
+msgid "View log messages"
 msgstr ""
diff --git a/plugins/volume_format_fs/intl/sv/cryptobox-server-feature-volume_format_fs.po b/plugins/volume_format_fs/intl/sv/cryptobox-server-feature-volume_format_fs.po
index df38971..41ce84f 100644
--- a/plugins/volume_format_fs/intl/sv/cryptobox-server-feature-volume_format_fs.po
+++ b/plugins/volume_format_fs/intl/sv/cryptobox-server-feature-volume_format_fs.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -62,22 +61,6 @@ msgstr ""
 msgid "Deactive volume now"
 msgstr ""
 
-#: AdviceMessage.UnmountBeforeInit.Link.Attr1.name
-msgid "action"
-msgstr ""
-
-#: AdviceMessage.UnmountBeforeInit.Link.Attr1.value
-msgid "umount"
-msgstr ""
-
-#: AdviceMessage.UnmountBeforeInit.Link.Attr2.name
-msgid "redirect"
-msgstr ""
-
-#: AdviceMessage.UnmountBeforeInit.Link.Attr2.value
-msgid "volume_format_fs"
-msgstr ""
-
 #: SuccessMessage.FormatSuccess.Title
 msgid "Formatting successful"
 msgstr ""
@@ -102,6 +85,14 @@ msgstr ""
 msgid "Formatting of the selected filesystem failed for unknown reasons - sorry!"
 msgstr ""
 
-#: AdviceMessage.UnmountBeforeInit.Link.Rel
-msgid "volume_mount"
+#: SuccessMessage.FormatSuccess.Title
+msgid "Formatting is running"
+msgstr ""
+
+#: SuccessMessage.FormatSuccess.Text
+msgid "The selected filesystem is being formatted in the background. This may take some time (depending on the size of your disk)."
+msgstr ""
+
+#: WarningMessage.FormatFailed.Link.Text
+msgid "View log messages"
 msgstr ""
diff --git a/plugins/volume_format_fs/language.hdf b/plugins/volume_format_fs/language.hdf
index 16cb50d..1ce6e73 100644
--- a/plugins/volume_format_fs/language.hdf
+++ b/plugins/volume_format_fs/language.hdf
@@ -45,5 +45,9 @@ WarningMessage {
 	FormatFailed {
 		Title	= Formatting failed
 		Text	= Formatting of the selected filesystem failed for unknown reasons - sorry!
+		Link.Text	= View log messages
+		Link.Rel	= logs
+		Link.Attr1.name	= pattern
+		Link.Attr1.value	= ERROR
 	}
 }
diff --git a/plugins/volume_format_fs/volume_format_fs.py b/plugins/volume_format_fs/volume_format_fs.py
index 433ec7b..584f242 100644
--- a/plugins/volume_format_fs/volume_format_fs.py
+++ b/plugins/volume_format_fs/volume_format_fs.py
@@ -79,7 +79,7 @@ class volume_format_fs(cryptobox.plugins.base.CryptoBoxPlugin):
 		except CBVolumeIsActive:
 			self.hdf["Data.Warning"] = "VolumeMayNotBeMounted"
 			self.cbox.log.info("initialization is not possible as long as the device (%s) is mounted" % self.device)
-			return None
+			return "volume_format"
 		except CBContainerError, errMsg:
 			self.hdf["Data.Warning"] = "Plugins.volume_format_fs.FormatFailed"
 			self.cbox.log.warn("initialization of device '%s' failed" % self.device)
@@ -107,7 +107,7 @@ class volume_format_fs(cryptobox.plugins.base.CryptoBoxPlugin):
 		except CBVolumeIsActive:
 			self.hdf["Data.Warning"] = "VolumeMayNotBeMounted"
 			self.cbox.log.info("initialization is not possible as long as the device (%s) is mounted" % self.device)
-			return None
+			return "volume_format"
 		except CBContainerError, errMsg:
 			self.hdf["Data.Warning"] = "Plugins.volume_format_fs.FormatFailed"
 			self.cbox.log.warn("initialization of device '%s' failed" % self.device)
diff --git a/plugins/volume_mount/intl/cryptobox-server-feature-volume_mount.pot b/plugins/volume_mount/intl/cryptobox-server-feature-volume_mount.pot
index 524419a..928e7bf 100644
--- a/plugins/volume_mount/intl/cryptobox-server-feature-volume_mount.pot
+++ b/plugins/volume_mount/intl/cryptobox-server-feature-volume_mount.pot
@@ -92,6 +92,54 @@ msgstr ""
 msgid "The volume is currently not active."
 msgstr ""
 
-#: WarningMessage.InvalidContainerType.Link.Rel
-msgid "volume_format_fs"
+#: Title.Mount
+msgid "Open volume"
+msgstr ""
+
+#: Title.Umount
+msgid "Turn on the volume"
+msgstr ""
+
+#: Button.Umount
+msgid "Close volume"
+msgstr ""
+
+#: SuccessMessage.MountDone.Title
+msgid "Volume opened"
+msgstr ""
+
+#: SuccessMessage.MountDone.Text
+msgid "The content of this volume is available now."
+msgstr ""
+
+#: SuccessMessage.UmountDone.Title
+msgid "Volume closed"
+msgstr ""
+
+#: SuccessMessage.UmountDone.Text
+msgid "The content of this volume is protected from access now."
+msgstr ""
+
+#: WarningMessage.UmountFailed.Title
+msgid "Closing failed"
+msgstr ""
+
+#: WarningMessage.UmountFailed.Text
+msgid "The volume could not be closed. Probably some files are still in use."
+msgstr ""
+
+#: WarningMessage.IsAlreadyMounted.Title
+msgid "Already open"
+msgstr ""
+
+#: WarningMessage.IsAlreadyMounted.Text
+msgid "The volume is already open."
+msgstr ""
+
+#: WarningMessage.IsNotMounted.Title
+msgid "Already closed"
+msgstr ""
+
+#: WarningMessage.IsNotMounted.Text
+msgid "The volume is already closed."
 msgstr ""
diff --git a/plugins/volume_mount/intl/cs/cryptobox-server-feature-volume_mount.po b/plugins/volume_mount/intl/cs/cryptobox-server-feature-volume_mount.po
index d84e4cb..3592f75 100644
--- a/plugins/volume_mount/intl/cs/cryptobox-server-feature-volume_mount.po
+++ b/plugins/volume_mount/intl/cs/cryptobox-server-feature-volume_mount.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -94,6 +93,54 @@ msgstr ""
 msgid "The volume is currently not active."
 msgstr ""
 
-#: WarningMessage.InvalidContainerType.Link.Rel
-msgid "volume_format_fs"
+#: Title.Mount
+msgid "Open volume"
+msgstr ""
+
+#: Title.Umount
+msgid "Turn on the volume"
+msgstr ""
+
+#: Button.Umount
+msgid "Close volume"
+msgstr ""
+
+#: SuccessMessage.MountDone.Title
+msgid "Volume opened"
+msgstr ""
+
+#: SuccessMessage.MountDone.Text
+msgid "The content of this volume is available now."
+msgstr ""
+
+#: SuccessMessage.UmountDone.Title
+msgid "Volume closed"
+msgstr ""
+
+#: SuccessMessage.UmountDone.Text
+msgid "The content of this volume is protected from access now."
+msgstr ""
+
+#: WarningMessage.UmountFailed.Title
+msgid "Closing failed"
+msgstr ""
+
+#: WarningMessage.UmountFailed.Text
+msgid "The volume could not be closed. Probably some files are still in use."
+msgstr ""
+
+#: WarningMessage.IsAlreadyMounted.Title
+msgid "Already open"
+msgstr ""
+
+#: WarningMessage.IsAlreadyMounted.Text
+msgid "The volume is already open."
+msgstr ""
+
+#: WarningMessage.IsNotMounted.Title
+msgid "Already closed"
+msgstr ""
+
+#: WarningMessage.IsNotMounted.Text
+msgid "The volume is already closed."
 msgstr ""
diff --git a/plugins/volume_mount/intl/da/cryptobox-server-feature-volume_mount.po b/plugins/volume_mount/intl/da/cryptobox-server-feature-volume_mount.po
index d84e4cb..3592f75 100644
--- a/plugins/volume_mount/intl/da/cryptobox-server-feature-volume_mount.po
+++ b/plugins/volume_mount/intl/da/cryptobox-server-feature-volume_mount.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -94,6 +93,54 @@ msgstr ""
 msgid "The volume is currently not active."
 msgstr ""
 
-#: WarningMessage.InvalidContainerType.Link.Rel
-msgid "volume_format_fs"
+#: Title.Mount
+msgid "Open volume"
+msgstr ""
+
+#: Title.Umount
+msgid "Turn on the volume"
+msgstr ""
+
+#: Button.Umount
+msgid "Close volume"
+msgstr ""
+
+#: SuccessMessage.MountDone.Title
+msgid "Volume opened"
+msgstr ""
+
+#: SuccessMessage.MountDone.Text
+msgid "The content of this volume is available now."
+msgstr ""
+
+#: SuccessMessage.UmountDone.Title
+msgid "Volume closed"
+msgstr ""
+
+#: SuccessMessage.UmountDone.Text
+msgid "The content of this volume is protected from access now."
+msgstr ""
+
+#: WarningMessage.UmountFailed.Title
+msgid "Closing failed"
+msgstr ""
+
+#: WarningMessage.UmountFailed.Text
+msgid "The volume could not be closed. Probably some files are still in use."
+msgstr ""
+
+#: WarningMessage.IsAlreadyMounted.Title
+msgid "Already open"
+msgstr ""
+
+#: WarningMessage.IsAlreadyMounted.Text
+msgid "The volume is already open."
+msgstr ""
+
+#: WarningMessage.IsNotMounted.Title
+msgid "Already closed"
+msgstr ""
+
+#: WarningMessage.IsNotMounted.Text
+msgid "The volume is already closed."
 msgstr ""
diff --git a/plugins/volume_mount/intl/de/cryptobox-server-feature-volume_mount.po b/plugins/volume_mount/intl/de/cryptobox-server-feature-volume_mount.po
index d84e4cb..3592f75 100644
--- a/plugins/volume_mount/intl/de/cryptobox-server-feature-volume_mount.po
+++ b/plugins/volume_mount/intl/de/cryptobox-server-feature-volume_mount.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -94,6 +93,54 @@ msgstr ""
 msgid "The volume is currently not active."
 msgstr ""
 
-#: WarningMessage.InvalidContainerType.Link.Rel
-msgid "volume_format_fs"
+#: Title.Mount
+msgid "Open volume"
+msgstr ""
+
+#: Title.Umount
+msgid "Turn on the volume"
+msgstr ""
+
+#: Button.Umount
+msgid "Close volume"
+msgstr ""
+
+#: SuccessMessage.MountDone.Title
+msgid "Volume opened"
+msgstr ""
+
+#: SuccessMessage.MountDone.Text
+msgid "The content of this volume is available now."
+msgstr ""
+
+#: SuccessMessage.UmountDone.Title
+msgid "Volume closed"
+msgstr ""
+
+#: SuccessMessage.UmountDone.Text
+msgid "The content of this volume is protected from access now."
+msgstr ""
+
+#: WarningMessage.UmountFailed.Title
+msgid "Closing failed"
+msgstr ""
+
+#: WarningMessage.UmountFailed.Text
+msgid "The volume could not be closed. Probably some files are still in use."
+msgstr ""
+
+#: WarningMessage.IsAlreadyMounted.Title
+msgid "Already open"
+msgstr ""
+
+#: WarningMessage.IsAlreadyMounted.Text
+msgid "The volume is already open."
+msgstr ""
+
+#: WarningMessage.IsNotMounted.Title
+msgid "Already closed"
+msgstr ""
+
+#: WarningMessage.IsNotMounted.Text
+msgid "The volume is already closed."
 msgstr ""
diff --git a/plugins/volume_mount/intl/en/cryptobox-server-feature-volume_mount.po b/plugins/volume_mount/intl/en/cryptobox-server-feature-volume_mount.po
index f901576..726a9eb 100644
--- a/plugins/volume_mount/intl/en/cryptobox-server-feature-volume_mount.po
+++ b/plugins/volume_mount/intl/en/cryptobox-server-feature-volume_mount.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -12,7 +11,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 0.10.1\n"
+"X-Generator: Translate Toolkit 0.10.1\n"
 
 #: Name
 msgid "Mount and umount volumes"
@@ -63,10 +62,8 @@ msgid "Unknown format"
 msgstr "Unknown format"
 
 #: WarningMessage.InvalidContainerType.Text
-msgid ""
-"The type of this volume ist not known. Maybe you want to initialize itfirst?"
-msgstr ""
-"The type of this volume ist not known. Maybe you want to initialize itfirst?"
+msgid "The type of this volume ist not known. Maybe you want to initialize itfirst?"
+msgstr "The type of this volume ist not known. Maybe you want to initialize itfirst?"
 
 #: WarningMessage.InvalidContainerType.Link.Text
 msgid "Format volume"
@@ -77,12 +74,8 @@ msgid "Deactivation failed"
 msgstr "Deactivation failed"
 
 #: WarningMessage.UmountFailed.Text
-msgid ""
-"The volume could not be deactivated. Probably some files are still in use. "
-"In case of emergency just shut down the CryptoBox!"
-msgstr ""
-"The volume could not be deactivated. Probably some files are still in use. "
-"In case of emergency just shut down the CryptoBox!"
+msgid "The volume could not be deactivated. Probably some files are still in use. In case of emergency just shut down the CryptoBox!"
+msgstr "The volume could not be deactivated. Probably some files are still in use. In case of emergency just shut down the CryptoBox!"
 
 #: WarningMessage.IsAlreadyMounted.Title
 msgid "Already active"
@@ -100,6 +93,59 @@ msgstr "Inactive"
 msgid "The volume is currently not active."
 msgstr "The volume is currently not active."
 
-#: WarningMessage.InvalidContainerType.Link.Rel
-msgid "volume_format_fs"
-msgstr "volume_format_fs"
+#: Title.Mount
+msgid "Open volume"
+msgstr ""
+
+#: Title.Umount
+msgid "Turn on the volume"
+msgstr ""
+
+#: Button.Umount
+msgid "Close volume"
+msgstr ""
+
+#: SuccessMessage.MountDone.Title
+msgid "Volume opened"
+msgstr ""
+
+#: SuccessMessage.MountDone.Text
+msgid "The content of this volume is available now."
+msgstr ""
+
+#: SuccessMessage.UmountDone.Title
+msgid "Volume closed"
+msgstr ""
+
+#: SuccessMessage.UmountDone.Text
+msgid "The content of this volume is protected from access now."
+msgstr ""
+
+#: WarningMessage.UmountFailed.Title
+msgid "Closing failed"
+msgstr ""
+
+#: WarningMessage.UmountFailed.Text
+msgid "The volume could not be closed. Probably some files are still in use."
+msgstr ""
+
+#: WarningMessage.IsAlreadyMounted.Title
+msgid "Already open"
+msgstr ""
+
+#: WarningMessage.IsAlreadyMounted.Text
+#, fuzzy
+msgid "The volume is already open."
+msgstr "The volume is already active."
+
+#: WarningMessage.IsNotMounted.Title
+msgid "Already closed"
+msgstr ""
+
+#: WarningMessage.IsNotMounted.Text
+#, fuzzy
+msgid "The volume is already closed."
+msgstr "The volume is already active."
+
+#~ msgid "volume_format_fs"
+#~ msgstr "volume_format_fs"
diff --git a/plugins/volume_mount/intl/es/cryptobox-server-feature-volume_mount.po b/plugins/volume_mount/intl/es/cryptobox-server-feature-volume_mount.po
index d84e4cb..3592f75 100644
--- a/plugins/volume_mount/intl/es/cryptobox-server-feature-volume_mount.po
+++ b/plugins/volume_mount/intl/es/cryptobox-server-feature-volume_mount.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -94,6 +93,54 @@ msgstr ""
 msgid "The volume is currently not active."
 msgstr ""
 
-#: WarningMessage.InvalidContainerType.Link.Rel
-msgid "volume_format_fs"
+#: Title.Mount
+msgid "Open volume"
+msgstr ""
+
+#: Title.Umount
+msgid "Turn on the volume"
+msgstr ""
+
+#: Button.Umount
+msgid "Close volume"
+msgstr ""
+
+#: SuccessMessage.MountDone.Title
+msgid "Volume opened"
+msgstr ""
+
+#: SuccessMessage.MountDone.Text
+msgid "The content of this volume is available now."
+msgstr ""
+
+#: SuccessMessage.UmountDone.Title
+msgid "Volume closed"
+msgstr ""
+
+#: SuccessMessage.UmountDone.Text
+msgid "The content of this volume is protected from access now."
+msgstr ""
+
+#: WarningMessage.UmountFailed.Title
+msgid "Closing failed"
+msgstr ""
+
+#: WarningMessage.UmountFailed.Text
+msgid "The volume could not be closed. Probably some files are still in use."
+msgstr ""
+
+#: WarningMessage.IsAlreadyMounted.Title
+msgid "Already open"
+msgstr ""
+
+#: WarningMessage.IsAlreadyMounted.Text
+msgid "The volume is already open."
+msgstr ""
+
+#: WarningMessage.IsNotMounted.Title
+msgid "Already closed"
+msgstr ""
+
+#: WarningMessage.IsNotMounted.Text
+msgid "The volume is already closed."
 msgstr ""
diff --git a/plugins/volume_mount/intl/fi/cryptobox-server-feature-volume_mount.po b/plugins/volume_mount/intl/fi/cryptobox-server-feature-volume_mount.po
index d84e4cb..3592f75 100644
--- a/plugins/volume_mount/intl/fi/cryptobox-server-feature-volume_mount.po
+++ b/plugins/volume_mount/intl/fi/cryptobox-server-feature-volume_mount.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -94,6 +93,54 @@ msgstr ""
 msgid "The volume is currently not active."
 msgstr ""
 
-#: WarningMessage.InvalidContainerType.Link.Rel
-msgid "volume_format_fs"
+#: Title.Mount
+msgid "Open volume"
+msgstr ""
+
+#: Title.Umount
+msgid "Turn on the volume"
+msgstr ""
+
+#: Button.Umount
+msgid "Close volume"
+msgstr ""
+
+#: SuccessMessage.MountDone.Title
+msgid "Volume opened"
+msgstr ""
+
+#: SuccessMessage.MountDone.Text
+msgid "The content of this volume is available now."
+msgstr ""
+
+#: SuccessMessage.UmountDone.Title
+msgid "Volume closed"
+msgstr ""
+
+#: SuccessMessage.UmountDone.Text
+msgid "The content of this volume is protected from access now."
+msgstr ""
+
+#: WarningMessage.UmountFailed.Title
+msgid "Closing failed"
+msgstr ""
+
+#: WarningMessage.UmountFailed.Text
+msgid "The volume could not be closed. Probably some files are still in use."
+msgstr ""
+
+#: WarningMessage.IsAlreadyMounted.Title
+msgid "Already open"
+msgstr ""
+
+#: WarningMessage.IsAlreadyMounted.Text
+msgid "The volume is already open."
+msgstr ""
+
+#: WarningMessage.IsNotMounted.Title
+msgid "Already closed"
+msgstr ""
+
+#: WarningMessage.IsNotMounted.Text
+msgid "The volume is already closed."
 msgstr ""
diff --git a/plugins/volume_mount/intl/fr/cryptobox-server-feature-volume_mount.po b/plugins/volume_mount/intl/fr/cryptobox-server-feature-volume_mount.po
index d84e4cb..3592f75 100644
--- a/plugins/volume_mount/intl/fr/cryptobox-server-feature-volume_mount.po
+++ b/plugins/volume_mount/intl/fr/cryptobox-server-feature-volume_mount.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -94,6 +93,54 @@ msgstr ""
 msgid "The volume is currently not active."
 msgstr ""
 
-#: WarningMessage.InvalidContainerType.Link.Rel
-msgid "volume_format_fs"
+#: Title.Mount
+msgid "Open volume"
+msgstr ""
+
+#: Title.Umount
+msgid "Turn on the volume"
+msgstr ""
+
+#: Button.Umount
+msgid "Close volume"
+msgstr ""
+
+#: SuccessMessage.MountDone.Title
+msgid "Volume opened"
+msgstr ""
+
+#: SuccessMessage.MountDone.Text
+msgid "The content of this volume is available now."
+msgstr ""
+
+#: SuccessMessage.UmountDone.Title
+msgid "Volume closed"
+msgstr ""
+
+#: SuccessMessage.UmountDone.Text
+msgid "The content of this volume is protected from access now."
+msgstr ""
+
+#: WarningMessage.UmountFailed.Title
+msgid "Closing failed"
+msgstr ""
+
+#: WarningMessage.UmountFailed.Text
+msgid "The volume could not be closed. Probably some files are still in use."
+msgstr ""
+
+#: WarningMessage.IsAlreadyMounted.Title
+msgid "Already open"
+msgstr ""
+
+#: WarningMessage.IsAlreadyMounted.Text
+msgid "The volume is already open."
+msgstr ""
+
+#: WarningMessage.IsNotMounted.Title
+msgid "Already closed"
+msgstr ""
+
+#: WarningMessage.IsNotMounted.Text
+msgid "The volume is already closed."
 msgstr ""
diff --git a/plugins/volume_mount/intl/hu/cryptobox-server-feature-volume_mount.po b/plugins/volume_mount/intl/hu/cryptobox-server-feature-volume_mount.po
index d84e4cb..3592f75 100644
--- a/plugins/volume_mount/intl/hu/cryptobox-server-feature-volume_mount.po
+++ b/plugins/volume_mount/intl/hu/cryptobox-server-feature-volume_mount.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -94,6 +93,54 @@ msgstr ""
 msgid "The volume is currently not active."
 msgstr ""
 
-#: WarningMessage.InvalidContainerType.Link.Rel
-msgid "volume_format_fs"
+#: Title.Mount
+msgid "Open volume"
+msgstr ""
+
+#: Title.Umount
+msgid "Turn on the volume"
+msgstr ""
+
+#: Button.Umount
+msgid "Close volume"
+msgstr ""
+
+#: SuccessMessage.MountDone.Title
+msgid "Volume opened"
+msgstr ""
+
+#: SuccessMessage.MountDone.Text
+msgid "The content of this volume is available now."
+msgstr ""
+
+#: SuccessMessage.UmountDone.Title
+msgid "Volume closed"
+msgstr ""
+
+#: SuccessMessage.UmountDone.Text
+msgid "The content of this volume is protected from access now."
+msgstr ""
+
+#: WarningMessage.UmountFailed.Title
+msgid "Closing failed"
+msgstr ""
+
+#: WarningMessage.UmountFailed.Text
+msgid "The volume could not be closed. Probably some files are still in use."
+msgstr ""
+
+#: WarningMessage.IsAlreadyMounted.Title
+msgid "Already open"
+msgstr ""
+
+#: WarningMessage.IsAlreadyMounted.Text
+msgid "The volume is already open."
+msgstr ""
+
+#: WarningMessage.IsNotMounted.Title
+msgid "Already closed"
+msgstr ""
+
+#: WarningMessage.IsNotMounted.Text
+msgid "The volume is already closed."
 msgstr ""
diff --git a/plugins/volume_mount/intl/it/cryptobox-server-feature-volume_mount.po b/plugins/volume_mount/intl/it/cryptobox-server-feature-volume_mount.po
index d84e4cb..3592f75 100644
--- a/plugins/volume_mount/intl/it/cryptobox-server-feature-volume_mount.po
+++ b/plugins/volume_mount/intl/it/cryptobox-server-feature-volume_mount.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -94,6 +93,54 @@ msgstr ""
 msgid "The volume is currently not active."
 msgstr ""
 
-#: WarningMessage.InvalidContainerType.Link.Rel
-msgid "volume_format_fs"
+#: Title.Mount
+msgid "Open volume"
+msgstr ""
+
+#: Title.Umount
+msgid "Turn on the volume"
+msgstr ""
+
+#: Button.Umount
+msgid "Close volume"
+msgstr ""
+
+#: SuccessMessage.MountDone.Title
+msgid "Volume opened"
+msgstr ""
+
+#: SuccessMessage.MountDone.Text
+msgid "The content of this volume is available now."
+msgstr ""
+
+#: SuccessMessage.UmountDone.Title
+msgid "Volume closed"
+msgstr ""
+
+#: SuccessMessage.UmountDone.Text
+msgid "The content of this volume is protected from access now."
+msgstr ""
+
+#: WarningMessage.UmountFailed.Title
+msgid "Closing failed"
+msgstr ""
+
+#: WarningMessage.UmountFailed.Text
+msgid "The volume could not be closed. Probably some files are still in use."
+msgstr ""
+
+#: WarningMessage.IsAlreadyMounted.Title
+msgid "Already open"
+msgstr ""
+
+#: WarningMessage.IsAlreadyMounted.Text
+msgid "The volume is already open."
+msgstr ""
+
+#: WarningMessage.IsNotMounted.Title
+msgid "Already closed"
+msgstr ""
+
+#: WarningMessage.IsNotMounted.Text
+msgid "The volume is already closed."
 msgstr ""
diff --git a/plugins/volume_mount/intl/ja/cryptobox-server-feature-volume_mount.po b/plugins/volume_mount/intl/ja/cryptobox-server-feature-volume_mount.po
index d84e4cb..3592f75 100644
--- a/plugins/volume_mount/intl/ja/cryptobox-server-feature-volume_mount.po
+++ b/plugins/volume_mount/intl/ja/cryptobox-server-feature-volume_mount.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -94,6 +93,54 @@ msgstr ""
 msgid "The volume is currently not active."
 msgstr ""
 
-#: WarningMessage.InvalidContainerType.Link.Rel
-msgid "volume_format_fs"
+#: Title.Mount
+msgid "Open volume"
+msgstr ""
+
+#: Title.Umount
+msgid "Turn on the volume"
+msgstr ""
+
+#: Button.Umount
+msgid "Close volume"
+msgstr ""
+
+#: SuccessMessage.MountDone.Title
+msgid "Volume opened"
+msgstr ""
+
+#: SuccessMessage.MountDone.Text
+msgid "The content of this volume is available now."
+msgstr ""
+
+#: SuccessMessage.UmountDone.Title
+msgid "Volume closed"
+msgstr ""
+
+#: SuccessMessage.UmountDone.Text
+msgid "The content of this volume is protected from access now."
+msgstr ""
+
+#: WarningMessage.UmountFailed.Title
+msgid "Closing failed"
+msgstr ""
+
+#: WarningMessage.UmountFailed.Text
+msgid "The volume could not be closed. Probably some files are still in use."
+msgstr ""
+
+#: WarningMessage.IsAlreadyMounted.Title
+msgid "Already open"
+msgstr ""
+
+#: WarningMessage.IsAlreadyMounted.Text
+msgid "The volume is already open."
+msgstr ""
+
+#: WarningMessage.IsNotMounted.Title
+msgid "Already closed"
+msgstr ""
+
+#: WarningMessage.IsNotMounted.Text
+msgid "The volume is already closed."
 msgstr ""
diff --git a/plugins/volume_mount/intl/nl/cryptobox-server-feature-volume_mount.po b/plugins/volume_mount/intl/nl/cryptobox-server-feature-volume_mount.po
index d84e4cb..3592f75 100644
--- a/plugins/volume_mount/intl/nl/cryptobox-server-feature-volume_mount.po
+++ b/plugins/volume_mount/intl/nl/cryptobox-server-feature-volume_mount.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -94,6 +93,54 @@ msgstr ""
 msgid "The volume is currently not active."
 msgstr ""
 
-#: WarningMessage.InvalidContainerType.Link.Rel
-msgid "volume_format_fs"
+#: Title.Mount
+msgid "Open volume"
+msgstr ""
+
+#: Title.Umount
+msgid "Turn on the volume"
+msgstr ""
+
+#: Button.Umount
+msgid "Close volume"
+msgstr ""
+
+#: SuccessMessage.MountDone.Title
+msgid "Volume opened"
+msgstr ""
+
+#: SuccessMessage.MountDone.Text
+msgid "The content of this volume is available now."
+msgstr ""
+
+#: SuccessMessage.UmountDone.Title
+msgid "Volume closed"
+msgstr ""
+
+#: SuccessMessage.UmountDone.Text
+msgid "The content of this volume is protected from access now."
+msgstr ""
+
+#: WarningMessage.UmountFailed.Title
+msgid "Closing failed"
+msgstr ""
+
+#: WarningMessage.UmountFailed.Text
+msgid "The volume could not be closed. Probably some files are still in use."
+msgstr ""
+
+#: WarningMessage.IsAlreadyMounted.Title
+msgid "Already open"
+msgstr ""
+
+#: WarningMessage.IsAlreadyMounted.Text
+msgid "The volume is already open."
+msgstr ""
+
+#: WarningMessage.IsNotMounted.Title
+msgid "Already closed"
+msgstr ""
+
+#: WarningMessage.IsNotMounted.Text
+msgid "The volume is already closed."
 msgstr ""
diff --git a/plugins/volume_mount/intl/pl/cryptobox-server-feature-volume_mount.po b/plugins/volume_mount/intl/pl/cryptobox-server-feature-volume_mount.po
index d84e4cb..3592f75 100644
--- a/plugins/volume_mount/intl/pl/cryptobox-server-feature-volume_mount.po
+++ b/plugins/volume_mount/intl/pl/cryptobox-server-feature-volume_mount.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -94,6 +93,54 @@ msgstr ""
 msgid "The volume is currently not active."
 msgstr ""
 
-#: WarningMessage.InvalidContainerType.Link.Rel
-msgid "volume_format_fs"
+#: Title.Mount
+msgid "Open volume"
+msgstr ""
+
+#: Title.Umount
+msgid "Turn on the volume"
+msgstr ""
+
+#: Button.Umount
+msgid "Close volume"
+msgstr ""
+
+#: SuccessMessage.MountDone.Title
+msgid "Volume opened"
+msgstr ""
+
+#: SuccessMessage.MountDone.Text
+msgid "The content of this volume is available now."
+msgstr ""
+
+#: SuccessMessage.UmountDone.Title
+msgid "Volume closed"
+msgstr ""
+
+#: SuccessMessage.UmountDone.Text
+msgid "The content of this volume is protected from access now."
+msgstr ""
+
+#: WarningMessage.UmountFailed.Title
+msgid "Closing failed"
+msgstr ""
+
+#: WarningMessage.UmountFailed.Text
+msgid "The volume could not be closed. Probably some files are still in use."
+msgstr ""
+
+#: WarningMessage.IsAlreadyMounted.Title
+msgid "Already open"
+msgstr ""
+
+#: WarningMessage.IsAlreadyMounted.Text
+msgid "The volume is already open."
+msgstr ""
+
+#: WarningMessage.IsNotMounted.Title
+msgid "Already closed"
+msgstr ""
+
+#: WarningMessage.IsNotMounted.Text
+msgid "The volume is already closed."
 msgstr ""
diff --git a/plugins/volume_mount/intl/pt/cryptobox-server-feature-volume_mount.po b/plugins/volume_mount/intl/pt/cryptobox-server-feature-volume_mount.po
index d84e4cb..3592f75 100644
--- a/plugins/volume_mount/intl/pt/cryptobox-server-feature-volume_mount.po
+++ b/plugins/volume_mount/intl/pt/cryptobox-server-feature-volume_mount.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -94,6 +93,54 @@ msgstr ""
 msgid "The volume is currently not active."
 msgstr ""
 
-#: WarningMessage.InvalidContainerType.Link.Rel
-msgid "volume_format_fs"
+#: Title.Mount
+msgid "Open volume"
+msgstr ""
+
+#: Title.Umount
+msgid "Turn on the volume"
+msgstr ""
+
+#: Button.Umount
+msgid "Close volume"
+msgstr ""
+
+#: SuccessMessage.MountDone.Title
+msgid "Volume opened"
+msgstr ""
+
+#: SuccessMessage.MountDone.Text
+msgid "The content of this volume is available now."
+msgstr ""
+
+#: SuccessMessage.UmountDone.Title
+msgid "Volume closed"
+msgstr ""
+
+#: SuccessMessage.UmountDone.Text
+msgid "The content of this volume is protected from access now."
+msgstr ""
+
+#: WarningMessage.UmountFailed.Title
+msgid "Closing failed"
+msgstr ""
+
+#: WarningMessage.UmountFailed.Text
+msgid "The volume could not be closed. Probably some files are still in use."
+msgstr ""
+
+#: WarningMessage.IsAlreadyMounted.Title
+msgid "Already open"
+msgstr ""
+
+#: WarningMessage.IsAlreadyMounted.Text
+msgid "The volume is already open."
+msgstr ""
+
+#: WarningMessage.IsNotMounted.Title
+msgid "Already closed"
+msgstr ""
+
+#: WarningMessage.IsNotMounted.Text
+msgid "The volume is already closed."
 msgstr ""
diff --git a/plugins/volume_mount/intl/ru/cryptobox-server-feature-volume_mount.po b/plugins/volume_mount/intl/ru/cryptobox-server-feature-volume_mount.po
index d84e4cb..3592f75 100644
--- a/plugins/volume_mount/intl/ru/cryptobox-server-feature-volume_mount.po
+++ b/plugins/volume_mount/intl/ru/cryptobox-server-feature-volume_mount.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -94,6 +93,54 @@ msgstr ""
 msgid "The volume is currently not active."
 msgstr ""
 
-#: WarningMessage.InvalidContainerType.Link.Rel
-msgid "volume_format_fs"
+#: Title.Mount
+msgid "Open volume"
+msgstr ""
+
+#: Title.Umount
+msgid "Turn on the volume"
+msgstr ""
+
+#: Button.Umount
+msgid "Close volume"
+msgstr ""
+
+#: SuccessMessage.MountDone.Title
+msgid "Volume opened"
+msgstr ""
+
+#: SuccessMessage.MountDone.Text
+msgid "The content of this volume is available now."
+msgstr ""
+
+#: SuccessMessage.UmountDone.Title
+msgid "Volume closed"
+msgstr ""
+
+#: SuccessMessage.UmountDone.Text
+msgid "The content of this volume is protected from access now."
+msgstr ""
+
+#: WarningMessage.UmountFailed.Title
+msgid "Closing failed"
+msgstr ""
+
+#: WarningMessage.UmountFailed.Text
+msgid "The volume could not be closed. Probably some files are still in use."
+msgstr ""
+
+#: WarningMessage.IsAlreadyMounted.Title
+msgid "Already open"
+msgstr ""
+
+#: WarningMessage.IsAlreadyMounted.Text
+msgid "The volume is already open."
+msgstr ""
+
+#: WarningMessage.IsNotMounted.Title
+msgid "Already closed"
+msgstr ""
+
+#: WarningMessage.IsNotMounted.Text
+msgid "The volume is already closed."
 msgstr ""
diff --git a/plugins/volume_mount/intl/sl/cryptobox-server-feature-volume_mount.po b/plugins/volume_mount/intl/sl/cryptobox-server-feature-volume_mount.po
index d84e4cb..3592f75 100644
--- a/plugins/volume_mount/intl/sl/cryptobox-server-feature-volume_mount.po
+++ b/plugins/volume_mount/intl/sl/cryptobox-server-feature-volume_mount.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -94,6 +93,54 @@ msgstr ""
 msgid "The volume is currently not active."
 msgstr ""
 
-#: WarningMessage.InvalidContainerType.Link.Rel
-msgid "volume_format_fs"
+#: Title.Mount
+msgid "Open volume"
+msgstr ""
+
+#: Title.Umount
+msgid "Turn on the volume"
+msgstr ""
+
+#: Button.Umount
+msgid "Close volume"
+msgstr ""
+
+#: SuccessMessage.MountDone.Title
+msgid "Volume opened"
+msgstr ""
+
+#: SuccessMessage.MountDone.Text
+msgid "The content of this volume is available now."
+msgstr ""
+
+#: SuccessMessage.UmountDone.Title
+msgid "Volume closed"
+msgstr ""
+
+#: SuccessMessage.UmountDone.Text
+msgid "The content of this volume is protected from access now."
+msgstr ""
+
+#: WarningMessage.UmountFailed.Title
+msgid "Closing failed"
+msgstr ""
+
+#: WarningMessage.UmountFailed.Text
+msgid "The volume could not be closed. Probably some files are still in use."
+msgstr ""
+
+#: WarningMessage.IsAlreadyMounted.Title
+msgid "Already open"
+msgstr ""
+
+#: WarningMessage.IsAlreadyMounted.Text
+msgid "The volume is already open."
+msgstr ""
+
+#: WarningMessage.IsNotMounted.Title
+msgid "Already closed"
+msgstr ""
+
+#: WarningMessage.IsNotMounted.Text
+msgid "The volume is already closed."
 msgstr ""
diff --git a/plugins/volume_mount/intl/sv/cryptobox-server-feature-volume_mount.po b/plugins/volume_mount/intl/sv/cryptobox-server-feature-volume_mount.po
index d84e4cb..3592f75 100644
--- a/plugins/volume_mount/intl/sv/cryptobox-server-feature-volume_mount.po
+++ b/plugins/volume_mount/intl/sv/cryptobox-server-feature-volume_mount.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -94,6 +93,54 @@ msgstr ""
 msgid "The volume is currently not active."
 msgstr ""
 
-#: WarningMessage.InvalidContainerType.Link.Rel
-msgid "volume_format_fs"
+#: Title.Mount
+msgid "Open volume"
+msgstr ""
+
+#: Title.Umount
+msgid "Turn on the volume"
+msgstr ""
+
+#: Button.Umount
+msgid "Close volume"
+msgstr ""
+
+#: SuccessMessage.MountDone.Title
+msgid "Volume opened"
+msgstr ""
+
+#: SuccessMessage.MountDone.Text
+msgid "The content of this volume is available now."
+msgstr ""
+
+#: SuccessMessage.UmountDone.Title
+msgid "Volume closed"
+msgstr ""
+
+#: SuccessMessage.UmountDone.Text
+msgid "The content of this volume is protected from access now."
+msgstr ""
+
+#: WarningMessage.UmountFailed.Title
+msgid "Closing failed"
+msgstr ""
+
+#: WarningMessage.UmountFailed.Text
+msgid "The volume could not be closed. Probably some files are still in use."
+msgstr ""
+
+#: WarningMessage.IsAlreadyMounted.Title
+msgid "Already open"
+msgstr ""
+
+#: WarningMessage.IsAlreadyMounted.Text
+msgid "The volume is already open."
+msgstr ""
+
+#: WarningMessage.IsNotMounted.Title
+msgid "Already closed"
+msgstr ""
+
+#: WarningMessage.IsNotMounted.Text
+msgid "The volume is already closed."
 msgstr ""
diff --git a/plugins/volume_mount/language.hdf b/plugins/volume_mount/language.hdf
index fc388d3..70c3f20 100644
--- a/plugins/volume_mount/language.hdf
+++ b/plugins/volume_mount/language.hdf
@@ -3,26 +3,26 @@ Link	= Activation
 
 
 Title {
-	Mount	= Activate volume
-	Umount	= Deactivate volume
+	Mount	= Open volume
+	Umount	= Turn on the volume
 }
 
 
 Button {
-	Mount	= Activate volume
-	Umount	= Deactivate volume
+	Mount	= Open volume
+	Umount	= Close volume
 }
 
 
 SuccessMessage {
 	MountDone {
-		Title	= Encrypted filesystem activated
-		Text	= The encrypted filesystem is now available.
+		Title	= Volume opened
+		Text	= The content of this volume is available now.
 	}
 
 	UmountDone {
-		Title	= Encrypted filesystem deactivated
-		Text	= The encrypted filesystem is now secured from all forms of access.
+		Title	= Volume closed
+		Text	= The content of this volume is protected from access now.
 	}
 }
 
@@ -46,18 +46,18 @@ WarningMessage {
 	}
 
 	UmountFailed {
-		Title	= Deactivation failed
-		Text	= The volume could not be deactivated. Probably some files are still in use. In case of emergency just shut down the CryptoBox!
+		Title	= Closing failed
+		Text	= The volume could not be closed. Probably some files are still in use.
 	}
 
 	IsAlreadyMounted {
-		Title	= Already active
-		Text	= The volume is already active.
+		Title	= Already open
+		Text	= The volume is already open.
 	}
 
 	IsNotMounted {
-		Title	= Inactive
-		Text	= The volume is currently not active.
+		Title	= Already closed
+		Text	= The volume is already closed.
 	}
 
 }
diff --git a/plugins/volume_mount/unittests.py b/plugins/volume_mount/unittests.py
index 2aa68f5..a531e13 100644
--- a/plugins/volume_mount/unittests.py
+++ b/plugins/volume_mount/unittests.py
@@ -28,5 +28,5 @@ class unittests(cryptobox.web.testclass.WebInterfaceTestClass):
 		url = self.url + "volume_mount?weblang=en&device=%2Fdev%2F" + self.device
 		self.register_auth(url)
 		self.cmd.go(url)
-		self.cmd.find('ctivate volume')
+		self.cmd.find('Open volume')
 
diff --git a/plugins/volume_mount/volume_mount.py b/plugins/volume_mount/volume_mount.py
index 97e4c6d..b69ca17 100644
--- a/plugins/volume_mount/volume_mount.py
+++ b/plugins/volume_mount/volume_mount.py
@@ -45,7 +45,7 @@ class volume_mount(cryptobox.plugins.base.CryptoBoxPlugin):
 			return "volume_status"
 		else:
 			self.cbox.log.info("plugin 'volume_mount' - unknown action: %s" % action)
-			return None
+			return "volume_status"
 	
 
 	def get_status(self):
@@ -89,8 +89,8 @@ class volume_mount(cryptobox.plugins.base.CryptoBoxPlugin):
 			self.cbox.log.info("the device (%s) is already mounted" % self.device)
 			return "volume_status"
 		if not pw:
-			self.dataset["Data.Warning"] = "EmptyPassword"
-			self.log.info("no password was supplied for mounting of device: '%s'" % self.device)
+			self.hdf["Data.Warning"] = "EmptyPassword"
+			self.cbox.log.info("no password was supplied for mounting of device: '%s'" % self.device)
 			return "volume_status"
 		if self.container.get_type() != cbxContainer.CONTAINERTYPES["luks"]:
 			## not a luks container - fail silently
diff --git a/plugins/volume_props/intl/cs/cryptobox-server-feature-volume_props.po b/plugins/volume_props/intl/cs/cryptobox-server-feature-volume_props.po
index b9b0ce1..d4d2e7e 100644
--- a/plugins/volume_props/intl/cs/cryptobox-server-feature-volume_props.po
+++ b/plugins/volume_props/intl/cs/cryptobox-server-feature-volume_props.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/volume_props/intl/da/cryptobox-server-feature-volume_props.po b/plugins/volume_props/intl/da/cryptobox-server-feature-volume_props.po
index b9b0ce1..d4d2e7e 100644
--- a/plugins/volume_props/intl/da/cryptobox-server-feature-volume_props.po
+++ b/plugins/volume_props/intl/da/cryptobox-server-feature-volume_props.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/volume_props/intl/de/cryptobox-server-feature-volume_props.po b/plugins/volume_props/intl/de/cryptobox-server-feature-volume_props.po
index b9b0ce1..d4d2e7e 100644
--- a/plugins/volume_props/intl/de/cryptobox-server-feature-volume_props.po
+++ b/plugins/volume_props/intl/de/cryptobox-server-feature-volume_props.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/volume_props/intl/en/cryptobox-server-feature-volume_props.po b/plugins/volume_props/intl/en/cryptobox-server-feature-volume_props.po
index 8f59c5c..2441009 100644
--- a/plugins/volume_props/intl/en/cryptobox-server-feature-volume_props.po
+++ b/plugins/volume_props/intl/en/cryptobox-server-feature-volume_props.po
@@ -1,10 +1,9 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: CryptoBox-Server 0.3\n"
 "Report-Msgid-Bugs-To: translate@cryptobox.org\n"
-"POT-Creation-Date: 2006-11-28 05:03+0100\n"
+"POT-Creation-Date: 2006-11-28 05:04+0100\n"
 "PO-Revision-Date: 2006-11-29 19:31+0100\n"
 "Last-Translator: Lars Kruse <devel@sumpfralle.de>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -12,7 +11,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 0.10.1\n"
+"X-Generator: Translate Toolkit 0.10.1\n"
 
 #: Name
 msgid "Volume properties"
diff --git a/plugins/volume_props/intl/es/cryptobox-server-feature-volume_props.po b/plugins/volume_props/intl/es/cryptobox-server-feature-volume_props.po
index b9b0ce1..d4d2e7e 100644
--- a/plugins/volume_props/intl/es/cryptobox-server-feature-volume_props.po
+++ b/plugins/volume_props/intl/es/cryptobox-server-feature-volume_props.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/volume_props/intl/fi/cryptobox-server-feature-volume_props.po b/plugins/volume_props/intl/fi/cryptobox-server-feature-volume_props.po
index b9b0ce1..d4d2e7e 100644
--- a/plugins/volume_props/intl/fi/cryptobox-server-feature-volume_props.po
+++ b/plugins/volume_props/intl/fi/cryptobox-server-feature-volume_props.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/volume_props/intl/fr/cryptobox-server-feature-volume_props.po b/plugins/volume_props/intl/fr/cryptobox-server-feature-volume_props.po
index b9b0ce1..d4d2e7e 100644
--- a/plugins/volume_props/intl/fr/cryptobox-server-feature-volume_props.po
+++ b/plugins/volume_props/intl/fr/cryptobox-server-feature-volume_props.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/volume_props/intl/hu/cryptobox-server-feature-volume_props.po b/plugins/volume_props/intl/hu/cryptobox-server-feature-volume_props.po
index b9b0ce1..d4d2e7e 100644
--- a/plugins/volume_props/intl/hu/cryptobox-server-feature-volume_props.po
+++ b/plugins/volume_props/intl/hu/cryptobox-server-feature-volume_props.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/volume_props/intl/it/cryptobox-server-feature-volume_props.po b/plugins/volume_props/intl/it/cryptobox-server-feature-volume_props.po
index b9b0ce1..d4d2e7e 100644
--- a/plugins/volume_props/intl/it/cryptobox-server-feature-volume_props.po
+++ b/plugins/volume_props/intl/it/cryptobox-server-feature-volume_props.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/volume_props/intl/ja/cryptobox-server-feature-volume_props.po b/plugins/volume_props/intl/ja/cryptobox-server-feature-volume_props.po
index b9b0ce1..d4d2e7e 100644
--- a/plugins/volume_props/intl/ja/cryptobox-server-feature-volume_props.po
+++ b/plugins/volume_props/intl/ja/cryptobox-server-feature-volume_props.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/volume_props/intl/nl/cryptobox-server-feature-volume_props.po b/plugins/volume_props/intl/nl/cryptobox-server-feature-volume_props.po
index b9b0ce1..d4d2e7e 100644
--- a/plugins/volume_props/intl/nl/cryptobox-server-feature-volume_props.po
+++ b/plugins/volume_props/intl/nl/cryptobox-server-feature-volume_props.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/volume_props/intl/pl/cryptobox-server-feature-volume_props.po b/plugins/volume_props/intl/pl/cryptobox-server-feature-volume_props.po
index b9b0ce1..d4d2e7e 100644
--- a/plugins/volume_props/intl/pl/cryptobox-server-feature-volume_props.po
+++ b/plugins/volume_props/intl/pl/cryptobox-server-feature-volume_props.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/volume_props/intl/pt/cryptobox-server-feature-volume_props.po b/plugins/volume_props/intl/pt/cryptobox-server-feature-volume_props.po
index b9b0ce1..d4d2e7e 100644
--- a/plugins/volume_props/intl/pt/cryptobox-server-feature-volume_props.po
+++ b/plugins/volume_props/intl/pt/cryptobox-server-feature-volume_props.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/volume_props/intl/ru/cryptobox-server-feature-volume_props.po b/plugins/volume_props/intl/ru/cryptobox-server-feature-volume_props.po
index b9b0ce1..d4d2e7e 100644
--- a/plugins/volume_props/intl/ru/cryptobox-server-feature-volume_props.po
+++ b/plugins/volume_props/intl/ru/cryptobox-server-feature-volume_props.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/volume_props/intl/sl/cryptobox-server-feature-volume_props.po b/plugins/volume_props/intl/sl/cryptobox-server-feature-volume_props.po
index b9b0ce1..d4d2e7e 100644
--- a/plugins/volume_props/intl/sl/cryptobox-server-feature-volume_props.po
+++ b/plugins/volume_props/intl/sl/cryptobox-server-feature-volume_props.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/volume_props/intl/sv/cryptobox-server-feature-volume_props.po b/plugins/volume_props/intl/sv/cryptobox-server-feature-volume_props.po
index b9b0ce1..d4d2e7e 100644
--- a/plugins/volume_props/intl/sv/cryptobox-server-feature-volume_props.po
+++ b/plugins/volume_props/intl/sv/cryptobox-server-feature-volume_props.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
diff --git a/plugins/volume_rename/intl/cryptobox-server-feature-volume_rename.pot b/plugins/volume_rename/intl/cryptobox-server-feature-volume_rename.pot
index c7cb653..1116748 100644
--- a/plugins/volume_rename/intl/cryptobox-server-feature-volume_rename.pot
+++ b/plugins/volume_rename/intl/cryptobox-server-feature-volume_rename.pot
@@ -36,22 +36,6 @@ msgstr ""
 msgid "Deactivate volume now"
 msgstr ""
 
-#: AdviceMessage.NoRenameIfActive.Link.Attr1.name
-msgid "action"
-msgstr ""
-
-#: AdviceMessage.NoRenameIfActive.Link.Attr1.value
-msgid "umount"
-msgstr ""
-
-#: AdviceMessage.NoRenameIfActive.Link.Attr2.name
-msgid "redirect"
-msgstr ""
-
-#: AdviceMessage.NoRenameIfActive.Link.Attr2.value
-msgid "volume_rename"
-msgstr ""
-
 #: SuccessMessage.VolumeNameChanged.Title
 msgid "Name changed"
 msgstr ""
@@ -88,6 +72,10 @@ msgstr ""
 msgid "The new name is already in use by another volume."
 msgstr ""
 
-#: AdviceMessage.NoRenameIfActive.Link.Rel
-msgid "volume_mount"
+#: AdviceMessage.NoRenameIfActive.Text
+msgid "You can not rename a volume while it is open."
+msgstr ""
+
+#: WarningMessage.NoRenameIfActive.Text
+msgid "You may not rename a volume while it is open."
 msgstr ""
diff --git a/plugins/volume_rename/intl/cs/cryptobox-server-feature-volume_rename.po b/plugins/volume_rename/intl/cs/cryptobox-server-feature-volume_rename.po
index 3b5c4e0..38f9c2c 100644
--- a/plugins/volume_rename/intl/cs/cryptobox-server-feature-volume_rename.po
+++ b/plugins/volume_rename/intl/cs/cryptobox-server-feature-volume_rename.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -38,22 +37,6 @@ msgstr ""
 msgid "Deactivate volume now"
 msgstr ""
 
-#: AdviceMessage.NoRenameIfActive.Link.Attr1.name
-msgid "action"
-msgstr ""
-
-#: AdviceMessage.NoRenameIfActive.Link.Attr1.value
-msgid "umount"
-msgstr ""
-
-#: AdviceMessage.NoRenameIfActive.Link.Attr2.name
-msgid "redirect"
-msgstr ""
-
-#: AdviceMessage.NoRenameIfActive.Link.Attr2.value
-msgid "volume_rename"
-msgstr ""
-
 #: SuccessMessage.VolumeNameChanged.Title
 msgid "Name changed"
 msgstr ""
@@ -90,6 +73,10 @@ msgstr ""
 msgid "The new name is already in use by another volume."
 msgstr ""
 
-#: AdviceMessage.NoRenameIfActive.Link.Rel
-msgid "volume_mount"
+#: AdviceMessage.NoRenameIfActive.Text
+msgid "You can not rename a volume while it is open."
+msgstr ""
+
+#: WarningMessage.NoRenameIfActive.Text
+msgid "You may not rename a volume while it is open."
 msgstr ""
diff --git a/plugins/volume_rename/intl/da/cryptobox-server-feature-volume_rename.po b/plugins/volume_rename/intl/da/cryptobox-server-feature-volume_rename.po
index 3b5c4e0..38f9c2c 100644
--- a/plugins/volume_rename/intl/da/cryptobox-server-feature-volume_rename.po
+++ b/plugins/volume_rename/intl/da/cryptobox-server-feature-volume_rename.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -38,22 +37,6 @@ msgstr ""
 msgid "Deactivate volume now"
 msgstr ""
 
-#: AdviceMessage.NoRenameIfActive.Link.Attr1.name
-msgid "action"
-msgstr ""
-
-#: AdviceMessage.NoRenameIfActive.Link.Attr1.value
-msgid "umount"
-msgstr ""
-
-#: AdviceMessage.NoRenameIfActive.Link.Attr2.name
-msgid "redirect"
-msgstr ""
-
-#: AdviceMessage.NoRenameIfActive.Link.Attr2.value
-msgid "volume_rename"
-msgstr ""
-
 #: SuccessMessage.VolumeNameChanged.Title
 msgid "Name changed"
 msgstr ""
@@ -90,6 +73,10 @@ msgstr ""
 msgid "The new name is already in use by another volume."
 msgstr ""
 
-#: AdviceMessage.NoRenameIfActive.Link.Rel
-msgid "volume_mount"
+#: AdviceMessage.NoRenameIfActive.Text
+msgid "You can not rename a volume while it is open."
+msgstr ""
+
+#: WarningMessage.NoRenameIfActive.Text
+msgid "You may not rename a volume while it is open."
 msgstr ""
diff --git a/plugins/volume_rename/intl/de/cryptobox-server-feature-volume_rename.po b/plugins/volume_rename/intl/de/cryptobox-server-feature-volume_rename.po
index 3b5c4e0..38f9c2c 100644
--- a/plugins/volume_rename/intl/de/cryptobox-server-feature-volume_rename.po
+++ b/plugins/volume_rename/intl/de/cryptobox-server-feature-volume_rename.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -38,22 +37,6 @@ msgstr ""
 msgid "Deactivate volume now"
 msgstr ""
 
-#: AdviceMessage.NoRenameIfActive.Link.Attr1.name
-msgid "action"
-msgstr ""
-
-#: AdviceMessage.NoRenameIfActive.Link.Attr1.value
-msgid "umount"
-msgstr ""
-
-#: AdviceMessage.NoRenameIfActive.Link.Attr2.name
-msgid "redirect"
-msgstr ""
-
-#: AdviceMessage.NoRenameIfActive.Link.Attr2.value
-msgid "volume_rename"
-msgstr ""
-
 #: SuccessMessage.VolumeNameChanged.Title
 msgid "Name changed"
 msgstr ""
@@ -90,6 +73,10 @@ msgstr ""
 msgid "The new name is already in use by another volume."
 msgstr ""
 
-#: AdviceMessage.NoRenameIfActive.Link.Rel
-msgid "volume_mount"
+#: AdviceMessage.NoRenameIfActive.Text
+msgid "You can not rename a volume while it is open."
+msgstr ""
+
+#: WarningMessage.NoRenameIfActive.Text
+msgid "You may not rename a volume while it is open."
 msgstr ""
diff --git a/plugins/volume_rename/intl/en/cryptobox-server-feature-volume_rename.po b/plugins/volume_rename/intl/en/cryptobox-server-feature-volume_rename.po
index 6016346..0adca79 100644
--- a/plugins/volume_rename/intl/en/cryptobox-server-feature-volume_rename.po
+++ b/plugins/volume_rename/intl/en/cryptobox-server-feature-volume_rename.po
@@ -1,10 +1,9 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: CryptoBox-Server 0.3\n"
 "Report-Msgid-Bugs-To: translate@cryptobox.org\n"
-"POT-Creation-Date: 2006-11-28 05:03+0100\n"
+"POT-Creation-Date: 2006-11-28 05:04+0100\n"
 "PO-Revision-Date: 2006-11-29 19:31+0100\n"
 "Last-Translator: Lars Kruse <devel@sumpfralle.de>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -12,7 +11,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 0.10.1\n"
+"X-Generator: Translate Toolkit 0.10.1\n"
 
 #: Name
 msgid "Rename volume"
@@ -38,22 +37,6 @@ msgstr "You can not rename a volume while it is active."
 msgid "Deactivate volume now"
 msgstr "Deactivate volume now"
 
-#: AdviceMessage.NoRenameIfActive.Link.Attr1.name
-msgid "action"
-msgstr "action"
-
-#: AdviceMessage.NoRenameIfActive.Link.Attr1.value
-msgid "umount"
-msgstr "umount"
-
-#: AdviceMessage.NoRenameIfActive.Link.Attr2.name
-msgid "redirect"
-msgstr "redirect"
-
-#: AdviceMessage.NoRenameIfActive.Link.Attr2.value
-msgid "volume_rename"
-msgstr "volume_rename"
-
 #: SuccessMessage.VolumeNameChanged.Title
 msgid "Name changed"
 msgstr "Name changed"
@@ -79,12 +62,8 @@ msgid "The supplied new name of the container was invalid. Please try again!"
 msgstr "The supplied new name of the container was invalid. Please try again!"
 
 #: WarningMessage.SetVolumeNameFailed.Text
-msgid ""
-"Could not change the name of the container. Take a look at the log files for "
-"details."
-msgstr ""
-"Could not change the name of the container. Take a look at the log files for "
-"details."
+msgid "Could not change the name of the container. Take a look at the log files for details."
+msgstr "Could not change the name of the container. Take a look at the log files for details."
 
 #: WarningMessage.VolumeNameIsInUse.Title
 msgid "Could not change volume name"
@@ -94,6 +73,27 @@ msgstr "Could not change volume name"
 msgid "The new name is already in use by another volume."
 msgstr "The new name is already in use by another volume."
 
-#: AdviceMessage.NoRenameIfActive.Link.Rel
-msgid "volume_mount"
-msgstr "volume_mount"
+#: AdviceMessage.NoRenameIfActive.Text
+#, fuzzy
+msgid "You can not rename a volume while it is open."
+msgstr "You can not rename a volume while it is active."
+
+#: WarningMessage.NoRenameIfActive.Text
+#, fuzzy
+msgid "You may not rename a volume while it is open."
+msgstr "You may not rename a volume while it is active."
+
+#~ msgid "action"
+#~ msgstr "action"
+
+#~ msgid "umount"
+#~ msgstr "umount"
+
+#~ msgid "redirect"
+#~ msgstr "redirect"
+
+#~ msgid "volume_rename"
+#~ msgstr "volume_rename"
+
+#~ msgid "volume_mount"
+#~ msgstr "volume_mount"
diff --git a/plugins/volume_rename/intl/es/cryptobox-server-feature-volume_rename.po b/plugins/volume_rename/intl/es/cryptobox-server-feature-volume_rename.po
index 3b5c4e0..38f9c2c 100644
--- a/plugins/volume_rename/intl/es/cryptobox-server-feature-volume_rename.po
+++ b/plugins/volume_rename/intl/es/cryptobox-server-feature-volume_rename.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -38,22 +37,6 @@ msgstr ""
 msgid "Deactivate volume now"
 msgstr ""
 
-#: AdviceMessage.NoRenameIfActive.Link.Attr1.name
-msgid "action"
-msgstr ""
-
-#: AdviceMessage.NoRenameIfActive.Link.Attr1.value
-msgid "umount"
-msgstr ""
-
-#: AdviceMessage.NoRenameIfActive.Link.Attr2.name
-msgid "redirect"
-msgstr ""
-
-#: AdviceMessage.NoRenameIfActive.Link.Attr2.value
-msgid "volume_rename"
-msgstr ""
-
 #: SuccessMessage.VolumeNameChanged.Title
 msgid "Name changed"
 msgstr ""
@@ -90,6 +73,10 @@ msgstr ""
 msgid "The new name is already in use by another volume."
 msgstr ""
 
-#: AdviceMessage.NoRenameIfActive.Link.Rel
-msgid "volume_mount"
+#: AdviceMessage.NoRenameIfActive.Text
+msgid "You can not rename a volume while it is open."
+msgstr ""
+
+#: WarningMessage.NoRenameIfActive.Text
+msgid "You may not rename a volume while it is open."
 msgstr ""
diff --git a/plugins/volume_rename/intl/fi/cryptobox-server-feature-volume_rename.po b/plugins/volume_rename/intl/fi/cryptobox-server-feature-volume_rename.po
index 3b5c4e0..38f9c2c 100644
--- a/plugins/volume_rename/intl/fi/cryptobox-server-feature-volume_rename.po
+++ b/plugins/volume_rename/intl/fi/cryptobox-server-feature-volume_rename.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -38,22 +37,6 @@ msgstr ""
 msgid "Deactivate volume now"
 msgstr ""
 
-#: AdviceMessage.NoRenameIfActive.Link.Attr1.name
-msgid "action"
-msgstr ""
-
-#: AdviceMessage.NoRenameIfActive.Link.Attr1.value
-msgid "umount"
-msgstr ""
-
-#: AdviceMessage.NoRenameIfActive.Link.Attr2.name
-msgid "redirect"
-msgstr ""
-
-#: AdviceMessage.NoRenameIfActive.Link.Attr2.value
-msgid "volume_rename"
-msgstr ""
-
 #: SuccessMessage.VolumeNameChanged.Title
 msgid "Name changed"
 msgstr ""
@@ -90,6 +73,10 @@ msgstr ""
 msgid "The new name is already in use by another volume."
 msgstr ""
 
-#: AdviceMessage.NoRenameIfActive.Link.Rel
-msgid "volume_mount"
+#: AdviceMessage.NoRenameIfActive.Text
+msgid "You can not rename a volume while it is open."
+msgstr ""
+
+#: WarningMessage.NoRenameIfActive.Text
+msgid "You may not rename a volume while it is open."
 msgstr ""
diff --git a/plugins/volume_rename/intl/fr/cryptobox-server-feature-volume_rename.po b/plugins/volume_rename/intl/fr/cryptobox-server-feature-volume_rename.po
index 3b5c4e0..38f9c2c 100644
--- a/plugins/volume_rename/intl/fr/cryptobox-server-feature-volume_rename.po
+++ b/plugins/volume_rename/intl/fr/cryptobox-server-feature-volume_rename.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -38,22 +37,6 @@ msgstr ""
 msgid "Deactivate volume now"
 msgstr ""
 
-#: AdviceMessage.NoRenameIfActive.Link.Attr1.name
-msgid "action"
-msgstr ""
-
-#: AdviceMessage.NoRenameIfActive.Link.Attr1.value
-msgid "umount"
-msgstr ""
-
-#: AdviceMessage.NoRenameIfActive.Link.Attr2.name
-msgid "redirect"
-msgstr ""
-
-#: AdviceMessage.NoRenameIfActive.Link.Attr2.value
-msgid "volume_rename"
-msgstr ""
-
 #: SuccessMessage.VolumeNameChanged.Title
 msgid "Name changed"
 msgstr ""
@@ -90,6 +73,10 @@ msgstr ""
 msgid "The new name is already in use by another volume."
 msgstr ""
 
-#: AdviceMessage.NoRenameIfActive.Link.Rel
-msgid "volume_mount"
+#: AdviceMessage.NoRenameIfActive.Text
+msgid "You can not rename a volume while it is open."
+msgstr ""
+
+#: WarningMessage.NoRenameIfActive.Text
+msgid "You may not rename a volume while it is open."
 msgstr ""
diff --git a/plugins/volume_rename/intl/hu/cryptobox-server-feature-volume_rename.po b/plugins/volume_rename/intl/hu/cryptobox-server-feature-volume_rename.po
index 3b5c4e0..38f9c2c 100644
--- a/plugins/volume_rename/intl/hu/cryptobox-server-feature-volume_rename.po
+++ b/plugins/volume_rename/intl/hu/cryptobox-server-feature-volume_rename.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -38,22 +37,6 @@ msgstr ""
 msgid "Deactivate volume now"
 msgstr ""
 
-#: AdviceMessage.NoRenameIfActive.Link.Attr1.name
-msgid "action"
-msgstr ""
-
-#: AdviceMessage.NoRenameIfActive.Link.Attr1.value
-msgid "umount"
-msgstr ""
-
-#: AdviceMessage.NoRenameIfActive.Link.Attr2.name
-msgid "redirect"
-msgstr ""
-
-#: AdviceMessage.NoRenameIfActive.Link.Attr2.value
-msgid "volume_rename"
-msgstr ""
-
 #: SuccessMessage.VolumeNameChanged.Title
 msgid "Name changed"
 msgstr ""
@@ -90,6 +73,10 @@ msgstr ""
 msgid "The new name is already in use by another volume."
 msgstr ""
 
-#: AdviceMessage.NoRenameIfActive.Link.Rel
-msgid "volume_mount"
+#: AdviceMessage.NoRenameIfActive.Text
+msgid "You can not rename a volume while it is open."
+msgstr ""
+
+#: WarningMessage.NoRenameIfActive.Text
+msgid "You may not rename a volume while it is open."
 msgstr ""
diff --git a/plugins/volume_rename/intl/it/cryptobox-server-feature-volume_rename.po b/plugins/volume_rename/intl/it/cryptobox-server-feature-volume_rename.po
index 3b5c4e0..38f9c2c 100644
--- a/plugins/volume_rename/intl/it/cryptobox-server-feature-volume_rename.po
+++ b/plugins/volume_rename/intl/it/cryptobox-server-feature-volume_rename.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -38,22 +37,6 @@ msgstr ""
 msgid "Deactivate volume now"
 msgstr ""
 
-#: AdviceMessage.NoRenameIfActive.Link.Attr1.name
-msgid "action"
-msgstr ""
-
-#: AdviceMessage.NoRenameIfActive.Link.Attr1.value
-msgid "umount"
-msgstr ""
-
-#: AdviceMessage.NoRenameIfActive.Link.Attr2.name
-msgid "redirect"
-msgstr ""
-
-#: AdviceMessage.NoRenameIfActive.Link.Attr2.value
-msgid "volume_rename"
-msgstr ""
-
 #: SuccessMessage.VolumeNameChanged.Title
 msgid "Name changed"
 msgstr ""
@@ -90,6 +73,10 @@ msgstr ""
 msgid "The new name is already in use by another volume."
 msgstr ""
 
-#: AdviceMessage.NoRenameIfActive.Link.Rel
-msgid "volume_mount"
+#: AdviceMessage.NoRenameIfActive.Text
+msgid "You can not rename a volume while it is open."
+msgstr ""
+
+#: WarningMessage.NoRenameIfActive.Text
+msgid "You may not rename a volume while it is open."
 msgstr ""
diff --git a/plugins/volume_rename/intl/ja/cryptobox-server-feature-volume_rename.po b/plugins/volume_rename/intl/ja/cryptobox-server-feature-volume_rename.po
index 3b5c4e0..38f9c2c 100644
--- a/plugins/volume_rename/intl/ja/cryptobox-server-feature-volume_rename.po
+++ b/plugins/volume_rename/intl/ja/cryptobox-server-feature-volume_rename.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -38,22 +37,6 @@ msgstr ""
 msgid "Deactivate volume now"
 msgstr ""
 
-#: AdviceMessage.NoRenameIfActive.Link.Attr1.name
-msgid "action"
-msgstr ""
-
-#: AdviceMessage.NoRenameIfActive.Link.Attr1.value
-msgid "umount"
-msgstr ""
-
-#: AdviceMessage.NoRenameIfActive.Link.Attr2.name
-msgid "redirect"
-msgstr ""
-
-#: AdviceMessage.NoRenameIfActive.Link.Attr2.value
-msgid "volume_rename"
-msgstr ""
-
 #: SuccessMessage.VolumeNameChanged.Title
 msgid "Name changed"
 msgstr ""
@@ -90,6 +73,10 @@ msgstr ""
 msgid "The new name is already in use by another volume."
 msgstr ""
 
-#: AdviceMessage.NoRenameIfActive.Link.Rel
-msgid "volume_mount"
+#: AdviceMessage.NoRenameIfActive.Text
+msgid "You can not rename a volume while it is open."
+msgstr ""
+
+#: WarningMessage.NoRenameIfActive.Text
+msgid "You may not rename a volume while it is open."
 msgstr ""
diff --git a/plugins/volume_rename/intl/nl/cryptobox-server-feature-volume_rename.po b/plugins/volume_rename/intl/nl/cryptobox-server-feature-volume_rename.po
index 3b5c4e0..38f9c2c 100644
--- a/plugins/volume_rename/intl/nl/cryptobox-server-feature-volume_rename.po
+++ b/plugins/volume_rename/intl/nl/cryptobox-server-feature-volume_rename.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -38,22 +37,6 @@ msgstr ""
 msgid "Deactivate volume now"
 msgstr ""
 
-#: AdviceMessage.NoRenameIfActive.Link.Attr1.name
-msgid "action"
-msgstr ""
-
-#: AdviceMessage.NoRenameIfActive.Link.Attr1.value
-msgid "umount"
-msgstr ""
-
-#: AdviceMessage.NoRenameIfActive.Link.Attr2.name
-msgid "redirect"
-msgstr ""
-
-#: AdviceMessage.NoRenameIfActive.Link.Attr2.value
-msgid "volume_rename"
-msgstr ""
-
 #: SuccessMessage.VolumeNameChanged.Title
 msgid "Name changed"
 msgstr ""
@@ -90,6 +73,10 @@ msgstr ""
 msgid "The new name is already in use by another volume."
 msgstr ""
 
-#: AdviceMessage.NoRenameIfActive.Link.Rel
-msgid "volume_mount"
+#: AdviceMessage.NoRenameIfActive.Text
+msgid "You can not rename a volume while it is open."
+msgstr ""
+
+#: WarningMessage.NoRenameIfActive.Text
+msgid "You may not rename a volume while it is open."
 msgstr ""
diff --git a/plugins/volume_rename/intl/pl/cryptobox-server-feature-volume_rename.po b/plugins/volume_rename/intl/pl/cryptobox-server-feature-volume_rename.po
index 3b5c4e0..38f9c2c 100644
--- a/plugins/volume_rename/intl/pl/cryptobox-server-feature-volume_rename.po
+++ b/plugins/volume_rename/intl/pl/cryptobox-server-feature-volume_rename.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -38,22 +37,6 @@ msgstr ""
 msgid "Deactivate volume now"
 msgstr ""
 
-#: AdviceMessage.NoRenameIfActive.Link.Attr1.name
-msgid "action"
-msgstr ""
-
-#: AdviceMessage.NoRenameIfActive.Link.Attr1.value
-msgid "umount"
-msgstr ""
-
-#: AdviceMessage.NoRenameIfActive.Link.Attr2.name
-msgid "redirect"
-msgstr ""
-
-#: AdviceMessage.NoRenameIfActive.Link.Attr2.value
-msgid "volume_rename"
-msgstr ""
-
 #: SuccessMessage.VolumeNameChanged.Title
 msgid "Name changed"
 msgstr ""
@@ -90,6 +73,10 @@ msgstr ""
 msgid "The new name is already in use by another volume."
 msgstr ""
 
-#: AdviceMessage.NoRenameIfActive.Link.Rel
-msgid "volume_mount"
+#: AdviceMessage.NoRenameIfActive.Text
+msgid "You can not rename a volume while it is open."
+msgstr ""
+
+#: WarningMessage.NoRenameIfActive.Text
+msgid "You may not rename a volume while it is open."
 msgstr ""
diff --git a/plugins/volume_rename/intl/pt/cryptobox-server-feature-volume_rename.po b/plugins/volume_rename/intl/pt/cryptobox-server-feature-volume_rename.po
index 3b5c4e0..38f9c2c 100644
--- a/plugins/volume_rename/intl/pt/cryptobox-server-feature-volume_rename.po
+++ b/plugins/volume_rename/intl/pt/cryptobox-server-feature-volume_rename.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -38,22 +37,6 @@ msgstr ""
 msgid "Deactivate volume now"
 msgstr ""
 
-#: AdviceMessage.NoRenameIfActive.Link.Attr1.name
-msgid "action"
-msgstr ""
-
-#: AdviceMessage.NoRenameIfActive.Link.Attr1.value
-msgid "umount"
-msgstr ""
-
-#: AdviceMessage.NoRenameIfActive.Link.Attr2.name
-msgid "redirect"
-msgstr ""
-
-#: AdviceMessage.NoRenameIfActive.Link.Attr2.value
-msgid "volume_rename"
-msgstr ""
-
 #: SuccessMessage.VolumeNameChanged.Title
 msgid "Name changed"
 msgstr ""
@@ -90,6 +73,10 @@ msgstr ""
 msgid "The new name is already in use by another volume."
 msgstr ""
 
-#: AdviceMessage.NoRenameIfActive.Link.Rel
-msgid "volume_mount"
+#: AdviceMessage.NoRenameIfActive.Text
+msgid "You can not rename a volume while it is open."
+msgstr ""
+
+#: WarningMessage.NoRenameIfActive.Text
+msgid "You may not rename a volume while it is open."
 msgstr ""
diff --git a/plugins/volume_rename/intl/ru/cryptobox-server-feature-volume_rename.po b/plugins/volume_rename/intl/ru/cryptobox-server-feature-volume_rename.po
index 3b5c4e0..38f9c2c 100644
--- a/plugins/volume_rename/intl/ru/cryptobox-server-feature-volume_rename.po
+++ b/plugins/volume_rename/intl/ru/cryptobox-server-feature-volume_rename.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -38,22 +37,6 @@ msgstr ""
 msgid "Deactivate volume now"
 msgstr ""
 
-#: AdviceMessage.NoRenameIfActive.Link.Attr1.name
-msgid "action"
-msgstr ""
-
-#: AdviceMessage.NoRenameIfActive.Link.Attr1.value
-msgid "umount"
-msgstr ""
-
-#: AdviceMessage.NoRenameIfActive.Link.Attr2.name
-msgid "redirect"
-msgstr ""
-
-#: AdviceMessage.NoRenameIfActive.Link.Attr2.value
-msgid "volume_rename"
-msgstr ""
-
 #: SuccessMessage.VolumeNameChanged.Title
 msgid "Name changed"
 msgstr ""
@@ -90,6 +73,10 @@ msgstr ""
 msgid "The new name is already in use by another volume."
 msgstr ""
 
-#: AdviceMessage.NoRenameIfActive.Link.Rel
-msgid "volume_mount"
+#: AdviceMessage.NoRenameIfActive.Text
+msgid "You can not rename a volume while it is open."
+msgstr ""
+
+#: WarningMessage.NoRenameIfActive.Text
+msgid "You may not rename a volume while it is open."
 msgstr ""
diff --git a/plugins/volume_rename/intl/sl/cryptobox-server-feature-volume_rename.po b/plugins/volume_rename/intl/sl/cryptobox-server-feature-volume_rename.po
index 3b5c4e0..38f9c2c 100644
--- a/plugins/volume_rename/intl/sl/cryptobox-server-feature-volume_rename.po
+++ b/plugins/volume_rename/intl/sl/cryptobox-server-feature-volume_rename.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -38,22 +37,6 @@ msgstr ""
 msgid "Deactivate volume now"
 msgstr ""
 
-#: AdviceMessage.NoRenameIfActive.Link.Attr1.name
-msgid "action"
-msgstr ""
-
-#: AdviceMessage.NoRenameIfActive.Link.Attr1.value
-msgid "umount"
-msgstr ""
-
-#: AdviceMessage.NoRenameIfActive.Link.Attr2.name
-msgid "redirect"
-msgstr ""
-
-#: AdviceMessage.NoRenameIfActive.Link.Attr2.value
-msgid "volume_rename"
-msgstr ""
-
 #: SuccessMessage.VolumeNameChanged.Title
 msgid "Name changed"
 msgstr ""
@@ -90,6 +73,10 @@ msgstr ""
 msgid "The new name is already in use by another volume."
 msgstr ""
 
-#: AdviceMessage.NoRenameIfActive.Link.Rel
-msgid "volume_mount"
+#: AdviceMessage.NoRenameIfActive.Text
+msgid "You can not rename a volume while it is open."
+msgstr ""
+
+#: WarningMessage.NoRenameIfActive.Text
+msgid "You may not rename a volume while it is open."
 msgstr ""
diff --git a/plugins/volume_rename/intl/sv/cryptobox-server-feature-volume_rename.po b/plugins/volume_rename/intl/sv/cryptobox-server-feature-volume_rename.po
index 3b5c4e0..38f9c2c 100644
--- a/plugins/volume_rename/intl/sv/cryptobox-server-feature-volume_rename.po
+++ b/plugins/volume_rename/intl/sv/cryptobox-server-feature-volume_rename.po
@@ -1,4 +1,3 @@
-# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -38,22 +37,6 @@ msgstr ""
 msgid "Deactivate volume now"
 msgstr ""
 
-#: AdviceMessage.NoRenameIfActive.Link.Attr1.name
-msgid "action"
-msgstr ""
-
-#: AdviceMessage.NoRenameIfActive.Link.Attr1.value
-msgid "umount"
-msgstr ""
-
-#: AdviceMessage.NoRenameIfActive.Link.Attr2.name
-msgid "redirect"
-msgstr ""
-
-#: AdviceMessage.NoRenameIfActive.Link.Attr2.value
-msgid "volume_rename"
-msgstr ""
-
 #: SuccessMessage.VolumeNameChanged.Title
 msgid "Name changed"
 msgstr ""
@@ -90,6 +73,10 @@ msgstr ""
 msgid "The new name is already in use by another volume."
 msgstr ""
 
-#: AdviceMessage.NoRenameIfActive.Link.Rel
-msgid "volume_mount"
+#: AdviceMessage.NoRenameIfActive.Text
+msgid "You can not rename a volume while it is open."
+msgstr ""
+
+#: WarningMessage.NoRenameIfActive.Text
+msgid "You may not rename a volume while it is open."
 msgstr ""
diff --git a/plugins/volume_rename/language.hdf b/plugins/volume_rename/language.hdf
index 499bff8..9ce4e5d 100644
--- a/plugins/volume_rename/language.hdf
+++ b/plugins/volume_rename/language.hdf
@@ -13,7 +13,7 @@ Button {
 
 AdviceMessage {
 	NoRenameIfActive {
-		Text	= You can not rename a volume while it is active.
+		Text	= You can not rename a volume while it is open.
 		Link.Text	= Deactivate volume now
 		Link.Rel 	= volume_mount
 		Link.Attr1.name	= action
@@ -35,7 +35,7 @@ SuccessMessage {
 WarningMessage {
 	NoRenameIfActive {
 		Title	= Failed to rename the volume
-		Text	= You may not rename a volume while it is active.
+		Text	= You may not rename a volume while it is open.
 	}
 
 	InvalidVolumeName {
diff --git a/scripts/fetch_po_files.sh b/scripts/fetch_po_files.sh
index 87d0626..83d0fa1 100755
--- a/scripts/fetch_po_files.sh
+++ b/scripts/fetch_po_files.sh
@@ -1,16 +1,36 @@
 #!/bin/sh
-# this script symlinks all cbx po files to the thoraxs pootle dir
-BASEPATH="/home/cryptobox/cbx-svn/trunk"
-TARGETPATH="/home/cryptobox/pootle-files"
+#
+# this script symlinks all cbx po files to thorax' pootle dir
+# it is useful to be root for this - otherwise chown and the pootle restart will fail
+#
+
+test $# -ne 1 && echo "Usage: $(basename $0) TARGET_DIR" && exit 1
+
+test ! -d "$1" && echo "target directory does not exist: '$1'" && exit 1
+
+TARGETPATH=$1
+BASEPATH=$(cd $(dirname "$0")/..; pwd)
+
+mkdir -p ${TARGETPATH}/templates
 
 for language in `ls ${BASEPATH}/intl/` ; do
-	echo $language
+	test ! -d "${BASEPATH}/intl/${language}" && continue
+	echo "Processing $language ..."
 	[ ! -d ${TARGETPATH}/${language} ] && mkdir -p ${TARGETPATH}/${language}
-	find ${BASEPATH}/intl/${language} -name *.po -exec ln -s '{}' ${TARGETPATH}/${language}/ \; 
-	for plugin in `ls ${BASEPATH}/plugins/`; do
-		find ${BASEPATH}/plugins/${plugin}/intl/${language} -name *.po -exec ln -s '{}' ${TARGETPATH}/${language}/ \;
+	## base translation
+	find ${BASEPATH}/intl/${language} -name \*.po -exec ln -sfn '{}' ${TARGETPATH}/${language}/ \; 
+	## plugin translations
+	for plugin in $(ls ${BASEPATH}/plugins/); do
+		test ! -d "${BASEPATH}/plugins/${plugin}" && continue
+		find ${BASEPATH}/plugins/${plugin}/intl/${language} -name \*.po -exec ln -sfn '{}' ${TARGETPATH}/${language}/ \;
 	done
 done
 
+echo "Processing template files ..."
+find ${BASEPATH}/intl ${BASEPATH}/plugins -type f -name \*.pot | while read fname
+  do	ln -sfn $fname ${TARGETPATH}/templates/
+ done
+
 chown -R pootle. ${TARGETPATH}
 /etc/init.d/pootle restart
+
diff --git a/scripts/update_po_files.py b/scripts/update_po_files.py
index 7ba5db6..c6b1d65 100755
--- a/scripts/update_po_files.py
+++ b/scripts/update_po_files.py
@@ -71,6 +71,7 @@ def process_language_file(hdf_file, po_dir, textDomain):
 		pot = translate.storage.po.pofile.parsefile(pot_file)
 	def walk_hdf(prefix, node):
 		def addPoItem(hdf_node):
+			## ignore hdf values with a "LINK" attribute
 			for (key,value) in hdf_node.attrs():
 				if key == "LINK": return
 			if not hdf_node.value(): return
@@ -83,7 +84,16 @@ def process_language_file(hdf_file, po_dir, textDomain):
 				new_prefix = prefix + node.name() + '.'
 			else:
 				new_prefix = prefix
-			addPoItem(node)
+			## as the attribute feature of clearsilver does not work yet, we
+			## have to rely on magic names to prevent the translation of links
+			if not (new_prefix.endswith(".Link.Rel.") \
+					or new_prefix.endswith(".Link.Prot.") \
+					or new_prefix.endswith(".Link.Abs.") \
+					or new_prefix.endswith(".Link.Attr1.name.") \
+					or new_prefix.endswith(".Link.Attr1.value.") \
+					or new_prefix.endswith(".Link.Attr2.name.") \
+					or new_prefix.endswith(".Link.Attr2.value.")):
+				addPoItem(node)
 			walk_hdf(new_prefix, node.child())
 			node = node.next()
 	walk_hdf("",hdf)
diff --git a/setup.py b/setup.py
index 8620003..c6710c6 100644
--- a/setup.py
+++ b/setup.py
@@ -99,11 +99,11 @@ setup(
 	license	= 'GPL',
 	url	= 'http://cryptobox.org',
 	packages	= [ 'cryptobox', 'cryptobox.core', 'cryptobox.web', 'cryptobox.plugins', 'cryptobox.tests' ],
-	data_files	= getdatafiles(datadir, ['templates','www-data','lang','plugins']) + 
+	data_files	= getdatafiles(datadir, ['templates', 'www-data', 'lang', 'plugins']) + 
 		getdatafiles(confdir, ['conf-examples/cryptobox.conf']) + 
-		getdatafiles(os.path.join(confdir,'events.d'), ['event-scripts/README','event-scripts/_event_scripts_']) + 
+		getdatafiles(os.path.join(confdir,'events.d'), ['event-scripts/README', 'event-scripts/_event_scripts_']) + 
 		getdatafiles(docdir, ['doc/html']) +
-		getdatafiles(docdir, ['conf-examples','event-scripts','README','changelog','LICENSE','copyright','doc/html']) +
+		getdatafiles(docdir, ['conf-examples', 'event-scripts', 'README', 'changelog', 'LICENSE', 'copyright', 'doc/html']) +
 		get_language_files('share/locale'),
 	package_dir	= { '': 'src' },
 	scripts	= [ 'bin/CryptoBoxWebserver', 'bin/CryptoBoxRootActions' ],
diff --git a/src/cryptobox/__init__.py b/src/cryptobox/__init__.py
index c261d92..a476b56 100644
--- a/src/cryptobox/__init__.py
+++ b/src/cryptobox/__init__.py
@@ -9,5 +9,6 @@ encrypted partitions.
 __all__ = ['core', 'web', 'plugins', 'tests']
 __revision__ = "$Id$"
 
-__version__ = "0.2.99~1"
+
+__version__ = "0.2.53"
 
diff --git a/src/cryptobox/web/dataset.py b/src/cryptobox/web/dataset.py
index 2abae77..c308aa7 100644
--- a/src/cryptobox/web/dataset.py
+++ b/src/cryptobox/web/dataset.py
@@ -52,6 +52,10 @@ class WebInterfaceDataset(dict):
 		import cryptobox.web.languages
 		import cryptobox
 		self["Data.Version"] = cryptobox.__version__
+		## first: clean the dataset up - necessary if we were called more than once
+		for key in self.keys():
+			if key.startswith("Data.Languages."):
+				del self[key]
 		langs = self.cbox.prefs["WebSettings"]["Languages"][:]
 		langs.sort()
 		for (index, lang) in enumerate(langs):
@@ -119,14 +123,23 @@ class WebInterfaceDataset(dict):
 					self["Data.CurrentDisk.capacity.free"] = avail
 					self["Data.CurrentDisk.capacity.size"] = size
 					self["Data.CurrentDisk.capacity.percent"] = percent
+				else:
+					for key in self.keys():
+						if key.startswith("Data.CurrentDisk.capacity."):
+							del self[key]
 		self["Settings.LinkAttrs.device"] = device
 	
 
 	def set_containers_state(self):
 		"""Set some hdf values according to the list of available containers.
 		"""
+		## first: clean the dataset up - necessary if we were called more than once
+		for key in self.keys():
+			if key.startswith("Data.Disks."):
+				del self[key]
 		avail_counter  = 0
 		active_counter = 0
+		self.cbox.reread_container_list()
 		for container in self.cbox.get_container_list():
 			## useful if the container was changed during an action
 			container.reset_object()
@@ -153,6 +166,10 @@ class WebInterfaceDataset(dict):
 	def set_plugin_data(self):
 		"""Set some hdf values according to the available features.
 		"""
+		## first: clean the dataset up - necessary if we were called more than once
+		for key in self.keys():
+			if key.startswith("Settings.PluginList."):
+				del self[key]
 		for plugin in self.plugins:
 			entry_name = "Settings.PluginList." + plugin.get_name()
 			## first: remove all existing settings of this plugin
diff --git a/src/cryptobox/web/sites.py b/src/cryptobox/web/sites.py
index bb41cea..3018d0a 100644
--- a/src/cryptobox/web/sites.py
+++ b/src/cryptobox/web/sites.py
@@ -303,11 +303,12 @@ class WebInterfaceSites:
 				## some non-volume plugins change the internal state of other
 				## plugins - e.g.: plugin_manager
 				self.__dataset.set_plugin_data()
-				## some non-volume plugins may change the state of containers
-				self.__dataset.set_containers_state()
 				## default page for non-volume plugins is the disk selection
 				if not next_template:
 					next_template = { "plugin":"disks", "values":{} }
+			## some non-volume plugins may change the state of containers
+			## the mount plugin may change the number of active disks - for the logo
+			self.__dataset.set_containers_state()
 			## was a redirect requested?
 			if override_next_template:
 				next_template = override_next_template
@@ -488,18 +489,28 @@ class WebInterfaceSites:
 			## no translation found
 			self.cbox.log.warn("unable to load language file: %s" % err_msg)
 			return hdf
-		def walk_tree(hdf_node):
+		def walk_tree(parent_name, hdf_node):
 			"""iterate through all nodes"""
 			def translate_node(node):
 				"""turn one single string into unicode"""
+				if not node.value():
+					return
 				for (key, value) in node.attrs():
+					## ignore all nodes with the 'LINK' attribute
+					## for now clearsilver is buggy regarding attributes
+					## buggy -> parsing of a hdf file fails silently
 					if key == "LINK":
 						return
+				## as long as the attributes do not work, we have to rely on
+				## some magic names to ignore translations
+				if (parent_name == "Link") and \
+						(node.name() in ["Rel", "Prot", "Abs"]):
+					return
 				try:
-					#TODO: we should use unicode - or not?
+					#TODO: we should use unicode - or not? - turn it on later
 					#node.setValue("", translator.ugettext(node.value()))
 					## quite obscure: ugettext can handle None - gettext breaks instead
-					node.setValue("", str(translator.gettext(node.value())))
+					node.setValue("", translator.gettext(node.value()))
 				except UnicodeEncodeError, err_msg:
 					self.cbox.log.info(
 						    "Failed unicode encoding for gettext: %s - %s" \
@@ -508,9 +519,9 @@ class WebInterfaceSites:
 					node.setValue("", translator.gettext(node.value()))
 			while hdf_node:
 				translate_node(hdf_node)
-				walk_tree(hdf_node.child())
+				walk_tree(hdf_node.name(), hdf_node.child())
 				hdf_node = hdf_node.next()
-		walk_tree(hdf)
+		walk_tree("", hdf)
 
 
 	def __get_language_data(self):
diff --git a/stuff/debian-package.txt b/stuff/debian-package.txt
index a1ed266..66cedeb 100644
--- a/stuff/debian-package.txt
+++ b/stuff/debian-package.txt
@@ -23,6 +23,9 @@ same upstream version number or you will go to hell!
 
 The package files will get copied to ../tags/packages/debian/.
 
+The version number in src/cryptobox/__init__.py gets updated automatically by
+the make-deb.sh script.
+
 
 3) upload the package
 You should use dupload - it is the preferred uploading program for debian
diff --git a/templates/header.cs b/templates/header.cs
index 73596ec..44577c1 100644
--- a/templates/header.cs
+++ b/templates/header.cs
@@ -69,7 +69,10 @@
 			  else ?><?cs
 				set:logoFile = "cbx-text-logo1.png" ?><?cs
 			/if ?>
-			<img src="/cryptobox-misc/<?cs var:logoFile ?>" alt="icon: logo" />
+			<a href="<?cs call:link("", "", "", "", "") ?>" title="CryptoBox"
+					alt="CryptoBox logo">
+				<img src="/cryptobox-misc/<?cs var:logoFile ?>" alt="icon: logo" />
+			</a>
 		</td></tr></table>
 	</div></td></tr>
 
diff --git a/templates/language.hdf b/templates/language.hdf
index 8389634..23c26fc 100644
--- a/templates/language.hdf
+++ b/templates/language.hdf
@@ -13,7 +13,8 @@ Text {
 	RedirectNote		= Click here if your browser does not support automatic redirection.
 	ProjectHomePage		= Website of project
 	ProjectNote		= The CryptoBox is a project of
-	ContainerName	= Container's name
+	ContainerName	= Volume's name
+
 }
 
 
@@ -37,7 +38,9 @@ WarningMessage {
 
 	AccessDenied {
 		Title	= Invalid access credentials
-		Text	= Sorry - you are not allowed to do this!
+		Text	= Sorry - you did not enter the right credentials! (Maybe try the default setting: username=>'admin' / password=>'admin'.)
+		Link.Text	= Change password now
+		Link.Rel	= user_manager
 	}
 
 	EmptyPassword {
diff --git a/www-data/cryptobox.css b/www-data/cryptobox.css
index fd72b42..02cc586 100644
--- a/www-data/cryptobox.css
+++ b/www-data/cryptobox.css
@@ -118,6 +118,15 @@ div#footer a:hover {
 	font-size: 0.9em;
 	}
 
+#words div.message table {
+	/* without this width, the link will start immeadiately after
+	 * the message - this would be quite ugly
+	 * of course: IE breaks is a bit, as 100% are relative to the whole
+	 * screen again - but the problem is just a missing right border of
+	 * the environment warning box - hard to notice */
+	width: 100%;
+}
+
 #words div.message td.text h1 {
 	font-size: 1.5em;
 	padding: 0px;
@@ -150,7 +159,7 @@ div#footer a:hover {
 
 #EnvironmentWarning div.message {
 	text-align: left;
-	margin: 2px; 
+	margin: 0 2px 8px 2px; 
 	padding: 0 5px 0 0;
 	border: 1px solid #bbb;
 	color: #5e5e5e;
@@ -158,6 +167,15 @@ div#footer a:hover {
 	background-color: #eea;
 	}
 
+#EnvironmentWarning div.message table {
+	/* without this width, the link will start immeadiately after
+	 * the message - this would be quite ugly
+	 * of course: IE breaks is a bit, as 100% are relative to the whole
+	 * screen again - but the problem is just a missing right border of
+	 * the environment warning box - hard to notice */
+	width: 100%;
+}
+
 #EnvironmentWarning div.message td.message_symbol img {
 	width: 16px;
 	height: 16px;
@@ -426,6 +444,11 @@ table#volume_name td img {
 table#pane {
 	border: none;
 	border-collapse: collapse;
+	/* mozilla interpretes this relatively to the content part of the page
+	 * the internet explorer uses it as absolute within the whole page
+	 * 80% should be a good compromise to avoid scrollbars for 1024x768 in ie
+	 * and to get a constant page width - otherwise it would dynamically change */
+	width: 80%;
 }
 
 td#pane_left_top {