[Xfce4-commits] <thunar-volman:master> Release 0.5.0!

Jannis Pohlmann noreply at xfce.org
Sun Jul 25 20:18:02 CEST 2010


Updating branch refs/heads/master
         to 7c20da9ea8b4ba4d23f06896e03ef8a9b72abc7a (commit)
       from 40f977ffa365ff38148acd8fcf2a95b875b3c842 (commit)

commit 7c20da9ea8b4ba4d23f06896e03ef8a9b72abc7a
Author: Jannis Pohlmann <jannis at xfce.org>
Date:   Sun Jul 25 20:07:38 2010 +0200

    Release 0.5.0!

 AUTHORS                          |    1 +
 ChangeLog                        | 1564 +++++++++++++++++++++++++++++++++++---
 ChangeLog => ChangeLog.pre-git   |    0
 configure.in.in                  |   31 +-
 po/POTFILES.in                   |   19 +-
 po/ar.po                         |  449 +++++++-----
 po/ast.po                        |  546 +++++++++-----
 po/ca.po                         |  547 +++++++++-----
 po/cs.po                         |  560 +++++++++-----
 po/da.po                         |  558 +++++++++-----
 po/de.po                         |  550 +++++++++-----
 po/el.po                         |  583 +++++++++-----
 po/en_GB.po                      |  545 +++++++++-----
 po/es.po                         |  557 +++++++++-----
 po/eu.po                         |  549 +++++++++-----
 po/fi.po                         |  544 +++++++++-----
 po/fr.po                         |  561 +++++++++-----
 po/gl.po                         |  554 +++++++++-----
 po/hu.po                         |  577 +++++++++-----
 po/id.po                         |  548 +++++++++-----
 po/it.po                         |  547 +++++++++-----
 po/ja.po                         |  549 +++++++++-----
 po/lv.po                         |  543 +++++++++-----
 po/nb.po                         |  541 +++++++++-----
 po/nl.po                         |  588 +++++++++-----
 po/pl.po                         |  562 +++++++++-----
 po/pt.po                         |  553 +++++++++-----
 po/pt_BR.po                      |  571 +++++++++-----
 po/ru.po                         |  556 +++++++++-----
 po/sk.po                         |  575 +++++++++-----
 po/sq.po                         |  555 +++++++++-----
 po/sv.po                         |  557 +++++++++-----
 po/thunar-volman.pot             |  449 +++++++-----
 po/tr.po                         |  557 +++++++++-----
 po/uk.po                         |  547 +++++++++-----
 po/ur.po                         |  557 +++++++++-----
 po/ur_PK.po                      |  557 +++++++++-----
 po/zh_CN.po                      |  552 +++++++++-----
 po/zh_TW.po                      |  492 ++++++++-----
 thunar-volman/tvm-block-device.c |    7 +-
 thunar-volman/tvm-run.c          |    4 -
 thunar-volman/tvm-usb-device.c   |    6 -
 42 files changed, 13468 insertions(+), 6800 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index f442020..c76c171 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,3 +1,4 @@
+Jannis Pohlmann <jannis at xfce.org>
 Benedikt Meurer <benny at xfce.org>
 
 Portions of the code are based on code from gnome-volume-manager, written by
diff --git a/ChangeLog b/ChangeLog
index 6003758..551651a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,142 +1,1518 @@
-2008-11-09	Jannis Pohlmann <jannis at xfce.org>
+commit 40f977ffa365ff38148acd8fcf2a95b875b3c842
+Author: Jannis Pohlmann <jannis at xfce.org>
+Date:   Sun Jul 25 18:41:49 2010 +0200
 
-	* thunar-volman-settings.desktop.in.in: Remove GenericName and 
-	  X-XfceSettingsName keys.
+    Detect all devices as iPods whose ID_MODEL is prefixed with "iPod".
 
-2008-09-05	Jannis Pohlmann <jannis at xfce.org>
+commit f8b4f75b09138d8f112b3dee36f4a248897ea869
+Author: Jannis Pohlmann <jannis at xfce.org>
+Date:   Sun Jul 25 18:19:29 2010 +0200
 
-	* autogen.sh: Add git svn revision versioning support.
+    Add support for iPods with ID_MEDIA_PLAYER unset.
 
-2008-08-30	Brian Tarricone <bjt23 at cornell.edu>
+commit fd1d0913716d3b15ef9a4e604f5a81035cd8bc5a
+Author: Jannis Pohlmann <jannis at xfce.org>
+Date:   Sat Jul 24 21:45:05 2010 +0200
 
-	* thunar-volman-settings.desktop.in.in: Add keys to allow the settings
-	  dialog to show up in the new xfce settings manager.
-	* po/{thunar-volman.pot,*.po}: Update potfile and po files.
+    Improve input device detection. Patch by Nick Schermer.
 
-2008-08-12	Brian Tarricone <bjt23 at cornell.edu>
+commit 42276b42a38c551ede3986c37f67ffafb143e7f8
+Author: Jannis Pohlmann <jannis at xfce.org>
+Date:   Fri Jul 23 10:03:12 2010 +0200
 
-	* thunar-volman/{Makefile.am,tvm-block-device.c},
-	  thunar-volman/tvm-crypto-volume.{c,h}: Add support
-	  for auto-mounting encrypted volumes.  Patch from Colin
-	  Leroy.  Bug #3349.
-	* configure.in.in: Bump exo-hal version requirement to ensure
-	  we pull in an exo-mount that can handle encrypted volumes.
+    Add missing compiler and linker flags for gthread.
 
-2008-08-12	Brian Tarricone <bjt23 at cornell.edu>
+commit ec4a642dac6bdf799b868daa41a4c9c43aa2adb4
+Author: Jannis Pohlmann <jannis at xfce.org>
+Date:   Thu Jul 22 13:47:49 2010 +0200
 
-	* thunar-volman/*.h: Remove semicolons after G_BEGIN_DECLS/G_END_DECLS
-	  macros; they'd be harmful if compiled with a C++ compiler.
-	  Patch from Colin Leroy.  Bug #3349.
+    Display detection and mount notifications if libnotify is available.
 
-2008-03-15	Benedikt Meurer <benny at xfce.org>
+commit e6833035f20332b23e4e76f3eb96117680628bb8
+Author: Jannis Pohlmann <jannis at xfce.org>
+Date:   Wed Jul 21 22:55:24 2010 +0200
 
-	* thunar-volman/tvm-block-device.c: Apply patch from Tino Keitel
-	  and Colin Leroy to fix USB flash drives being incorrectly
-	  recognized as audio players. Bug #2856.
+    Add some debug output
 
-2007-12-02	Benedikt Meurer <benny at xfce.org>
+commit 45335a4707272417b3c5fbb28ffe3dd6f4926d1d
+Author: Jannis Pohlmann <jannis at xfce.org>
+Date:   Wed Jul 21 14:36:49 2010 +0200
 
-	* configure.in.in: Post-release version bump.
+    Fix path to the thunar-volman-settings executable.
 
-2007-12-02	Benedikt Meurer <benny at xfce.org>
+commit 693abb789907d8548ce22bbc8629e3ece1cd8f39
+Author: Jannis Pohlmann <jannis at xfce.org>
+Date:   Wed Jul 21 14:33:04 2010 +0200
 
-	* === Released 0.2.0 ===
-	* NEWS, configure.in.in: Bump version.
-	* THANKS: Add missing translator credits.
-	* po/*.po: Update Project-Id-Version.
+    Fix command line option handling (add code for --version).
 
-2007-10-09	Benedikt Meurer <benny at xfce.org>
+commit 3407dce340a7860de244ce2c1957f346482a1b80
+Author: Jannis Pohlmann <jannis at xfce.org>
+Date:   Wed Jul 21 14:07:36 2010 +0200
 
-	* thunar-volman/tvm-block-device.c: Properly ignore case looking
-	  for VCD, VIDEO_TS and DCIM folders. Bug #3038.
+    Make the input devices tab available again.
+    
+    Except for PDA (Palm, PocketPC) support everything is more or less
+    complete now.
 
-2007-05-20	Benedikt Meurer <benny at xfce.org>
+commit 24890c59eb95b8488e0cacdc43ead2c13fec9523
+Author: Jannis Pohlmann <jannis at xfce.org>
+Date:   Wed Jul 21 13:59:18 2010 +0200
 
-	* thunar-volman/tvm-preferences.c(tvm_preferences_set_property):
-	  Properly initialize values to their defaults prior to comparing
-	  them with a (probably) new value. Bug #2885.
+    Make the printers page available again.
 
-2007-05-20	Benedikt Meurer <benny at xfce.org>
+commit 8dfedf486e21d592409fdd2db52e38a1057a4317
+Author: Jannis Pohlmann <jannis at xfce.org>
+Date:   Wed Jul 21 13:57:13 2010 +0200
 
-	* thunar-volman/tvm-block-device.c(tvm_block_device_added): Try
-	  automount only if the volume actually contains a filesystem.
-	  Patch from Brian Tarricone <bjt23 at cornell.edu>. Bug #2789.
+    Make the PDA tab available agian. Disabled because unsupported.
 
-2007-05-20	Benedikt Meurer <benny at xfce.org>
+commit 4c8e7f24119632852d1ab381129cdaa1e0347d56
+Author: Jannis Pohlmann <jannis at xfce.org>
+Date:   Wed Jul 21 13:53:21 2010 +0200
 
-	* configure.in.in, INSTALL: Update for new autoconf.
-	* configure.in.in, Makefile.am, thunar-volman-settings.desktop.in.in,
-	  thunar-volman-settings.in: Install .desktop file to launch the
-	  thunar-volman preferences dialog. Bug #3225.
-	* po/*.po: Update translations.
+    Make the camera tab available again.
 
-2007-01-20	Benedikt Meurer <benny at xfce.org>
+commit 2629d51bd957ed1bb9c3e0ab39582b5dacdf72c2
+Author: Jannis Pohlmann <jannis at xfce.org>
+Date:   Wed Jul 21 13:48:24 2010 +0200
 
-	* configure.in.in: Post-release version bump.
+    Implement the multimedia tab of thunar-volman-settings again.
 
-2007-01-20	Benedikt Meurer <benny at xfce.org>
+commit 344b273424f3e49fdedeb677db48db8fdaebf67c
+Author: Jannis Pohlmann <jannis at xfce.org>
+Date:   Wed Jul 21 13:41:29 2010 +0200
 
-	* === Released 0.1.2 ===
-	* NEWS, configure.in.in: Bump version.
-	* THANKS: Add missing translator credits.
-	* po/*.po: Update Project-Id-Version.
+    Initial work on porting thunar-volman-settings to the new code.
+    
+    The storage devices tab already works again.
 
-2007-01-16	Benedikt Meurer <benny at xfce.org>
+commit 11b47a673e22f3b9e7715548b5f5ca1a8ee8ba2a
+Author: Jannis Pohlmann <jannis at xfce.org>
+Date:   Wed Jul 21 12:26:10 2010 +0200
 
-	* po/LINGUAS, po/zh_TW.po: Add chinese translations, thanks to
-	  Cheng-Wei Chien <e.cwchien at gmail.com>.
-	* THANKS: Add credits for Cheng-Wei Chien <e.cwchien at gmail.com>.
+    Add support for mixed data/audio and pure audio CDs.
+    
+    In addition, a few more calls to tvm_device_handler_finished() have been
+    added to make sure thunar-volman exits on unknown/unsupported devices
+    and on features that are disabled. A few checks have been added to only
+    do something if the corresponding feature is enabled.
 
-2007-01-16	Benedikt Meurer <benny at xfce.org>
+commit 8761d7e17778886a60ce96dd6d736d5b9b0c147f
+Author: Jannis Pohlmann <jannis at xfce.org>
+Date:   Wed Jul 21 12:25:46 2010 +0200
 
-	* icons/48x48/tvm-dev-pocketpc.png: Use Pocket PC icon contributed
-	  by Eugenia Loli-Queru <eugenia at osnews.com>.
+    Add function to run the default audio CD player.
 
-2007-01-15	Benedikt Meurer <benny at xfce.org>
+commit 1e50062cee660551c1c2759baf00dfd8aecc07f3
+Author: Jannis Pohlmann <jannis at xfce.org>
+Date:   Wed Jul 21 11:54:15 2010 +0200
 
-	* configure.in.in: Post-release version bump.
+    Fix typo spotted by Linoel Le Folgoc.
 
-2007-01-15	Benedikt Meurer <benny at xfce.org>
+commit 1a6787121c8fe4cb15f87b6be066d07721aee66f
+Author: Jannis Pohlmann <jannis at xfce.org>
+Date:   Wed Jul 21 11:29:21 2010 +0200
 
-	* === Released 0.1.0 ===
-	* README: Update website URL and dependencies.
-	* NEWS, configure.in.in: Bump version.
-	* THANKS: Add translator credits.
-	* po/*.po: Update project version.
+    Add support for detecting PTP/gphoto2 cameras.
 
-2007-01-15	Benedikt Meurer <benny at xfce.org>
+commit ab265b25f13f70b35f3a2ceb2538053507af1883
+Author: Jannis Pohlmann <jannis at xfce.org>
+Date:   Wed Jul 21 11:12:11 2010 +0200
 
-	* thunar-volman/tvm-preferences-dialog.c: Connect the "Help" button
-	  and open the removable media section of the Thunar user manual.
-	* po/thunar-volman.pot, po/*.po: Merge new strings.
-	* po/de.po: Update german translations.
+    Add support for detecting USB printers.
 
-2007-01-15	Benedikt Meurer <benny at xfce.org>
+commit 0a3fd067c0dd3e97382faa8d6429bc6d0300a665
+Author: Jannis Pohlmann <jannis at xfce.org>
+Date:   Wed Jul 21 11:11:43 2010 +0200
 
-	* thunar-volman/: Add support for printers.
-	* po/POTFILES.in: Add new files here.
-	* po/thunar-volman.pot, po/*.po: Merge new strings.
-	* po/de.po: Update german translations.
+    Add support for wacom volito and bamboo tablets.
 
-2007-01-15	Benedikt Meurer <benny at xfce.org>
+commit 916ddd8e49cba6cd4912b3efa01f7945718eb33b
+Author: Jannis Pohlmann <jannis at xfce.org>
+Date:   Tue Jul 20 16:01:48 2010 +0200
 
-	* icons/48x48/, thunar-volman/: Add support for PDAs (currently
-	  Palm Pilots and Pocket PCs).
+    Add support for keyboards, mice and tablets.
 
-2007-01-12	Benedikt Meurer <benny at xfce.org>
+commit 2359de82d71b8bfa89fc06e0b4abdd8e44c9ee3b
+Author: Jannis Pohlmann <jannis at xfce.org>
+Date:   Tue Jul 20 15:16:54 2010 +0200
 
-	* icons/48x48/tvm-dev-tablet.png: Use tangoified tablet icon.
+    Add support for USB media players and iPods.
 
-2007-01-12	Benedikt Meurer <benny at xfce.org>
+commit a75667cca11293e4f6582ac219f32b92cfbb9462
+Author: Jannis Pohlmann <jannis at xfce.org>
+Date:   Tue Jul 20 13:55:54 2010 +0200
 
-	* thunar-volman/tvm-block-device.c: Support autorun.exe if wine is
-	  installed on the system.
-	* thunar-volman/tvm-preferences.c(tvm_preferences_class_init): Enable
-	  autorun and autoopen by default, which is safe, since we prompt
-	  for confirmation every time, as required by the specification.
+    Implement photo import from cameras detected as mass storage devices.
 
-2007-01-12	Benedikt Meurer <benny at xfce.org>
+commit d7fb1ad549e9b090b03ccfde1df46771c4b7863c
+Author: Jannis Pohlmann <jannis at xfce.org>
+Date:   Tue Jul 20 13:06:34 2010 +0200
 
-	* Initial import.
+    Implement autoopen (requires an .autoopen or autoopen file).
+    
+    This finishes our implementation of the Desktop Application Autostart
+    Specification.
 
-# vi:set ts=8 sw=8 noet ai nocindent:
+commit a1cb43a6485957a74c35f58dd42022d7116f00b7
+Author: Jannis Pohlmann <jannis at xfce.org>
+Date:   Tue Jul 20 12:39:46 2010 +0200
+
+    Add support for opening autorun.exe files with wine.
+
+commit fef3c1273d39bfb04c818d379d43db09a5c0323b
+Author: Jannis Pohlmann <jannis at xfce.org>
+Date:   Tue Jul 20 12:25:59 2010 +0200
+
+    Implement autorun support (requires .autorun, autorun or autorun.sh).
+    
+    This is the first step towards support of the Desktop Application
+    Autostart Specification. The next step is autoopen support.
+
+commit 269de460833d282df34812bbaffc7f8b0dbe67bf
+Author: Jannis Pohlmann <jannis at xfce.org>
+Date:   Tue Jul 20 11:42:45 2010 +0200
+
+    Add support for blank CDs and DVDs by launching the burn software.
+
+commit ccafc02e8cce0bc104af60012d8c2c493ed5327e
+Author: Jannis Pohlmann <jannis at xfce.org>
+Date:   Tue Jul 20 11:21:25 2010 +0200
+
+    Properly exit when the CD/DVD drive has no media.
+
+commit 81c12834783b92f0784dca25a82277ee5afb20bc
+Author: Jannis Pohlmann <jannis at xfce.org>
+Date:   Mon Jul 19 19:33:22 2010 +0200
+
+    Make tvm_file_test() case insensitive so that video_ts equals VIDEO_TS.
+    
+    This fixes a few problems with video CD/DVD autoplay.
+
+commit 4fee95888fe46deab053be73b121323467168ede
+Author: Jannis Pohlmann <jannis at xfce.org>
+Date:   Mon Jul 19 19:22:17 2010 +0200
+
+    Implement video CD/DVD autoplaying.
+
+commit 86b67e880310d214507a29c2a0e98a751a120c91
+Author: Jannis Pohlmann <jannis at xfce.org>
+Date:   Mon Jul 19 18:14:25 2010 +0200
+
+    Initial work on porting thunar-volman to gudev/GIO.
+    
+    Block devices are now opened in Thunar. Their contents are not
+    investigated in order to distinguish iPods/cameras/media players from
+    normal storage devices yet.
+
+commit f4b209756bef6140b09f9e26ab6e673ced384c55
+Author: Robert Hartl <hartl.robert at gmail.com>
+Date:   Wed Jul 21 01:45:32 2010 +0200
+
+    l10n: Updated Slovak (sk) translation to 100%
+    
+    New status: 96 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit d454b8f15c34fb2f9b31a3f4d56e3ec12ba9b4cd
+Author: Spiros Georgaras <sng at hellug.gr>
+Date:   Sat Jul 10 21:04:01 2010 +0200
+
+    l10n: Updated Greek (el) translation to 100%
+    
+    New status: 96 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 22366fb138cbf8717589038fb85f7b5045526aa6
+Author: Stavros Giannouris <stavrosg at gmail.com>
+Date:   Sat Jul 10 13:46:18 2010 +0200
+
+    l10n: Updated Greek (el) translation to 100%
+    
+    New status: 96 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 00ae449a70379792b77a89529ab078f0cf4e25fc
+Author: Evaggelos Balaskas <ebalaskas at ebalaskas.gr>
+Date:   Sun Jun 27 18:30:55 2010 +0200
+
+    l10n: Updated Greek (el) translation to 100%
+    
+    New status: 96 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit ef6db90aab32429f370f4d9c553d462c68446747
+Author: Cristian Marchi <cri.penta at gmail.com>
+Date:   Mon Apr 12 20:20:32 2010 +0200
+
+    l10n: Updated Italian (it) translation to 100%
+    
+    New status: 96 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 77358c6dcef92485025991d18cff6dc73df6a384
+Author: Bauzhan Muftakhidinov <baurthefirst at gmail.com>
+Date:   Tue Mar 23 22:32:19 2010 +0100
+
+    l10n: Updated Kazakh (kk) translation to 100%
+    
+    New status: 96 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit a4cd9860a974ee62554a0d9e49d050e791cef328
+Author: Bauzhan Muftakhidinov <baurthefirst at gmail.com>
+Date:   Sat Mar 20 20:18:08 2010 +0100
+
+    l10n: New translation to Kazakh.
+    
+    New status: 19 messages complete with 0 fuzzies and 77 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 125bf6a2a8cd0c8be570dd992ed38abec0927ea5
+Author: Gabor Kelemen <kelemeng at gnome.hu>
+Date:   Fri Feb 5 22:48:34 2010 +0100
+
+    l10n: Updated Hungarian (hu) translation to 100%
+    
+    New status: 96 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit d7a6eb0af90c9d5d9e47da97927c799aefd1603f
+Author: Gabor Kelemen <kelemeng at gnome.hu>
+Date:   Fri Feb 5 00:47:23 2010 +0100
+
+    l10n: Updated Hungarian (hu) translation to 100%
+    
+    New status: 96 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit a31c138ead39cd5cb5b365a62944e6a5e0842961
+Author: Daniel Nylander <po at danielnylander.se>
+Date:   Wed Dec 16 17:21:26 2009 +0000
+
+    l10n: Updates to Swedish (sv) translation
+    
+    Transmitted-via: Transifex (translations.xfce.org)
+
+commit 4620fcb6e753bf289cb5230433720478b23eeae8
+Author: Michal Várady <miko.vaji at gmail.com>
+Date:   Thu Nov 5 17:22:20 2009 +0000
+
+    l10n: Updates to Czech (cs) translation
+    
+    Transmitted-via: Transifex (translations.xfce.org)
+
+commit 062e75bb7538bceaa8f4903d858a21f551eded56
+Author: Rihards Prieditis <rprieditis at gmail.com>
+Date:   Fri Oct 16 14:18:21 2009 +0000
+
+    l10n: Updates to Latvian (lv) translation
+    
+    Transmitted-via: Transifex (translations.xfce.org)
+
+commit 04641b5856e154938b09359f08327337c09e827e
+Author: Leandro Regueiro <leandro.regueiro at gmail.com>
+Date:   Thu Oct 1 15:15:16 2009 +0000
+
+    l10n: Updates to Galician (gl) translation
+    
+    Transmitted-via: Transifex (translations.xfce.org)
+
+commit 4369facd6c521c96f0f3300bccde557a21258771
+Author: Robert Hartl <hartl.robert at gmail.com>
+Date:   Sun Sep 13 16:42:17 2009 +0000
+
+    l10n: Updates to Slovak (sk) translation
+    
+    Transmitted-via: Transifex (translations.xfce.org)
+
+commit 80ea658ceba154e8314392ebbbec8ff7c7058fdc
+Author: Nuno Miguel <nunis at netcabo.pt>
+Date:   Thu Aug 27 18:49:44 2009 +0000
+
+    l10n: Updates to Portuguese (pt) translation
+    
+    Transmitted-via: Transifex (translations.xfce.org)
+
+commit 4711f8ed1b9b9d2baebedb94107065006095cea7
+Author: Auke Kok <sofar at foo-projects.org>
+Date:   Tue Aug 18 18:07:13 2009 +0000
+
+    l10n: Updates to Dutch (Flemish) (nl) translation
+    
+    Transmitted-via: Transifex (translations.xfce.org)
+
+commit eedc203b794fbbab7356c913a7fb1aff6172088e
+Author: Jeff Bailes <thepizzaking at gmail.com>
+Date:   Tue Aug 18 02:01:38 2009 +0000
+
+    l10n: Updates to English (United Kingdom) (en_GB) translation
+    
+    Transmitted-via: Transifex (translations.xfce.org)
+
+commit c4b0e5e6cab3c8c2b4b83d2b37c8dea08c9bfb20
+Author: Mike Massonnet <mmassonnet at xfce.org>
+Date:   Sat Aug 8 13:41:32 2009 +0000
+
+    update goodies translation
+    
+    (Old svn revision: 7896)
+
+commit 6d60b65212626fd69c1b4e8c355e8db3281a36a1
+Author: Gabor Kelemen <kelemeng at gnome.hu>
+Date:   Thu Jul 23 00:43:11 2009 +0000
+
+    2009-07-23  Gabor Kelemen  <kelemeng at gnome.hu>
+    
+    	* hu.po: Translation reworked.
+    
+    (Old svn revision: 7763)
+
+commit 034e658117aac121d6a57a594cd50bff1b6afa02
+Author: Mike Massonnet <mmassonnet at xfce.org>
+Date:   Sun Jun 28 18:26:51 2009 +0000
+
+    update goodies translation
+    
+    (Old svn revision: 7639)
+
+commit 3d966b8b1b7c94c230a3ca8ad79ec7a67e867afe
+Author: Mike Massonnet <mmassonnet at xfce.org>
+Date:   Thu Jun 18 21:33:43 2009 +0000
+
+    update goodies translations
+    
+    (Old svn revision: 7612)
+
+commit 187b452580603a8d8d74e1eb7359dc221a273838
+Author: Mike Massonnet <mmassonnet at xfce.org>
+Date:   Mon Jun 15 12:37:13 2009 +0000
+
+    update translations
+    
+    (Old svn revision: 7578)
+
+commit c8f8d4fcf3cfe65af200c930b4f985bbb7111ad3
+Author: Mike Massonnet <mmassonnet at xfce.org>
+Date:   Tue Jun 9 20:43:09 2009 +0000
+
+    Drop svn:executable bit from po files
+    
+    (Old svn revision: 7518)
+
+commit cd1056f13af57e8f021e2ec3c4ce7f12185ad25f
+Author: Mike Massonnet <mmassonnet at xfce.org>
+Date:   Fri May 29 10:44:34 2009 +0000
+
+    update goodies translations
+    
+    (Old svn revision: 7436)
+
+commit 0e27a789c2d643d543cf878fe66edc4a020092a1
+Author: Mike Massonnet <mmassonnet at xfce.org>
+Date:   Mon May 11 16:30:40 2009 +0000
+
+    update translations
+    
+    (Old svn revision: 7327)
+
+commit 17fa98e2bc51f965acff331b1d441195a6707adc
+Author: Mike Massonnet <mmassonnet at xfce.org>
+Date:   Mon Apr 20 13:47:42 2009 +0000
+
+    goodies translation update (galician only)
+    
+    (Old svn revision: 7249)
+
+commit ff1f361f9167db5dda1ec6f1247c5dd795a263a2
+Author: Mike Massonnet <mmassonnet at xfce.org>
+Date:   Thu Apr 16 08:20:27 2009 +0000
+
+    goodies translation update
+    
+    (Old svn revision: 7213)
+
+commit 4534c6d8355915fa62ac20bee4221a5e4b6bf774
+Author: Piotr Sokól <piotr.sokol at 10g.pl>
+Date:   Mon Mar 30 15:16:13 2009 +0000
+
+    Updated Polish translations
+    
+    (Old svn revision: 7051)
+
+commit cdca2404021a3e2f5eadb635534d2706727393a7
+Author: Piotr Sokól <piotr.sokol at 10g.pl>
+Date:   Mon Mar 23 10:16:08 2009 +0000
+
+    Updated Polish translations
+    
+    (Old svn revision: 6981)
+
+commit e79f50e6e86b0b470a9636d9ac223ea5e79879be
+Author: Masato Hashimoto <cabezon.hashimoto at gmail.com>
+Date:   Thu Mar 19 15:08:03 2009 +0000
+
+    	* ja.po: Japanese translation update (Masato Hashimoto)
+    	* ja.po: Japanese translation update (Masato Hashimoto)
+    	* ja.po: Japanese translation update (Masato Hashimoto)
+    	* ja.po: Japanese translation update (Masato Hashimoto)
+    	* ja.po: Japanese translation update (Masato Hashimoto)
+    	* ja.po: Japanese translation update (Masato Hashimoto)
+    	* ja.po: Japanese translation update (Masato Hashimoto)
+    	* ja.po: Japanese translation update (Masato Hashimoto)
+    	* ja.po: Japanese translation update (Masato Hashimoto)
+    	* ja.po: Japanese translation update (Masato Hashimoto)
+    	* ja.po: Japanese translation update (Masato Hashimoto)
+    	* ja.po: Japanese translation update (Masato Hashimoto)
+    
+    (Old svn revision: 6949)
+
+commit c82c06d1441d3c03422202e57b029376622044bb
+Author: Maximilian Schleiss <maxschleiss at solnet.ch>
+Date:   Sat Mar 14 15:26:30 2009 +0000
+
+    Translations updates - es fr gl it tr
+    
+    (Old svn revision: 6902)
+
+commit 2f2cb90ae069440a00a42edc180d5a32178a2cfb
+Author: Mike Massonnet <mmassonnet at xfce.org>
+Date:   Thu Mar 5 20:12:29 2009 +0000
+
+    Fix the renaming of the pt nb files -- thanks to jerome who noticed this problem
+    
+    (Old svn revision: 6850)
+
+commit 368a75fb5c1b2c1438286fc240ee187018a0e5e1
+Author: Mike Massonnet <mmassonnet at xfce.org>
+Date:   Thu Mar 5 14:53:41 2009 +0000
+
+    Renamed pt_PT to pt and nb_NO to nb (bug #4574)
+    
+    (Old svn revision: 6848)
+
+commit 4e2708519dc70a71405df0076bd59e5f6606add7
+Author: Stavros Giannouris <stavrosg2002 at freemail.gr>
+Date:   Sun Mar 1 19:06:38 2009 +0000
+
+    Greek translations update by Evaggelos Balaskas <ebalaskas at ebalaskas.gr>
+    
+    (Old svn revision: 6825)
+
+commit 4c59cfef86403391db8db9ade8e88b4e988246d0
+Author: Per Kongstad <p_kongstad at op.pl>
+Date:   Fri Feb 20 08:34:25 2009 +0000
+
+    	* ru.po, LINGUAS: Russian translation added (Pavel Labushev)
+    	* ru.po, LINGUAS: Russian translation added (Pavel Labushev)
+    
+    (Old svn revision: 6726)
+
+commit 782e8e37674c49687b60760ba37ce1b5c7c540a4
+Author: Eren Turkay <turkay.eren at gmail.com>
+Date:   Tue Feb 17 15:00:14 2009 +0000
+
+    Turkish translation update by Samed Beyribey
+    
+    (Old svn revision: 6706)
+
+commit 48dec3386c3ea4a16e74263ff02e7c343ad07266
+Author: Maximilian Schleiss <maxschleiss at solnet.ch>
+Date:   Sun Feb 8 08:24:06 2009 +0000
+
+    Translations updates - fr id it ja nb pl
+    
+    (Old svn revision: 6659)
+
+commit d181a6713a848a2c7d043391806a79df8f5527cf
+Author: Michal Varady <miko.vaji at gmail.com>
+Date:   Sun Feb 1 00:49:24 2009 +0000
+
+    Czech translation fixed
+    
+    (Old svn revision: 6616)
+
+commit 57a5aaff05be3174f550e6db24e082a32b3694ec
+Author: Maximilian Schleiss <maxschleiss at solnet.ch>
+Date:   Sun Jan 18 17:54:19 2009 +0000
+
+    Translations updates - de ca it ja nb pt_PT tr
+    
+    (Old svn revision: 6493)
+
+commit 558a80cb4f5b67a9bd207e0095ee472ea60e9ee3
+Author: Alexander Toresson <alexander.toresson at gmail.com>
+Date:   Mon Jan 12 23:30:19 2009 +0000
+
+    thunar-svn-plugin/trunk/po:
+    	* sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
+    xfce4-cddrive-plugin/trunk/po:
+    	* sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
+    xfce4-weather-plugin/trunk/po:
+    	* sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
+    xfce4-volstatus-icon/trunk/po:
+    	* sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
+    xfce4-quicklauncher-plugin/trunk/po:
+    	* sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
+    xfce4-timer-plugin/trunk/po:
+    	* sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
+    xfce4-clipman-plugin/trunk/po:
+    	* sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
+    xfce4-diskperf-plugin/trunk/po:
+    	* sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
+    xfce4-mailwatch-plugin/trunk/po:
+    	* sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
+    ristretto/trunk/po:
+    	* sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
+    xfce4-sensors-plugin/trunk/po:
+    	* sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
+    xfce4-mount-plugin/trunk/po:
+    	* sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
+    xfce4-genmon-plugin/trunk/po:
+    	* sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
+    thunar-volman/trunk/po:
+    	* sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
+    notification-daemon-xfce/trunk/po:
+    	* sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
+    xfce4-power-manager/trunk/po:
+    	* sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
+    xfce4-dict/trunk/po:
+    	* sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
+    xfce4-cellmodem-plugin/trunk/po:
+    	* sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
+    xfce4-battery-plugin/trunk/po:
+    	* sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
+    
+    (Old svn revision: 6445)
+
+commit 601e52fb61534db56ee85d46f4e2f6541389c4ba
+Author: Maximilian Schleiss <maxschleiss at solnet.ch>
+Date:   Thu Dec 25 19:20:40 2008 +0000
+
+    Translations updates - es gl id ja uk
+    
+    (Old svn revision: 6367)
+
+commit 0a9eba9cedcf63b303505366169c6f8056006e78
+Author: Maximilian Schleiss <maxschleiss at solnet.ch>
+Date:   Sun Nov 30 21:44:26 2008 +0000
+
+    Translations updates - ca
+    
+    (Old svn revision: 6240)
+
+commit cf8159a25463949e09d0b834460cea7ccb732524
+Author: Maximilian Schleiss <maxschleiss at solnet.ch>
+Date:   Sat Nov 29 22:51:08 2008 +0000
+
+    Translations updates - es fr
+    
+    (Old svn revision: 6226)
+
+commit f74163c3589efb84af7cb42c09b1d45483585d7f
+Author: Maximilian Schleiss <maxschleiss at solnet.ch>
+Date:   Sun Nov 16 22:45:19 2008 +0000
+
+    Translations updates and additions - ca, nb_NO, uk, zh_CN
+    
+    (Old svn revision: 6128)
+
+commit 6e806cae0246988cb1d0ed47e3bf3b262ceafc49
+Author: Piarres Beobide <pi at beobide.net>
+Date:   Wed Nov 12 10:59:45 2008 +0000
+
+    Some goodies Basque translation update
+    
+    
+    (Old svn revision: 6068)
+
+commit 5e9484493ff28d8c49bee993b7f682ac21373648
+Author: Maximilian Schleiss <maxschleiss at solnet.ch>
+Date:   Sun Nov 9 23:17:35 2008 +0000
+
+    Translations updates for a lot of languages in a lot of packages
+    
+    (Old svn revision: 6041)
+
+commit 67642407270d0e896c4d0d530d68548682028d06
+Author: Jannis Pohlmann <jannis at xfce.org>
+Date:   Sun Nov 9 17:24:46 2008 +0000
+
+    	* thunar-volman-settings.desktop.in.in: Remove GenericName and
+    	  X-XfceSettingsName keys. $
+    
+    (Old svn revision: 6040)
+
+commit 8fd1978a8a0d34f542f1d6901f6abe76bbd6c92a
+Author: Michal Varady <miko.vaji at gmail.com>
+Date:   Sun Nov 2 18:20:06 2008 +0000
+
+    Czech translation updated and added (it has not been present in LINGUAS since first commit)
+    
+    (Old svn revision: 5921)
+
+commit adc6863a99efea86936f7ce41ddbd4c9bbeb1444
+Author: Lars Nielsen <lars at mit-web.dk>
+Date:   Tue Oct 14 13:35:30 2008 +0000
+
+    	* da.po,LINGUAS: Danish translation added
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    (Old svn revision: 5612)
+
+commit 1344eb34b734e969ea0b7ee7bf4f757e8455e281
+Author: Maximilian Schleiss <maxschleiss at solnet.ch>
+Date:   Sun Oct 5 16:01:03 2008 +0000
+
+    Updated Indonesian translation for the xfburn and dict modules
+    Updated Norwegian Bokmal translation for the mailwatch module and added one for the dict module
+    Added Japanese translation for the thunar-volman module
+    Updated European Portuguese translation for the smartbookmark, mpc and dict modules
+    Added Spanish translation for the mailwatch module
+    
+    
+    (Old svn revision: 5515)
+
+commit 20306de5b015a47489d7d1d0a13570a5e1df0ff9
+Author: Jari Rahkonen <jari.rahkonen at pp1.inet.fi>
+Date:   Sat Sep 13 12:41:31 2008 +0000
+
+    Update Finnish translation
+    
+    
+    (Old svn revision: 5398)
+
+commit dd6021db4bd032dc3ebe3ff893a3f1c04474099a
+Author: Maximilian Schleiss <maxschleiss at solnet.ch>
+Date:   Mon Sep 8 21:17:00 2008 +0000
+
+    Translations update for id and fr
+    
+    (Old svn revision: 5375)
+
+commit 6bbe52e52c89eb95e29e6e2199538e8a16c481af
+Author: Piarres Beobide <pi at beobide.net>
+Date:   Sun Sep 7 23:40:34 2008 +0000
+
+    Basque translation update
+    
+    
+    (Old svn revision: 5367)
+
+commit 57967ab23b44f518be3ac9f1cae50f84a824ec3e
+Author: Jannis Pohlmann <jannis at xfce.org>
+Date:   Thu Sep 4 22:57:18 2008 +0000
+
+    	* autogen.sh: Add git svn revision versioning support.
+    
+    (Old svn revision: 5359)
+
+commit 7027b7374bdd58bc4c242b7baa65a5f3760553d1
+Author: SZERVÁC Attila <sas at 321.hu>
+Date:   Mon Sep 1 03:24:09 2008 +0000
+
+    [intl:hu] little updates
+    
+    (Old svn revision: 5334)
+
+commit 60dfac9ba4ca7bb70e3c5c15b066bd6fbe916af9
+Author: Og Maciel <ogmaciel at gnome.org>
+Date:   Sat Aug 30 17:23:14 2008 +0000
+
+    Updated Brazilian Portuguese translation.
+    
+    (Old svn revision: 5332)
+
+commit c9af56c128eee1b75ac29f94fef69970b97fe858
+Author: Brian Tarricone <brian at tarricone.org>
+Date:   Sat Aug 30 09:28:31 2008 +0000
+
+    2008-08-30  Brian Tarricone <bjt23 at cornell.edu>
+    
+        * thunar-volman-settings.desktop.in.in: Add keys to allow the
+        * settings dialog to show up in the new xfce settings manager.
+        * po/{thunar-volman.pot,*.po}: Update potfile and po files.
+    
+    (Old svn revision: 5329)
+
+commit 29a9ef890f4a9da3365abdb50864e0026a8e6bb2
+Author: Stephan Arts <stephan at xfce.org>
+Date:   Thu Aug 21 11:22:18 2008 +0000
+
+    Bump version number and fix make distcheck
+    
+    
+    
+    (Old svn revision: 5282)
+
+commit 6ae39d3017c4386919b0d6b0e259555e14b7ad0f
+Author: Brian Tarricone <brian at tarricone.org>
+Date:   Tue Aug 12 09:02:44 2008 +0000
+
+    and fudge changelog entry :-/
+    
+    (Old svn revision: 5218)
+
+commit e8457cc1ada4875f3dd58c1d7fc53603e7c67bfb
+Author: Brian Tarricone <brian at tarricone.org>
+Date:   Tue Aug 12 08:58:33 2008 +0000
+
+    Meh, add missing files.  These guys are from Colin Leroy as well,
+    bug #3349.
+    
+    (Old svn revision: 5217)
+
+commit 99788f8d1f3dd6988cd33bd857889870485e8807
+Author: Brian Tarricone <brian at tarricone.org>
+Date:   Tue Aug 12 08:54:28 2008 +0000
+
+    2008-08-12  Brian Tarricone <bjt23 at cornell.edu>
+    
+        * thunar-volman/{Makefile.am,tvm-block-device.c}: Add support
+          for auto-mounting encrypted volumes.  Patch from Colin
+          Leroy.  Bug #3349.
+        * configure.in.in: Bump exo-hal version requirement to ensure
+          we pull in an exo-mount that can handle encrypted volumes.
+    
+    (Old svn revision: 5216)
+
+commit 6da5b2615ee77a3903e2b5d4ef1a7617244d1ae7
+Author: Brian Tarricone <brian at tarricone.org>
+Date:   Tue Aug 12 08:54:15 2008 +0000
+
+    2008-08-12  Brian Tarricone <bjt23 at cornell.edu>
+    
+        * thunar-volman/*.h: Remove semicolons after G_BEGIN_DECLS/G_END_DECLS
+          macros; they'd be harmful if compiled with a C++ compiler.
+          Patch from Colin Leroy.  Bug #3349.
+    
+    (Old svn revision: 5215)
+
+commit be5a05d07a1c7146a4de118f7cee4b4cd1458011
+Author: Mohamed Magdy <mohamed.m.k at gmail.com>
+Date:   Wed Jul 16 23:01:19 2008 +0000
+
+    Update Arabic translations
+    
+    (Old svn revision: 5118)
+
+commit f39eb38c3a11cabb8275a7ab6bde60f1be9ceb94
+Author: Mohamed Magdy <mohamed.m.k at gmail.com>
+Date:   Tue Jul 15 19:15:17 2008 +0000
+
+    Update Arabic translations
+    
+    (Old svn revision: 5098)
+
+commit 33ed23072df63b8463575c20cdcd134722f3fe57
+Author: Maximilian Schleiss <maxschleiss at solnet.ch>
+Date:   Thu Jun 26 22:00:51 2008 +0000
+
+    Translations added and updated for most goodies (gl)
+    
+    (Old svn revision: 4998)
+
+commit 692fb8f483f5c404688002fe755d1c6b5e6c23ed
+Author: Jari Rahkonen <jari.rahkonen at pp1.inet.fi>
+Date:   Tue Jun 24 12:49:06 2008 +0000
+
+    Fixed a string in the Finnish translation.
+    
+    
+    (Old svn revision: 4990)
+
+commit 9bf5fabda75cb502730f0a0c1e7eca8faee4c877
+Author: Mike Massonnet <mmassonnet at xfce.org>
+Date:   Sun Jun 22 10:40:21 2008 +0000
+
+    update-po
+    
+    (Old svn revision: 4985)
+
+commit 6dc575d0f0848b5c6a0aa9af4a5141ddf466fd6d
+Author: Og Maciel <ogmaciel at gnome.org>
+Date:   Wed May 14 14:48:25 2008 +0000
+
+    Updated Brazilian Portuguese translation
+    
+    (Old svn revision: 4799)
+
+commit d26069a77f4ee8e6071f575b5f03aa899d08e06c
+Author: Mike Massonnet <mmassonnet at xfce.org>
+Date:   Tue Mar 18 13:05:17 2008 +0000
+
+    Update Portuguese translation
+    
+    (Old svn revision: 4067)
+
+commit f001aa2b78f17a130f79f9656aa9c5e8692362d5
+Author: Benedikt Meurer <benny at xfce.org>
+Date:   Sat Mar 15 09:33:34 2008 +0000
+
+    2008-03-15	Benedikt Meurer <benny at xfce.org>
+    
+    	* thunar-volman/tvm-block-device.c: Apply patch from Tino Keitel
+    	  and Colin Leroy to fix USB flash drives being incorrectly
+    	  recognized as audio players. Bug #2856.
+    
+    
+    
+    
+    (Old svn revision: 4057)
+
+commit 8ce1c70db5279d19cf7626bbbc4277e984f68e63
+Author: SZERVÁC Attila <sas at 321.hu>
+Date:   Mon Feb 18 21:47:24 2008 +0000
+
+    hu: xfbib added volman updated
+    
+    (Old svn revision: 3972)
+
+commit 97714c2ed2efeea75c23dae440832b1a59fef931
+Author: Michal Varady <miko.vaji at gmail.com>
+Date:   Sat Dec 15 21:58:17 2007 +0000
+
+    New Czech translations for gsynaptics-mcs-plugin, notification-daemon-xfce, thunar-volman, xfce4-cddrive-plugin and xfce4-datetime-plugin
+    
+    
+    (Old svn revision: 3707)
+
+commit 7651b3f157bd1f9d2d42c04de879992900504edb
+Author: Benedikt Meurer <benny at xfce.org>
+Date:   Sun Dec 2 15:00:42 2007 +0000
+
+    2007-12-02	Benedikt Meurer <benny at xfce.org>
+    
+    	* configure.in.in: Post-release version bump.
+    
+    
+    
+    
+    (Old svn revision: 3666)
+
+commit d3daeba33fc28fc4600d9358ff9e34e3dd2c313b
+Author: Benedikt Meurer <benny at xfce.org>
+Date:   Sun Dec 2 14:57:50 2007 +0000
+
+    2007-12-02	Benedikt Meurer <benny at xfce.org>
+    
+    	* === Released 0.2.0 ===
+    	* NEWS, configure.in.in: Bump version.
+    	* THANKS: Add missing translator credits.
+    	* po/*.po: Update Project-Id-Version.
+    
+    
+    
+    
+    (Old svn revision: 3664)
+
+commit 8f0e3156cb83ad3fbf5c5d4681efcdc3ba593874
+Author: Maximilian Schleiss <maxschleiss at solnet.ch>
+Date:   Mon Nov 19 23:06:36 2007 +0000
+
+    Latvian translations added to most goodies.
+    
+    (Old svn revision: 3611)
+
+commit faf233906673e8dbe967f8a3b3671b1945efc9a5
+Author: Mike Massonnet <mmassonnet at xfce.org>
+Date:   Thu Nov 15 08:37:37 2007 +0000
+
+    Fix changelogs for updated ur.po files, and add thunar-archive-plugin
+    
+    (Old svn revision: 3591)
+
+commit 8ad4198cf23f8b326e92f01ef2a03f02b5f6f48f
+Author: Mike Massonnet <mmassonnet at xfce.org>
+Date:   Thu Nov 15 08:24:33 2007 +0000
+
+    Rename pk.po to ur.po
+    
+    (Old svn revision: 3590)
+
+commit 32d21e3169235f6db6838c1b6a02b84cbe5ceb11
+Author: Mike Massonnet <mmassonnet at xfce.org>
+Date:   Sun Oct 28 19:05:17 2007 +0000
+
+    Add new translation by محمد علي المكي <makki.ma at gmail.com>
+    
+    (Old svn revision: 3466)
+
+commit 7d1248014eb5818d8e457db3efaf956180637008
+Author: Brian Tarricone <brian at tarricone.org>
+Date:   Wed Oct 24 22:36:53 2007 +0000
+
+    remove trailing parens on AC_INIT version info to work around bug
+    in intltool 0.35.x and 0.36.x
+    
+    
+    (Old svn revision: 3434)
+
+commit 96e087fd0d320db98a6cc0126ace7e85ca45d920
+Author: Benedikt Meurer <benny at xfce.org>
+Date:   Tue Oct 9 19:10:19 2007 +0000
+
+    2007-10-09	Benedikt Meurer <benny at xfce.org>
+    
+    	* thunar-volman/tvm-block-device.c: Properly ignore case looking
+    	  for VCD, VIDEO_TS and DCIM folders. Bug #3038.
+    
+    
+    
+    
+    (Old svn revision: 3318)
+
+commit 8a33ffef6886c6779b562760d5bc9ada205e64ef
+Author: Mike Massonnet <mmassonnet at xfce.org>
+Date:   Sat Sep 22 22:46:13 2007 +0000
+
+     * xfce4-sensors-plugin, xfce4-weather-plugin, xfce4-systemload-plugin,
+       thunar-volman: Update European Portuguese translation.
+    
+    
+    (Old svn revision: 3240)
+
+commit effa968c516a5aa53d8ab5a6521c36d3baf8d2b7
+Author: Jean-François Wauthy <pollux at xfce.org>
+Date:   Sun Sep 16 09:07:39 2007 +0000
+
+    Update Basque translations
+    
+    
+    (Old svn revision: 3234)
+
+commit 83b53a6f2f6346f75e0fe1425e193736487838c1
+Author: Og Maciel <ogmaciel at gnome.org>
+Date:   Wed Sep 5 01:25:18 2007 +0000
+
+    Updated LINGUAS to include pt_BR.
+    
+    (Old svn revision: 3144)
+
+commit ac81fe7cfcf3d40a7e61bb128156a963fb7fa3a8
+Author: Og Maciel <ogmaciel at gnome.org>
+Date:   Tue Sep 4 00:20:24 2007 +0000
+
+    Added translations for Brazilian Portuguese by Fábio Nogueira.
+    
+    (Old svn revision: 3131)
+
+commit 7ae4b476e14c07a631a3dfe5397a51eafff60aa1
+Author: Og Maciel <ogmaciel at gnome.org>
+Date:   Tue Sep 4 00:06:41 2007 +0000
+
+    Updated translations for Brazilian Portuguese by Fábio Nogueira.
+    
+    (Old svn revision: 3129)
+
+commit 8a13e2a48c71f9bec1ff58f9da2303550d538ddc
+Author: Mike Massonnet <mmassonnet at xfce.org>
+Date:   Fri Aug 24 23:30:50 2007 +0000
+
+    * po/pt_PT.po: Update translations.
+    
+    
+    (Old svn revision: 3070)
+
+commit c6d0bd5352058dbc4d3bebb0e6fc614f644a1e4c
+Author: Maximilian Schleiss <maxschleiss at solnet.ch>
+Date:   Sun Jul 8 21:34:59 2007 +0000
+
+    Last bunch of pt_PT and nb_NO files to be added.
+    
+    (Old svn revision: 2900)
+
+commit 17cfe7b4094116de08fb69bcae4e6ce1b0bb65c7
+Author: Maximilian Schleiss <maxschleiss at solnet.ch>
+Date:   Sun Jul 8 20:18:00 2007 +0000
+
+    * nb_NO.po: Norwegian Bokmal translations added
+    * pt_PT.po: European Portuguese translations added
+    
+    
+    (Old svn revision: 2898)
+
+commit c7a7f0ec01cca5c6405bd8dffa5131affe641396
+Author: Maximilian Schleiss <maxschleiss at solnet.ch>
+Date:   Wed Jun 13 22:36:38 2007 +0000
+
+    * it.po: Updated translations for the verve, thunar-media-tags, thunar-archive, battery, clipman, netload thunar-volman, eyes, cpufrew, notification-daemon and mailwatch plugins.
+    * *.po: Fixed some headers
+    
+    
+    (Old svn revision: 2825)
+
+commit 73103c151a9a5f28a219e8cb40f9b2046c100c3a
+Author: Benedikt Meurer <benny at xfce.org>
+Date:   Sun May 20 14:30:06 2007 +0000
+
+    2007-05-20	Benedikt Meurer <benny at xfce.org>
+    
+    	* thunar-volman/tvm-preferences.c(tvm_preferences_set_property):
+    	  Properly initialize values to their defaults prior to comparing
+    	  them with a (probably) new value. Bug #2885.
+    
+    
+    
+    
+    (Old svn revision: 2764)
+
+commit bc4a6ce786f00b825b470fb47e6f2a07d7901c0b
+Author: Benedikt Meurer <benny at xfce.org>
+Date:   Sun May 20 12:47:53 2007 +0000
+
+    2007-05-20	Benedikt Meurer <benny at xfce.org>
+    
+    	* thunar-volman/tvm-block-device.c(tvm_block_device_added): Try
+    	  automount only if the volume actually contains a filesystem.
+    	  Patch from Brian Tarricone <bjt23 at cornell.edu>. Bug #2789.
+    
+    
+    
+    
+    (Old svn revision: 2762)
+
+commit 5c554fc80dc990f8b46c1e82f712de91bd4d1eae
+Author: Benedikt Meurer <benny at xfce.org>
+Date:   Sun May 20 12:35:30 2007 +0000
+
+    2007-05-20	Benedikt Meurer <benny at xfce.org>
+    
+    	* configure.in.in, INSTALL: Update for new autoconf.
+    	* configure.in.in, Makefile.am, thunar-volman-settings.desktop.in.in,
+    	  thunar-volman-settings.in: Install .desktop file to launch the
+    	  thunar-volman preferences dialog. Bug #3225.
+    	* po/*.po: Update translations.
+    
+    
+    
+    
+    (Old svn revision: 2761)
+
+commit ee311464dbc95b5c8cb79c60b671b77e998e5de6
+Author: Pau Rullan Ferragut <paurullan at bulma.net>
+Date:   Sat Mar 31 11:53:09 2007 +0000
+
+    forgot to add in LINGUAS en_GB
+    
+    (Old svn revision: 2637)
+
+commit 4fa644af222a586a1f1f7136ee596c14a3654053
+Author: Pau Rullan Ferragut <paurullan at bulma.net>
+Date:   Sat Mar 31 07:26:37 2007 +0000
+
+    i18n british translation
+    
+    (Old svn revision: 2609)
+
+commit b76dd74cb7910e187914bb4bbe80121157802e8e
+Author: Maximilian Schleiss <maxschleiss at solnet.ch>
+Date:   Fri Mar 2 17:53:48 2007 +0000
+
+    Added the Ukrainian translation by Dmitry Nikitin for the battery plugin package. Added the French translation for the datetime plugin.
+    
+    (Old svn revision: 2533)
+
+commit 1cd6a7e411901de078942dc32d5409033904589c
+Author: Maximilian Schleiss <maxschleiss at solnet.ch>
+Date:   Fri Mar 2 15:48:28 2007 +0000
+
+    Updated the Ukrainian translations for the gsynaptics, thunar-media-tags, thunar-archive, xkb, thunar-volman and notification-daemon plugin packages by Dmitry Nikitin.
+    
+    (Old svn revision: 2532)
+
+commit e8842e0b58824f906a5bc6dce3be79c8094ff38f
+Author: Maximilian Schleiss <maxschleiss at solnet.ch>
+Date:   Tue Feb 20 21:22:55 2007 +0000
+
+    * fr.po: Updated some French translations.
+    * ja.po: Updated and added the Japanese translations by Nobuhiro Iwamatsu in the
+      xkb and the volstatus-icon plugins respectively.
+    * sq.po: Updated the headers of most plugins by Besnik Bleta.
+    
+    (Old svn revision: 2506)
+
+commit 711094c9ed1f1b8aecf91a19cf33dff815141a58
+Author: Maximilian Schleiss <maxschleiss at solnet.ch>
+Date:   Fri Feb 2 18:52:37 2007 +0000
+
+    Added the Albanian translations by Besnik Bleta for all the goodies.
+    
+    (Old svn revision: 2480)
+
+commit b814d99f62780b14ad1b42de1d6ff349807660c1
+Author: Maximilian Schleiss <maxschleiss at solnet.ch>
+Date:   Fri Feb 2 11:38:28 2007 +0000
+
+    Made minor changes to some goodies french translations.
+    
+    (Old svn revision: 2478)
+
+commit d905ee73a4959102d375b3ca89aed26eedb1e5e1
+Author: Benedikt Meurer <benny at xfce.org>
+Date:   Sun Jan 21 22:29:42 2007 +0000
+
+    2007-01-21  Benedikt Meurer <benny at xfce.org>
+    
+    	* LINGUAS, nl.po: Add dutch translations by Remco den
+    	  Breeje <remco at vioco.nl>.
+    
+    
+    
+    
+    (Old svn revision: 2457)
+
+commit fc1da1a15e1b252082da2f9845a70ee60cdb5dce
+Author: Benedikt Meurer <benny at xfce.org>
+Date:   Sat Jan 20 10:57:06 2007 +0000
+
+    2007-01-20	Benedikt Meurer <benny at xfce.org>
+    
+    	* configure.in.in: Post-release version bump.
+    
+    
+    
+    
+    (Old svn revision: 2442)
+
+commit df980acccb3057829a569f4b84ef31cc1c40fd7b
+Author: Benedikt Meurer <benny at xfce.org>
+Date:   Sat Jan 20 10:55:58 2007 +0000
+
+    2007-01-20	Benedikt Meurer <benny at xfce.org>
+    
+    	* === Released 0.1.2 ===
+    	* NEWS, configure.in.in: Bump version.
+    	* THANKS: Add missing translator credits.
+    	* po/*.po: Update Project-Id-Version.
+    
+    
+    
+    
+    (Old svn revision: 2440)
+
+commit e9c36638c4f56cb6dcad4a109e44534c91bdbb2a
+Author: Jari Rahkonen <jari.rahkonen at pp1.inet.fi>
+Date:   Thu Jan 18 22:35:53 2007 +0000
+
+    New Finnish translation for volman, weather plugin translation updated.
+    
+    
+    (Old svn revision: 2429)
+
+commit e8dda3779a8c407ee58a7a43107e0c5c07e347bd
+Author: Maximilian Schleiss <maxschleiss at solnet.ch>
+Date:   Thu Jan 18 15:55:07 2007 +0000
+
+    Updated the French, German and Polish translations. Added the Polish translation to the thunar-volman package.
+    
+    (Old svn revision: 2425)
+
+commit 791c2aa35f9956c250534b02f1834568f6fa4417
+Author: Benedikt Meurer <benny at xfce.org>
+Date:   Tue Jan 16 19:10:59 2007 +0000
+
+    2007-01-16	Benedikt Meurer <benny at xfce.org>
+    
+    	* po/LINGUAS, po/zh_TW.po: Add chinese translations, thanks to
+    	  Cheng-Wei Chien <e.cwchien at gmail.com>.
+    	* THANKS: Add credits for Cheng-Wei Chien <e.cwchien at gmail.com>.
+    
+    
+    
+    
+    (Old svn revision: 2384)
+
+commit 54c534ea22598e6e8e0069c80b5ce6f771816a00
+Author: Benedikt Meurer <benny at xfce.org>
+Date:   Tue Jan 16 14:31:46 2007 +0000
+
+    2007-01-16	Benedikt Meurer <benny at xfce.org>
+    
+    	* icons/48x48/tvm-dev-pocketpc.png: Use Pocket PC icon contributed
+    	  by Eugenia Loli-Queru <eugenia at osnews.com>.
+    
+    
+    
+    
+    (Old svn revision: 2378)
+
+commit d54b4c62b9780ac9a462bf72127adf8710b0e249
+Author: Benedikt Meurer <benny at xfce.org>
+Date:   Mon Jan 15 21:07:37 2007 +0000
+
+    2007-01-15	Benedikt Meurer <benny at xfce.org>
+    
+    	* configure.in.in: Post-release version bump.
+    
+    
+    
+    
+    (Old svn revision: 2370)
+
+commit 295c43049dc2eaf89da445a218e4d0ee4089ee6e
+Author: Benedikt Meurer <benny at xfce.org>
+Date:   Mon Jan 15 21:05:27 2007 +0000
+
+    2007-01-15	Benedikt Meurer <benny at xfce.org>
+    
+    	* === Released 0.1.0 ===
+    	* README: Update website URL and dependencies.
+    	* NEWS, configure.in.in: Bump version.
+    	* THANKS: Add translator credits.
+    	* po/*.po: Update project version.
+    
+    
+    
+    
+    (Old svn revision: 2368)
+
+commit 0e2257b30139626550cddef82390d675c23b36cc
+Author: Benedikt Meurer <benny at xfce.org>
+Date:   Mon Jan 15 20:14:29 2007 +0000
+
+    2007-01-15	Benedikt Meurer <benny at xfce.org>
+    
+    	* thunar-volman/tvm-preferences-dialog.c: Connect the "Help" button
+    	  and open the removable media section of the Thunar user manual.
+    	* po/thunar-volman.pot, po/*.po: Merge new strings.
+    	* po/de.po: Update german translations.
+    
+    
+    
+    
+    (Old svn revision: 2367)
+
+commit 433fca05a8a7bee0432eca879a9b88f954749ead
+Author: Benedikt Meurer <benny at xfce.org>
+Date:   Mon Jan 15 17:57:27 2007 +0000
+
+    2007-01-15	Benedikt Meurer <benny at xfce.org>
+    
+    	* thunar-volman/: Add support for printers.
+    	* po/POTFILES.in: Add new files here.
+    	* po/thunar-volman.pot, po/*.po: Merge new strings.
+    	* po/de.po: Update german translations.
+    
+    
+    
+    
+    (Old svn revision: 2364)
+
+commit 3112b17554fabc808676f4a2ba090961abaf207c
+Author: Benedikt Meurer <benny at xfce.org>
+Date:   Mon Jan 15 17:21:08 2007 +0000
+
+    2007-01-15	Benedikt Meurer <benny at xfce.org>
+    
+    	* icons/48x48/, thunar-volman/: Add support for PDAs (currently
+    	  Palm Pilots and Pocket PCs).
+    
+    
+    
+    
+    (Old svn revision: 2363)
+
+commit ad674fc156dd47bdf573c0fd4edc64f64fcea1a2
+Author: Maximilian Schleiss <maxschleiss at solnet.ch>
+Date:   Fri Jan 12 16:23:47 2007 +0000
+
+    Added the French translation of the thunar-volman package
+    
+    (Old svn revision: 2345)
+
+commit ce71615ed03b4b5819a8d502aab784397deb1dbf
+Author: SZERVÁC Attila <sas at 321.hu>
+Date:   Fri Jan 12 11:10:30 2007 +0000
+
+    hu trunk: initial volman hu.po
+    
+    (Old svn revision: 2343)
+
+commit 5b18dcbdb0c14dd88cd1b5acaceaf4982fb2b2f6
+Author: Benedikt Meurer <benny at xfce.org>
+Date:   Fri Jan 12 09:40:01 2007 +0000
+
+    2007-01-12	Benedikt Meurer <benny at xfce.org>
+    
+    	* icons/48x48/tvm-dev-tablet.png: Use tangoified tablet icon.
+    
+    
+    
+    
+    (Old svn revision: 2342)
+
+commit 78a62c7ccd2b66f2d618b61fddf33e8f36681fe1
+Author: Benedikt Meurer <benny at xfce.org>
+Date:   Fri Jan 12 00:40:26 2007 +0000
+
+    2007-01-12	Benedikt Meurer <benny at xfce.org>
+    
+    	* thunar-volman/tvm-block-device.c: Support autorun.exe if wine is
+    	  installed on the system.
+    	* thunar-volman/tvm-preferences.c(tvm_preferences_class_init): Enable
+    	  autorun and autoopen by default, which is safe, since we prompt
+    	  for confirmation every time, as required by the specification.
+    
+    
+    
+    
+    (Old svn revision: 2341)
+
+commit 5e6ee92f0391e4c6f2d233e8d3fac7a6db006558
+Author: Benedikt Meurer <benny at xfce.org>
+Date:   Thu Jan 11 23:11:32 2007 +0000
+
+    2007-01-12	Benedikt Meurer <benny at xfce.org>
+    
+    	* Initial import.
+    
+    
+    
+    
+    (Old svn revision: 2340)
+
+commit d4a31f6120b658b6c0d3707bb992d6adc4e8c1d6
+Author: Benedikt Meurer <benny at xfce.org>
+Date:   Thu Jan 11 22:58:46 2007 +0000
+
+    Repository layout for the thunar-volman.
+    
+    
+    
+    (Old svn revision: 2339)
diff --git a/ChangeLog b/ChangeLog.pre-git
similarity index 100%
copy from ChangeLog
copy to ChangeLog.pre-git
diff --git a/configure.in.in b/configure.in.in
index 2189714..e5a86ac 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -1,31 +1,42 @@
 dnl $Id$
 dnl
-dnl Copyright (c) 2004-2007
-dnl         The Thunar development team. All rights reserved.
+dnl Copyright (c) 2004-2007 Benedikt Meurer <benny at xfce.org>
+dnl Copyright (c) 2010      Jannis Pohlmann <jannis at xfce.org>
 dnl
-dnl Written for thunar-volman by Benedikt Meurer <benny at xfce.org>.
+dnl This program is free software; you can redistribute it and/or 
+dnl modify it under the terms of the GNU General Public License as
+dnl published by the Free Software Foundation; either version 2 of 
+dnl the License, or (at your option) any later version.
 dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public 
+dnl License along with this program; if not, write to the Free 
+dnl Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+dnl Boston, MA 02110-1301, USA.
 
 dnl ***************************
 dnl *** Version information ***
 dnl ***************************
 m4_define([tvm_version_major], [0])
-m4_define([tvm_version_minor], [3])
-m4_define([tvm_version_micro], [80])
-m4_define([tvm_version_build], [r at REVISION@])
+m4_define([tvm_version_minor], [5])
+m4_define([tvm_version_micro], [0])
+m4_define([tvm_version_build], [])
 m4_define([tvm_version_tag], [])
-m4_define([tvm_version], [tvm_version_major().tvm_version_minor().tvm_version_micro()ifelse(tvm_version_tag(), [svn], [tvm_version_tag()-tvm_version_build()], [tvm_version_tag()])])
+m4_define([tvm_version], [tvm_version_major().tvm_version_minor().tvm_version_micro()ifelse(tvm_version_tag(), [git], [tvm_version_tag()-tvm_version_build()], [tvm_version_tag()])])
 
 dnl *******************************************
 dnl *** Debugging support for SVN snapshots ***
 dnl *******************************************
-m4_define([tvm_debug_default], [ifelse(tvm_version_tag(), [svn], [yes], [minimum])])
+m4_define([tvm_debug_default], [ifelse(tvm_version_tag(), [git], [full], [minimum])])
 
 dnl ***************************
 dnl *** Initialize autoconf ***
 dnl ***************************
-AC_COPYRIGHT([Copyright (c) 2004-2007
-        The Thunar development team. All rights reserved.
+AC_COPYRIGHT([Copyright (c) 2004-2010 The Thunar development team. All rights reserved.
         
 Written for thunar-volman by Benedikt Meurer <benny at xfce.org>.])
 AC_INIT([thunar-volman], [tvm_version], [http://bugzilla.xfce.org/])
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3b552e3..f655bb8 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,17 +1,16 @@
 thunar-volman/main.c
 thunar-volman/tvm-block-device.c
-thunar-volman/tvm-camera-device.c
-thunar-volman/tvm-command-entry.c
-thunar-volman/tvm-crypto-volume.c
+thunar-volman/tvm-context.c
 thunar-volman/tvm-device.c
+thunar-volman/tvm-gio-extensions.c
 thunar-volman/tvm-input-device.c
+thunar-volman/tvm-notify.c
 thunar-volman/tvm-pango-extensions.c
-thunar-volman/tvm-pda-device.c
-thunar-volman/tvm-preferences-dialog.c
-thunar-volman/tvm-preferences.c
-thunar-volman/tvm-printer-device.c
 thunar-volman/tvm-prompt.c
 thunar-volman/tvm-run.c
-thunar-volman/xfce-heading.c
-thunar-volman/xfce-titled-dialog.c
-thunar-volman-settings.desktop.in.in
+thunar-volman/tvm-usb-device.c
+
+thunar-volman-settings/main.c
+thunar-volman-settings/thunar-volman-settings.desktop.in.in
+thunar-volman-settings/tvm-command-entry.c
+thunar-volman-settings/tvm-preferences-dialog.c
diff --git a/po/ar.po b/po/ar.po
index 37d28d6..e259146 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -2,456 +2,545 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-30 02:26-0700\n"
+"POT-Creation-Date: 2010-07-25 20:06+0200\n"
 "PO-Revision-Date: 2008-07-15 17:29+0200\n"
 "Last-Translator: Mohamed Magdy <mohamedmk at gmail.com>\n"
 "Language-Team: Arabeyes <doc at arabeyes.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Arabic\n"
 
-#: ../thunar-volman/main.c:50
-msgid "The HAL device UDI of the newly added device"
+#: ../thunar-volman/main.c:59
+msgid "The syfs path of the newly added device"
 msgstr ""
 
-#: ../thunar-volman/main.c:51 ../thunar-volman/tvm-preferences-dialog.c:120
-#: ../thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman/main.c:60
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:104
 msgid "Configure management of removable drives and media"
 msgstr ""
 
-#: ../thunar-volman/main.c:52
+#: ../thunar-volman/main.c:61
 msgid "Print version information and exit"
 msgstr ""
 
 #. setup application name
-#: ../thunar-volman/main.c:69
+#: ../thunar-volman/main.c:93
 msgid "Thunar Volume Manager"
 msgstr ""
 
-#: ../thunar-volman/main.c:90
-msgid "Failed to open display"
-msgstr ""
-
-#: ../thunar-volman/main.c:106
-msgid "The Thunar development team. All rights reserved."
-msgstr ""
-
-#: ../thunar-volman/main.c:107
-msgid "Written by Benedikt Meurer <benny at xfce.org>."
+#: ../thunar-volman/main.c:133
+msgid "All rights reserved."
 msgstr ""
 
-#: ../thunar-volman/main.c:108
+#: ../thunar-volman/main.c:134
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr ""
 
-#. TRANSLATORS: A HAL device UDI must match certain conditions to be valid (to be exact, it must be a valid D-Bus object path)
-#: ../thunar-volman/main.c:133
+#: ../thunar-volman/main.c:188
 #, c-format
-msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
+msgid "There is no device with the sysfs path \"%s\""
 msgstr ""
 
-#. TRANSLATORS: thunar-volman wasn't invoked with either --device-added or --configure.
-#: ../thunar-volman/main.c:144
+#: ../thunar-volman/main.c:200
 #, c-format
-msgid "Must specify the new HAL device UDI with --device-added"
+msgid "Must specify the sysfs path of new devices with --device-added"
 msgstr ""
 
 #. ...so we need to prompt what to do
-#: ../thunar-volman/tvm-block-device.c:189
+#: ../thunar-volman/tvm-block-device.c:204
 msgid "Photos and Music"
 msgstr ""
 
-#: ../thunar-volman/tvm-block-device.c:190
-msgid "Photos were found on your portable music player."
+#: ../thunar-volman/tvm-block-device.c:205
+msgid "Photos were found on your portable music player"
 msgstr ""
 
-#: ../thunar-volman/tvm-block-device.c:191
+#: ../thunar-volman/tvm-block-device.c:206
 msgid "Would you like to import the photos or manage the music?"
 msgstr ""
 
-#: ../thunar-volman/tvm-block-device.c:192
-#: ../thunar-volman/tvm-block-device.c:258
-#: ../thunar-volman/tvm-block-device.c:335
-#: ../thunar-volman/tvm-block-device.c:371
-#: ../thunar-volman/tvm-block-device.c:430
-#: ../thunar-volman/tvm-block-device.c:703
-#: ../thunar-volman/tvm-crypto-volume.c:448 ../thunar-volman/tvm-run.c:136
-#: ../thunar-volman/tvm-run.c:147
+#: ../thunar-volman/tvm-block-device.c:208
+#: ../thunar-volman/tvm-block-device.c:277
+#: ../thunar-volman/tvm-block-device.c:378
+#: ../thunar-volman/tvm-block-device.c:425
+#: ../thunar-volman/tvm-block-device.c:507
+#: ../thunar-volman/tvm-block-device.c:826 ../thunar-volman/tvm-run.c:196
+#: ../thunar-volman/tvm-run.c:207
 msgid "Ig_nore"
 msgstr ""
 
-#: ../thunar-volman/tvm-block-device.c:193
-#: ../thunar-volman/tvm-block-device.c:259
+#: ../thunar-volman/tvm-block-device.c:209
+#: ../thunar-volman/tvm-block-device.c:278
 msgid "Import _Photos"
 msgstr ""
 
-#: ../thunar-volman/tvm-block-device.c:194
+#: ../thunar-volman/tvm-block-device.c:210
 msgid "Manage _Music"
 msgstr ""
 
-#. ask the user whether to import photos
-#: ../thunar-volman/tvm-block-device.c:255
+#. ask the user to import photos
+#: ../thunar-volman/tvm-block-device.c:273
 msgid "Photo Import"
 msgstr ""
 
-#: ../thunar-volman/tvm-block-device.c:256
-msgid "A photo card has been detected."
+#: ../thunar-volman/tvm-block-device.c:274
+msgid "A photo card has been detected"
 msgstr ""
 
-#: ../thunar-volman/tvm-block-device.c:257
+#: ../thunar-volman/tvm-block-device.c:275
 msgid ""
 "There are photos on the card. Would you like to add these photos to your "
 "album?"
 msgstr ""
 
-#. prompt the user whether to execute this file
-#: ../thunar-volman/tvm-block-device.c:332
-#: ../thunar-volman/tvm-block-device.c:368
+#. prompt the user to execute the file
+#. prompt the user to execute this file
+#: ../thunar-volman/tvm-block-device.c:373
+#: ../thunar-volman/tvm-block-device.c:420
 #, c-format
 msgid "Would you like to allow \"%s\" to run?"
 msgstr ""
 
-#: ../thunar-volman/tvm-block-device.c:333
-#: ../thunar-volman/tvm-block-device.c:369
+#: ../thunar-volman/tvm-block-device.c:376
+#: ../thunar-volman/tvm-block-device.c:423
 msgid "Auto-Run Confirmation"
 msgstr ""
 
-#: ../thunar-volman/tvm-block-device.c:334
-#: ../thunar-volman/tvm-block-device.c:370
+#: ../thunar-volman/tvm-block-device.c:377
+#: ../thunar-volman/tvm-block-device.c:424
 msgid "Auto-Run capability detected"
 msgstr ""
 
-#: ../thunar-volman/tvm-block-device.c:336
-#: ../thunar-volman/tvm-block-device.c:372
+#: ../thunar-volman/tvm-block-device.c:379
+#: ../thunar-volman/tvm-block-device.c:426
 msgid "_Allow Auto-Run"
 msgstr ""
 
 #. prompt the user whether to autoopen this file
-#: ../thunar-volman/tvm-block-device.c:427
+#: ../thunar-volman/tvm-block-device.c:502
 #, c-format
 msgid "Would you like to open \"%s\"?"
 msgstr ""
 
-#: ../thunar-volman/tvm-block-device.c:428
+#: ../thunar-volman/tvm-block-device.c:505
 msgid "Auto-Open Confirmation"
 msgstr ""
 
-#: ../thunar-volman/tvm-block-device.c:429
+#: ../thunar-volman/tvm-block-device.c:506
 msgid "Auto-Open capability detected"
 msgstr ""
 
-#: ../thunar-volman/tvm-block-device.c:431
+#: ../thunar-volman/tvm-block-device.c:508
 msgid "_Open"
 msgstr ""
 
-#. ask what do with the mixed audio/data disc
-#: ../thunar-volman/tvm-block-device.c:700
-msgid "Audio / Data CD"
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "CD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "DVD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:618
+msgid "The CD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:619
+msgid "The DVD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:629
+msgid "Volume mounted"
 msgstr ""
 
-#: ../thunar-volman/tvm-block-device.c:701
-msgid "The CD in the drive contains both music and files."
+#: ../thunar-volman/tvm-block-device.c:632
+#, c-format
+msgid "The volume \"%s\" was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:637
+#, c-format
+msgid "The inserted volume was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:691
+#, c-format
+msgid "Unable to locate mount point"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:737
+#, c-format
+msgid "Unable to mount the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:746
+#, c-format
+msgid "Could not detect the volume corresponding to the device"
 msgstr ""
 
-#: ../thunar-volman/tvm-block-device.c:702
+#: ../thunar-volman/tvm-block-device.c:821
+msgid "Audio/Data CD"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:822
+msgid "The CD in the drive contains both music and files"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:824
 msgid "Would you like to listen to music or browse the files?"
 msgstr ""
 
-#: ../thunar-volman/tvm-block-device.c:704
+#: ../thunar-volman/tvm-block-device.c:827
 msgid "_Browse Files"
 msgstr ""
 
-#: ../thunar-volman/tvm-block-device.c:705
+#: ../thunar-volman/tvm-block-device.c:828
 msgid "_Play CD"
 msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:233
-msgid "Select an Application"
+#: ../thunar-volman/tvm-block-device.c:916
+#, c-format
+msgid "Unknown block device type"
 msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:243
-msgid "All Files"
+#: ../thunar-volman/tvm-device.c:139
+#, c-format
+msgid "Device type not supported"
 msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:248
-msgid "Executable Files"
+#: ../thunar-volman/tvm-input-device.c:74
+msgid "input-keyboard"
 msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:263
-msgid "Perl Scripts"
+#: ../thunar-volman/tvm-input-device.c:75
+msgid "Keyboard detected"
 msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:269
-msgid "Python Scripts"
+#: ../thunar-volman/tvm-input-device.c:76
+msgid "A keyboard was detected"
 msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:275
-msgid "Ruby Scripts"
+#: ../thunar-volman/tvm-input-device.c:86
+#: ../thunar-volman/tvm-input-device.c:100
+msgid "input-tablet"
 msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:281
-msgid "Shell Scripts"
+#: ../thunar-volman/tvm-input-device.c:87
+#: ../thunar-volman/tvm-input-device.c:101
+msgid "Tablet detected"
 msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:286
-#: ../thunar-volman/tvm-crypto-volume.c:443
-msgid "Encrypted volume"
+#: ../thunar-volman/tvm-input-device.c:88
+#: ../thunar-volman/tvm-input-device.c:102
+msgid "A graphics tablet was detected"
 msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:297
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
+#: ../thunar-volman/tvm-input-device.c:110
+msgid "input-mouse"
+msgstr ""
+
+#: ../thunar-volman/tvm-input-device.c:111
+msgid "Mouse detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-input-device.c:112
+msgid "A mouse was detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-input-device.c:139
+#, c-format
+msgid "Unsupported input device type"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:173
+#, c-format
+msgid "Autoburning of blank CDs and DVDs is disabled"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:193
+msgid "Blank DVD inserted"
 msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:302
-msgid "Setting up the crypto layer..."
+#: ../thunar-volman/tvm-run.c:194
+msgid "You have inserted a blank DVD."
 msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) but got Permission denied.
-#: ../thunar-volman/tvm-crypto-volume.c:369
+#: ../thunar-volman/tvm-run.c:195 ../thunar-volman/tvm-run.c:206
+msgid "What would you like to do?"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:197
+msgid "Burn _DVD"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:204
+msgid "Blank CD inserted"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:205
+msgid "You have inserted a blank CD."
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:208
+msgid "Burn _Data CD"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:209
+msgid "Burn _Audio CD"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:233
 #, c-format
-msgid "You are not privileged to setup the crypto layer"
+msgid "The burn command may not be empty"
 msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) and typed the wrong password.
-#: ../thunar-volman/tvm-crypto-volume.c:374
+#: ../thunar-volman/tvm-run.c:272
 #, c-format
-msgid "Wrong password"
+msgid "The CD player command is undefined"
 msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:445
-msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
+#: ../thunar-volman/tvm-usb-device.c:66
+msgid "Camera detected"
 msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:446
-msgid "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
+#: ../thunar-volman/tvm-usb-device.c:67
+msgid "A photo camera was detected"
 msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:447
-msgid "Please enter your password to decrypt and mount the volume."
+#: ../thunar-volman/tvm-usb-device.c:77
+msgid "Printer detected"
 msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:449
-msgid "_Mount"
+#: ../thunar-volman/tvm-usb-device.c:78
+msgid "A USB printer was detected"
 msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:468
-msgid "Failed to setup the encrypted volume"
+#: ../thunar-volman/tvm-usb-device.c:104
+#, c-format
+msgid "Unsupported USB device type"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:119
-#: ../thunar-volman-settings.desktop.in.in.h:2
+#. setup application name
+#: ../thunar-volman-settings/main.c:52
+msgid "Thunar Volume Manager Settings"
+msgstr ""
+
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:102
 msgid "Removable Drives and Media"
 msgstr ""
 
+#: ../thunar-volman-settings/tvm-command-entry.c:240
+msgid "Select an Application"
+msgstr ""
+
+#: ../thunar-volman-settings/tvm-command-entry.c:250
+msgid "All Files"
+msgstr ""
+
+#: ../thunar-volman-settings/tvm-command-entry.c:255
+msgid "Executable Files"
+msgstr ""
+
+#: ../thunar-volman-settings/tvm-command-entry.c:270
+msgid "Perl Scripts"
+msgstr ""
+
+#: ../thunar-volman-settings/tvm-command-entry.c:276
+msgid "Python Scripts"
+msgstr ""
+
+#: ../thunar-volman-settings/tvm-command-entry.c:282
+msgid "Ruby Scripts"
+msgstr ""
+
+#: ../thunar-volman-settings/tvm-command-entry.c:288
+msgid "Shell Scripts"
+msgstr ""
+
 #.
 #. Storage
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:143
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:130
 msgid "Storage"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:153
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:141
 msgid "Removable Storage"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:170
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:158
 msgid "_Mount removable drives when hot-plugged"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:175
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:166
 msgid "Mount removable media when _inserted"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:180
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:174
 msgid "B_rowse removable media when inserted"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:185
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:182
 msgid "_Auto-run programs on new drives and media"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:190
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:189
 msgid "Auto-open files on new drives and media"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:199
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:201
 msgid "Blank CDs and DVDs"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:216
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:218
 msgid "_Burn a CD or DVD when a blank disc is inserted"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:224
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:229
 msgid "Command for _Data CDs:"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:231
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:239
 msgid "Command for A_udio CDs:"
 msgstr ""
 
 #.
 #. Multimedia
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:245
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:255
 msgid "Multimedia"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:255
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:266
 msgid "Audio CDs"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:272
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:283
 msgid "Play _audio CDs when inserted"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:277
-#: ../thunar-volman/tvm-preferences-dialog.c:383
-#: ../thunar-volman/tvm-preferences-dialog.c:425
-#: ../thunar-volman/tvm-preferences-dialog.c:499
-#: ../thunar-volman/tvm-preferences-dialog.c:541
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:290
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:415
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:466
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:553
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:601
 msgid "_Command:"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:287
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:304
 msgid "Video CDs/DVDs"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:304
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:321
 msgid "Play _video CDs and DVDs when inserted"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:309
-#: ../thunar-volman/tvm-preferences-dialog.c:341
-#: ../thunar-volman/tvm-preferences-dialog.c:457
-#: ../thunar-volman/tvm-preferences-dialog.c:573
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:329
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:367
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:505
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:640
 msgid "C_ommand:"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:319
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:343
 msgid "Portable Music Players"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:336
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:360
 msgid "Play _music files when connected"
 msgstr ""
 
 #.
 #. Cameras
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:351
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:379
 msgid "Cameras"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:361
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:390
 msgid "Digital Cameras"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:378
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:407
 msgid "Import digital photographs when connected"
 msgstr ""
 
 #.
 #. PDAs
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:393
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:427
 msgid "PDAs"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:403
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:441
 msgid "Palm™"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:420
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:458
 msgid "Sync _Palm™ devices when connected"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:435
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:480
 msgid "Pocket PCs"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:452
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:497
 msgid "Sync Pocket P_C devices when connected"
 msgstr ""
 
 #.
 #. Printers
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:467
-#: ../thunar-volman/tvm-preferences-dialog.c:477
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:517
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:528
 msgid "Printers"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:494
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:545
 msgid "Automatically run a program when a _printer is connected"
 msgstr ""
 
 #.
 #. Input Devices
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:509
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:565
 msgid "Input Devices"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:519
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:576
 msgid "Keyboards"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:536
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:593
 msgid "Automatically run a program when an USB _keyboard is connected"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:551
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:615
 msgid "Mice"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:568
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:632
 msgid "Automatically run a program when an USB _mouse is connected"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:583
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:654
 msgid "Tablet"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:600
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:671
 msgid "Automatically run a program when a _tablet is connected"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:605
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:679
 msgid "Com_mand:"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:690
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:755
 msgid "Failed to open the documentation browser"
 msgstr ""
-
-#: ../thunar-volman/tvm-run.c:133 ../thunar-volman/tvm-run.c:144
-msgid "Choose Disc Type"
-msgstr ""
-
-#: ../thunar-volman/tvm-run.c:134 ../thunar-volman/tvm-run.c:145
-msgid "You have inserted a blank disc."
-msgstr ""
-
-#: ../thunar-volman/tvm-run.c:135 ../thunar-volman/tvm-run.c:146
-msgid "What would you like to do?"
-msgstr ""
-
-#: ../thunar-volman/tvm-run.c:137
-msgid "Make _DVD"
-msgstr ""
-
-#: ../thunar-volman/tvm-run.c:148
-msgid "Make _Data CD"
-msgstr ""
-
-#: ../thunar-volman/tvm-run.c:149
-msgid "Make _Audio CD"
-msgstr ""
-
-#: ../thunar-volman-settings.desktop.in.in.h:3
-msgid "Removable Media"
-msgstr ""
diff --git a/po/ast.po b/po/ast.po
index d4abf44..56e9322 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -3,456 +3,616 @@ msgid ""
 msgstr ""
 "Project-Id-Version: thunar-volman 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-30 02:26-0700\n"
+"POT-Creation-Date: 2010-07-25 20:06+0200\n"
 "PO-Revision-Date: 2009-07-13 19:55+0100\n"
 "Last-Translator: Marcos Antonio Alvarez Costales <marcoscostales at gmail.com>\n"
 "Language-Team: Asturian <alministradores at softastur.org>\n"
+"Language: ast\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../thunar-volman/main.c:50
-msgid "The HAL device UDI of the newly added device"
+#: ../thunar-volman/main.c:59
+#, fuzzy
+msgid "The syfs path of the newly added device"
 msgstr "L'UDI de preséu HAL del nuevu preséu amestáu"
 
-#: ../thunar-volman/main.c:51 ../thunar-volman/tvm-preferences-dialog.c:120
-#: ../thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman/main.c:60
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:104
 msgid "Configure management of removable drives and media"
 msgstr "Configurar la xestión de preseos y soportes estrayíbles"
 
-#: ../thunar-volman/main.c:52
+#: ../thunar-volman/main.c:61
 msgid "Print version information and exit"
 msgstr "Amosar la información de versión y colar"
 
 #. setup application name
-#: ../thunar-volman/main.c:69
+#: ../thunar-volman/main.c:93
 msgid "Thunar Volume Manager"
 msgstr "Xestor de volúmenes de Thunar"
 
-#: ../thunar-volman/main.c:90
-msgid "Failed to open display"
-msgstr "Fallu al abrir display"
-
-#: ../thunar-volman/main.c:106
-msgid "The Thunar development team. All rights reserved."
-msgstr "L'equipu de desendolcu de Thunar. Tolos drechos reservaos."
-
-#: ../thunar-volman/main.c:107
-msgid "Written by Benedikt Meurer <benny at xfce.org>."
-msgstr "Escritu por Benedikt Meurer <benny at xfce.org>."
+#: ../thunar-volman/main.c:133
+msgid "All rights reserved."
+msgstr ""
 
-#: ../thunar-volman/main.c:108
+#: ../thunar-volman/main.c:134
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Por favor, informa de fallos a <%s>."
 
-#. TRANSLATORS: A HAL device UDI must match certain conditions to be valid (to be exact, it must be a valid D-Bus object path)
-#: ../thunar-volman/main.c:133
+#: ../thunar-volman/main.c:188
 #, c-format
-msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
-msgstr "L'UDI \"%s\" especificáu nun ye un UDI de preséu HAL válidu."
+msgid "There is no device with the sysfs path \"%s\""
+msgstr ""
 
-#. TRANSLATORS: thunar-volman wasn't invoked with either --device-added or --configure.
-#: ../thunar-volman/main.c:144
-#, c-format
-msgid "Must specify the new HAL device UDI with --device-added"
+#: ../thunar-volman/main.c:200
+#, fuzzy, c-format
+msgid "Must specify the sysfs path of new devices with --device-added"
 msgstr "Tien d'especificar el nuevu UDI de preséu HAL con --device-added"
 
 #. ...so we need to prompt what to do
-#: ../thunar-volman/tvm-block-device.c:189
+#: ../thunar-volman/tvm-block-device.c:204
 msgid "Photos and Music"
 msgstr "Semeyes y música"
 
-#: ../thunar-volman/tvm-block-device.c:190
-msgid "Photos were found on your portable music player."
+#: ../thunar-volman/tvm-block-device.c:205
+#, fuzzy
+msgid "Photos were found on your portable music player"
 msgstr "Atopáronse semeyes nel to reproductor de música portátil."
 
-#: ../thunar-volman/tvm-block-device.c:191
+#: ../thunar-volman/tvm-block-device.c:206
 msgid "Would you like to import the photos or manage the music?"
 msgstr "¿Quies importar les semeyes o xestionar la música?"
 
-#: ../thunar-volman/tvm-block-device.c:192
-#: ../thunar-volman/tvm-block-device.c:258
-#: ../thunar-volman/tvm-block-device.c:335
-#: ../thunar-volman/tvm-block-device.c:371
-#: ../thunar-volman/tvm-block-device.c:430
-#: ../thunar-volman/tvm-block-device.c:703
-#: ../thunar-volman/tvm-crypto-volume.c:448 ../thunar-volman/tvm-run.c:136
-#: ../thunar-volman/tvm-run.c:147
+#: ../thunar-volman/tvm-block-device.c:208
+#: ../thunar-volman/tvm-block-device.c:277
+#: ../thunar-volman/tvm-block-device.c:378
+#: ../thunar-volman/tvm-block-device.c:425
+#: ../thunar-volman/tvm-block-device.c:507
+#: ../thunar-volman/tvm-block-device.c:826 ../thunar-volman/tvm-run.c:196
+#: ../thunar-volman/tvm-run.c:207
 msgid "Ig_nore"
 msgstr "I_norar"
 
-#: ../thunar-volman/tvm-block-device.c:193
-#: ../thunar-volman/tvm-block-device.c:259
+#: ../thunar-volman/tvm-block-device.c:209
+#: ../thunar-volman/tvm-block-device.c:278
 msgid "Import _Photos"
 msgstr "Importar les seme_yes"
 
-#: ../thunar-volman/tvm-block-device.c:194
+#: ../thunar-volman/tvm-block-device.c:210
 msgid "Manage _Music"
 msgstr "Xestionar la _música"
 
-#. ask the user whether to import photos
-#: ../thunar-volman/tvm-block-device.c:255
+#. ask the user to import photos
+#: ../thunar-volman/tvm-block-device.c:273
 msgid "Photo Import"
 msgstr "Importar de semeyes"
 
-#: ../thunar-volman/tvm-block-device.c:256
-msgid "A photo card has been detected."
+#: ../thunar-volman/tvm-block-device.c:274
+#, fuzzy
+msgid "A photo card has been detected"
 msgstr "Deteutóse una tarxeta con semeyes."
 
-#: ../thunar-volman/tvm-block-device.c:257
+#: ../thunar-volman/tvm-block-device.c:275
 msgid ""
 "There are photos on the card. Would you like to add these photos to your "
 "album?"
 msgstr "Hai semeyes na tarxeta. ¿Quies amestar estes semeyes al to álbum?"
 
-#. prompt the user whether to execute this file
-#: ../thunar-volman/tvm-block-device.c:332
-#: ../thunar-volman/tvm-block-device.c:368
+#. prompt the user to execute the file
+#. prompt the user to execute this file
+#: ../thunar-volman/tvm-block-device.c:373
+#: ../thunar-volman/tvm-block-device.c:420
 #, c-format
 msgid "Would you like to allow \"%s\" to run?"
 msgstr "¿Quies permitir que s'execute \"%s\"?"
 
-#: ../thunar-volman/tvm-block-device.c:333
-#: ../thunar-volman/tvm-block-device.c:369
+#: ../thunar-volman/tvm-block-device.c:376
+#: ../thunar-volman/tvm-block-device.c:423
 msgid "Auto-Run Confirmation"
 msgstr "Confirmación d'auto-execución"
 
-#: ../thunar-volman/tvm-block-device.c:334
-#: ../thunar-volman/tvm-block-device.c:370
+#: ../thunar-volman/tvm-block-device.c:377
+#: ../thunar-volman/tvm-block-device.c:424
 msgid "Auto-Run capability detected"
 msgstr "Capacidá d'auto-execución deteutada"
 
-#: ../thunar-volman/tvm-block-device.c:336
-#: ../thunar-volman/tvm-block-device.c:372
+#: ../thunar-volman/tvm-block-device.c:379
+#: ../thunar-volman/tvm-block-device.c:426
 msgid "_Allow Auto-Run"
 msgstr "Permitir l'_auto-execución"
 
 #. prompt the user whether to autoopen this file
-#: ../thunar-volman/tvm-block-device.c:427
+#: ../thunar-volman/tvm-block-device.c:502
 #, c-format
 msgid "Would you like to open \"%s\"?"
 msgstr "¿Quies abrir \"%s\"?"
 
-#: ../thunar-volman/tvm-block-device.c:428
+#: ../thunar-volman/tvm-block-device.c:505
 msgid "Auto-Open Confirmation"
 msgstr "Confirmación d'auto-apertura"
 
-#: ../thunar-volman/tvm-block-device.c:429
+#: ../thunar-volman/tvm-block-device.c:506
 msgid "Auto-Open capability detected"
 msgstr "Capacidá d'auto-apertura deteutada"
 
-#: ../thunar-volman/tvm-block-device.c:431
+#: ../thunar-volman/tvm-block-device.c:508
 msgid "_Open"
 msgstr "_Abrir"
 
-#. ask what do with the mixed audio/data disc
-#: ../thunar-volman/tvm-block-device.c:700
-msgid "Audio / Data CD"
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "CD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "DVD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:618
+msgid "The CD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:619
+msgid "The DVD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:629
+msgid "Volume mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:632
+#, c-format
+msgid "The volume \"%s\" was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:637
+#, c-format
+msgid "The inserted volume was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:691
+#, c-format
+msgid "Unable to locate mount point"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:737
+#, c-format
+msgid "Unable to mount the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:746
+#, c-format
+msgid "Could not detect the volume corresponding to the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:821
+#, fuzzy
+msgid "Audio/Data CD"
 msgstr "CD d'audiu / datos"
 
-#: ../thunar-volman/tvm-block-device.c:701
-msgid "The CD in the drive contains both music and files."
+#: ../thunar-volman/tvm-block-device.c:822
+#, fuzzy
+msgid "The CD in the drive contains both music and files"
 msgstr "El CD dientro del preséu caltién música y ficheros."
 
-#: ../thunar-volman/tvm-block-device.c:702
+#: ../thunar-volman/tvm-block-device.c:824
 msgid "Would you like to listen to music or browse the files?"
 msgstr "¿Quies escuchar música o ver los ficheros?"
 
-#: ../thunar-volman/tvm-block-device.c:704
+#: ../thunar-volman/tvm-block-device.c:827
 msgid "_Browse Files"
 msgstr "_Restolar ficheros"
 
-#: ../thunar-volman/tvm-block-device.c:705
+#: ../thunar-volman/tvm-block-device.c:828
 msgid "_Play CD"
 msgstr "_Reproducir CD"
 
-#: ../thunar-volman/tvm-command-entry.c:233
-msgid "Select an Application"
-msgstr "Seleicionar una aplicación"
+#: ../thunar-volman/tvm-block-device.c:916
+#, c-format
+msgid "Unknown block device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:243
-msgid "All Files"
-msgstr "Tolos ficheros"
+#: ../thunar-volman/tvm-device.c:139
+#, c-format
+msgid "Device type not supported"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:248
-msgid "Executable Files"
-msgstr "Ficheros executables"
+#: ../thunar-volman/tvm-input-device.c:74
+#, fuzzy
+msgid "input-keyboard"
+msgstr "Teclaos"
 
-#: ../thunar-volman/tvm-command-entry.c:263
-msgid "Perl Scripts"
-msgstr "Scripts de Perl"
+#: ../thunar-volman/tvm-input-device.c:75
+#, fuzzy
+msgid "Keyboard detected"
+msgstr "Teclaos"
 
-#: ../thunar-volman/tvm-command-entry.c:269
-msgid "Python Scripts"
-msgstr "Scripts de Python"
+#: ../thunar-volman/tvm-input-device.c:76
+#, fuzzy
+msgid "A keyboard was detected"
+msgstr "Deteutóse una tarxeta con semeyes."
 
-#: ../thunar-volman/tvm-command-entry.c:275
-msgid "Ruby Scripts"
-msgstr "Scripts de Ruby"
+#: ../thunar-volman/tvm-input-device.c:86
+#: ../thunar-volman/tvm-input-device.c:100
+msgid "input-tablet"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:281
-msgid "Shell Scripts"
-msgstr "Scripts de shell"
+#: ../thunar-volman/tvm-input-device.c:87
+#: ../thunar-volman/tvm-input-device.c:101
+#, fuzzy
+msgid "Tablet detected"
+msgstr "Capacidá d'auto-execución deteutada"
 
-#: ../thunar-volman/tvm-crypto-volume.c:286
-#: ../thunar-volman/tvm-crypto-volume.c:443
-msgid "Encrypted volume"
-msgstr "Volume cifráu"
+#: ../thunar-volman/tvm-input-device.c:88
+#: ../thunar-volman/tvm-input-device.c:102
+msgid "A graphics tablet was detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:297
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Montando volume cifráu...</span>"
+#: ../thunar-volman/tvm-input-device.c:110
+msgid "input-mouse"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:302
-msgid "Setting up the crypto layer..."
-msgstr "Configurando la capa de cifráu..."
+#: ../thunar-volman/tvm-input-device.c:111
+msgid "Mouse detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-input-device.c:112
+msgid "A mouse was detected"
+msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) but got Permission denied.
-#: ../thunar-volman/tvm-crypto-volume.c:369
+#: ../thunar-volman/tvm-input-device.c:139
 #, c-format
-msgid "You are not privileged to setup the crypto layer"
-msgstr "Nun tienes privilexos pa configurar la capa de cifráu"
+msgid "Unsupported input device type"
+msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) and typed the wrong password.
-#: ../thunar-volman/tvm-crypto-volume.c:374
+#: ../thunar-volman/tvm-run.c:173
 #, c-format
-msgid "Wrong password"
-msgstr "Contraseña incorreuta"
+msgid "Autoburning of blank CDs and DVDs is disabled"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:445
-msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Contraseña incorreuta.</span>"
+#: ../thunar-volman/tvm-run.c:193
+msgid "Blank DVD inserted"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:446
-msgid "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Esti volume ta cifráu.</span>"
+#: ../thunar-volman/tvm-run.c:194
+#, fuzzy
+msgid "You have inserted a blank DVD."
+msgstr "Inxertásti un discu virxen."
 
-#: ../thunar-volman/tvm-crypto-volume.c:447
-msgid "Please enter your password to decrypt and mount the volume."
-msgstr "Por favor, introduz la to contraseña pa descifrar y montar el volume."
+#: ../thunar-volman/tvm-run.c:195 ../thunar-volman/tvm-run.c:206
+msgid "What would you like to do?"
+msgstr "¿Qué quies facer?"
 
-#: ../thunar-volman/tvm-crypto-volume.c:449
-msgid "_Mount"
-msgstr "_Montar"
+#: ../thunar-volman/tvm-run.c:197
+msgid "Burn _DVD"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:468
-msgid "Failed to setup the encrypted volume"
-msgstr "Fallu al configurar el volume cifráu"
+#: ../thunar-volman/tvm-run.c:204
+#, fuzzy
+msgid "Blank CD inserted"
+msgstr "Desaniciar CDs y DVDs"
+
+#: ../thunar-volman/tvm-run.c:205
+#, fuzzy
+msgid "You have inserted a blank CD."
+msgstr "Inxertásti un discu virxen."
+
+#: ../thunar-volman/tvm-run.c:208
+#, fuzzy
+msgid "Burn _Data CD"
+msgstr "Criar un CD de _datos"
+
+#: ../thunar-volman/tvm-run.c:209
+#, fuzzy
+msgid "Burn _Audio CD"
+msgstr "Criar un CD d'_audiu"
+
+#: ../thunar-volman/tvm-run.c:233
+#, c-format
+msgid "The burn command may not be empty"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:272
+#, c-format
+msgid "The CD player command is undefined"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:66
+msgid "Camera detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:119
-#: ../thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman/tvm-usb-device.c:67
+#, fuzzy
+msgid "A photo camera was detected"
+msgstr "Deteutóse una tarxeta con semeyes."
+
+#: ../thunar-volman/tvm-usb-device.c:77
+msgid "Printer detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:78
+msgid "A USB printer was detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:104
+#, c-format
+msgid "Unsupported USB device type"
+msgstr ""
+
+#. setup application name
+#: ../thunar-volman-settings/main.c:52
+#, fuzzy
+msgid "Thunar Volume Manager Settings"
+msgstr "Xestor de volúmenes de Thunar"
+
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:102
 msgid "Removable Drives and Media"
 msgstr "Preseos y soportes estrayíbles"
 
+#: ../thunar-volman-settings/tvm-command-entry.c:240
+msgid "Select an Application"
+msgstr "Seleicionar una aplicación"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:250
+msgid "All Files"
+msgstr "Tolos ficheros"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:255
+msgid "Executable Files"
+msgstr "Ficheros executables"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:270
+msgid "Perl Scripts"
+msgstr "Scripts de Perl"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:276
+msgid "Python Scripts"
+msgstr "Scripts de Python"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:282
+msgid "Ruby Scripts"
+msgstr "Scripts de Ruby"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:288
+msgid "Shell Scripts"
+msgstr "Scripts de shell"
+
 #.
 #. Storage
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:143
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:130
 msgid "Storage"
 msgstr "Atroxu"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:153
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:141
 msgid "Removable Storage"
 msgstr "Atroxu estrayíble"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:170
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:158
 msgid "_Mount removable drives when hot-plugged"
 msgstr "_Montar los preseos estrayíbles al coneutase"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:175
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:166
 msgid "Mount removable media when _inserted"
 msgstr "Montar unidá estrayíble al _inxertala"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:180
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:174
 msgid "B_rowse removable media when inserted"
 msgstr "Res_tolar unidá estrayíble al inxertala"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:185
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:182
 msgid "_Auto-run programs on new drives and media"
 msgstr "_Auto-execución de programes en nuevos preseos y unidaes"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:190
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:189
 msgid "Auto-open files on new drives and media"
 msgstr "Auto-apertura de ficheros en nuevos preseos y unidaes"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:199
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:201
 msgid "Blank CDs and DVDs"
 msgstr "Desaniciar CDs y DVDs"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:216
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:218
 msgid "_Burn a CD or DVD when a blank disc is inserted"
 msgstr "_Grabar un CD o DVD cuando s'inxerte un discu virxe"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:224
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:229
 msgid "Command for _Data CDs:"
 msgstr "Comandu pa los CDs de _datos:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:231
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:239
 msgid "Command for A_udio CDs:"
 msgstr "Comandu pa los CDs d'a_udiu:"
 
 #.
 #. Multimedia
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:245
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:255
 msgid "Multimedia"
 msgstr "Multimedia"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:255
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:266
 msgid "Audio CDs"
 msgstr "CDs d'audiu"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:272
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:283
 msgid "Play _audio CDs when inserted"
 msgstr "Reproducir CDs d'_audiu al inxertar"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:277
-#: ../thunar-volman/tvm-preferences-dialog.c:383
-#: ../thunar-volman/tvm-preferences-dialog.c:425
-#: ../thunar-volman/tvm-preferences-dialog.c:499
-#: ../thunar-volman/tvm-preferences-dialog.c:541
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:290
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:415
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:466
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:553
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:601
 msgid "_Command:"
 msgstr "_Comandu:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:287
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:304
 msgid "Video CDs/DVDs"
 msgstr "CDs/DVDs de vídeu"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:304
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:321
 msgid "Play _video CDs and DVDs when inserted"
 msgstr "Reproducir CDs y DVDs de _vídeu al inxertar"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:309
-#: ../thunar-volman/tvm-preferences-dialog.c:341
-#: ../thunar-volman/tvm-preferences-dialog.c:457
-#: ../thunar-volman/tvm-preferences-dialog.c:573
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:329
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:367
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:505
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:640
 msgid "C_ommand:"
 msgstr "C_omandu:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:319
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:343
 msgid "Portable Music Players"
 msgstr "Reproductor de música portátil"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:336
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:360
 msgid "Play _music files when connected"
 msgstr "Reproducir ficheros de _música al coneutar"
 
 #.
 #. Cameras
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:351
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:379
 msgid "Cameras"
 msgstr "Cámares"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:361
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:390
 msgid "Digital Cameras"
 msgstr "Cámares dixitales"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:378
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:407
 msgid "Import digital photographs when connected"
 msgstr "Importar semeyes dixitales al coneutar"
 
 #.
 #. PDAs
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:393
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:427
 msgid "PDAs"
 msgstr "PDAs"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:403
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:441
 msgid "Palm™"
 msgstr "Palm™"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:420
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:458
 msgid "Sync _Palm™ devices when connected"
 msgstr "Sincronizar preseos _Palm™ al coneutar"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:435
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:480
 msgid "Pocket PCs"
 msgstr "Pocket PCs"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:452
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:497
 msgid "Sync Pocket P_C devices when connected"
 msgstr "Sincronizar preseos Pocket P_C al coneutar"
 
 #.
 #. Printers
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:467
-#: ../thunar-volman/tvm-preferences-dialog.c:477
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:517
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:528
 msgid "Printers"
 msgstr "Imprentadores"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:494
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:545
 msgid "Automatically run a program when a _printer is connected"
 msgstr "Executar automáticamente un programa al coneutar una im_prentadora"
 
 #.
 #. Input Devices
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:509
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:565
 msgid "Input Devices"
 msgstr "Preseos d'entrada"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:519
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:576
 msgid "Keyboards"
 msgstr "Teclaos"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:536
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:593
 msgid "Automatically run a program when an USB _keyboard is connected"
 msgstr "Executar automáticamente un programa al coneutar un te_cláu USB"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:551
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:615
 msgid "Mice"
 msgstr "Mures"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:568
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:632
 msgid "Automatically run a program when an USB _mouse is connected"
 msgstr "Executar automáticamente un programa al coneutar un _mur USB"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:583
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:654
 msgid "Tablet"
 msgstr "Tableta gráfica"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:600
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:671
 msgid "Automatically run a program when a _tablet is connected"
 msgstr ""
 "Executar automáticamente un programa cuando se coneute una _tableta gráfica"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:605
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:679
 msgid "Com_mand:"
 msgstr "Co_mandu:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:690
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:755
 msgid "Failed to open the documentation browser"
 msgstr "Fallu al abrir el visor de documentación"
 
-#: ../thunar-volman/tvm-run.c:133 ../thunar-volman/tvm-run.c:144
-msgid "Choose Disc Type"
-msgstr "Escoyer la triba de discu"
+#~ msgid "Failed to open display"
+#~ msgstr "Fallu al abrir display"
 
-#: ../thunar-volman/tvm-run.c:134 ../thunar-volman/tvm-run.c:145
-msgid "You have inserted a blank disc."
-msgstr "Inxertásti un discu virxen."
+#~ msgid "The Thunar development team. All rights reserved."
+#~ msgstr "L'equipu de desendolcu de Thunar. Tolos drechos reservaos."
 
-#: ../thunar-volman/tvm-run.c:135 ../thunar-volman/tvm-run.c:146
-msgid "What would you like to do?"
-msgstr "¿Qué quies facer?"
+#~ msgid "Written by Benedikt Meurer <benny at xfce.org>."
+#~ msgstr "Escritu por Benedikt Meurer <benny at xfce.org>."
 
-#: ../thunar-volman/tvm-run.c:137
-msgid "Make _DVD"
-msgstr "Criar un _DVD"
+#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
+#~ msgstr "L'UDI \"%s\" especificáu nun ye un UDI de preséu HAL válidu."
 
-#: ../thunar-volman/tvm-run.c:148
-msgid "Make _Data CD"
-msgstr "Criar un CD de _datos"
+#~ msgid "Encrypted volume"
+#~ msgstr "Volume cifráu"
 
-#: ../thunar-volman/tvm-run.c:149
-msgid "Make _Audio CD"
-msgstr "Criar un CD d'_audiu"
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Montando volume cifráu...</span>"
+
+#~ msgid "Setting up the crypto layer..."
+#~ msgstr "Configurando la capa de cifráu..."
+
+#~ msgid "You are not privileged to setup the crypto layer"
+#~ msgstr "Nun tienes privilexos pa configurar la capa de cifráu"
+
+#~ msgid "Wrong password"
+#~ msgstr "Contraseña incorreuta"
+
+#~ msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
+#~ msgstr "<span weight=\"bold\" size=\"larger\">Contraseña incorreuta.</span>"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
+#~ msgstr "<span weight=\"bold\" size=\"larger\">Esti volume ta cifráu.</span>"
+
+#~ msgid "Please enter your password to decrypt and mount the volume."
+#~ msgstr ""
+#~ "Por favor, introduz la to contraseña pa descifrar y montar el volume."
+
+#~ msgid "_Mount"
+#~ msgstr "_Montar"
+
+#~ msgid "Failed to setup the encrypted volume"
+#~ msgstr "Fallu al configurar el volume cifráu"
+
+#~ msgid "Choose Disc Type"
+#~ msgstr "Escoyer la triba de discu"
+
+#~ msgid "Make _DVD"
+#~ msgstr "Criar un _DVD"
 
-#: ../thunar-volman-settings.desktop.in.in.h:3
-msgid "Removable Media"
-msgstr "Unidaes estrayíbles"
+#~ msgid "Removable Media"
+#~ msgstr "Unidaes estrayíbles"
diff --git a/po/ca.po b/po/ca.po
index 01b3fa9..ece3068 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,10 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: thunar-volman\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-30 02:26-0700\n"
+"POT-Creation-Date: 2010-07-25 20:06+0200\n"
 "PO-Revision-Date: 2008-11-30 14:28+0100\n"
 "Last-Translator: Carles Muñoz Gorriz <carlesmu at internautas.org>\n"
 "Language-Team: Catalan\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,447 +21,607 @@ msgstr ""
 "X-Poedit-Language: Catalan\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../thunar-volman/main.c:50
-msgid "The HAL device UDI of the newly added device"
+#: ../thunar-volman/main.c:59
+#, fuzzy
+msgid "The syfs path of the newly added device"
 msgstr "El UDI del dispositiu HAL del dispositiu tot just afegit"
 
-#: ../thunar-volman/main.c:51 ../thunar-volman/tvm-preferences-dialog.c:120
-#: ../thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman/main.c:60
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:104
 msgid "Configure management of removable drives and media"
 msgstr "Configura la gestió dels dispositius i mitjans extraïbles"
 
-#: ../thunar-volman/main.c:52
+#: ../thunar-volman/main.c:61
 msgid "Print version information and exit"
 msgstr "Mostra informació sobre la versió i surt"
 
 #. setup application name
-#: ../thunar-volman/main.c:69
+#: ../thunar-volman/main.c:93
 msgid "Thunar Volume Manager"
 msgstr "Gestor de volums de Thunar"
 
-#: ../thunar-volman/main.c:90
-msgid "Failed to open display"
-msgstr "No s'ha pogut obrir la pantalla"
-
-#: ../thunar-volman/main.c:106
-msgid "The Thunar development team. All rights reserved."
-msgstr "L'equip de desenvolupament de Thunar. Tots els drets reservats."
-
-#: ../thunar-volman/main.c:107
-msgid "Written by Benedikt Meurer <benny at xfce.org>."
-msgstr "Escrit per Benedikt Meurer <benny at xfce.org>."
+#: ../thunar-volman/main.c:133
+msgid "All rights reserved."
+msgstr ""
 
-#: ../thunar-volman/main.c:108
+#: ../thunar-volman/main.c:134
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Envieu els errors a <%s>."
 
-#. TRANSLATORS: A HAL device UDI must match certain conditions to be valid (to be exact, it must be a valid D-Bus object path)
-#: ../thunar-volman/main.c:133
+#: ../thunar-volman/main.c:188
 #, c-format
-msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
-msgstr "El UDI «%s» indicat no és un UDI de dispositiu HAL"
+msgid "There is no device with the sysfs path \"%s\""
+msgstr ""
 
-#. TRANSLATORS: thunar-volman wasn't invoked with either --device-added or --configure.
-#: ../thunar-volman/main.c:144
-#, c-format
-msgid "Must specify the new HAL device UDI with --device-added"
+#: ../thunar-volman/main.c:200
+#, fuzzy, c-format
+msgid "Must specify the sysfs path of new devices with --device-added"
 msgstr "Heu d'indicar el nou UDI de dispositiu HAL amb --device-added"
 
 #. ...so we need to prompt what to do
-#: ../thunar-volman/tvm-block-device.c:189
+#: ../thunar-volman/tvm-block-device.c:204
 msgid "Photos and Music"
 msgstr "Fotos i música"
 
-#: ../thunar-volman/tvm-block-device.c:190
-msgid "Photos were found on your portable music player."
+#: ../thunar-volman/tvm-block-device.c:205
+#, fuzzy
+msgid "Photos were found on your portable music player"
 msgstr "S'han trobat fotos en el reproductor de música portàtil."
 
-#: ../thunar-volman/tvm-block-device.c:191
+#: ../thunar-volman/tvm-block-device.c:206
 msgid "Would you like to import the photos or manage the music?"
 msgstr "Voleu importar les fotos o gestionar la música?"
 
-#: ../thunar-volman/tvm-block-device.c:192
-#: ../thunar-volman/tvm-block-device.c:258
-#: ../thunar-volman/tvm-block-device.c:335
-#: ../thunar-volman/tvm-block-device.c:371
-#: ../thunar-volman/tvm-block-device.c:430
-#: ../thunar-volman/tvm-block-device.c:703
-#: ../thunar-volman/tvm-crypto-volume.c:448 ../thunar-volman/tvm-run.c:136
-#: ../thunar-volman/tvm-run.c:147
+#: ../thunar-volman/tvm-block-device.c:208
+#: ../thunar-volman/tvm-block-device.c:277
+#: ../thunar-volman/tvm-block-device.c:378
+#: ../thunar-volman/tvm-block-device.c:425
+#: ../thunar-volman/tvm-block-device.c:507
+#: ../thunar-volman/tvm-block-device.c:826 ../thunar-volman/tvm-run.c:196
+#: ../thunar-volman/tvm-run.c:207
 msgid "Ig_nore"
 msgstr "Ig_nora"
 
-#: ../thunar-volman/tvm-block-device.c:193
-#: ../thunar-volman/tvm-block-device.c:259
+#: ../thunar-volman/tvm-block-device.c:209
+#: ../thunar-volman/tvm-block-device.c:278
 msgid "Import _Photos"
 msgstr "Importa les _fotos"
 
-#: ../thunar-volman/tvm-block-device.c:194
+#: ../thunar-volman/tvm-block-device.c:210
 msgid "Manage _Music"
 msgstr "Gestiona la _música"
 
-#. ask the user whether to import photos
-#: ../thunar-volman/tvm-block-device.c:255
+#. ask the user to import photos
+#: ../thunar-volman/tvm-block-device.c:273
 msgid "Photo Import"
 msgstr "Importa les fotos"
 
-#: ../thunar-volman/tvm-block-device.c:256
-msgid "A photo card has been detected."
+#: ../thunar-volman/tvm-block-device.c:274
+#, fuzzy
+msgid "A photo card has been detected"
 msgstr "S'ha detectat una tarja de fotos."
 
-#: ../thunar-volman/tvm-block-device.c:257
+#: ../thunar-volman/tvm-block-device.c:275
 msgid ""
 "There are photos on the card. Would you like to add these photos to your "
 "album?"
 msgstr "Hi han fotos a la targeta, Voleu afegir-les al vostre àlbum?"
 
-#. prompt the user whether to execute this file
-#: ../thunar-volman/tvm-block-device.c:332
-#: ../thunar-volman/tvm-block-device.c:368
+#. prompt the user to execute the file
+#. prompt the user to execute this file
+#: ../thunar-volman/tvm-block-device.c:373
+#: ../thunar-volman/tvm-block-device.c:420
 #, c-format
 msgid "Would you like to allow \"%s\" to run?"
 msgstr "Voleu permetre l'execució de «%s»?"
 
-#: ../thunar-volman/tvm-block-device.c:333
-#: ../thunar-volman/tvm-block-device.c:369
+#: ../thunar-volman/tvm-block-device.c:376
+#: ../thunar-volman/tvm-block-device.c:423
 msgid "Auto-Run Confirmation"
 msgstr "Confirmació d'execució automàtica"
 
-#: ../thunar-volman/tvm-block-device.c:334
-#: ../thunar-volman/tvm-block-device.c:370
+#: ../thunar-volman/tvm-block-device.c:377
+#: ../thunar-volman/tvm-block-device.c:424
 msgid "Auto-Run capability detected"
 msgstr "Detectada capacitat d'execució automàtica"
 
-#: ../thunar-volman/tvm-block-device.c:336
-#: ../thunar-volman/tvm-block-device.c:372
+#: ../thunar-volman/tvm-block-device.c:379
+#: ../thunar-volman/tvm-block-device.c:426
 msgid "_Allow Auto-Run"
 msgstr "_Permet l'execució automàtica"
 
 #. prompt the user whether to autoopen this file
-#: ../thunar-volman/tvm-block-device.c:427
+#: ../thunar-volman/tvm-block-device.c:502
 #, c-format
 msgid "Would you like to open \"%s\"?"
 msgstr "Voleu obrir «%s»?"
 
-#: ../thunar-volman/tvm-block-device.c:428
+#: ../thunar-volman/tvm-block-device.c:505
 msgid "Auto-Open Confirmation"
 msgstr "Confirmació d'obertura automàtica"
 
-#: ../thunar-volman/tvm-block-device.c:429
+#: ../thunar-volman/tvm-block-device.c:506
 msgid "Auto-Open capability detected"
 msgstr "Detectada capacitat d'obertura automàtica"
 
-#: ../thunar-volman/tvm-block-device.c:431
+#: ../thunar-volman/tvm-block-device.c:508
 msgid "_Open"
 msgstr "_Obre"
 
-#. ask what do with the mixed audio/data disc
-#: ../thunar-volman/tvm-block-device.c:700
-msgid "Audio / Data CD"
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "CD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "DVD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:618
+msgid "The CD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:619
+msgid "The DVD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:629
+msgid "Volume mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:632
+#, c-format
+msgid "The volume \"%s\" was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:637
+#, c-format
+msgid "The inserted volume was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:691
+#, c-format
+msgid "Unable to locate mount point"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:737
+#, c-format
+msgid "Unable to mount the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:746
+#, c-format
+msgid "Could not detect the volume corresponding to the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:821
+#, fuzzy
+msgid "Audio/Data CD"
 msgstr "CD d'àudio i dades"
 
-#: ../thunar-volman/tvm-block-device.c:701
-msgid "The CD in the drive contains both music and files."
+#: ../thunar-volman/tvm-block-device.c:822
+#, fuzzy
+msgid "The CD in the drive contains both music and files"
 msgstr "El CD del dispositiu te tant música com fitxers."
 
-#: ../thunar-volman/tvm-block-device.c:702
+#: ../thunar-volman/tvm-block-device.c:824
 msgid "Would you like to listen to music or browse the files?"
 msgstr "Voleu escoltar la música o navegar en els fitxers?"
 
-#: ../thunar-volman/tvm-block-device.c:704
+#: ../thunar-volman/tvm-block-device.c:827
 msgid "_Browse Files"
 msgstr "_Navegador de fitxers"
 
-#: ../thunar-volman/tvm-block-device.c:705
+#: ../thunar-volman/tvm-block-device.c:828
 msgid "_Play CD"
 msgstr "_Reprodueix un CD"
 
-#: ../thunar-volman/tvm-command-entry.c:233
-msgid "Select an Application"
-msgstr "Seleccioneu una aplicació"
+#: ../thunar-volman/tvm-block-device.c:916
+#, c-format
+msgid "Unknown block device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:243
-msgid "All Files"
-msgstr "Tots els fitxers"
+#: ../thunar-volman/tvm-device.c:139
+#, c-format
+msgid "Device type not supported"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:248
-msgid "Executable Files"
-msgstr "Fitxers executables"
+#: ../thunar-volman/tvm-input-device.c:74
+#, fuzzy
+msgid "input-keyboard"
+msgstr "Teclats"
 
-#: ../thunar-volman/tvm-command-entry.c:263
-msgid "Perl Scripts"
-msgstr "Seqüències de Perl"
+#: ../thunar-volman/tvm-input-device.c:75
+#, fuzzy
+msgid "Keyboard detected"
+msgstr "Teclats"
 
-#: ../thunar-volman/tvm-command-entry.c:269
-msgid "Python Scripts"
-msgstr "Seqüències de Python"
+#: ../thunar-volman/tvm-input-device.c:76
+#, fuzzy
+msgid "A keyboard was detected"
+msgstr "S'ha detectat una tarja de fotos."
 
-#: ../thunar-volman/tvm-command-entry.c:275
-msgid "Ruby Scripts"
-msgstr "Seqüències de Ruby"
+#: ../thunar-volman/tvm-input-device.c:86
+#: ../thunar-volman/tvm-input-device.c:100
+msgid "input-tablet"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:281
-msgid "Shell Scripts"
-msgstr "Seqüències de l'intèrpret d'ordres"
+#: ../thunar-volman/tvm-input-device.c:87
+#: ../thunar-volman/tvm-input-device.c:101
+#, fuzzy
+msgid "Tablet detected"
+msgstr "Detectada capacitat d'execució automàtica"
 
-#: ../thunar-volman/tvm-crypto-volume.c:286
-#: ../thunar-volman/tvm-crypto-volume.c:443
-msgid "Encrypted volume"
-msgstr "Volum xifrat"
+#: ../thunar-volman/tvm-input-device.c:88
+#: ../thunar-volman/tvm-input-device.c:102
+msgid "A graphics tablet was detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:297
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Muntant un volum xifrat…</span>"
+#: ../thunar-volman/tvm-input-device.c:110
+msgid "input-mouse"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:302
-msgid "Setting up the crypto layer..."
-msgstr "Configurant la capa de xifratge…"
+#: ../thunar-volman/tvm-input-device.c:111
+msgid "Mouse detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-input-device.c:112
+msgid "A mouse was detected"
+msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) but got Permission denied.
-#: ../thunar-volman/tvm-crypto-volume.c:369
+#: ../thunar-volman/tvm-input-device.c:139
 #, c-format
-msgid "You are not privileged to setup the crypto layer"
-msgstr "No teniu pro privilegis per configurar la capa de xifratge"
+msgid "Unsupported input device type"
+msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) and typed the wrong password.
-#: ../thunar-volman/tvm-crypto-volume.c:374
+#: ../thunar-volman/tvm-run.c:173
 #, c-format
-msgid "Wrong password"
-msgstr "Contrasenya incorrecta"
+msgid "Autoburning of blank CDs and DVDs is disabled"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:445
-msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Contrasenya incorrecte.</span>"
+#: ../thunar-volman/tvm-run.c:193
+msgid "Blank DVD inserted"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:446
-msgid "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Aquest volum està xifrat.</span>"
+#: ../thunar-volman/tvm-run.c:194
+#, fuzzy
+msgid "You have inserted a blank DVD."
+msgstr "Heu introduït un disc en blanc."
 
-#: ../thunar-volman/tvm-crypto-volume.c:447
-msgid "Please enter your password to decrypt and mount the volume."
-msgstr "Introduïu la vostra contrasenya per desxifrar i muntar el volum."
+#: ../thunar-volman/tvm-run.c:195 ../thunar-volman/tvm-run.c:206
+msgid "What would you like to do?"
+msgstr "Què voleu fer?"
 
-#: ../thunar-volman/tvm-crypto-volume.c:449
-msgid "_Mount"
-msgstr "_Munta"
+#: ../thunar-volman/tvm-run.c:197
+msgid "Burn _DVD"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:468
-msgid "Failed to setup the encrypted volume"
-msgstr "No s'ha pogut configurar el volum xifrat"
+#: ../thunar-volman/tvm-run.c:204
+#, fuzzy
+msgid "Blank CD inserted"
+msgstr "CDs i DVDs en blanc"
+
+#: ../thunar-volman/tvm-run.c:205
+#, fuzzy
+msgid "You have inserted a blank CD."
+msgstr "Heu introduït un disc en blanc."
+
+#: ../thunar-volman/tvm-run.c:208
+#, fuzzy
+msgid "Burn _Data CD"
+msgstr "Fes un CD de _dades"
+
+#: ../thunar-volman/tvm-run.c:209
+#, fuzzy
+msgid "Burn _Audio CD"
+msgstr "Fes un CD d'_àudio"
+
+#: ../thunar-volman/tvm-run.c:233
+#, c-format
+msgid "The burn command may not be empty"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:272
+#, c-format
+msgid "The CD player command is undefined"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:66
+msgid "Camera detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:119
-#: ../thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman/tvm-usb-device.c:67
+#, fuzzy
+msgid "A photo camera was detected"
+msgstr "S'ha detectat una tarja de fotos."
+
+#: ../thunar-volman/tvm-usb-device.c:77
+msgid "Printer detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:78
+msgid "A USB printer was detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:104
+#, c-format
+msgid "Unsupported USB device type"
+msgstr ""
+
+#. setup application name
+#: ../thunar-volman-settings/main.c:52
+#, fuzzy
+msgid "Thunar Volume Manager Settings"
+msgstr "Gestor de volums de Thunar"
+
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:102
 msgid "Removable Drives and Media"
 msgstr "Dispositius i mitjans extraïble"
 
+#: ../thunar-volman-settings/tvm-command-entry.c:240
+msgid "Select an Application"
+msgstr "Seleccioneu una aplicació"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:250
+msgid "All Files"
+msgstr "Tots els fitxers"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:255
+msgid "Executable Files"
+msgstr "Fitxers executables"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:270
+msgid "Perl Scripts"
+msgstr "Seqüències de Perl"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:276
+msgid "Python Scripts"
+msgstr "Seqüències de Python"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:282
+msgid "Ruby Scripts"
+msgstr "Seqüències de Ruby"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:288
+msgid "Shell Scripts"
+msgstr "Seqüències de l'intèrpret d'ordres"
+
 #.
 #. Storage
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:143
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:130
 msgid "Storage"
 msgstr "Emmagatzematge"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:153
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:141
 msgid "Removable Storage"
 msgstr "Emmagatzemament extraïble"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:170
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:158
 msgid "_Mount removable drives when hot-plugged"
 msgstr "_Munta els dispositius extraïbles quan es connecten"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:175
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:166
 msgid "Mount removable media when _inserted"
 msgstr "Munta els mitjans extraïbles quan s'_insereixin"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:180
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:174
 msgid "B_rowse removable media when inserted"
 msgstr "_Navega en els mitjans extraïbles quan s'insereixin"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:185
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:182
 msgid "_Auto-run programs on new drives and media"
 msgstr "Executa _automàticament programes en dispositius o mitjans nous"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:190
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:189
 msgid "Auto-open files on new drives and media"
 msgstr "Obre automàticament els fitxers de mitjans i dispositius nous"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:199
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:201
 msgid "Blank CDs and DVDs"
 msgstr "CDs i DVDs en blanc"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:216
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:218
 msgid "_Burn a CD or DVD when a blank disc is inserted"
 msgstr "_Crema un CD o un DVD quan s'insereixi un disc en blanc"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:224
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:229
 msgid "Command for _Data CDs:"
 msgstr "Ordre pels CDs de _dades:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:231
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:239
 msgid "Command for A_udio CDs:"
 msgstr "Ordre pels CDs d'à_udio:"
 
 #.
 #. Multimedia
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:245
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:255
 msgid "Multimedia"
 msgstr "Multimèdia"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:255
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:266
 msgid "Audio CDs"
 msgstr "CDs d'àudio"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:272
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:283
 msgid "Play _audio CDs when inserted"
 msgstr "Reprodueix els _àudio CDs quan s'insereixin"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:277
-#: ../thunar-volman/tvm-preferences-dialog.c:383
-#: ../thunar-volman/tvm-preferences-dialog.c:425
-#: ../thunar-volman/tvm-preferences-dialog.c:499
-#: ../thunar-volman/tvm-preferences-dialog.c:541
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:290
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:415
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:466
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:553
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:601
 msgid "_Command:"
 msgstr "_Ordre:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:287
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:304
 msgid "Video CDs/DVDs"
 msgstr "CDs/DVDs de vídeo"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:304
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:321
 msgid "Play _video CDs and DVDs when inserted"
 msgstr "Reprodueix els _vídeo CDs i DVDs quan s'insereixin"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:309
-#: ../thunar-volman/tvm-preferences-dialog.c:341
-#: ../thunar-volman/tvm-preferences-dialog.c:457
-#: ../thunar-volman/tvm-preferences-dialog.c:573
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:329
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:367
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:505
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:640
 msgid "C_ommand:"
 msgstr "O_rdre:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:319
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:343
 msgid "Portable Music Players"
 msgstr "Reproductors de música portàtils"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:336
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:360
 msgid "Play _music files when connected"
 msgstr "Reprodueix els fitxers de _música quan es connectin"
 
 #.
 #. Cameras
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:351
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:379
 msgid "Cameras"
 msgstr "Càmeres"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:361
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:390
 msgid "Digital Cameras"
 msgstr "Càmeres fotogràfiques digitals"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:378
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:407
 msgid "Import digital photographs when connected"
 msgstr "Importa les fotos digitals quan es connecti"
 
 #.
 #. PDAs
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:393
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:427
 msgid "PDAs"
 msgstr "Organitzadors personals"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:403
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:441
 msgid "Palm™"
 msgstr "Palm™"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:420
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:458
 msgid "Sync _Palm™ devices when connected"
 msgstr "Sincronitza els dispositius _Palm™ quan es connectin"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:435
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:480
 msgid "Pocket PCs"
 msgstr "Ordinadors de butxaca"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:452
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:497
 msgid "Sync Pocket P_C devices when connected"
 msgstr "Sincronitza els ordinadors de _butxaca quan es connectin"
 
 #.
 #. Printers
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:467
-#: ../thunar-volman/tvm-preferences-dialog.c:477
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:517
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:528
 msgid "Printers"
 msgstr "Impressores"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:494
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:545
 msgid "Automatically run a program when a _printer is connected"
 msgstr "Executa automàticament un programa quan es connecti una _impressora"
 
 #.
 #. Input Devices
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:509
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:565
 msgid "Input Devices"
 msgstr "Dispositius d'entrada"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:519
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:576
 msgid "Keyboards"
 msgstr "Teclats"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:536
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:593
 msgid "Automatically run a program when an USB _keyboard is connected"
 msgstr "Executa automàticament un programa quan es connecti un _teclat USB"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:551
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:615
 msgid "Mice"
 msgstr "Ratolí"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:568
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:632
 msgid "Automatically run a program when an USB _mouse is connected"
 msgstr "Executa automàticament un programa quan es connecti un r_atolí USB"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:583
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:654
 msgid "Tablet"
 msgstr "Tauleta"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:600
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:671
 msgid "Automatically run a program when a _tablet is connected"
 msgstr "Executa automàticament un programa quan es connecti una ta_uleta"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:605
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:679
 msgid "Com_mand:"
 msgstr "Or_dre:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:690
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:755
 msgid "Failed to open the documentation browser"
 msgstr "No s'ha pogut obrir el visor de documentació"
 
-#: ../thunar-volman/tvm-run.c:133 ../thunar-volman/tvm-run.c:144
-msgid "Choose Disc Type"
-msgstr "Seleccioneu el tipus de disc"
+#~ msgid "Failed to open display"
+#~ msgstr "No s'ha pogut obrir la pantalla"
 
-#: ../thunar-volman/tvm-run.c:134 ../thunar-volman/tvm-run.c:145
-msgid "You have inserted a blank disc."
-msgstr "Heu introduït un disc en blanc."
+#~ msgid "The Thunar development team. All rights reserved."
+#~ msgstr "L'equip de desenvolupament de Thunar. Tots els drets reservats."
 
-#: ../thunar-volman/tvm-run.c:135 ../thunar-volman/tvm-run.c:146
-msgid "What would you like to do?"
-msgstr "Què voleu fer?"
+#~ msgid "Written by Benedikt Meurer <benny at xfce.org>."
+#~ msgstr "Escrit per Benedikt Meurer <benny at xfce.org>."
 
-#: ../thunar-volman/tvm-run.c:137
-msgid "Make _DVD"
-msgstr "Fes un _DVD"
+#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
+#~ msgstr "El UDI «%s» indicat no és un UDI de dispositiu HAL"
 
-#: ../thunar-volman/tvm-run.c:148
-msgid "Make _Data CD"
-msgstr "Fes un CD de _dades"
+#~ msgid "Encrypted volume"
+#~ msgstr "Volum xifrat"
 
-#: ../thunar-volman/tvm-run.c:149
-msgid "Make _Audio CD"
-msgstr "Fes un CD d'_àudio"
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Muntant un volum xifrat…</span>"
+
+#~ msgid "Setting up the crypto layer..."
+#~ msgstr "Configurant la capa de xifratge…"
+
+#~ msgid "You are not privileged to setup the crypto layer"
+#~ msgstr "No teniu pro privilegis per configurar la capa de xifratge"
+
+#~ msgid "Wrong password"
+#~ msgstr "Contrasenya incorrecta"
+
+#~ msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Contrasenya incorrecte.</span>"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Aquest volum està xifrat.</span>"
+
+#~ msgid "Please enter your password to decrypt and mount the volume."
+#~ msgstr "Introduïu la vostra contrasenya per desxifrar i muntar el volum."
+
+#~ msgid "_Mount"
+#~ msgstr "_Munta"
+
+#~ msgid "Failed to setup the encrypted volume"
+#~ msgstr "No s'ha pogut configurar el volum xifrat"
+
+#~ msgid "Choose Disc Type"
+#~ msgstr "Seleccioneu el tipus de disc"
+
+#~ msgid "Make _DVD"
+#~ msgstr "Fes un _DVD"
 
-#: ../thunar-volman-settings.desktop.in.in.h:3
-msgid "Removable Media"
-msgstr "Medis extraïbles"
+#~ msgid "Removable Media"
+#~ msgstr "Medis extraïbles"
diff --git a/po/cs.po b/po/cs.po
index e603dec..b6e4a84 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,459 +7,621 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce 4-i18-goodies\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-30 02:26-0700\n"
+"POT-Creation-Date: 2010-07-25 20:06+0200\n"
 "PO-Revision-Date: 2009-11-05 18:21+0100\n"
 "Last-Translator: Michal Várady <miko.vaji at gmail.com>\n"
 "Language-Team: Czech\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ../thunar-volman/main.c:50
-msgid "The HAL device UDI of the newly added device"
+#: ../thunar-volman/main.c:59
+#, fuzzy
+msgid "The syfs path of the newly added device"
 msgstr "Identifikační číslo (UDI) nově přidaného zařízení HAL"
 
-#: ../thunar-volman/main.c:51
-#: ../thunar-volman/tvm-preferences-dialog.c:120
-#: ../thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman/main.c:60
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:104
 msgid "Configure management of removable drives and media"
 msgstr "Správa nastavení vyměnitelných jednotek a médií"
 
-#: ../thunar-volman/main.c:52
+#: ../thunar-volman/main.c:61
 msgid "Print version information and exit"
 msgstr "Zobrazí informace o verzi a ukončí se"
 
 #. setup application name
-#: ../thunar-volman/main.c:69
+#: ../thunar-volman/main.c:93
 msgid "Thunar Volume Manager"
 msgstr "Správce svazků aplikace Thunar"
 
-#: ../thunar-volman/main.c:90
-msgid "Failed to open display"
-msgstr "Nepodařilo se otevřít displej"
-
-#: ../thunar-volman/main.c:106
-msgid "The Thunar development team. All rights reserved."
-msgstr "Vývojový tým aplikace Thunar. Všechna práva vyhrazena."
-
-#: ../thunar-volman/main.c:107
-msgid "Written by Benedikt Meurer <benny at xfce.org>."
-msgstr "Napsal Benedikt Meurer <benny at xfce.org>."
+#: ../thunar-volman/main.c:133
+msgid "All rights reserved."
+msgstr ""
 
-#: ../thunar-volman/main.c:108
+#: ../thunar-volman/main.c:134
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Prosíme, abyste chyby hlásili na adresu <%s>."
 
-#. TRANSLATORS: A HAL device UDI must match certain conditions to be valid (to be exact, it must be a valid D-Bus object path)
-#: ../thunar-volman/main.c:133
+#: ../thunar-volman/main.c:188
 #, c-format
-msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
-msgstr "Zadaný identifikátor zařízení (UDI) \"%s\" není platným identifikátorem zařízení vrstvy HAL"
+msgid "There is no device with the sysfs path \"%s\""
+msgstr ""
 
-#. TRANSLATORS: thunar-volman wasn't invoked with either --device-added or --configure.
-#: ../thunar-volman/main.c:144
-#, c-format
-msgid "Must specify the new HAL device UDI with --device-added"
-msgstr "Je nutné zadat nový identifikátor (UDI) zařízení vrstvy HAL pomocí přepínače --device-added"
+#: ../thunar-volman/main.c:200
+#, fuzzy, c-format
+msgid "Must specify the sysfs path of new devices with --device-added"
+msgstr ""
+"Je nutné zadat nový identifikátor (UDI) zařízení vrstvy HAL pomocí přepínače "
+"--device-added"
 
 #. ...so we need to prompt what to do
-#: ../thunar-volman/tvm-block-device.c:189
+#: ../thunar-volman/tvm-block-device.c:204
 msgid "Photos and Music"
 msgstr "Fotografie a hudba"
 
-#: ../thunar-volman/tvm-block-device.c:190
-msgid "Photos were found on your portable music player."
+#: ../thunar-volman/tvm-block-device.c:205
+#, fuzzy
+msgid "Photos were found on your portable music player"
 msgstr "Na přenosném hudebním přehrávači byly nalezeny fotografie."
 
-#: ../thunar-volman/tvm-block-device.c:191
+#: ../thunar-volman/tvm-block-device.c:206
 msgid "Would you like to import the photos or manage the music?"
 msgstr "Chcete importovat fotografie nebo spravovat hudbu?"
 
-#: ../thunar-volman/tvm-block-device.c:192
-#: ../thunar-volman/tvm-block-device.c:258
-#: ../thunar-volman/tvm-block-device.c:335
-#: ../thunar-volman/tvm-block-device.c:371
-#: ../thunar-volman/tvm-block-device.c:430
-#: ../thunar-volman/tvm-block-device.c:703
-#: ../thunar-volman/tvm-crypto-volume.c:448
-#: ../thunar-volman/tvm-run.c:136
-#: ../thunar-volman/tvm-run.c:147
+#: ../thunar-volman/tvm-block-device.c:208
+#: ../thunar-volman/tvm-block-device.c:277
+#: ../thunar-volman/tvm-block-device.c:378
+#: ../thunar-volman/tvm-block-device.c:425
+#: ../thunar-volman/tvm-block-device.c:507
+#: ../thunar-volman/tvm-block-device.c:826 ../thunar-volman/tvm-run.c:196
+#: ../thunar-volman/tvm-run.c:207
 msgid "Ig_nore"
 msgstr "Ig_norovat"
 
-#: ../thunar-volman/tvm-block-device.c:193
-#: ../thunar-volman/tvm-block-device.c:259
+#: ../thunar-volman/tvm-block-device.c:209
+#: ../thunar-volman/tvm-block-device.c:278
 msgid "Import _Photos"
 msgstr "Importovat _fotografie"
 
-#: ../thunar-volman/tvm-block-device.c:194
+#: ../thunar-volman/tvm-block-device.c:210
 msgid "Manage _Music"
 msgstr "Spravovat _hudbu"
 
-#. ask the user whether to import photos
-#: ../thunar-volman/tvm-block-device.c:255
+#. ask the user to import photos
+#: ../thunar-volman/tvm-block-device.c:273
 msgid "Photo Import"
 msgstr "Import fotografií"
 
-#: ../thunar-volman/tvm-block-device.c:256
-msgid "A photo card has been detected."
+#: ../thunar-volman/tvm-block-device.c:274
+#, fuzzy
+msgid "A photo card has been detected"
 msgstr "Byla nalezena karta s fotografiemi"
 
-#: ../thunar-volman/tvm-block-device.c:257
-msgid "There are photos on the card. Would you like to add these photos to your album?"
+#: ../thunar-volman/tvm-block-device.c:275
+msgid ""
+"There are photos on the card. Would you like to add these photos to your "
+"album?"
 msgstr "Na kartě jsou fotografie. Chcete je přidat do svého alba?"
 
-#. prompt the user whether to execute this file
-#: ../thunar-volman/tvm-block-device.c:332
-#: ../thunar-volman/tvm-block-device.c:368
+#. prompt the user to execute the file
+#. prompt the user to execute this file
+#: ../thunar-volman/tvm-block-device.c:373
+#: ../thunar-volman/tvm-block-device.c:420
 #, c-format
 msgid "Would you like to allow \"%s\" to run?"
 msgstr "Chcete povolit spuštění souboru \"%s\"?"
 
-#: ../thunar-volman/tvm-block-device.c:333
-#: ../thunar-volman/tvm-block-device.c:369
+#: ../thunar-volman/tvm-block-device.c:376
+#: ../thunar-volman/tvm-block-device.c:423
 msgid "Auto-Run Confirmation"
 msgstr "Potvrzení automatického spuštění"
 
-#: ../thunar-volman/tvm-block-device.c:334
-#: ../thunar-volman/tvm-block-device.c:370
+#: ../thunar-volman/tvm-block-device.c:377
+#: ../thunar-volman/tvm-block-device.c:424
 msgid "Auto-Run capability detected"
 msgstr "Nalezena podpora pro automatické spuštění"
 
-#: ../thunar-volman/tvm-block-device.c:336
-#: ../thunar-volman/tvm-block-device.c:372
+#: ../thunar-volman/tvm-block-device.c:379
+#: ../thunar-volman/tvm-block-device.c:426
 msgid "_Allow Auto-Run"
 msgstr "_Povolit automatické spouštění"
 
 #. prompt the user whether to autoopen this file
-#: ../thunar-volman/tvm-block-device.c:427
+#: ../thunar-volman/tvm-block-device.c:502
 #, c-format
 msgid "Would you like to open \"%s\"?"
 msgstr "Chcete otevřít soubor \"%s\"?"
 
-#: ../thunar-volman/tvm-block-device.c:428
+#: ../thunar-volman/tvm-block-device.c:505
 msgid "Auto-Open Confirmation"
 msgstr "Potvrzení automatického otevření"
 
-#: ../thunar-volman/tvm-block-device.c:429
+#: ../thunar-volman/tvm-block-device.c:506
 msgid "Auto-Open capability detected"
 msgstr "Nalezena podpora pro automatické otevření"
 
-#: ../thunar-volman/tvm-block-device.c:431
+#: ../thunar-volman/tvm-block-device.c:508
 msgid "_Open"
 msgstr "_Otevřít"
 
-#. ask what do with the mixed audio/data disc
-#: ../thunar-volman/tvm-block-device.c:700
-msgid "Audio / Data CD"
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "CD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "DVD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:618
+msgid "The CD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:619
+msgid "The DVD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:629
+msgid "Volume mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:632
+#, c-format
+msgid "The volume \"%s\" was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:637
+#, c-format
+msgid "The inserted volume was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:691
+#, c-format
+msgid "Unable to locate mount point"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:737
+#, c-format
+msgid "Unable to mount the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:746
+#, c-format
+msgid "Could not detect the volume corresponding to the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:821
+#, fuzzy
+msgid "Audio/Data CD"
 msgstr "Hudební nebo datové CD"
 
-#: ../thunar-volman/tvm-block-device.c:701
-msgid "The CD in the drive contains both music and files."
+#: ../thunar-volman/tvm-block-device.c:822
+#, fuzzy
+msgid "The CD in the drive contains both music and files"
 msgstr "CD v jednotce obsahuje hudbu i soubory."
 
-#: ../thunar-volman/tvm-block-device.c:702
+#: ../thunar-volman/tvm-block-device.c:824
 msgid "Would you like to listen to music or browse the files?"
 msgstr "Chcete poslouchat hudbu nebo procházet soubory?"
 
-#: ../thunar-volman/tvm-block-device.c:704
+#: ../thunar-volman/tvm-block-device.c:827
 msgid "_Browse Files"
 msgstr "_Procházet soubory"
 
-#: ../thunar-volman/tvm-block-device.c:705
+#: ../thunar-volman/tvm-block-device.c:828
 msgid "_Play CD"
 msgstr "Přehrát _CD"
 
-#: ../thunar-volman/tvm-command-entry.c:233
-msgid "Select an Application"
-msgstr "Výběr aplikace"
+#: ../thunar-volman/tvm-block-device.c:916
+#, c-format
+msgid "Unknown block device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:243
-msgid "All Files"
-msgstr "Všechny soubory"
+#: ../thunar-volman/tvm-device.c:139
+#, c-format
+msgid "Device type not supported"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:248
-msgid "Executable Files"
-msgstr "Spustitelné soubory"
+#: ../thunar-volman/tvm-input-device.c:74
+#, fuzzy
+msgid "input-keyboard"
+msgstr "Klávesnice"
 
-#: ../thunar-volman/tvm-command-entry.c:263
-msgid "Perl Scripts"
-msgstr "Skripty jazyka Perl"
+#: ../thunar-volman/tvm-input-device.c:75
+#, fuzzy
+msgid "Keyboard detected"
+msgstr "Klávesnice"
 
-#: ../thunar-volman/tvm-command-entry.c:269
-msgid "Python Scripts"
-msgstr "Skripty jazyka Python"
+#: ../thunar-volman/tvm-input-device.c:76
+#, fuzzy
+msgid "A keyboard was detected"
+msgstr "Byla nalezena karta s fotografiemi"
 
-#: ../thunar-volman/tvm-command-entry.c:275
-msgid "Ruby Scripts"
-msgstr "Skripty jazyka Ruby"
+#: ../thunar-volman/tvm-input-device.c:86
+#: ../thunar-volman/tvm-input-device.c:100
+msgid "input-tablet"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:281
-msgid "Shell Scripts"
-msgstr "Shellové skripty"
+#: ../thunar-volman/tvm-input-device.c:87
+#: ../thunar-volman/tvm-input-device.c:101
+#, fuzzy
+msgid "Tablet detected"
+msgstr "Nalezena podpora pro automatické spuštění"
+
+#: ../thunar-volman/tvm-input-device.c:88
+#: ../thunar-volman/tvm-input-device.c:102
+msgid "A graphics tablet was detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:286
-#: ../thunar-volman/tvm-crypto-volume.c:443
-msgid "Encrypted volume"
-msgstr "Šifrovaný svazek"
+#: ../thunar-volman/tvm-input-device.c:110
+msgid "input-mouse"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:297
-msgid "<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Připojování šifrovaného svazku...</span>"
+#: ../thunar-volman/tvm-input-device.c:111
+msgid "Mouse detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:302
-msgid "Setting up the crypto layer..."
-msgstr "Nastavování šifrovací vrstvy..."
+#: ../thunar-volman/tvm-input-device.c:112
+msgid "A mouse was detected"
+msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) but got Permission denied.
-#: ../thunar-volman/tvm-crypto-volume.c:369
+#: ../thunar-volman/tvm-input-device.c:139
 #, c-format
-msgid "You are not privileged to setup the crypto layer"
-msgstr "Nemáte oprávnění nastavovat šifrovací vrstvu"
+msgid "Unsupported input device type"
+msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) and typed the wrong password.
-#: ../thunar-volman/tvm-crypto-volume.c:374
+#: ../thunar-volman/tvm-run.c:173
 #, c-format
-msgid "Wrong password"
-msgstr "Špatné heslo"
+msgid "Autoburning of blank CDs and DVDs is disabled"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:445
-msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Špatné heslo.</span>"
+#: ../thunar-volman/tvm-run.c:193
+msgid "Blank DVD inserted"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:446
-msgid "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Tento svazek je šifrovaný.</span>"
+#: ../thunar-volman/tvm-run.c:194
+#, fuzzy
+msgid "You have inserted a blank DVD."
+msgstr "Vložili jste prázdný disk."
 
-#: ../thunar-volman/tvm-crypto-volume.c:447
-msgid "Please enter your password to decrypt and mount the volume."
-msgstr "Pro odšifrování a připojení svazku zadejte heslo."
+#: ../thunar-volman/tvm-run.c:195 ../thunar-volman/tvm-run.c:206
+msgid "What would you like to do?"
+msgstr "Vyberte si z následujících možností"
 
-#: ../thunar-volman/tvm-crypto-volume.c:449
-msgid "_Mount"
-msgstr "_Připojit"
+#: ../thunar-volman/tvm-run.c:197
+msgid "Burn _DVD"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:468
-msgid "Failed to setup the encrypted volume"
-msgstr "Nepodařilo se nastavit šifrovaný svazek"
+#: ../thunar-volman/tvm-run.c:204
+#, fuzzy
+msgid "Blank CD inserted"
+msgstr "Prázdná CD a DVD"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:119
-#: ../thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman/tvm-run.c:205
+#, fuzzy
+msgid "You have inserted a blank CD."
+msgstr "Vložili jste prázdný disk."
+
+#: ../thunar-volman/tvm-run.c:208
+#, fuzzy
+msgid "Burn _Data CD"
+msgstr "Vytvořit datové _CD"
+
+#: ../thunar-volman/tvm-run.c:209
+#, fuzzy
+msgid "Burn _Audio CD"
+msgstr "Vytvořit _hudební CD"
+
+#: ../thunar-volman/tvm-run.c:233
+#, c-format
+msgid "The burn command may not be empty"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:272
+#, c-format
+msgid "The CD player command is undefined"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:66
+msgid "Camera detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:67
+#, fuzzy
+msgid "A photo camera was detected"
+msgstr "Byla nalezena karta s fotografiemi"
+
+#: ../thunar-volman/tvm-usb-device.c:77
+msgid "Printer detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:78
+msgid "A USB printer was detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:104
+#, c-format
+msgid "Unsupported USB device type"
+msgstr ""
+
+#. setup application name
+#: ../thunar-volman-settings/main.c:52
+#, fuzzy
+msgid "Thunar Volume Manager Settings"
+msgstr "Správce svazků aplikace Thunar"
+
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:102
 msgid "Removable Drives and Media"
 msgstr "Vyměnitelné jednotky a média"
 
+#: ../thunar-volman-settings/tvm-command-entry.c:240
+msgid "Select an Application"
+msgstr "Výběr aplikace"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:250
+msgid "All Files"
+msgstr "Všechny soubory"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:255
+msgid "Executable Files"
+msgstr "Spustitelné soubory"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:270
+msgid "Perl Scripts"
+msgstr "Skripty jazyka Perl"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:276
+msgid "Python Scripts"
+msgstr "Skripty jazyka Python"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:282
+msgid "Ruby Scripts"
+msgstr "Skripty jazyka Ruby"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:288
+msgid "Shell Scripts"
+msgstr "Shellové skripty"
+
 #.
 #. Storage
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:143
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:130
 msgid "Storage"
 msgstr "Úložiště"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:153
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:141
 msgid "Removable Storage"
 msgstr "Vyměnitelné úložiště"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:170
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:158
 msgid "_Mount removable drives when hot-plugged"
 msgstr "Připojit _vyměnitelné jednotky při připojení typu hot-plug"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:175
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:166
 msgid "Mount removable media when _inserted"
 msgstr "Př_ipojit vyměnitelná média po vložení"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:180
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:174
 msgid "B_rowse removable media when inserted"
 msgstr "P_rocházet vyměnitelná média po vložení"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:185
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:182
 msgid "_Auto-run programs on new drives and media"
 msgstr "_Automaticky spouštět programy na nových jednotkách a médiích"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:190
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:189
 msgid "Auto-open files on new drives and media"
 msgstr "Automaticky otevírat soubory na nových jednotkách a médiích"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:199
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:201
 msgid "Blank CDs and DVDs"
 msgstr "Prázdná CD a DVD"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:216
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:218
 msgid "_Burn a CD or DVD when a blank disc is inserted"
 msgstr "Vypálit _CD nebo DVD po vložení prázdného disku"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:224
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:229
 msgid "Command for _Data CDs:"
 msgstr "Příkaz pro _datová CD:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:231
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:239
 msgid "Command for A_udio CDs:"
 msgstr "Příkaz pro _hudební CD:"
 
 #.
 #. Multimedia
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:245
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:255
 msgid "Multimedia"
 msgstr "Multimédia"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:255
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:266
 msgid "Audio CDs"
 msgstr "Hudební CD"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:272
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:283
 msgid "Play _audio CDs when inserted"
 msgstr "Přehrát _hudební CD po vložení"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:277
-#: ../thunar-volman/tvm-preferences-dialog.c:383
-#: ../thunar-volman/tvm-preferences-dialog.c:425
-#: ../thunar-volman/tvm-preferences-dialog.c:499
-#: ../thunar-volman/tvm-preferences-dialog.c:541
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:290
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:415
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:466
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:553
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:601
 msgid "_Command:"
 msgstr "_Příkaz:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:287
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:304
 msgid "Video CDs/DVDs"
 msgstr "Video CD nebo DVD"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:304
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:321
 msgid "Play _video CDs and DVDs when inserted"
 msgstr "Přehrát disky _video CD a DVD po vložení"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:309
-#: ../thunar-volman/tvm-preferences-dialog.c:341
-#: ../thunar-volman/tvm-preferences-dialog.c:457
-#: ../thunar-volman/tvm-preferences-dialog.c:573
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:329
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:367
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:505
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:640
 msgid "C_ommand:"
 msgstr "Pří_kaz:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:319
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:343
 msgid "Portable Music Players"
 msgstr "Přenosné hudební přehrávače"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:336
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:360
 msgid "Play _music files when connected"
 msgstr "Přehrát hudební _soubory po připojení"
 
 #.
 #. Cameras
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:351
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:379
 msgid "Cameras"
 msgstr "Fotoaparáty"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:361
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:390
 msgid "Digital Cameras"
 msgstr "Digitální fotoaparáty"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:378
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:407
 msgid "Import digital photographs when connected"
 msgstr "Importovat digitální fotografie po připojení"
 
 #.
 #. PDAs
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:393
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:427
 msgid "PDAs"
 msgstr "Zařízení PDA"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:403
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:441
 msgid "Palm™"
 msgstr "Zařízení Palm™"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:420
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:458
 msgid "Sync _Palm™ devices when connected"
 msgstr "_Synchronizovat zařízení Palm™ po připojení"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:435
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:480
 msgid "Pocket PCs"
 msgstr "Zařízení PCs"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:452
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:497
 msgid "Sync Pocket P_C devices when connected"
 msgstr "Synchronizovat zařízení Pocket P_C po připojení"
 
 #.
 #. Printers
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:467
-#: ../thunar-volman/tvm-preferences-dialog.c:477
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:517
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:528
 msgid "Printers"
 msgstr "Tiskárny"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:494
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:545
 msgid "Automatically run a program when a _printer is connected"
 msgstr "Au_tomaticky spustit program po připojení tiskárny"
 
 #.
 #. Input Devices
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:509
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:565
 msgid "Input Devices"
 msgstr "Vstupní zařízení"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:519
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:576
 msgid "Keyboards"
 msgstr "Klávesnice"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:536
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:593
 msgid "Automatically run a program when an USB _keyboard is connected"
 msgstr "_Automaticky spustit program po připojení klávesnice s rozhraním USB"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:551
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:615
 msgid "Mice"
 msgstr "Myši"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:568
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:632
 msgid "Automatically run a program when an USB _mouse is connected"
 msgstr "Automaticky spustit program po připojení _myši s rozhraním USB"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:583
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:654
 msgid "Tablet"
 msgstr "Tablet"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:600
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:671
 msgid "Automatically run a program when a _tablet is connected"
 msgstr "Automaticky spustit program po připojení _tabletu s rozhraním USB"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:605
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:679
 msgid "Com_mand:"
 msgstr "Pří_kaz:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:690
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:755
 msgid "Failed to open the documentation browser"
 msgstr "Nepodařilo se otevřít prohlížeč dokumentace"
 
-#: ../thunar-volman/tvm-run.c:133
-#: ../thunar-volman/tvm-run.c:144
-msgid "Choose Disc Type"
-msgstr "Zvolte typ disku"
+#~ msgid "Failed to open display"
+#~ msgstr "Nepodařilo se otevřít displej"
 
-#: ../thunar-volman/tvm-run.c:134
-#: ../thunar-volman/tvm-run.c:145
-msgid "You have inserted a blank disc."
-msgstr "Vložili jste prázdný disk."
+#~ msgid "The Thunar development team. All rights reserved."
+#~ msgstr "Vývojový tým aplikace Thunar. Všechna práva vyhrazena."
 
-#: ../thunar-volman/tvm-run.c:135
-#: ../thunar-volman/tvm-run.c:146
-msgid "What would you like to do?"
-msgstr "Vyberte si z následujících možností"
+#~ msgid "Written by Benedikt Meurer <benny at xfce.org>."
+#~ msgstr "Napsal Benedikt Meurer <benny at xfce.org>."
 
-#: ../thunar-volman/tvm-run.c:137
-msgid "Make _DVD"
-msgstr "Vytvořit _DVD"
+#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
+#~ msgstr ""
+#~ "Zadaný identifikátor zařízení (UDI) \"%s\" není platným identifikátorem "
+#~ "zařízení vrstvy HAL"
 
-#: ../thunar-volman/tvm-run.c:148
-msgid "Make _Data CD"
-msgstr "Vytvořit datové _CD"
+#~ msgid "Encrypted volume"
+#~ msgstr "Šifrovaný svazek"
 
-#: ../thunar-volman/tvm-run.c:149
-msgid "Make _Audio CD"
-msgstr "Vytvořit _hudební CD"
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Připojování šifrovaného svazku...</"
+#~ "span>"
+
+#~ msgid "Setting up the crypto layer..."
+#~ msgstr "Nastavování šifrovací vrstvy..."
+
+#~ msgid "You are not privileged to setup the crypto layer"
+#~ msgstr "Nemáte oprávnění nastavovat šifrovací vrstvu"
+
+#~ msgid "Wrong password"
+#~ msgstr "Špatné heslo"
+
+#~ msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
+#~ msgstr "<span weight=\"bold\" size=\"larger\">Špatné heslo.</span>"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Tento svazek je šifrovaný.</span>"
+
+#~ msgid "Please enter your password to decrypt and mount the volume."
+#~ msgstr "Pro odšifrování a připojení svazku zadejte heslo."
+
+#~ msgid "_Mount"
+#~ msgstr "_Připojit"
+
+#~ msgid "Failed to setup the encrypted volume"
+#~ msgstr "Nepodařilo se nastavit šifrovaný svazek"
+
+#~ msgid "Choose Disc Type"
+#~ msgstr "Zvolte typ disku"
 
-#: ../thunar-volman-settings.desktop.in.in.h:3
-msgid "Removable Media"
-msgstr "Vyměnitelná média"
+#~ msgid "Make _DVD"
+#~ msgstr "Vytvořit _DVD"
 
+#~ msgid "Removable Media"
+#~ msgstr "Vyměnitelná média"
diff --git a/po/da.po b/po/da.po
index 97c1e41..81271cb 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: thunar-volman 0.3.80\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-30 02:26-0700\n"
+"POT-Creation-Date: 2010-07-25 20:06+0200\n"
 "PO-Revision-Date: 2008-10-14 11:14+0100\n"
 "Last-Translator: Per Kongstad <p_kongstad at op.pl>\n"
 "Language-Team: Danish <dansk at dansk-gruppen.dk>\n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,450 +19,609 @@ msgstr ""
 "X-Poedit-Country: DENMARK\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../thunar-volman/main.c:50
-msgid "The HAL device UDI of the newly added device"
+#: ../thunar-volman/main.c:59
+#, fuzzy
+msgid "The syfs path of the newly added device"
 msgstr "HAL-enhedens UDI af den nylig tilføjede enhed"
 
-#: ../thunar-volman/main.c:51
-#: ../thunar-volman/tvm-preferences-dialog.c:120
-#: ../thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman/main.c:60
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:104
 msgid "Configure management of removable drives and media"
 msgstr "Indstillingshåndtering af fjernbare drev og medie"
 
-#: ../thunar-volman/main.c:52
+#: ../thunar-volman/main.c:61
 msgid "Print version information and exit"
 msgstr "Udskriv versionsinformation og afslut"
 
 #. setup application name
-#: ../thunar-volman/main.c:69
+#: ../thunar-volman/main.c:93
 msgid "Thunar Volume Manager"
 msgstr "Thunar-arkivhåndtering"
 
-#: ../thunar-volman/main.c:90
-msgid "Failed to open display"
-msgstr "Kunne ikke åbne skærm"
-
-#: ../thunar-volman/main.c:106
-msgid "The Thunar development team. All rights reserved."
-msgstr "Thunars udviklingshold. Alle rettigheder forbeholdt."
-
-#: ../thunar-volman/main.c:107
-msgid "Written by Benedikt Meurer <benny at xfce.org>."
-msgstr "Skrevet af Benedikt Meurer <benny at xfce.org>."
+#: ../thunar-volman/main.c:133
+msgid "All rights reserved."
+msgstr ""
 
-#: ../thunar-volman/main.c:108
+#: ../thunar-volman/main.c:134
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Rapportér venligst fejl til <%s>."
 
-#. TRANSLATORS: A HAL device UDI must match certain conditions to be valid (to be exact, it must be a valid D-Bus object path)
-#: ../thunar-volman/main.c:133
+#: ../thunar-volman/main.c:188
 #, c-format
-msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
-msgstr "Det angivne UDI \"%s\" er ikke et gyldigt HAL-enheds UDI"
+msgid "There is no device with the sysfs path \"%s\""
+msgstr ""
 
-#. TRANSLATORS: thunar-volman wasn't invoked with either --device-added or --configure.
-#: ../thunar-volman/main.c:144
-#, c-format
-msgid "Must specify the new HAL device UDI with --device-added"
+#: ../thunar-volman/main.c:200
+#, fuzzy, c-format
+msgid "Must specify the sysfs path of new devices with --device-added"
 msgstr "Du skal angive det nye HAL-enheds UDI med --device-added"
 
 #. ...so we need to prompt what to do
-#: ../thunar-volman/tvm-block-device.c:189
+#: ../thunar-volman/tvm-block-device.c:204
 msgid "Photos and Music"
 msgstr "Billeder og musik"
 
-#: ../thunar-volman/tvm-block-device.c:190
-msgid "Photos were found on your portable music player."
+#: ../thunar-volman/tvm-block-device.c:205
+#, fuzzy
+msgid "Photos were found on your portable music player"
 msgstr "Billeder blev fundet på din transportable musikafspiller."
 
-#: ../thunar-volman/tvm-block-device.c:191
+#: ../thunar-volman/tvm-block-device.c:206
 msgid "Would you like to import the photos or manage the music?"
 msgstr "Vil du importere billederne eller håndtere din musik?"
 
-#: ../thunar-volman/tvm-block-device.c:192
-#: ../thunar-volman/tvm-block-device.c:258
-#: ../thunar-volman/tvm-block-device.c:335
-#: ../thunar-volman/tvm-block-device.c:371
-#: ../thunar-volman/tvm-block-device.c:430
-#: ../thunar-volman/tvm-block-device.c:703
-#: ../thunar-volman/tvm-crypto-volume.c:448
-#: ../thunar-volman/tvm-run.c:136
-#: ../thunar-volman/tvm-run.c:147
+#: ../thunar-volman/tvm-block-device.c:208
+#: ../thunar-volman/tvm-block-device.c:277
+#: ../thunar-volman/tvm-block-device.c:378
+#: ../thunar-volman/tvm-block-device.c:425
+#: ../thunar-volman/tvm-block-device.c:507
+#: ../thunar-volman/tvm-block-device.c:826 ../thunar-volman/tvm-run.c:196
+#: ../thunar-volman/tvm-run.c:207
 msgid "Ig_nore"
 msgstr "_Ignorér"
 
-#: ../thunar-volman/tvm-block-device.c:193
-#: ../thunar-volman/tvm-block-device.c:259
+#: ../thunar-volman/tvm-block-device.c:209
+#: ../thunar-volman/tvm-block-device.c:278
 msgid "Import _Photos"
 msgstr "Importér _billeder"
 
-#: ../thunar-volman/tvm-block-device.c:194
+#: ../thunar-volman/tvm-block-device.c:210
 msgid "Manage _Music"
 msgstr "Håndter _musik"
 
-#. ask the user whether to import photos
-#: ../thunar-volman/tvm-block-device.c:255
+#. ask the user to import photos
+#: ../thunar-volman/tvm-block-device.c:273
 msgid "Photo Import"
 msgstr "Billedimport"
 
-#: ../thunar-volman/tvm-block-device.c:256
-msgid "A photo card has been detected."
+#: ../thunar-volman/tvm-block-device.c:274
+#, fuzzy
+msgid "A photo card has been detected"
 msgstr "Et billedhukommelseskort er blevet fundet."
 
-#: ../thunar-volman/tvm-block-device.c:257
-msgid "There are photos on the card. Would you like to add these photos to your album?"
-msgstr "Der er billeder på hukommelseskortet. Vil du tilføje disse billeder til din samling?"
+#: ../thunar-volman/tvm-block-device.c:275
+msgid ""
+"There are photos on the card. Would you like to add these photos to your "
+"album?"
+msgstr ""
+"Der er billeder på hukommelseskortet. Vil du tilføje disse billeder til din "
+"samling?"
 
-#. prompt the user whether to execute this file
-#: ../thunar-volman/tvm-block-device.c:332
-#: ../thunar-volman/tvm-block-device.c:368
+#. prompt the user to execute the file
+#. prompt the user to execute this file
+#: ../thunar-volman/tvm-block-device.c:373
+#: ../thunar-volman/tvm-block-device.c:420
 #, c-format
 msgid "Would you like to allow \"%s\" to run?"
 msgstr "Vil du tillade \"%s\" at køre?"
 
-#: ../thunar-volman/tvm-block-device.c:333
-#: ../thunar-volman/tvm-block-device.c:369
+#: ../thunar-volman/tvm-block-device.c:376
+#: ../thunar-volman/tvm-block-device.c:423
 msgid "Auto-Run Confirmation"
 msgstr "Bekræft auto-kør"
 
-#: ../thunar-volman/tvm-block-device.c:334
-#: ../thunar-volman/tvm-block-device.c:370
+#: ../thunar-volman/tvm-block-device.c:377
+#: ../thunar-volman/tvm-block-device.c:424
 msgid "Auto-Run capability detected"
 msgstr "Fundet auto-kørmulighed"
 
-#: ../thunar-volman/tvm-block-device.c:336
-#: ../thunar-volman/tvm-block-device.c:372
+#: ../thunar-volman/tvm-block-device.c:379
+#: ../thunar-volman/tvm-block-device.c:426
 msgid "_Allow Auto-Run"
 msgstr "_Tillad auto-kør"
 
 #. prompt the user whether to autoopen this file
-#: ../thunar-volman/tvm-block-device.c:427
+#: ../thunar-volman/tvm-block-device.c:502
 #, c-format
 msgid "Would you like to open \"%s\"?"
 msgstr "Vil du åbne \"%s\"?"
 
-#: ../thunar-volman/tvm-block-device.c:428
+#: ../thunar-volman/tvm-block-device.c:505
 msgid "Auto-Open Confirmation"
 msgstr "Bekræft auto-åben"
 
-#: ../thunar-volman/tvm-block-device.c:429
+#: ../thunar-volman/tvm-block-device.c:506
 msgid "Auto-Open capability detected"
 msgstr "Fundet auto-åbenmulighed"
 
-#: ../thunar-volman/tvm-block-device.c:431
+#: ../thunar-volman/tvm-block-device.c:508
 msgid "_Open"
 msgstr "_Åbn"
 
-#. ask what do with the mixed audio/data disc
-#: ../thunar-volman/tvm-block-device.c:700
-msgid "Audio / Data CD"
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "CD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "DVD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:618
+msgid "The CD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:619
+msgid "The DVD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:629
+msgid "Volume mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:632
+#, c-format
+msgid "The volume \"%s\" was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:637
+#, c-format
+msgid "The inserted volume was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:691
+#, c-format
+msgid "Unable to locate mount point"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:737
+#, c-format
+msgid "Unable to mount the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:746
+#, c-format
+msgid "Could not detect the volume corresponding to the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:821
+#, fuzzy
+msgid "Audio/Data CD"
 msgstr "Lyd- / data-cd"
 
-#: ../thunar-volman/tvm-block-device.c:701
-msgid "The CD in the drive contains both music and files."
+#: ../thunar-volman/tvm-block-device.c:822
+#, fuzzy
+msgid "The CD in the drive contains both music and files"
 msgstr "Cden i drevet indeholder både musik og filer."
 
-#: ../thunar-volman/tvm-block-device.c:702
+#: ../thunar-volman/tvm-block-device.c:824
 msgid "Would you like to listen to music or browse the files?"
 msgstr "Vil du lytte til musik eller navigere filerne?"
 
-#: ../thunar-volman/tvm-block-device.c:704
+#: ../thunar-volman/tvm-block-device.c:827
 msgid "_Browse Files"
 msgstr "_Navigér filer"
 
-#: ../thunar-volman/tvm-block-device.c:705
+#: ../thunar-volman/tvm-block-device.c:828
 msgid "_Play CD"
 msgstr "_Afspil cd"
 
-#: ../thunar-volman/tvm-command-entry.c:233
-msgid "Select an Application"
-msgstr "Vælg et program"
+#: ../thunar-volman/tvm-block-device.c:916
+#, c-format
+msgid "Unknown block device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:243
-msgid "All Files"
-msgstr "Alle filer"
+#: ../thunar-volman/tvm-device.c:139
+#, c-format
+msgid "Device type not supported"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:248
-msgid "Executable Files"
-msgstr "Kørselbare filer"
+#: ../thunar-volman/tvm-input-device.c:74
+#, fuzzy
+msgid "input-keyboard"
+msgstr "Tastaturer"
 
-#: ../thunar-volman/tvm-command-entry.c:263
-msgid "Perl Scripts"
-msgstr "Perl-skripter"
+#: ../thunar-volman/tvm-input-device.c:75
+#, fuzzy
+msgid "Keyboard detected"
+msgstr "Tastaturer"
 
-#: ../thunar-volman/tvm-command-entry.c:269
-msgid "Python Scripts"
-msgstr "Python-skripter"
+#: ../thunar-volman/tvm-input-device.c:76
+#, fuzzy
+msgid "A keyboard was detected"
+msgstr "Et billedhukommelseskort er blevet fundet."
 
-#: ../thunar-volman/tvm-command-entry.c:275
-msgid "Ruby Scripts"
-msgstr "Ruby-skripter"
+#: ../thunar-volman/tvm-input-device.c:86
+#: ../thunar-volman/tvm-input-device.c:100
+msgid "input-tablet"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:281
-msgid "Shell Scripts"
-msgstr "Skalskripter"
+#: ../thunar-volman/tvm-input-device.c:87
+#: ../thunar-volman/tvm-input-device.c:101
+#, fuzzy
+msgid "Tablet detected"
+msgstr "Fundet auto-kørmulighed"
+
+#: ../thunar-volman/tvm-input-device.c:88
+#: ../thunar-volman/tvm-input-device.c:102
+msgid "A graphics tablet was detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:286
-#: ../thunar-volman/tvm-crypto-volume.c:443
-msgid "Encrypted volume"
-msgstr "Krypteret arkiv"
+#: ../thunar-volman/tvm-input-device.c:110
+msgid "input-mouse"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:297
-msgid "<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Monterer krypteret arkiv...</span>"
+#: ../thunar-volman/tvm-input-device.c:111
+msgid "Mouse detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:302
-msgid "Setting up the crypto layer..."
-msgstr "Indstiller krypteringslag..."
+#: ../thunar-volman/tvm-input-device.c:112
+msgid "A mouse was detected"
+msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) but got Permission denied.
-#: ../thunar-volman/tvm-crypto-volume.c:369
+#: ../thunar-volman/tvm-input-device.c:139
 #, c-format
-msgid "You are not privileged to setup the crypto layer"
-msgstr "Du har ikke rettigheder til at indstille krypteringslag"
+msgid "Unsupported input device type"
+msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) and typed the wrong password.
-#: ../thunar-volman/tvm-crypto-volume.c:374
+#: ../thunar-volman/tvm-run.c:173
 #, c-format
-msgid "Wrong password"
-msgstr "Forkert adgangskode"
+msgid "Autoburning of blank CDs and DVDs is disabled"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:445
-msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Forkert adgangskode.</span>"
+#: ../thunar-volman/tvm-run.c:193
+msgid "Blank DVD inserted"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:446
-msgid "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Dette arkiv er krypteret.</span>"
+#: ../thunar-volman/tvm-run.c:194
+#, fuzzy
+msgid "You have inserted a blank DVD."
+msgstr "Du har indsat en tom disk."
 
-#: ../thunar-volman/tvm-crypto-volume.c:447
-msgid "Please enter your password to decrypt and mount the volume."
-msgstr "Angiv venligst din adgangskode for at afkryptere og montere arkivet."
+#: ../thunar-volman/tvm-run.c:195 ../thunar-volman/tvm-run.c:206
+msgid "What would you like to do?"
+msgstr "Hvad vil du gerne gøre?"
 
-#: ../thunar-volman/tvm-crypto-volume.c:449
-msgid "_Mount"
-msgstr "_Montér"
+#: ../thunar-volman/tvm-run.c:197
+msgid "Burn _DVD"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:468
-msgid "Failed to setup the encrypted volume"
-msgstr "Kunne ikke indstille krypteret arkiv"
+#: ../thunar-volman/tvm-run.c:204
+#, fuzzy
+msgid "Blank CD inserted"
+msgstr "Slet cder og dvder"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:119
-#: ../thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman/tvm-run.c:205
+#, fuzzy
+msgid "You have inserted a blank CD."
+msgstr "Du har indsat en tom disk."
+
+#: ../thunar-volman/tvm-run.c:208
+#, fuzzy
+msgid "Burn _Data CD"
+msgstr "Lav _data-cd"
+
+#: ../thunar-volman/tvm-run.c:209
+#, fuzzy
+msgid "Burn _Audio CD"
+msgstr "Lav _lyd-cd"
+
+#: ../thunar-volman/tvm-run.c:233
+#, c-format
+msgid "The burn command may not be empty"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:272
+#, c-format
+msgid "The CD player command is undefined"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:66
+msgid "Camera detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:67
+#, fuzzy
+msgid "A photo camera was detected"
+msgstr "Et billedhukommelseskort er blevet fundet."
+
+#: ../thunar-volman/tvm-usb-device.c:77
+msgid "Printer detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:78
+msgid "A USB printer was detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:104
+#, c-format
+msgid "Unsupported USB device type"
+msgstr ""
+
+#. setup application name
+#: ../thunar-volman-settings/main.c:52
+#, fuzzy
+msgid "Thunar Volume Manager Settings"
+msgstr "Thunar-arkivhåndtering"
+
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:102
 msgid "Removable Drives and Media"
 msgstr "Fjernbare drev og medier"
 
+#: ../thunar-volman-settings/tvm-command-entry.c:240
+msgid "Select an Application"
+msgstr "Vælg et program"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:250
+msgid "All Files"
+msgstr "Alle filer"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:255
+msgid "Executable Files"
+msgstr "Kørselbare filer"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:270
+msgid "Perl Scripts"
+msgstr "Perl-skripter"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:276
+msgid "Python Scripts"
+msgstr "Python-skripter"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:282
+msgid "Ruby Scripts"
+msgstr "Ruby-skripter"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:288
+msgid "Shell Scripts"
+msgstr "Skalskripter"
+
 #.
 #. Storage
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:143
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:130
 msgid "Storage"
 msgstr "Lager"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:153
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:141
 msgid "Removable Storage"
 msgstr "Fjernbart lager"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:170
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:158
 msgid "_Mount removable drives when hot-plugged"
 msgstr "_Montér fjernbare drev når de bliver hot-plugged"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:175
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:166
 msgid "Mount removable media when _inserted"
 msgstr "Montér fjernbare medier når de _indsættes"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:180
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:174
 msgid "B_rowse removable media when inserted"
 msgstr "N_avigér fjernbare medier når de indsættes"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:185
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:182
 msgid "_Auto-run programs on new drives and media"
 msgstr "_Auto-kør programmer på nye drev og medier"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:190
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:189
 msgid "Auto-open files on new drives and media"
 msgstr "Auto-åben filer på nye drev og medier"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:199
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:201
 msgid "Blank CDs and DVDs"
 msgstr "Slet cder og dvder"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:216
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:218
 msgid "_Burn a CD or DVD when a blank disc is inserted"
 msgstr "_Brænd en cd eller dvd når tomt medie indsættes"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:224
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:229
 msgid "Command for _Data CDs:"
 msgstr "Kommando for _data-cder:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:231
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:239
 msgid "Command for A_udio CDs:"
 msgstr "Kommando for _lyd-cder:"
 
 #.
 #. Multimedia
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:245
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:255
 msgid "Multimedia"
 msgstr "Multimedie"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:255
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:266
 msgid "Audio CDs"
 msgstr "Lyd-cder"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:272
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:283
 msgid "Play _audio CDs when inserted"
 msgstr "Afspil _lyd-cder når de indsættes"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:277
-#: ../thunar-volman/tvm-preferences-dialog.c:383
-#: ../thunar-volman/tvm-preferences-dialog.c:425
-#: ../thunar-volman/tvm-preferences-dialog.c:499
-#: ../thunar-volman/tvm-preferences-dialog.c:541
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:290
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:415
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:466
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:553
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:601
 msgid "_Command:"
 msgstr "_Kommando:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:287
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:304
 msgid "Video CDs/DVDs"
 msgstr "Video-cder/dvder"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:304
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:321
 msgid "Play _video CDs and DVDs when inserted"
 msgstr "Afspil _video-cder og dvder når de indsættes"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:309
-#: ../thunar-volman/tvm-preferences-dialog.c:341
-#: ../thunar-volman/tvm-preferences-dialog.c:457
-#: ../thunar-volman/tvm-preferences-dialog.c:573
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:329
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:367
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:505
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:640
 msgid "C_ommand:"
 msgstr "K_ommando:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:319
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:343
 msgid "Portable Music Players"
 msgstr "Bærbar musikafspiller"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:336
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:360
 msgid "Play _music files when connected"
 msgstr "Afspil _musikfiler ved tilslutning"
 
 #.
 #. Cameras
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:351
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:379
 msgid "Cameras"
 msgstr "Kameraer"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:361
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:390
 msgid "Digital Cameras"
 msgstr "Digitale kameraer"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:378
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:407
 msgid "Import digital photographs when connected"
 msgstr "Importér digitale billeder ved tilslutning"
 
 #.
 #. PDAs
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:393
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:427
 msgid "PDAs"
 msgstr "PDAer"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:403
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:441
 msgid "Palm™"
 msgstr "Palm™"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:420
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:458
 msgid "Sync _Palm™ devices when connected"
 msgstr "Synkronisér_Palm™-enheder ved tilslutning"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:435
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:480
 msgid "Pocket PCs"
 msgstr "Lomme-PCere"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:452
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:497
 msgid "Sync Pocket P_C devices when connected"
 msgstr "Synkronisér lomme-_PC-enheder ved tilslutning"
 
 #.
 #. Printers
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:467
-#: ../thunar-volman/tvm-preferences-dialog.c:477
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:517
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:528
 msgid "Printers"
 msgstr "Printere"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:494
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:545
 msgid "Automatically run a program when a _printer is connected"
 msgstr "Kør automatisk et program ved tilslutning af en _printer"
 
 #.
 #. Input Devices
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:509
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:565
 msgid "Input Devices"
 msgstr "Inddata-enheder"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:519
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:576
 msgid "Keyboards"
 msgstr "Tastaturer"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:536
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:593
 msgid "Automatically run a program when an USB _keyboard is connected"
 msgstr "Kør automatisk et program ved tilslutning af et USB-_tastatur"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:551
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:615
 msgid "Mice"
 msgstr "Mus"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:568
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:632
 msgid "Automatically run a program when an USB _mouse is connected"
 msgstr "Kør automatisk et program ved tilslutning af en USB-_mus"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:583
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:654
 msgid "Tablet"
 msgstr "Tablet"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:600
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:671
 msgid "Automatically run a program when a _tablet is connected"
 msgstr "Kør automatisk et program ved tilslutning af en _tablet"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:605
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:679
 msgid "Com_mand:"
 msgstr "Komm_ando:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:690
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:755
 msgid "Failed to open the documentation browser"
 msgstr "Kunne ikke åbne dokumentationsnavigator"
 
-#: ../thunar-volman/tvm-run.c:133
-#: ../thunar-volman/tvm-run.c:144
-msgid "Choose Disc Type"
-msgstr "Vælg disktype"
+#~ msgid "Failed to open display"
+#~ msgstr "Kunne ikke åbne skærm"
 
-#: ../thunar-volman/tvm-run.c:134
-#: ../thunar-volman/tvm-run.c:145
-msgid "You have inserted a blank disc."
-msgstr "Du har indsat en tom disk."
+#~ msgid "The Thunar development team. All rights reserved."
+#~ msgstr "Thunars udviklingshold. Alle rettigheder forbeholdt."
 
-#: ../thunar-volman/tvm-run.c:135
-#: ../thunar-volman/tvm-run.c:146
-msgid "What would you like to do?"
-msgstr "Hvad vil du gerne gøre?"
+#~ msgid "Written by Benedikt Meurer <benny at xfce.org>."
+#~ msgstr "Skrevet af Benedikt Meurer <benny at xfce.org>."
 
-#: ../thunar-volman/tvm-run.c:137
-msgid "Make _DVD"
-msgstr "Lav _dvd"
+#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
+#~ msgstr "Det angivne UDI \"%s\" er ikke et gyldigt HAL-enheds UDI"
 
-#: ../thunar-volman/tvm-run.c:148
-msgid "Make _Data CD"
-msgstr "Lav _data-cd"
+#~ msgid "Encrypted volume"
+#~ msgstr "Krypteret arkiv"
 
-#: ../thunar-volman/tvm-run.c:149
-msgid "Make _Audio CD"
-msgstr "Lav _lyd-cd"
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Monterer krypteret arkiv...</span>"
+
+#~ msgid "Setting up the crypto layer..."
+#~ msgstr "Indstiller krypteringslag..."
+
+#~ msgid "You are not privileged to setup the crypto layer"
+#~ msgstr "Du har ikke rettigheder til at indstille krypteringslag"
+
+#~ msgid "Wrong password"
+#~ msgstr "Forkert adgangskode"
+
+#~ msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
+#~ msgstr "<span weight=\"bold\" size=\"larger\">Forkert adgangskode.</span>"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Dette arkiv er krypteret.</span>"
+
+#~ msgid "Please enter your password to decrypt and mount the volume."
+#~ msgstr ""
+#~ "Angiv venligst din adgangskode for at afkryptere og montere arkivet."
+
+#~ msgid "_Mount"
+#~ msgstr "_Montér"
+
+#~ msgid "Failed to setup the encrypted volume"
+#~ msgstr "Kunne ikke indstille krypteret arkiv"
+
+#~ msgid "Choose Disc Type"
+#~ msgstr "Vælg disktype"
 
-#: ../thunar-volman-settings.desktop.in.in.h:3
-msgid "Removable Media"
-msgstr "Fjernbare medier"
+#~ msgid "Make _DVD"
+#~ msgstr "Lav _dvd"
 
+#~ msgid "Removable Media"
+#~ msgstr "Fjernbare medier"
diff --git a/po/de.po b/po/de.po
index c8aebc6..688d2e3 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,104 +7,98 @@ msgid ""
 msgstr ""
 "Project-Id-Version: thunar-volman 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-03 21:09+0100\n"
+"POT-Creation-Date: 2010-07-25 20:06+0200\n"
 "PO-Revision-Date: 2007-01-15 21:19+0100\n"
 "Last-Translator: Benedikt Meurer <benny at xfce.org>\n"
 "Language-Team: German <de at li.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../thunar-volman/main.c:50
-msgid "The HAL device UDI of the newly added device"
+#: ../thunar-volman/main.c:59
+#, fuzzy
+msgid "The syfs path of the newly added device"
 msgstr "Der HAL UDI des neu hinzugekommenen Geräts"
 
-#: ../thunar-volman/main.c:51 ../thunar-volman/tvm-preferences-dialog.c:120
-#: ../thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman/main.c:60
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:104
 msgid "Configure management of removable drives and media"
 msgstr "Handhabung von Wechseldatenträgern und -medien konfigurieren"
 
-#: ../thunar-volman/main.c:52
+#: ../thunar-volman/main.c:61
 msgid "Print version information and exit"
 msgstr "Programmversion anzeigen"
 
 #. setup application name
-#: ../thunar-volman/main.c:69
+#: ../thunar-volman/main.c:93
 msgid "Thunar Volume Manager"
 msgstr "Thunar Datenträgerverwaltung"
 
-#: ../thunar-volman/main.c:90
-msgid "Failed to open display"
-msgstr "Konnte keine Verbindung zum XServer herstellen"
-
-#: ../thunar-volman/main.c:106
-msgid "The Thunar development team. All rights reserved."
-msgstr "Die Thunar Entwickler. Alle Rechte vorbehalten."
-
-#: ../thunar-volman/main.c:107
-msgid "Written by Benedikt Meurer <benny at xfce.org>."
-msgstr "Entwickelt von Benedikt Meurer <benny at xfce.org>."
+#: ../thunar-volman/main.c:133
+msgid "All rights reserved."
+msgstr ""
 
-#: ../thunar-volman/main.c:108
+#: ../thunar-volman/main.c:134
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Bitte melden Sie Probleme unter <%s>."
 
-#. TRANSLATORS: A HAL device UDI must match certain conditions to be valid (to be exact, it must be a valid D-Bus object path)
-#: ../thunar-volman/main.c:133
+#: ../thunar-volman/main.c:188
 #, c-format
-msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
-msgstr "Der angegebene UDI »%s« ist kein gültiger HAL UDI"
+msgid "There is no device with the sysfs path \"%s\""
+msgstr ""
 
-#. TRANSLATORS: thunar-volman wasn't invoked with either --device-added or --configure.
-#: ../thunar-volman/main.c:144
-#, c-format
-msgid "Must specify the new HAL device UDI with --device-added"
+#: ../thunar-volman/main.c:200
+#, fuzzy, c-format
+msgid "Must specify the sysfs path of new devices with --device-added"
 msgstr "Es muss ein HAL UDI mit --device-added angegeben werden"
 
 #. ...so we need to prompt what to do
-#: ../thunar-volman/tvm-block-device.c:189
+#: ../thunar-volman/tvm-block-device.c:204
 msgid "Photos and Music"
 msgstr "Fotos und Musik"
 
-#: ../thunar-volman/tvm-block-device.c:190
-msgid "Photos were found on your portable music player."
+#: ../thunar-volman/tvm-block-device.c:205
+#, fuzzy
+msgid "Photos were found on your portable music player"
 msgstr "Auf diesem Gerät wurden Fotos und Musik entdeckt."
 
-#: ../thunar-volman/tvm-block-device.c:191
+#: ../thunar-volman/tvm-block-device.c:206
 msgid "Would you like to import the photos or manage the music?"
 msgstr "Sollen die Fotos importiert oder die Musik verwaltet werden?"
 
-#: ../thunar-volman/tvm-block-device.c:192
-#: ../thunar-volman/tvm-block-device.c:258
-#: ../thunar-volman/tvm-block-device.c:335
-#: ../thunar-volman/tvm-block-device.c:371
-#: ../thunar-volman/tvm-block-device.c:430
-#: ../thunar-volman/tvm-block-device.c:703
-#: ../thunar-volman/tvm-crypto-volume.c:448 ../thunar-volman/tvm-run.c:136
-#: ../thunar-volman/tvm-run.c:147
+#: ../thunar-volman/tvm-block-device.c:208
+#: ../thunar-volman/tvm-block-device.c:277
+#: ../thunar-volman/tvm-block-device.c:378
+#: ../thunar-volman/tvm-block-device.c:425
+#: ../thunar-volman/tvm-block-device.c:507
+#: ../thunar-volman/tvm-block-device.c:826 ../thunar-volman/tvm-run.c:196
+#: ../thunar-volman/tvm-run.c:207
 msgid "Ig_nore"
 msgstr "_Ignorieren"
 
-#: ../thunar-volman/tvm-block-device.c:193
-#: ../thunar-volman/tvm-block-device.c:259
+#: ../thunar-volman/tvm-block-device.c:209
+#: ../thunar-volman/tvm-block-device.c:278
 msgid "Import _Photos"
 msgstr "Fotos _Importieren"
 
-#: ../thunar-volman/tvm-block-device.c:194
+#: ../thunar-volman/tvm-block-device.c:210
 msgid "Manage _Music"
 msgstr "_Musik verwalten"
 
-#. ask the user whether to import photos
-#: ../thunar-volman/tvm-block-device.c:255
+#. ask the user to import photos
+#: ../thunar-volman/tvm-block-device.c:273
 msgid "Photo Import"
 msgstr "Fotos importieren"
 
-#: ../thunar-volman/tvm-block-device.c:256
-msgid "A photo card has been detected."
+#: ../thunar-volman/tvm-block-device.c:274
+#, fuzzy
+msgid "A photo card has been detected"
 msgstr "Ein Medium mit Fotos wurde erkannt."
 
-#: ../thunar-volman/tvm-block-device.c:257
+#: ../thunar-volman/tvm-block-device.c:275
 msgid ""
 "There are photos on the card. Would you like to add these photos to your "
 "album?"
@@ -112,362 +106,526 @@ msgstr ""
 "Auf diesem Medium sind Fotos vorhanden. Sollen diese Ihrem Fotoalbum "
 "hinzugefügt werden?"
 
-#. prompt the user whether to execute this file
-#: ../thunar-volman/tvm-block-device.c:332
-#: ../thunar-volman/tvm-block-device.c:368
+#. prompt the user to execute the file
+#. prompt the user to execute this file
+#: ../thunar-volman/tvm-block-device.c:373
+#: ../thunar-volman/tvm-block-device.c:420
 #, c-format
 msgid "Would you like to allow \"%s\" to run?"
 msgstr "Soll »%s« ausgeführt werden?"
 
-#: ../thunar-volman/tvm-block-device.c:333
-#: ../thunar-volman/tvm-block-device.c:369
+#: ../thunar-volman/tvm-block-device.c:376
+#: ../thunar-volman/tvm-block-device.c:423
 msgid "Auto-Run Confirmation"
 msgstr "Automatisches Ausführen bestätigen"
 
-#: ../thunar-volman/tvm-block-device.c:334
-#: ../thunar-volman/tvm-block-device.c:370
+#: ../thunar-volman/tvm-block-device.c:377
+#: ../thunar-volman/tvm-block-device.c:424
 msgid "Auto-Run capability detected"
 msgstr "Unterstützung für Automatisches Ausführen erkannt."
 
-#: ../thunar-volman/tvm-block-device.c:336
-#: ../thunar-volman/tvm-block-device.c:372
+#: ../thunar-volman/tvm-block-device.c:379
+#: ../thunar-volman/tvm-block-device.c:426
 msgid "_Allow Auto-Run"
 msgstr "_Automatisches Ausführen erlauben"
 
 #. prompt the user whether to autoopen this file
-#: ../thunar-volman/tvm-block-device.c:427
+#: ../thunar-volman/tvm-block-device.c:502
 #, c-format
 msgid "Would you like to open \"%s\"?"
 msgstr "Soll »%s« geöffnet werden?"
 
-#: ../thunar-volman/tvm-block-device.c:428
+#: ../thunar-volman/tvm-block-device.c:505
 msgid "Auto-Open Confirmation"
 msgstr "Automatisches Öffnen bestätigen"
 
-#: ../thunar-volman/tvm-block-device.c:429
+#: ../thunar-volman/tvm-block-device.c:506
 msgid "Auto-Open capability detected"
 msgstr "Unterstützung für Automatisches Öffnen erkannt."
 
-#: ../thunar-volman/tvm-block-device.c:431
+#: ../thunar-volman/tvm-block-device.c:508
 msgid "_Open"
 msgstr "Ö_ffnen"
 
-#. ask what do with the mixed audio/data disc
-#: ../thunar-volman/tvm-block-device.c:700
-msgid "Audio / Data CD"
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "CD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "DVD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:618
+msgid "The CD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:619
+msgid "The DVD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:629
+msgid "Volume mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:632
+#, c-format
+msgid "The volume \"%s\" was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:637
+#, c-format
+msgid "The inserted volume was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:691
+#, c-format
+msgid "Unable to locate mount point"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:737
+#, c-format
+msgid "Unable to mount the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:746
+#, c-format
+msgid "Could not detect the volume corresponding to the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:821
+#, fuzzy
+msgid "Audio/Data CD"
 msgstr "Audio-/Daten-CD"
 
-#: ../thunar-volman/tvm-block-device.c:701
-msgid "The CD in the drive contains both music and files."
+#: ../thunar-volman/tvm-block-device.c:822
+#, fuzzy
+msgid "The CD in the drive contains both music and files"
 msgstr "Die CD im Laufwerk enthält sowohl Musik als auch Dateien."
 
-#: ../thunar-volman/tvm-block-device.c:702
+#: ../thunar-volman/tvm-block-device.c:824
 msgid "Would you like to listen to music or browse the files?"
 msgstr "Soll die Musik wiedergegeben oder die Dateien angezeigt werden?"
 
-#: ../thunar-volman/tvm-block-device.c:704
+#: ../thunar-volman/tvm-block-device.c:827
 msgid "_Browse Files"
 msgstr "_Dateien anzeigen"
 
-#: ../thunar-volman/tvm-block-device.c:705
+#: ../thunar-volman/tvm-block-device.c:828
 msgid "_Play CD"
 msgstr "_CD wiedergeben"
 
-#: ../thunar-volman/tvm-command-entry.c:233
-msgid "Select an Application"
-msgstr "Anwendung auswählen"
+#: ../thunar-volman/tvm-block-device.c:916
+#, c-format
+msgid "Unknown block device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:243
-msgid "All Files"
-msgstr "Alle Dateien"
+#: ../thunar-volman/tvm-device.c:139
+#, c-format
+msgid "Device type not supported"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:248
-msgid "Executable Files"
-msgstr "Ausführbare Dateien"
+#: ../thunar-volman/tvm-input-device.c:74
+#, fuzzy
+msgid "input-keyboard"
+msgstr "Tastaturen"
 
-#: ../thunar-volman/tvm-command-entry.c:263
-msgid "Perl Scripts"
-msgstr "Perl Skripte"
+#: ../thunar-volman/tvm-input-device.c:75
+#, fuzzy
+msgid "Keyboard detected"
+msgstr "Tastaturen"
 
-#: ../thunar-volman/tvm-command-entry.c:269
-msgid "Python Scripts"
-msgstr "Python Skripte"
+#: ../thunar-volman/tvm-input-device.c:76
+#, fuzzy
+msgid "A keyboard was detected"
+msgstr "Ein Medium mit Fotos wurde erkannt."
 
-#: ../thunar-volman/tvm-command-entry.c:275
-msgid "Ruby Scripts"
-msgstr "Ruby Skripte"
+#: ../thunar-volman/tvm-input-device.c:86
+#: ../thunar-volman/tvm-input-device.c:100
+msgid "input-tablet"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:281
-msgid "Shell Scripts"
-msgstr "Shell Skripte"
+#: ../thunar-volman/tvm-input-device.c:87
+#: ../thunar-volman/tvm-input-device.c:101
+#, fuzzy
+msgid "Tablet detected"
+msgstr "Unterstützung für Automatisches Ausführen erkannt."
+
+#: ../thunar-volman/tvm-input-device.c:88
+#: ../thunar-volman/tvm-input-device.c:102
+msgid "A graphics tablet was detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:286
-#: ../thunar-volman/tvm-crypto-volume.c:443
-msgid "Encrypted volume"
-msgstr "Verschlüsselter Datenträger"
+#: ../thunar-volman/tvm-input-device.c:110
+msgid "input-mouse"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:297
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
+#: ../thunar-volman/tvm-input-device.c:111
+msgid "Mouse detected"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Verschlüsselten Datenträger "
-"einhängen...</span>"
 
-#: ../thunar-volman/tvm-crypto-volume.c:302
-msgid "Setting up the crypto layer..."
-msgstr "Verschlüsselungsschicht aufsetzen..."
+#: ../thunar-volman/tvm-input-device.c:112
+msgid "A mouse was detected"
+msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) but got Permission denied.
-#: ../thunar-volman/tvm-crypto-volume.c:369
+#: ../thunar-volman/tvm-input-device.c:139
 #, c-format
-msgid "You are not privileged to setup the crypto layer"
+msgid "Unsupported input device type"
 msgstr ""
-"Sie sind nicht dazu berechtigt, die Verschlüsselungsschicht einzurichten"
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) and typed the wrong password.
-#: ../thunar-volman/tvm-crypto-volume.c:374
+#: ../thunar-volman/tvm-run.c:173
 #, c-format
-msgid "Wrong password"
-msgstr "Falsches Passwort"
+msgid "Autoburning of blank CDs and DVDs is disabled"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:193
+msgid "Blank DVD inserted"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:445
-msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Falsches Passwort.</span>"
+#: ../thunar-volman/tvm-run.c:194
+#, fuzzy
+msgid "You have inserted a blank DVD."
+msgstr "Ein Rohling wurde eingelegt."
 
-#: ../thunar-volman/tvm-crypto-volume.c:446
-msgid "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
+#: ../thunar-volman/tvm-run.c:195 ../thunar-volman/tvm-run.c:206
+msgid "What would you like to do?"
+msgstr "Welche Aktion soll ausgeführt werden?"
+
+#: ../thunar-volman/tvm-run.c:197
+msgid "Burn _DVD"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:204
+#, fuzzy
+msgid "Blank CD inserted"
+msgstr "CD/DVD-Rohlinge"
+
+#: ../thunar-volman/tvm-run.c:205
+#, fuzzy
+msgid "You have inserted a blank CD."
+msgstr "Ein Rohling wurde eingelegt."
+
+#: ../thunar-volman/tvm-run.c:208
+#, fuzzy
+msgid "Burn _Data CD"
+msgstr "_Daten-CD brennen"
+
+#: ../thunar-volman/tvm-run.c:209
+#, fuzzy
+msgid "Burn _Audio CD"
+msgstr "_Audio-CD brennen"
+
+#: ../thunar-volman/tvm-run.c:233
+#, c-format
+msgid "The burn command may not be empty"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:272
+#, c-format
+msgid "The CD player command is undefined"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:66
+msgid "Camera detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:67
+#, fuzzy
+msgid "A photo camera was detected"
+msgstr "Ein Medium mit Fotos wurde erkannt."
+
+#: ../thunar-volman/tvm-usb-device.c:77
+msgid "Printer detected"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Dieser Datenträger ist verschlüsselt.</"
-"span>"
 
-#: ../thunar-volman/tvm-crypto-volume.c:447
-msgid "Please enter your password to decrypt and mount the volume."
+#: ../thunar-volman/tvm-usb-device.c:78
+msgid "A USB printer was detected"
 msgstr ""
-"Bitte geben Sie Ihr Passwort ein, um den Datenträger zu entschlüsseln und "
-"einzuhängen."
 
-#: ../thunar-volman/tvm-crypto-volume.c:449
-msgid "_Mount"
-msgstr "_Einhängen"
+#: ../thunar-volman/tvm-usb-device.c:104
+#, c-format
+msgid "Unsupported USB device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:468
-msgid "Failed to setup the encrypted volume"
-msgstr "Konnte den verschlüsselten Datenträger nicht einrichten"
+#. setup application name
+#: ../thunar-volman-settings/main.c:52
+#, fuzzy
+msgid "Thunar Volume Manager Settings"
+msgstr "Thunar Datenträgerverwaltung"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:119
-#: ../thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:102
 msgid "Removable Drives and Media"
 msgstr "Wechseldatenträger- und Medieneinstellungen"
 
+#: ../thunar-volman-settings/tvm-command-entry.c:240
+msgid "Select an Application"
+msgstr "Anwendung auswählen"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:250
+msgid "All Files"
+msgstr "Alle Dateien"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:255
+msgid "Executable Files"
+msgstr "Ausführbare Dateien"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:270
+msgid "Perl Scripts"
+msgstr "Perl Skripte"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:276
+msgid "Python Scripts"
+msgstr "Python Skripte"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:282
+msgid "Ruby Scripts"
+msgstr "Ruby Skripte"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:288
+msgid "Shell Scripts"
+msgstr "Shell Skripte"
+
 #.
 #. Storage
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:143
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:130
 msgid "Storage"
 msgstr "Datenträger"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:153
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:141
 msgid "Removable Storage"
 msgstr "Wechseldatenträger"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:170
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:158
 msgid "_Mount removable drives when hot-plugged"
 msgstr "_Hotplug-Wechsellaufwerke automatisch einhängen"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:175
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:166
 msgid "Mount removable media when _inserted"
 msgstr "Wechselmedien beim Einlegen ein_hängen"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:180
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:174
 msgid "B_rowse removable media when inserted"
 msgstr "Wechselmedien beim _Einlegen öffnen"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:185
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:182
 msgid "_Auto-run programs on new drives and media"
 msgstr "_Programme auf neuen Laufwerken und Medien automatisch ausführen"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:190
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:189
 msgid "Auto-open files on new drives and media"
 msgstr "Dateien auf neuen Laufwerken und Medien automatisch ö_ffnen"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:199
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:201
 msgid "Blank CDs and DVDs"
 msgstr "CD/DVD-Rohlinge"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:216
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:218
 msgid "_Burn a CD or DVD when a blank disc is inserted"
 msgstr "Eine CD oder DVD _brennen, wenn ein Rohling eingelegt wird"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:224
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:229
 msgid "Command for _Data CDs:"
 msgstr "Befehl für _Daten-CDs:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:231
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:239
 msgid "Command for A_udio CDs:"
 msgstr "Befehl für A_udio-CDs:"
 
 #.
 #. Multimedia
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:245
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:255
 msgid "Multimedia"
 msgstr "Unterhaltungsmedien"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:255
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:266
 msgid "Audio CDs"
 msgstr "Audio-CDs"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:272
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:283
 msgid "Play _audio CDs when inserted"
 msgstr "_Audio-CDs beim Einlegen wiedergeben"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:277
-#: ../thunar-volman/tvm-preferences-dialog.c:383
-#: ../thunar-volman/tvm-preferences-dialog.c:425
-#: ../thunar-volman/tvm-preferences-dialog.c:499
-#: ../thunar-volman/tvm-preferences-dialog.c:541
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:290
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:415
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:466
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:553
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:601
 msgid "_Command:"
 msgstr "_Befehl:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:287
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:304
 msgid "Video CDs/DVDs"
 msgstr "Video-CDs/DVDs"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:304
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:321
 msgid "Play _video CDs and DVDs when inserted"
 msgstr "_Video-CDs/DVDs beim Einlegen wiedergeben"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:309
-#: ../thunar-volman/tvm-preferences-dialog.c:341
-#: ../thunar-volman/tvm-preferences-dialog.c:457
-#: ../thunar-volman/tvm-preferences-dialog.c:573
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:329
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:367
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:505
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:640
 msgid "C_ommand:"
 msgstr "B_efehl:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:319
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:343
 msgid "Portable Music Players"
 msgstr "Tragbare Musik-Player"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:336
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:360
 msgid "Play _music files when connected"
 msgstr "Nach dem Verbinden _Musikdateien abspielen"
 
 #.
 #. Cameras
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:351
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:379
 msgid "Cameras"
 msgstr "Kameras"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:361
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:390
 msgid "Digital Cameras"
 msgstr "Digitalkameras"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:378
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:407
 msgid "Import digital photographs when connected"
 msgstr "Nach dem Verbinden digitale Fotos _importieren"
 
 #.
 #. PDAs
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:393
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:427
 msgid "PDAs"
 msgstr "PDAs"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:403
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:441
 msgid "Palm™"
 msgstr "Palm"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:420
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:458
 msgid "Sync _Palm™ devices when connected"
 msgstr "Nach dem Verbinden Daten mit Pa_lms abgleichen"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:435
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:480
 msgid "Pocket PCs"
 msgstr "Pocket PCs"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:452
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:497
 msgid "Sync Pocket P_C devices when connected"
 msgstr "Nach dem Verbinden Daten mit _PocketPCs abgleichen"
 
 #.
 #. Printers
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:467
-#: ../thunar-volman/tvm-preferences-dialog.c:477
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:517
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:528
 msgid "Printers"
 msgstr "Drucker"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:494
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:545
 msgid "Automatically run a program when a _printer is connected"
 msgstr "Automatisch ein Programm ausführen, wenn ein _Drucker eingesteckt wird"
 
 #.
 #. Input Devices
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:509
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:565
 msgid "Input Devices"
 msgstr "Eingabegeräte"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:519
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:576
 msgid "Keyboards"
 msgstr "Tastaturen"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:536
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:593
 msgid "Automatically run a program when an USB _keyboard is connected"
 msgstr ""
 "Automatisch ein Programm ausführen, wenn eine USB-_Tastatur eingesteckt wird"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:551
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:615
 msgid "Mice"
 msgstr "Mäuse"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:568
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:632
 msgid "Automatically run a program when an USB _mouse is connected"
 msgstr ""
 "Automatisch ein Programm ausführen, wenn eine USB-_Maus eingesteckt wird"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:583
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:654
 msgid "Tablet"
 msgstr "Grafiktablets"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:600
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:671
 msgid "Automatically run a program when a _tablet is connected"
 msgstr ""
 "Automatisch ein Programm ausführen, wenn ein _Grafiktablett eingesteckt wird"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:605
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:679
 msgid "Com_mand:"
 msgstr "Befe_hl:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:690
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:755
 msgid "Failed to open the documentation browser"
 msgstr "Die Dokumentation konnte nicht angezeigt werden"
 
-#: ../thunar-volman/tvm-run.c:133 ../thunar-volman/tvm-run.c:144
-msgid "Choose Disc Type"
-msgstr "Medientyp auswählen"
+#~ msgid "Failed to open display"
+#~ msgstr "Konnte keine Verbindung zum XServer herstellen"
 
-#: ../thunar-volman/tvm-run.c:134 ../thunar-volman/tvm-run.c:145
-msgid "You have inserted a blank disc."
-msgstr "Ein Rohling wurde eingelegt."
+#~ msgid "The Thunar development team. All rights reserved."
+#~ msgstr "Die Thunar Entwickler. Alle Rechte vorbehalten."
 
-#: ../thunar-volman/tvm-run.c:135 ../thunar-volman/tvm-run.c:146
-msgid "What would you like to do?"
-msgstr "Welche Aktion soll ausgeführt werden?"
+#~ msgid "Written by Benedikt Meurer <benny at xfce.org>."
+#~ msgstr "Entwickelt von Benedikt Meurer <benny at xfce.org>."
 
-#: ../thunar-volman/tvm-run.c:137
-msgid "Make _DVD"
-msgstr "_DVD brennen"
+#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
+#~ msgstr "Der angegebene UDI »%s« ist kein gültiger HAL UDI"
 
-#: ../thunar-volman/tvm-run.c:148
-msgid "Make _Data CD"
-msgstr "_Daten-CD brennen"
+#~ msgid "Encrypted volume"
+#~ msgstr "Verschlüsselter Datenträger"
 
-#: ../thunar-volman/tvm-run.c:149
-msgid "Make _Audio CD"
-msgstr "_Audio-CD brennen"
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Verschlüsselten Datenträger "
+#~ "einhängen...</span>"
+
+#~ msgid "Setting up the crypto layer..."
+#~ msgstr "Verschlüsselungsschicht aufsetzen..."
+
+#~ msgid "You are not privileged to setup the crypto layer"
+#~ msgstr ""
+#~ "Sie sind nicht dazu berechtigt, die Verschlüsselungsschicht einzurichten"
+
+#~ msgid "Wrong password"
+#~ msgstr "Falsches Passwort"
+
+#~ msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
+#~ msgstr "<span weight=\"bold\" size=\"larger\">Falsches Passwort.</span>"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Dieser Datenträger ist "
+#~ "verschlüsselt.</span>"
+
+#~ msgid "Please enter your password to decrypt and mount the volume."
+#~ msgstr ""
+#~ "Bitte geben Sie Ihr Passwort ein, um den Datenträger zu entschlüsseln und "
+#~ "einzuhängen."
+
+#~ msgid "_Mount"
+#~ msgstr "_Einhängen"
+
+#~ msgid "Failed to setup the encrypted volume"
+#~ msgstr "Konnte den verschlüsselten Datenträger nicht einrichten"
+
+#~ msgid "Choose Disc Type"
+#~ msgstr "Medientyp auswählen"
+
+#~ msgid "Make _DVD"
+#~ msgstr "_DVD brennen"
 
-#: ../thunar-volman-settings.desktop.in.in.h:3
-msgid "Removable Media"
-msgstr "Wechselmedien"
+#~ msgid "Removable Media"
+#~ msgstr "Wechselmedien"
diff --git a/po/el.po b/po/el.po
index 458604c..9398deb 100644
--- a/po/el.po
+++ b/po/el.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # Evaggelos Balaskas <ebalaskas at ebalaskas.gr>, 2009.
 # Stavros Giannouris <stavrosg at hellug.gr>, 2009.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: thunar-volman git version\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-30 02:26-0700\n"
+"POT-Creation-Date: 2010-07-25 20:06+0200\n"
 "PO-Revision-Date: 2010-06-27 19:27+0200\n"
 "Last-Translator: Evaggelos Balaskas <ebalaskas at ebalaskas.gr>\n"
 "Language-Team: Greek <nls at tux.hellug.gr>\n"
+"Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,442 +21,614 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Poedit-Country: GREECE\n"
 
-#: ../thunar-volman/main.c:50
-msgid "The HAL device UDI of the newly added device"
+#: ../thunar-volman/main.c:59
+#, fuzzy
+msgid "The syfs path of the newly added device"
 msgstr "Το UDI της συσκευής HAL της νέας συσκευής που προστέθηκε"
 
-#: ../thunar-volman/main.c:51 ../thunar-volman/tvm-preferences-dialog.c:120
-#: ../thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman/main.c:60
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:104
 msgid "Configure management of removable drives and media"
 msgstr "Ρύθμιση διαχείρισης των αφαιρούμενων συσκευών και μέσων"
 
-#: ../thunar-volman/main.c:52
+#: ../thunar-volman/main.c:61
 msgid "Print version information and exit"
 msgstr "Εμφάνισε πληροφορίες έκδοσης και έξοδος"
 
 #. setup application name
-#: ../thunar-volman/main.c:69
+#: ../thunar-volman/main.c:93
 msgid "Thunar Volume Manager"
 msgstr "Thunar διαχειριστής αφαιρούμενων μονάδων"
 
-#: ../thunar-volman/main.c:90
-msgid "Failed to open display"
-msgstr "Απέτυχε να ανοίξει η οθόνη"
-
-#: ../thunar-volman/main.c:106
-msgid "The Thunar development team. All rights reserved."
-msgstr "Η ομάδα ανάπτυξης του Thunar. Με την επιφύλαξη παντός νομίμου δικαιώματος."
-
-#: ../thunar-volman/main.c:107
-msgid "Written by Benedikt Meurer <benny at xfce.org>."
-msgstr "Γράφτηκε από τον Benedikt Meurer <benny at xfce.org>."
+#: ../thunar-volman/main.c:133
+msgid "All rights reserved."
+msgstr ""
 
-#: ../thunar-volman/main.c:108
+#: ../thunar-volman/main.c:134
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Παρακαλώ αναφέρατε σφάλματα στο <%s>."
 
-#. TRANSLATORS: A HAL device UDI must match certain conditions to be valid (to
-#. be exact, it must be a valid D-Bus object path)
-#: ../thunar-volman/main.c:133
+#: ../thunar-volman/main.c:188
 #, c-format
-msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
-msgstr "Το καθορισμένο UDI \"%s\" δεν είναι έγκυρο UDI συσκευής HAL"
+msgid "There is no device with the sysfs path \"%s\""
+msgstr ""
 
-#. TRANSLATORS: thunar-volman wasn't invoked with either --device-added or
-#. --configure.
-#: ../thunar-volman/main.c:144
-#, c-format
-msgid "Must specify the new HAL device UDI with --device-added"
+#: ../thunar-volman/main.c:200
+#, fuzzy, c-format
+msgid "Must specify the sysfs path of new devices with --device-added"
 msgstr "Πρέπει να καθορίσετε το νέο UDI συσκευής με --device-added"
 
 #. ...so we need to prompt what to do
-#: ../thunar-volman/tvm-block-device.c:189
+#: ../thunar-volman/tvm-block-device.c:204
 msgid "Photos and Music"
 msgstr "Εικόνες και Μουσική"
 
-#: ../thunar-volman/tvm-block-device.c:190
-msgid "Photos were found on your portable music player."
+#: ../thunar-volman/tvm-block-device.c:205
+#, fuzzy
+msgid "Photos were found on your portable music player"
 msgstr "Βρέθηκαν εικόνες στη φορητή μουσική συσκευή."
 
-#: ../thunar-volman/tvm-block-device.c:191
+#: ../thunar-volman/tvm-block-device.c:206
 msgid "Would you like to import the photos or manage the music?"
 msgstr "Θέλετε να εισάγετε τις εικόνες ή να διαχειριστείτε την μουσική;"
 
-#: ../thunar-volman/tvm-block-device.c:192
-#: ../thunar-volman/tvm-block-device.c:258
-#: ../thunar-volman/tvm-block-device.c:335
-#: ../thunar-volman/tvm-block-device.c:371
-#: ../thunar-volman/tvm-block-device.c:430
-#: ../thunar-volman/tvm-block-device.c:703
-#: ../thunar-volman/tvm-crypto-volume.c:448 ../thunar-volman/tvm-run.c:136
-#: ../thunar-volman/tvm-run.c:147
+#: ../thunar-volman/tvm-block-device.c:208
+#: ../thunar-volman/tvm-block-device.c:277
+#: ../thunar-volman/tvm-block-device.c:378
+#: ../thunar-volman/tvm-block-device.c:425
+#: ../thunar-volman/tvm-block-device.c:507
+#: ../thunar-volman/tvm-block-device.c:826 ../thunar-volman/tvm-run.c:196
+#: ../thunar-volman/tvm-run.c:207
 msgid "Ig_nore"
 msgstr "Αγν_όηση"
 
-#: ../thunar-volman/tvm-block-device.c:193
-#: ../thunar-volman/tvm-block-device.c:259
+#: ../thunar-volman/tvm-block-device.c:209
+#: ../thunar-volman/tvm-block-device.c:278
 msgid "Import _Photos"
 msgstr "Εισαγωγή εικ_όνων"
 
-#: ../thunar-volman/tvm-block-device.c:194
+#: ../thunar-volman/tvm-block-device.c:210
 msgid "Manage _Music"
 msgstr "Διαχείριση μ_ουσικής"
 
-#. ask the user whether to import photos
-#: ../thunar-volman/tvm-block-device.c:255
+#. ask the user to import photos
+#: ../thunar-volman/tvm-block-device.c:273
 msgid "Photo Import"
 msgstr "Εισαγωγή εικόνας"
 
-#: ../thunar-volman/tvm-block-device.c:256
-msgid "A photo card has been detected."
+#: ../thunar-volman/tvm-block-device.c:274
+#, fuzzy
+msgid "A photo card has been detected"
 msgstr "Εντοπίστηκε μία κάρτα εικόνας."
 
-#: ../thunar-volman/tvm-block-device.c:257
-msgid "There are photos on the card. Would you like to add these photos to your album?"
-msgstr "Υπάρχουν εικόνες στην κάρτα. Θέλετε να προσθέσετε τις εικόνες στο άλμπουμ σας;"
+#: ../thunar-volman/tvm-block-device.c:275
+msgid ""
+"There are photos on the card. Would you like to add these photos to your "
+"album?"
+msgstr ""
+"Υπάρχουν εικόνες στην κάρτα. Θέλετε να προσθέσετε τις εικόνες στο άλμπουμ "
+"σας;"
 
-#. prompt the user whether to execute this file
-#: ../thunar-volman/tvm-block-device.c:332
-#: ../thunar-volman/tvm-block-device.c:368
+#. prompt the user to execute the file
+#. prompt the user to execute this file
+#: ../thunar-volman/tvm-block-device.c:373
+#: ../thunar-volman/tvm-block-device.c:420
 #, c-format
 msgid "Would you like to allow \"%s\" to run?"
 msgstr "Θέλετε να επιτρέψετε στο \"%s\" να τρέξει;"
 
-#: ../thunar-volman/tvm-block-device.c:333
-#: ../thunar-volman/tvm-block-device.c:369
+#: ../thunar-volman/tvm-block-device.c:376
+#: ../thunar-volman/tvm-block-device.c:423
 msgid "Auto-Run Confirmation"
 msgstr "Ρύθμιση αυτόματης εκτέλεσης"
 
-#: ../thunar-volman/tvm-block-device.c:334
-#: ../thunar-volman/tvm-block-device.c:370
+#: ../thunar-volman/tvm-block-device.c:377
+#: ../thunar-volman/tvm-block-device.c:424
 msgid "Auto-Run capability detected"
 msgstr "Εντοπίστηκε δυνατότητα αυτόματης εκτέλεσης"
 
-#: ../thunar-volman/tvm-block-device.c:336
-#: ../thunar-volman/tvm-block-device.c:372
+#: ../thunar-volman/tvm-block-device.c:379
+#: ../thunar-volman/tvm-block-device.c:426
 msgid "_Allow Auto-Run"
 msgstr "Να ε_πιτρέπεται η αυτόματη εκτέλεση"
 
 #. prompt the user whether to autoopen this file
-#: ../thunar-volman/tvm-block-device.c:427
+#: ../thunar-volman/tvm-block-device.c:502
 #, c-format
 msgid "Would you like to open \"%s\"?"
 msgstr "Θέλετε να ανοίξετε το \"%s\";"
 
-#: ../thunar-volman/tvm-block-device.c:428
+#: ../thunar-volman/tvm-block-device.c:505
 msgid "Auto-Open Confirmation"
 msgstr "Ρύθμιση αυτόματου ανοίγματος"
 
-#: ../thunar-volman/tvm-block-device.c:429
+#: ../thunar-volman/tvm-block-device.c:506
 msgid "Auto-Open capability detected"
 msgstr "Εντοπίστηκε δυνατότητα αυτόματου ανοίγματος"
 
-#: ../thunar-volman/tvm-block-device.c:431
+#: ../thunar-volman/tvm-block-device.c:508
 msgid "_Open"
 msgstr "Άν_οιγμα"
 
-#. ask what do with the mixed audio/data disc
-#: ../thunar-volman/tvm-block-device.c:700
-msgid "Audio / Data CD"
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "CD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "DVD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:618
+msgid "The CD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:619
+msgid "The DVD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:629
+msgid "Volume mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:632
+#, c-format
+msgid "The volume \"%s\" was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:637
+#, c-format
+msgid "The inserted volume was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:691
+#, c-format
+msgid "Unable to locate mount point"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:737
+#, c-format
+msgid "Unable to mount the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:746
+#, c-format
+msgid "Could not detect the volume corresponding to the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:821
+#, fuzzy
+msgid "Audio/Data CD"
 msgstr "CD ήχου / δεδομένων"
 
-#: ../thunar-volman/tvm-block-device.c:701
-msgid "The CD in the drive contains both music and files."
+#: ../thunar-volman/tvm-block-device.c:822
+#, fuzzy
+msgid "The CD in the drive contains both music and files"
 msgstr "Το cd στον οδηγό περιέχει μουσική και αρχεία."
 
-#: ../thunar-volman/tvm-block-device.c:702
+#: ../thunar-volman/tvm-block-device.c:824
 msgid "Would you like to listen to music or browse the files?"
 msgstr "Θέλετε να ακούσετε μουσική ή να περιηγηθείτε στα αρχεία;"
 
-#: ../thunar-volman/tvm-block-device.c:704
+#: ../thunar-volman/tvm-block-device.c:827
 msgid "_Browse Files"
 msgstr "Π_εριήγηση αρχείων"
 
-#: ../thunar-volman/tvm-block-device.c:705
+#: ../thunar-volman/tvm-block-device.c:828
 msgid "_Play CD"
 msgstr "Ανα_παραγωγή CD"
 
-#: ../thunar-volman/tvm-command-entry.c:233
-msgid "Select an Application"
-msgstr "Επιλογή εφαρμογής"
+#: ../thunar-volman/tvm-block-device.c:916
+#, c-format
+msgid "Unknown block device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:243
-msgid "All Files"
-msgstr "Όλα τα αρχεία"
+#: ../thunar-volman/tvm-device.c:139
+#, c-format
+msgid "Device type not supported"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:248
-msgid "Executable Files"
-msgstr "Εκτελέσιμα αρχεία"
+#: ../thunar-volman/tvm-input-device.c:74
+#, fuzzy
+msgid "input-keyboard"
+msgstr "Πληκτρολόγια"
 
-#: ../thunar-volman/tvm-command-entry.c:263
-msgid "Perl Scripts"
-msgstr "Δέσμες ενεργειών perl"
+#: ../thunar-volman/tvm-input-device.c:75
+#, fuzzy
+msgid "Keyboard detected"
+msgstr "Πληκτρολόγια"
 
-#: ../thunar-volman/tvm-command-entry.c:269
-msgid "Python Scripts"
-msgstr "Δέσμες ενεργειών python"
+#: ../thunar-volman/tvm-input-device.c:76
+#, fuzzy
+msgid "A keyboard was detected"
+msgstr "Εντοπίστηκε μία κάρτα εικόνας."
 
-#: ../thunar-volman/tvm-command-entry.c:275
-msgid "Ruby Scripts"
-msgstr "Δέσμες ενεργειών ruby"
+#: ../thunar-volman/tvm-input-device.c:86
+#: ../thunar-volman/tvm-input-device.c:100
+msgid "input-tablet"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:281
-msgid "Shell Scripts"
-msgstr "Δέσμες ενεργειών κέλυφους"
+#: ../thunar-volman/tvm-input-device.c:87
+#: ../thunar-volman/tvm-input-device.c:101
+#, fuzzy
+msgid "Tablet detected"
+msgstr "Εντοπίστηκε δυνατότητα αυτόματης εκτέλεσης"
+
+#: ../thunar-volman/tvm-input-device.c:88
+#: ../thunar-volman/tvm-input-device.c:102
+msgid "A graphics tablet was detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-input-device.c:110
+msgid "input-mouse"
+msgstr ""
+
+#: ../thunar-volman/tvm-input-device.c:111
+msgid "Mouse detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-input-device.c:112
+msgid "A mouse was detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-input-device.c:139
+#, c-format
+msgid "Unsupported input device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:286
-#: ../thunar-volman/tvm-crypto-volume.c:443
-msgid "Encrypted volume"
-msgstr "Κρυπτογραφημένες μονάδες"
+#: ../thunar-volman/tvm-run.c:173
+#, c-format
+msgid "Autoburning of blank CDs and DVDs is disabled"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:297
-msgid "<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Προσάρτηση κρυπτογραφημένης μονάδας...</span>"
+#: ../thunar-volman/tvm-run.c:193
+msgid "Blank DVD inserted"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:302
-msgid "Setting up the crypto layer..."
-msgstr "Ρύθμιση του επιπέδου κρυπτογράφησης..."
+#: ../thunar-volman/tvm-run.c:194
+#, fuzzy
+msgid "You have inserted a blank DVD."
+msgstr "Έχετε εισάγει ένα κενό δίσκο."
+
+#: ../thunar-volman/tvm-run.c:195 ../thunar-volman/tvm-run.c:206
+msgid "What would you like to do?"
+msgstr "Τι θέλετε να γίνει;"
+
+#: ../thunar-volman/tvm-run.c:197
+msgid "Burn _DVD"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:204
+#, fuzzy
+msgid "Blank CD inserted"
+msgstr "Κενά CD και DVD"
+
+#: ../thunar-volman/tvm-run.c:205
+#, fuzzy
+msgid "You have inserted a blank CD."
+msgstr "Έχετε εισάγει ένα κενό δίσκο."
+
+#: ../thunar-volman/tvm-run.c:208
+#, fuzzy
+msgid "Burn _Data CD"
+msgstr "Δημιουργία cd _δεδομένων"
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume)
-#. but got Permission denied.
-#: ../thunar-volman/tvm-crypto-volume.c:369
+#: ../thunar-volman/tvm-run.c:209
+#, fuzzy
+msgid "Burn _Audio CD"
+msgstr "Δημιουργία cd _ήχου"
+
+#: ../thunar-volman/tvm-run.c:233
 #, c-format
-msgid "You are not privileged to setup the crypto layer"
-msgstr "Δεν έχετε τα δικαιώματα να ρυθμίσετε το επίπεδο κρυπτογράφησης"
+msgid "The burn command may not be empty"
+msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume)
-#. and typed the wrong password.
-#: ../thunar-volman/tvm-crypto-volume.c:374
+#: ../thunar-volman/tvm-run.c:272
 #, c-format
-msgid "Wrong password"
-msgstr "Λανθασμένο συνθηματικό"
+msgid "The CD player command is undefined"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:445
-msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Λανθασμένο συνθηματικό.</span>"
+#: ../thunar-volman/tvm-usb-device.c:66
+msgid "Camera detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:67
+#, fuzzy
+msgid "A photo camera was detected"
+msgstr "Εντοπίστηκε μία κάρτα εικόνας."
 
-#: ../thunar-volman/tvm-crypto-volume.c:446
-msgid "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Αυτή η μονάδα είναι κρυπτογραφημένη.</span>"
+#: ../thunar-volman/tvm-usb-device.c:77
+msgid "Printer detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:447
-msgid "Please enter your password to decrypt and mount the volume."
-msgstr "Παρακαλώ εισάγετε το συνθηματικό για την αποκρυπτογράφηση και προσάρτηση της μονάδας."
+#: ../thunar-volman/tvm-usb-device.c:78
+msgid "A USB printer was detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:449
-msgid "_Mount"
-msgstr "_Προσάρτηση"
+#: ../thunar-volman/tvm-usb-device.c:104
+#, c-format
+msgid "Unsupported USB device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:468
-msgid "Failed to setup the encrypted volume"
-msgstr "Αποτυχία ρύθμισης της κρυπτογραφημένης μονάδας"
+#. setup application name
+#: ../thunar-volman-settings/main.c:52
+#, fuzzy
+msgid "Thunar Volume Manager Settings"
+msgstr "Thunar διαχειριστής αφαιρούμενων μονάδων"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:119
-#: ../thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:102
 msgid "Removable Drives and Media"
 msgstr "Αφαιρούμενοι οδηγοί και μέσα"
 
+#: ../thunar-volman-settings/tvm-command-entry.c:240
+msgid "Select an Application"
+msgstr "Επιλογή εφαρμογής"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:250
+msgid "All Files"
+msgstr "Όλα τα αρχεία"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:255
+msgid "Executable Files"
+msgstr "Εκτελέσιμα αρχεία"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:270
+msgid "Perl Scripts"
+msgstr "Δέσμες ενεργειών perl"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:276
+msgid "Python Scripts"
+msgstr "Δέσμες ενεργειών python"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:282
+msgid "Ruby Scripts"
+msgstr "Δέσμες ενεργειών ruby"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:288
+msgid "Shell Scripts"
+msgstr "Δέσμες ενεργειών κέλυφους"
+
+#.
 #. Storage
-#. 
-#: ../thunar-volman/tvm-preferences-dialog.c:143
+#.
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:130
 msgid "Storage"
 msgstr "Μέσο αποθήκευσης"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:153
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:141
 msgid "Removable Storage"
 msgstr "Αφαιρούμενο μέσο αποθήκευσης"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:170
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:158
 msgid "_Mount removable drives when hot-plugged"
 msgstr "Πρ_οσάρτηση αφαιρούμενων οδηγών όταν συνδέονται"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:175
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:166
 msgid "Mount removable media when _inserted"
 msgstr "Προσάρτηση αφαιρούμενων μέσων όταν εισαχθούν"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:180
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:174
 msgid "B_rowse removable media when inserted"
 msgstr "Περιήγηση αφαιρούμενων μέσων όταν εισαχθούν"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:185
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:182
 msgid "_Auto-run programs on new drives and media"
 msgstr "Αυτ_όματη εκτέλεση προγραμμάτων σε νέους οδηγούς και μέσα"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:190
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:189
 msgid "Auto-open files on new drives and media"
 msgstr "Αυτόματο άνοιγμα των αρχείων σε νέους οδηγούς και μέσα"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:199
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:201
 msgid "Blank CDs and DVDs"
 msgstr "Κενά CD και DVD"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:216
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:218
 msgid "_Burn a CD or DVD when a blank disc is inserted"
 msgstr "_Εγγραφή ενός CD ή DVD όταν εισαχθεί κενός δίσκος"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:224
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:229
 msgid "Command for _Data CDs:"
 msgstr "Εντολή για CD δεδομένων:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:231
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:239
 msgid "Command for A_udio CDs:"
 msgstr "Εντολή για CD ήχου:"
 
+#.
 #. Multimedia
-#. 
-#: ../thunar-volman/tvm-preferences-dialog.c:245
+#.
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:255
 msgid "Multimedia"
 msgstr "Πολυμέσα"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:255
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:266
 msgid "Audio CDs"
 msgstr "CD ήχου"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:272
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:283
 msgid "Play _audio CDs when inserted"
 msgstr "Αναπαραγωγή CD ήχου όταν εισαχθεί"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:277
-#: ../thunar-volman/tvm-preferences-dialog.c:383
-#: ../thunar-volman/tvm-preferences-dialog.c:425
-#: ../thunar-volman/tvm-preferences-dialog.c:499
-#: ../thunar-volman/tvm-preferences-dialog.c:541
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:290
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:415
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:466
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:553
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:601
 msgid "_Command:"
 msgstr "_Εντολή:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:287
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:304
 msgid "Video CDs/DVDs"
 msgstr "Βίντεο CD/DVD"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:304
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:321
 msgid "Play _video CDs and DVDs when inserted"
 msgstr "Αναπαραγωγή βίντεο CD και DVD όταν εισαχθούν"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:309
-#: ../thunar-volman/tvm-preferences-dialog.c:341
-#: ../thunar-volman/tvm-preferences-dialog.c:457
-#: ../thunar-volman/tvm-preferences-dialog.c:573
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:329
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:367
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:505
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:640
 msgid "C_ommand:"
 msgstr "Εντ_ολή:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:319
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:343
 msgid "Portable Music Players"
 msgstr "Φορητές συσκευές μουσικής"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:336
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:360
 msgid "Play _music files when connected"
 msgstr "Αναπαραγωγή _μουσικών αρχείων όταν συνδεθούν"
 
+#.
 #. Cameras
-#. 
-#: ../thunar-volman/tvm-preferences-dialog.c:351
+#.
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:379
 msgid "Cameras"
 msgstr "Φωτογραφικές μηχανές"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:361
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:390
 msgid "Digital Cameras"
 msgstr "Ψηφιακές φωτογραφικές μηχανές"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:378
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:407
 msgid "Import digital photographs when connected"
 msgstr "Εισαγωγή ψηφιακών φωτογραφιών όταν συνδεθούν "
 
+#.
 #. PDAs
-#. 
-#: ../thunar-volman/tvm-preferences-dialog.c:393
+#.
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:427
 msgid "PDAs"
 msgstr "PDA"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:403
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:441
 msgid "Palm™"
 msgstr "Palm™"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:420
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:458
 msgid "Sync _Palm™ devices when connected"
 msgstr "Συγχρονισμός συσκευών _Palm™ όταν συνδεθούν"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:435
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:480
 msgid "Pocket PCs"
 msgstr "Pocket PCs"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:452
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:497
 msgid "Sync Pocket P_C devices when connected"
 msgstr "Συγχρονισμός συσκευής Pocket PC όταν συνδεθεί"
 
+#.
 #. Printers
-#. 
-#: ../thunar-volman/tvm-preferences-dialog.c:467
-#: ../thunar-volman/tvm-preferences-dialog.c:477
+#.
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:517
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:528
 msgid "Printers"
 msgstr "Εκτυπωτές"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:494
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:545
 msgid "Automatically run a program when a _printer is connected"
 msgstr "Αυτόματη εκτέλεση προγράμματος όταν συνδεθεί ένας εκτυπωτής"
 
+#.
 #. Input Devices
-#. 
-#: ../thunar-volman/tvm-preferences-dialog.c:509
+#.
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:565
 msgid "Input Devices"
 msgstr "Συσκευές εισόδου"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:519
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:576
 msgid "Keyboards"
 msgstr "Πληκτρολόγια"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:536
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:593
 msgid "Automatically run a program when an USB _keyboard is connected"
 msgstr "Αυτόματη εκτέλεση ενός προγράμματος όταν συνδεθεί ένα πληκτρολόγιο USB"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:551
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:615
 msgid "Mice"
 msgstr "Ποντίκι"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:568
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:632
 msgid "Automatically run a program when an USB _mouse is connected"
 msgstr "Αυτόματη εκτέλεση ενός προγράμματος όταν συνδεθεί ένα _ποντίκι usb"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:583
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:654
 msgid "Tablet"
 msgstr "Πινακίδιο"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:600
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:671
 msgid "Automatically run a program when a _tablet is connected"
 msgstr "Αυτόματη εκτέλεση ενός προγράμματος όταν συνδεθεί ένα _πινακίδιο"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:605
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:679
 msgid "Com_mand:"
 msgstr "Εντ_ολή:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:690
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:755
 msgid "Failed to open the documentation browser"
 msgstr "Αποτυχία ανοίγματος του περιηγητή βοήθειας"
 
-#: ../thunar-volman/tvm-run.c:133 ../thunar-volman/tvm-run.c:144
-msgid "Choose Disc Type"
-msgstr "Επιλογή τύπου δίσκου"
+#~ msgid "Failed to open display"
+#~ msgstr "Απέτυχε να ανοίξει η οθόνη"
 
-#: ../thunar-volman/tvm-run.c:134 ../thunar-volman/tvm-run.c:145
-msgid "You have inserted a blank disc."
-msgstr "Έχετε εισάγει ένα κενό δίσκο."
+#~ msgid "The Thunar development team. All rights reserved."
+#~ msgstr ""
+#~ "Η ομάδα ανάπτυξης του Thunar. Με την επιφύλαξη παντός νομίμου δικαιώματος."
 
-#: ../thunar-volman/tvm-run.c:135 ../thunar-volman/tvm-run.c:146
-msgid "What would you like to do?"
-msgstr "Τι θέλετε να γίνει;"
+#~ msgid "Written by Benedikt Meurer <benny at xfce.org>."
+#~ msgstr "Γράφτηκε από τον Benedikt Meurer <benny at xfce.org>."
 
-#: ../thunar-volman/tvm-run.c:137
-msgid "Make _DVD"
-msgstr "Δημιουργία _dvd"
+#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
+#~ msgstr "Το καθορισμένο UDI \"%s\" δεν είναι έγκυρο UDI συσκευής HAL"
 
-#: ../thunar-volman/tvm-run.c:148
-msgid "Make _Data CD"
-msgstr "Δημιουργία cd _δεδομένων"
+#~ msgid "Encrypted volume"
+#~ msgstr "Κρυπτογραφημένες μονάδες"
 
-#: ../thunar-volman/tvm-run.c:149
-msgid "Make _Audio CD"
-msgstr "Δημιουργία cd _ήχου"
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Προσάρτηση κρυπτογραφημένης "
+#~ "μονάδας...</span>"
+
+#~ msgid "Setting up the crypto layer..."
+#~ msgstr "Ρύθμιση του επιπέδου κρυπτογράφησης..."
+
+#~ msgid "You are not privileged to setup the crypto layer"
+#~ msgstr "Δεν έχετε τα δικαιώματα να ρυθμίσετε το επίπεδο κρυπτογράφησης"
+
+#~ msgid "Wrong password"
+#~ msgstr "Λανθασμένο συνθηματικό"
+
+#~ msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Λανθασμένο συνθηματικό.</span>"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Αυτή η μονάδα είναι κρυπτογραφημένη."
+#~ "</span>"
+
+#~ msgid "Please enter your password to decrypt and mount the volume."
+#~ msgstr ""
+#~ "Παρακαλώ εισάγετε το συνθηματικό για την αποκρυπτογράφηση και προσάρτηση "
+#~ "της μονάδας."
+
+#~ msgid "_Mount"
+#~ msgstr "_Προσάρτηση"
+
+#~ msgid "Failed to setup the encrypted volume"
+#~ msgstr "Αποτυχία ρύθμισης της κρυπτογραφημένης μονάδας"
+
+#~ msgid "Choose Disc Type"
+#~ msgstr "Επιλογή τύπου δίσκου"
+
+#~ msgid "Make _DVD"
+#~ msgstr "Δημιουργία _dvd"
 
-#: ../thunar-volman-settings.desktop.in.in.h:3
-msgid "Removable Media"
-msgstr "Αφαιρούμενα μέσα"
+#~ msgid "Removable Media"
+#~ msgstr "Αφαιρούμενα μέσα"
diff --git a/po/en_GB.po b/po/en_GB.po
index 173b229..429b276 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -9,104 +9,98 @@ msgid ""
 msgstr ""
 "Project-Id-Version: thunar-volman 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-30 02:26-0700\n"
+"POT-Creation-Date: 2010-07-25 20:06+0200\n"
 "PO-Revision-Date: 2009-08-18 11:54+1000\n"
 "Last-Translator: Jeff Bailes <thepizzaking at gmail.com>\n"
 "Language-Team: English/GB\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../thunar-volman/main.c:50
-msgid "The HAL device UDI of the newly added device"
+#: ../thunar-volman/main.c:59
+#, fuzzy
+msgid "The syfs path of the newly added device"
 msgstr "The HAL device UDI of the newly added device"
 
-#: ../thunar-volman/main.c:51 ../thunar-volman/tvm-preferences-dialog.c:120
-#: ../thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman/main.c:60
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:104
 msgid "Configure management of removable drives and media"
 msgstr "Configure management of removable drives and media"
 
-#: ../thunar-volman/main.c:52
+#: ../thunar-volman/main.c:61
 msgid "Print version information and exit"
 msgstr "Print version information and exit"
 
 #. setup application name
-#: ../thunar-volman/main.c:69
+#: ../thunar-volman/main.c:93
 msgid "Thunar Volume Manager"
 msgstr "Thunar Volume Manager"
 
-#: ../thunar-volman/main.c:90
-msgid "Failed to open display"
-msgstr "Failed to open display"
-
-#: ../thunar-volman/main.c:106
-msgid "The Thunar development team. All rights reserved."
-msgstr "The Thunar development team. All rights reserved."
-
-#: ../thunar-volman/main.c:107
-msgid "Written by Benedikt Meurer <benny at xfce.org>."
-msgstr "Written by Benedikt Meurer <benny at xfce.org>."
+#: ../thunar-volman/main.c:133
+msgid "All rights reserved."
+msgstr ""
 
-#: ../thunar-volman/main.c:108
+#: ../thunar-volman/main.c:134
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Please report bugs to <%s>."
 
-#. TRANSLATORS: A HAL device UDI must match certain conditions to be valid (to be exact, it must be a valid D-Bus object path)
-#: ../thunar-volman/main.c:133
+#: ../thunar-volman/main.c:188
 #, c-format
-msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
-msgstr "The specified UDI \"%s\" is not a valid HAL device UDI"
+msgid "There is no device with the sysfs path \"%s\""
+msgstr ""
 
-#. TRANSLATORS: thunar-volman wasn't invoked with either --device-added or --configure.
-#: ../thunar-volman/main.c:144
-#, c-format
-msgid "Must specify the new HAL device UDI with --device-added"
+#: ../thunar-volman/main.c:200
+#, fuzzy, c-format
+msgid "Must specify the sysfs path of new devices with --device-added"
 msgstr "Must specify the new HAL device UDI with --device-added"
 
 #. ...so we need to prompt what to do
-#: ../thunar-volman/tvm-block-device.c:189
+#: ../thunar-volman/tvm-block-device.c:204
 msgid "Photos and Music"
 msgstr "Photos and Music"
 
-#: ../thunar-volman/tvm-block-device.c:190
-msgid "Photos were found on your portable music player."
+#: ../thunar-volman/tvm-block-device.c:205
+#, fuzzy
+msgid "Photos were found on your portable music player"
 msgstr "Photos were found on your portable music player."
 
-#: ../thunar-volman/tvm-block-device.c:191
+#: ../thunar-volman/tvm-block-device.c:206
 msgid "Would you like to import the photos or manage the music?"
 msgstr "Would you like to import the photos or manage the music?"
 
-#: ../thunar-volman/tvm-block-device.c:192
-#: ../thunar-volman/tvm-block-device.c:258
-#: ../thunar-volman/tvm-block-device.c:335
-#: ../thunar-volman/tvm-block-device.c:371
-#: ../thunar-volman/tvm-block-device.c:430
-#: ../thunar-volman/tvm-block-device.c:703
-#: ../thunar-volman/tvm-crypto-volume.c:448 ../thunar-volman/tvm-run.c:136
-#: ../thunar-volman/tvm-run.c:147
+#: ../thunar-volman/tvm-block-device.c:208
+#: ../thunar-volman/tvm-block-device.c:277
+#: ../thunar-volman/tvm-block-device.c:378
+#: ../thunar-volman/tvm-block-device.c:425
+#: ../thunar-volman/tvm-block-device.c:507
+#: ../thunar-volman/tvm-block-device.c:826 ../thunar-volman/tvm-run.c:196
+#: ../thunar-volman/tvm-run.c:207
 msgid "Ig_nore"
 msgstr "Ig_nore"
 
-#: ../thunar-volman/tvm-block-device.c:193
-#: ../thunar-volman/tvm-block-device.c:259
+#: ../thunar-volman/tvm-block-device.c:209
+#: ../thunar-volman/tvm-block-device.c:278
 msgid "Import _Photos"
 msgstr "Import _Photos"
 
-#: ../thunar-volman/tvm-block-device.c:194
+#: ../thunar-volman/tvm-block-device.c:210
 msgid "Manage _Music"
 msgstr "Manage _Music"
 
-#. ask the user whether to import photos
-#: ../thunar-volman/tvm-block-device.c:255
+#. ask the user to import photos
+#: ../thunar-volman/tvm-block-device.c:273
 msgid "Photo Import"
 msgstr "Photo Import"
 
-#: ../thunar-volman/tvm-block-device.c:256
-msgid "A photo card has been detected."
+#: ../thunar-volman/tvm-block-device.c:274
+#, fuzzy
+msgid "A photo card has been detected"
 msgstr "A photo card has been detected."
 
-#: ../thunar-volman/tvm-block-device.c:257
+#: ../thunar-volman/tvm-block-device.c:275
 msgid ""
 "There are photos on the card. Would you like to add these photos to your "
 "album?"
@@ -114,353 +108,518 @@ msgstr ""
 "There are photos on the card. Would you like to add these photos to your "
 "album?"
 
-#. prompt the user whether to execute this file
-#: ../thunar-volman/tvm-block-device.c:332
-#: ../thunar-volman/tvm-block-device.c:368
+#. prompt the user to execute the file
+#. prompt the user to execute this file
+#: ../thunar-volman/tvm-block-device.c:373
+#: ../thunar-volman/tvm-block-device.c:420
 #, c-format
 msgid "Would you like to allow \"%s\" to run?"
 msgstr "Would you like to allow \"%s\" to run?"
 
-#: ../thunar-volman/tvm-block-device.c:333
-#: ../thunar-volman/tvm-block-device.c:369
+#: ../thunar-volman/tvm-block-device.c:376
+#: ../thunar-volman/tvm-block-device.c:423
 msgid "Auto-Run Confirmation"
 msgstr "Auto-Run Confirmation"
 
-#: ../thunar-volman/tvm-block-device.c:334
-#: ../thunar-volman/tvm-block-device.c:370
+#: ../thunar-volman/tvm-block-device.c:377
+#: ../thunar-volman/tvm-block-device.c:424
 msgid "Auto-Run capability detected"
 msgstr "Auto-Run capability detected"
 
-#: ../thunar-volman/tvm-block-device.c:336
-#: ../thunar-volman/tvm-block-device.c:372
+#: ../thunar-volman/tvm-block-device.c:379
+#: ../thunar-volman/tvm-block-device.c:426
 msgid "_Allow Auto-Run"
 msgstr "_Allow Auto-Run"
 
 #. prompt the user whether to autoopen this file
-#: ../thunar-volman/tvm-block-device.c:427
+#: ../thunar-volman/tvm-block-device.c:502
 #, c-format
 msgid "Would you like to open \"%s\"?"
 msgstr "Would you like to open \"%s\"?"
 
-#: ../thunar-volman/tvm-block-device.c:428
+#: ../thunar-volman/tvm-block-device.c:505
 msgid "Auto-Open Confirmation"
 msgstr "Auto-Open Confirmation"
 
-#: ../thunar-volman/tvm-block-device.c:429
+#: ../thunar-volman/tvm-block-device.c:506
 msgid "Auto-Open capability detected"
 msgstr "Auto-Open capability detected"
 
-#: ../thunar-volman/tvm-block-device.c:431
+#: ../thunar-volman/tvm-block-device.c:508
 msgid "_Open"
 msgstr "_Open"
 
-#. ask what do with the mixed audio/data disc
-#: ../thunar-volman/tvm-block-device.c:700
-msgid "Audio / Data CD"
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "CD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "DVD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:618
+msgid "The CD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:619
+msgid "The DVD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:629
+msgid "Volume mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:632
+#, c-format
+msgid "The volume \"%s\" was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:637
+#, c-format
+msgid "The inserted volume was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:691
+#, c-format
+msgid "Unable to locate mount point"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:737
+#, c-format
+msgid "Unable to mount the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:746
+#, c-format
+msgid "Could not detect the volume corresponding to the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:821
+#, fuzzy
+msgid "Audio/Data CD"
 msgstr "Audio / Data CD"
 
-#: ../thunar-volman/tvm-block-device.c:701
-msgid "The CD in the drive contains both music and files."
+#: ../thunar-volman/tvm-block-device.c:822
+#, fuzzy
+msgid "The CD in the drive contains both music and files"
 msgstr "The CD in the drive contains both music and files."
 
-#: ../thunar-volman/tvm-block-device.c:702
+#: ../thunar-volman/tvm-block-device.c:824
 msgid "Would you like to listen to music or browse the files?"
 msgstr "Would you like to listen to music or browse the files?"
 
-#: ../thunar-volman/tvm-block-device.c:704
+#: ../thunar-volman/tvm-block-device.c:827
 msgid "_Browse Files"
 msgstr "_Browse Files"
 
-#: ../thunar-volman/tvm-block-device.c:705
+#: ../thunar-volman/tvm-block-device.c:828
 msgid "_Play CD"
 msgstr "_Play CD"
 
-#: ../thunar-volman/tvm-command-entry.c:233
-msgid "Select an Application"
-msgstr "Select an Application"
+#: ../thunar-volman/tvm-block-device.c:916
+#, c-format
+msgid "Unknown block device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:243
-msgid "All Files"
-msgstr "All Files"
+#: ../thunar-volman/tvm-device.c:139
+#, c-format
+msgid "Device type not supported"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:248
-msgid "Executable Files"
-msgstr "Executable Files"
+#: ../thunar-volman/tvm-input-device.c:74
+#, fuzzy
+msgid "input-keyboard"
+msgstr "Keyboards"
 
-#: ../thunar-volman/tvm-command-entry.c:263
-msgid "Perl Scripts"
-msgstr "Perl Scripts"
+#: ../thunar-volman/tvm-input-device.c:75
+#, fuzzy
+msgid "Keyboard detected"
+msgstr "Keyboards"
 
-#: ../thunar-volman/tvm-command-entry.c:269
-msgid "Python Scripts"
-msgstr "Python Scripts"
+#: ../thunar-volman/tvm-input-device.c:76
+#, fuzzy
+msgid "A keyboard was detected"
+msgstr "A photo card has been detected."
 
-#: ../thunar-volman/tvm-command-entry.c:275
-msgid "Ruby Scripts"
-msgstr "Ruby Scripts"
+#: ../thunar-volman/tvm-input-device.c:86
+#: ../thunar-volman/tvm-input-device.c:100
+msgid "input-tablet"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:281
-msgid "Shell Scripts"
-msgstr "Shell Scripts"
+#: ../thunar-volman/tvm-input-device.c:87
+#: ../thunar-volman/tvm-input-device.c:101
+#, fuzzy
+msgid "Tablet detected"
+msgstr "Auto-Run capability detected"
 
-#: ../thunar-volman/tvm-crypto-volume.c:286
-#: ../thunar-volman/tvm-crypto-volume.c:443
-msgid "Encrypted volume"
-msgstr "Encrypted volume"
+#: ../thunar-volman/tvm-input-device.c:88
+#: ../thunar-volman/tvm-input-device.c:102
+msgid "A graphics tablet was detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:297
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
+#: ../thunar-volman/tvm-input-device.c:110
+msgid "input-mouse"
+msgstr ""
+
+#: ../thunar-volman/tvm-input-device.c:111
+msgid "Mouse detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-input-device.c:112
+msgid "A mouse was detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-input-device.c:139
+#, c-format
+msgid "Unsupported input device type"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:173
+#, c-format
+msgid "Autoburning of blank CDs and DVDs is disabled"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
 
-#: ../thunar-volman/tvm-crypto-volume.c:302
-msgid "Setting up the crypto layer..."
-msgstr "Setting up the crypto layer..."
+#: ../thunar-volman/tvm-run.c:193
+msgid "Blank DVD inserted"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:194
+#, fuzzy
+msgid "You have inserted a blank DVD."
+msgstr "You have inserted a blank disc."
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) but got Permission denied.
-#: ../thunar-volman/tvm-crypto-volume.c:369
+#: ../thunar-volman/tvm-run.c:195 ../thunar-volman/tvm-run.c:206
+msgid "What would you like to do?"
+msgstr "What would you like to do?"
+
+#: ../thunar-volman/tvm-run.c:197
+msgid "Burn _DVD"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:204
+#, fuzzy
+msgid "Blank CD inserted"
+msgstr "Blank CDs and DVDs"
+
+#: ../thunar-volman/tvm-run.c:205
+#, fuzzy
+msgid "You have inserted a blank CD."
+msgstr "You have inserted a blank disc."
+
+#: ../thunar-volman/tvm-run.c:208
+#, fuzzy
+msgid "Burn _Data CD"
+msgstr "Make _Data CD"
+
+#: ../thunar-volman/tvm-run.c:209
+#, fuzzy
+msgid "Burn _Audio CD"
+msgstr "Make _Audio CD"
+
+#: ../thunar-volman/tvm-run.c:233
 #, c-format
-msgid "You are not privileged to setup the crypto layer"
-msgstr "You are not privileged to setup the crypto layer"
+msgid "The burn command may not be empty"
+msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) and typed the wrong password.
-#: ../thunar-volman/tvm-crypto-volume.c:374
+#: ../thunar-volman/tvm-run.c:272
 #, c-format
-msgid "Wrong password"
-msgstr "Wrong password"
+msgid "The CD player command is undefined"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:66
+msgid "Camera detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:445
-msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
+#: ../thunar-volman/tvm-usb-device.c:67
+#, fuzzy
+msgid "A photo camera was detected"
+msgstr "A photo card has been detected."
 
-#: ../thunar-volman/tvm-crypto-volume.c:446
-msgid "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
+#: ../thunar-volman/tvm-usb-device.c:77
+msgid "Printer detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:447
-msgid "Please enter your password to decrypt and mount the volume."
-msgstr "Please enter your password to decrypt and mount the volume."
+#: ../thunar-volman/tvm-usb-device.c:78
+msgid "A USB printer was detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:449
-msgid "_Mount"
-msgstr "_Mount"
+#: ../thunar-volman/tvm-usb-device.c:104
+#, c-format
+msgid "Unsupported USB device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:468
-msgid "Failed to setup the encrypted volume"
-msgstr "Failed to setup the encrypted volume"
+#. setup application name
+#: ../thunar-volman-settings/main.c:52
+#, fuzzy
+msgid "Thunar Volume Manager Settings"
+msgstr "Thunar Volume Manager"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:119
-#: ../thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:102
 msgid "Removable Drives and Media"
 msgstr "Removable Drives and Media"
 
+#: ../thunar-volman-settings/tvm-command-entry.c:240
+msgid "Select an Application"
+msgstr "Select an Application"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:250
+msgid "All Files"
+msgstr "All Files"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:255
+msgid "Executable Files"
+msgstr "Executable Files"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:270
+msgid "Perl Scripts"
+msgstr "Perl Scripts"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:276
+msgid "Python Scripts"
+msgstr "Python Scripts"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:282
+msgid "Ruby Scripts"
+msgstr "Ruby Scripts"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:288
+msgid "Shell Scripts"
+msgstr "Shell Scripts"
+
 #.
 #. Storage
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:143
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:130
 msgid "Storage"
 msgstr "Storage"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:153
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:141
 msgid "Removable Storage"
 msgstr "Removable Storage"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:170
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:158
 msgid "_Mount removable drives when hot-plugged"
 msgstr "_Mount removable drives when hot-plugged"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:175
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:166
 msgid "Mount removable media when _inserted"
 msgstr "Mount removable media when _inserted"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:180
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:174
 msgid "B_rowse removable media when inserted"
 msgstr "B_rowse removable media when inserted"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:185
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:182
 msgid "_Auto-run programs on new drives and media"
 msgstr "_Auto-run programs on new drives and media"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:190
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:189
 msgid "Auto-open files on new drives and media"
 msgstr "Auto-open files on new drives and media"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:199
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:201
 msgid "Blank CDs and DVDs"
 msgstr "Blank CDs and DVDs"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:216
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:218
 msgid "_Burn a CD or DVD when a blank disc is inserted"
 msgstr "_Burn a CD or DVD when a blank disc is inserted"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:224
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:229
 msgid "Command for _Data CDs:"
 msgstr "Command for _Data CDs:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:231
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:239
 msgid "Command for A_udio CDs:"
 msgstr "Command for A_udio CDs:"
 
 #.
 #. Multimedia
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:245
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:255
 msgid "Multimedia"
 msgstr "Multimedia"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:255
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:266
 msgid "Audio CDs"
 msgstr "Audio CDs"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:272
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:283
 msgid "Play _audio CDs when inserted"
 msgstr "Play _audio CDs when inserted"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:277
-#: ../thunar-volman/tvm-preferences-dialog.c:383
-#: ../thunar-volman/tvm-preferences-dialog.c:425
-#: ../thunar-volman/tvm-preferences-dialog.c:499
-#: ../thunar-volman/tvm-preferences-dialog.c:541
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:290
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:415
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:466
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:553
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:601
 msgid "_Command:"
 msgstr "_Command:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:287
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:304
 msgid "Video CDs/DVDs"
 msgstr "Video CDs/DVDs"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:304
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:321
 msgid "Play _video CDs and DVDs when inserted"
 msgstr "Play _video CDs and DVDs when inserted"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:309
-#: ../thunar-volman/tvm-preferences-dialog.c:341
-#: ../thunar-volman/tvm-preferences-dialog.c:457
-#: ../thunar-volman/tvm-preferences-dialog.c:573
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:329
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:367
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:505
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:640
 msgid "C_ommand:"
 msgstr "C_ommand:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:319
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:343
 msgid "Portable Music Players"
 msgstr "Portable Music Players"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:336
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:360
 msgid "Play _music files when connected"
 msgstr "Play _music files when connected"
 
 #.
 #. Cameras
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:351
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:379
 msgid "Cameras"
 msgstr "Cameras"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:361
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:390
 msgid "Digital Cameras"
 msgstr "Digital Cameras"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:378
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:407
 msgid "Import digital photographs when connected"
 msgstr "Import digital photographs when connected"
 
 #.
 #. PDAs
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:393
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:427
 msgid "PDAs"
 msgstr "PDAs"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:403
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:441
 msgid "Palm™"
 msgstr "Palm™"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:420
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:458
 msgid "Sync _Palm™ devices when connected"
 msgstr "Sync _Palm™ devices when connected"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:435
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:480
 msgid "Pocket PCs"
 msgstr "Pocket PCs"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:452
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:497
 msgid "Sync Pocket P_C devices when connected"
 msgstr "Sync Pocket P_C devices when connected"
 
 #.
 #. Printers
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:467
-#: ../thunar-volman/tvm-preferences-dialog.c:477
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:517
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:528
 msgid "Printers"
 msgstr "Printers"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:494
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:545
 msgid "Automatically run a program when a _printer is connected"
 msgstr "Automatically run a program when a _printer is connected"
 
 #.
 #. Input Devices
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:509
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:565
 msgid "Input Devices"
 msgstr "Input Devices"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:519
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:576
 msgid "Keyboards"
 msgstr "Keyboards"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:536
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:593
 msgid "Automatically run a program when an USB _keyboard is connected"
 msgstr "Automatically run a program when an USB _keyboard is connected"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:551
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:615
 msgid "Mice"
 msgstr "Mice"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:568
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:632
 msgid "Automatically run a program when an USB _mouse is connected"
 msgstr "Automatically run a program when an USB _mouse is connected"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:583
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:654
 msgid "Tablet"
 msgstr "Tablet"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:600
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:671
 msgid "Automatically run a program when a _tablet is connected"
 msgstr "Automatically run a program when a _tablet is connected"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:605
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:679
 msgid "Com_mand:"
 msgstr "Com_mand:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:690
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:755
 msgid "Failed to open the documentation browser"
 msgstr "Failed to open the documentation browser"
 
-#: ../thunar-volman/tvm-run.c:133 ../thunar-volman/tvm-run.c:144
-msgid "Choose Disc Type"
-msgstr "Choose Disc Type"
+#~ msgid "Failed to open display"
+#~ msgstr "Failed to open display"
 
-#: ../thunar-volman/tvm-run.c:134 ../thunar-volman/tvm-run.c:145
-msgid "You have inserted a blank disc."
-msgstr "You have inserted a blank disc."
+#~ msgid "The Thunar development team. All rights reserved."
+#~ msgstr "The Thunar development team. All rights reserved."
 
-#: ../thunar-volman/tvm-run.c:135 ../thunar-volman/tvm-run.c:146
-msgid "What would you like to do?"
-msgstr "What would you like to do?"
+#~ msgid "Written by Benedikt Meurer <benny at xfce.org>."
+#~ msgstr "Written by Benedikt Meurer <benny at xfce.org>."
 
-#: ../thunar-volman/tvm-run.c:137
-msgid "Make _DVD"
-msgstr "Make _DVD"
+#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
+#~ msgstr "The specified UDI \"%s\" is not a valid HAL device UDI"
 
-#: ../thunar-volman/tvm-run.c:148
-msgid "Make _Data CD"
-msgstr "Make _Data CD"
+#~ msgid "Encrypted volume"
+#~ msgstr "Encrypted volume"
 
-#: ../thunar-volman/tvm-run.c:149
-msgid "Make _Audio CD"
-msgstr "Make _Audio CD"
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
+
+#~ msgid "Setting up the crypto layer..."
+#~ msgstr "Setting up the crypto layer..."
+
+#~ msgid "You are not privileged to setup the crypto layer"
+#~ msgstr "You are not privileged to setup the crypto layer"
+
+#~ msgid "Wrong password"
+#~ msgstr "Wrong password"
+
+#~ msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
+#~ msgstr "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
+
+#~ msgid "Please enter your password to decrypt and mount the volume."
+#~ msgstr "Please enter your password to decrypt and mount the volume."
+
+#~ msgid "_Mount"
+#~ msgstr "_Mount"
+
+#~ msgid "Failed to setup the encrypted volume"
+#~ msgstr "Failed to setup the encrypted volume"
+
+#~ msgid "Choose Disc Type"
+#~ msgstr "Choose Disc Type"
+
+#~ msgid "Make _DVD"
+#~ msgstr "Make _DVD"
 
-#: ../thunar-volman-settings.desktop.in.in.h:3
-msgid "Removable Media"
-msgstr "Removable Media"
+#~ msgid "Removable Media"
+#~ msgstr "Removable Media"
diff --git a/po/es.po b/po/es.po
index 2b37d92..a290583 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,458 +7,617 @@ msgid ""
 msgstr ""
 "Project-Id-Version: thunar-volman 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-30 02:26-0700\n"
+"POT-Creation-Date: 2010-07-25 20:06+0200\n"
 "PO-Revision-Date: 2008-11-02 12:45+0100\n"
 "Last-Translator: Abel Martín <abel.martin.ruiz at gmail.com>\n"
 "Language-Team: Spanish <xfce-i18n at xfce.org>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../thunar-volman/main.c:50
-msgid "The HAL device UDI of the newly added device"
+#: ../thunar-volman/main.c:59
+#, fuzzy
+msgid "The syfs path of the newly added device"
 msgstr "El UDI de dispositivo HAL del nuevo dispositivo añadido"
 
-#: ../thunar-volman/main.c:51
-#: ../thunar-volman/tvm-preferences-dialog.c:120
-#: ../thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman/main.c:60
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:104
 msgid "Configure management of removable drives and media"
 msgstr "Configurar la gestión de dispositivos y soportes extraíbles"
 
-#: ../thunar-volman/main.c:52
+#: ../thunar-volman/main.c:61
 msgid "Print version information and exit"
 msgstr "Mostrar la información de versión y salir"
 
 #. setup application name
-#: ../thunar-volman/main.c:69
+#: ../thunar-volman/main.c:93
 msgid "Thunar Volume Manager"
 msgstr "Gestor de volúmenes de Thunar"
 
-#: ../thunar-volman/main.c:90
-msgid "Failed to open display"
-msgstr "Fallo al abrir display"
-
-#: ../thunar-volman/main.c:106
-msgid "The Thunar development team. All rights reserved."
-msgstr "El equipo de desarrollo de Thunar. Todos los derechos reservados."
-
-#: ../thunar-volman/main.c:107
-msgid "Written by Benedikt Meurer <benny at xfce.org>."
-msgstr "Escrito por Benedikt Meurer <benny at xfce.org>."
+#: ../thunar-volman/main.c:133
+msgid "All rights reserved."
+msgstr ""
 
-#: ../thunar-volman/main.c:108
+#: ../thunar-volman/main.c:134
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Por favor, informe de fallos a <%s>."
 
-#. TRANSLATORS: A HAL device UDI must match certain conditions to be valid (to be exact, it must be a valid D-Bus object path)
-#: ../thunar-volman/main.c:133
+#: ../thunar-volman/main.c:188
 #, c-format
-msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
-msgstr "El UDI \"%s\" especificado no es un UDI de dispositivo HAL válido."
+msgid "There is no device with the sysfs path \"%s\""
+msgstr ""
 
-#. TRANSLATORS: thunar-volman wasn't invoked with either --device-added or --configure.
-#: ../thunar-volman/main.c:144
-#, c-format
-msgid "Must specify the new HAL device UDI with --device-added"
+#: ../thunar-volman/main.c:200
+#, fuzzy, c-format
+msgid "Must specify the sysfs path of new devices with --device-added"
 msgstr "Debe especificar el nuevo UDI de dispositivo HAL con --device-added"
 
 #. ...so we need to prompt what to do
-#: ../thunar-volman/tvm-block-device.c:189
+#: ../thunar-volman/tvm-block-device.c:204
 msgid "Photos and Music"
 msgstr "Fotos y música"
 
-#: ../thunar-volman/tvm-block-device.c:190
-msgid "Photos were found on your portable music player."
+#: ../thunar-volman/tvm-block-device.c:205
+#, fuzzy
+msgid "Photos were found on your portable music player"
 msgstr "Se encontraron fotos en su reproductor de música portátil"
 
-#: ../thunar-volman/tvm-block-device.c:191
+#: ../thunar-volman/tvm-block-device.c:206
 msgid "Would you like to import the photos or manage the music?"
 msgstr "¿Desea importar las fotos o gestionar la música?"
 
-#: ../thunar-volman/tvm-block-device.c:192
-#: ../thunar-volman/tvm-block-device.c:258
-#: ../thunar-volman/tvm-block-device.c:335
-#: ../thunar-volman/tvm-block-device.c:371
-#: ../thunar-volman/tvm-block-device.c:430
-#: ../thunar-volman/tvm-block-device.c:703
-#: ../thunar-volman/tvm-crypto-volume.c:448
-#: ../thunar-volman/tvm-run.c:136
-#: ../thunar-volman/tvm-run.c:147
+#: ../thunar-volman/tvm-block-device.c:208
+#: ../thunar-volman/tvm-block-device.c:277
+#: ../thunar-volman/tvm-block-device.c:378
+#: ../thunar-volman/tvm-block-device.c:425
+#: ../thunar-volman/tvm-block-device.c:507
+#: ../thunar-volman/tvm-block-device.c:826 ../thunar-volman/tvm-run.c:196
+#: ../thunar-volman/tvm-run.c:207
 msgid "Ig_nore"
 msgstr "Ig_norar"
 
-#: ../thunar-volman/tvm-block-device.c:193
-#: ../thunar-volman/tvm-block-device.c:259
+#: ../thunar-volman/tvm-block-device.c:209
+#: ../thunar-volman/tvm-block-device.c:278
 msgid "Import _Photos"
 msgstr "Importar las _fotos"
 
-#: ../thunar-volman/tvm-block-device.c:194
+#: ../thunar-volman/tvm-block-device.c:210
 msgid "Manage _Music"
 msgstr "Gestionar la _música"
 
-#. ask the user whether to import photos
-#: ../thunar-volman/tvm-block-device.c:255
+#. ask the user to import photos
+#: ../thunar-volman/tvm-block-device.c:273
 msgid "Photo Import"
 msgstr "Importación de fotos"
 
-#: ../thunar-volman/tvm-block-device.c:256
-msgid "A photo card has been detected."
+#: ../thunar-volman/tvm-block-device.c:274
+#, fuzzy
+msgid "A photo card has been detected"
 msgstr "Se ha detectado una tarjeta con fotos."
 
-#: ../thunar-volman/tvm-block-device.c:257
-msgid "There are photos on the card. Would you like to add these photos to your album?"
+#: ../thunar-volman/tvm-block-device.c:275
+msgid ""
+"There are photos on the card. Would you like to add these photos to your "
+"album?"
 msgstr "Hay fotos en la tarjeta. ¿Desea añadir estas fotos a su álbum?"
 
-#. prompt the user whether to execute this file
-#: ../thunar-volman/tvm-block-device.c:332
-#: ../thunar-volman/tvm-block-device.c:368
+#. prompt the user to execute the file
+#. prompt the user to execute this file
+#: ../thunar-volman/tvm-block-device.c:373
+#: ../thunar-volman/tvm-block-device.c:420
 #, c-format
 msgid "Would you like to allow \"%s\" to run?"
 msgstr "¿Desea permitir que se ejecute \"%s\"?"
 
-#: ../thunar-volman/tvm-block-device.c:333
-#: ../thunar-volman/tvm-block-device.c:369
+#: ../thunar-volman/tvm-block-device.c:376
+#: ../thunar-volman/tvm-block-device.c:423
 msgid "Auto-Run Confirmation"
 msgstr "Confirmación de auto-ejecución"
 
-#: ../thunar-volman/tvm-block-device.c:334
-#: ../thunar-volman/tvm-block-device.c:370
+#: ../thunar-volman/tvm-block-device.c:377
+#: ../thunar-volman/tvm-block-device.c:424
 msgid "Auto-Run capability detected"
 msgstr "Capacidad de auto-ejecución detectada"
 
-#: ../thunar-volman/tvm-block-device.c:336
-#: ../thunar-volman/tvm-block-device.c:372
+#: ../thunar-volman/tvm-block-device.c:379
+#: ../thunar-volman/tvm-block-device.c:426
 msgid "_Allow Auto-Run"
 msgstr "Permitir la _auto-ejecución"
 
 #. prompt the user whether to autoopen this file
-#: ../thunar-volman/tvm-block-device.c:427
+#: ../thunar-volman/tvm-block-device.c:502
 #, c-format
 msgid "Would you like to open \"%s\"?"
 msgstr "¿Desea abrir \"%s\"?"
 
-#: ../thunar-volman/tvm-block-device.c:428
+#: ../thunar-volman/tvm-block-device.c:505
 msgid "Auto-Open Confirmation"
 msgstr "Confirmación de auto-apertura"
 
-#: ../thunar-volman/tvm-block-device.c:429
+#: ../thunar-volman/tvm-block-device.c:506
 msgid "Auto-Open capability detected"
 msgstr "Capacidad de auto-apertura detectada"
 
-#: ../thunar-volman/tvm-block-device.c:431
+#: ../thunar-volman/tvm-block-device.c:508
 msgid "_Open"
 msgstr "_Abrir"
 
-#. ask what do with the mixed audio/data disc
-#: ../thunar-volman/tvm-block-device.c:700
-msgid "Audio / Data CD"
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "CD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "DVD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:618
+msgid "The CD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:619
+msgid "The DVD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:629
+msgid "Volume mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:632
+#, c-format
+msgid "The volume \"%s\" was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:637
+#, c-format
+msgid "The inserted volume was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:691
+#, c-format
+msgid "Unable to locate mount point"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:737
+#, c-format
+msgid "Unable to mount the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:746
+#, c-format
+msgid "Could not detect the volume corresponding to the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:821
+#, fuzzy
+msgid "Audio/Data CD"
 msgstr "CD de audio / datos"
 
-#: ../thunar-volman/tvm-block-device.c:701
-msgid "The CD in the drive contains both music and files."
+#: ../thunar-volman/tvm-block-device.c:822
+#, fuzzy
+msgid "The CD in the drive contains both music and files"
 msgstr "El CD dentro del dispositivo contiene música y archivos."
 
-#: ../thunar-volman/tvm-block-device.c:702
+#: ../thunar-volman/tvm-block-device.c:824
 msgid "Would you like to listen to music or browse the files?"
 msgstr "¿Desea escuchar música o ver los archivos?"
 
-#: ../thunar-volman/tvm-block-device.c:704
+#: ../thunar-volman/tvm-block-device.c:827
 msgid "_Browse Files"
 msgstr "_Examinar archivos"
 
-#: ../thunar-volman/tvm-block-device.c:705
+#: ../thunar-volman/tvm-block-device.c:828
 msgid "_Play CD"
 msgstr "_Reproducir CD"
 
-#: ../thunar-volman/tvm-command-entry.c:233
-msgid "Select an Application"
-msgstr "Seleccionar una aplicación"
+#: ../thunar-volman/tvm-block-device.c:916
+#, c-format
+msgid "Unknown block device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:243
-msgid "All Files"
-msgstr "Todos los archivos"
+#: ../thunar-volman/tvm-device.c:139
+#, c-format
+msgid "Device type not supported"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:248
-msgid "Executable Files"
-msgstr "Archivos ejecutables"
+#: ../thunar-volman/tvm-input-device.c:74
+#, fuzzy
+msgid "input-keyboard"
+msgstr "Teclados"
 
-#: ../thunar-volman/tvm-command-entry.c:263
-msgid "Perl Scripts"
-msgstr "Scripts de Perl"
+#: ../thunar-volman/tvm-input-device.c:75
+#, fuzzy
+msgid "Keyboard detected"
+msgstr "Teclados"
 
-#: ../thunar-volman/tvm-command-entry.c:269
-msgid "Python Scripts"
-msgstr "Scripts de Python"
+#: ../thunar-volman/tvm-input-device.c:76
+#, fuzzy
+msgid "A keyboard was detected"
+msgstr "Se ha detectado una tarjeta con fotos."
 
-#: ../thunar-volman/tvm-command-entry.c:275
-msgid "Ruby Scripts"
-msgstr "Scripts de Ruby"
+#: ../thunar-volman/tvm-input-device.c:86
+#: ../thunar-volman/tvm-input-device.c:100
+msgid "input-tablet"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:281
-msgid "Shell Scripts"
-msgstr "Scripts de shell"
+#: ../thunar-volman/tvm-input-device.c:87
+#: ../thunar-volman/tvm-input-device.c:101
+#, fuzzy
+msgid "Tablet detected"
+msgstr "Capacidad de auto-ejecución detectada"
+
+#: ../thunar-volman/tvm-input-device.c:88
+#: ../thunar-volman/tvm-input-device.c:102
+msgid "A graphics tablet was detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:286
-#: ../thunar-volman/tvm-crypto-volume.c:443
-msgid "Encrypted volume"
-msgstr "Volumen cifrado"
+#: ../thunar-volman/tvm-input-device.c:110
+msgid "input-mouse"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:297
-msgid "<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Montando volumen cifrado...</span>"
+#: ../thunar-volman/tvm-input-device.c:111
+msgid "Mouse detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:302
-msgid "Setting up the crypto layer..."
-msgstr "Configurando la capa de cifrado..."
+#: ../thunar-volman/tvm-input-device.c:112
+msgid "A mouse was detected"
+msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) but got Permission denied.
-#: ../thunar-volman/tvm-crypto-volume.c:369
+#: ../thunar-volman/tvm-input-device.c:139
 #, c-format
-msgid "You are not privileged to setup the crypto layer"
-msgstr "No tiene privilegios para configurar la capa de cifrado"
+msgid "Unsupported input device type"
+msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) and typed the wrong password.
-#: ../thunar-volman/tvm-crypto-volume.c:374
+#: ../thunar-volman/tvm-run.c:173
 #, c-format
-msgid "Wrong password"
-msgstr "Contraseña incorrecta"
+msgid "Autoburning of blank CDs and DVDs is disabled"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:445
-msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Contraseña incorrecta.</span>"
+#: ../thunar-volman/tvm-run.c:193
+msgid "Blank DVD inserted"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:446
-msgid "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Este volumen está cifrado.</span>"
+#: ../thunar-volman/tvm-run.c:194
+#, fuzzy
+msgid "You have inserted a blank DVD."
+msgstr "Ha insertado un disco virgen."
 
-#: ../thunar-volman/tvm-crypto-volume.c:447
-msgid "Please enter your password to decrypt and mount the volume."
-msgstr "Por favor, introduzca su contraseña para descifrar y montar el volumen."
+#: ../thunar-volman/tvm-run.c:195 ../thunar-volman/tvm-run.c:206
+msgid "What would you like to do?"
+msgstr "¿Qué desea hacer?"
 
-#: ../thunar-volman/tvm-crypto-volume.c:449
-msgid "_Mount"
-msgstr "_Montar"
+#: ../thunar-volman/tvm-run.c:197
+msgid "Burn _DVD"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:468
-msgid "Failed to setup the encrypted volume"
-msgstr "Fallo al configurar el volumen cifrado"
+#: ../thunar-volman/tvm-run.c:204
+#, fuzzy
+msgid "Blank CD inserted"
+msgstr "Borrar CDs y DVDs"
+
+#: ../thunar-volman/tvm-run.c:205
+#, fuzzy
+msgid "You have inserted a blank CD."
+msgstr "Ha insertado un disco virgen."
+
+#: ../thunar-volman/tvm-run.c:208
+#, fuzzy
+msgid "Burn _Data CD"
+msgstr "Crear un CD de _datos"
+
+#: ../thunar-volman/tvm-run.c:209
+#, fuzzy
+msgid "Burn _Audio CD"
+msgstr "Crearr un CD _audio"
+
+#: ../thunar-volman/tvm-run.c:233
+#, c-format
+msgid "The burn command may not be empty"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:272
+#, c-format
+msgid "The CD player command is undefined"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:66
+msgid "Camera detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:119
-#: ../thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman/tvm-usb-device.c:67
+#, fuzzy
+msgid "A photo camera was detected"
+msgstr "Se ha detectado una tarjeta con fotos."
+
+#: ../thunar-volman/tvm-usb-device.c:77
+msgid "Printer detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:78
+msgid "A USB printer was detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:104
+#, c-format
+msgid "Unsupported USB device type"
+msgstr ""
+
+#. setup application name
+#: ../thunar-volman-settings/main.c:52
+#, fuzzy
+msgid "Thunar Volume Manager Settings"
+msgstr "Gestor de volúmenes de Thunar"
+
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:102
 msgid "Removable Drives and Media"
 msgstr "Dispositivos y soportes extraíbles"
 
+#: ../thunar-volman-settings/tvm-command-entry.c:240
+msgid "Select an Application"
+msgstr "Seleccionar una aplicación"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:250
+msgid "All Files"
+msgstr "Todos los archivos"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:255
+msgid "Executable Files"
+msgstr "Archivos ejecutables"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:270
+msgid "Perl Scripts"
+msgstr "Scripts de Perl"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:276
+msgid "Python Scripts"
+msgstr "Scripts de Python"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:282
+msgid "Ruby Scripts"
+msgstr "Scripts de Ruby"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:288
+msgid "Shell Scripts"
+msgstr "Scripts de shell"
+
 #.
 #. Storage
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:143
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:130
 msgid "Storage"
 msgstr "Almacenamiento"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:153
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:141
 msgid "Removable Storage"
 msgstr "Almacenamiento extraíble"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:170
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:158
 msgid "_Mount removable drives when hot-plugged"
 msgstr "_Montar los dispositivos extraíbles al conectarse"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:175
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:166
 msgid "Mount removable media when _inserted"
 msgstr "Montar soportes extraíbles al ser _insertados"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:180
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:174
 msgid "B_rowse removable media when inserted"
 msgstr "E_xaminar soporte extraíble al ser insertado"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:185
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:182
 msgid "_Auto-run programs on new drives and media"
 msgstr "_Auto-ejecución de programas en nuevos soportes y unidades"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:190
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:189
 msgid "Auto-open files on new drives and media"
 msgstr "Auto-apertura de archivos en nuevos soportes y unidades"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:199
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:201
 msgid "Blank CDs and DVDs"
 msgstr "Borrar CDs y DVDs"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:216
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:218
 msgid "_Burn a CD or DVD when a blank disc is inserted"
 msgstr "_Grabar un CD o DVD cuando se inserta un disco virgen"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:224
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:229
 msgid "Command for _Data CDs:"
 msgstr "Comando para los CDs de _datos:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:231
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:239
 msgid "Command for A_udio CDs:"
 msgstr "Comando para los CDs de a_udio:"
 
 #.
 #. Multimedia
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:245
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:255
 msgid "Multimedia"
 msgstr "Multimedia"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:255
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:266
 msgid "Audio CDs"
 msgstr "CDs de audio"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:272
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:283
 msgid "Play _audio CDs when inserted"
 msgstr "Reproducir CDs de _audio al ser insertados"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:277
-#: ../thunar-volman/tvm-preferences-dialog.c:383
-#: ../thunar-volman/tvm-preferences-dialog.c:425
-#: ../thunar-volman/tvm-preferences-dialog.c:499
-#: ../thunar-volman/tvm-preferences-dialog.c:541
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:290
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:415
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:466
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:553
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:601
 msgid "_Command:"
 msgstr "_Comando:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:287
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:304
 msgid "Video CDs/DVDs"
 msgstr "CDs/DVDs de vídeo"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:304
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:321
 msgid "Play _video CDs and DVDs when inserted"
 msgstr "Reproducir CDs y DVDs de _vídeo al ser insertados"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:309
-#: ../thunar-volman/tvm-preferences-dialog.c:341
-#: ../thunar-volman/tvm-preferences-dialog.c:457
-#: ../thunar-volman/tvm-preferences-dialog.c:573
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:329
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:367
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:505
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:640
 msgid "C_ommand:"
 msgstr "C_omando:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:319
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:343
 msgid "Portable Music Players"
 msgstr "Reproductor de música portátil"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:336
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:360
 msgid "Play _music files when connected"
 msgstr "Reproducir archivos de _música al ser conectado"
 
 #.
 #. Cameras
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:351
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:379
 msgid "Cameras"
 msgstr "Cámaras"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:361
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:390
 msgid "Digital Cameras"
 msgstr "Cámaras digitales"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:378
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:407
 msgid "Import digital photographs when connected"
 msgstr "Importar fotografías digitales al ser conectada"
 
 #.
 #. PDAs
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:393
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:427
 msgid "PDAs"
 msgstr "PDAs"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:403
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:441
 msgid "Palm™"
 msgstr "Palm™"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:420
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:458
 msgid "Sync _Palm™ devices when connected"
 msgstr "Sincronizar dispositivos _Palm™ al ser conectados"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:435
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:480
 msgid "Pocket PCs"
 msgstr "Pocket PCs"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:452
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:497
 msgid "Sync Pocket P_C devices when connected"
 msgstr "Sincronizar dispositivos Pocket P_C al ser conectados"
 
 #.
 #. Printers
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:467
-#: ../thunar-volman/tvm-preferences-dialog.c:477
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:517
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:528
 msgid "Printers"
 msgstr "Impresoras"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:494
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:545
 msgid "Automatically run a program when a _printer is connected"
 msgstr "Ejecutar automáticamente un programa al conectar una im_presora"
 
 #.
 #. Input Devices
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:509
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:565
 msgid "Input Devices"
 msgstr "Dispositivos de entrada"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:519
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:576
 msgid "Keyboards"
 msgstr "Teclados"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:536
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:593
 msgid "Automatically run a program when an USB _keyboard is connected"
 msgstr "Ejecutar automáticamente un programa al conectar un te_clado USB"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:551
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:615
 msgid "Mice"
 msgstr "Ratones"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:568
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:632
 msgid "Automatically run a program when an USB _mouse is connected"
 msgstr "Ejecutar automáticamente un programa al conectar un _ratón USB"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:583
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:654
 msgid "Tablet"
 msgstr "Tableta gráfica"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:600
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:671
 msgid "Automatically run a program when a _tablet is connected"
-msgstr "Ejecutar automáticamente un programa cuando se conecta una _tableta gráfica"
+msgstr ""
+"Ejecutar automáticamente un programa cuando se conecta una _tableta gráfica"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:605
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:679
 msgid "Com_mand:"
 msgstr "Co_mando:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:690
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:755
 msgid "Failed to open the documentation browser"
 msgstr "Fallo al abrir el visor de documentación"
 
-#: ../thunar-volman/tvm-run.c:133
-#: ../thunar-volman/tvm-run.c:144
-msgid "Choose Disc Type"
-msgstr "Elegir el tipo de disco"
+#~ msgid "Failed to open display"
+#~ msgstr "Fallo al abrir display"
 
-#: ../thunar-volman/tvm-run.c:134
-#: ../thunar-volman/tvm-run.c:145
-msgid "You have inserted a blank disc."
-msgstr "Ha insertado un disco virgen."
+#~ msgid "The Thunar development team. All rights reserved."
+#~ msgstr "El equipo de desarrollo de Thunar. Todos los derechos reservados."
 
-#: ../thunar-volman/tvm-run.c:135
-#: ../thunar-volman/tvm-run.c:146
-msgid "What would you like to do?"
-msgstr "¿Qué desea hacer?"
+#~ msgid "Written by Benedikt Meurer <benny at xfce.org>."
+#~ msgstr "Escrito por Benedikt Meurer <benny at xfce.org>."
 
-#: ../thunar-volman/tvm-run.c:137
-msgid "Make _DVD"
-msgstr "Crear un _DVD"
+#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
+#~ msgstr "El UDI \"%s\" especificado no es un UDI de dispositivo HAL válido."
 
-#: ../thunar-volman/tvm-run.c:148
-msgid "Make _Data CD"
-msgstr "Crear un CD de _datos"
+#~ msgid "Encrypted volume"
+#~ msgstr "Volumen cifrado"
 
-#: ../thunar-volman/tvm-run.c:149
-msgid "Make _Audio CD"
-msgstr "Crearr un CD _audio"
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Montando volumen cifrado...</span>"
+
+#~ msgid "Setting up the crypto layer..."
+#~ msgstr "Configurando la capa de cifrado..."
+
+#~ msgid "You are not privileged to setup the crypto layer"
+#~ msgstr "No tiene privilegios para configurar la capa de cifrado"
+
+#~ msgid "Wrong password"
+#~ msgstr "Contraseña incorrecta"
+
+#~ msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
+#~ msgstr "<span weight=\"bold\" size=\"larger\">Contraseña incorrecta.</span>"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Este volumen está cifrado.</span>"
+
+#~ msgid "Please enter your password to decrypt and mount the volume."
+#~ msgstr ""
+#~ "Por favor, introduzca su contraseña para descifrar y montar el volumen."
+
+#~ msgid "_Mount"
+#~ msgstr "_Montar"
+
+#~ msgid "Failed to setup the encrypted volume"
+#~ msgstr "Fallo al configurar el volumen cifrado"
+
+#~ msgid "Choose Disc Type"
+#~ msgstr "Elegir el tipo de disco"
 
-#: ../thunar-volman-settings.desktop.in.in.h:3
-msgid "Removable Media"
-msgstr "Soportes extraíbles"
+#~ msgid "Make _DVD"
+#~ msgstr "Crear un _DVD"
 
+#~ msgid "Removable Media"
+#~ msgstr "Soportes extraíbles"
diff --git a/po/eu.po b/po/eu.po
index 7e36621..32d8476 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-30 02:26-0700\n"
+"POT-Creation-Date: 2010-07-25 20:06+0200\n"
 "PO-Revision-Date: 2008-11-09 15:38+0200\n"
 "Last-Translator: Piarres Beobide <pi at beobide.net>\n"
 "Language-Team: Euskara <debian-l10n-basque at lists.debian.org>\n"
@@ -19,446 +19,609 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 1.2.0\n"
 
-#: ../thunar-volman/main.c:50
-msgid "The HAL device UDI of the newly added device"
+#: ../thunar-volman/main.c:59
+#, fuzzy
+msgid "The syfs path of the newly added device"
 msgstr "Gehitu berri den gailuaren HAL gailu UDI-a"
 
-#: ../thunar-volman/main.c:51 ../thunar-volman/tvm-preferences-dialog.c:120
-#: ../thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman/main.c:60
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:104
 msgid "Configure management of removable drives and media"
 msgstr "Konfiguratu gailu eta euskarri aldagarrien kudeaketa"
 
-#: ../thunar-volman/main.c:52
+#: ../thunar-volman/main.c:61
 msgid "Print version information and exit"
 msgstr "Inprimatu bertsio argibideak eta irten"
 
 #. setup application name
-#: ../thunar-volman/main.c:69
+#: ../thunar-volman/main.c:93
 msgid "Thunar Volume Manager"
 msgstr "Thunar Bolumen Kudeatzailea"
 
-#: ../thunar-volman/main.c:90
-msgid "Failed to open display"
-msgstr "Huts panataila irekitzean"
-
-#: ../thunar-volman/main.c:106
-msgid "The Thunar development team. All rights reserved."
-msgstr "Thunar garapen taldea. Eskubide guztiak erreserbaturik"
-
-#: ../thunar-volman/main.c:107
-msgid "Written by Benedikt Meurer <benny at xfce.org>."
-msgstr "Benedikt Meurer <benny at xfce.org>-ek idatzia."
+#: ../thunar-volman/main.c:133
+msgid "All rights reserved."
+msgstr ""
 
-#: ../thunar-volman/main.c:108
+#: ../thunar-volman/main.c:134
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Programa erroreen berri eman hemen : <%s>"
 
-#. TRANSLATORS: A HAL device UDI must match certain conditions to be valid (to be exact, it must be a valid D-Bus object path)
-#: ../thunar-volman/main.c:133
+#: ../thunar-volman/main.c:188
 #, c-format
-msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
-msgstr "Ezarritako UDI \"%s\" ez da baliozko HAL gailu UDI bat"
+msgid "There is no device with the sysfs path \"%s\""
+msgstr ""
 
-#. TRANSLATORS: thunar-volman wasn't invoked with either --device-added or --configure.
-#: ../thunar-volman/main.c:144
-#, c-format
-msgid "Must specify the new HAL device UDI with --device-added"
+#: ../thunar-volman/main.c:200
+#, fuzzy, c-format
+msgid "Must specify the sysfs path of new devices with --device-added"
 msgstr "HAL gailu UDI berria --device-added erabiliaz ezarri behar da"
 
 #. ...so we need to prompt what to do
-#: ../thunar-volman/tvm-block-device.c:189
+#: ../thunar-volman/tvm-block-device.c:204
 msgid "Photos and Music"
 msgstr "Argazki eta musika"
 
-#: ../thunar-volman/tvm-block-device.c:190
-msgid "Photos were found on your portable music player."
+#: ../thunar-volman/tvm-block-device.c:205
+#, fuzzy
+msgid "Photos were found on your portable music player"
 msgstr "Argazkiak aurkitu dira zure musika erreproduktore eramanagarrian."
 
-#: ../thunar-volman/tvm-block-device.c:191
+#: ../thunar-volman/tvm-block-device.c:206
 msgid "Would you like to import the photos or manage the music?"
 msgstr "Argazkiak inportatu edo musika kudatu nahi duzu?"
 
-#: ../thunar-volman/tvm-block-device.c:192
-#: ../thunar-volman/tvm-block-device.c:258
-#: ../thunar-volman/tvm-block-device.c:335
-#: ../thunar-volman/tvm-block-device.c:371
-#: ../thunar-volman/tvm-block-device.c:430
-#: ../thunar-volman/tvm-block-device.c:703
-#: ../thunar-volman/tvm-crypto-volume.c:448 ../thunar-volman/tvm-run.c:136
-#: ../thunar-volman/tvm-run.c:147
+#: ../thunar-volman/tvm-block-device.c:208
+#: ../thunar-volman/tvm-block-device.c:277
+#: ../thunar-volman/tvm-block-device.c:378
+#: ../thunar-volman/tvm-block-device.c:425
+#: ../thunar-volman/tvm-block-device.c:507
+#: ../thunar-volman/tvm-block-device.c:826 ../thunar-volman/tvm-run.c:196
+#: ../thunar-volman/tvm-run.c:207
 msgid "Ig_nore"
 msgstr "Ba_ztertu"
 
-#: ../thunar-volman/tvm-block-device.c:193
-#: ../thunar-volman/tvm-block-device.c:259
+#: ../thunar-volman/tvm-block-device.c:209
+#: ../thunar-volman/tvm-block-device.c:278
 msgid "Import _Photos"
 msgstr "Inportatu _Argazkiak"
 
-#: ../thunar-volman/tvm-block-device.c:194
+#: ../thunar-volman/tvm-block-device.c:210
 msgid "Manage _Music"
 msgstr "Kudeatu _musika"
 
-#. ask the user whether to import photos
-#: ../thunar-volman/tvm-block-device.c:255
+#. ask the user to import photos
+#: ../thunar-volman/tvm-block-device.c:273
 msgid "Photo Import"
 msgstr "Argazkia inportatu"
 
-#: ../thunar-volman/tvm-block-device.c:256
-msgid "A photo card has been detected."
+#: ../thunar-volman/tvm-block-device.c:274
+#, fuzzy
+msgid "A photo card has been detected"
 msgstr "Argazki txartel bat atzeman da"
 
-#: ../thunar-volman/tvm-block-device.c:257
+#: ../thunar-volman/tvm-block-device.c:275
 msgid ""
 "There are photos on the card. Would you like to add these photos to your "
 "album?"
-msgstr "Argazkiak daude txartelean. Argazki horiek zure albumean gehitu nahi dituzu?"
+msgstr ""
+"Argazkiak daude txartelean. Argazki horiek zure albumean gehitu nahi dituzu?"
 
-#. prompt the user whether to execute this file
-#: ../thunar-volman/tvm-block-device.c:332
-#: ../thunar-volman/tvm-block-device.c:368
+#. prompt the user to execute the file
+#. prompt the user to execute this file
+#: ../thunar-volman/tvm-block-device.c:373
+#: ../thunar-volman/tvm-block-device.c:420
 #, c-format
 msgid "Would you like to allow \"%s\" to run?"
 msgstr "\"%s\" abiaraztea baimendu nahi al duzu?"
 
-#: ../thunar-volman/tvm-block-device.c:333
-#: ../thunar-volman/tvm-block-device.c:369
+#: ../thunar-volman/tvm-block-device.c:376
+#: ../thunar-volman/tvm-block-device.c:423
 msgid "Auto-Run Confirmation"
 msgstr "Auto-abiarazte berrespena"
 
-#: ../thunar-volman/tvm-block-device.c:334
-#: ../thunar-volman/tvm-block-device.c:370
+#: ../thunar-volman/tvm-block-device.c:377
+#: ../thunar-volman/tvm-block-device.c:424
 msgid "Auto-Run capability detected"
 msgstr "Auto-abiarazte gaitasuna atzeman da"
 
-#: ../thunar-volman/tvm-block-device.c:336
-#: ../thunar-volman/tvm-block-device.c:372
+#: ../thunar-volman/tvm-block-device.c:379
+#: ../thunar-volman/tvm-block-device.c:426
 msgid "_Allow Auto-Run"
 msgstr "_Auto-abiaraztea onartu"
 
 #. prompt the user whether to autoopen this file
-#: ../thunar-volman/tvm-block-device.c:427
+#: ../thunar-volman/tvm-block-device.c:502
 #, c-format
 msgid "Would you like to open \"%s\"?"
 msgstr "\"%s\" ireki nahi al duzu?"
 
-#: ../thunar-volman/tvm-block-device.c:428
+#: ../thunar-volman/tvm-block-device.c:505
 msgid "Auto-Open Confirmation"
 msgstr "Auto-Irekitze berrespena"
 
-#: ../thunar-volman/tvm-block-device.c:429
+#: ../thunar-volman/tvm-block-device.c:506
 msgid "Auto-Open capability detected"
 msgstr "Auto-Irekitze gaitasuna atzeman da"
 
-#: ../thunar-volman/tvm-block-device.c:431
+#: ../thunar-volman/tvm-block-device.c:508
 msgid "_Open"
 msgstr "_Ireki"
 
-#. ask what do with the mixed audio/data disc
-#: ../thunar-volman/tvm-block-device.c:700
-msgid "Audio / Data CD"
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "CD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "DVD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:618
+msgid "The CD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:619
+msgid "The DVD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:629
+msgid "Volume mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:632
+#, c-format
+msgid "The volume \"%s\" was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:637
+#, c-format
+msgid "The inserted volume was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:691
+#, c-format
+msgid "Unable to locate mount point"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:737
+#, c-format
+msgid "Unable to mount the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:746
+#, c-format
+msgid "Could not detect the volume corresponding to the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:821
+#, fuzzy
+msgid "Audio/Data CD"
 msgstr "Audio / Datu CD-a"
 
-#: ../thunar-volman/tvm-block-device.c:701
-msgid "The CD in the drive contains both music and files."
+#: ../thunar-volman/tvm-block-device.c:822
+#, fuzzy
+msgid "The CD in the drive contains both music and files"
 msgstr "Gailuan dagoen CD-ak musika eta fitxategiak ditu"
 
-#: ../thunar-volman/tvm-block-device.c:702
+#: ../thunar-volman/tvm-block-device.c:824
 msgid "Would you like to listen to music or browse the files?"
 msgstr "Musika entzun edo fitxategiak arakatu nahi dituzu?"
 
-#: ../thunar-volman/tvm-block-device.c:704
+#: ../thunar-volman/tvm-block-device.c:827
 msgid "_Browse Files"
 msgstr "_Arakatu fitxategiak"
 
-#: ../thunar-volman/tvm-block-device.c:705
+#: ../thunar-volman/tvm-block-device.c:828
 msgid "_Play CD"
 msgstr "CD-a Erre_produzitu"
 
-#: ../thunar-volman/tvm-command-entry.c:233
-msgid "Select an Application"
-msgstr "Hautatu aplikazio bat"
+#: ../thunar-volman/tvm-block-device.c:916
+#, c-format
+msgid "Unknown block device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:243
-msgid "All Files"
-msgstr "Fitxategi Guztiak"
+#: ../thunar-volman/tvm-device.c:139
+#, c-format
+msgid "Device type not supported"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:248
-msgid "Executable Files"
-msgstr "Fitxategi Abiarazgarriak"
+#: ../thunar-volman/tvm-input-device.c:74
+#, fuzzy
+msgid "input-keyboard"
+msgstr "Teklatuak"
 
-#: ../thunar-volman/tvm-command-entry.c:263
-msgid "Perl Scripts"
-msgstr "Perl Script-ak"
+#: ../thunar-volman/tvm-input-device.c:75
+#, fuzzy
+msgid "Keyboard detected"
+msgstr "Teklatuak"
 
-#: ../thunar-volman/tvm-command-entry.c:269
-msgid "Python Scripts"
-msgstr "Python Script-ak"
+#: ../thunar-volman/tvm-input-device.c:76
+#, fuzzy
+msgid "A keyboard was detected"
+msgstr "Argazki txartel bat atzeman da"
 
-#: ../thunar-volman/tvm-command-entry.c:275
-msgid "Ruby Scripts"
-msgstr "Ruby Script-ak"
+#: ../thunar-volman/tvm-input-device.c:86
+#: ../thunar-volman/tvm-input-device.c:100
+msgid "input-tablet"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:281
-msgid "Shell Scripts"
-msgstr "Shell Script-ak"
+#: ../thunar-volman/tvm-input-device.c:87
+#: ../thunar-volman/tvm-input-device.c:101
+#, fuzzy
+msgid "Tablet detected"
+msgstr "Auto-abiarazte gaitasuna atzeman da"
+
+#: ../thunar-volman/tvm-input-device.c:88
+#: ../thunar-volman/tvm-input-device.c:102
+msgid "A graphics tablet was detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:286
-#: ../thunar-volman/tvm-crypto-volume.c:443
-msgid "Encrypted volume"
-msgstr "Enkriptaturiko bolumena"
+#: ../thunar-volman/tvm-input-device.c:110
+msgid "input-mouse"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:297
-msgid "<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Enkriptaturiko bolumena muntatzen...</span>"
+#: ../thunar-volman/tvm-input-device.c:111
+msgid "Mouse detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:302
-msgid "Setting up the crypto layer..."
-msgstr "Kriptografia geruza konfiguratzen..."
+#: ../thunar-volman/tvm-input-device.c:112
+msgid "A mouse was detected"
+msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) but got Permission denied.
-#: ../thunar-volman/tvm-crypto-volume.c:369
+#: ../thunar-volman/tvm-input-device.c:139
 #, c-format
-msgid "You are not privileged to setup the crypto layer"
-msgstr "Ez duzu kriptografia geruza konfiguratzeko baimenik"
+msgid "Unsupported input device type"
+msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) and typed the wrong password.
-#: ../thunar-volman/tvm-crypto-volume.c:374
+#: ../thunar-volman/tvm-run.c:173
 #, c-format
-msgid "Wrong password"
-msgstr "Okerreko pasahitza"
+msgid "Autoburning of blank CDs and DVDs is disabled"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:445
-msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Okerreko pasahitza.</span>"
+#: ../thunar-volman/tvm-run.c:193
+msgid "Blank DVD inserted"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:446
-msgid "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Bolumen hau enkriptaturik dago.</span>"
+#: ../thunar-volman/tvm-run.c:194
+#, fuzzy
+msgid "You have inserted a blank DVD."
+msgstr "Disko zuri bat sartu duzu"
 
-#: ../thunar-volman/tvm-crypto-volume.c:447
-msgid "Please enter your password to decrypt and mount the volume."
-msgstr "Mesedez idatzi pasahitza bolumenda desenkriptatu eta muntatzeko."
+#: ../thunar-volman/tvm-run.c:195 ../thunar-volman/tvm-run.c:206
+msgid "What would you like to do?"
+msgstr "Zer egin nahi duzu?"
 
-#: ../thunar-volman/tvm-crypto-volume.c:449
-msgid "_Mount"
-msgstr "_Muntatu"
+#: ../thunar-volman/tvm-run.c:197
+msgid "Burn _DVD"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:468
-msgid "Failed to setup the encrypted volume"
-msgstr "Huts enkriptaturiko bolumena konfiguratzean"
+#: ../thunar-volman/tvm-run.c:204
+#, fuzzy
+msgid "Blank CD inserted"
+msgstr "CD eta DVD zuriak"
+
+#: ../thunar-volman/tvm-run.c:205
+#, fuzzy
+msgid "You have inserted a blank CD."
+msgstr "Disko zuri bat sartu duzu"
+
+#: ../thunar-volman/tvm-run.c:208
+#, fuzzy
+msgid "Burn _Data CD"
+msgstr "_Data CD-a egin"
+
+#: ../thunar-volman/tvm-run.c:209
+#, fuzzy
+msgid "Burn _Audio CD"
+msgstr "_Audio CD-a egin"
+
+#: ../thunar-volman/tvm-run.c:233
+#, c-format
+msgid "The burn command may not be empty"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:272
+#, c-format
+msgid "The CD player command is undefined"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:66
+msgid "Camera detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:119
-#: ../thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman/tvm-usb-device.c:67
+#, fuzzy
+msgid "A photo camera was detected"
+msgstr "Argazki txartel bat atzeman da"
+
+#: ../thunar-volman/tvm-usb-device.c:77
+msgid "Printer detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:78
+msgid "A USB printer was detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:104
+#, c-format
+msgid "Unsupported USB device type"
+msgstr ""
+
+#. setup application name
+#: ../thunar-volman-settings/main.c:52
+#, fuzzy
+msgid "Thunar Volume Manager Settings"
+msgstr "Thunar Bolumen Kudeatzailea"
+
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:102
 msgid "Removable Drives and Media"
 msgstr "Gailu eta Euskarri Aldagarriak"
 
+#: ../thunar-volman-settings/tvm-command-entry.c:240
+msgid "Select an Application"
+msgstr "Hautatu aplikazio bat"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:250
+msgid "All Files"
+msgstr "Fitxategi Guztiak"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:255
+msgid "Executable Files"
+msgstr "Fitxategi Abiarazgarriak"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:270
+msgid "Perl Scripts"
+msgstr "Perl Script-ak"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:276
+msgid "Python Scripts"
+msgstr "Python Script-ak"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:282
+msgid "Ruby Scripts"
+msgstr "Ruby Script-ak"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:288
+msgid "Shell Scripts"
+msgstr "Shell Script-ak"
+
 #.
 #. Storage
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:143
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:130
 msgid "Storage"
 msgstr "Biltegiratzea"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:153
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:141
 msgid "Removable Storage"
 msgstr "Biltegiratze Eramangarria"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:170
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:158
 msgid "_Mount removable drives when hot-plugged"
 msgstr "_Muntatu gailu eramangarriak beroan sartzean"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:175
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:166
 msgid "Mount removable media when _inserted"
 msgstr "Muntatu euskarri aldagarriak sartzerakoan"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:180
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:174
 msgid "B_rowse removable media when inserted"
 msgstr "A_rakatu euskarri eramangarriak sartzerakoan"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:185
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:182
 msgid "_Auto-run programs on new drives and media"
 msgstr "_Auto-abiarazi gailu eta euskarri berrietako programak"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:190
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:189
 msgid "Auto-open files on new drives and media"
 msgstr "Auto-ireki fitxategiak gailu eta euskarri berrietan"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:199
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:201
 msgid "Blank CDs and DVDs"
 msgstr "CD eta DVD zuriak"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:216
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:218
 msgid "_Burn a CD or DVD when a blank disc is inserted"
 msgstr "_Grabatu CD edo DVD bat disko zuri bat sartzean"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:224
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:229
 msgid "Command for _Data CDs:"
 msgstr "_Datu CD-entzat komandoa:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:231
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:239
 msgid "Command for A_udio CDs:"
 msgstr "A_udio CD-entzat komandoa:"
 
 #.
 #. Multimedia
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:245
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:255
 msgid "Multimedia"
 msgstr "Multimedia"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:255
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:266
 msgid "Audio CDs"
 msgstr "Audio CD-ak"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:272
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:283
 msgid "Play _audio CDs when inserted"
 msgstr "Erreproduzitu _Audio CD-ak sartzerakoan"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:277
-#: ../thunar-volman/tvm-preferences-dialog.c:383
-#: ../thunar-volman/tvm-preferences-dialog.c:425
-#: ../thunar-volman/tvm-preferences-dialog.c:499
-#: ../thunar-volman/tvm-preferences-dialog.c:541
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:290
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:415
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:466
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:553
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:601
 msgid "_Command:"
 msgstr "_Komandoa:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:287
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:304
 msgid "Video CDs/DVDs"
 msgstr "Bideo CD/DVD-ak"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:304
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:321
 msgid "Play _video CDs and DVDs when inserted"
 msgstr "Erreproduzitu _bideo CD eta DVD-ak sartzerakoan"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:309
-#: ../thunar-volman/tvm-preferences-dialog.c:341
-#: ../thunar-volman/tvm-preferences-dialog.c:457
-#: ../thunar-volman/tvm-preferences-dialog.c:573
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:329
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:367
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:505
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:640
 msgid "C_ommand:"
 msgstr "K_omandoa:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:319
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:343
 msgid "Portable Music Players"
 msgstr "Musika erreproduktore eramangarriak"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:336
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:360
 msgid "Play _music files when connected"
 msgstr "_Musika erreproduzitu sartzerakoan"
 
 #.
 #. Cameras
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:351
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:379
 msgid "Cameras"
 msgstr "Kamerak"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:361
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:390
 msgid "Digital Cameras"
 msgstr "Kamera Digitalak"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:378
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:407
 msgid "Import digital photographs when connected"
 msgstr "Inportatu argazki digitalak konektatzerakoan"
 
 #.
 #. PDAs
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:393
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:427
 msgid "PDAs"
 msgstr "PDA-k"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:403
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:441
 msgid "Palm™"
 msgstr "Palm™"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:420
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:458
 msgid "Sync _Palm™ devices when connected"
 msgstr "_Palm™ gailuak sinkronizatu konektatzerakoan"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:435
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:480
 msgid "Pocket PCs"
 msgstr "Pocket PC"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:452
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:497
 msgid "Sync Pocket P_C devices when connected"
 msgstr "Pocket P_C gailuak sinkronizatu konektatzerakoan"
 
 #.
 #. Printers
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:467
-#: ../thunar-volman/tvm-preferences-dialog.c:477
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:517
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:528
 msgid "Printers"
 msgstr "Inrpimagailuak"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:494
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:545
 msgid "Automatically run a program when a _printer is connected"
 msgstr "Automatikoki programa bat abiarazi in_primagailua konektatzerakoan"
 
 #.
 #. Input Devices
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:509
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:565
 msgid "Input Devices"
 msgstr "Sarrera gailuak"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:519
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:576
 msgid "Keyboards"
 msgstr "Teklatuak"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:536
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:593
 msgid "Automatically run a program when an USB _keyboard is connected"
 msgstr "Automatikoki programa bat abiarazi USB te_klatu bat konektatzerakoan"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:551
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:615
 msgid "Mice"
 msgstr "Sagua"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:568
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:632
 msgid "Automatically run a program when an USB _mouse is connected"
 msgstr "Automatikoki programa bat abiarazi USB _Sagu bat konektatzerakoan"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:583
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:654
 msgid "Tablet"
 msgstr "Tableta"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:600
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:671
 msgid "Automatically run a program when a _tablet is connected"
 msgstr "Automatikoki programa bat abiarazi _tableta bat konektatzerakoan"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:605
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:679
 msgid "Com_mand:"
 msgstr "Ko_mandoa:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:690
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:755
 msgid "Failed to open the documentation browser"
 msgstr "Huts dokumentazio nabigatzailea irekitzean"
 
-#: ../thunar-volman/tvm-run.c:133 ../thunar-volman/tvm-run.c:144
-msgid "Choose Disc Type"
-msgstr "Hautatu disko mota"
+#~ msgid "Failed to open display"
+#~ msgstr "Huts panataila irekitzean"
 
-#: ../thunar-volman/tvm-run.c:134 ../thunar-volman/tvm-run.c:145
-msgid "You have inserted a blank disc."
-msgstr "Disko zuri bat sartu duzu"
+#~ msgid "The Thunar development team. All rights reserved."
+#~ msgstr "Thunar garapen taldea. Eskubide guztiak erreserbaturik"
 
-#: ../thunar-volman/tvm-run.c:135 ../thunar-volman/tvm-run.c:146
-msgid "What would you like to do?"
-msgstr "Zer egin nahi duzu?"
+#~ msgid "Written by Benedikt Meurer <benny at xfce.org>."
+#~ msgstr "Benedikt Meurer <benny at xfce.org>-ek idatzia."
 
-#: ../thunar-volman/tvm-run.c:137
-msgid "Make _DVD"
-msgstr "DVD-a egin"
+#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
+#~ msgstr "Ezarritako UDI \"%s\" ez da baliozko HAL gailu UDI bat"
 
-#: ../thunar-volman/tvm-run.c:148
-msgid "Make _Data CD"
-msgstr "_Data CD-a egin"
+#~ msgid "Encrypted volume"
+#~ msgstr "Enkriptaturiko bolumena"
 
-#: ../thunar-volman/tvm-run.c:149
-msgid "Make _Audio CD"
-msgstr "_Audio CD-a egin"
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Enkriptaturiko bolumena muntatzen..."
+#~ "</span>"
+
+#~ msgid "Setting up the crypto layer..."
+#~ msgstr "Kriptografia geruza konfiguratzen..."
+
+#~ msgid "You are not privileged to setup the crypto layer"
+#~ msgstr "Ez duzu kriptografia geruza konfiguratzeko baimenik"
+
+#~ msgid "Wrong password"
+#~ msgstr "Okerreko pasahitza"
+
+#~ msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
+#~ msgstr "<span weight=\"bold\" size=\"larger\">Okerreko pasahitza.</span>"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Bolumen hau enkriptaturik dago.</"
+#~ "span>"
+
+#~ msgid "Please enter your password to decrypt and mount the volume."
+#~ msgstr "Mesedez idatzi pasahitza bolumenda desenkriptatu eta muntatzeko."
+
+#~ msgid "_Mount"
+#~ msgstr "_Muntatu"
+
+#~ msgid "Failed to setup the encrypted volume"
+#~ msgstr "Huts enkriptaturiko bolumena konfiguratzean"
+
+#~ msgid "Choose Disc Type"
+#~ msgstr "Hautatu disko mota"
+
+#~ msgid "Make _DVD"
+#~ msgstr "DVD-a egin"
 
-#: ../thunar-volman-settings.desktop.in.in.h:3
-msgid "Removable Media"
-msgstr "Euskarri aldagarriak"
+#~ msgid "Removable Media"
+#~ msgstr "Euskarri aldagarriak"
diff --git a/po/fi.po b/po/fi.po
index 03068c7..0ff4cd0 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,456 +7,614 @@ msgid ""
 msgstr ""
 "Project-Id-Version: thunar-volman 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-13 15:28+0300\n"
+"POT-Creation-Date: 2010-07-25 20:06+0200\n"
 "PO-Revision-Date: 2008-09-13 15:35+0300\n"
 "Last-Translator: Jari Rahkonen <jari.rahkonen at pp1.inet.fi>\n"
 "Language-Team: Finnish <fi at li.org>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../thunar-volman/main.c:50
-msgid "The HAL device UDI of the newly added device"
+#: ../thunar-volman/main.c:59
+#, fuzzy
+msgid "The syfs path of the newly added device"
 msgstr "Lisätyn laitteen HAL:in laite-UDI"
 
-#: ../thunar-volman/main.c:51 ../thunar-volman/tvm-preferences-dialog.c:120
-#: ../thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman/main.c:60
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:104
 msgid "Configure management of removable drives and media"
 msgstr "Muokkaa irrotettavien asemien ja taltioiden hallinta-asetuksia"
 
-#: ../thunar-volman/main.c:52
+#: ../thunar-volman/main.c:61
 msgid "Print version information and exit"
 msgstr "Tulosta versiotiedot ja poistu"
 
 #. setup application name
-#: ../thunar-volman/main.c:69
+#: ../thunar-volman/main.c:93
 msgid "Thunar Volume Manager"
 msgstr "Thunarin taltionhallinta"
 
-#: ../thunar-volman/main.c:90
-msgid "Failed to open display"
-msgstr "Näytön avaaminen epäonnistui"
-
-#: ../thunar-volman/main.c:106
-msgid "The Thunar development team. All rights reserved."
-msgstr "Thunarin kehitysryhmä. Kaikki oikeudet pidätetään."
-
-#: ../thunar-volman/main.c:107
-msgid "Written by Benedikt Meurer <benny at xfce.org>."
-msgstr "Kirjoittanut Benedikt Meurer <benny at xfce.org>."
+#: ../thunar-volman/main.c:133
+msgid "All rights reserved."
+msgstr ""
 
-#: ../thunar-volman/main.c:108
+#: ../thunar-volman/main.c:134
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Ilmoita vioista osoitteeseen <%s>"
 
-#. TRANSLATORS: A HAL device UDI must match certain conditions to be valid (to be exact, it must be a valid D-Bus object path)
-#: ../thunar-volman/main.c:133
+#: ../thunar-volman/main.c:188
 #, c-format
-msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
-msgstr "Määritetty UDI \"%s\" ei ole kelvollinen HAL:in laite-UDI"
+msgid "There is no device with the sysfs path \"%s\""
+msgstr ""
 
-#. TRANSLATORS: thunar-volman wasn't invoked with either --device-added or --configure.
-#: ../thunar-volman/main.c:144
-#, c-format
-msgid "Must specify the new HAL device UDI with --device-added"
+#: ../thunar-volman/main.c:200
+#, fuzzy, c-format
+msgid "Must specify the sysfs path of new devices with --device-added"
 msgstr "HAL:in laite-UDI on määritettävä valitsimella --device-added"
 
 #. ...so we need to prompt what to do
-#: ../thunar-volman/tvm-block-device.c:189
+#: ../thunar-volman/tvm-block-device.c:204
 msgid "Photos and Music"
 msgstr "Valokuvia ja Musiikkia"
 
-#: ../thunar-volman/tvm-block-device.c:190
-msgid "Photos were found on your portable music player."
+#: ../thunar-volman/tvm-block-device.c:205
+#, fuzzy
+msgid "Photos were found on your portable music player"
 msgstr "Musiikkisoittimeltasi löytyi valokuvia."
 
-#: ../thunar-volman/tvm-block-device.c:191
+#: ../thunar-volman/tvm-block-device.c:206
 msgid "Would you like to import the photos or manage the music?"
 msgstr "Noudetaanko valokuvia vai hallitaanko musiikkia?"
 
-#: ../thunar-volman/tvm-block-device.c:192
-#: ../thunar-volman/tvm-block-device.c:258
-#: ../thunar-volman/tvm-block-device.c:335
-#: ../thunar-volman/tvm-block-device.c:371
-#: ../thunar-volman/tvm-block-device.c:430
-#: ../thunar-volman/tvm-block-device.c:703
-#: ../thunar-volman/tvm-crypto-volume.c:448 ../thunar-volman/tvm-run.c:136
-#: ../thunar-volman/tvm-run.c:147
+#: ../thunar-volman/tvm-block-device.c:208
+#: ../thunar-volman/tvm-block-device.c:277
+#: ../thunar-volman/tvm-block-device.c:378
+#: ../thunar-volman/tvm-block-device.c:425
+#: ../thunar-volman/tvm-block-device.c:507
+#: ../thunar-volman/tvm-block-device.c:826 ../thunar-volman/tvm-run.c:196
+#: ../thunar-volman/tvm-run.c:207
 msgid "Ig_nore"
 msgstr "_Ohita"
 
-#: ../thunar-volman/tvm-block-device.c:193
-#: ../thunar-volman/tvm-block-device.c:259
+#: ../thunar-volman/tvm-block-device.c:209
+#: ../thunar-volman/tvm-block-device.c:278
 msgid "Import _Photos"
 msgstr "Tuo _Valokuvia"
 
-#: ../thunar-volman/tvm-block-device.c:194
+#: ../thunar-volman/tvm-block-device.c:210
 msgid "Manage _Music"
 msgstr "Hallitse _Musiikkia"
 
-#. ask the user whether to import photos
-#: ../thunar-volman/tvm-block-device.c:255
+#. ask the user to import photos
+#: ../thunar-volman/tvm-block-device.c:273
 msgid "Photo Import"
 msgstr "Valokuvien tuonti"
 
-#: ../thunar-volman/tvm-block-device.c:256
-msgid "A photo card has been detected."
+#: ../thunar-volman/tvm-block-device.c:274
+#, fuzzy
+msgid "A photo card has been detected"
 msgstr "Kameran muistikortti havaittu."
 
-#: ../thunar-volman/tvm-block-device.c:257
+#: ../thunar-volman/tvm-block-device.c:275
 msgid ""
 "There are photos on the card. Would you like to add these photos to your "
 "album?"
 msgstr "Kortilla on valokuvia. Lisätäänkö kuvat albumiisi?"
 
-#. prompt the user whether to execute this file
-#: ../thunar-volman/tvm-block-device.c:332
-#: ../thunar-volman/tvm-block-device.c:368
+#. prompt the user to execute the file
+#. prompt the user to execute this file
+#: ../thunar-volman/tvm-block-device.c:373
+#: ../thunar-volman/tvm-block-device.c:420
 #, c-format
 msgid "Would you like to allow \"%s\" to run?"
 msgstr "Sallitaanko sovelluksen \"%s\" suorittaminen?"
 
-#: ../thunar-volman/tvm-block-device.c:333
-#: ../thunar-volman/tvm-block-device.c:369
+#: ../thunar-volman/tvm-block-device.c:376
+#: ../thunar-volman/tvm-block-device.c:423
 msgid "Auto-Run Confirmation"
 msgstr "Automaattikäynnistyksen asetukset"
 
-#: ../thunar-volman/tvm-block-device.c:334
-#: ../thunar-volman/tvm-block-device.c:370
+#: ../thunar-volman/tvm-block-device.c:377
+#: ../thunar-volman/tvm-block-device.c:424
 msgid "Auto-Run capability detected"
 msgstr "Automaattikäynnistys voidaan suorittaa"
 
-#: ../thunar-volman/tvm-block-device.c:336
-#: ../thunar-volman/tvm-block-device.c:372
+#: ../thunar-volman/tvm-block-device.c:379
+#: ../thunar-volman/tvm-block-device.c:426
 msgid "_Allow Auto-Run"
 msgstr "_Salli automaattikäynnistys"
 
 #. prompt the user whether to autoopen this file
-#: ../thunar-volman/tvm-block-device.c:427
+#: ../thunar-volman/tvm-block-device.c:502
 #, c-format
 msgid "Would you like to open \"%s\"?"
 msgstr "Avataanko \"%s\"?"
 
-#: ../thunar-volman/tvm-block-device.c:428
+#: ../thunar-volman/tvm-block-device.c:505
 msgid "Auto-Open Confirmation"
 msgstr "Automaattiavauksen hyväksyminen"
 
-#: ../thunar-volman/tvm-block-device.c:429
+#: ../thunar-volman/tvm-block-device.c:506
 msgid "Auto-Open capability detected"
 msgstr "Automaattiavaus voidaan suorittaa"
 
-#: ../thunar-volman/tvm-block-device.c:431
+#: ../thunar-volman/tvm-block-device.c:508
 msgid "_Open"
 msgstr "_Avaa"
 
-#. ask what do with the mixed audio/data disc
-#: ../thunar-volman/tvm-block-device.c:700
-msgid "Audio / Data CD"
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "CD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "DVD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:618
+msgid "The CD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:619
+msgid "The DVD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:629
+msgid "Volume mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:632
+#, c-format
+msgid "The volume \"%s\" was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:637
+#, c-format
+msgid "The inserted volume was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:691
+#, c-format
+msgid "Unable to locate mount point"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:737
+#, c-format
+msgid "Unable to mount the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:746
+#, c-format
+msgid "Could not detect the volume corresponding to the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:821
+#, fuzzy
+msgid "Audio/Data CD"
 msgstr "Ääni / Data -CD"
 
-#: ../thunar-volman/tvm-block-device.c:701
-msgid "The CD in the drive contains both music and files."
+#: ../thunar-volman/tvm-block-device.c:822
+#, fuzzy
+msgid "The CD in the drive contains both music and files"
 msgstr "Asemassa olevalla CD:llä on sekä musiikkia että tiedostoja"
 
-#: ../thunar-volman/tvm-block-device.c:702
+#: ../thunar-volman/tvm-block-device.c:824
 msgid "Would you like to listen to music or browse the files?"
 msgstr "Haluatko kuunnella musiikkia vai selata tiedostoja?"
 
-#: ../thunar-volman/tvm-block-device.c:704
+#: ../thunar-volman/tvm-block-device.c:827
 msgid "_Browse Files"
 msgstr "_Selaa tiedostoja"
 
-#: ../thunar-volman/tvm-block-device.c:705
+#: ../thunar-volman/tvm-block-device.c:828
 msgid "_Play CD"
 msgstr "Soita _CD"
 
-#: ../thunar-volman/tvm-command-entry.c:233
-msgid "Select an Application"
-msgstr "Valitse sovellus"
+#: ../thunar-volman/tvm-block-device.c:916
+#, c-format
+msgid "Unknown block device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:243
-msgid "All Files"
-msgstr "Kaikki tiedostot"
+#: ../thunar-volman/tvm-device.c:139
+#, c-format
+msgid "Device type not supported"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:248
-msgid "Executable Files"
-msgstr "Käynnistystiedostot"
+#: ../thunar-volman/tvm-input-device.c:74
+#, fuzzy
+msgid "input-keyboard"
+msgstr "Näppäimistöt"
 
-#: ../thunar-volman/tvm-command-entry.c:263
-msgid "Perl Scripts"
-msgstr "Perl-komentotiedostot"
+#: ../thunar-volman/tvm-input-device.c:75
+#, fuzzy
+msgid "Keyboard detected"
+msgstr "Näppäimistöt"
 
-#: ../thunar-volman/tvm-command-entry.c:269
-msgid "Python Scripts"
-msgstr "Python-komentotiedostot"
+#: ../thunar-volman/tvm-input-device.c:76
+#, fuzzy
+msgid "A keyboard was detected"
+msgstr "Kameran muistikortti havaittu."
 
-#: ../thunar-volman/tvm-command-entry.c:275
-msgid "Ruby Scripts"
-msgstr "Ruby-komentotiedostot"
+#: ../thunar-volman/tvm-input-device.c:86
+#: ../thunar-volman/tvm-input-device.c:100
+msgid "input-tablet"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:281
-msgid "Shell Scripts"
-msgstr "Kehotteen komentosarjat"
+#: ../thunar-volman/tvm-input-device.c:87
+#: ../thunar-volman/tvm-input-device.c:101
+#, fuzzy
+msgid "Tablet detected"
+msgstr "Automaattikäynnistys voidaan suorittaa"
 
-#: ../thunar-volman/tvm-crypto-volume.c:286
-#: ../thunar-volman/tvm-crypto-volume.c:443
-msgid "Encrypted volume"
-msgstr "Salattu taltio"
+#: ../thunar-volman/tvm-input-device.c:88
+#: ../thunar-volman/tvm-input-device.c:102
+msgid "A graphics tablet was detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:297
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
+#: ../thunar-volman/tvm-input-device.c:110
+msgid "input-mouse"
+msgstr ""
+
+#: ../thunar-volman/tvm-input-device.c:111
+msgid "Mouse detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-input-device.c:112
+msgid "A mouse was detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-input-device.c:139
+#, c-format
+msgid "Unsupported input device type"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:173
+#, c-format
+msgid "Autoburning of blank CDs and DVDs is disabled"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Liitetään salattu taltio...</span>"
 
-#: ../thunar-volman/tvm-crypto-volume.c:302
-msgid "Setting up the crypto layer..."
-msgstr "Alustetaan salauskerros..."
+#: ../thunar-volman/tvm-run.c:193
+msgid "Blank DVD inserted"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:194
+#, fuzzy
+msgid "You have inserted a blank DVD."
+msgstr "Asetit tyhjän levyn asemaan."
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) but got Permission denied.
-#: ../thunar-volman/tvm-crypto-volume.c:369
+#: ../thunar-volman/tvm-run.c:195 ../thunar-volman/tvm-run.c:206
+msgid "What would you like to do?"
+msgstr "Mitä haluat tehdä?"
+
+#: ../thunar-volman/tvm-run.c:197
+msgid "Burn _DVD"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:204
+#, fuzzy
+msgid "Blank CD inserted"
+msgstr "Tyhjät CD:t ja DVD:t"
+
+#: ../thunar-volman/tvm-run.c:205
+#, fuzzy
+msgid "You have inserted a blank CD."
+msgstr "Asetit tyhjän levyn asemaan."
+
+#: ../thunar-volman/tvm-run.c:208
+#, fuzzy
+msgid "Burn _Data CD"
+msgstr "Luo _data-CD"
+
+#: ../thunar-volman/tvm-run.c:209
+#, fuzzy
+msgid "Burn _Audio CD"
+msgstr "Luo ää_ni-CD"
+
+#: ../thunar-volman/tvm-run.c:233
 #, c-format
-msgid "You are not privileged to setup the crypto layer"
-msgstr "Käyttöoikeutesi eivät riitä salauskerroksen alustamiseen"
+msgid "The burn command may not be empty"
+msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) and typed the wrong password.
-#: ../thunar-volman/tvm-crypto-volume.c:374
+#: ../thunar-volman/tvm-run.c:272
 #, c-format
-msgid "Wrong password"
-msgstr "Väärä salasana"
+msgid "The CD player command is undefined"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:66
+msgid "Camera detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:445
-msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Väärä salasana.</span>"
+#: ../thunar-volman/tvm-usb-device.c:67
+#, fuzzy
+msgid "A photo camera was detected"
+msgstr "Kameran muistikortti havaittu."
 
-#: ../thunar-volman/tvm-crypto-volume.c:446
-msgid "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Taltio on salattu.</span>"
+#: ../thunar-volman/tvm-usb-device.c:77
+msgid "Printer detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:447
-msgid "Please enter your password to decrypt and mount the volume."
-msgstr "Syötä salasanasi purkaaksesi salauksen ja liittääksesi taltion."
+#: ../thunar-volman/tvm-usb-device.c:78
+msgid "A USB printer was detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:449
-msgid "_Mount"
-msgstr "_Liitä"
+#: ../thunar-volman/tvm-usb-device.c:104
+#, c-format
+msgid "Unsupported USB device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:468
-msgid "Failed to setup the encrypted volume"
-msgstr "Salatun taltion määritys epäonnistui"
+#. setup application name
+#: ../thunar-volman-settings/main.c:52
+#, fuzzy
+msgid "Thunar Volume Manager Settings"
+msgstr "Thunarin taltionhallinta"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:119
-#: ../thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:102
 msgid "Removable Drives and Media"
 msgstr "Irrotettavat asemat ja taltiot"
 
+#: ../thunar-volman-settings/tvm-command-entry.c:240
+msgid "Select an Application"
+msgstr "Valitse sovellus"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:250
+msgid "All Files"
+msgstr "Kaikki tiedostot"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:255
+msgid "Executable Files"
+msgstr "Käynnistystiedostot"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:270
+msgid "Perl Scripts"
+msgstr "Perl-komentotiedostot"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:276
+msgid "Python Scripts"
+msgstr "Python-komentotiedostot"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:282
+msgid "Ruby Scripts"
+msgstr "Ruby-komentotiedostot"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:288
+msgid "Shell Scripts"
+msgstr "Kehotteen komentosarjat"
+
 #.
 #. Storage
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:143
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:130
 msgid "Storage"
 msgstr "Tietovälineet"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:153
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:141
 msgid "Removable Storage"
 msgstr "Irrotettavat tietovälineet"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:170
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:158
 msgid "_Mount removable drives when hot-plugged"
 msgstr "_Liitä irrotettavat asemat yhdistettäessä laitteistoon"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:175
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:166
 msgid "Mount removable media when _inserted"
 msgstr "Liitä poistettavat _taltiot, kun ne asetetaan asemaan"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:180
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:174
 msgid "B_rowse removable media when inserted"
 msgstr "_Selaa poistettavia taltioita, kun ne asetetaan asemaan"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:185
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:182
 msgid "_Auto-run programs on new drives and media"
 msgstr "Suorita _automaattikäynnistys liitetyille asemille ja taltioille"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:190
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:189
 msgid "Auto-open files on new drives and media"
 msgstr "Avaa automaattisesti tiedostoja liitetyiltä asemilta ja taltioilta"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:199
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:201
 msgid "Blank CDs and DVDs"
 msgstr "Tyhjät CD:t ja DVD:t"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:216
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:218
 msgid "_Burn a CD or DVD when a blank disc is inserted"
 msgstr "_Polta CD tai DVD, kun asemaan asetetaan tyhjä levy"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:224
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:229
 msgid "Command for _Data CDs:"
 msgstr "Komento _data-CD:ille"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:231
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:239
 msgid "Command for A_udio CDs:"
 msgstr "Komento ää_ni-CD:ille"
 
 #.
 #. Multimedia
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:245
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:255
 msgid "Multimedia"
 msgstr "Multimedia"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:255
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:266
 msgid "Audio CDs"
 msgstr "Ääni-CD:t"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:272
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:283
 msgid "Play _audio CDs when inserted"
 msgstr "Soita ää_ni-CD, kun se asetetaan asemaan"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:277
-#: ../thunar-volman/tvm-preferences-dialog.c:383
-#: ../thunar-volman/tvm-preferences-dialog.c:425
-#: ../thunar-volman/tvm-preferences-dialog.c:499
-#: ../thunar-volman/tvm-preferences-dialog.c:541
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:290
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:415
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:466
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:553
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:601
 msgid "_Command:"
 msgstr "_Komento:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:287
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:304
 msgid "Video CDs/DVDs"
 msgstr "Video-CD:t/DVD:t"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:304
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:321
 msgid "Play _video CDs and DVDs when inserted"
 msgstr "Soita _video-CD tai DVD, kun se asetetaan asemaan"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:309
-#: ../thunar-volman/tvm-preferences-dialog.c:341
-#: ../thunar-volman/tvm-preferences-dialog.c:457
-#: ../thunar-volman/tvm-preferences-dialog.c:573
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:329
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:367
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:505
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:640
 msgid "C_ommand:"
 msgstr "K_omento:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:319
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:343
 msgid "Portable Music Players"
 msgstr "Siirrettävät musiikkisoittimet"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:336
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:360
 msgid "Play _music files when connected"
 msgstr "Soita _musiikkitiedostoja, kun laite yhdistetään"
 
 #.
 #. Cameras
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:351
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:379
 msgid "Cameras"
 msgstr "Kamerat"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:361
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:390
 msgid "Digital Cameras"
 msgstr "Digitaalikamerat"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:378
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:407
 msgid "Import digital photographs when connected"
 msgstr "Tuo digikuvia, kun laite yhdistetään"
 
 #.
 #. PDAs
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:393
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:427
 msgid "PDAs"
 msgstr "Kämmentietokoneet"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:403
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:441
 msgid "Palm™"
 msgstr "Palm"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:420
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:458
 msgid "Sync _Palm™ devices when connected"
 msgstr "Synkronoi _Palm™, kun laite yhdistetään"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:435
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:480
 msgid "Pocket PCs"
 msgstr "Pocket PC:t"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:452
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:497
 msgid "Sync Pocket P_C devices when connected"
 msgstr "Synkronoi Pocket P_C, kun laite yhdistetään"
 
 #.
 #. Printers
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:467
-#: ../thunar-volman/tvm-preferences-dialog.c:477
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:517
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:528
 msgid "Printers"
 msgstr "Tulostimet"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:494
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:545
 msgid "Automatically run a program when a _printer is connected"
 msgstr "Suorita sovellus, kun _tulostin yhdistetään"
 
 #.
 #. Input Devices
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:509
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:565
 msgid "Input Devices"
 msgstr "Syöttölaitteet"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:519
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:576
 msgid "Keyboards"
 msgstr "Näppäimistöt"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:536
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:593
 msgid "Automatically run a program when an USB _keyboard is connected"
 msgstr "Suorita sovellus, kun USB-_näppäimistö yhdistetään"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:551
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:615
 msgid "Mice"
 msgstr "Hiiret"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:568
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:632
 msgid "Automatically run a program when an USB _mouse is connected"
 msgstr "Suorita sovellus, kun USB-_hiiri yhdistetään"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:583
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:654
 msgid "Tablet"
 msgstr "Piirtopöytä"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:600
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:671
 msgid "Automatically run a program when a _tablet is connected"
 msgstr "Suorita sovellus, kun pii_rtopöytä yhdistetään"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:605
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:679
 msgid "Com_mand:"
 msgstr "Ko_mento:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:690
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:755
 msgid "Failed to open the documentation browser"
 msgstr "Dokumentaatioselainta ei voi avata"
 
-#: ../thunar-volman/tvm-run.c:133 ../thunar-volman/tvm-run.c:144
-msgid "Choose Disc Type"
-msgstr "Valitse levyn tyyppi"
+#~ msgid "Failed to open display"
+#~ msgstr "Näytön avaaminen epäonnistui"
 
-#: ../thunar-volman/tvm-run.c:134 ../thunar-volman/tvm-run.c:145
-msgid "You have inserted a blank disc."
-msgstr "Asetit tyhjän levyn asemaan."
+#~ msgid "The Thunar development team. All rights reserved."
+#~ msgstr "Thunarin kehitysryhmä. Kaikki oikeudet pidätetään."
 
-#: ../thunar-volman/tvm-run.c:135 ../thunar-volman/tvm-run.c:146
-msgid "What would you like to do?"
-msgstr "Mitä haluat tehdä?"
+#~ msgid "Written by Benedikt Meurer <benny at xfce.org>."
+#~ msgstr "Kirjoittanut Benedikt Meurer <benny at xfce.org>."
 
-#: ../thunar-volman/tvm-run.c:137
-msgid "Make _DVD"
-msgstr "Luo _DVD"
+#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
+#~ msgstr "Määritetty UDI \"%s\" ei ole kelvollinen HAL:in laite-UDI"
 
-#: ../thunar-volman/tvm-run.c:148
-msgid "Make _Data CD"
-msgstr "Luo _data-CD"
+#~ msgid "Encrypted volume"
+#~ msgstr "Salattu taltio"
 
-#: ../thunar-volman/tvm-run.c:149
-msgid "Make _Audio CD"
-msgstr "Luo ää_ni-CD"
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Liitetään salattu taltio...</span>"
+
+#~ msgid "Setting up the crypto layer..."
+#~ msgstr "Alustetaan salauskerros..."
+
+#~ msgid "You are not privileged to setup the crypto layer"
+#~ msgstr "Käyttöoikeutesi eivät riitä salauskerroksen alustamiseen"
+
+#~ msgid "Wrong password"
+#~ msgstr "Väärä salasana"
+
+#~ msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
+#~ msgstr "<span weight=\"bold\" size=\"larger\">Väärä salasana.</span>"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
+#~ msgstr "<span weight=\"bold\" size=\"larger\">Taltio on salattu.</span>"
+
+#~ msgid "Please enter your password to decrypt and mount the volume."
+#~ msgstr "Syötä salasanasi purkaaksesi salauksen ja liittääksesi taltion."
+
+#~ msgid "_Mount"
+#~ msgstr "_Liitä"
+
+#~ msgid "Failed to setup the encrypted volume"
+#~ msgstr "Salatun taltion määritys epäonnistui"
+
+#~ msgid "Choose Disc Type"
+#~ msgstr "Valitse levyn tyyppi"
+
+#~ msgid "Make _DVD"
+#~ msgstr "Luo _DVD"
 
-#: ../thunar-volman-settings.desktop.in.in.h:3
-msgid "Removable Media"
-msgstr "Irrotettavat taltiot"
+#~ msgid "Removable Media"
+#~ msgstr "Irrotettavat taltiot"
diff --git a/po/fr.po b/po/fr.po
index 5be1605..2b22a6f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,458 +7,619 @@ msgid ""
 msgstr ""
 "Project-Id-Version: thunar-volman\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-30 02:26-0700\n"
+"POT-Creation-Date: 2010-07-25 20:06+0200\n"
 "PO-Revision-Date: 2008-11-29 23:50+0100\n"
 "Last-Translator: Maximilian Schleiss <maximilian at xfce.org>\n"
 "Language-Team: French <xfce-i18n at xfce.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../thunar-volman/main.c:50
-msgid "The HAL device UDI of the newly added device"
+#: ../thunar-volman/main.c:59
+#, fuzzy
+msgid "The syfs path of the newly added device"
 msgstr "L'UDI HAL du périphérique nouvellement ajouté"
 
-#: ../thunar-volman/main.c:51
-#: ../thunar-volman/tvm-preferences-dialog.c:120
-#: ../thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman/main.c:60
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:104
 msgid "Configure management of removable drives and media"
 msgstr "Configurer la gestion de disques amovibles et de médias"
 
-#: ../thunar-volman/main.c:52
+#: ../thunar-volman/main.c:61
 msgid "Print version information and exit"
 msgstr "Afficher la version et quitter"
 
 #. setup application name
-#: ../thunar-volman/main.c:69
+#: ../thunar-volman/main.c:93
 msgid "Thunar Volume Manager"
 msgstr "Gestionnaire de volume Thunar"
 
-#: ../thunar-volman/main.c:90
-msgid "Failed to open display"
-msgstr "Échec à l'ouverture de l'affichage"
-
-#: ../thunar-volman/main.c:106
-msgid "The Thunar development team. All rights reserved."
-msgstr "L'équipe de développement de Thunar. Tous droits réservés."
-
-#: ../thunar-volman/main.c:107
-msgid "Written by Benedikt Meurer <benny at xfce.org>."
-msgstr "Écrit par Benedikt Meurer <benny at xfce.org>."
+#: ../thunar-volman/main.c:133
+msgid "All rights reserved."
+msgstr ""
 
-#: ../thunar-volman/main.c:108
+#: ../thunar-volman/main.c:134
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Veuillez envoyer vos rapports de bogues à <%s>."
 
-#. TRANSLATORS: A HAL device UDI must match certain conditions to be valid (to be exact, it must be a valid D-Bus object path)
-#: ../thunar-volman/main.c:133
+#: ../thunar-volman/main.c:188
 #, c-format
-msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
-msgstr "l'UDI \"%s\" spécifié n'est pas un UDI de périphérique HAL valide"
+msgid "There is no device with the sysfs path \"%s\""
+msgstr ""
 
-#. TRANSLATORS: thunar-volman wasn't invoked with either --device-added or --configure.
-#: ../thunar-volman/main.c:144
-#, c-format
-msgid "Must specify the new HAL device UDI with --device-added"
+#: ../thunar-volman/main.c:200
+#, fuzzy, c-format
+msgid "Must specify the sysfs path of new devices with --device-added"
 msgstr "Spécifier l'UDI du nouveau périphérique HAL avec --device-added"
 
 #. ...so we need to prompt what to do
-#: ../thunar-volman/tvm-block-device.c:189
+#: ../thunar-volman/tvm-block-device.c:204
 msgid "Photos and Music"
 msgstr "Photos et musique"
 
-#: ../thunar-volman/tvm-block-device.c:190
-msgid "Photos were found on your portable music player."
+#: ../thunar-volman/tvm-block-device.c:205
+#, fuzzy
+msgid "Photos were found on your portable music player"
 msgstr "Des photos on été trouvées sur votre lecteur de musique portable."
 
-#: ../thunar-volman/tvm-block-device.c:191
+#: ../thunar-volman/tvm-block-device.c:206
 msgid "Would you like to import the photos or manage the music?"
 msgstr "Voulez-vous importer les photos ou gérer la musique ?"
 
-#: ../thunar-volman/tvm-block-device.c:192
-#: ../thunar-volman/tvm-block-device.c:258
-#: ../thunar-volman/tvm-block-device.c:335
-#: ../thunar-volman/tvm-block-device.c:371
-#: ../thunar-volman/tvm-block-device.c:430
-#: ../thunar-volman/tvm-block-device.c:703
-#: ../thunar-volman/tvm-crypto-volume.c:448
-#: ../thunar-volman/tvm-run.c:136
-#: ../thunar-volman/tvm-run.c:147
+#: ../thunar-volman/tvm-block-device.c:208
+#: ../thunar-volman/tvm-block-device.c:277
+#: ../thunar-volman/tvm-block-device.c:378
+#: ../thunar-volman/tvm-block-device.c:425
+#: ../thunar-volman/tvm-block-device.c:507
+#: ../thunar-volman/tvm-block-device.c:826 ../thunar-volman/tvm-run.c:196
+#: ../thunar-volman/tvm-run.c:207
 msgid "Ig_nore"
 msgstr "Ig_norer"
 
-#: ../thunar-volman/tvm-block-device.c:193
-#: ../thunar-volman/tvm-block-device.c:259
+#: ../thunar-volman/tvm-block-device.c:209
+#: ../thunar-volman/tvm-block-device.c:278
 msgid "Import _Photos"
 msgstr "Importer les _Photos"
 
-#: ../thunar-volman/tvm-block-device.c:194
+#: ../thunar-volman/tvm-block-device.c:210
 msgid "Manage _Music"
 msgstr "Gérer la _musique"
 
-#. ask the user whether to import photos
-#: ../thunar-volman/tvm-block-device.c:255
+#. ask the user to import photos
+#: ../thunar-volman/tvm-block-device.c:273
 msgid "Photo Import"
 msgstr "Importer des photos"
 
-#: ../thunar-volman/tvm-block-device.c:256
-msgid "A photo card has been detected."
+#: ../thunar-volman/tvm-block-device.c:274
+#, fuzzy
+msgid "A photo card has been detected"
 msgstr "Une carte mémoire pour photos a été détectée."
 
-#: ../thunar-volman/tvm-block-device.c:257
-msgid "There are photos on the card. Would you like to add these photos to your album?"
-msgstr "Des photos se trouvent sur la carte. Voulez-vous les ajouter à votre album ?"
+#: ../thunar-volman/tvm-block-device.c:275
+msgid ""
+"There are photos on the card. Would you like to add these photos to your "
+"album?"
+msgstr ""
+"Des photos se trouvent sur la carte. Voulez-vous les ajouter à votre album ?"
 
-#. prompt the user whether to execute this file
-#: ../thunar-volman/tvm-block-device.c:332
-#: ../thunar-volman/tvm-block-device.c:368
+#. prompt the user to execute the file
+#. prompt the user to execute this file
+#: ../thunar-volman/tvm-block-device.c:373
+#: ../thunar-volman/tvm-block-device.c:420
 #, c-format
 msgid "Would you like to allow \"%s\" to run?"
 msgstr "Permettez-vous l'exécution de \"%s\" ?"
 
-#: ../thunar-volman/tvm-block-device.c:333
-#: ../thunar-volman/tvm-block-device.c:369
+#: ../thunar-volman/tvm-block-device.c:376
+#: ../thunar-volman/tvm-block-device.c:423
 msgid "Auto-Run Confirmation"
 msgstr "Confirmation d'auto-exécution"
 
-#: ../thunar-volman/tvm-block-device.c:334
-#: ../thunar-volman/tvm-block-device.c:370
+#: ../thunar-volman/tvm-block-device.c:377
+#: ../thunar-volman/tvm-block-device.c:424
 msgid "Auto-Run capability detected"
 msgstr "Possibilité d'auto-exécution détectée"
 
-#: ../thunar-volman/tvm-block-device.c:336
-#: ../thunar-volman/tvm-block-device.c:372
+#: ../thunar-volman/tvm-block-device.c:379
+#: ../thunar-volman/tvm-block-device.c:426
 msgid "_Allow Auto-Run"
 msgstr "_Permettre l'auto-exécution"
 
 #. prompt the user whether to autoopen this file
-#: ../thunar-volman/tvm-block-device.c:427
+#: ../thunar-volman/tvm-block-device.c:502
 #, c-format
 msgid "Would you like to open \"%s\"?"
 msgstr "Voulez-vous ouvrir \"%s\" ?"
 
-#: ../thunar-volman/tvm-block-device.c:428
+#: ../thunar-volman/tvm-block-device.c:505
 msgid "Auto-Open Confirmation"
 msgstr "Confirmation d'auto-ouverture"
 
-#: ../thunar-volman/tvm-block-device.c:429
+#: ../thunar-volman/tvm-block-device.c:506
 msgid "Auto-Open capability detected"
 msgstr "Possibilité d'auto-ouverture détectée"
 
-#: ../thunar-volman/tvm-block-device.c:431
+#: ../thunar-volman/tvm-block-device.c:508
 msgid "_Open"
 msgstr "_Ouvrir"
 
-#. ask what do with the mixed audio/data disc
-#: ../thunar-volman/tvm-block-device.c:700
-msgid "Audio / Data CD"
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "CD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "DVD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:618
+msgid "The CD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:619
+msgid "The DVD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:629
+msgid "Volume mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:632
+#, c-format
+msgid "The volume \"%s\" was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:637
+#, c-format
+msgid "The inserted volume was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:691
+#, c-format
+msgid "Unable to locate mount point"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:737
+#, c-format
+msgid "Unable to mount the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:746
+#, c-format
+msgid "Could not detect the volume corresponding to the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:821
+#, fuzzy
+msgid "Audio/Data CD"
 msgstr "Audio / CD Data"
 
-#: ../thunar-volman/tvm-block-device.c:701
-msgid "The CD in the drive contains both music and files."
+#: ../thunar-volman/tvm-block-device.c:822
+#, fuzzy
+msgid "The CD in the drive contains both music and files"
 msgstr "Le CD dans le lecteur contient de la musique et des fichiers"
 
-#: ../thunar-volman/tvm-block-device.c:702
+#: ../thunar-volman/tvm-block-device.c:824
 msgid "Would you like to listen to music or browse the files?"
 msgstr "Voulez-vous écouter la musique ou lire les données ?"
 
-#: ../thunar-volman/tvm-block-device.c:704
+#: ../thunar-volman/tvm-block-device.c:827
 msgid "_Browse Files"
 msgstr "_Lire les données"
 
-#: ../thunar-volman/tvm-block-device.c:705
+#: ../thunar-volman/tvm-block-device.c:828
 msgid "_Play CD"
 msgstr "_Écouter le CD"
 
-#: ../thunar-volman/tvm-command-entry.c:233
-msgid "Select an Application"
-msgstr "Sélectionner une application"
+#: ../thunar-volman/tvm-block-device.c:916
+#, c-format
+msgid "Unknown block device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:243
-msgid "All Files"
-msgstr "Tous les fichiers"
+#: ../thunar-volman/tvm-device.c:139
+#, c-format
+msgid "Device type not supported"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:248
-msgid "Executable Files"
-msgstr "Fichiers exécutables"
+#: ../thunar-volman/tvm-input-device.c:74
+#, fuzzy
+msgid "input-keyboard"
+msgstr "Clavier"
 
-#: ../thunar-volman/tvm-command-entry.c:263
-msgid "Perl Scripts"
-msgstr "Scripts perl"
+#: ../thunar-volman/tvm-input-device.c:75
+#, fuzzy
+msgid "Keyboard detected"
+msgstr "Clavier"
 
-#: ../thunar-volman/tvm-command-entry.c:269
-msgid "Python Scripts"
-msgstr "Scripts python"
+#: ../thunar-volman/tvm-input-device.c:76
+#, fuzzy
+msgid "A keyboard was detected"
+msgstr "Une carte mémoire pour photos a été détectée."
 
-#: ../thunar-volman/tvm-command-entry.c:275
-msgid "Ruby Scripts"
-msgstr "Scripts ruby"
+#: ../thunar-volman/tvm-input-device.c:86
+#: ../thunar-volman/tvm-input-device.c:100
+msgid "input-tablet"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:281
-msgid "Shell Scripts"
-msgstr "Scripts shell"
+#: ../thunar-volman/tvm-input-device.c:87
+#: ../thunar-volman/tvm-input-device.c:101
+#, fuzzy
+msgid "Tablet detected"
+msgstr "Possibilité d'auto-exécution détectée"
+
+#: ../thunar-volman/tvm-input-device.c:88
+#: ../thunar-volman/tvm-input-device.c:102
+msgid "A graphics tablet was detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:286
-#: ../thunar-volman/tvm-crypto-volume.c:443
-msgid "Encrypted volume"
-msgstr "Volume crypté"
+#: ../thunar-volman/tvm-input-device.c:110
+msgid "input-mouse"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:297
-msgid "<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Monage du volume crypté...</span>"
+#: ../thunar-volman/tvm-input-device.c:111
+msgid "Mouse detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:302
-msgid "Setting up the crypto layer..."
-msgstr "Mise en place de la couche de cryptage..."
+#: ../thunar-volman/tvm-input-device.c:112
+msgid "A mouse was detected"
+msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) but got Permission denied.
-#: ../thunar-volman/tvm-crypto-volume.c:369
+#: ../thunar-volman/tvm-input-device.c:139
 #, c-format
-msgid "You are not privileged to setup the crypto layer"
-msgstr "Vous n'avez pas les droits nécessaires à la mise en place de la couche de cryptage"
+msgid "Unsupported input device type"
+msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) and typed the wrong password.
-#: ../thunar-volman/tvm-crypto-volume.c:374
+#: ../thunar-volman/tvm-run.c:173
 #, c-format
-msgid "Wrong password"
-msgstr "Mot de passe incorrect"
+msgid "Autoburning of blank CDs and DVDs is disabled"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:445
-msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Mot de passe incorrect.</span>"
+#: ../thunar-volman/tvm-run.c:193
+msgid "Blank DVD inserted"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:446
-msgid "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Ce volume est crypté.</span>"
+#: ../thunar-volman/tvm-run.c:194
+#, fuzzy
+msgid "You have inserted a blank DVD."
+msgstr "Vous avez inséré un disque vierge."
 
-#: ../thunar-volman/tvm-crypto-volume.c:447
-msgid "Please enter your password to decrypt and mount the volume."
-msgstr "Veuillez saisir votre mot de passe afin de décrypter et monter le volume."
+#: ../thunar-volman/tvm-run.c:195 ../thunar-volman/tvm-run.c:206
+msgid "What would you like to do?"
+msgstr "Que voulez-vous faire ?"
 
-#: ../thunar-volman/tvm-crypto-volume.c:449
-msgid "_Mount"
-msgstr "_Monter"
+#: ../thunar-volman/tvm-run.c:197
+msgid "Burn _DVD"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:468
-msgid "Failed to setup the encrypted volume"
-msgstr "Échec à la mise en place du volume crypté"
+#: ../thunar-volman/tvm-run.c:204
+#, fuzzy
+msgid "Blank CD inserted"
+msgstr "CDs et DVDs vierges"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:119
-#: ../thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman/tvm-run.c:205
+#, fuzzy
+msgid "You have inserted a blank CD."
+msgstr "Vous avez inséré un disque vierge."
+
+#: ../thunar-volman/tvm-run.c:208
+#, fuzzy
+msgid "Burn _Data CD"
+msgstr "Créer un CD de données"
+
+#: ../thunar-volman/tvm-run.c:209
+#, fuzzy
+msgid "Burn _Audio CD"
+msgstr "Créer un CD _audio"
+
+#: ../thunar-volman/tvm-run.c:233
+#, c-format
+msgid "The burn command may not be empty"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:272
+#, c-format
+msgid "The CD player command is undefined"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:66
+msgid "Camera detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:67
+#, fuzzy
+msgid "A photo camera was detected"
+msgstr "Une carte mémoire pour photos a été détectée."
+
+#: ../thunar-volman/tvm-usb-device.c:77
+msgid "Printer detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:78
+msgid "A USB printer was detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:104
+#, c-format
+msgid "Unsupported USB device type"
+msgstr ""
+
+#. setup application name
+#: ../thunar-volman-settings/main.c:52
+#, fuzzy
+msgid "Thunar Volume Manager Settings"
+msgstr "Gestionnaire de volume Thunar"
+
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:102
 msgid "Removable Drives and Media"
 msgstr "Disques amovibles et médias"
 
+#: ../thunar-volman-settings/tvm-command-entry.c:240
+msgid "Select an Application"
+msgstr "Sélectionner une application"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:250
+msgid "All Files"
+msgstr "Tous les fichiers"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:255
+msgid "Executable Files"
+msgstr "Fichiers exécutables"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:270
+msgid "Perl Scripts"
+msgstr "Scripts perl"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:276
+msgid "Python Scripts"
+msgstr "Scripts python"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:282
+msgid "Ruby Scripts"
+msgstr "Scripts ruby"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:288
+msgid "Shell Scripts"
+msgstr "Scripts shell"
+
 #.
 #. Storage
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:143
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:130
 msgid "Storage"
 msgstr "Stockage"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:153
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:141
 msgid "Removable Storage"
 msgstr "Stockage amovible"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:170
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:158
 msgid "_Mount removable drives when hot-plugged"
 msgstr "_Monter les disques amovibles à la connexion"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:175
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:166
 msgid "Mount removable media when _inserted"
 msgstr "Monter les médias amovibles à l'_insertion"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:180
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:174
 msgid "B_rowse removable media when inserted"
 msgstr "_Parcourir les médias amovibles à l'insertion"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:185
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:182
 msgid "_Auto-run programs on new drives and media"
 msgstr "_Auto-exécution d'applications pour les nouveaux disques et médias"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:190
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:189
 msgid "Auto-open files on new drives and media"
 msgstr "Auto-ouverture des fichiers pour les nouveaux disques et médias"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:199
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:201
 msgid "Blank CDs and DVDs"
 msgstr "CDs et DVDs vierges"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:216
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:218
 msgid "_Burn a CD or DVD when a blank disc is inserted"
 msgstr "_Graver un CD ou DVD à l'insertion d'un disque vierge"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:224
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:229
 msgid "Command for _Data CDs:"
 msgstr "Commande pour les CDs _données :"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:231
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:239
 msgid "Command for A_udio CDs:"
 msgstr "Commande pour les CDs A_udio :"
 
 #.
 #. Multimedia
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:245
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:255
 msgid "Multimedia"
 msgstr "Multimédia"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:255
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:266
 msgid "Audio CDs"
 msgstr "CDs audio"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:272
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:283
 msgid "Play _audio CDs when inserted"
 msgstr "Écouter les CDs _audio à l'insertion"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:277
-#: ../thunar-volman/tvm-preferences-dialog.c:383
-#: ../thunar-volman/tvm-preferences-dialog.c:425
-#: ../thunar-volman/tvm-preferences-dialog.c:499
-#: ../thunar-volman/tvm-preferences-dialog.c:541
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:290
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:415
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:466
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:553
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:601
 msgid "_Command:"
 msgstr "_Commande :"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:287
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:304
 msgid "Video CDs/DVDs"
 msgstr "CDs/DVDs vidéo"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:304
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:321
 msgid "Play _video CDs and DVDs when inserted"
 msgstr "Visionner les CDs et DVDs vidéo à l'insertion"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:309
-#: ../thunar-volman/tvm-preferences-dialog.c:341
-#: ../thunar-volman/tvm-preferences-dialog.c:457
-#: ../thunar-volman/tvm-preferences-dialog.c:573
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:329
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:367
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:505
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:640
 msgid "C_ommand:"
 msgstr "C_ommande :"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:319
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:343
 msgid "Portable Music Players"
 msgstr "Lecteurs de musique portables"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:336
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:360
 msgid "Play _music files when connected"
 msgstr "Écouter la _musique à la connexion"
 
 #.
 #. Cameras
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:351
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:379
 msgid "Cameras"
 msgstr "Caméras"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:361
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:390
 msgid "Digital Cameras"
 msgstr "Caméras digitales"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:378
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:407
 msgid "Import digital photographs when connected"
 msgstr "Importer les photos numériques à la connexion"
 
 #.
 #. PDAs
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:393
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:427
 msgid "PDAs"
 msgstr "PDAs"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:403
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:441
 msgid "Palm™"
 msgstr "Palm™"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:420
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:458
 msgid "Sync _Palm™ devices when connected"
 msgstr "Synchroniser les périphériques Palm™ une fois connectés"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:435
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:480
 msgid "Pocket PCs"
 msgstr "Pocket PCs"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:452
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:497
 msgid "Sync Pocket P_C devices when connected"
 msgstr "Synchroniser les périphériques Pocket PC une fois connectés"
 
 #.
 #. Printers
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:467
-#: ../thunar-volman/tvm-preferences-dialog.c:477
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:517
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:528
 msgid "Printers"
 msgstr "Imprimantes"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:494
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:545
 msgid "Automatically run a program when a _printer is connected"
 msgstr "Exécuter une application à la connexion d'une imprimante"
 
 #.
 #. Input Devices
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:509
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:565
 msgid "Input Devices"
 msgstr "Périphériques d'entrée"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:519
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:576
 msgid "Keyboards"
 msgstr "Clavier"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:536
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:593
 msgid "Automatically run a program when an USB _keyboard is connected"
 msgstr "Exécuter une application à la connexion d'un _clavier USB"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:551
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:615
 msgid "Mice"
 msgstr "Souris"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:568
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:632
 msgid "Automatically run a program when an USB _mouse is connected"
 msgstr "Exécuter une application à la connexion d'une _souris USB"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:583
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:654
 msgid "Tablet"
 msgstr "Tablette graphique"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:600
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:671
 msgid "Automatically run a program when a _tablet is connected"
 msgstr "Exécuter une application à la connexion d'une _tablette graphique"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:605
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:679
 msgid "Com_mand:"
 msgstr "Com_mande :"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:690
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:755
 msgid "Failed to open the documentation browser"
 msgstr "Échec à l'ouverture du navigateur de documents"
 
-#: ../thunar-volman/tvm-run.c:133
-#: ../thunar-volman/tvm-run.c:144
-msgid "Choose Disc Type"
-msgstr "Choisir le type de disque"
+#~ msgid "Failed to open display"
+#~ msgstr "Échec à l'ouverture de l'affichage"
 
-#: ../thunar-volman/tvm-run.c:134
-#: ../thunar-volman/tvm-run.c:145
-msgid "You have inserted a blank disc."
-msgstr "Vous avez inséré un disque vierge."
+#~ msgid "The Thunar development team. All rights reserved."
+#~ msgstr "L'équipe de développement de Thunar. Tous droits réservés."
 
-#: ../thunar-volman/tvm-run.c:135
-#: ../thunar-volman/tvm-run.c:146
-msgid "What would you like to do?"
-msgstr "Que voulez-vous faire ?"
+#~ msgid "Written by Benedikt Meurer <benny at xfce.org>."
+#~ msgstr "Écrit par Benedikt Meurer <benny at xfce.org>."
 
-#: ../thunar-volman/tvm-run.c:137
-msgid "Make _DVD"
-msgstr "Créer un _DVD"
+#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
+#~ msgstr "l'UDI \"%s\" spécifié n'est pas un UDI de périphérique HAL valide"
 
-#: ../thunar-volman/tvm-run.c:148
-msgid "Make _Data CD"
-msgstr "Créer un CD de données"
+#~ msgid "Encrypted volume"
+#~ msgstr "Volume crypté"
 
-#: ../thunar-volman/tvm-run.c:149
-msgid "Make _Audio CD"
-msgstr "Créer un CD _audio"
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Monage du volume crypté...</span>"
+
+#~ msgid "Setting up the crypto layer..."
+#~ msgstr "Mise en place de la couche de cryptage..."
+
+#~ msgid "You are not privileged to setup the crypto layer"
+#~ msgstr ""
+#~ "Vous n'avez pas les droits nécessaires à la mise en place de la couche de "
+#~ "cryptage"
+
+#~ msgid "Wrong password"
+#~ msgstr "Mot de passe incorrect"
+
+#~ msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Mot de passe incorrect.</span>"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
+#~ msgstr "<span weight=\"bold\" size=\"larger\">Ce volume est crypté.</span>"
+
+#~ msgid "Please enter your password to decrypt and mount the volume."
+#~ msgstr ""
+#~ "Veuillez saisir votre mot de passe afin de décrypter et monter le volume."
+
+#~ msgid "_Mount"
+#~ msgstr "_Monter"
+
+#~ msgid "Failed to setup the encrypted volume"
+#~ msgstr "Échec à la mise en place du volume crypté"
+
+#~ msgid "Choose Disc Type"
+#~ msgstr "Choisir le type de disque"
 
-#: ../thunar-volman-settings.desktop.in.in.h:3
-msgid "Removable Media"
-msgstr "Disque amovible"
+#~ msgid "Make _DVD"
+#~ msgstr "Créer un _DVD"
 
+#~ msgid "Removable Media"
+#~ msgstr "Disque amovible"
diff --git a/po/gl.po b/po/gl.po
index 0f900bf..0efc86f 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -11,460 +11,618 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-30 02:26-0700\n"
+"POT-Creation-Date: 2010-07-25 20:06+0200\n"
 "PO-Revision-Date: 2009-08-19 13:15+0100\n"
 "Last-Translator: Leandro Regueiro <leandro.regueiro at gmail.com>\n"
 "Language-Team: Galician <proxecto at trasno.net>\n"
+"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 # UDI=Uniform Driver Interface
-#: ../thunar-volman/main.c:50
-msgid "The HAL device UDI of the newly added device"
+#: ../thunar-volman/main.c:59
+#, fuzzy
+msgid "The syfs path of the newly added device"
 msgstr "A UDI do dispositivo para HAL do novo dispositivo engadido"
 
-#: ../thunar-volman/main.c:51
-#: ../thunar-volman/tvm-preferences-dialog.c:120
-#: ../thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman/main.c:60
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:104
 msgid "Configure management of removable drives and media"
 msgstr "Configurar a xestión da unidades e dispositivos extraíbles"
 
-#: ../thunar-volman/main.c:52
+#: ../thunar-volman/main.c:61
 msgid "Print version information and exit"
 msgstr "Mostra a información da versión e sae"
 
 #. setup application name
-#: ../thunar-volman/main.c:69
+#: ../thunar-volman/main.c:93
 msgid "Thunar Volume Manager"
 msgstr "Xestor de volumes de Thunar"
 
-#: ../thunar-volman/main.c:90
-msgid "Failed to open display"
-msgstr "Fallo ao abrir visualización"
-
-#: ../thunar-volman/main.c:106
-msgid "The Thunar development team. All rights reserved."
-msgstr "O equipo de desenvolvemento de Thunar. Tódolos dereitos reservados."
-
-#: ../thunar-volman/main.c:107
-msgid "Written by Benedikt Meurer <benny at xfce.org>."
-msgstr "Escrito por Benedikt Meurer <benny at xfce.org>."
+#: ../thunar-volman/main.c:133
+msgid "All rights reserved."
+msgstr ""
 
-#: ../thunar-volman/main.c:108
+#: ../thunar-volman/main.c:134
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Por favor comuníquelle os erros a <%s>."
 
-#. TRANSLATORS: A HAL device UDI must match certain conditions to be valid (to be exact, it must be a valid D-Bus object path)
-#: ../thunar-volman/main.c:133
+#: ../thunar-volman/main.c:188
 #, c-format
-msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
-msgstr "A UDI \"%s\" especificado non é unha UDI de dispositivo HAL válido"
+msgid "There is no device with the sysfs path \"%s\""
+msgstr ""
 
-#. TRANSLATORS: thunar-volman wasn't invoked with either --device-added or --configure.
-#: ../thunar-volman/main.c:144
-#, c-format
-msgid "Must specify the new HAL device UDI with --device-added"
+#: ../thunar-volman/main.c:200
+#, fuzzy, c-format
+msgid "Must specify the sysfs path of new devices with --device-added"
 msgstr "Debe especificar a UDI para HAL do novo dispositivo con --device-added"
 
 #. ...so we need to prompt what to do
-#: ../thunar-volman/tvm-block-device.c:189
+#: ../thunar-volman/tvm-block-device.c:204
 msgid "Photos and Music"
 msgstr "Fotos e música"
 
-#: ../thunar-volman/tvm-block-device.c:190
-msgid "Photos were found on your portable music player."
+#: ../thunar-volman/tvm-block-device.c:205
+#, fuzzy
+msgid "Photos were found on your portable music player"
 msgstr "Atopáronse fotos no reprodutor de música portátil."
 
-#: ../thunar-volman/tvm-block-device.c:191
+#: ../thunar-volman/tvm-block-device.c:206
 msgid "Would you like to import the photos or manage the music?"
 msgstr "Desexa importar as fotos ou xestionar a música?"
 
-#: ../thunar-volman/tvm-block-device.c:192
-#: ../thunar-volman/tvm-block-device.c:258
-#: ../thunar-volman/tvm-block-device.c:335
-#: ../thunar-volman/tvm-block-device.c:371
-#: ../thunar-volman/tvm-block-device.c:430
-#: ../thunar-volman/tvm-block-device.c:703
-#: ../thunar-volman/tvm-crypto-volume.c:448
-#: ../thunar-volman/tvm-run.c:136
-#: ../thunar-volman/tvm-run.c:147
+#: ../thunar-volman/tvm-block-device.c:208
+#: ../thunar-volman/tvm-block-device.c:277
+#: ../thunar-volman/tvm-block-device.c:378
+#: ../thunar-volman/tvm-block-device.c:425
+#: ../thunar-volman/tvm-block-device.c:507
+#: ../thunar-volman/tvm-block-device.c:826 ../thunar-volman/tvm-run.c:196
+#: ../thunar-volman/tvm-run.c:207
 msgid "Ig_nore"
 msgstr "Ig_norar"
 
-#: ../thunar-volman/tvm-block-device.c:193
-#: ../thunar-volman/tvm-block-device.c:259
+#: ../thunar-volman/tvm-block-device.c:209
+#: ../thunar-volman/tvm-block-device.c:278
 msgid "Import _Photos"
 msgstr "Importar _Fotos"
 
-#: ../thunar-volman/tvm-block-device.c:194
+#: ../thunar-volman/tvm-block-device.c:210
 msgid "Manage _Music"
 msgstr "Xestionar a _música"
 
-#. ask the user whether to import photos
-#: ../thunar-volman/tvm-block-device.c:255
+#. ask the user to import photos
+#: ../thunar-volman/tvm-block-device.c:273
 msgid "Photo Import"
 msgstr "Importar fotos"
 
-#: ../thunar-volman/tvm-block-device.c:256
-msgid "A photo card has been detected."
+#: ../thunar-volman/tvm-block-device.c:274
+#, fuzzy
+msgid "A photo card has been detected"
 msgstr "Detectouse unha tarxeta de fotos."
 
-#: ../thunar-volman/tvm-block-device.c:257
-msgid "There are photos on the card. Would you like to add these photos to your album?"
+#: ../thunar-volman/tvm-block-device.c:275
+msgid ""
+"There are photos on the card. Would you like to add these photos to your "
+"album?"
 msgstr "Hai fotos na tarxeta. Desexa engadir estas fotos ó seu álbum?"
 
-#. prompt the user whether to execute this file
-#: ../thunar-volman/tvm-block-device.c:332
-#: ../thunar-volman/tvm-block-device.c:368
+#. prompt the user to execute the file
+#. prompt the user to execute this file
+#: ../thunar-volman/tvm-block-device.c:373
+#: ../thunar-volman/tvm-block-device.c:420
 #, c-format
 msgid "Would you like to allow \"%s\" to run?"
 msgstr "Desexa permitir que se execute \"%s\"?"
 
-#: ../thunar-volman/tvm-block-device.c:333
-#: ../thunar-volman/tvm-block-device.c:369
+#: ../thunar-volman/tvm-block-device.c:376
+#: ../thunar-volman/tvm-block-device.c:423
 msgid "Auto-Run Confirmation"
 msgstr "Confirmación de execución automática"
 
-#: ../thunar-volman/tvm-block-device.c:334
-#: ../thunar-volman/tvm-block-device.c:370
+#: ../thunar-volman/tvm-block-device.c:377
+#: ../thunar-volman/tvm-block-device.c:424
 msgid "Auto-Run capability detected"
 msgstr "Detectouse a capacidade de execución automática"
 
-#: ../thunar-volman/tvm-block-device.c:336
-#: ../thunar-volman/tvm-block-device.c:372
+#: ../thunar-volman/tvm-block-device.c:379
+#: ../thunar-volman/tvm-block-device.c:426
 msgid "_Allow Auto-Run"
 msgstr "_Permitir execución automática"
 
 #. prompt the user whether to autoopen this file
-#: ../thunar-volman/tvm-block-device.c:427
+#: ../thunar-volman/tvm-block-device.c:502
 #, c-format
 msgid "Would you like to open \"%s\"?"
 msgstr "Desexa abrir \"%s\"?"
 
-#: ../thunar-volman/tvm-block-device.c:428
+#: ../thunar-volman/tvm-block-device.c:505
 msgid "Auto-Open Confirmation"
 msgstr "Confirmación de apertura automática"
 
-#: ../thunar-volman/tvm-block-device.c:429
+#: ../thunar-volman/tvm-block-device.c:506
 msgid "Auto-Open capability detected"
 msgstr "Detectouse a capacidade de apertura automática"
 
-#: ../thunar-volman/tvm-block-device.c:431
+#: ../thunar-volman/tvm-block-device.c:508
 msgid "_Open"
 msgstr "_Abrir"
 
-#. ask what do with the mixed audio/data disc
-#: ../thunar-volman/tvm-block-device.c:700
-msgid "Audio / Data CD"
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "CD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "DVD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:618
+msgid "The CD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:619
+msgid "The DVD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:629
+msgid "Volume mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:632
+#, c-format
+msgid "The volume \"%s\" was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:637
+#, c-format
+msgid "The inserted volume was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:691
+#, c-format
+msgid "Unable to locate mount point"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:737
+#, c-format
+msgid "Unable to mount the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:746
+#, c-format
+msgid "Could not detect the volume corresponding to the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:821
+#, fuzzy
+msgid "Audio/Data CD"
 msgstr "CD de audio/datos"
 
-#: ../thunar-volman/tvm-block-device.c:701
-msgid "The CD in the drive contains both music and files."
+#: ../thunar-volman/tvm-block-device.c:822
+#, fuzzy
+msgid "The CD in the drive contains both music and files"
 msgstr "O CD da unidade contén música e ficheiros."
 
-#: ../thunar-volman/tvm-block-device.c:702
+#: ../thunar-volman/tvm-block-device.c:824
 msgid "Would you like to listen to music or browse the files?"
 msgstr "Desexa escoitar a música ou ver os ficheiros?"
 
-#: ../thunar-volman/tvm-block-device.c:704
+#: ../thunar-volman/tvm-block-device.c:827
 msgid "_Browse Files"
 msgstr "_Ver os ficheiros"
 
-#: ../thunar-volman/tvm-block-device.c:705
+#: ../thunar-volman/tvm-block-device.c:828
 msgid "_Play CD"
 msgstr "_Reproducir o CD"
 
-#: ../thunar-volman/tvm-command-entry.c:233
-msgid "Select an Application"
-msgstr "Seleccione unha aplicación"
+#: ../thunar-volman/tvm-block-device.c:916
+#, c-format
+msgid "Unknown block device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:243
-msgid "All Files"
-msgstr "Tódolos ficheiros"
+#: ../thunar-volman/tvm-device.c:139
+#, c-format
+msgid "Device type not supported"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:248
-msgid "Executable Files"
-msgstr "Ficheiros executables"
+#: ../thunar-volman/tvm-input-device.c:74
+#, fuzzy
+msgid "input-keyboard"
+msgstr "Teclados"
 
-#: ../thunar-volman/tvm-command-entry.c:263
-msgid "Perl Scripts"
-msgstr "Scripts en Perl"
+#: ../thunar-volman/tvm-input-device.c:75
+#, fuzzy
+msgid "Keyboard detected"
+msgstr "Teclados"
 
-#: ../thunar-volman/tvm-command-entry.c:269
-msgid "Python Scripts"
-msgstr "Scripts en Python"
+#: ../thunar-volman/tvm-input-device.c:76
+#, fuzzy
+msgid "A keyboard was detected"
+msgstr "Detectouse unha tarxeta de fotos."
 
-#: ../thunar-volman/tvm-command-entry.c:275
-msgid "Ruby Scripts"
-msgstr "Scripts en Ruby"
+#: ../thunar-volman/tvm-input-device.c:86
+#: ../thunar-volman/tvm-input-device.c:100
+msgid "input-tablet"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:281
-msgid "Shell Scripts"
-msgstr "Scripts de Shell"
+#: ../thunar-volman/tvm-input-device.c:87
+#: ../thunar-volman/tvm-input-device.c:101
+#, fuzzy
+msgid "Tablet detected"
+msgstr "Detectouse a capacidade de execución automática"
+
+#: ../thunar-volman/tvm-input-device.c:88
+#: ../thunar-volman/tvm-input-device.c:102
+msgid "A graphics tablet was detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-input-device.c:110
+msgid "input-mouse"
+msgstr ""
+
+#: ../thunar-volman/tvm-input-device.c:111
+msgid "Mouse detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-input-device.c:112
+msgid "A mouse was detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-input-device.c:139
+#, c-format
+msgid "Unsupported input device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:286
-#: ../thunar-volman/tvm-crypto-volume.c:443
-msgid "Encrypted volume"
-msgstr "Volume cifrado"
+#: ../thunar-volman/tvm-run.c:173
+#, c-format
+msgid "Autoburning of blank CDs and DVDs is disabled"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:297
-msgid "<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Montando un volume cifrado...</span>"
+#: ../thunar-volman/tvm-run.c:193
+msgid "Blank DVD inserted"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:302
-msgid "Setting up the crypto layer..."
-msgstr "Configurando a capa de criptografía..."
+#: ../thunar-volman/tvm-run.c:194
+#, fuzzy
+msgid "You have inserted a blank DVD."
+msgstr "Inseriu un disco en branco."
+
+#: ../thunar-volman/tvm-run.c:195 ../thunar-volman/tvm-run.c:206
+msgid "What would you like to do?"
+msgstr "Que desexa facer?"
+
+#: ../thunar-volman/tvm-run.c:197
+msgid "Burn _DVD"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:204
+#, fuzzy
+msgid "Blank CD inserted"
+msgstr "CDs e DVDs baleiros"
+
+#: ../thunar-volman/tvm-run.c:205
+#, fuzzy
+msgid "You have inserted a blank CD."
+msgstr "Inseriu un disco en branco."
+
+#: ../thunar-volman/tvm-run.c:208
+#, fuzzy
+msgid "Burn _Data CD"
+msgstr "Crear CD de _datos"
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) but got Permission denied.
-#: ../thunar-volman/tvm-crypto-volume.c:369
+#: ../thunar-volman/tvm-run.c:209
+#, fuzzy
+msgid "Burn _Audio CD"
+msgstr "Crear CD de _audio"
+
+#: ../thunar-volman/tvm-run.c:233
 #, c-format
-msgid "You are not privileged to setup the crypto layer"
-msgstr "Non tes privilexios para configurar a capa de criptografía"
+msgid "The burn command may not be empty"
+msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) and typed the wrong password.
-#: ../thunar-volman/tvm-crypto-volume.c:374
+#: ../thunar-volman/tvm-run.c:272
 #, c-format
-msgid "Wrong password"
-msgstr "Contrasinal incorrecto"
+msgid "The CD player command is undefined"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:445
-msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Contrasinal incorrecto.</span>"
+#: ../thunar-volman/tvm-usb-device.c:66
+msgid "Camera detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:67
+#, fuzzy
+msgid "A photo camera was detected"
+msgstr "Detectouse unha tarxeta de fotos."
 
-#: ../thunar-volman/tvm-crypto-volume.c:446
-msgid "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Este volume está cifrado.</span>"
+#: ../thunar-volman/tvm-usb-device.c:77
+msgid "Printer detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:447
-msgid "Please enter your password to decrypt and mount the volume."
-msgstr "Introduza o seu contrasinal para descifrar e montar o volume."
+#: ../thunar-volman/tvm-usb-device.c:78
+msgid "A USB printer was detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:449
-msgid "_Mount"
-msgstr "_Montar"
+#: ../thunar-volman/tvm-usb-device.c:104
+#, c-format
+msgid "Unsupported USB device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:468
-msgid "Failed to setup the encrypted volume"
-msgstr "Produciuse un erro ó configurar o volume cifrado"
+#. setup application name
+#: ../thunar-volman-settings/main.c:52
+#, fuzzy
+msgid "Thunar Volume Manager Settings"
+msgstr "Xestor de volumes de Thunar"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:119
-#: ../thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:102
 msgid "Removable Drives and Media"
 msgstr "Unidades e dispositivos extraíbles"
 
+#: ../thunar-volman-settings/tvm-command-entry.c:240
+msgid "Select an Application"
+msgstr "Seleccione unha aplicación"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:250
+msgid "All Files"
+msgstr "Tódolos ficheiros"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:255
+msgid "Executable Files"
+msgstr "Ficheiros executables"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:270
+msgid "Perl Scripts"
+msgstr "Scripts en Perl"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:276
+msgid "Python Scripts"
+msgstr "Scripts en Python"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:282
+msgid "Ruby Scripts"
+msgstr "Scripts en Ruby"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:288
+msgid "Shell Scripts"
+msgstr "Scripts de Shell"
+
 #.
 #. Storage
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:143
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:130
 msgid "Storage"
 msgstr "Almacenamento"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:153
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:141
 msgid "Removable Storage"
 msgstr "Almacenamento extraíble"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:170
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:158
 msgid "_Mount removable drives when hot-plugged"
 msgstr "_Montar os dispositivos extraíbles ao conectalos en quente"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:175
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:166
 msgid "Mount removable media when _inserted"
 msgstr "Montar os soportes extraíbles ao _inserilos"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:180
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:174
 msgid "B_rowse removable media when inserted"
 msgstr "Examinar os sopo_rtes extraíbles ao inserilos"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:185
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:182
 msgid "_Auto-run programs on new drives and media"
 msgstr "_Executar automaticamente os programas dos soportes e unidades novas"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:190
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:189
 msgid "Auto-open files on new drives and media"
 msgstr "_Abrir automaticamente os ficheiros dos soportes e unidades novas"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:199
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:201
 msgid "Blank CDs and DVDs"
 msgstr "CDs e DVDs baleiros"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:216
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:218
 msgid "_Burn a CD or DVD when a blank disc is inserted"
 msgstr "_Gravar un CD ou DVD cando se insire un disco baleiro"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:224
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:229
 msgid "Command for _Data CDs:"
 msgstr "Comando para os CDs de _datos:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:231
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:239
 msgid "Command for A_udio CDs:"
 msgstr "Comando para os CDs de s_on:"
 
 #.
 #. Multimedia
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:245
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:255
 msgid "Multimedia"
 msgstr "Multimedia"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:255
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:266
 msgid "Audio CDs"
 msgstr "CDs de audio"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:272
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:283
 msgid "Play _audio CDs when inserted"
 msgstr "_Reproducir os CDs de son ao inserilos"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:277
-#: ../thunar-volman/tvm-preferences-dialog.c:383
-#: ../thunar-volman/tvm-preferences-dialog.c:425
-#: ../thunar-volman/tvm-preferences-dialog.c:499
-#: ../thunar-volman/tvm-preferences-dialog.c:541
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:290
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:415
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:466
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:553
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:601
 msgid "_Command:"
 msgstr "_Comando:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:287
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:304
 msgid "Video CDs/DVDs"
 msgstr "CDs/DVDs de vídeo"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:304
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:321
 msgid "Play _video CDs and DVDs when inserted"
 msgstr "Reproducir os CDs de vídeo e os DVDs ao inserilos"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:309
-#: ../thunar-volman/tvm-preferences-dialog.c:341
-#: ../thunar-volman/tvm-preferences-dialog.c:457
-#: ../thunar-volman/tvm-preferences-dialog.c:573
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:329
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:367
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:505
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:640
 msgid "C_ommand:"
 msgstr "C_omando:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:319
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:343
 msgid "Portable Music Players"
 msgstr "Reprodutores de música portátiles"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:336
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:360
 msgid "Play _music files when connected"
 msgstr "Reproducir os ficheiros de _música cando se conecten"
 
 #.
 #. Cameras
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:351
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:379
 msgid "Cameras"
 msgstr "Cámaras"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:361
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:390
 msgid "Digital Cameras"
 msgstr "Cámaras Dixitais"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:378
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:407
 msgid "Import digital photographs when connected"
 msgstr "Importar fotografías dixitais cando se conecta"
 
 #.
 #. PDAs
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:393
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:427
 msgid "PDAs"
 msgstr "PDAs"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:403
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:441
 msgid "Palm™"
 msgstr "Palm™"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:420
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:458
 msgid "Sync _Palm™ devices when connected"
 msgstr "Sincronizar os dispositivos _Palm™ cando se conecten"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:435
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:480
 msgid "Pocket PCs"
 msgstr "Pocket PCs"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:452
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:497
 msgid "Sync Pocket P_C devices when connected"
 msgstr "Sincronizar os dispositivos Pocket P_C cando se conectan"
 
 #.
 #. Printers
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:467
-#: ../thunar-volman/tvm-preferences-dialog.c:477
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:517
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:528
 msgid "Printers"
 msgstr "Impresoras"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:494
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:545
 msgid "Automatically run a program when a _printer is connected"
 msgstr "Executar un programa automaticamente cando se conecta unha _impresora"
 
 #.
 #. Input Devices
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:509
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:565
 msgid "Input Devices"
 msgstr "Dispositivos de entrada"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:519
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:576
 msgid "Keyboards"
 msgstr "Teclados"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:536
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:593
 msgid "Automatically run a program when an USB _keyboard is connected"
 msgstr "Executar un programa automaticamente cando se conecta un _teclado USB"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:551
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:615
 msgid "Mice"
 msgstr "Ratos"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:568
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:632
 msgid "Automatically run a program when an USB _mouse is connected"
 msgstr "Executar un programa automaticamente cando se conecta un _rato USB"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:583
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:654
 msgid "Tablet"
 msgstr "Tableta"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:600
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:671
 msgid "Automatically run a program when a _tablet is connected"
 msgstr "Executar un programa automaticamente cando se conecta unha ta_bleta"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:605
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:679
 msgid "Com_mand:"
 msgstr "Co_mando:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:690
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:755
 msgid "Failed to open the documentation browser"
 msgstr "Produciuse un erro ó abrir o visor da documentación"
 
-#: ../thunar-volman/tvm-run.c:133
-#: ../thunar-volman/tvm-run.c:144
-msgid "Choose Disc Type"
-msgstr "Escolla o tipo de disco"
+#~ msgid "Failed to open display"
+#~ msgstr "Fallo ao abrir visualización"
 
-#: ../thunar-volman/tvm-run.c:134
-#: ../thunar-volman/tvm-run.c:145
-msgid "You have inserted a blank disc."
-msgstr "Inseriu un disco en branco."
+#~ msgid "The Thunar development team. All rights reserved."
+#~ msgstr "O equipo de desenvolvemento de Thunar. Tódolos dereitos reservados."
 
-#: ../thunar-volman/tvm-run.c:135
-#: ../thunar-volman/tvm-run.c:146
-msgid "What would you like to do?"
-msgstr "Que desexa facer?"
+#~ msgid "Written by Benedikt Meurer <benny at xfce.org>."
+#~ msgstr "Escrito por Benedikt Meurer <benny at xfce.org>."
 
-#: ../thunar-volman/tvm-run.c:137
-msgid "Make _DVD"
-msgstr "Crear _DVD"
+#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
+#~ msgstr "A UDI \"%s\" especificado non é unha UDI de dispositivo HAL válido"
 
-#: ../thunar-volman/tvm-run.c:148
-msgid "Make _Data CD"
-msgstr "Crear CD de _datos"
+#~ msgid "Encrypted volume"
+#~ msgstr "Volume cifrado"
 
-#: ../thunar-volman/tvm-run.c:149
-msgid "Make _Audio CD"
-msgstr "Crear CD de _audio"
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Montando un volume cifrado...</span>"
+
+#~ msgid "Setting up the crypto layer..."
+#~ msgstr "Configurando a capa de criptografía..."
+
+#~ msgid "You are not privileged to setup the crypto layer"
+#~ msgstr "Non tes privilexios para configurar a capa de criptografía"
+
+#~ msgid "Wrong password"
+#~ msgstr "Contrasinal incorrecto"
+
+#~ msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Contrasinal incorrecto.</span>"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Este volume está cifrado.</span>"
+
+#~ msgid "Please enter your password to decrypt and mount the volume."
+#~ msgstr "Introduza o seu contrasinal para descifrar e montar o volume."
+
+#~ msgid "_Mount"
+#~ msgstr "_Montar"
+
+#~ msgid "Failed to setup the encrypted volume"
+#~ msgstr "Produciuse un erro ó configurar o volume cifrado"
+
+#~ msgid "Choose Disc Type"
+#~ msgstr "Escolla o tipo de disco"
 
-#: ../thunar-volman-settings.desktop.in.in.h:3
-msgid "Removable Media"
-msgstr "Soportes extraíbles"
+#~ msgid "Make _DVD"
+#~ msgstr "Crear _DVD"
 
+#~ msgid "Removable Media"
+#~ msgstr "Soportes extraíbles"
diff --git a/po/hu.po b/po/hu.po
index d144d75..aa97f8f 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,459 +1,626 @@
 # Hungarian translation of thunar-volman
 # Copyright 2009. Free Software Foundation, Inc.
 # This file is distributed under the same license as the thunar-volman package.
-# 
+#
 # Gabor Kelemen <kelemeng at gnome dot hu>, 2009.
 # SZERVÁC Attila <sas at 321.hu>
 msgid ""
 msgstr ""
 "Project-Id-Version: thunar-volman\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-30 02:26-0700\n"
+"POT-Creation-Date: 2010-07-25 20:06+0200\n"
 "PO-Revision-Date: 2009-07-23 02:42+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
 "Language-Team: Hungarian <gnome at gnome dot hu>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../thunar-volman/main.c:50
-msgid "The HAL device UDI of the newly added device"
+#: ../thunar-volman/main.c:59
+#, fuzzy
+msgid "The syfs path of the newly added device"
 msgstr "Az újonnan felvett eszköz HAL eszköz UDI-ja"
 
-#: ../thunar-volman/main.c:51 ../thunar-volman/tvm-preferences-dialog.c:120
-#: ../thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman/main.c:60
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:104
 msgid "Configure management of removable drives and media"
 msgstr "Cserélhető meghajtók és adathordozók kezelésének beállítása"
 
-#: ../thunar-volman/main.c:52
+#: ../thunar-volman/main.c:61
 msgid "Print version information and exit"
 msgstr "Verzióinformációk kiírása és kilépés"
 
 #. setup application name
-#: ../thunar-volman/main.c:69
+#: ../thunar-volman/main.c:93
 msgid "Thunar Volume Manager"
 msgstr "Thunar kötetkezelő"
 
-#: ../thunar-volman/main.c:90
-msgid "Failed to open display"
-msgstr "A képernyő megnyitása meghiúsult"
-
-#: ../thunar-volman/main.c:106
-msgid "The Thunar development team. All rights reserved."
-msgstr "A Thunar fejlesztői csapata. Minden jog fenntartva."
-
-#: ../thunar-volman/main.c:107
-msgid "Written by Benedikt Meurer <benny at xfce.org>."
-msgstr "Írta: Benedikt Meurer <benny at xfce.org>."
+#: ../thunar-volman/main.c:133
+msgid "All rights reserved."
+msgstr ""
 
-#: ../thunar-volman/main.c:108
+#: ../thunar-volman/main.c:134
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "A hibákat ide jelentse: <%s>."
 
-#. TRANSLATORS: A HAL device UDI must match certain conditions to be valid (to
-#. be exact, it must be a valid D-Bus object path)
-#: ../thunar-volman/main.c:133
+#: ../thunar-volman/main.c:188
 #, c-format
-msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
-msgstr "A megadott UDI („%s”) nem érvényes HAL eszköz UDI"
+msgid "There is no device with the sysfs path \"%s\""
+msgstr ""
 
-#. TRANSLATORS: thunar-volman wasn't invoked with either --device-added or
-#. --configure.
-#: ../thunar-volman/main.c:144
-#, c-format
-msgid "Must specify the new HAL device UDI with --device-added"
+#: ../thunar-volman/main.c:200
+#, fuzzy, c-format
+msgid "Must specify the sysfs path of new devices with --device-added"
 msgstr "Az új HAL eszköz UDI-t a --device-added használatával kell megadni"
 
 #. ...so we need to prompt what to do
-#: ../thunar-volman/tvm-block-device.c:189
+#: ../thunar-volman/tvm-block-device.c:204
 msgid "Photos and Music"
 msgstr "Fényképek és zene"
 
-#: ../thunar-volman/tvm-block-device.c:190
-msgid "Photos were found on your portable music player."
+#: ../thunar-volman/tvm-block-device.c:205
+#, fuzzy
+msgid "Photos were found on your portable music player"
 msgstr "Fényképek találhatók a hordozható zenelejátszón."
 
-#: ../thunar-volman/tvm-block-device.c:191
+#: ../thunar-volman/tvm-block-device.c:206
 msgid "Would you like to import the photos or manage the music?"
 msgstr "A fényképeket szeretné importálni, vagy inkább a zenét kezelné?"
 
-#: ../thunar-volman/tvm-block-device.c:192
-#: ../thunar-volman/tvm-block-device.c:258
-#: ../thunar-volman/tvm-block-device.c:335
-#: ../thunar-volman/tvm-block-device.c:371
-#: ../thunar-volman/tvm-block-device.c:430
-#: ../thunar-volman/tvm-block-device.c:703
-#: ../thunar-volman/tvm-crypto-volume.c:448 ../thunar-volman/tvm-run.c:136
-#: ../thunar-volman/tvm-run.c:147
+#: ../thunar-volman/tvm-block-device.c:208
+#: ../thunar-volman/tvm-block-device.c:277
+#: ../thunar-volman/tvm-block-device.c:378
+#: ../thunar-volman/tvm-block-device.c:425
+#: ../thunar-volman/tvm-block-device.c:507
+#: ../thunar-volman/tvm-block-device.c:826 ../thunar-volman/tvm-run.c:196
+#: ../thunar-volman/tvm-run.c:207
 msgid "Ig_nore"
 msgstr "K_ihagyás"
 
-#: ../thunar-volman/tvm-block-device.c:193
-#: ../thunar-volman/tvm-block-device.c:259
+#: ../thunar-volman/tvm-block-device.c:209
+#: ../thunar-volman/tvm-block-device.c:278
 msgid "Import _Photos"
 msgstr "Fényké_pek importálása"
 
-#: ../thunar-volman/tvm-block-device.c:194
+#: ../thunar-volman/tvm-block-device.c:210
 msgid "Manage _Music"
 msgstr "_Zene kezelése"
 
-#. ask the user whether to import photos
-#: ../thunar-volman/tvm-block-device.c:255
+#. ask the user to import photos
+#: ../thunar-volman/tvm-block-device.c:273
 msgid "Photo Import"
 msgstr "Fényképek importálása"
 
-#: ../thunar-volman/tvm-block-device.c:256
-msgid "A photo card has been detected."
+#: ../thunar-volman/tvm-block-device.c:274
+#, fuzzy
+msgid "A photo card has been detected"
 msgstr "A rendszer egy fényképkártyát észlelt."
 
-#: ../thunar-volman/tvm-block-device.c:257
-msgid "There are photos on the card. Would you like to add these photos to your album?"
-msgstr "Fényképek találhatók a kártyán. Szeretné ezeket a fényképeket az albumához adni?"
+#: ../thunar-volman/tvm-block-device.c:275
+msgid ""
+"There are photos on the card. Would you like to add these photos to your "
+"album?"
+msgstr ""
+"Fényképek találhatók a kártyán. Szeretné ezeket a fényképeket az albumához "
+"adni?"
 
-#. prompt the user whether to execute this file
-#: ../thunar-volman/tvm-block-device.c:332
-#: ../thunar-volman/tvm-block-device.c:368
+#. prompt the user to execute the file
+#. prompt the user to execute this file
+#: ../thunar-volman/tvm-block-device.c:373
+#: ../thunar-volman/tvm-block-device.c:420
 #, c-format
 msgid "Would you like to allow \"%s\" to run?"
 msgstr "Engedélyezi „%s” futását?"
 
-#: ../thunar-volman/tvm-block-device.c:333
-#: ../thunar-volman/tvm-block-device.c:369
+#: ../thunar-volman/tvm-block-device.c:376
+#: ../thunar-volman/tvm-block-device.c:423
 msgid "Auto-Run Confirmation"
 msgstr "Automatikus futtatás jóváhagyása"
 
-#: ../thunar-volman/tvm-block-device.c:334
-#: ../thunar-volman/tvm-block-device.c:370
+#: ../thunar-volman/tvm-block-device.c:377
+#: ../thunar-volman/tvm-block-device.c:424
 msgid "Auto-Run capability detected"
 msgstr "Az automatikus futtatás lehetősége észlelve"
 
-#: ../thunar-volman/tvm-block-device.c:336
-#: ../thunar-volman/tvm-block-device.c:372
+#: ../thunar-volman/tvm-block-device.c:379
+#: ../thunar-volman/tvm-block-device.c:426
 msgid "_Allow Auto-Run"
 msgstr "_Automatikus futtatás engedélyezése"
 
 #. prompt the user whether to autoopen this file
-#: ../thunar-volman/tvm-block-device.c:427
+#: ../thunar-volman/tvm-block-device.c:502
 #, c-format
 msgid "Would you like to open \"%s\"?"
 msgstr "Meg szeretné nyitni a fájlt („%s”)?"
 
-#: ../thunar-volman/tvm-block-device.c:428
+#: ../thunar-volman/tvm-block-device.c:505
 msgid "Auto-Open Confirmation"
 msgstr "Automatikus megnyitás jóváhagyása"
 
-#: ../thunar-volman/tvm-block-device.c:429
+#: ../thunar-volman/tvm-block-device.c:506
 msgid "Auto-Open capability detected"
 msgstr "Az automatikus megnyitás lehetősége észlelve"
 
-#: ../thunar-volman/tvm-block-device.c:431
+#: ../thunar-volman/tvm-block-device.c:508
 msgid "_Open"
 msgstr "_Megnyitás"
 
-#. ask what do with the mixed audio/data disc
-#: ../thunar-volman/tvm-block-device.c:700
-msgid "Audio / Data CD"
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "CD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "DVD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:618
+msgid "The CD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:619
+msgid "The DVD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:629
+msgid "Volume mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:632
+#, c-format
+msgid "The volume \"%s\" was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:637
+#, c-format
+msgid "The inserted volume was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:691
+#, c-format
+msgid "Unable to locate mount point"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:737
+#, c-format
+msgid "Unable to mount the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:746
+#, c-format
+msgid "Could not detect the volume corresponding to the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:821
+#, fuzzy
+msgid "Audio/Data CD"
 msgstr "Hang/adat CD"
 
-#: ../thunar-volman/tvm-block-device.c:701
-msgid "The CD in the drive contains both music and files."
+#: ../thunar-volman/tvm-block-device.c:822
+#, fuzzy
+msgid "The CD in the drive contains both music and files"
 msgstr "A meghajtóban lévő CD zenét és fájlokat is tartalmaz."
 
-#: ../thunar-volman/tvm-block-device.c:702
+#: ../thunar-volman/tvm-block-device.c:824
 msgid "Would you like to listen to music or browse the files?"
 msgstr "Meg szeretné hallgatni a zenét, vagy a fájlokat böngészné?"
 
-#: ../thunar-volman/tvm-block-device.c:704
+#: ../thunar-volman/tvm-block-device.c:827
 msgid "_Browse Files"
 msgstr "Fájlok _tallózása"
 
-#: ../thunar-volman/tvm-block-device.c:705
+#: ../thunar-volman/tvm-block-device.c:828
 msgid "_Play CD"
 msgstr "_CD lejátszása"
 
-#: ../thunar-volman/tvm-command-entry.c:233
-msgid "Select an Application"
-msgstr "Válasszon egy alkalmazást"
+#: ../thunar-volman/tvm-block-device.c:916
+#, c-format
+msgid "Unknown block device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:243
-msgid "All Files"
-msgstr "Minden fájl"
+#: ../thunar-volman/tvm-device.c:139
+#, c-format
+msgid "Device type not supported"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:248
-msgid "Executable Files"
-msgstr "Végrehajtható fájlok"
+#: ../thunar-volman/tvm-input-device.c:74
+#, fuzzy
+msgid "input-keyboard"
+msgstr "Billentyűzetek"
 
-#: ../thunar-volman/tvm-command-entry.c:263
-msgid "Perl Scripts"
-msgstr "Perl-parancsfájlok"
+#: ../thunar-volman/tvm-input-device.c:75
+#, fuzzy
+msgid "Keyboard detected"
+msgstr "Billentyűzetek"
 
-#: ../thunar-volman/tvm-command-entry.c:269
-msgid "Python Scripts"
-msgstr "Python-parancsfájlok"
+#: ../thunar-volman/tvm-input-device.c:76
+#, fuzzy
+msgid "A keyboard was detected"
+msgstr "A rendszer egy fényképkártyát észlelt."
 
-#: ../thunar-volman/tvm-command-entry.c:275
-msgid "Ruby Scripts"
-msgstr "Ruby-parancsfájlok"
+#: ../thunar-volman/tvm-input-device.c:86
+#: ../thunar-volman/tvm-input-device.c:100
+msgid "input-tablet"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:281
-msgid "Shell Scripts"
-msgstr "Shell-parancsfájlok"
+#: ../thunar-volman/tvm-input-device.c:87
+#: ../thunar-volman/tvm-input-device.c:101
+#, fuzzy
+msgid "Tablet detected"
+msgstr "Az automatikus futtatás lehetősége észlelve"
+
+#: ../thunar-volman/tvm-input-device.c:88
+#: ../thunar-volman/tvm-input-device.c:102
+msgid "A graphics tablet was detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-input-device.c:110
+msgid "input-mouse"
+msgstr ""
+
+#: ../thunar-volman/tvm-input-device.c:111
+msgid "Mouse detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-input-device.c:112
+msgid "A mouse was detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-input-device.c:139
+#, c-format
+msgid "Unsupported input device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:286
-#: ../thunar-volman/tvm-crypto-volume.c:443
-msgid "Encrypted volume"
-msgstr "Titkosított kötet"
+#: ../thunar-volman/tvm-run.c:173
+#, c-format
+msgid "Autoburning of blank CDs and DVDs is disabled"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:297
-msgid "<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Titkosított kötet csatolása…</span>"
+#: ../thunar-volman/tvm-run.c:193
+msgid "Blank DVD inserted"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:302
-msgid "Setting up the crypto layer..."
-msgstr "A titkosítási réteg beállítása…"
+#: ../thunar-volman/tvm-run.c:194
+#, fuzzy
+msgid "You have inserted a blank DVD."
+msgstr "A meghajtóban egy üres lemez van."
+
+#: ../thunar-volman/tvm-run.c:195 ../thunar-volman/tvm-run.c:206
+msgid "What would you like to do?"
+msgstr "Mit szeretne tenni?"
+
+#: ../thunar-volman/tvm-run.c:197
+msgid "Burn _DVD"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:204
+#, fuzzy
+msgid "Blank CD inserted"
+msgstr "Üres CD-k és DVD-k"
+
+#: ../thunar-volman/tvm-run.c:205
+#, fuzzy
+msgid "You have inserted a blank CD."
+msgstr "A meghajtóban egy üres lemez van."
+
+#: ../thunar-volman/tvm-run.c:208
+#, fuzzy
+msgid "Burn _Data CD"
+msgstr "_Adat CD készítése"
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume)
-#. but got Permission denied.
-#: ../thunar-volman/tvm-crypto-volume.c:369
+#: ../thunar-volman/tvm-run.c:209
+#, fuzzy
+msgid "Burn _Audio CD"
+msgstr "_Hang-CD készítése"
+
+#: ../thunar-volman/tvm-run.c:233
 #, c-format
-msgid "You are not privileged to setup the crypto layer"
-msgstr "Nincs jogosultsága a titkosítási réteg beállítására"
+msgid "The burn command may not be empty"
+msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume)
-#. and typed the wrong password.
-#: ../thunar-volman/tvm-crypto-volume.c:374
+#: ../thunar-volman/tvm-run.c:272
 #, c-format
-msgid "Wrong password"
-msgstr "Hibás jelszó"
+msgid "The CD player command is undefined"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:445
-msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Hibás jelszó.</span>"
+#: ../thunar-volman/tvm-usb-device.c:66
+msgid "Camera detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:67
+#, fuzzy
+msgid "A photo camera was detected"
+msgstr "A rendszer egy fényképkártyát észlelt."
 
-#: ../thunar-volman/tvm-crypto-volume.c:446
-msgid "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Ez a kötet titkosítva van.</span>"
+#: ../thunar-volman/tvm-usb-device.c:77
+msgid "Printer detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:447
-msgid "Please enter your password to decrypt and mount the volume."
-msgstr "Adja meg jelszavát a kötet visszafejtéséhez és csatolásához."
+#: ../thunar-volman/tvm-usb-device.c:78
+msgid "A USB printer was detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:449
-msgid "_Mount"
-msgstr "_Csatolás"
+#: ../thunar-volman/tvm-usb-device.c:104
+#, c-format
+msgid "Unsupported USB device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:468
-msgid "Failed to setup the encrypted volume"
-msgstr "A titkosított kötet beállítása meghiúsult"
+#. setup application name
+#: ../thunar-volman-settings/main.c:52
+#, fuzzy
+msgid "Thunar Volume Manager Settings"
+msgstr "Thunar kötetkezelő"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:119
-#: ../thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:102
 msgid "Removable Drives and Media"
 msgstr "Cserélhető meghajtók és adathordozók"
 
+#: ../thunar-volman-settings/tvm-command-entry.c:240
+msgid "Select an Application"
+msgstr "Válasszon egy alkalmazást"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:250
+msgid "All Files"
+msgstr "Minden fájl"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:255
+msgid "Executable Files"
+msgstr "Végrehajtható fájlok"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:270
+msgid "Perl Scripts"
+msgstr "Perl-parancsfájlok"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:276
+msgid "Python Scripts"
+msgstr "Python-parancsfájlok"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:282
+msgid "Ruby Scripts"
+msgstr "Ruby-parancsfájlok"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:288
+msgid "Shell Scripts"
+msgstr "Shell-parancsfájlok"
+
+#.
 #. Storage
-#. 
-#: ../thunar-volman/tvm-preferences-dialog.c:143
+#.
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:130
 msgid "Storage"
 msgstr "Tároló"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:153
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:141
 msgid "Removable Storage"
 msgstr "Cserélhető tároló"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:170
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:158
 msgid "_Mount removable drives when hot-plugged"
 msgstr "Cserélhető _meghajtók csatlakoztatása működés közbeni behelyezéskor"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:175
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:166
 msgid "Mount removable media when _inserted"
 msgstr "_Cserélhető adathordozók csatlakoztatása behelyezéskor"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:180
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:174
 msgid "B_rowse removable media when inserted"
 msgstr "Cserélhető adathordozók _tallózása behelyezéskor"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:185
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:182
 msgid "_Auto-run programs on new drives and media"
 msgstr "Programok _automatikus futtatása új meghajtókon és adathordozókon"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:190
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:189
 msgid "Auto-open files on new drives and media"
 msgstr "Fájlok automatikus megnyitása új meghajtókon és adathordozókon"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:199
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:201
 msgid "Blank CDs and DVDs"
 msgstr "Üres CD-k és DVD-k"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:216
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:218
 msgid "_Burn a CD or DVD when a blank disc is inserted"
 msgstr "CD vagy _DVD írása üres lemez behelyezésekor"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:224
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:229
 msgid "Command for _Data CDs:"
 msgstr "Parancs _adatlemezekhez:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:231
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:239
 msgid "Command for A_udio CDs:"
 msgstr "Parancs han_g CD lemezekhez:"
 
+#.
 #. Multimedia
-#. 
-#: ../thunar-volman/tvm-preferences-dialog.c:245
+#.
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:255
 msgid "Multimedia"
 msgstr "Multimédia"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:255
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:266
 msgid "Audio CDs"
 msgstr "Hang-CD-k"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:272
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:283
 msgid "Play _audio CDs when inserted"
 msgstr "Hang-CD-k l_ejátszása behelyezéskor"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:277
-#: ../thunar-volman/tvm-preferences-dialog.c:383
-#: ../thunar-volman/tvm-preferences-dialog.c:425
-#: ../thunar-volman/tvm-preferences-dialog.c:499
-#: ../thunar-volman/tvm-preferences-dialog.c:541
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:290
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:415
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:466
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:553
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:601
 msgid "_Command:"
 msgstr "_Parancs:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:287
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:304
 msgid "Video CDs/DVDs"
 msgstr "Videó CD-k/DVD-k"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:304
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:321
 msgid "Play _video CDs and DVDs when inserted"
 msgstr "_Videó CD-k és DVD-k lejátszása behelyezéskor"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:309
-#: ../thunar-volman/tvm-preferences-dialog.c:341
-#: ../thunar-volman/tvm-preferences-dialog.c:457
-#: ../thunar-volman/tvm-preferences-dialog.c:573
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:329
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:367
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:505
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:640
 msgid "C_ommand:"
 msgstr "Pa_rancs:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:319
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:343
 msgid "Portable Music Players"
 msgstr "Hordozható zenelejátszók"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:336
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:360
 msgid "Play _music files when connected"
 msgstr "_Zenei fájlok lejátszása csatlakoztatáskor"
 
+#.
 #. Cameras
-#. 
-#: ../thunar-volman/tvm-preferences-dialog.c:351
+#.
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:379
 msgid "Cameras"
 msgstr "Fényképezőgépek"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:361
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:390
 msgid "Digital Cameras"
 msgstr "Digitális fényképezőgép"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:378
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:407
 msgid "Import digital photographs when connected"
 msgstr "Digitális fényképek importálása csatlakoztatáskor"
 
+#.
 #. PDAs
-#. 
-#: ../thunar-volman/tvm-preferences-dialog.c:393
+#.
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:427
 msgid "PDAs"
 msgstr "PDA-k"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:403
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:441
 msgid "Palm™"
 msgstr "Palm™"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:420
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:458
 msgid "Sync _Palm™ devices when connected"
 msgstr "Pal_m™ eszközök szinkronizálása csatlakoztatáskor"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:435
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:480
 msgid "Pocket PCs"
 msgstr "Zsebszámítógépek"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:452
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:497
 msgid "Sync Pocket P_C devices when connected"
 msgstr "_Zsebszámítógépek szinkronizálása csatlakoztatáskor"
 
+#.
 #. Printers
-#. 
-#: ../thunar-volman/tvm-preferences-dialog.c:467
-#: ../thunar-volman/tvm-preferences-dialog.c:477
+#.
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:517
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:528
 msgid "Printers"
 msgstr "Nyomtatók"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:494
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:545
 msgid "Automatically run a program when a _printer is connected"
 msgstr "Program futtatása automatikusan _nyomtató csatlakoztatásakor"
 
+#.
 #. Input Devices
-#. 
-#: ../thunar-volman/tvm-preferences-dialog.c:509
+#.
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:565
 msgid "Input Devices"
 msgstr "Bemeneti eszközök"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:519
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:576
 msgid "Keyboards"
 msgstr "Billentyűzetek"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:536
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:593
 msgid "Automatically run a program when an USB _keyboard is connected"
 msgstr "Program futtatása automatikusan USB-billentyű_zet csatlakoztatásakor"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:551
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:615
 msgid "Mice"
 msgstr "Egér"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:568
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:632
 msgid "Automatically run a program when an USB _mouse is connected"
 msgstr "Program futtatása automatikusan USB-_egér csatlakoztatásakor"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:583
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:654
 msgid "Tablet"
 msgstr "Digitalizáló tábla"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:600
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:671
 msgid "Automatically run a program when a _tablet is connected"
 msgstr "Program futtatása automatikusan _digitalizáló tábla csatlakoztatásakor"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:605
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:679
 msgid "Com_mand:"
 msgstr "Para_ncs:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:690
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:755
 msgid "Failed to open the documentation browser"
 msgstr "A dokumentációböngésző megnyitása meghiúsult"
 
-#: ../thunar-volman/tvm-run.c:133 ../thunar-volman/tvm-run.c:144
-msgid "Choose Disc Type"
-msgstr "Válasszon lemeztípust"
+#~ msgid "Failed to open display"
+#~ msgstr "A képernyő megnyitása meghiúsult"
 
-#: ../thunar-volman/tvm-run.c:134 ../thunar-volman/tvm-run.c:145
-msgid "You have inserted a blank disc."
-msgstr "A meghajtóban egy üres lemez van."
+#~ msgid "The Thunar development team. All rights reserved."
+#~ msgstr "A Thunar fejlesztői csapata. Minden jog fenntartva."
 
-#: ../thunar-volman/tvm-run.c:135 ../thunar-volman/tvm-run.c:146
-msgid "What would you like to do?"
-msgstr "Mit szeretne tenni?"
+#~ msgid "Written by Benedikt Meurer <benny at xfce.org>."
+#~ msgstr "Írta: Benedikt Meurer <benny at xfce.org>."
 
-#: ../thunar-volman/tvm-run.c:137
-msgid "Make _DVD"
-msgstr "_DVD készítése"
+#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
+#~ msgstr "A megadott UDI („%s”) nem érvényes HAL eszköz UDI"
 
-#: ../thunar-volman/tvm-run.c:148
-msgid "Make _Data CD"
-msgstr "_Adat CD készítése"
+#~ msgid "Encrypted volume"
+#~ msgstr "Titkosított kötet"
 
-#: ../thunar-volman/tvm-run.c:149
-msgid "Make _Audio CD"
-msgstr "_Hang-CD készítése"
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Titkosított kötet csatolása…</span>"
+
+#~ msgid "Setting up the crypto layer..."
+#~ msgstr "A titkosítási réteg beállítása…"
+
+#~ msgid "You are not privileged to setup the crypto layer"
+#~ msgstr "Nincs jogosultsága a titkosítási réteg beállítására"
+
+#~ msgid "Wrong password"
+#~ msgstr "Hibás jelszó"
+
+#~ msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
+#~ msgstr "<span weight=\"bold\" size=\"larger\">Hibás jelszó.</span>"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Ez a kötet titkosítva van.</span>"
+
+#~ msgid "Please enter your password to decrypt and mount the volume."
+#~ msgstr "Adja meg jelszavát a kötet visszafejtéséhez és csatolásához."
+
+#~ msgid "_Mount"
+#~ msgstr "_Csatolás"
+
+#~ msgid "Failed to setup the encrypted volume"
+#~ msgstr "A titkosított kötet beállítása meghiúsult"
+
+#~ msgid "Choose Disc Type"
+#~ msgstr "Válasszon lemeztípust"
+
+#~ msgid "Make _DVD"
+#~ msgstr "_DVD készítése"
 
-#: ../thunar-volman-settings.desktop.in.in.h:3
-msgid "Removable Media"
-msgstr "Cserélhető adathordozók"
+#~ msgid "Removable Media"
+#~ msgstr "Cserélhető adathordozók"
diff --git a/po/id.po b/po/id.po
index 6f67c10..bda02f0 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,458 +7,618 @@ msgid ""
 msgstr ""
 "Project-Id-Version: thunar-volman 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-30 02:26-0700\n"
+"POT-Creation-Date: 2010-07-25 20:06+0200\n"
 "PO-Revision-Date: 2008-09-03 21:13+0700\n"
 "Last-Translator: Andhika Padmawan <andhika.padmawan at gmail.com>\n"
 "Language-Team: Indonesian <id at li.org>\n"
+"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../thunar-volman/main.c:50
-msgid "The HAL device UDI of the newly added device"
+#: ../thunar-volman/main.c:59
+#, fuzzy
+msgid "The syfs path of the newly added device"
 msgstr "UDI divais HAL dari divais yang baru ditambah"
 
-#: ../thunar-volman/main.c:51 ../thunar-volman/tvm-preferences-dialog.c:120
-#: ../thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman/main.c:60
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:104
 msgid "Configure management of removable drives and media"
 msgstr "Pengaturan manajemen dari media dan penggerak dapat dilepas"
 
-#: ../thunar-volman/main.c:52
+#: ../thunar-volman/main.c:61
 msgid "Print version information and exit"
 msgstr "Cetak informasi versi lalu keluar"
 
 #. setup application name
-#: ../thunar-volman/main.c:69
+#: ../thunar-volman/main.c:93
 msgid "Thunar Volume Manager"
 msgstr "Manajer Volume Thunar"
 
-#: ../thunar-volman/main.c:90
-msgid "Failed to open display"
-msgstr "Gagal membuka tampilan"
-
-#: ../thunar-volman/main.c:106
-msgid "The Thunar development team. All rights reserved."
-msgstr "Tim pengembang Thunar. Hak cipta dilindungi undang-undang."
-
-#: ../thunar-volman/main.c:107
-msgid "Written by Benedikt Meurer <benny at xfce.org>."
-msgstr "Ditulis oleh Benedikt Meurer <benny at xfce.org>."
+#: ../thunar-volman/main.c:133
+msgid "All rights reserved."
+msgstr ""
 
-#: ../thunar-volman/main.c:108
+#: ../thunar-volman/main.c:134
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Silakan laporkan kutu ke <%s>."
 
-#. TRANSLATORS: A HAL device UDI must match certain conditions to be valid (to be exact, it must be a valid D-Bus object path)
-#: ../thunar-volman/main.c:133
+#: ../thunar-volman/main.c:188
 #, c-format
-msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
-msgstr "UDI \"%s\" yang ditentukan bukan UDI divais HAL yang sah"
+msgid "There is no device with the sysfs path \"%s\""
+msgstr ""
 
-#. TRANSLATORS: thunar-volman wasn't invoked with either --device-added or --configure.
-#: ../thunar-volman/main.c:144
-#, c-format
-msgid "Must specify the new HAL device UDI with --device-added"
+#: ../thunar-volman/main.c:200
+#, fuzzy, c-format
+msgid "Must specify the sysfs path of new devices with --device-added"
 msgstr "Harus ditentukan UDI divais HAL baru dengan --device-added"
 
 #. ...so we need to prompt what to do
-#: ../thunar-volman/tvm-block-device.c:189
+#: ../thunar-volman/tvm-block-device.c:204
 msgid "Photos and Music"
 msgstr "Foto dan Musik"
 
-#: ../thunar-volman/tvm-block-device.c:190
-msgid "Photos were found on your portable music player."
+#: ../thunar-volman/tvm-block-device.c:205
+#, fuzzy
+msgid "Photos were found on your portable music player"
 msgstr "Foto yang ditemukan pada penggelar musik portable."
 
-#: ../thunar-volman/tvm-block-device.c:191
+#: ../thunar-volman/tvm-block-device.c:206
 msgid "Would you like to import the photos or manage the music?"
 msgstr "Anda ingin mengimpor foto atau mengatur musik?"
 
-#: ../thunar-volman/tvm-block-device.c:192
-#: ../thunar-volman/tvm-block-device.c:258
-#: ../thunar-volman/tvm-block-device.c:335
-#: ../thunar-volman/tvm-block-device.c:371
-#: ../thunar-volman/tvm-block-device.c:430
-#: ../thunar-volman/tvm-block-device.c:703
-#: ../thunar-volman/tvm-crypto-volume.c:448 ../thunar-volman/tvm-run.c:136
-#: ../thunar-volman/tvm-run.c:147
+#: ../thunar-volman/tvm-block-device.c:208
+#: ../thunar-volman/tvm-block-device.c:277
+#: ../thunar-volman/tvm-block-device.c:378
+#: ../thunar-volman/tvm-block-device.c:425
+#: ../thunar-volman/tvm-block-device.c:507
+#: ../thunar-volman/tvm-block-device.c:826 ../thunar-volman/tvm-run.c:196
+#: ../thunar-volman/tvm-run.c:207
 msgid "Ig_nore"
 msgstr "Ab_aikan"
 
-#: ../thunar-volman/tvm-block-device.c:193
-#: ../thunar-volman/tvm-block-device.c:259
+#: ../thunar-volman/tvm-block-device.c:209
+#: ../thunar-volman/tvm-block-device.c:278
 msgid "Import _Photos"
 msgstr "Impor _Foto"
 
-#: ../thunar-volman/tvm-block-device.c:194
+#: ../thunar-volman/tvm-block-device.c:210
 msgid "Manage _Music"
 msgstr "Atur _Musik"
 
-#. ask the user whether to import photos
-#: ../thunar-volman/tvm-block-device.c:255
+#. ask the user to import photos
+#: ../thunar-volman/tvm-block-device.c:273
 msgid "Photo Import"
 msgstr "Impor Foto"
 
-#: ../thunar-volman/tvm-block-device.c:256
-msgid "A photo card has been detected."
+#: ../thunar-volman/tvm-block-device.c:274
+#, fuzzy
+msgid "A photo card has been detected"
 msgstr "Kartu foto telah terdeteksi."
 
-#: ../thunar-volman/tvm-block-device.c:257
+#: ../thunar-volman/tvm-block-device.c:275
 msgid ""
 "There are photos on the card. Would you like to add these photos to your "
 "album?"
 msgstr ""
 "Ada foto di dalam kartu. Anda ingin menyertakan foto ini ke dalam album anda?"
 
-#. prompt the user whether to execute this file
-#: ../thunar-volman/tvm-block-device.c:332
-#: ../thunar-volman/tvm-block-device.c:368
+#. prompt the user to execute the file
+#. prompt the user to execute this file
+#: ../thunar-volman/tvm-block-device.c:373
+#: ../thunar-volman/tvm-block-device.c:420
 #, c-format
 msgid "Would you like to allow \"%s\" to run?"
 msgstr "Anda ingin mengizinkan \"%s\" berjalan?"
 
-#: ../thunar-volman/tvm-block-device.c:333
-#: ../thunar-volman/tvm-block-device.c:369
+#: ../thunar-volman/tvm-block-device.c:376
+#: ../thunar-volman/tvm-block-device.c:423
 msgid "Auto-Run Confirmation"
 msgstr "Konfirmasi Jalan Otomatis"
 
-#: ../thunar-volman/tvm-block-device.c:334
-#: ../thunar-volman/tvm-block-device.c:370
+#: ../thunar-volman/tvm-block-device.c:377
+#: ../thunar-volman/tvm-block-device.c:424
 msgid "Auto-Run capability detected"
 msgstr "Kemampuan Jalan Otomatis terdeteksi"
 
-#: ../thunar-volman/tvm-block-device.c:336
-#: ../thunar-volman/tvm-block-device.c:372
+#: ../thunar-volman/tvm-block-device.c:379
+#: ../thunar-volman/tvm-block-device.c:426
 msgid "_Allow Auto-Run"
 msgstr "_Izinkan Jalan Otomatis"
 
 #. prompt the user whether to autoopen this file
-#: ../thunar-volman/tvm-block-device.c:427
+#: ../thunar-volman/tvm-block-device.c:502
 #, c-format
 msgid "Would you like to open \"%s\"?"
 msgstr "Anda ingin membuka \"%s\"?"
 
-#: ../thunar-volman/tvm-block-device.c:428
+#: ../thunar-volman/tvm-block-device.c:505
 msgid "Auto-Open Confirmation"
 msgstr "Konfirmasi Buka Otomatis"
 
-#: ../thunar-volman/tvm-block-device.c:429
+#: ../thunar-volman/tvm-block-device.c:506
 msgid "Auto-Open capability detected"
 msgstr "Kemampuan Buka Otomatis terdeteksi"
 
-#: ../thunar-volman/tvm-block-device.c:431
+#: ../thunar-volman/tvm-block-device.c:508
 msgid "_Open"
 msgstr "_Buka"
 
-#. ask what do with the mixed audio/data disc
-#: ../thunar-volman/tvm-block-device.c:700
-msgid "Audio / Data CD"
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "CD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "DVD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:618
+msgid "The CD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:619
+msgid "The DVD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:629
+msgid "Volume mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:632
+#, c-format
+msgid "The volume \"%s\" was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:637
+#, c-format
+msgid "The inserted volume was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:691
+#, c-format
+msgid "Unable to locate mount point"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:737
+#, c-format
+msgid "Unable to mount the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:746
+#, c-format
+msgid "Could not detect the volume corresponding to the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:821
+#, fuzzy
+msgid "Audio/Data CD"
 msgstr "CD Data / Audio"
 
-#: ../thunar-volman/tvm-block-device.c:701
-msgid "The CD in the drive contains both music and files."
+#: ../thunar-volman/tvm-block-device.c:822
+#, fuzzy
+msgid "The CD in the drive contains both music and files"
 msgstr "CD di dalam penggerak berisi musik dan berkas."
 
-#: ../thunar-volman/tvm-block-device.c:702
+#: ../thunar-volman/tvm-block-device.c:824
 msgid "Would you like to listen to music or browse the files?"
 msgstr "Anda ingin mendengarkan musik atau meramban berkas?"
 
-#: ../thunar-volman/tvm-block-device.c:704
+#: ../thunar-volman/tvm-block-device.c:827
 msgid "_Browse Files"
 msgstr "_Ramban Berkas"
 
-#: ../thunar-volman/tvm-block-device.c:705
+#: ../thunar-volman/tvm-block-device.c:828
 msgid "_Play CD"
 msgstr "_Putar CD"
 
-#: ../thunar-volman/tvm-command-entry.c:233
-msgid "Select an Application"
-msgstr "Pilih Aplikasi"
+#: ../thunar-volman/tvm-block-device.c:916
+#, c-format
+msgid "Unknown block device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:243
-msgid "All Files"
-msgstr "Semua Berkas"
+#: ../thunar-volman/tvm-device.c:139
+#, c-format
+msgid "Device type not supported"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:248
-msgid "Executable Files"
-msgstr "Berkas Dapat Dieksekusi"
+#: ../thunar-volman/tvm-input-device.c:74
+#, fuzzy
+msgid "input-keyboard"
+msgstr "Papan Ketik"
 
-#: ../thunar-volman/tvm-command-entry.c:263
-msgid "Perl Scripts"
-msgstr "Skrip Perl"
+#: ../thunar-volman/tvm-input-device.c:75
+#, fuzzy
+msgid "Keyboard detected"
+msgstr "Papan Ketik"
 
-#: ../thunar-volman/tvm-command-entry.c:269
-msgid "Python Scripts"
-msgstr "Skrip Python"
+#: ../thunar-volman/tvm-input-device.c:76
+#, fuzzy
+msgid "A keyboard was detected"
+msgstr "Kartu foto telah terdeteksi."
 
-#: ../thunar-volman/tvm-command-entry.c:275
-msgid "Ruby Scripts"
-msgstr "Skrip Ruby"
+#: ../thunar-volman/tvm-input-device.c:86
+#: ../thunar-volman/tvm-input-device.c:100
+msgid "input-tablet"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:281
-msgid "Shell Scripts"
-msgstr "Skrip Shell"
+#: ../thunar-volman/tvm-input-device.c:87
+#: ../thunar-volman/tvm-input-device.c:101
+#, fuzzy
+msgid "Tablet detected"
+msgstr "Kemampuan Jalan Otomatis terdeteksi"
 
-#: ../thunar-volman/tvm-crypto-volume.c:286
-#: ../thunar-volman/tvm-crypto-volume.c:443
-msgid "Encrypted volume"
-msgstr "Volume terenkripsi"
+#: ../thunar-volman/tvm-input-device.c:88
+#: ../thunar-volman/tvm-input-device.c:102
+msgid "A graphics tablet was detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:297
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
+#: ../thunar-volman/tvm-input-device.c:110
+msgid "input-mouse"
+msgstr ""
+
+#: ../thunar-volman/tvm-input-device.c:111
+msgid "Mouse detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-input-device.c:112
+msgid "A mouse was detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-input-device.c:139
+#, c-format
+msgid "Unsupported input device type"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:173
+#, c-format
+msgid "Autoburning of blank CDs and DVDs is disabled"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Mengaitkan volume terenkripsi...</span>"
 
-#: ../thunar-volman/tvm-crypto-volume.c:302
-msgid "Setting up the crypto layer..."
-msgstr "Mengatur lapisan kripto..."
+#: ../thunar-volman/tvm-run.c:193
+msgid "Blank DVD inserted"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:194
+#, fuzzy
+msgid "You have inserted a blank DVD."
+msgstr "Anda telah memasukkan cakram kosong."
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) but got Permission denied.
-#: ../thunar-volman/tvm-crypto-volume.c:369
+#: ../thunar-volman/tvm-run.c:195 ../thunar-volman/tvm-run.c:206
+msgid "What would you like to do?"
+msgstr "Apa yang ingin anda lakukan?"
+
+#: ../thunar-volman/tvm-run.c:197
+msgid "Burn _DVD"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:204
+#, fuzzy
+msgid "Blank CD inserted"
+msgstr "CD dan DVD kosong"
+
+#: ../thunar-volman/tvm-run.c:205
+#, fuzzy
+msgid "You have inserted a blank CD."
+msgstr "Anda telah memasukkan cakram kosong."
+
+#: ../thunar-volman/tvm-run.c:208
+#, fuzzy
+msgid "Burn _Data CD"
+msgstr "Buat CD _Data"
+
+#: ../thunar-volman/tvm-run.c:209
+#, fuzzy
+msgid "Burn _Audio CD"
+msgstr "Buat CD _Audio"
+
+#: ../thunar-volman/tvm-run.c:233
 #, c-format
-msgid "You are not privileged to setup the crypto layer"
-msgstr "Anda tidak diizinkan untuk mengatur lapisan kripto"
+msgid "The burn command may not be empty"
+msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) and typed the wrong password.
-#: ../thunar-volman/tvm-crypto-volume.c:374
+#: ../thunar-volman/tvm-run.c:272
 #, c-format
-msgid "Wrong password"
-msgstr "Sandi lewat salah"
+msgid "The CD player command is undefined"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:66
+msgid "Camera detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:445
-msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Sandi lewat salah.</span>"
+#: ../thunar-volman/tvm-usb-device.c:67
+#, fuzzy
+msgid "A photo camera was detected"
+msgstr "Kartu foto telah terdeteksi."
 
-#: ../thunar-volman/tvm-crypto-volume.c:446
-msgid "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Volume ini terenkripsi.</span>"
+#: ../thunar-volman/tvm-usb-device.c:77
+msgid "Printer detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:447
-msgid "Please enter your password to decrypt and mount the volume."
-msgstr "Silakan masukkan sandi lewat anda untuk mendekripsi dan mengaitkan "
-"volume."
+#: ../thunar-volman/tvm-usb-device.c:78
+msgid "A USB printer was detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:449
-msgid "_Mount"
-msgstr "_Kait"
+#: ../thunar-volman/tvm-usb-device.c:104
+#, c-format
+msgid "Unsupported USB device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:468
-msgid "Failed to setup the encrypted volume"
-msgstr "Gagal untuk mengatur volume terenkripsi"
+#. setup application name
+#: ../thunar-volman-settings/main.c:52
+#, fuzzy
+msgid "Thunar Volume Manager Settings"
+msgstr "Manajer Volume Thunar"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:119
-#: ../thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:102
 msgid "Removable Drives and Media"
 msgstr "Media dan Penggerak Dapat Dilepas"
 
+#: ../thunar-volman-settings/tvm-command-entry.c:240
+msgid "Select an Application"
+msgstr "Pilih Aplikasi"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:250
+msgid "All Files"
+msgstr "Semua Berkas"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:255
+msgid "Executable Files"
+msgstr "Berkas Dapat Dieksekusi"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:270
+msgid "Perl Scripts"
+msgstr "Skrip Perl"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:276
+msgid "Python Scripts"
+msgstr "Skrip Python"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:282
+msgid "Ruby Scripts"
+msgstr "Skrip Ruby"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:288
+msgid "Shell Scripts"
+msgstr "Skrip Shell"
+
 #.
 #. Storage
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:143
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:130
 msgid "Storage"
 msgstr "Penyimpan"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:153
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:141
 msgid "Removable Storage"
 msgstr "Penyimpan Dapat Dilepas"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:170
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:158
 msgid "_Mount removable drives when hot-plugged"
 msgstr "_Mount penggerak dapat dilepas ketika hot-plug"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:175
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:166
 msgid "Mount removable media when _inserted"
 msgstr "Mount media dapat dilepas ketika d_imasukkan"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:180
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:174
 msgid "B_rowse removable media when inserted"
 msgstr "R_amban media dapat dilepas ketika dimasukkan"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:185
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:182
 msgid "_Auto-run programs on new drives and media"
 msgstr "_Jalankan otomatis program pada penggerak dan media baru"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:190
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:189
 msgid "Auto-open files on new drives and media"
 msgstr "Buka otomatis berkas pada penggerak dan media baru"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:199
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:201
 msgid "Blank CDs and DVDs"
 msgstr "CD dan DVD kosong"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:216
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:218
 msgid "_Burn a CD or DVD when a blank disc is inserted"
 msgstr "_Bakar CD atau DVD ketika cakram kosong dimasukkan"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:224
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:229
 msgid "Command for _Data CDs:"
 msgstr "Perintah untuk CD _Data:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:231
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:239
 msgid "Command for A_udio CDs:"
 msgstr "Perintah untuk CD A_udio:"
 
 #.
 #. Multimedia
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:245
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:255
 msgid "Multimedia"
 msgstr "Multimedia"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:255
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:266
 msgid "Audio CDs"
 msgstr "CD Audio"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:272
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:283
 msgid "Play _audio CDs when inserted"
 msgstr "Putar CD _audio ketika dimasukkan"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:277
-#: ../thunar-volman/tvm-preferences-dialog.c:383
-#: ../thunar-volman/tvm-preferences-dialog.c:425
-#: ../thunar-volman/tvm-preferences-dialog.c:499
-#: ../thunar-volman/tvm-preferences-dialog.c:541
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:290
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:415
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:466
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:553
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:601
 msgid "_Command:"
 msgstr "_Perintah:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:287
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:304
 msgid "Video CDs/DVDs"
 msgstr "Video CD/DVD"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:304
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:321
 msgid "Play _video CDs and DVDs when inserted"
 msgstr "Putar _video CD dan DVD ketika dimasukkan"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:309
-#: ../thunar-volman/tvm-preferences-dialog.c:341
-#: ../thunar-volman/tvm-preferences-dialog.c:457
-#: ../thunar-volman/tvm-preferences-dialog.c:573
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:329
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:367
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:505
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:640
 msgid "C_ommand:"
 msgstr "P_erintah:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:319
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:343
 msgid "Portable Music Players"
 msgstr "Penggelar Musik Portable"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:336
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:360
 msgid "Play _music files when connected"
 msgstr "Putar berkas _musik ketika tersambung"
 
 #.
 #. Cameras
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:351
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:379
 msgid "Cameras"
 msgstr "Kamera"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:361
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:390
 msgid "Digital Cameras"
 msgstr "Kamera Digital"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:378
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:407
 msgid "Import digital photographs when connected"
 msgstr "Impor foto digital ketika tersambung"
 
 #.
 #. PDAs
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:393
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:427
 msgid "PDAs"
 msgstr "PDA"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:403
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:441
 msgid "Palm™"
 msgstr "Palm™"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:420
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:458
 msgid "Sync _Palm™ devices when connected"
 msgstr "Sinkronasi divais _Palm™ ketika tersambung"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:435
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:480
 msgid "Pocket PCs"
 msgstr "PC Saku"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:452
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:497
 msgid "Sync Pocket P_C devices when connected"
 msgstr "Sinkronasi divais P_C Saku ketika tersambung"
 
 #.
 #. Printers
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:467
-#: ../thunar-volman/tvm-preferences-dialog.c:477
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:517
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:528
 msgid "Printers"
 msgstr "Pencetak"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:494
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:545
 msgid "Automatically run a program when a _printer is connected"
 msgstr "Otomatis menjalankan program ketika _pencetak tersambung"
 
 #.
 #. Input Devices
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:509
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:565
 msgid "Input Devices"
 msgstr "Divais Masukan"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:519
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:576
 msgid "Keyboards"
 msgstr "Papan Ketik"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:536
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:593
 msgid "Automatically run a program when an USB _keyboard is connected"
 msgstr "Otomatis menjalankan program ketika papan _ketik USB tersambung"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:551
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:615
 msgid "Mice"
 msgstr "Tetikus"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:568
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:632
 msgid "Automatically run a program when an USB _mouse is connected"
 msgstr "Otomatis menjalankan program ketika _tetikus USB tersambung"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:583
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:654
 msgid "Tablet"
 msgstr "Tablet"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:600
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:671
 msgid "Automatically run a program when a _tablet is connected"
 msgstr "Otomatis menjalankan program ketika _tablet tersambung"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:605
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:679
 msgid "Com_mand:"
 msgstr "Per_intah:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:690
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:755
 msgid "Failed to open the documentation browser"
 msgstr "Gagal membuka peramban dokumentasi"
 
-#: ../thunar-volman/tvm-run.c:133 ../thunar-volman/tvm-run.c:144
-msgid "Choose Disc Type"
-msgstr "Pilih Tipe Cakram"
+#~ msgid "Failed to open display"
+#~ msgstr "Gagal membuka tampilan"
 
-#: ../thunar-volman/tvm-run.c:134 ../thunar-volman/tvm-run.c:145
-msgid "You have inserted a blank disc."
-msgstr "Anda telah memasukkan cakram kosong."
+#~ msgid "The Thunar development team. All rights reserved."
+#~ msgstr "Tim pengembang Thunar. Hak cipta dilindungi undang-undang."
 
-#: ../thunar-volman/tvm-run.c:135 ../thunar-volman/tvm-run.c:146
-msgid "What would you like to do?"
-msgstr "Apa yang ingin anda lakukan?"
+#~ msgid "Written by Benedikt Meurer <benny at xfce.org>."
+#~ msgstr "Ditulis oleh Benedikt Meurer <benny at xfce.org>."
 
-#: ../thunar-volman/tvm-run.c:137
-msgid "Make _DVD"
-msgstr "Buat _DVD"
+#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
+#~ msgstr "UDI \"%s\" yang ditentukan bukan UDI divais HAL yang sah"
 
-#: ../thunar-volman/tvm-run.c:148
-msgid "Make _Data CD"
-msgstr "Buat CD _Data"
+#~ msgid "Encrypted volume"
+#~ msgstr "Volume terenkripsi"
 
-#: ../thunar-volman/tvm-run.c:149
-msgid "Make _Audio CD"
-msgstr "Buat CD _Audio"
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Mengaitkan volume terenkripsi...</"
+#~ "span>"
+
+#~ msgid "Setting up the crypto layer..."
+#~ msgstr "Mengatur lapisan kripto..."
+
+#~ msgid "You are not privileged to setup the crypto layer"
+#~ msgstr "Anda tidak diizinkan untuk mengatur lapisan kripto"
+
+#~ msgid "Wrong password"
+#~ msgstr "Sandi lewat salah"
+
+#~ msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
+#~ msgstr "<span weight=\"bold\" size=\"larger\">Sandi lewat salah.</span>"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Volume ini terenkripsi.</span>"
+
+#~ msgid "Please enter your password to decrypt and mount the volume."
+#~ msgstr ""
+#~ "Silakan masukkan sandi lewat anda untuk mendekripsi dan mengaitkan volume."
+
+#~ msgid "_Mount"
+#~ msgstr "_Kait"
+
+#~ msgid "Failed to setup the encrypted volume"
+#~ msgstr "Gagal untuk mengatur volume terenkripsi"
+
+#~ msgid "Choose Disc Type"
+#~ msgstr "Pilih Tipe Cakram"
+
+#~ msgid "Make _DVD"
+#~ msgstr "Buat _DVD"
 
-#: ../thunar-volman-settings.desktop.in.in.h:3
-msgid "Removable Media"
-msgstr "Media Dapat Dilepas"
+#~ msgid "Removable Media"
+#~ msgstr "Media Dapat Dilepas"
diff --git a/po/it.po b/po/it.po
index f69334e..319b91b 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,11 +8,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: thunar-volman 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-30 02:26-0700\n"
+"POT-Creation-Date: 2010-07-25 20:06+0200\n"
 "PO-Revision-Date: 2010-03-26 11:30+0100\n"
 "Last-Translator: Cristian Marchi <cri.penta at gmail.com>\n"
 "Language-Team: Italian Translation Team <xfce-it-translators at googlegroups."
 "com>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,449 +24,607 @@ msgstr ""
 # drive = unità
 # encrypted = cifrato
 # media = disco (non è un contenuto ma bensì il supporto)
-#: ../thunar-volman/main.c:50
-msgid "The HAL device UDI of the newly added device"
+#: ../thunar-volman/main.c:59
+#, fuzzy
+msgid "The syfs path of the newly added device"
 msgstr "L'UDI HAL del dispositivo aggiunto recentemente"
 
-#: ../thunar-volman/main.c:51 ../thunar-volman/tvm-preferences-dialog.c:120
-#: ../thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman/main.c:60
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:104
 msgid "Configure management of removable drives and media"
 msgstr "Configurazione della gestione delle unità rimovibili e dei dischi"
 
-#: ../thunar-volman/main.c:52
+#: ../thunar-volman/main.c:61
 msgid "Print version information and exit"
 msgstr "Stampa le informazioni di versione ed esce"
 
 #. setup application name
-#: ../thunar-volman/main.c:69
+#: ../thunar-volman/main.c:93
 msgid "Thunar Volume Manager"
 msgstr "Gestore dei volumi di Thunar"
 
-#: ../thunar-volman/main.c:90
-msgid "Failed to open display"
-msgstr "Apertura dello schermo non riuscita"
-
-#: ../thunar-volman/main.c:106
-msgid "The Thunar development team. All rights reserved."
-msgstr "Il gruppo di sviluppo di Thunar. Tutti i diritti riservati."
-
-#: ../thunar-volman/main.c:107
-msgid "Written by Benedikt Meurer <benny at xfce.org>."
-msgstr "Scritto da Benedikt Meurer <benny at xfce.org>."
+#: ../thunar-volman/main.c:133
+msgid "All rights reserved."
+msgstr ""
 
-#: ../thunar-volman/main.c:108
+#: ../thunar-volman/main.c:134
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Segnalare i problemi a <%s>."
 
-#. TRANSLATORS: A HAL device UDI must match certain conditions to be valid (to be exact, it must be a valid D-Bus object path)
-#: ../thunar-volman/main.c:133
+#: ../thunar-volman/main.c:188
 #, c-format
-msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
-msgstr "L'UDI \"%s\" specificato non è un UDI HAL di dispositivo valido"
+msgid "There is no device with the sysfs path \"%s\""
+msgstr ""
 
-#. TRANSLATORS: thunar-volman wasn't invoked with either --device-added or --configure.
-#: ../thunar-volman/main.c:144
-#, c-format
-msgid "Must specify the new HAL device UDI with --device-added"
+#: ../thunar-volman/main.c:200
+#, fuzzy, c-format
+msgid "Must specify the sysfs path of new devices with --device-added"
 msgstr "Si deve specificare l'UDI HAL del dispositivo con --device-added"
 
 #. ...so we need to prompt what to do
-#: ../thunar-volman/tvm-block-device.c:189
+#: ../thunar-volman/tvm-block-device.c:204
 msgid "Photos and Music"
 msgstr "Foto e musica"
 
-#: ../thunar-volman/tvm-block-device.c:190
-msgid "Photos were found on your portable music player."
+#: ../thunar-volman/tvm-block-device.c:205
+#, fuzzy
+msgid "Photos were found on your portable music player"
 msgstr "Sono state trovate delle foto nel riproduttore musicale portatile."
 
-#: ../thunar-volman/tvm-block-device.c:191
+#: ../thunar-volman/tvm-block-device.c:206
 msgid "Would you like to import the photos or manage the music?"
 msgstr "Si desidera importare le foto o gestire la musica?"
 
-#: ../thunar-volman/tvm-block-device.c:192
-#: ../thunar-volman/tvm-block-device.c:258
-#: ../thunar-volman/tvm-block-device.c:335
-#: ../thunar-volman/tvm-block-device.c:371
-#: ../thunar-volman/tvm-block-device.c:430
-#: ../thunar-volman/tvm-block-device.c:703
-#: ../thunar-volman/tvm-crypto-volume.c:448 ../thunar-volman/tvm-run.c:136
-#: ../thunar-volman/tvm-run.c:147
+#: ../thunar-volman/tvm-block-device.c:208
+#: ../thunar-volman/tvm-block-device.c:277
+#: ../thunar-volman/tvm-block-device.c:378
+#: ../thunar-volman/tvm-block-device.c:425
+#: ../thunar-volman/tvm-block-device.c:507
+#: ../thunar-volman/tvm-block-device.c:826 ../thunar-volman/tvm-run.c:196
+#: ../thunar-volman/tvm-run.c:207
 msgid "Ig_nore"
 msgstr "Ig_nora"
 
-#: ../thunar-volman/tvm-block-device.c:193
-#: ../thunar-volman/tvm-block-device.c:259
+#: ../thunar-volman/tvm-block-device.c:209
+#: ../thunar-volman/tvm-block-device.c:278
 msgid "Import _Photos"
 msgstr "Importa le _foto"
 
-#: ../thunar-volman/tvm-block-device.c:194
+#: ../thunar-volman/tvm-block-device.c:210
 msgid "Manage _Music"
 msgstr "Gestisci la _musica"
 
-#. ask the user whether to import photos
-#: ../thunar-volman/tvm-block-device.c:255
+#. ask the user to import photos
+#: ../thunar-volman/tvm-block-device.c:273
 msgid "Photo Import"
 msgstr "Importazione foto"
 
-#: ../thunar-volman/tvm-block-device.c:256
-msgid "A photo card has been detected."
+#: ../thunar-volman/tvm-block-device.c:274
+#, fuzzy
+msgid "A photo card has been detected"
 msgstr "È stata rilevata una scheda per foto."
 
-#: ../thunar-volman/tvm-block-device.c:257
+#: ../thunar-volman/tvm-block-device.c:275
 msgid ""
 "There are photos on the card. Would you like to add these photos to your "
 "album?"
 msgstr "La scheda contiene delle foto. Aggiungerle al proprio album?"
 
-#. prompt the user whether to execute this file
-#: ../thunar-volman/tvm-block-device.c:332
-#: ../thunar-volman/tvm-block-device.c:368
+#. prompt the user to execute the file
+#. prompt the user to execute this file
+#: ../thunar-volman/tvm-block-device.c:373
+#: ../thunar-volman/tvm-block-device.c:420
 #, c-format
 msgid "Would you like to allow \"%s\" to run?"
 msgstr "Consentire l'esecuzione di \"%s\"?"
 
-#: ../thunar-volman/tvm-block-device.c:333
-#: ../thunar-volman/tvm-block-device.c:369
+#: ../thunar-volman/tvm-block-device.c:376
+#: ../thunar-volman/tvm-block-device.c:423
 msgid "Auto-Run Confirmation"
 msgstr "Conferma di esecuzione automatica"
 
-#: ../thunar-volman/tvm-block-device.c:334
-#: ../thunar-volman/tvm-block-device.c:370
+#: ../thunar-volman/tvm-block-device.c:377
+#: ../thunar-volman/tvm-block-device.c:424
 msgid "Auto-Run capability detected"
 msgstr "Rilevate capacità di esecuzione automatica"
 
-#: ../thunar-volman/tvm-block-device.c:336
-#: ../thunar-volman/tvm-block-device.c:372
+#: ../thunar-volman/tvm-block-device.c:379
+#: ../thunar-volman/tvm-block-device.c:426
 msgid "_Allow Auto-Run"
 msgstr "_Permetti l'esecuzione automatica"
 
 #. prompt the user whether to autoopen this file
-#: ../thunar-volman/tvm-block-device.c:427
+#: ../thunar-volman/tvm-block-device.c:502
 #, c-format
 msgid "Would you like to open \"%s\"?"
 msgstr "Aprire \"%s\"?"
 
-#: ../thunar-volman/tvm-block-device.c:428
+#: ../thunar-volman/tvm-block-device.c:505
 msgid "Auto-Open Confirmation"
 msgstr "Conferma dell'apertura automatica"
 
-#: ../thunar-volman/tvm-block-device.c:429
+#: ../thunar-volman/tvm-block-device.c:506
 msgid "Auto-Open capability detected"
 msgstr "Rilevata capacità di apertura automatica"
 
-#: ../thunar-volman/tvm-block-device.c:431
+#: ../thunar-volman/tvm-block-device.c:508
 msgid "_Open"
 msgstr "_Apri"
 
-#. ask what do with the mixed audio/data disc
-#: ../thunar-volman/tvm-block-device.c:700
-msgid "Audio / Data CD"
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "CD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "DVD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:618
+msgid "The CD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:619
+msgid "The DVD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:629
+msgid "Volume mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:632
+#, c-format
+msgid "The volume \"%s\" was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:637
+#, c-format
+msgid "The inserted volume was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:691
+#, c-format
+msgid "Unable to locate mount point"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:737
+#, c-format
+msgid "Unable to mount the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:746
+#, c-format
+msgid "Could not detect the volume corresponding to the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:821
+#, fuzzy
+msgid "Audio/Data CD"
 msgstr "CD Audio e dati"
 
-#: ../thunar-volman/tvm-block-device.c:701
-msgid "The CD in the drive contains both music and files."
+#: ../thunar-volman/tvm-block-device.c:822
+#, fuzzy
+msgid "The CD in the drive contains both music and files"
 msgstr "Il CD nell'unità contiene sia musica che file."
 
-#: ../thunar-volman/tvm-block-device.c:702
+#: ../thunar-volman/tvm-block-device.c:824
 msgid "Would you like to listen to music or browse the files?"
 msgstr "Si desidera ascoltare la musica o sfogliare i file?"
 
-#: ../thunar-volman/tvm-block-device.c:704
+#: ../thunar-volman/tvm-block-device.c:827
 msgid "_Browse Files"
 msgstr "Sfoglia i _file"
 
-#: ../thunar-volman/tvm-block-device.c:705
+#: ../thunar-volman/tvm-block-device.c:828
 msgid "_Play CD"
 msgstr "_Riproduci il CD"
 
-#: ../thunar-volman/tvm-command-entry.c:233
-msgid "Select an Application"
-msgstr "Selezionare un'applicazione"
+#: ../thunar-volman/tvm-block-device.c:916
+#, c-format
+msgid "Unknown block device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:243
-msgid "All Files"
-msgstr "Tutti i file"
+#: ../thunar-volman/tvm-device.c:139
+#, c-format
+msgid "Device type not supported"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:248
-msgid "Executable Files"
-msgstr "File eseguibili"
+#: ../thunar-volman/tvm-input-device.c:74
+#, fuzzy
+msgid "input-keyboard"
+msgstr "Tastiere"
 
-#: ../thunar-volman/tvm-command-entry.c:263
-msgid "Perl Scripts"
-msgstr "Script di Perl"
+#: ../thunar-volman/tvm-input-device.c:75
+#, fuzzy
+msgid "Keyboard detected"
+msgstr "Tastiere"
 
-#: ../thunar-volman/tvm-command-entry.c:269
-msgid "Python Scripts"
-msgstr "Script di Python"
+#: ../thunar-volman/tvm-input-device.c:76
+#, fuzzy
+msgid "A keyboard was detected"
+msgstr "È stata rilevata una scheda per foto."
 
-#: ../thunar-volman/tvm-command-entry.c:275
-msgid "Ruby Scripts"
-msgstr "Script di Ruby"
+#: ../thunar-volman/tvm-input-device.c:86
+#: ../thunar-volman/tvm-input-device.c:100
+msgid "input-tablet"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:281
-msgid "Shell Scripts"
-msgstr "Script per la Shell"
+#: ../thunar-volman/tvm-input-device.c:87
+#: ../thunar-volman/tvm-input-device.c:101
+#, fuzzy
+msgid "Tablet detected"
+msgstr "Rilevate capacità di esecuzione automatica"
 
-#: ../thunar-volman/tvm-crypto-volume.c:286
-#: ../thunar-volman/tvm-crypto-volume.c:443
-msgid "Encrypted volume"
-msgstr "Volume cifrato"
+#: ../thunar-volman/tvm-input-device.c:88
+#: ../thunar-volman/tvm-input-device.c:102
+msgid "A graphics tablet was detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:297
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
+#: ../thunar-volman/tvm-input-device.c:110
+msgid "input-mouse"
+msgstr ""
+
+#: ../thunar-volman/tvm-input-device.c:111
+msgid "Mouse detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-input-device.c:112
+msgid "A mouse was detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-input-device.c:139
+#, c-format
+msgid "Unsupported input device type"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:173
+#, c-format
+msgid "Autoburning of blank CDs and DVDs is disabled"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Montaggio del volume cifrato in "
-"corso...</span>"
 
-#: ../thunar-volman/tvm-crypto-volume.c:302
-msgid "Setting up the crypto layer..."
-msgstr "Impostazione del livello cifrato in corso..."
+#: ../thunar-volman/tvm-run.c:193
+msgid "Blank DVD inserted"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:194
+#, fuzzy
+msgid "You have inserted a blank DVD."
+msgstr "È stato inserito un disco vuoto."
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) but got Permission denied.
-#: ../thunar-volman/tvm-crypto-volume.c:369
+#: ../thunar-volman/tvm-run.c:195 ../thunar-volman/tvm-run.c:206
+msgid "What would you like to do?"
+msgstr "Cosa si desidera fare?"
+
+#: ../thunar-volman/tvm-run.c:197
+msgid "Burn _DVD"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:204
+#, fuzzy
+msgid "Blank CD inserted"
+msgstr "CD e DVD vuoti"
+
+#: ../thunar-volman/tvm-run.c:205
+#, fuzzy
+msgid "You have inserted a blank CD."
+msgstr "È stato inserito un disco vuoto."
+
+#: ../thunar-volman/tvm-run.c:208
+#, fuzzy
+msgid "Burn _Data CD"
+msgstr "Crea CD da_ti"
+
+#: ../thunar-volman/tvm-run.c:209
+#, fuzzy
+msgid "Burn _Audio CD"
+msgstr "Crea CD _audio"
+
+#: ../thunar-volman/tvm-run.c:233
 #, c-format
-msgid "You are not privileged to setup the crypto layer"
-msgstr "Non si posseggono i privilegi per impostare il livello cifrato"
+msgid "The burn command may not be empty"
+msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) and typed the wrong password.
-#: ../thunar-volman/tvm-crypto-volume.c:374
+#: ../thunar-volman/tvm-run.c:272
 #, c-format
-msgid "Wrong password"
-msgstr "Password errata"
+msgid "The CD player command is undefined"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:66
+msgid "Camera detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:445
-msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Password errata.</span>"
+#: ../thunar-volman/tvm-usb-device.c:67
+#, fuzzy
+msgid "A photo camera was detected"
+msgstr "È stata rilevata una scheda per foto."
 
-#: ../thunar-volman/tvm-crypto-volume.c:446
-msgid "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Questo volume è cifrato.</span>"
+#: ../thunar-volman/tvm-usb-device.c:77
+msgid "Printer detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:447
-msgid "Please enter your password to decrypt and mount the volume."
-msgstr "Inserire la password per decifrare e montare il volume."
+#: ../thunar-volman/tvm-usb-device.c:78
+msgid "A USB printer was detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:449
-msgid "_Mount"
-msgstr "_Monta"
+#: ../thunar-volman/tvm-usb-device.c:104
+#, c-format
+msgid "Unsupported USB device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:468
-msgid "Failed to setup the encrypted volume"
-msgstr "Impostazione del volume cifrato non riuscita"
+#. setup application name
+#: ../thunar-volman-settings/main.c:52
+#, fuzzy
+msgid "Thunar Volume Manager Settings"
+msgstr "Gestore dei volumi di Thunar"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:119
-#: ../thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:102
 msgid "Removable Drives and Media"
 msgstr "Unità rimovibili e dischi"
 
+#: ../thunar-volman-settings/tvm-command-entry.c:240
+msgid "Select an Application"
+msgstr "Selezionare un'applicazione"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:250
+msgid "All Files"
+msgstr "Tutti i file"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:255
+msgid "Executable Files"
+msgstr "File eseguibili"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:270
+msgid "Perl Scripts"
+msgstr "Script di Perl"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:276
+msgid "Python Scripts"
+msgstr "Script di Python"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:282
+msgid "Ruby Scripts"
+msgstr "Script di Ruby"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:288
+msgid "Shell Scripts"
+msgstr "Script per la Shell"
+
 #.
 #. Storage
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:143
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:130
 msgid "Storage"
 msgstr "Archiviazione"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:153
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:141
 msgid "Removable Storage"
 msgstr "Dispositivi rimovibili di archiviazione"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:170
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:158
 msgid "_Mount removable drives when hot-plugged"
 msgstr "_Monta i dispositivi rimovibili collegati"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:175
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:166
 msgid "Mount removable media when _inserted"
 msgstr "Monta i dischi rimovibili ins_eriti"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:180
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:174
 msgid "B_rowse removable media when inserted"
 msgstr "S_foglia i dischi rimovibili inseriti"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:185
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:182
 msgid "_Auto-run programs on new drives and media"
 msgstr "Esegui au_tomaticamente i programmi sulle nuove unità o dischi"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:190
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:189
 msgid "Auto-open files on new drives and media"
 msgstr "Apri automaticamente i file sulle nuove unità o dischi"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:199
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:201
 msgid "Blank CDs and DVDs"
 msgstr "CD e DVD vuoti"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:216
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:218
 msgid "_Burn a CD or DVD when a blank disc is inserted"
 msgstr "Ma_sterizza un CD o DVD quando viene inserito un disco vuoto"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:224
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:229
 msgid "Command for _Data CDs:"
 msgstr "Comando per i CD _dati:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:231
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:239
 msgid "Command for A_udio CDs:"
 msgstr "Comando per i CD a_udio:"
 
 #.
 #. Multimedia
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:245
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:255
 msgid "Multimedia"
 msgstr "Contenuti multimediali"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:255
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:266
 msgid "Audio CDs"
 msgstr "CD audio"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:272
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:283
 msgid "Play _audio CDs when inserted"
 msgstr "Riproduci i CD _audio quando inseriti"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:277
-#: ../thunar-volman/tvm-preferences-dialog.c:383
-#: ../thunar-volman/tvm-preferences-dialog.c:425
-#: ../thunar-volman/tvm-preferences-dialog.c:499
-#: ../thunar-volman/tvm-preferences-dialog.c:541
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:290
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:415
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:466
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:553
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:601
 msgid "_Command:"
 msgstr "C_omando:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:287
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:304
 msgid "Video CDs/DVDs"
 msgstr "Video CD/DVD"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:304
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:321
 msgid "Play _video CDs and DVDs when inserted"
 msgstr "Riproduci i _video CD e DVD inseriti"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:309
-#: ../thunar-volman/tvm-preferences-dialog.c:341
-#: ../thunar-volman/tvm-preferences-dialog.c:457
-#: ../thunar-volman/tvm-preferences-dialog.c:573
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:329
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:367
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:505
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:640
 msgid "C_ommand:"
 msgstr "Co_mando:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:319
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:343
 msgid "Portable Music Players"
 msgstr "Riproduttori musicali portatili"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:336
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:360
 msgid "Play _music files when connected"
 msgstr "Riproduci i file m_usicali quando collegato"
 
 #.
 #. Cameras
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:351
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:379
 msgid "Cameras"
 msgstr "Fotocamere"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:361
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:390
 msgid "Digital Cameras"
 msgstr "Fotocamere digitali"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:378
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:407
 msgid "Import digital photographs when connected"
 msgstr "Importa le fotografie digitali quando collegato"
 
 #.
 #. PDAs
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:393
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:427
 msgid "PDAs"
 msgstr "Palmari (PDA)"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:403
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:441
 msgid "Palm™"
 msgstr "Palm™"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:420
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:458
 msgid "Sync _Palm™ devices when connected"
 msgstr "Sincronizza i dispositivi P_alm™ collegati"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:435
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:480
 msgid "Pocket PCs"
 msgstr "PC tascabili"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:452
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:497
 msgid "Sync Pocket P_C devices when connected"
 msgstr "Sincronizza i PC _tascabili quando collegati"
 
 #.
 #. Printers
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:467
-#: ../thunar-volman/tvm-preferences-dialog.c:477
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:517
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:528
 msgid "Printers"
 msgstr "Stampanti"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:494
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:545
 msgid "Automatically run a program when a _printer is connected"
 msgstr "Esegui un programma alla connessione di una _stampante"
 
 #.
 #. Input Devices
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:509
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:565
 msgid "Input Devices"
 msgstr "Dispositivi di ingresso"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:519
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:576
 msgid "Keyboards"
 msgstr "Tastiere"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:536
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:593
 msgid "Automatically run a program when an USB _keyboard is connected"
 msgstr "Esegui un programma alla connessione di una _tastiera USB"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:551
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:615
 msgid "Mice"
 msgstr "Mouse"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:568
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:632
 msgid "Automatically run a program when an USB _mouse is connected"
 msgstr "Esegui un programma alla connessione di un mo_use USB"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:583
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:654
 msgid "Tablet"
 msgstr "Tavoletta"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:600
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:671
 msgid "Automatically run a program when a _tablet is connected"
 msgstr "Esegui un programma alla connessione di una ta_voletta"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:605
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:679
 msgid "Com_mand:"
 msgstr "Com_ando:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:690
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:755
 msgid "Failed to open the documentation browser"
 msgstr "Impossibile aprire il navigatore della documentazione"
 
-#: ../thunar-volman/tvm-run.c:133 ../thunar-volman/tvm-run.c:144
-msgid "Choose Disc Type"
-msgstr "Scegliere il tipo di disco"
+#~ msgid "Failed to open display"
+#~ msgstr "Apertura dello schermo non riuscita"
 
-#: ../thunar-volman/tvm-run.c:134 ../thunar-volman/tvm-run.c:145
-msgid "You have inserted a blank disc."
-msgstr "È stato inserito un disco vuoto."
+#~ msgid "The Thunar development team. All rights reserved."
+#~ msgstr "Il gruppo di sviluppo di Thunar. Tutti i diritti riservati."
 
-#: ../thunar-volman/tvm-run.c:135 ../thunar-volman/tvm-run.c:146
-msgid "What would you like to do?"
-msgstr "Cosa si desidera fare?"
+#~ msgid "Written by Benedikt Meurer <benny at xfce.org>."
+#~ msgstr "Scritto da Benedikt Meurer <benny at xfce.org>."
 
-#: ../thunar-volman/tvm-run.c:137
-msgid "Make _DVD"
-msgstr "Crea _DVD"
+#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
+#~ msgstr "L'UDI \"%s\" specificato non è un UDI HAL di dispositivo valido"
 
-#: ../thunar-volman/tvm-run.c:148
-msgid "Make _Data CD"
-msgstr "Crea CD da_ti"
+#~ msgid "Encrypted volume"
+#~ msgstr "Volume cifrato"
 
-#: ../thunar-volman/tvm-run.c:149
-msgid "Make _Audio CD"
-msgstr "Crea CD _audio"
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Montaggio del volume cifrato in "
+#~ "corso...</span>"
+
+#~ msgid "Setting up the crypto layer..."
+#~ msgstr "Impostazione del livello cifrato in corso..."
+
+#~ msgid "You are not privileged to setup the crypto layer"
+#~ msgstr "Non si posseggono i privilegi per impostare il livello cifrato"
+
+#~ msgid "Wrong password"
+#~ msgstr "Password errata"
+
+#~ msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
+#~ msgstr "<span weight=\"bold\" size=\"larger\">Password errata.</span>"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Questo volume è cifrato.</span>"
+
+#~ msgid "Please enter your password to decrypt and mount the volume."
+#~ msgstr "Inserire la password per decifrare e montare il volume."
+
+#~ msgid "_Mount"
+#~ msgstr "_Monta"
+
+#~ msgid "Failed to setup the encrypted volume"
+#~ msgstr "Impostazione del volume cifrato non riuscita"
+
+#~ msgid "Choose Disc Type"
+#~ msgstr "Scegliere il tipo di disco"
+
+#~ msgid "Make _DVD"
+#~ msgstr "Crea _DVD"
 
-#: ../thunar-volman-settings.desktop.in.in.h:3
-msgid "Removable Media"
-msgstr "Dispositivi rimovibili"
+#~ msgid "Removable Media"
+#~ msgstr "Dispositivi rimovibili"
diff --git a/po/ja.po b/po/ja.po
index 64d9c02..68eafc5 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,461 +8,620 @@ msgid ""
 msgstr ""
 "Project-Id-Version: thunar-volman 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-30 02:26-0700\n"
+"POT-Creation-Date: 2010-07-25 20:06+0200\n"
 "PO-Revision-Date: 2008-11-09 14:59+0900\n"
 "Last-Translator: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>\n"
 "Language-Team: Japanese <xfce-users-jp at ml.fdiary.net>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../thunar-volman/main.c:50
-msgid "The HAL device UDI of the newly added device"
+#: ../thunar-volman/main.c:59
+#, fuzzy
+msgid "The syfs path of the newly added device"
 msgstr "新しく追加されたデバイスの HAL デバイス UDI"
 
-#: ../thunar-volman/main.c:51 ../thunar-volman/tvm-preferences-dialog.c:120
-#: ../thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman/main.c:60
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:104
 msgid "Configure management of removable drives and media"
 msgstr "リムーバブルドライブとメディアの取扱いを設定します"
 
-#: ../thunar-volman/main.c:52
+#: ../thunar-volman/main.c:61
 msgid "Print version information and exit"
 msgstr "バージョン情報を表示して終了する"
 
 #. setup application name
-#: ../thunar-volman/main.c:69
+#: ../thunar-volman/main.c:93
 msgid "Thunar Volume Manager"
 msgstr "Thunar ボリュームマネージャ"
 
-#: ../thunar-volman/main.c:90
-msgid "Failed to open display"
-msgstr "ディスプレイのオープンに失敗しました"
-
-#: ../thunar-volman/main.c:106
-msgid "The Thunar development team. All rights reserved."
-msgstr "The Thunar development team. All rights reserved."
-
-#: ../thunar-volman/main.c:107
-msgid "Written by Benedikt Meurer <benny at xfce.org>."
-msgstr "Benedikt Meurer <benny at xfce.org> が製作しました。"
+#: ../thunar-volman/main.c:133
+msgid "All rights reserved."
+msgstr ""
 
-#: ../thunar-volman/main.c:108
+#: ../thunar-volman/main.c:134
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "バグは <%s> に報告してください。"
 
-#. TRANSLATORS: A HAL device UDI must match certain conditions to be valid (to be exact, it must be a valid D-Bus object path)
-#: ../thunar-volman/main.c:133
+#: ../thunar-volman/main.c:188
 #, c-format
-msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
-msgstr "指定された UDI \"%s\" は正常な HAL デバイス UDI ではありません"
+msgid "There is no device with the sysfs path \"%s\""
+msgstr ""
 
-#. TRANSLATORS: thunar-volman wasn't invoked with either --device-added or --configure.
-#: ../thunar-volman/main.c:144
-#, c-format
-msgid "Must specify the new HAL device UDI with --device-added"
+#: ../thunar-volman/main.c:200
+#, fuzzy, c-format
+msgid "Must specify the sysfs path of new devices with --device-added"
 msgstr "--device-added オプションで新しい HAL デバイス UDI を指定してください"
 
 #. ...so we need to prompt what to do
-#: ../thunar-volman/tvm-block-device.c:189
+#: ../thunar-volman/tvm-block-device.c:204
 msgid "Photos and Music"
 msgstr "写真と音楽"
 
-#: ../thunar-volman/tvm-block-device.c:190
-msgid "Photos were found on your portable music player."
+#: ../thunar-volman/tvm-block-device.c:205
+#, fuzzy
+msgid "Photos were found on your portable music player"
 msgstr "携帯音楽プレイヤー内に写真が見つかりました。"
 
-#: ../thunar-volman/tvm-block-device.c:191
+#: ../thunar-volman/tvm-block-device.c:206
 msgid "Would you like to import the photos or manage the music?"
 msgstr "写真を取り込みますか? それとも音楽を管理しますか?"
 
-#: ../thunar-volman/tvm-block-device.c:192
-#: ../thunar-volman/tvm-block-device.c:258
-#: ../thunar-volman/tvm-block-device.c:335
-#: ../thunar-volman/tvm-block-device.c:371
-#: ../thunar-volman/tvm-block-device.c:430
-#: ../thunar-volman/tvm-block-device.c:703
-#: ../thunar-volman/tvm-crypto-volume.c:448 ../thunar-volman/tvm-run.c:136
-#: ../thunar-volman/tvm-run.c:147
+#: ../thunar-volman/tvm-block-device.c:208
+#: ../thunar-volman/tvm-block-device.c:277
+#: ../thunar-volman/tvm-block-device.c:378
+#: ../thunar-volman/tvm-block-device.c:425
+#: ../thunar-volman/tvm-block-device.c:507
+#: ../thunar-volman/tvm-block-device.c:826 ../thunar-volman/tvm-run.c:196
+#: ../thunar-volman/tvm-run.c:207
 msgid "Ig_nore"
 msgstr "無視する(_N)"
 
-#: ../thunar-volman/tvm-block-device.c:193
-#: ../thunar-volman/tvm-block-device.c:259
+#: ../thunar-volman/tvm-block-device.c:209
+#: ../thunar-volman/tvm-block-device.c:278
 msgid "Import _Photos"
 msgstr "写真を取り込む(_P)"
 
-#: ../thunar-volman/tvm-block-device.c:194
+#: ../thunar-volman/tvm-block-device.c:210
 msgid "Manage _Music"
 msgstr "音楽を管理する(_M)"
 
-#. ask the user whether to import photos
-#: ../thunar-volman/tvm-block-device.c:255
+#. ask the user to import photos
+#: ../thunar-volman/tvm-block-device.c:273
 msgid "Photo Import"
 msgstr "写真の取り込み"
 
-#: ../thunar-volman/tvm-block-device.c:256
-msgid "A photo card has been detected."
+#: ../thunar-volman/tvm-block-device.c:274
+#, fuzzy
+msgid "A photo card has been detected"
 msgstr "写真が保存されたメディアを検出しました。"
 
-#: ../thunar-volman/tvm-block-device.c:257
+#: ../thunar-volman/tvm-block-device.c:275
 msgid ""
 "There are photos on the card. Would you like to add these photos to your "
 "album?"
 msgstr "メディア内に写真があります。写真をアルバムに追加しますか?"
 
-#. prompt the user whether to execute this file
-#: ../thunar-volman/tvm-block-device.c:332
-#: ../thunar-volman/tvm-block-device.c:368
+#. prompt the user to execute the file
+#. prompt the user to execute this file
+#: ../thunar-volman/tvm-block-device.c:373
+#: ../thunar-volman/tvm-block-device.c:420
 #, c-format
 msgid "Would you like to allow \"%s\" to run?"
 msgstr "\"%s\" の実行を許可しますか?"
 
-#: ../thunar-volman/tvm-block-device.c:333
-#: ../thunar-volman/tvm-block-device.c:369
+#: ../thunar-volman/tvm-block-device.c:376
+#: ../thunar-volman/tvm-block-device.c:423
 msgid "Auto-Run Confirmation"
 msgstr "自動実行の確認"
 
-#: ../thunar-volman/tvm-block-device.c:334
-#: ../thunar-volman/tvm-block-device.c:370
+#: ../thunar-volman/tvm-block-device.c:377
+#: ../thunar-volman/tvm-block-device.c:424
 msgid "Auto-Run capability detected"
 msgstr "自動実行ができます"
 
-#: ../thunar-volman/tvm-block-device.c:336
-#: ../thunar-volman/tvm-block-device.c:372
+#: ../thunar-volman/tvm-block-device.c:379
+#: ../thunar-volman/tvm-block-device.c:426
 msgid "_Allow Auto-Run"
 msgstr "自動実行を許可する(_A)"
 
 #. prompt the user whether to autoopen this file
-#: ../thunar-volman/tvm-block-device.c:427
+#: ../thunar-volman/tvm-block-device.c:502
 #, c-format
 msgid "Would you like to open \"%s\"?"
 msgstr "\"%s\" を開きますか?"
 
-#: ../thunar-volman/tvm-block-device.c:428
+#: ../thunar-volman/tvm-block-device.c:505
 msgid "Auto-Open Confirmation"
 msgstr "自動オープンの確認"
 
-#: ../thunar-volman/tvm-block-device.c:429
+#: ../thunar-volman/tvm-block-device.c:506
 msgid "Auto-Open capability detected"
 msgstr "自動的に開くことができます"
 
-#: ../thunar-volman/tvm-block-device.c:431
+#: ../thunar-volman/tvm-block-device.c:508
 msgid "_Open"
 msgstr "開く(_O)"
 
-#. ask what do with the mixed audio/data disc
-#: ../thunar-volman/tvm-block-device.c:700
-msgid "Audio / Data CD"
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "CD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "DVD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:618
+msgid "The CD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:619
+msgid "The DVD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:629
+msgid "Volume mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:632
+#, c-format
+msgid "The volume \"%s\" was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:637
+#, c-format
+msgid "The inserted volume was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:691
+#, c-format
+msgid "Unable to locate mount point"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:737
+#, c-format
+msgid "Unable to mount the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:746
+#, c-format
+msgid "Could not detect the volume corresponding to the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:821
+#, fuzzy
+msgid "Audio/Data CD"
 msgstr "オーディオ/データ CD"
 
-#: ../thunar-volman/tvm-block-device.c:701
-msgid "The CD in the drive contains both music and files."
+#: ../thunar-volman/tvm-block-device.c:822
+#, fuzzy
+msgid "The CD in the drive contains both music and files"
 msgstr "挿入された CD には音楽とデータファイルの両方があります。"
 
-#: ../thunar-volman/tvm-block-device.c:702
+#: ../thunar-volman/tvm-block-device.c:824
 msgid "Would you like to listen to music or browse the files?"
 msgstr "音楽を聞きますか? それともファイルを参照しますか?"
 
-#: ../thunar-volman/tvm-block-device.c:704
+#: ../thunar-volman/tvm-block-device.c:827
 msgid "_Browse Files"
 msgstr "ファイルを参照する(_B)"
 
-#: ../thunar-volman/tvm-block-device.c:705
+#: ../thunar-volman/tvm-block-device.c:828
 msgid "_Play CD"
 msgstr "CD を再生する(_P)"
 
-#: ../thunar-volman/tvm-command-entry.c:233
-msgid "Select an Application"
-msgstr "アプリケーションを選択してください"
+#: ../thunar-volman/tvm-block-device.c:916
+#, c-format
+msgid "Unknown block device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:243
-msgid "All Files"
-msgstr "全てのファイル"
+#: ../thunar-volman/tvm-device.c:139
+#, c-format
+msgid "Device type not supported"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:248
-msgid "Executable Files"
-msgstr "実行ファイル"
+#: ../thunar-volman/tvm-input-device.c:74
+#, fuzzy
+msgid "input-keyboard"
+msgstr "キーボード"
 
-#: ../thunar-volman/tvm-command-entry.c:263
-msgid "Perl Scripts"
-msgstr "Perl スクリプト"
+#: ../thunar-volman/tvm-input-device.c:75
+#, fuzzy
+msgid "Keyboard detected"
+msgstr "キーボード"
 
-#: ../thunar-volman/tvm-command-entry.c:269
-msgid "Python Scripts"
-msgstr "Python スクリプト"
+#: ../thunar-volman/tvm-input-device.c:76
+#, fuzzy
+msgid "A keyboard was detected"
+msgstr "写真が保存されたメディアを検出しました。"
 
-#: ../thunar-volman/tvm-command-entry.c:275
-msgid "Ruby Scripts"
-msgstr "Ruby スクリプト"
+#: ../thunar-volman/tvm-input-device.c:86
+#: ../thunar-volman/tvm-input-device.c:100
+msgid "input-tablet"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:281
-msgid "Shell Scripts"
-msgstr "シェルスクリプト"
+#: ../thunar-volman/tvm-input-device.c:87
+#: ../thunar-volman/tvm-input-device.c:101
+#, fuzzy
+msgid "Tablet detected"
+msgstr "自動実行ができます"
+
+#: ../thunar-volman/tvm-input-device.c:88
+#: ../thunar-volman/tvm-input-device.c:102
+msgid "A graphics tablet was detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:286
-#: ../thunar-volman/tvm-crypto-volume.c:443
-msgid "Encrypted volume"
-msgstr "暗号化ボリューム"
+#: ../thunar-volman/tvm-input-device.c:110
+msgid "input-mouse"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:297
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
+#: ../thunar-volman/tvm-input-device.c:111
+msgid "Mouse detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-input-device.c:112
+msgid "A mouse was detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-input-device.c:139
+#, c-format
+msgid "Unsupported input device type"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">暗号化ボリュームをマウントしています..."
-"</span>"
 
-#: ../thunar-volman/tvm-crypto-volume.c:302
-msgid "Setting up the crypto layer..."
-msgstr "暗号レイヤをセットアップしています..."
+#: ../thunar-volman/tvm-run.c:173
+#, c-format
+msgid "Autoburning of blank CDs and DVDs is disabled"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:193
+msgid "Blank DVD inserted"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:194
+#, fuzzy
+msgid "You have inserted a blank DVD."
+msgstr "空のディスクが挿入されました。"
+
+#: ../thunar-volman/tvm-run.c:195 ../thunar-volman/tvm-run.c:206
+msgid "What would you like to do?"
+msgstr "何をしますか?"
+
+#: ../thunar-volman/tvm-run.c:197
+msgid "Burn _DVD"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:204
+#, fuzzy
+msgid "Blank CD inserted"
+msgstr "空の CD および DVD"
+
+#: ../thunar-volman/tvm-run.c:205
+#, fuzzy
+msgid "You have inserted a blank CD."
+msgstr "空のディスクが挿入されました。"
+
+#: ../thunar-volman/tvm-run.c:208
+#, fuzzy
+msgid "Burn _Data CD"
+msgstr "データ CD を作成する(_D)"
+
+#: ../thunar-volman/tvm-run.c:209
+#, fuzzy
+msgid "Burn _Audio CD"
+msgstr "オーディオ CD を作成する(_A)"
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) but got Permission denied.
-#: ../thunar-volman/tvm-crypto-volume.c:369
+#: ../thunar-volman/tvm-run.c:233
 #, c-format
-msgid "You are not privileged to setup the crypto layer"
-msgstr "暗号レイヤをセットアップする権限が与えられていません"
+msgid "The burn command may not be empty"
+msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) and typed the wrong password.
-#: ../thunar-volman/tvm-crypto-volume.c:374
+#: ../thunar-volman/tvm-run.c:272
 #, c-format
-msgid "Wrong password"
-msgstr "パスワードが正しくありません"
+msgid "The CD player command is undefined"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:445
-msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
+#: ../thunar-volman/tvm-usb-device.c:66
+msgid "Camera detected"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">パスワードが正しくありません。</span>"
 
-#: ../thunar-volman/tvm-crypto-volume.c:446
-msgid "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
+#: ../thunar-volman/tvm-usb-device.c:67
+#, fuzzy
+msgid "A photo camera was detected"
+msgstr "写真が保存されたメディアを検出しました。"
+
+#: ../thunar-volman/tvm-usb-device.c:77
+msgid "Printer detected"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">このボリュームは暗号化されています。</"
-"span>"
 
-#: ../thunar-volman/tvm-crypto-volume.c:447
-msgid "Please enter your password to decrypt and mount the volume."
-msgstr "ボリュームの暗号解読とマウントのためパスワードを入力してください。"
+#: ../thunar-volman/tvm-usb-device.c:78
+msgid "A USB printer was detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:449
-msgid "_Mount"
-msgstr "マウント(_M)"
+#: ../thunar-volman/tvm-usb-device.c:104
+#, c-format
+msgid "Unsupported USB device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:468
-msgid "Failed to setup the encrypted volume"
-msgstr "暗号化ボリュームのセットアップに失敗しました"
+#. setup application name
+#: ../thunar-volman-settings/main.c:52
+#, fuzzy
+msgid "Thunar Volume Manager Settings"
+msgstr "Thunar ボリュームマネージャ"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:119
-#: ../thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:102
 msgid "Removable Drives and Media"
 msgstr "リムーバブルドライブとメディア"
 
+#: ../thunar-volman-settings/tvm-command-entry.c:240
+msgid "Select an Application"
+msgstr "アプリケーションを選択してください"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:250
+msgid "All Files"
+msgstr "全てのファイル"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:255
+msgid "Executable Files"
+msgstr "実行ファイル"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:270
+msgid "Perl Scripts"
+msgstr "Perl スクリプト"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:276
+msgid "Python Scripts"
+msgstr "Python スクリプト"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:282
+msgid "Ruby Scripts"
+msgstr "Ruby スクリプト"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:288
+msgid "Shell Scripts"
+msgstr "シェルスクリプト"
+
 #.
 #. Storage
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:143
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:130
 msgid "Storage"
 msgstr "ストレージ"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:153
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:141
 msgid "Removable Storage"
 msgstr "リムーバブルストレージ"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:170
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:158
 msgid "_Mount removable drives when hot-plugged"
 msgstr "リムーバブルドライブがホットプラグされたらマウントする(_M)"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:175
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:166
 msgid "Mount removable media when _inserted"
 msgstr "リムーバブルメディアが挿入されたらマウントする(_I)"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:180
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:174
 msgid "B_rowse removable media when inserted"
 msgstr "リムーバブルメディアが挿入されたら参照する(_R)"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:185
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:182
 msgid "_Auto-run programs on new drives and media"
 msgstr "新しいドライブおよびメディア上のプログラムを自動実行する(_A)"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:190
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:189
 msgid "Auto-open files on new drives and media"
 msgstr "新しいドライブおよびメディア上のファイルを自動的に開く"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:199
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:201
 msgid "Blank CDs and DVDs"
 msgstr "空の CD および DVD"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:216
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:218
 msgid "_Burn a CD or DVD when a blank disc is inserted"
 msgstr "空の CD または DVD が挿入されたらディスクを作成する(_B)"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:224
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:229
 msgid "Command for _Data CDs:"
 msgstr "データ CD 用コマンド(_D)"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:231
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:239
 msgid "Command for A_udio CDs:"
 msgstr "オーディオ CD 用コマンド(_U)"
 
 #.
 #. Multimedia
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:245
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:255
 msgid "Multimedia"
 msgstr "マルチメディア"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:255
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:266
 msgid "Audio CDs"
 msgstr "オーディオ CD"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:272
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:283
 msgid "Play _audio CDs when inserted"
 msgstr "オーディオ CD が挿入されたら再生する(_A)"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:277
-#: ../thunar-volman/tvm-preferences-dialog.c:383
-#: ../thunar-volman/tvm-preferences-dialog.c:425
-#: ../thunar-volman/tvm-preferences-dialog.c:499
-#: ../thunar-volman/tvm-preferences-dialog.c:541
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:290
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:415
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:466
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:553
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:601
 msgid "_Command:"
 msgstr "コマンド(_C):"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:287
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:304
 msgid "Video CDs/DVDs"
 msgstr "ビデオ CD/DVD"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:304
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:321
 msgid "Play _video CDs and DVDs when inserted"
 msgstr "ビデオ CD および DVD が挿入されたら再生する(_V)"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:309
-#: ../thunar-volman/tvm-preferences-dialog.c:341
-#: ../thunar-volman/tvm-preferences-dialog.c:457
-#: ../thunar-volman/tvm-preferences-dialog.c:573
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:329
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:367
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:505
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:640
 msgid "C_ommand:"
 msgstr "コマンド(_O):"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:319
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:343
 msgid "Portable Music Players"
 msgstr "携帯音楽プレイヤー"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:336
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:360
 msgid "Play _music files when connected"
 msgstr "接続されたら音楽ファイルを再生する(_M)"
 
 #.
 #. Cameras
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:351
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:379
 msgid "Cameras"
 msgstr "カメラ"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:361
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:390
 msgid "Digital Cameras"
 msgstr "デジタルカメラ"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:378
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:407
 msgid "Import digital photographs when connected"
 msgstr "接続されたら写真を取り込む"
 
 #.
 #. PDAs
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:393
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:427
 msgid "PDAs"
 msgstr "PDA"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:403
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:441
 msgid "Palm™"
 msgstr "Palm™"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:420
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:458
 msgid "Sync _Palm™ devices when connected"
 msgstr "Palm™ デバイスが接続されたら同期をとる(_P)"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:435
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:480
 msgid "Pocket PCs"
 msgstr "Pocket PC"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:452
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:497
 msgid "Sync Pocket P_C devices when connected"
 msgstr "Pocket PC デバイスが接続されたら同期をとる(_C)"
 
 #.
 #. Printers
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:467
-#: ../thunar-volman/tvm-preferences-dialog.c:477
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:517
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:528
 msgid "Printers"
 msgstr "プリンタ"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:494
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:545
 msgid "Automatically run a program when a _printer is connected"
 msgstr "プリンタが接続されたら自動的にプログラムを実行する(_P)"
 
 #.
 #. Input Devices
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:509
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:565
 msgid "Input Devices"
 msgstr "入力デバイス"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:519
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:576
 msgid "Keyboards"
 msgstr "キーボード"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:536
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:593
 msgid "Automatically run a program when an USB _keyboard is connected"
 msgstr "USBキーボードが接続されたら自動的にプログラムを実行する(_K)"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:551
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:615
 msgid "Mice"
 msgstr "マウス"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:568
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:632
 msgid "Automatically run a program when an USB _mouse is connected"
 msgstr "USBマウスが接続されたら自動的にプログラムを実行する(_M)"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:583
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:654
 msgid "Tablet"
 msgstr "タブレット"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:600
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:671
 msgid "Automatically run a program when a _tablet is connected"
 msgstr "タブレットが接続されたら自動的にプログラムを実行する(_T)"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:605
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:679
 msgid "Com_mand:"
 msgstr "コマンド(_M):"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:690
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:755
 msgid "Failed to open the documentation browser"
 msgstr "ドキュメントブラウザのオープンに失敗しました"
 
-#: ../thunar-volman/tvm-run.c:133 ../thunar-volman/tvm-run.c:144
-msgid "Choose Disc Type"
-msgstr "ディスクタイプの選択"
+#~ msgid "Failed to open display"
+#~ msgstr "ディスプレイのオープンに失敗しました"
 
-#: ../thunar-volman/tvm-run.c:134 ../thunar-volman/tvm-run.c:145
-msgid "You have inserted a blank disc."
-msgstr "空のディスクが挿入されました。"
+#~ msgid "The Thunar development team. All rights reserved."
+#~ msgstr "The Thunar development team. All rights reserved."
 
-#: ../thunar-volman/tvm-run.c:135 ../thunar-volman/tvm-run.c:146
-msgid "What would you like to do?"
-msgstr "何をしますか?"
+#~ msgid "Written by Benedikt Meurer <benny at xfce.org>."
+#~ msgstr "Benedikt Meurer <benny at xfce.org> が製作しました。"
 
-#: ../thunar-volman/tvm-run.c:137
-msgid "Make _DVD"
-msgstr "DVD を作成する(_D)"
+#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
+#~ msgstr "指定された UDI \"%s\" は正常な HAL デバイス UDI ではありません"
 
-#: ../thunar-volman/tvm-run.c:148
-msgid "Make _Data CD"
-msgstr "データ CD を作成する(_D)"
+#~ msgid "Encrypted volume"
+#~ msgstr "暗号化ボリューム"
 
-#: ../thunar-volman/tvm-run.c:149
-msgid "Make _Audio CD"
-msgstr "オーディオ CD を作成する(_A)"
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">暗号化ボリュームをマウントしていま"
+#~ "す...</span>"
+
+#~ msgid "Setting up the crypto layer..."
+#~ msgstr "暗号レイヤをセットアップしています..."
+
+#~ msgid "You are not privileged to setup the crypto layer"
+#~ msgstr "暗号レイヤをセットアップする権限が与えられていません"
+
+#~ msgid "Wrong password"
+#~ msgstr "パスワードが正しくありません"
+
+#~ msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">パスワードが正しくありません。</"
+#~ "span>"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">このボリュームは暗号化されています。"
+#~ "</span>"
+
+#~ msgid "Please enter your password to decrypt and mount the volume."
+#~ msgstr "ボリュームの暗号解読とマウントのためパスワードを入力してください。"
+
+#~ msgid "_Mount"
+#~ msgstr "マウント(_M)"
+
+#~ msgid "Failed to setup the encrypted volume"
+#~ msgstr "暗号化ボリュームのセットアップに失敗しました"
+
+#~ msgid "Choose Disc Type"
+#~ msgstr "ディスクタイプの選択"
+
+#~ msgid "Make _DVD"
+#~ msgstr "DVD を作成する(_D)"
 
-#: ../thunar-volman-settings.desktop.in.in.h:3
-msgid "Removable Media"
-msgstr "リムーバブルメディア"
+#~ msgid "Removable Media"
+#~ msgstr "リムーバブルメディア"
diff --git a/po/lv.po b/po/lv.po
index 038084b..74528f0 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: thunar-volman 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-30 02:26-0700\n"
+"POT-Creation-Date: 2010-07-25 20:06+0200\n"
 "PO-Revision-Date: 2009-10-16 15:18+0100\n"
 "Last-Translator: Rihards Prieditis <rprieditis at gmail.com>\n"
 "Language-Team: Latvian <translation-team-lv at lists.sourceforge.net>\n"
+"Language: lv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,450 +20,606 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
 "2);\n"
 
-#: ../thunar-volman/main.c:50
-msgid "The HAL device UDI of the newly added device"
+#: ../thunar-volman/main.c:59
+#, fuzzy
+msgid "The syfs path of the newly added device"
 msgstr "Jaunās pievienotāts ierīces HAL ierīces UDI"
 
-#: ../thunar-volman/main.c:51 ../thunar-volman/tvm-preferences-dialog.c:120
-#: ../thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman/main.c:60
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:104
 msgid "Configure management of removable drives and media"
 msgstr "Konfigurēt noņemamo disku un datu nesēju pārvaldību"
 
-#: ../thunar-volman/main.c:52
+#: ../thunar-volman/main.c:61
 msgid "Print version information and exit"
 msgstr "Izdrukāt versijas informāciju un iziet"
 
 #. setup application name
-#: ../thunar-volman/main.c:69
+#: ../thunar-volman/main.c:93
 msgid "Thunar Volume Manager"
 msgstr "Thunar sējumu pārvaldnieks"
 
-#: ../thunar-volman/main.c:90
-msgid "Failed to open display"
-msgstr "Neizdevās atvērt displeju"
-
-#: ../thunar-volman/main.c:106
-msgid "The Thunar development team. All rights reserved."
-msgstr "Thunar izstrādes komanda. Visas tiesības rezervētas."
-
-#: ../thunar-volman/main.c:107
-msgid "Written by Benedikt Meurer <benny at xfce.org>."
-msgstr "Autors Benedikt Meurer <benny at xfce.org>."
+#: ../thunar-volman/main.c:133
+msgid "All rights reserved."
+msgstr ""
 
-#: ../thunar-volman/main.c:108
+#: ../thunar-volman/main.c:134
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Lūdzu ziņojiet pa kļūdām uz<%s>."
 
-#. TRANSLATORS: A HAL device UDI must match certain conditions to be valid (to be exact, it must be a valid D-Bus object path)
-#: ../thunar-volman/main.c:133
+#: ../thunar-volman/main.c:188
 #, c-format
-msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
-msgstr "Norādītais UDI \"%s\" nav derīgs HAL ierīces UDI"
+msgid "There is no device with the sysfs path \"%s\""
+msgstr ""
 
-#. TRANSLATORS: thunar-volman wasn't invoked with either --device-added or --configure.
-#: ../thunar-volman/main.c:144
-#, c-format
-msgid "Must specify the new HAL device UDI with --device-added"
+#: ../thunar-volman/main.c:200
+#, fuzzy, c-format
+msgid "Must specify the sysfs path of new devices with --device-added"
 msgstr "Jānorāda jauns HAL ierīces UDI ar --device-added"
 
 #. ...so we need to prompt what to do
-#: ../thunar-volman/tvm-block-device.c:189
+#: ../thunar-volman/tvm-block-device.c:204
 msgid "Photos and Music"
 msgstr "Foto un mūzika"
 
-#: ../thunar-volman/tvm-block-device.c:190
-msgid "Photos were found on your portable music player."
+#: ../thunar-volman/tvm-block-device.c:205
+#, fuzzy
+msgid "Photos were found on your portable music player"
 msgstr "Tika atrastas fotogrāfijas uz portatīvā mūzikas atskaņotāja."
 
-#: ../thunar-volman/tvm-block-device.c:191
+#: ../thunar-volman/tvm-block-device.c:206
 msgid "Would you like to import the photos or manage the music?"
 msgstr "Jūs vēlaties importēt fotogrāfijas, vai pārvaldīt mūziku?"
 
-#: ../thunar-volman/tvm-block-device.c:192
-#: ../thunar-volman/tvm-block-device.c:258
-#: ../thunar-volman/tvm-block-device.c:335
-#: ../thunar-volman/tvm-block-device.c:371
-#: ../thunar-volman/tvm-block-device.c:430
-#: ../thunar-volman/tvm-block-device.c:703
-#: ../thunar-volman/tvm-crypto-volume.c:448 ../thunar-volman/tvm-run.c:136
-#: ../thunar-volman/tvm-run.c:147
+#: ../thunar-volman/tvm-block-device.c:208
+#: ../thunar-volman/tvm-block-device.c:277
+#: ../thunar-volman/tvm-block-device.c:378
+#: ../thunar-volman/tvm-block-device.c:425
+#: ../thunar-volman/tvm-block-device.c:507
+#: ../thunar-volman/tvm-block-device.c:826 ../thunar-volman/tvm-run.c:196
+#: ../thunar-volman/tvm-run.c:207
 msgid "Ig_nore"
 msgstr "Ign_orēt"
 
-#: ../thunar-volman/tvm-block-device.c:193
-#: ../thunar-volman/tvm-block-device.c:259
+#: ../thunar-volman/tvm-block-device.c:209
+#: ../thunar-volman/tvm-block-device.c:278
 msgid "Import _Photos"
 msgstr "Importēt _fotogrāfijas"
 
-#: ../thunar-volman/tvm-block-device.c:194
+#: ../thunar-volman/tvm-block-device.c:210
 msgid "Manage _Music"
 msgstr "Pārvaldīt _mūziku"
 
-#. ask the user whether to import photos
-#: ../thunar-volman/tvm-block-device.c:255
+#. ask the user to import photos
+#: ../thunar-volman/tvm-block-device.c:273
 msgid "Photo Import"
 msgstr "Fotogrāfiju imports"
 
-#: ../thunar-volman/tvm-block-device.c:256
-msgid "A photo card has been detected."
+#: ../thunar-volman/tvm-block-device.c:274
+#, fuzzy
+msgid "A photo card has been detected"
 msgstr "Tika noteikta fotogrāfiju karte"
 
-#: ../thunar-volman/tvm-block-device.c:257
+#: ../thunar-volman/tvm-block-device.c:275
 msgid ""
 "There are photos on the card. Would you like to add these photos to your "
 "album?"
 msgstr ""
 "Uz kartes ir fotogrāfijas. Vai vēlaties pievienot šīs fotogrāfijas albūmam?"
 
-#. prompt the user whether to execute this file
-#: ../thunar-volman/tvm-block-device.c:332
-#: ../thunar-volman/tvm-block-device.c:368
+#. prompt the user to execute the file
+#. prompt the user to execute this file
+#: ../thunar-volman/tvm-block-device.c:373
+#: ../thunar-volman/tvm-block-device.c:420
 #, c-format
 msgid "Would you like to allow \"%s\" to run?"
 msgstr "Vai vēlaties atļaut izpildīt \"%s\"?"
 
-#: ../thunar-volman/tvm-block-device.c:333
-#: ../thunar-volman/tvm-block-device.c:369
+#: ../thunar-volman/tvm-block-device.c:376
+#: ../thunar-volman/tvm-block-device.c:423
 msgid "Auto-Run Confirmation"
 msgstr "Automātiskās palaišanas apstiprināšana"
 
-#: ../thunar-volman/tvm-block-device.c:334
-#: ../thunar-volman/tvm-block-device.c:370
+#: ../thunar-volman/tvm-block-device.c:377
+#: ../thunar-volman/tvm-block-device.c:424
 msgid "Auto-Run capability detected"
 msgstr "Automātiskās palaišanas iespējas noteiktas"
 
-#: ../thunar-volman/tvm-block-device.c:336
-#: ../thunar-volman/tvm-block-device.c:372
+#: ../thunar-volman/tvm-block-device.c:379
+#: ../thunar-volman/tvm-block-device.c:426
 msgid "_Allow Auto-Run"
 msgstr "_Atļaut auto-palaišanu"
 
 #. prompt the user whether to autoopen this file
-#: ../thunar-volman/tvm-block-device.c:427
+#: ../thunar-volman/tvm-block-device.c:502
 #, c-format
 msgid "Would you like to open \"%s\"?"
 msgstr "Vai vēlaties atvērt \"%s\"?"
 
-#: ../thunar-volman/tvm-block-device.c:428
+#: ../thunar-volman/tvm-block-device.c:505
 msgid "Auto-Open Confirmation"
 msgstr "Automātiskās atvēršanas apstiprināšana"
 
-#: ../thunar-volman/tvm-block-device.c:429
+#: ../thunar-volman/tvm-block-device.c:506
 msgid "Auto-Open capability detected"
 msgstr "Automātiskās atvērtšanas iespējas noteiktas"
 
-#: ../thunar-volman/tvm-block-device.c:431
+#: ../thunar-volman/tvm-block-device.c:508
 msgid "_Open"
 msgstr "_Atvērt"
 
-#. ask what do with the mixed audio/data disc
-#: ../thunar-volman/tvm-block-device.c:700
-msgid "Audio / Data CD"
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "CD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "DVD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:618
+msgid "The CD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:619
+msgid "The DVD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:629
+msgid "Volume mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:632
+#, c-format
+msgid "The volume \"%s\" was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:637
+#, c-format
+msgid "The inserted volume was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:691
+#, c-format
+msgid "Unable to locate mount point"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:737
+#, c-format
+msgid "Unable to mount the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:746
+#, c-format
+msgid "Could not detect the volume corresponding to the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:821
+#, fuzzy
+msgid "Audio/Data CD"
 msgstr "Audio / Datu CD"
 
-#: ../thunar-volman/tvm-block-device.c:701
-msgid "The CD in the drive contains both music and files."
+#: ../thunar-volman/tvm-block-device.c:822
+#, fuzzy
+msgid "The CD in the drive contains both music and files"
 msgstr "CD satur gan mūziku, gan failus."
 
-#: ../thunar-volman/tvm-block-device.c:702
+#: ../thunar-volman/tvm-block-device.c:824
 msgid "Would you like to listen to music or browse the files?"
 msgstr "Jūs vēlaties klausīties mūziku, vai pārlūkot failus?"
 
-#: ../thunar-volman/tvm-block-device.c:704
+#: ../thunar-volman/tvm-block-device.c:827
 msgid "_Browse Files"
 msgstr "_Pārlūkot failus"
 
-#: ../thunar-volman/tvm-block-device.c:705
+#: ../thunar-volman/tvm-block-device.c:828
 msgid "_Play CD"
 msgstr "S_pēlēt CD"
 
-#: ../thunar-volman/tvm-command-entry.c:233
-msgid "Select an Application"
-msgstr "Norādiet lietotni"
+#: ../thunar-volman/tvm-block-device.c:916
+#, c-format
+msgid "Unknown block device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:243
-msgid "All Files"
-msgstr "Visi faili"
+#: ../thunar-volman/tvm-device.c:139
+#, c-format
+msgid "Device type not supported"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:248
-msgid "Executable Files"
-msgstr "Izpildāmie faili"
+#: ../thunar-volman/tvm-input-device.c:74
+#, fuzzy
+msgid "input-keyboard"
+msgstr "Klaviatūra"
 
-#: ../thunar-volman/tvm-command-entry.c:263
-msgid "Perl Scripts"
-msgstr "Perl skripti"
+#: ../thunar-volman/tvm-input-device.c:75
+#, fuzzy
+msgid "Keyboard detected"
+msgstr "Klaviatūra"
 
-#: ../thunar-volman/tvm-command-entry.c:269
-msgid "Python Scripts"
-msgstr "Python skripti"
+#: ../thunar-volman/tvm-input-device.c:76
+#, fuzzy
+msgid "A keyboard was detected"
+msgstr "Tika noteikta fotogrāfiju karte"
 
-#: ../thunar-volman/tvm-command-entry.c:275
-msgid "Ruby Scripts"
-msgstr "Ruby skripti"
+#: ../thunar-volman/tvm-input-device.c:86
+#: ../thunar-volman/tvm-input-device.c:100
+msgid "input-tablet"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:281
-msgid "Shell Scripts"
-msgstr "Čaukas skripti"
+#: ../thunar-volman/tvm-input-device.c:87
+#: ../thunar-volman/tvm-input-device.c:101
+#, fuzzy
+msgid "Tablet detected"
+msgstr "Automātiskās palaišanas iespējas noteiktas"
 
-#: ../thunar-volman/tvm-crypto-volume.c:286
-#: ../thunar-volman/tvm-crypto-volume.c:443
-msgid "Encrypted volume"
-msgstr "Šifrēts sējums"
+#: ../thunar-volman/tvm-input-device.c:88
+#: ../thunar-volman/tvm-input-device.c:102
+msgid "A graphics tablet was detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:297
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
+#: ../thunar-volman/tvm-input-device.c:110
+msgid "input-mouse"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Šifrēta sējuma montēšana...</span>"
 
-#: ../thunar-volman/tvm-crypto-volume.c:302
-msgid "Setting up the crypto layer..."
-msgstr "crypto slāņa uzstādīšana..."
+#: ../thunar-volman/tvm-input-device.c:111
+msgid "Mouse detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-input-device.c:112
+msgid "A mouse was detected"
+msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) but got Permission denied.
-#: ../thunar-volman/tvm-crypto-volume.c:369
+#: ../thunar-volman/tvm-input-device.c:139
 #, c-format
-msgid "You are not privileged to setup the crypto layer"
-msgstr "Jums nav tiesību uzstādīt crypto slāni"
+msgid "Unsupported input device type"
+msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) and typed the wrong password.
-#: ../thunar-volman/tvm-crypto-volume.c:374
+#: ../thunar-volman/tvm-run.c:173
 #, c-format
-msgid "Wrong password"
-msgstr "Nepareiza parole"
+msgid "Autoburning of blank CDs and DVDs is disabled"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:445
-msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Nepareiza parole.</span>"
+#: ../thunar-volman/tvm-run.c:193
+msgid "Blank DVD inserted"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:446
-msgid "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Šis sējums ir šifrēts.</span>"
+#: ../thunar-volman/tvm-run.c:194
+#, fuzzy
+msgid "You have inserted a blank DVD."
+msgstr "Jūs esat ievietojis tukšu disku."
 
-#: ../thunar-volman/tvm-crypto-volume.c:447
-msgid "Please enter your password to decrypt and mount the volume."
-msgstr "Lūdzu ievadiet savu paroli, lai atšifrētu un nomontētu sējumu."
+#: ../thunar-volman/tvm-run.c:195 ../thunar-volman/tvm-run.c:206
+msgid "What would you like to do?"
+msgstr "Ko vēlaties darīt?"
+
+#: ../thunar-volman/tvm-run.c:197
+msgid "Burn _DVD"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:204
+#, fuzzy
+msgid "Blank CD inserted"
+msgstr "Tukši CD un DVD"
+
+#: ../thunar-volman/tvm-run.c:205
+#, fuzzy
+msgid "You have inserted a blank CD."
+msgstr "Jūs esat ievietojis tukšu disku."
+
+#: ../thunar-volman/tvm-run.c:208
+#, fuzzy
+msgid "Burn _Data CD"
+msgstr "Veidot _Datu CD"
+
+#: ../thunar-volman/tvm-run.c:209
+#, fuzzy
+msgid "Burn _Audio CD"
+msgstr "Veidot _Audio CD"
+
+#: ../thunar-volman/tvm-run.c:233
+#, c-format
+msgid "The burn command may not be empty"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:272
+#, c-format
+msgid "The CD player command is undefined"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:66
+msgid "Camera detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:67
+#, fuzzy
+msgid "A photo camera was detected"
+msgstr "Tika noteikta fotogrāfiju karte"
+
+#: ../thunar-volman/tvm-usb-device.c:77
+msgid "Printer detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:78
+msgid "A USB printer was detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:449
-msgid "_Mount"
-msgstr "_Montēt"
+#: ../thunar-volman/tvm-usb-device.c:104
+#, c-format
+msgid "Unsupported USB device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:468
-msgid "Failed to setup the encrypted volume"
-msgstr "Neizdevās uzstādīt šifrēšanas sējumu"
+#. setup application name
+#: ../thunar-volman-settings/main.c:52
+#, fuzzy
+msgid "Thunar Volume Manager Settings"
+msgstr "Thunar sējumu pārvaldnieks"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:119
-#: ../thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:102
 msgid "Removable Drives and Media"
 msgstr "Noņemamie diski un datu nesēji"
 
+#: ../thunar-volman-settings/tvm-command-entry.c:240
+msgid "Select an Application"
+msgstr "Norādiet lietotni"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:250
+msgid "All Files"
+msgstr "Visi faili"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:255
+msgid "Executable Files"
+msgstr "Izpildāmie faili"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:270
+msgid "Perl Scripts"
+msgstr "Perl skripti"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:276
+msgid "Python Scripts"
+msgstr "Python skripti"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:282
+msgid "Ruby Scripts"
+msgstr "Ruby skripti"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:288
+msgid "Shell Scripts"
+msgstr "Čaukas skripti"
+
 #.
 #. Storage
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:143
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:130
 msgid "Storage"
 msgstr "Datu nesēji"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:153
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:141
 msgid "Removable Storage"
 msgstr "Noņemamie datu nesēji"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:170
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:158
 msgid "_Mount removable drives when hot-plugged"
 msgstr "_Montēt noņemamos diskus, kad karsti-pieslēgti"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:175
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:166
 msgid "Mount removable media when _inserted"
 msgstr "Montēt noņemamos datu nesējus, kad _ievieoti"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:180
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:174
 msgid "B_rowse removable media when inserted"
 msgstr "Pā_rlūkot noņemamos datu nesējus, kad ievietoti"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:185
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:182
 msgid "_Auto-run programs on new drives and media"
 msgstr "_Automātiski izpildīt programmas uz jauniem diskiem un datu nesējiem"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:190
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:189
 msgid "Auto-open files on new drives and media"
 msgstr "Automātiski atvērt failus uz jauniem diskiem un datu nesējiem"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:199
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:201
 msgid "Blank CDs and DVDs"
 msgstr "Tukši CD un DVD"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:216
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:218
 msgid "_Burn a CD or DVD when a blank disc is inserted"
 msgstr "_Dedzināt CD vai DVD, kad ievietots tukšs disks"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:224
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:229
 msgid "Command for _Data CDs:"
 msgstr "Komanda priekš _Datu CD:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:231
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:239
 msgid "Command for A_udio CDs:"
 msgstr "Komanda priekš A_udio CD:"
 
 #.
 #. Multimedia
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:245
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:255
 msgid "Multimedia"
 msgstr "Multimēdia"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:255
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:266
 msgid "Audio CDs"
 msgstr "Audio CD"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:272
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:283
 msgid "Play _audio CDs when inserted"
 msgstr "Atskaņot _audio CD, kad ievietoti"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:277
-#: ../thunar-volman/tvm-preferences-dialog.c:383
-#: ../thunar-volman/tvm-preferences-dialog.c:425
-#: ../thunar-volman/tvm-preferences-dialog.c:499
-#: ../thunar-volman/tvm-preferences-dialog.c:541
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:290
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:415
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:466
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:553
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:601
 msgid "_Command:"
 msgstr "_Komanda:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:287
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:304
 msgid "Video CDs/DVDs"
 msgstr "Video CD/DVD"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:304
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:321
 msgid "Play _video CDs and DVDs when inserted"
 msgstr "Atskaņot _video CD un DVD, kad ievietoti"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:309
-#: ../thunar-volman/tvm-preferences-dialog.c:341
-#: ../thunar-volman/tvm-preferences-dialog.c:457
-#: ../thunar-volman/tvm-preferences-dialog.c:573
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:329
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:367
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:505
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:640
 msgid "C_ommand:"
 msgstr "K_omanda:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:319
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:343
 msgid "Portable Music Players"
 msgstr "Portatīvais mūzikas atskaņotājs"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:336
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:360
 msgid "Play _music files when connected"
 msgstr "Atskaņot _mūzikas failus, kad pievienots"
 
 #.
 #. Cameras
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:351
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:379
 msgid "Cameras"
 msgstr "Kameras"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:361
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:390
 msgid "Digital Cameras"
 msgstr "Digitālās kameras"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:378
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:407
 msgid "Import digital photographs when connected"
 msgstr "Importēt digitālās fotogrāfijas, kad pievienots"
 
 #.
 #. PDAs
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:393
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:427
 msgid "PDAs"
 msgstr "Personālie ciparasistenti"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:403
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:441
 msgid "Palm™"
 msgstr "Palm™"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:420
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:458
 msgid "Sync _Palm™ devices when connected"
 msgstr "Sinhronizēt _Palm™ ierīci, kad pievienots"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:435
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:480
 msgid "Pocket PCs"
 msgstr "Plaukstdatori"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:452
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:497
 msgid "Sync Pocket P_C devices when connected"
 msgstr "Sinhronizēt plaukstdatoru, kad pievienots"
 
 #.
 #. Printers
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:467
-#: ../thunar-volman/tvm-preferences-dialog.c:477
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:517
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:528
 msgid "Printers"
 msgstr "Printeri"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:494
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:545
 msgid "Automatically run a program when a _printer is connected"
 msgstr "Automātiski palaist programu, kad p_rinteris ir pievienots"
 
 #.
 #. Input Devices
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:509
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:565
 msgid "Input Devices"
 msgstr "Ievad ierīces"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:519
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:576
 msgid "Keyboards"
 msgstr "Klaviatūra"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:536
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:593
 msgid "Automatically run a program when an USB _keyboard is connected"
 msgstr "Automātiski palaist programu, kad USB _klaviatūra ir pievienota"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:551
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:615
 msgid "Mice"
 msgstr "Pele"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:568
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:632
 msgid "Automatically run a program when an USB _mouse is connected"
 msgstr "Automātiski palaist programu, kad USB _pele ir pievienota"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:583
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:654
 msgid "Tablet"
 msgstr "Planšetdators"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:600
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:671
 msgid "Automatically run a program when a _tablet is connected"
 msgstr "Automātiski palaist programu, kad _planšetdators ir pievienots"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:605
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:679
 msgid "Com_mand:"
 msgstr "Kom_anda:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:690
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:755
 msgid "Failed to open the documentation browser"
 msgstr "Neizdevas atvērt dokumentu pārlūku"
 
-#: ../thunar-volman/tvm-run.c:133 ../thunar-volman/tvm-run.c:144
-msgid "Choose Disc Type"
-msgstr "Norādiet diska tipu"
+#~ msgid "Failed to open display"
+#~ msgstr "Neizdevās atvērt displeju"
 
-#: ../thunar-volman/tvm-run.c:134 ../thunar-volman/tvm-run.c:145
-msgid "You have inserted a blank disc."
-msgstr "Jūs esat ievietojis tukšu disku."
+#~ msgid "The Thunar development team. All rights reserved."
+#~ msgstr "Thunar izstrādes komanda. Visas tiesības rezervētas."
 
-#: ../thunar-volman/tvm-run.c:135 ../thunar-volman/tvm-run.c:146
-msgid "What would you like to do?"
-msgstr "Ko vēlaties darīt?"
+#~ msgid "Written by Benedikt Meurer <benny at xfce.org>."
+#~ msgstr "Autors Benedikt Meurer <benny at xfce.org>."
 
-#: ../thunar-volman/tvm-run.c:137
-msgid "Make _DVD"
-msgstr "Veidot _DVD"
+#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
+#~ msgstr "Norādītais UDI \"%s\" nav derīgs HAL ierīces UDI"
 
-#: ../thunar-volman/tvm-run.c:148
-msgid "Make _Data CD"
-msgstr "Veidot _Datu CD"
+#~ msgid "Encrypted volume"
+#~ msgstr "Šifrēts sējums"
 
-#: ../thunar-volman/tvm-run.c:149
-msgid "Make _Audio CD"
-msgstr "Veidot _Audio CD"
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Šifrēta sējuma montēšana...</span>"
+
+#~ msgid "Setting up the crypto layer..."
+#~ msgstr "crypto slāņa uzstādīšana..."
+
+#~ msgid "You are not privileged to setup the crypto layer"
+#~ msgstr "Jums nav tiesību uzstādīt crypto slāni"
+
+#~ msgid "Wrong password"
+#~ msgstr "Nepareiza parole"
+
+#~ msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
+#~ msgstr "<span weight=\"bold\" size=\"larger\">Nepareiza parole.</span>"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
+#~ msgstr "<span weight=\"bold\" size=\"larger\">Šis sējums ir šifrēts.</span>"
+
+#~ msgid "Please enter your password to decrypt and mount the volume."
+#~ msgstr "Lūdzu ievadiet savu paroli, lai atšifrētu un nomontētu sējumu."
+
+#~ msgid "_Mount"
+#~ msgstr "_Montēt"
+
+#~ msgid "Failed to setup the encrypted volume"
+#~ msgstr "Neizdevās uzstādīt šifrēšanas sējumu"
+
+#~ msgid "Choose Disc Type"
+#~ msgstr "Norādiet diska tipu"
 
-#: ../thunar-volman-settings.desktop.in.in.h:3
-msgid "Removable Media"
-msgstr "Noņemamās iekārtas"
+#~ msgid "Make _DVD"
+#~ msgstr "Veidot _DVD"
 
+#~ msgid "Removable Media"
+#~ msgstr "Noņemamās iekārtas"
diff --git a/po/nb.po b/po/nb.po
index e27521c..ef9bea3 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,105 +8,99 @@ msgid ""
 msgstr ""
 "Project-Id-Version: thunar-volman 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-27 23:59+0100\n"
+"POT-Creation-Date: 2010-07-25 20:06+0200\n"
 "PO-Revision-Date: 2007-07-01 20:42+0200\n"
 "Last-Translator: Terje Uriansrud <terje at uriansrud.net>\n"
 "Language-Team: Norwegian Bokmal\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../thunar-volman/main.c:50
-msgid "The HAL device UDI of the newly added device"
+#: ../thunar-volman/main.c:59
+#, fuzzy
+msgid "The syfs path of the newly added device"
 msgstr "HAL enhetens UDI for enheten som er lagt til"
 
-#: ../thunar-volman/main.c:51 ../thunar-volman/tvm-preferences-dialog.c:120
-#: ../thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman/main.c:60
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:104
 msgid "Configure management of removable drives and media"
 msgstr "Konfigurer oppsett for avmonterbare stasjoner og media"
 
-#: ../thunar-volman/main.c:52
+#: ../thunar-volman/main.c:61
 msgid "Print version information and exit"
 msgstr "Skriv ut versjonsinformasjon og avslutt"
 
 #. setup application name
-#: ../thunar-volman/main.c:69
+#: ../thunar-volman/main.c:93
 msgid "Thunar Volume Manager"
 msgstr "Thunar enhetsbehandler"
 
-#: ../thunar-volman/main.c:90
-msgid "Failed to open display"
-msgstr "Klarte ikke åpne skjerm"
-
-#: ../thunar-volman/main.c:106
-msgid "The Thunar development team. All rights reserved."
-msgstr "Thunar utvikliingsteam. Alle rettigheter reservert."
-
-#: ../thunar-volman/main.c:107
-msgid "Written by Benedikt Meurer <benny at xfce.org>."
-msgstr "Skrevet av Benedikt Meurer <benny at xfce.org>."
+#: ../thunar-volman/main.c:133
+msgid "All rights reserved."
+msgstr ""
 
-#: ../thunar-volman/main.c:108
+#: ../thunar-volman/main.c:134
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Rapporter feil til <%s>."
 
-#. TRANSLATORS: A HAL device UDI must match certain conditions to be valid (to be exact, it must be a valid D-Bus object path)
-#: ../thunar-volman/main.c:133
+#: ../thunar-volman/main.c:188
 #, c-format
-msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
-msgstr "Den spesifiserte UDI \"%s\" er ikke en gyldig HAL enhets UDI"
+msgid "There is no device with the sysfs path \"%s\""
+msgstr ""
 
-#. TRANSLATORS: thunar-volman wasn't invoked with either --device-added or --configure.
-#: ../thunar-volman/main.c:144
-#, c-format
-msgid "Must specify the new HAL device UDI with --device-added"
+#: ../thunar-volman/main.c:200
+#, fuzzy, c-format
+msgid "Must specify the sysfs path of new devices with --device-added"
 msgstr "Spesifisering av ny HAL enhet UDI må spesifiseres med --device-added"
 
 #. ...so we need to prompt what to do
-#: ../thunar-volman/tvm-block-device.c:189
+#: ../thunar-volman/tvm-block-device.c:204
 msgid "Photos and Music"
 msgstr "Bilder og musikk"
 
-#: ../thunar-volman/tvm-block-device.c:190
-msgid "Photos were found on your portable music player."
+#: ../thunar-volman/tvm-block-device.c:205
+#, fuzzy
+msgid "Photos were found on your portable music player"
 msgstr "Bilder er funnet på din portable musikkavspiller."
 
-#: ../thunar-volman/tvm-block-device.c:191
+#: ../thunar-volman/tvm-block-device.c:206
 msgid "Would you like to import the photos or manage the music?"
 msgstr "Ønsker du å importere bildene eller vedlikeholde musikk?"
 
-#: ../thunar-volman/tvm-block-device.c:192
-#: ../thunar-volman/tvm-block-device.c:258
-#: ../thunar-volman/tvm-block-device.c:335
-#: ../thunar-volman/tvm-block-device.c:371
-#: ../thunar-volman/tvm-block-device.c:430
-#: ../thunar-volman/tvm-block-device.c:703
-#: ../thunar-volman/tvm-crypto-volume.c:448 ../thunar-volman/tvm-run.c:136
-#: ../thunar-volman/tvm-run.c:147
+#: ../thunar-volman/tvm-block-device.c:208
+#: ../thunar-volman/tvm-block-device.c:277
+#: ../thunar-volman/tvm-block-device.c:378
+#: ../thunar-volman/tvm-block-device.c:425
+#: ../thunar-volman/tvm-block-device.c:507
+#: ../thunar-volman/tvm-block-device.c:826 ../thunar-volman/tvm-run.c:196
+#: ../thunar-volman/tvm-run.c:207
 msgid "Ig_nore"
 msgstr "_Ignorer"
 
-#: ../thunar-volman/tvm-block-device.c:193
-#: ../thunar-volman/tvm-block-device.c:259
+#: ../thunar-volman/tvm-block-device.c:209
+#: ../thunar-volman/tvm-block-device.c:278
 msgid "Import _Photos"
 msgstr "Importer _bilder"
 
-#: ../thunar-volman/tvm-block-device.c:194
+#: ../thunar-volman/tvm-block-device.c:210
 msgid "Manage _Music"
 msgstr "Vedlikehold _musikk"
 
-#. ask the user whether to import photos
-#: ../thunar-volman/tvm-block-device.c:255
+#. ask the user to import photos
+#: ../thunar-volman/tvm-block-device.c:273
 msgid "Photo Import"
 msgstr "Bildeimport"
 
-#: ../thunar-volman/tvm-block-device.c:256
-msgid "A photo card has been detected."
+#: ../thunar-volman/tvm-block-device.c:274
+#, fuzzy
+msgid "A photo card has been detected"
 msgstr "Et bildekort ble funnet."
 
-#: ../thunar-volman/tvm-block-device.c:257
+#: ../thunar-volman/tvm-block-device.c:275
 msgid ""
 "There are photos on the card. Would you like to add these photos to your "
 "album?"
@@ -114,353 +108,520 @@ msgstr ""
 "Det finnes bilder på kortet. Ønsker du å legge til disse bildene ialbumet "
 "ditt?"
 
-#. prompt the user whether to execute this file
-#: ../thunar-volman/tvm-block-device.c:332
-#: ../thunar-volman/tvm-block-device.c:368
+#. prompt the user to execute the file
+#. prompt the user to execute this file
+#: ../thunar-volman/tvm-block-device.c:373
+#: ../thunar-volman/tvm-block-device.c:420
 #, c-format
 msgid "Would you like to allow \"%s\" to run?"
 msgstr "Ønsker du å tillate \"%s\" å starte?"
 
-#: ../thunar-volman/tvm-block-device.c:333
-#: ../thunar-volman/tvm-block-device.c:369
+#: ../thunar-volman/tvm-block-device.c:376
+#: ../thunar-volman/tvm-block-device.c:423
 msgid "Auto-Run Confirmation"
 msgstr "Automatisk kjøringsbekreftelse"
 
-#: ../thunar-volman/tvm-block-device.c:334
-#: ../thunar-volman/tvm-block-device.c:370
+#: ../thunar-volman/tvm-block-device.c:377
+#: ../thunar-volman/tvm-block-device.c:424
 msgid "Auto-Run capability detected"
 msgstr "Automatisk kjøreegenskap funnet"
 
-#: ../thunar-volman/tvm-block-device.c:336
-#: ../thunar-volman/tvm-block-device.c:372
+#: ../thunar-volman/tvm-block-device.c:379
+#: ../thunar-volman/tvm-block-device.c:426
 msgid "_Allow Auto-Run"
 msgstr "_Tillat automatisk kjøring"
 
 #. prompt the user whether to autoopen this file
-#: ../thunar-volman/tvm-block-device.c:427
+#: ../thunar-volman/tvm-block-device.c:502
 #, c-format
 msgid "Would you like to open \"%s\"?"
 msgstr "Ønsker du å åpne \"%s\"?"
 
-#: ../thunar-volman/tvm-block-device.c:428
+#: ../thunar-volman/tvm-block-device.c:505
 msgid "Auto-Open Confirmation"
 msgstr "Automatisk åpningsbekreftelse "
 
-#: ../thunar-volman/tvm-block-device.c:429
+#: ../thunar-volman/tvm-block-device.c:506
 msgid "Auto-Open capability detected"
 msgstr "Automatisk åpningsegenskap funnet"
 
-#: ../thunar-volman/tvm-block-device.c:431
+#: ../thunar-volman/tvm-block-device.c:508
 msgid "_Open"
 msgstr "_Åpne"
 
-#. ask what do with the mixed audio/data disc
-#: ../thunar-volman/tvm-block-device.c:700
-msgid "Audio / Data CD"
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "CD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "DVD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:618
+msgid "The CD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:619
+msgid "The DVD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:629
+msgid "Volume mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:632
+#, c-format
+msgid "The volume \"%s\" was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:637
+#, c-format
+msgid "The inserted volume was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:691
+#, c-format
+msgid "Unable to locate mount point"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:737
+#, c-format
+msgid "Unable to mount the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:746
+#, c-format
+msgid "Could not detect the volume corresponding to the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:821
+#, fuzzy
+msgid "Audio/Data CD"
 msgstr "Lyd/data CD"
 
-#: ../thunar-volman/tvm-block-device.c:701
-msgid "The CD in the drive contains both music and files."
+#: ../thunar-volman/tvm-block-device.c:822
+#, fuzzy
+msgid "The CD in the drive contains both music and files"
 msgstr "CD'en i enheten inneholder både musikk og filer."
 
-#: ../thunar-volman/tvm-block-device.c:702
+#: ../thunar-volman/tvm-block-device.c:824
 msgid "Would you like to listen to music or browse the files?"
 msgstr "Ønsker du å høre på musikken eller navigere filene?"
 
-#: ../thunar-volman/tvm-block-device.c:704
+#: ../thunar-volman/tvm-block-device.c:827
 msgid "_Browse Files"
 msgstr "_Navigerer filer"
 
-#: ../thunar-volman/tvm-block-device.c:705
+#: ../thunar-volman/tvm-block-device.c:828
 msgid "_Play CD"
 msgstr "_Spill CD"
 
-#: ../thunar-volman/tvm-command-entry.c:233
-msgid "Select an Application"
-msgstr "Velg program"
+#: ../thunar-volman/tvm-block-device.c:916
+#, c-format
+msgid "Unknown block device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:243
-msgid "All Files"
-msgstr "Alle filer"
+#: ../thunar-volman/tvm-device.c:139
+#, c-format
+msgid "Device type not supported"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:248
-msgid "Executable Files"
-msgstr "Kjørbare filer"
+#: ../thunar-volman/tvm-input-device.c:74
+#, fuzzy
+msgid "input-keyboard"
+msgstr "Tastatur"
 
-#: ../thunar-volman/tvm-command-entry.c:263
-msgid "Perl Scripts"
-msgstr "Perl skript"
+#: ../thunar-volman/tvm-input-device.c:75
+#, fuzzy
+msgid "Keyboard detected"
+msgstr "Tastatur"
 
-#: ../thunar-volman/tvm-command-entry.c:269
-msgid "Python Scripts"
-msgstr "Python skript"
+#: ../thunar-volman/tvm-input-device.c:76
+#, fuzzy
+msgid "A keyboard was detected"
+msgstr "Et bildekort ble funnet."
 
-#: ../thunar-volman/tvm-command-entry.c:275
-msgid "Ruby Scripts"
-msgstr "Rudy skript"
+#: ../thunar-volman/tvm-input-device.c:86
+#: ../thunar-volman/tvm-input-device.c:100
+msgid "input-tablet"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:281
-msgid "Shell Scripts"
-msgstr "Skallskript"
+#: ../thunar-volman/tvm-input-device.c:87
+#: ../thunar-volman/tvm-input-device.c:101
+#, fuzzy
+msgid "Tablet detected"
+msgstr "Automatisk kjøreegenskap funnet"
 
-#: ../thunar-volman/tvm-crypto-volume.c:286
-#: ../thunar-volman/tvm-crypto-volume.c:443
-msgid "Encrypted volume"
-msgstr "Kryptert dataområde"
+#: ../thunar-volman/tvm-input-device.c:88
+#: ../thunar-volman/tvm-input-device.c:102
+msgid "A graphics tablet was detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:297
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
+#: ../thunar-volman/tvm-input-device.c:110
+msgid "input-mouse"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Monterer kryptert dataområde...</span>"
 
-#: ../thunar-volman/tvm-crypto-volume.c:302
-msgid "Setting up the crypto layer..."
-msgstr "Setter opp kryptografilag..."
+#: ../thunar-volman/tvm-input-device.c:111
+msgid "Mouse detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-input-device.c:112
+msgid "A mouse was detected"
+msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) but got Permission denied.
-#: ../thunar-volman/tvm-crypto-volume.c:369
+#: ../thunar-volman/tvm-input-device.c:139
 #, c-format
-msgid "You are not privileged to setup the crypto layer"
-msgstr "Du har ikke rettigheter til å sette opp kryptografilaget"
+msgid "Unsupported input device type"
+msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) and typed the wrong password.
-#: ../thunar-volman/tvm-crypto-volume.c:374
+#: ../thunar-volman/tvm-run.c:173
 #, c-format
-msgid "Wrong password"
-msgstr "Feil passord"
+msgid "Autoburning of blank CDs and DVDs is disabled"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:193
+msgid "Blank DVD inserted"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:445
-msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Feil passord.</span>"
+#: ../thunar-volman/tvm-run.c:194
+#, fuzzy
+msgid "You have inserted a blank DVD."
+msgstr "Du har satt inn en tom plate."
 
-#: ../thunar-volman/tvm-crypto-volume.c:446
-msgid "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
+#: ../thunar-volman/tvm-run.c:195 ../thunar-volman/tvm-run.c:206
+msgid "What would you like to do?"
+msgstr "Hva ønsker du å gjøre?"
+
+#: ../thunar-volman/tvm-run.c:197
+msgid "Burn _DVD"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:204
+#, fuzzy
+msgid "Blank CD inserted"
+msgstr "Blanke CD'er og DVD'er"
+
+#: ../thunar-volman/tvm-run.c:205
+#, fuzzy
+msgid "You have inserted a blank CD."
+msgstr "Du har satt inn en tom plate."
+
+#: ../thunar-volman/tvm-run.c:208
+#, fuzzy
+msgid "Burn _Data CD"
+msgstr "Lag en _datacd"
+
+#: ../thunar-volman/tvm-run.c:209
+#, fuzzy
+msgid "Burn _Audio CD"
+msgstr "Lag en _lydcd"
+
+#: ../thunar-volman/tvm-run.c:233
+#, c-format
+msgid "The burn command may not be empty"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:272
+#, c-format
+msgid "The CD player command is undefined"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:66
+msgid "Camera detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:67
+#, fuzzy
+msgid "A photo camera was detected"
+msgstr "Et bildekort ble funnet."
+
+#: ../thunar-volman/tvm-usb-device.c:77
+msgid "Printer detected"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Dette dataområdet er kryptert.</span>"
 
-#: ../thunar-volman/tvm-crypto-volume.c:447
-msgid "Please enter your password to decrypt and mount the volume."
-msgstr "Skriv inn passordet for å dekryptere og montere dataområdet."
+#: ../thunar-volman/tvm-usb-device.c:78
+msgid "A USB printer was detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:449
-msgid "_Mount"
-msgstr "_Monter"
+#: ../thunar-volman/tvm-usb-device.c:104
+#, c-format
+msgid "Unsupported USB device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:468
-msgid "Failed to setup the encrypted volume"
-msgstr "Klarte ikke sette opp det krypterte dataområdet"
+#. setup application name
+#: ../thunar-volman-settings/main.c:52
+#, fuzzy
+msgid "Thunar Volume Manager Settings"
+msgstr "Thunar enhetsbehandler"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:119
-#: ../thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:102
 msgid "Removable Drives and Media"
 msgstr "Avmonterbare Enheter og media"
 
+#: ../thunar-volman-settings/tvm-command-entry.c:240
+msgid "Select an Application"
+msgstr "Velg program"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:250
+msgid "All Files"
+msgstr "Alle filer"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:255
+msgid "Executable Files"
+msgstr "Kjørbare filer"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:270
+msgid "Perl Scripts"
+msgstr "Perl skript"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:276
+msgid "Python Scripts"
+msgstr "Python skript"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:282
+msgid "Ruby Scripts"
+msgstr "Rudy skript"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:288
+msgid "Shell Scripts"
+msgstr "Skallskript"
+
 #.
 #. Storage
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:143
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:130
 msgid "Storage"
 msgstr "Lagring"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:153
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:141
 msgid "Removable Storage"
 msgstr "Avmonterbar lagring"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:170
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:158
 msgid "_Mount removable drives when hot-plugged"
 msgstr "_Monter flyttbare enheter når de koblet til"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:175
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:166
 msgid "Mount removable media when _inserted"
 msgstr "Monter flyttbare medier når de settes _inn"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:180
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:174
 msgid "B_rowse removable media when inserted"
 msgstr "_Naviger flyttbare medier når de settes inn"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:185
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:182
 msgid "_Auto-run programs on new drives and media"
 msgstr "_Kjør automatisk programmer på nye enheter eller media"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:190
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:189
 msgid "Auto-open files on new drives and media"
 msgstr "_Åpne automatisk filer på nye enheter og media"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:199
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:201
 msgid "Blank CDs and DVDs"
 msgstr "Blanke CD'er og DVD'er"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:216
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:218
 msgid "_Burn a CD or DVD when a blank disc is inserted"
 msgstr "_Brenn en CD eller DVD når en tom plate settes inn"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:224
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:229
 msgid "Command for _Data CDs:"
 msgstr "Kommando for _data CD'er:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:231
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:239
 msgid "Command for A_udio CDs:"
 msgstr "Kommando for _lydcd'er:"
 
 #.
 #. Multimedia
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:245
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:255
 msgid "Multimedia"
 msgstr "Multimedia"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:255
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:266
 msgid "Audio CDs"
 msgstr "Lydcd'er"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:272
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:283
 msgid "Play _audio CDs when inserted"
 msgstr "Spill _lydcd når de settes inn"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:277
-#: ../thunar-volman/tvm-preferences-dialog.c:383
-#: ../thunar-volman/tvm-preferences-dialog.c:425
-#: ../thunar-volman/tvm-preferences-dialog.c:499
-#: ../thunar-volman/tvm-preferences-dialog.c:541
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:290
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:415
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:466
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:553
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:601
 msgid "_Command:"
 msgstr "_Kommando:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:287
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:304
 msgid "Video CDs/DVDs"
 msgstr "Video CD'er/DVD'er"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:304
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:321
 msgid "Play _video CDs and DVDs when inserted"
 msgstr "Spill _video CD'er og DVD'er når de settes inn"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:309
-#: ../thunar-volman/tvm-preferences-dialog.c:341
-#: ../thunar-volman/tvm-preferences-dialog.c:457
-#: ../thunar-volman/tvm-preferences-dialog.c:573
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:329
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:367
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:505
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:640
 msgid "C_ommand:"
 msgstr "K_ommando:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:319
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:343
 msgid "Portable Music Players"
 msgstr "Portable musikkspillere"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:336
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:360
 msgid "Play _music files when connected"
 msgstr "Spill _musikkfiler ved tilkobling"
 
 #.
 #. Cameras
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:351
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:379
 msgid "Cameras"
 msgstr "Kamera"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:361
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:390
 msgid "Digital Cameras"
 msgstr "Digitale kameraer"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:378
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:407
 msgid "Import digital photographs when connected"
 msgstr "Importer digitale bilder ved tilkobling"
 
 #.
 #. PDAs
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:393
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:427
 msgid "PDAs"
 msgstr "PDA'er"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:403
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:441
 msgid "Palm™"
 msgstr "Palm"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:420
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:458
 msgid "Sync _Palm™ devices when connected"
 msgstr "Synkroniser _Palm enheter hvis tilkoblet"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:435
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:480
 msgid "Pocket PCs"
 msgstr "Pocket PC'er"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:452
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:497
 msgid "Sync Pocket P_C devices when connected"
 msgstr "Synkronser Pocket P_C enheter ved tilkobling"
 
 #.
 #. Printers
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:467
-#: ../thunar-volman/tvm-preferences-dialog.c:477
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:517
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:528
 msgid "Printers"
 msgstr "Skrivere"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:494
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:545
 msgid "Automatically run a program when a _printer is connected"
 msgstr "Kjør et program automatisk når en _skriver kobles til"
 
 #.
 #. Input Devices
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:509
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:565
 msgid "Input Devices"
 msgstr "Innenheter"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:519
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:576
 msgid "Keyboards"
 msgstr "Tastatur"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:536
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:593
 msgid "Automatically run a program when an USB _keyboard is connected"
 msgstr "Kjør et program automatisk når et USB _tastatur kobles til"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:551
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:615
 msgid "Mice"
 msgstr "Mus"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:568
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:632
 msgid "Automatically run a program when an USB _mouse is connected"
 msgstr "Kjør et program automatisk når en USB _mus kobles til"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:583
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:654
 msgid "Tablet"
 msgstr "Tablet"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:600
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:671
 msgid "Automatically run a program when a _tablet is connected"
 msgstr "Kjør et program automatisk når en _tablet kobles til"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:605
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:679
 msgid "Com_mand:"
 msgstr "Kom_mando:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:690
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:755
 msgid "Failed to open the documentation browser"
 msgstr "Klarte ikke åpne dokumentasjonsnavigatoren"
 
-#: ../thunar-volman/tvm-run.c:133 ../thunar-volman/tvm-run.c:144
-msgid "Choose Disc Type"
-msgstr "Velg disktype"
+#~ msgid "Failed to open display"
+#~ msgstr "Klarte ikke åpne skjerm"
 
-#: ../thunar-volman/tvm-run.c:134 ../thunar-volman/tvm-run.c:145
-msgid "You have inserted a blank disc."
-msgstr "Du har satt inn en tom plate."
+#~ msgid "The Thunar development team. All rights reserved."
+#~ msgstr "Thunar utvikliingsteam. Alle rettigheter reservert."
 
-#: ../thunar-volman/tvm-run.c:135 ../thunar-volman/tvm-run.c:146
-msgid "What would you like to do?"
-msgstr "Hva ønsker du å gjøre?"
+#~ msgid "Written by Benedikt Meurer <benny at xfce.org>."
+#~ msgstr "Skrevet av Benedikt Meurer <benny at xfce.org>."
 
-#: ../thunar-volman/tvm-run.c:137
-msgid "Make _DVD"
-msgstr "Lag _DVD"
+#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
+#~ msgstr "Den spesifiserte UDI \"%s\" er ikke en gyldig HAL enhets UDI"
 
-#: ../thunar-volman/tvm-run.c:148
-msgid "Make _Data CD"
-msgstr "Lag en _datacd"
+#~ msgid "Encrypted volume"
+#~ msgstr "Kryptert dataområde"
 
-#: ../thunar-volman/tvm-run.c:149
-msgid "Make _Audio CD"
-msgstr "Lag en _lydcd"
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Monterer kryptert dataområde...</"
+#~ "span>"
+
+#~ msgid "Setting up the crypto layer..."
+#~ msgstr "Setter opp kryptografilag..."
+
+#~ msgid "You are not privileged to setup the crypto layer"
+#~ msgstr "Du har ikke rettigheter til å sette opp kryptografilaget"
+
+#~ msgid "Wrong password"
+#~ msgstr "Feil passord"
+
+#~ msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
+#~ msgstr "<span weight=\"bold\" size=\"larger\">Feil passord.</span>"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Dette dataområdet er kryptert.</"
+#~ "span>"
+
+#~ msgid "Please enter your password to decrypt and mount the volume."
+#~ msgstr "Skriv inn passordet for å dekryptere og montere dataområdet."
+
+#~ msgid "_Mount"
+#~ msgstr "_Monter"
+
+#~ msgid "Failed to setup the encrypted volume"
+#~ msgstr "Klarte ikke sette opp det krypterte dataområdet"
+
+#~ msgid "Choose Disc Type"
+#~ msgstr "Velg disktype"
+
+#~ msgid "Make _DVD"
+#~ msgstr "Lag _DVD"
 
 #~ msgid "Removable Media"
 #~ msgstr "Avmonterbare media"
diff --git a/po/nl.po b/po/nl.po
index f9902c8..534a270 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,459 +7,633 @@ msgid ""
 msgstr ""
 "Project-Id-Version: thunar-volman 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-30 02:26-0700\n"
+"POT-Creation-Date: 2010-07-25 20:06+0200\n"
 "PO-Revision-Date: 2009-08-18 11:06-0800\n"
 "Last-Translator: Auke Kok <auke-jan.h.kok at intel.com>\n"
 "Language-Team: Dutch <vertaling at vrijschrift.org>\n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Dutch\n"
 
-#: ../thunar-volman/main.c:50
-msgid "The HAL device UDI of the newly added device"
+#: ../thunar-volman/main.c:59
+#, fuzzy
+msgid "The syfs path of the newly added device"
 msgstr "De UDI van het nieuw toegevoegde HAL apparaat"
 
-#: ../thunar-volman/main.c:51
-#: ../thunar-volman/tvm-preferences-dialog.c:120
-#: ../thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman/main.c:60
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:104
 msgid "Configure management of removable drives and media"
 msgstr "Beheer van verwisselbare stations en media instellen"
 
-#: ../thunar-volman/main.c:52
+#: ../thunar-volman/main.c:61
 msgid "Print version information and exit"
 msgstr "Print versie informatie en sluit af"
 
 #. setup application name
-#: ../thunar-volman/main.c:69
+#: ../thunar-volman/main.c:93
 msgid "Thunar Volume Manager"
 msgstr "Thunar Volume Beheer"
 
-#: ../thunar-volman/main.c:90
-msgid "Failed to open display"
-msgstr "Kon scherm niet openen"
-
-#: ../thunar-volman/main.c:106
-msgid "The Thunar development team. All rights reserved."
-msgstr "Het Thunar ontwikkel team. Alle rechten voorbehouden"
-
-#: ../thunar-volman/main.c:107
-msgid "Written by Benedikt Meurer <benny at xfce.org>."
-msgstr "Geschreven door Benedikt Meurer <benny at xfce.org>"
+#: ../thunar-volman/main.c:133
+msgid "All rights reserved."
+msgstr ""
 
-#: ../thunar-volman/main.c:108
+#: ../thunar-volman/main.c:134
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Bugs rapporteren: <%s>."
 
-#. TRANSLATORS: A HAL device UDI must match certain conditions to be valid (to be exact, it must be a valid D-Bus object path)
-#: ../thunar-volman/main.c:133
+#: ../thunar-volman/main.c:188
 #, c-format
-msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
-msgstr "De opgegeven UDI \"%s\" is geen correcte HAL apparaat UDI"
+msgid "There is no device with the sysfs path \"%s\""
+msgstr ""
 
-#. TRANSLATORS: thunar-volman wasn't invoked with either --device-added or --configure.
-#: ../thunar-volman/main.c:144
-#, c-format
-msgid "Must specify the new HAL device UDI with --device-added"
-msgstr "Er dient een UDI van een nieuw HAL appraat te worden opgegeven met --device-added"
+#: ../thunar-volman/main.c:200
+#, fuzzy, c-format
+msgid "Must specify the sysfs path of new devices with --device-added"
+msgstr ""
+"Er dient een UDI van een nieuw HAL appraat te worden opgegeven met --device-"
+"added"
 
 #. ...so we need to prompt what to do
-#: ../thunar-volman/tvm-block-device.c:189
+#: ../thunar-volman/tvm-block-device.c:204
 msgid "Photos and Music"
 msgstr "Foto's en Muziek"
 
-#: ../thunar-volman/tvm-block-device.c:190
-msgid "Photos were found on your portable music player."
+#: ../thunar-volman/tvm-block-device.c:205
+#, fuzzy
+msgid "Photos were found on your portable music player"
 msgstr "Er zijn foto's en muziekbestanden gevonden op uw apparaat"
 
-#: ../thunar-volman/tvm-block-device.c:191
+#: ../thunar-volman/tvm-block-device.c:206
 msgid "Would you like to import the photos or manage the music?"
 msgstr "Wilt u deze foto's importeren of de muziek beheren?"
 
-#: ../thunar-volman/tvm-block-device.c:192
-#: ../thunar-volman/tvm-block-device.c:258
-#: ../thunar-volman/tvm-block-device.c:335
-#: ../thunar-volman/tvm-block-device.c:371
-#: ../thunar-volman/tvm-block-device.c:430
-#: ../thunar-volman/tvm-block-device.c:703
-#: ../thunar-volman/tvm-crypto-volume.c:448
-#: ../thunar-volman/tvm-run.c:136
-#: ../thunar-volman/tvm-run.c:147
+#: ../thunar-volman/tvm-block-device.c:208
+#: ../thunar-volman/tvm-block-device.c:277
+#: ../thunar-volman/tvm-block-device.c:378
+#: ../thunar-volman/tvm-block-device.c:425
+#: ../thunar-volman/tvm-block-device.c:507
+#: ../thunar-volman/tvm-block-device.c:826 ../thunar-volman/tvm-run.c:196
+#: ../thunar-volman/tvm-run.c:207
 msgid "Ig_nore"
 msgstr "_Afbreken"
 
-#: ../thunar-volman/tvm-block-device.c:193
-#: ../thunar-volman/tvm-block-device.c:259
+#: ../thunar-volman/tvm-block-device.c:209
+#: ../thunar-volman/tvm-block-device.c:278
 msgid "Import _Photos"
 msgstr "_Foto's importeren"
 
-#: ../thunar-volman/tvm-block-device.c:194
+#: ../thunar-volman/tvm-block-device.c:210
 msgid "Manage _Music"
 msgstr "_Muziek beheren"
 
-#. ask the user whether to import photos
-#: ../thunar-volman/tvm-block-device.c:255
+#. ask the user to import photos
+#: ../thunar-volman/tvm-block-device.c:273
 msgid "Photo Import"
 msgstr "Foto's importeren"
 
-#: ../thunar-volman/tvm-block-device.c:256
-msgid "A photo card has been detected."
+#: ../thunar-volman/tvm-block-device.c:274
+#, fuzzy
+msgid "A photo card has been detected"
 msgstr "Een medium met foto's is gedetecteerd."
 
-#: ../thunar-volman/tvm-block-device.c:257
-msgid "There are photos on the card. Would you like to add these photos to your album?"
-msgstr "Op dit medium zijn foto's gevonden. Wilt u deze foto's toevoegen aan uw album?"
+#: ../thunar-volman/tvm-block-device.c:275
+msgid ""
+"There are photos on the card. Would you like to add these photos to your "
+"album?"
+msgstr ""
+"Op dit medium zijn foto's gevonden. Wilt u deze foto's toevoegen aan uw "
+"album?"
 
-#. prompt the user whether to execute this file
-#: ../thunar-volman/tvm-block-device.c:332
-#: ../thunar-volman/tvm-block-device.c:368
+#. prompt the user to execute the file
+#. prompt the user to execute this file
+#: ../thunar-volman/tvm-block-device.c:373
+#: ../thunar-volman/tvm-block-device.c:420
 #, c-format
 msgid "Would you like to allow \"%s\" to run?"
 msgstr "Wilt u \"%s\" uitvoeren?"
 
-#: ../thunar-volman/tvm-block-device.c:333
-#: ../thunar-volman/tvm-block-device.c:369
+#: ../thunar-volman/tvm-block-device.c:376
+#: ../thunar-volman/tvm-block-device.c:423
 msgid "Auto-Run Confirmation"
 msgstr "Auto-start bevestigen"
 
-#: ../thunar-volman/tvm-block-device.c:334
-#: ../thunar-volman/tvm-block-device.c:370
+#: ../thunar-volman/tvm-block-device.c:377
+#: ../thunar-volman/tvm-block-device.c:424
 msgid "Auto-Run capability detected"
 msgstr "Auto-start mogelijkheid gevonden"
 
-#: ../thunar-volman/tvm-block-device.c:336
-#: ../thunar-volman/tvm-block-device.c:372
+#: ../thunar-volman/tvm-block-device.c:379
+#: ../thunar-volman/tvm-block-device.c:426
 msgid "_Allow Auto-Run"
 msgstr "Auto-start _Toestaan"
 
 #. prompt the user whether to autoopen this file
-#: ../thunar-volman/tvm-block-device.c:427
+#: ../thunar-volman/tvm-block-device.c:502
 #, c-format
 msgid "Would you like to open \"%s\"?"
 msgstr "Wilt u \"%s\" openen?"
 
-#: ../thunar-volman/tvm-block-device.c:428
+#: ../thunar-volman/tvm-block-device.c:505
 msgid "Auto-Open Confirmation"
 msgstr "Automatisch openen bevestigen"
 
-#: ../thunar-volman/tvm-block-device.c:429
+#: ../thunar-volman/tvm-block-device.c:506
 msgid "Auto-Open capability detected"
 msgstr "Mogelijkheid om automatisch te openen gevonden"
 
-#: ../thunar-volman/tvm-block-device.c:431
+#: ../thunar-volman/tvm-block-device.c:508
 msgid "_Open"
 msgstr "_Openen"
 
-#. ask what do with the mixed audio/data disc
-#: ../thunar-volman/tvm-block-device.c:700
-msgid "Audio / Data CD"
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "CD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "DVD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:618
+msgid "The CD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:619
+msgid "The DVD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:629
+msgid "Volume mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:632
+#, c-format
+msgid "The volume \"%s\" was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:637
+#, c-format
+msgid "The inserted volume was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:691
+#, c-format
+msgid "Unable to locate mount point"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:737
+#, c-format
+msgid "Unable to mount the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:746
+#, c-format
+msgid "Could not detect the volume corresponding to the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:821
+#, fuzzy
+msgid "Audio/Data CD"
 msgstr "Muziek / Gegevens CD"
 
-#: ../thunar-volman/tvm-block-device.c:701
-msgid "The CD in the drive contains both music and files."
+#: ../thunar-volman/tvm-block-device.c:822
+#, fuzzy
+msgid "The CD in the drive contains both music and files"
 msgstr "De CD in het station bevat zowel muziek als bestanden."
 
-#: ../thunar-volman/tvm-block-device.c:702
+#: ../thunar-volman/tvm-block-device.c:824
 msgid "Would you like to listen to music or browse the files?"
 msgstr "Wilt u de muziek beluisteren of door de bestanden bladeren?"
 
-#: ../thunar-volman/tvm-block-device.c:704
+#: ../thunar-volman/tvm-block-device.c:827
 msgid "_Browse Files"
 msgstr "Door _bestanden bladeren"
 
-#: ../thunar-volman/tvm-block-device.c:705
+#: ../thunar-volman/tvm-block-device.c:828
 msgid "_Play CD"
 msgstr "_Muziek beluisteren"
 
-#: ../thunar-volman/tvm-command-entry.c:233
-msgid "Select an Application"
-msgstr "Selecteer een applicatie"
+#: ../thunar-volman/tvm-block-device.c:916
+#, c-format
+msgid "Unknown block device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:243
-msgid "All Files"
-msgstr "Voeg bestanden toe"
+#: ../thunar-volman/tvm-device.c:139
+#, c-format
+msgid "Device type not supported"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:248
-msgid "Executable Files"
-msgstr "Uitvoerbare bestanden"
+#: ../thunar-volman/tvm-input-device.c:74
+#, fuzzy
+msgid "input-keyboard"
+msgstr "Toetsenborden"
 
-#: ../thunar-volman/tvm-command-entry.c:263
-msgid "Perl Scripts"
-msgstr "Perl Scripts"
+#: ../thunar-volman/tvm-input-device.c:75
+#, fuzzy
+msgid "Keyboard detected"
+msgstr "Toetsenborden"
 
-#: ../thunar-volman/tvm-command-entry.c:269
-msgid "Python Scripts"
-msgstr "Python Scripts"
+#: ../thunar-volman/tvm-input-device.c:76
+#, fuzzy
+msgid "A keyboard was detected"
+msgstr "Een medium met foto's is gedetecteerd."
 
-#: ../thunar-volman/tvm-command-entry.c:275
-msgid "Ruby Scripts"
-msgstr "Ruby Scripts"
+#: ../thunar-volman/tvm-input-device.c:86
+#: ../thunar-volman/tvm-input-device.c:100
+msgid "input-tablet"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:281
-msgid "Shell Scripts"
-msgstr "Shell Scripts"
+#: ../thunar-volman/tvm-input-device.c:87
+#: ../thunar-volman/tvm-input-device.c:101
+#, fuzzy
+msgid "Tablet detected"
+msgstr "Auto-start mogelijkheid gevonden"
 
-#: ../thunar-volman/tvm-crypto-volume.c:286
-#: ../thunar-volman/tvm-crypto-volume.c:443
-msgid "Encrypted volume"
-msgstr "Versleuteld volume"
+#: ../thunar-volman/tvm-input-device.c:88
+#: ../thunar-volman/tvm-input-device.c:102
+msgid "A graphics tablet was detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:297
-msgid "<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Versleuteld volume aankoppelen...</span>"
+#: ../thunar-volman/tvm-input-device.c:110
+msgid "input-mouse"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:302
-msgid "Setting up the crypto layer..."
-msgstr "Initialisatie cryptografische laag..."
+#: ../thunar-volman/tvm-input-device.c:111
+msgid "Mouse detected"
+msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) but got Permission denied.
-#: ../thunar-volman/tvm-crypto-volume.c:369
+#: ../thunar-volman/tvm-input-device.c:112
+msgid "A mouse was detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-input-device.c:139
 #, c-format
-msgid "You are not privileged to setup the crypto layer"
-msgstr "Je hebt geen privileges om de cryptografische laag op te zetten"
+msgid "Unsupported input device type"
+msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) and typed the wrong password.
-#: ../thunar-volman/tvm-crypto-volume.c:374
+#: ../thunar-volman/tvm-run.c:173
 #, c-format
-msgid "Wrong password"
-msgstr "Fout wachtwoord"
+msgid "Autoburning of blank CDs and DVDs is disabled"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:445
-msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Fout wachtwoord.</span>"
+#: ../thunar-volman/tvm-run.c:193
+msgid "Blank DVD inserted"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:446
-msgid "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Dit volume is versleuteld.</span>"
+#: ../thunar-volman/tvm-run.c:194
+#, fuzzy
+msgid "You have inserted a blank DVD."
+msgstr "U heeft een lege schijf ingevoerd"
 
-#: ../thunar-volman/tvm-crypto-volume.c:447
-msgid "Please enter your password to decrypt and mount the volume."
-msgstr "Geef je wachtwoord on het volume aan te koppelen en te ontsleutelen."
+#: ../thunar-volman/tvm-run.c:195 ../thunar-volman/tvm-run.c:206
+msgid "What would you like to do?"
+msgstr "Wat wilt u doen?"
 
-#: ../thunar-volman/tvm-crypto-volume.c:449
-msgid "_Mount"
-msgstr "_Aankoppelen"
+#: ../thunar-volman/tvm-run.c:197
+msgid "Burn _DVD"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:468
-msgid "Failed to setup the encrypted volume"
-msgstr "Fout bij opzetten versleuteld volume"
+#: ../thunar-volman/tvm-run.c:204
+#, fuzzy
+msgid "Blank CD inserted"
+msgstr "Lege CD's en DVD's"
+
+#: ../thunar-volman/tvm-run.c:205
+#, fuzzy
+msgid "You have inserted a blank CD."
+msgstr "U heeft een lege schijf ingevoerd"
+
+#: ../thunar-volman/tvm-run.c:208
+#, fuzzy
+msgid "Burn _Data CD"
+msgstr "Een _Gegevens CD maken"
+
+#: ../thunar-volman/tvm-run.c:209
+#, fuzzy
+msgid "Burn _Audio CD"
+msgstr "Een _Muziek CD maken"
+
+#: ../thunar-volman/tvm-run.c:233
+#, c-format
+msgid "The burn command may not be empty"
+msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:119
-#: ../thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman/tvm-run.c:272
+#, c-format
+msgid "The CD player command is undefined"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:66
+msgid "Camera detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:67
+#, fuzzy
+msgid "A photo camera was detected"
+msgstr "Een medium met foto's is gedetecteerd."
+
+#: ../thunar-volman/tvm-usb-device.c:77
+msgid "Printer detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:78
+msgid "A USB printer was detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:104
+#, c-format
+msgid "Unsupported USB device type"
+msgstr ""
+
+#. setup application name
+#: ../thunar-volman-settings/main.c:52
+#, fuzzy
+msgid "Thunar Volume Manager Settings"
+msgstr "Thunar Volume Beheer"
+
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:102
 msgid "Removable Drives and Media"
 msgstr "Verwisselbare apparaten en media"
 
+#: ../thunar-volman-settings/tvm-command-entry.c:240
+msgid "Select an Application"
+msgstr "Selecteer een applicatie"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:250
+msgid "All Files"
+msgstr "Voeg bestanden toe"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:255
+msgid "Executable Files"
+msgstr "Uitvoerbare bestanden"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:270
+msgid "Perl Scripts"
+msgstr "Perl Scripts"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:276
+msgid "Python Scripts"
+msgstr "Python Scripts"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:282
+msgid "Ruby Scripts"
+msgstr "Ruby Scripts"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:288
+msgid "Shell Scripts"
+msgstr "Shell Scripts"
+
 #.
 #. Storage
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:143
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:130
 msgid "Storage"
 msgstr "Opslag"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:153
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:141
 msgid "Removable Storage"
 msgstr "Verwisselbare opslag"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:170
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:158
 msgid "_Mount removable drives when hot-plugged"
-msgstr "Automatisch aankoppelen van verwisselbare s_tations wanneer deze worden ingeplugd"
+msgstr ""
+"Automatisch aankoppelen van verwisselbare s_tations wanneer deze worden "
+"ingeplugd"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:175
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:166
 msgid "Mount removable media when _inserted"
-msgstr "Automatisch aankoppelen van verwisselbare _media wanneer deze worden ingeplugd"
+msgstr ""
+"Automatisch aankoppelen van verwisselbare _media wanneer deze worden "
+"ingeplugd"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:180
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:174
 msgid "B_rowse removable media when inserted"
-msgstr "Door bestanden b_laderen bij verwisselbare media wanneer deze worden ingeplugd"
+msgstr ""
+"Door bestanden b_laderen bij verwisselbare media wanneer deze worden "
+"ingeplugd"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:185
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:182
 msgid "_Auto-run programs on new drives and media"
 msgstr "Programma's automatisch _starten op nieuwe stations en media"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:190
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:189
 msgid "Auto-open files on new drives and media"
 msgstr "Bestanden automatisch _openen op nieuwe stations en media"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:199
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:201
 msgid "Blank CDs and DVDs"
 msgstr "Lege CD's en DVD's"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:216
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:218
 msgid "_Burn a CD or DVD when a blank disc is inserted"
 msgstr "Een lege CD of DVD _branden wanneer deze wordt ingevoerd"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:224
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:229
 msgid "Command for _Data CDs:"
 msgstr "Commando voor _Data CD's"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:231
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:239
 msgid "Command for A_udio CDs:"
 msgstr "Commando voor _Muziek CD's"
 
 #.
 #. Multimedia
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:245
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:255
 msgid "Multimedia"
 msgstr "Multimedia"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:255
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:266
 msgid "Audio CDs"
 msgstr "Muziek CD's"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:272
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:283
 msgid "Play _audio CDs when inserted"
 msgstr "Speel _Muziek CD's wanneer deze worden ingevoerd"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:277
-#: ../thunar-volman/tvm-preferences-dialog.c:383
-#: ../thunar-volman/tvm-preferences-dialog.c:425
-#: ../thunar-volman/tvm-preferences-dialog.c:499
-#: ../thunar-volman/tvm-preferences-dialog.c:541
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:290
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:415
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:466
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:553
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:601
 msgid "_Command:"
 msgstr "_Commando:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:287
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:304
 msgid "Video CDs/DVDs"
 msgstr "Video CD's/DVD's"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:304
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:321
 msgid "Play _video CDs and DVDs when inserted"
 msgstr "Speel _video CD's en DVD's wanneer deze worden ingevoerd"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:309
-#: ../thunar-volman/tvm-preferences-dialog.c:341
-#: ../thunar-volman/tvm-preferences-dialog.c:457
-#: ../thunar-volman/tvm-preferences-dialog.c:573
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:329
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:367
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:505
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:640
 msgid "C_ommand:"
 msgstr "_Commando:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:319
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:343
 msgid "Portable Music Players"
 msgstr "Draagbare Muziekspelers"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:336
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:360
 msgid "Play _music files when connected"
 msgstr "_Muziek afspelen wanneer muziekspelers worden ingevoerd"
 
 #.
 #. Cameras
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:351
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:379
 msgid "Cameras"
 msgstr "Camera's"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:361
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:390
 msgid "Digital Cameras"
 msgstr "Digitale Camera's"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:378
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:407
 msgid "Import digital photographs when connected"
 msgstr "Foto's importeren wanneer een digitale camera wordt aangesloten"
 
 #.
 #. PDAs
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:393
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:427
 msgid "PDAs"
 msgstr "PDA's"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:403
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:441
 msgid "Palm™"
 msgstr "Palm™"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:420
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:458
 msgid "Sync _Palm™ devices when connected"
 msgstr "_Palm™ apparaat synchroniseren bij het aansluiten"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:435
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:480
 msgid "Pocket PCs"
 msgstr "Pocket PC's"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:452
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:497
 msgid "Sync Pocket P_C devices when connected"
 msgstr "Pocket P_C apparaat synchroniseren bij het aansluiten"
 
 #.
 #. Printers
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:467
-#: ../thunar-volman/tvm-preferences-dialog.c:477
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:517
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:528
 msgid "Printers"
 msgstr "Printer's"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:494
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:545
 msgid "Automatically run a program when a _printer is connected"
-msgstr "Een programma automatisch uitvoeren wanneer een _printer wordt aangesloten"
+msgstr ""
+"Een programma automatisch uitvoeren wanneer een _printer wordt aangesloten"
 
 #.
 #. Input Devices
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:509
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:565
 msgid "Input Devices"
 msgstr "Invoerapparaten"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:519
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:576
 msgid "Keyboards"
 msgstr "Toetsenborden"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:536
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:593
 msgid "Automatically run a program when an USB _keyboard is connected"
-msgstr "Een programma automatisch uitvoeren wanneer een _toetsenbord wordt aangesloten"
+msgstr ""
+"Een programma automatisch uitvoeren wanneer een _toetsenbord wordt "
+"aangesloten"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:551
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:615
 msgid "Mice"
 msgstr "Muizen"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:568
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:632
 msgid "Automatically run a program when an USB _mouse is connected"
-msgstr "Een programma automatisch uitvoeren wanneer een _muis wordt aangesloten"
+msgstr ""
+"Een programma automatisch uitvoeren wanneer een _muis wordt aangesloten"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:583
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:654
 msgid "Tablet"
 msgstr "Tablet"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:600
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:671
 msgid "Automatically run a program when a _tablet is connected"
-msgstr "Een programma automatisch uitvoeren wanneer een _tablet PC wordt aangesloten"
+msgstr ""
+"Een programma automatisch uitvoeren wanneer een _tablet PC wordt aangesloten"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:605
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:679
 msgid "Com_mand:"
 msgstr "_Commando:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:690
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:755
 msgid "Failed to open the documentation browser"
 msgstr "Kon documentatie verkenner niet openen"
 
-#: ../thunar-volman/tvm-run.c:133
-#: ../thunar-volman/tvm-run.c:144
-msgid "Choose Disc Type"
-msgstr "Kies Type Schijf"
+#~ msgid "Failed to open display"
+#~ msgstr "Kon scherm niet openen"
 
-#: ../thunar-volman/tvm-run.c:134
-#: ../thunar-volman/tvm-run.c:145
-msgid "You have inserted a blank disc."
-msgstr "U heeft een lege schijf ingevoerd"
+#~ msgid "The Thunar development team. All rights reserved."
+#~ msgstr "Het Thunar ontwikkel team. Alle rechten voorbehouden"
 
-#: ../thunar-volman/tvm-run.c:135
-#: ../thunar-volman/tvm-run.c:146
-msgid "What would you like to do?"
-msgstr "Wat wilt u doen?"
+#~ msgid "Written by Benedikt Meurer <benny at xfce.org>."
+#~ msgstr "Geschreven door Benedikt Meurer <benny at xfce.org>"
 
-#: ../thunar-volman/tvm-run.c:137
-msgid "Make _DVD"
-msgstr "Een _DVD maken"
+#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
+#~ msgstr "De opgegeven UDI \"%s\" is geen correcte HAL apparaat UDI"
 
-#: ../thunar-volman/tvm-run.c:148
-msgid "Make _Data CD"
-msgstr "Een _Gegevens CD maken"
+#~ msgid "Encrypted volume"
+#~ msgstr "Versleuteld volume"
 
-#: ../thunar-volman/tvm-run.c:149
-msgid "Make _Audio CD"
-msgstr "Een _Muziek CD maken"
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Versleuteld volume aankoppelen...</"
+#~ "span>"
+
+#~ msgid "Setting up the crypto layer..."
+#~ msgstr "Initialisatie cryptografische laag..."
+
+#~ msgid "You are not privileged to setup the crypto layer"
+#~ msgstr "Je hebt geen privileges om de cryptografische laag op te zetten"
+
+#~ msgid "Wrong password"
+#~ msgstr "Fout wachtwoord"
+
+#~ msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
+#~ msgstr "<span weight=\"bold\" size=\"larger\">Fout wachtwoord.</span>"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Dit volume is versleuteld.</span>"
+
+#~ msgid "Please enter your password to decrypt and mount the volume."
+#~ msgstr ""
+#~ "Geef je wachtwoord on het volume aan te koppelen en te ontsleutelen."
+
+#~ msgid "_Mount"
+#~ msgstr "_Aankoppelen"
+
+#~ msgid "Failed to setup the encrypted volume"
+#~ msgstr "Fout bij opzetten versleuteld volume"
+
+#~ msgid "Choose Disc Type"
+#~ msgstr "Kies Type Schijf"
 
-#: ../thunar-volman-settings.desktop.in.in.h:3
-msgid "Removable Media"
-msgstr "Verwisselbare media"
+#~ msgid "Make _DVD"
+#~ msgstr "Een _DVD maken"
 
+#~ msgid "Removable Media"
+#~ msgstr "Verwisselbare media"
diff --git a/po/pl.po b/po/pl.po
index 31f0e74..ea64ac2 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,460 +7,620 @@ msgid ""
 msgstr ""
 "Project-Id-Version: thunar-volman 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-30 02:26-0700\n"
+"POT-Creation-Date: 2010-07-25 20:06+0200\n"
 "PO-Revision-Date: 2009-03-24 17:30+0100\n"
 "Last-Translator: Piotr Sokół <piotr.sokol at 10g.pl>\n"
 "Language-Team: Polish <translation-team-pl at lists.sourceforge.net>\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=((n==1) ? 0 : ((n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20)) ? 1 : 2));\n"
+"Plural-Forms: nplurals=3; plural=((n==1) ? 0 : ((n%10>=2 && n%10<=4 && (n"
+"%100<10 || n%100>=20)) ? 1 : 2));\n"
 
-#: ../thunar-volman/main.c:50
-msgid "The HAL device UDI of the newly added device"
+#: ../thunar-volman/main.c:59
+#, fuzzy
+msgid "The syfs path of the newly added device"
 msgstr "Określa UDI nowo dodanego urządzenia HAL"
 
-#: ../thunar-volman/main.c:51
-#: ../thunar-volman/tvm-preferences-dialog.c:120
-#: ../thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman/main.c:60
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:104
 msgid "Configure management of removable drives and media"
 msgstr "Konfiguruje zarządzanie wymiennymi nośnikami oraz urządzeniami"
 
-#: ../thunar-volman/main.c:52
+#: ../thunar-volman/main.c:61
 msgid "Print version information and exit"
 msgstr "Wypisuje informacje o wersji i kończy"
 
 #. setup application name
-#: ../thunar-volman/main.c:69
+#: ../thunar-volman/main.c:93
 msgid "Thunar Volume Manager"
 msgstr "Menedżer wolumenów programu Thunar"
 
-#: ../thunar-volman/main.c:90
-msgid "Failed to open display"
-msgstr "Nie udało się otworzyć ekranu"
-
-#: ../thunar-volman/main.c:106
-msgid "The Thunar development team. All rights reserved."
-msgstr "Zespół programistów Thunara. Wszelkie prawa zastrzeżone."
-
-#: ../thunar-volman/main.c:107
-msgid "Written by Benedikt Meurer <benny at xfce.org>."
-msgstr "Napisany przez Benedikta Meurera <benny at xfce.org>."
+#: ../thunar-volman/main.c:133
+msgid "All rights reserved."
+msgstr ""
 
-#: ../thunar-volman/main.c:108
+#: ../thunar-volman/main.c:134
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Proszę zgłaszać błędy na adres <%s>."
 
-#. TRANSLATORS: A HAL device UDI must match certain conditions to be valid (to be exact, it must be a valid D-Bus object path)
-#: ../thunar-volman/main.c:133
+#: ../thunar-volman/main.c:188
 #, c-format
-msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
-msgstr "Podane UDI „%s” nie jest prawidłowym UDI urządzenia HAL"
+msgid "There is no device with the sysfs path \"%s\""
+msgstr ""
 
-#. TRANSLATORS: thunar-volman wasn't invoked with either --device-added or --configure.
-#: ../thunar-volman/main.c:144
-#, c-format
-msgid "Must specify the new HAL device UDI with --device-added"
+#: ../thunar-volman/main.c:200
+#, fuzzy, c-format
+msgid "Must specify the sysfs path of new devices with --device-added"
 msgstr "Należy określić UDI nowego urządzenia HAL przez --device-added"
 
 #. ...so we need to prompt what to do
-#: ../thunar-volman/tvm-block-device.c:189
+#: ../thunar-volman/tvm-block-device.c:204
 msgid "Photos and Music"
 msgstr "Zdjęcia i muzyka"
 
-#: ../thunar-volman/tvm-block-device.c:190
-msgid "Photos were found on your portable music player."
+#: ../thunar-volman/tvm-block-device.c:205
+#, fuzzy
+msgid "Photos were found on your portable music player"
 msgstr "Na przenośnym odtwarzaczu muzyki znaleziono pliki obrazów."
 
-#: ../thunar-volman/tvm-block-device.c:191
+#: ../thunar-volman/tvm-block-device.c:206
 msgid "Would you like to import the photos or manage the music?"
 msgstr "Zaimportować zdjęcia czy zarządzać muzyką?"
 
-#: ../thunar-volman/tvm-block-device.c:192
-#: ../thunar-volman/tvm-block-device.c:258
-#: ../thunar-volman/tvm-block-device.c:335
-#: ../thunar-volman/tvm-block-device.c:371
-#: ../thunar-volman/tvm-block-device.c:430
-#: ../thunar-volman/tvm-block-device.c:703
-#: ../thunar-volman/tvm-crypto-volume.c:448
-#: ../thunar-volman/tvm-run.c:136
-#: ../thunar-volman/tvm-run.c:147
+#: ../thunar-volman/tvm-block-device.c:208
+#: ../thunar-volman/tvm-block-device.c:277
+#: ../thunar-volman/tvm-block-device.c:378
+#: ../thunar-volman/tvm-block-device.c:425
+#: ../thunar-volman/tvm-block-device.c:507
+#: ../thunar-volman/tvm-block-device.c:826 ../thunar-volman/tvm-run.c:196
+#: ../thunar-volman/tvm-run.c:207
 msgid "Ig_nore"
 msgstr "_Zignoruj"
 
-#: ../thunar-volman/tvm-block-device.c:193
-#: ../thunar-volman/tvm-block-device.c:259
+#: ../thunar-volman/tvm-block-device.c:209
+#: ../thunar-volman/tvm-block-device.c:278
 msgid "Import _Photos"
 msgstr "Zaimportuj _obrazy"
 
-#: ../thunar-volman/tvm-block-device.c:194
+#: ../thunar-volman/tvm-block-device.c:210
 msgid "Manage _Music"
 msgstr "Zarządzaj _muzyką"
 
-#. ask the user whether to import photos
-#: ../thunar-volman/tvm-block-device.c:255
+#. ask the user to import photos
+#: ../thunar-volman/tvm-block-device.c:273
 msgid "Photo Import"
 msgstr "Import zdjęć"
 
-#: ../thunar-volman/tvm-block-device.c:256
-msgid "A photo card has been detected."
+#: ../thunar-volman/tvm-block-device.c:274
+#, fuzzy
+msgid "A photo card has been detected"
 msgstr "Wykryto kartę pamięci z plikami obrazów."
 
-#: ../thunar-volman/tvm-block-device.c:257
-msgid "There are photos on the card. Would you like to add these photos to your album?"
+#: ../thunar-volman/tvm-block-device.c:275
+msgid ""
+"There are photos on the card. Would you like to add these photos to your "
+"album?"
 msgstr "Na karcie znaleziono pliki obrazów. Dodać je do albumu?"
 
-#. prompt the user whether to execute this file
-#: ../thunar-volman/tvm-block-device.c:332
-#: ../thunar-volman/tvm-block-device.c:368
+#. prompt the user to execute the file
+#. prompt the user to execute this file
+#: ../thunar-volman/tvm-block-device.c:373
+#: ../thunar-volman/tvm-block-device.c:420
 #, c-format
 msgid "Would you like to allow \"%s\" to run?"
 msgstr "Uruchomić „%s”?"
 
-#: ../thunar-volman/tvm-block-device.c:333
-#: ../thunar-volman/tvm-block-device.c:369
+#: ../thunar-volman/tvm-block-device.c:376
+#: ../thunar-volman/tvm-block-device.c:423
 msgid "Auto-Run Confirmation"
 msgstr "Automatyczne uruchamianie"
 
-#: ../thunar-volman/tvm-block-device.c:334
-#: ../thunar-volman/tvm-block-device.c:370
+#: ../thunar-volman/tvm-block-device.c:377
+#: ../thunar-volman/tvm-block-device.c:424
 msgid "Auto-Run capability detected"
 msgstr "Wykryto możliwość automatycznego uruchomienia zawartości"
 
-#: ../thunar-volman/tvm-block-device.c:336
-#: ../thunar-volman/tvm-block-device.c:372
+#: ../thunar-volman/tvm-block-device.c:379
+#: ../thunar-volman/tvm-block-device.c:426
 msgid "_Allow Auto-Run"
 msgstr "_Uruchom automatycznie"
 
 #. prompt the user whether to autoopen this file
-#: ../thunar-volman/tvm-block-device.c:427
+#: ../thunar-volman/tvm-block-device.c:502
 #, c-format
 msgid "Would you like to open \"%s\"?"
 msgstr "Otworzyć „%s”?"
 
-#: ../thunar-volman/tvm-block-device.c:428
+#: ../thunar-volman/tvm-block-device.c:505
 msgid "Auto-Open Confirmation"
 msgstr "Potwierdzenie automatycznego otwierania"
 
-#: ../thunar-volman/tvm-block-device.c:429
+#: ../thunar-volman/tvm-block-device.c:506
 msgid "Auto-Open capability detected"
 msgstr "Wykryto możliwość automatycznego otworzenia zawartości"
 
-#: ../thunar-volman/tvm-block-device.c:431
+#: ../thunar-volman/tvm-block-device.c:508
 msgid "_Open"
 msgstr "_Otwórz"
 
-#. ask what do with the mixed audio/data disc
-#: ../thunar-volman/tvm-block-device.c:700
-msgid "Audio / Data CD"
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "CD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "DVD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:618
+msgid "The CD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:619
+msgid "The DVD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:629
+msgid "Volume mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:632
+#, c-format
+msgid "The volume \"%s\" was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:637
+#, c-format
+msgid "The inserted volume was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:691
+#, c-format
+msgid "Unable to locate mount point"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:737
+#, c-format
+msgid "Unable to mount the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:746
+#, c-format
+msgid "Could not detect the volume corresponding to the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:821
+#, fuzzy
+msgid "Audio/Data CD"
 msgstr "Płyta z danymi / audio"
 
-#: ../thunar-volman/tvm-block-device.c:701
-msgid "The CD in the drive contains both music and files."
+#: ../thunar-volman/tvm-block-device.c:822
+#, fuzzy
+msgid "The CD in the drive contains both music and files"
 msgstr "Płyta CD w napędzie zawiera pliki muzyczne i inne pliki."
 
-#: ../thunar-volman/tvm-block-device.c:702
+#: ../thunar-volman/tvm-block-device.c:824
 msgid "Would you like to listen to music or browse the files?"
 msgstr "Odtworzyć muzykę czy przeglądać pliki?"
 
-#: ../thunar-volman/tvm-block-device.c:704
+#: ../thunar-volman/tvm-block-device.c:827
 msgid "_Browse Files"
 msgstr "_Przeglądaj pliki"
 
-#: ../thunar-volman/tvm-block-device.c:705
+#: ../thunar-volman/tvm-block-device.c:828
 msgid "_Play CD"
 msgstr "_Odtwórz płytę"
 
-#: ../thunar-volman/tvm-command-entry.c:233
-msgid "Select an Application"
-msgstr "Wybór pliku"
+#: ../thunar-volman/tvm-block-device.c:916
+#, c-format
+msgid "Unknown block device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:243
-msgid "All Files"
-msgstr "Wszystkie pliki"
+#: ../thunar-volman/tvm-device.c:139
+#, c-format
+msgid "Device type not supported"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:248
-msgid "Executable Files"
-msgstr "Pliki wykonywalne"
+#: ../thunar-volman/tvm-input-device.c:74
+#, fuzzy
+msgid "input-keyboard"
+msgstr "Klawiatury"
 
-#: ../thunar-volman/tvm-command-entry.c:263
-msgid "Perl Scripts"
-msgstr "Skrypty Perl"
+#: ../thunar-volman/tvm-input-device.c:75
+#, fuzzy
+msgid "Keyboard detected"
+msgstr "Klawiatury"
 
-#: ../thunar-volman/tvm-command-entry.c:269
-msgid "Python Scripts"
-msgstr "Skrypty Python"
+#: ../thunar-volman/tvm-input-device.c:76
+#, fuzzy
+msgid "A keyboard was detected"
+msgstr "Wykryto kartę pamięci z plikami obrazów."
 
-#: ../thunar-volman/tvm-command-entry.c:275
-msgid "Ruby Scripts"
-msgstr "Skrypty Ruby"
+#: ../thunar-volman/tvm-input-device.c:86
+#: ../thunar-volman/tvm-input-device.c:100
+msgid "input-tablet"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:281
-msgid "Shell Scripts"
-msgstr "Skrypty powłoki"
+#: ../thunar-volman/tvm-input-device.c:87
+#: ../thunar-volman/tvm-input-device.c:101
+#, fuzzy
+msgid "Tablet detected"
+msgstr "Wykryto możliwość automatycznego uruchomienia zawartości"
+
+#: ../thunar-volman/tvm-input-device.c:88
+#: ../thunar-volman/tvm-input-device.c:102
+msgid "A graphics tablet was detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:286
-#: ../thunar-volman/tvm-crypto-volume.c:443
-msgid "Encrypted volume"
-msgstr "Zaszyfrowany wolumen"
+#: ../thunar-volman/tvm-input-device.c:110
+msgid "input-mouse"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:297
-msgid "<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Montowanie zaszyfrowanego woluminu...</span>"
+#: ../thunar-volman/tvm-input-device.c:111
+msgid "Mouse detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:302
-msgid "Setting up the crypto layer..."
-msgstr "Ustawianie powłoki szyfrującej..."
+#: ../thunar-volman/tvm-input-device.c:112
+msgid "A mouse was detected"
+msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) but got Permission denied.
-#: ../thunar-volman/tvm-crypto-volume.c:369
+#: ../thunar-volman/tvm-input-device.c:139
 #, c-format
-msgid "You are not privileged to setup the crypto layer"
-msgstr "Brak uprawnień do skonfigurowania powłoki szyfrującej"
+msgid "Unsupported input device type"
+msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) and typed the wrong password.
-#: ../thunar-volman/tvm-crypto-volume.c:374
+#: ../thunar-volman/tvm-run.c:173
 #, c-format
-msgid "Wrong password"
-msgstr "Niepoprawne hasło"
+msgid "Autoburning of blank CDs and DVDs is disabled"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:445
-msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Niepoprawne hasło.</span>"
+#: ../thunar-volman/tvm-run.c:193
+msgid "Blank DVD inserted"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:446
-msgid "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Wolumen jest zaszyfrowany.</span>"
+#: ../thunar-volman/tvm-run.c:194
+#, fuzzy
+msgid "You have inserted a blank DVD."
+msgstr "W napędzie umieszczono pustą płytę."
 
-#: ../thunar-volman/tvm-crypto-volume.c:447
-msgid "Please enter your password to decrypt and mount the volume."
-msgstr "Proszę wprowadzić hasło, aby odszyfrować i zamontować wolumen."
+#: ../thunar-volman/tvm-run.c:195 ../thunar-volman/tvm-run.c:206
+msgid "What would you like to do?"
+msgstr "Co zrobić?"
 
-#: ../thunar-volman/tvm-crypto-volume.c:449
-msgid "_Mount"
-msgstr "_Zamontuj"
+#: ../thunar-volman/tvm-run.c:197
+msgid "Burn _DVD"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:204
+#, fuzzy
+msgid "Blank CD inserted"
+msgstr "Puste płyty CD i DVD"
 
-#: ../thunar-volman/tvm-crypto-volume.c:468
-msgid "Failed to setup the encrypted volume"
-msgstr "Nie udało się skonfigurować zaszyfrowanego wolumenu"
+#: ../thunar-volman/tvm-run.c:205
+#, fuzzy
+msgid "You have inserted a blank CD."
+msgstr "W napędzie umieszczono pustą płytę."
 
-#: ../thunar-volman/tvm-preferences-dialog.c:119
-#: ../thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman/tvm-run.c:208
+#, fuzzy
+msgid "Burn _Data CD"
+msgstr "Utwórz CD z _danymi"
+
+#: ../thunar-volman/tvm-run.c:209
+#, fuzzy
+msgid "Burn _Audio CD"
+msgstr "Utwórz CD _audio"
+
+#: ../thunar-volman/tvm-run.c:233
+#, c-format
+msgid "The burn command may not be empty"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:272
+#, c-format
+msgid "The CD player command is undefined"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:66
+msgid "Camera detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:67
+#, fuzzy
+msgid "A photo camera was detected"
+msgstr "Wykryto kartę pamięci z plikami obrazów."
+
+#: ../thunar-volman/tvm-usb-device.c:77
+msgid "Printer detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:78
+msgid "A USB printer was detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:104
+#, c-format
+msgid "Unsupported USB device type"
+msgstr ""
+
+#. setup application name
+#: ../thunar-volman-settings/main.c:52
+#, fuzzy
+msgid "Thunar Volume Manager Settings"
+msgstr "Menedżer wolumenów programu Thunar"
+
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:102
 msgid "Removable Drives and Media"
 msgstr "Napędy i nośniki wymienne"
 
+#: ../thunar-volman-settings/tvm-command-entry.c:240
+msgid "Select an Application"
+msgstr "Wybór pliku"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:250
+msgid "All Files"
+msgstr "Wszystkie pliki"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:255
+msgid "Executable Files"
+msgstr "Pliki wykonywalne"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:270
+msgid "Perl Scripts"
+msgstr "Skrypty Perl"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:276
+msgid "Python Scripts"
+msgstr "Skrypty Python"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:282
+msgid "Ruby Scripts"
+msgstr "Skrypty Ruby"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:288
+msgid "Shell Scripts"
+msgstr "Skrypty powłoki"
+
 #.
 #. Storage
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:143
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:130
 msgid "Storage"
 msgstr "Nośniki pamięci"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:153
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:141
 msgid "Removable Storage"
 msgstr "Pamięć wymienna"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:170
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:158
 msgid "_Mount removable drives when hot-plugged"
 msgstr "Montowanie napędów wymiennych po _podłączeniu"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:175
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:166
 msgid "Mount removable media when _inserted"
 msgstr "Montowanie nośników wymiennych po _umieszczeniu w napędzie"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:180
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:174
 msgid "B_rowse removable media when inserted"
 msgstr "P_rzeglądanie nośników wymiennych po umieszczeniu w napędzie"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:185
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:182
 msgid "_Auto-run programs on new drives and media"
-msgstr "_Automatyczne uruchamianie programów zamieszczonych na napędach i nośnikach"
+msgstr ""
+"_Automatyczne uruchamianie programów zamieszczonych na napędach i nośnikach"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:190
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:189
 msgid "Auto-open files on new drives and media"
 msgstr "Automatyczne otwieranie plików zamieszczonych na napędach i nośnikach"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:199
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:201
 msgid "Blank CDs and DVDs"
 msgstr "Puste płyty CD i DVD"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:216
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:218
 msgid "_Burn a CD or DVD when a blank disc is inserted"
 msgstr "_Nagrywanie po umieszczeniu w napędzie"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:224
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:229
 msgid "Command for _Data CDs:"
 msgstr "Polecenie dla płyt z _danymi:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:231
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:239
 msgid "Command for A_udio CDs:"
 msgstr "Polecenie dla płyt a_udio:"
 
 #.
 #. Multimedia
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:245
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:255
 msgid "Multimedia"
 msgstr "Multimedia"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:255
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:266
 msgid "Audio CDs"
 msgstr "Płyty CD audio"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:272
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:283
 msgid "Play _audio CDs when inserted"
 msgstr "_Odtwarzanie po umieszczeniu w napędzie"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:277
-#: ../thunar-volman/tvm-preferences-dialog.c:383
-#: ../thunar-volman/tvm-preferences-dialog.c:425
-#: ../thunar-volman/tvm-preferences-dialog.c:499
-#: ../thunar-volman/tvm-preferences-dialog.c:541
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:290
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:415
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:466
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:553
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:601
 msgid "_Command:"
 msgstr "_Polecenie:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:287
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:304
 msgid "Video CDs/DVDs"
 msgstr "Płyty CD/DVD wideo"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:304
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:321
 msgid "Play _video CDs and DVDs when inserted"
 msgstr "O_dtwarzanie po umieszczeniu w napędzie"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:309
-#: ../thunar-volman/tvm-preferences-dialog.c:341
-#: ../thunar-volman/tvm-preferences-dialog.c:457
-#: ../thunar-volman/tvm-preferences-dialog.c:573
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:329
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:367
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:505
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:640
 msgid "C_ommand:"
 msgstr "P_olecenie:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:319
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:343
 msgid "Portable Music Players"
 msgstr "Przenośne odtwarzacze muzyki"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:336
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:360
 msgid "Play _music files when connected"
 msgstr "Odtwarzanie plików _muzycznych po podłączeniu"
 
 #.
 #. Cameras
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:351
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:379
 msgid "Cameras"
 msgstr "Aparaty fotograficzne"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:361
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:390
 msgid "Digital Cameras"
 msgstr "Cyfrowe aparaty fotograficzne"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:378
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:407
 msgid "Import digital photographs when connected"
 msgstr "Importowanie fotografii po podłączeniu"
 
 #.
 #. PDAs
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:393
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:427
 msgid "PDAs"
 msgstr "PDA"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:403
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:441
 msgid "Palm™"
 msgstr "Palm™"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:420
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:458
 msgid "Sync _Palm™ devices when connected"
 msgstr "_Synchronizowanie po podłączeniu"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:435
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:480
 msgid "Pocket PCs"
 msgstr "Pocket PC"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:452
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:497
 msgid "Sync Pocket P_C devices when connected"
 msgstr "S_ynchronizowanie po podłączeniu"
 
 #.
 #. Printers
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:467
-#: ../thunar-volman/tvm-preferences-dialog.c:477
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:517
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:528
 msgid "Printers"
 msgstr "Drukarki"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:494
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:545
 msgid "Automatically run a program when a _printer is connected"
 msgstr "_Uruchamianie programu po podłączeniu"
 
 #.
 #. Input Devices
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:509
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:565
 msgid "Input Devices"
 msgstr "Urządzenia wejściowe"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:519
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:576
 msgid "Keyboards"
 msgstr "Klawiatury"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:536
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:593
 msgid "Automatically run a program when an USB _keyboard is connected"
 msgstr "Uruchamianie programu po podłączeniu _klawiatury USB"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:551
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:615
 msgid "Mice"
 msgstr "Myszy"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:568
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:632
 msgid "Automatically run a program when an USB _mouse is connected"
 msgstr "Uruchamianie programu po podłączeniu _myszy USB"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:583
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:654
 msgid "Tablet"
 msgstr "Tablety"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:600
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:671
 msgid "Automatically run a program when a _tablet is connected"
 msgstr "_Uruchamianie programu po podłączeniu"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:605
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:679
 msgid "Com_mand:"
 msgstr "Po_lecenie:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:690
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:755
 msgid "Failed to open the documentation browser"
 msgstr "Nie udało się uruchomić przeglądarki dokumentacji"
 
-#: ../thunar-volman/tvm-run.c:133
-#: ../thunar-volman/tvm-run.c:144
-msgid "Choose Disc Type"
-msgstr "Proszę wybrać typ dysku"
+#~ msgid "Failed to open display"
+#~ msgstr "Nie udało się otworzyć ekranu"
 
-#: ../thunar-volman/tvm-run.c:134
-#: ../thunar-volman/tvm-run.c:145
-msgid "You have inserted a blank disc."
-msgstr "W napędzie umieszczono pustą płytę."
+#~ msgid "The Thunar development team. All rights reserved."
+#~ msgstr "Zespół programistów Thunara. Wszelkie prawa zastrzeżone."
 
-#: ../thunar-volman/tvm-run.c:135
-#: ../thunar-volman/tvm-run.c:146
-msgid "What would you like to do?"
-msgstr "Co zrobić?"
+#~ msgid "Written by Benedikt Meurer <benny at xfce.org>."
+#~ msgstr "Napisany przez Benedikta Meurera <benny at xfce.org>."
 
-#: ../thunar-volman/tvm-run.c:137
-msgid "Make _DVD"
-msgstr "Utwórz _DVD"
+#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
+#~ msgstr "Podane UDI „%s” nie jest prawidłowym UDI urządzenia HAL"
 
-#: ../thunar-volman/tvm-run.c:148
-msgid "Make _Data CD"
-msgstr "Utwórz CD z _danymi"
+#~ msgid "Encrypted volume"
+#~ msgstr "Zaszyfrowany wolumen"
 
-#: ../thunar-volman/tvm-run.c:149
-msgid "Make _Audio CD"
-msgstr "Utwórz CD _audio"
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Montowanie zaszyfrowanego "
+#~ "woluminu...</span>"
 
-#: ../thunar-volman-settings.desktop.in.in.h:3
-#, fuzzy
-msgid "Removable Media"
-msgstr "Wymienne napędy i nośniki"
+#~ msgid "Setting up the crypto layer..."
+#~ msgstr "Ustawianie powłoki szyfrującej..."
+
+#~ msgid "You are not privileged to setup the crypto layer"
+#~ msgstr "Brak uprawnień do skonfigurowania powłoki szyfrującej"
 
+#~ msgid "Wrong password"
+#~ msgstr "Niepoprawne hasło"
+
+#~ msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
+#~ msgstr "<span weight=\"bold\" size=\"larger\">Niepoprawne hasło.</span>"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Wolumen jest zaszyfrowany.</span>"
+
+#~ msgid "Please enter your password to decrypt and mount the volume."
+#~ msgstr "Proszę wprowadzić hasło, aby odszyfrować i zamontować wolumen."
+
+#~ msgid "_Mount"
+#~ msgstr "_Zamontuj"
+
+#~ msgid "Failed to setup the encrypted volume"
+#~ msgstr "Nie udało się skonfigurować zaszyfrowanego wolumenu"
+
+#~ msgid "Choose Disc Type"
+#~ msgstr "Proszę wybrać typ dysku"
+
+#~ msgid "Make _DVD"
+#~ msgstr "Utwórz _DVD"
+
+#, fuzzy
+#~ msgid "Removable Media"
+#~ msgstr "Wymienne napędy i nośniki"
diff --git a/po/pt.po b/po/pt.po
index 87af80f..3c228db 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,458 +7,615 @@ msgid ""
 msgstr ""
 "Project-Id-Version: thunar-volman 0.3.80\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-30 02:26-0700\n"
+"POT-Creation-Date: 2010-07-25 20:06+0200\n"
 "PO-Revision-Date: 2009-08-27 19:42+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../thunar-volman/main.c:50
-msgid "The HAL device UDI of the newly added device"
+#: ../thunar-volman/main.c:59
+#, fuzzy
+msgid "The syfs path of the newly added device"
 msgstr "O UDI do novo dispositivo HAL adicionado"
 
-#: ../thunar-volman/main.c:51
-#: ../thunar-volman/tvm-preferences-dialog.c:120
-#: ../thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman/main.c:60
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:104
 msgid "Configure management of removable drives and media"
 msgstr "Configurar gestão de drives amovíveis"
 
-#: ../thunar-volman/main.c:52
+#: ../thunar-volman/main.c:61
 msgid "Print version information and exit"
 msgstr "Mostrar versão e sair"
 
 #. setup application name
-#: ../thunar-volman/main.c:69
+#: ../thunar-volman/main.c:93
 msgid "Thunar Volume Manager"
 msgstr "Thunar Volume Manager"
 
-#: ../thunar-volman/main.c:90
-msgid "Failed to open display"
-msgstr "Falha ao abrir ecrã"
-
-#: ../thunar-volman/main.c:106
-msgid "The Thunar development team. All rights reserved."
-msgstr "Equipa de desenvolvimento do Thunar. Todos os direitos reservados."
-
-#: ../thunar-volman/main.c:107
-msgid "Written by Benedikt Meurer <benny at xfce.org>."
-msgstr "Escrito por Benedikt Meurer <benny at xfce.org>."
+#: ../thunar-volman/main.c:133
+msgid "All rights reserved."
+msgstr ""
 
-#: ../thunar-volman/main.c:108
+#: ../thunar-volman/main.c:134
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Reporte bugs para <%s>."
 
-#. TRANSLATORS: A HAL device UDI must match certain conditions to be valid (to be exact, it must be a valid D-Bus object path)
-#: ../thunar-volman/main.c:133
+#: ../thunar-volman/main.c:188
 #, c-format
-msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
-msgstr "UDI especificado \"%s\" não é um dispositivo HAL válido"
+msgid "There is no device with the sysfs path \"%s\""
+msgstr ""
 
-#. TRANSLATORS: thunar-volman wasn't invoked with either --device-added or --configure.
-#: ../thunar-volman/main.c:144
-#, c-format
-msgid "Must specify the new HAL device UDI with --device-added"
+#: ../thunar-volman/main.c:200
+#, fuzzy, c-format
+msgid "Must specify the sysfs path of new devices with --device-added"
 msgstr "Tem de especificar o novo UDI HAL de dispositivo com --device-added"
 
 #. ...so we need to prompt what to do
-#: ../thunar-volman/tvm-block-device.c:189
+#: ../thunar-volman/tvm-block-device.c:204
 msgid "Photos and Music"
 msgstr "Fotos e Música"
 
-#: ../thunar-volman/tvm-block-device.c:190
-msgid "Photos were found on your portable music player."
+#: ../thunar-volman/tvm-block-device.c:205
+#, fuzzy
+msgid "Photos were found on your portable music player"
 msgstr "Fotos encontradas no leitor de música portátil."
 
-#: ../thunar-volman/tvm-block-device.c:191
+#: ../thunar-volman/tvm-block-device.c:206
 msgid "Would you like to import the photos or manage the music?"
 msgstr "Deseja importar as fotos ou gerir a música?"
 
-#: ../thunar-volman/tvm-block-device.c:192
-#: ../thunar-volman/tvm-block-device.c:258
-#: ../thunar-volman/tvm-block-device.c:335
-#: ../thunar-volman/tvm-block-device.c:371
-#: ../thunar-volman/tvm-block-device.c:430
-#: ../thunar-volman/tvm-block-device.c:703
-#: ../thunar-volman/tvm-crypto-volume.c:448
-#: ../thunar-volman/tvm-run.c:136
-#: ../thunar-volman/tvm-run.c:147
+#: ../thunar-volman/tvm-block-device.c:208
+#: ../thunar-volman/tvm-block-device.c:277
+#: ../thunar-volman/tvm-block-device.c:378
+#: ../thunar-volman/tvm-block-device.c:425
+#: ../thunar-volman/tvm-block-device.c:507
+#: ../thunar-volman/tvm-block-device.c:826 ../thunar-volman/tvm-run.c:196
+#: ../thunar-volman/tvm-run.c:207
 msgid "Ig_nore"
 msgstr "Ig_norar"
 
-#: ../thunar-volman/tvm-block-device.c:193
-#: ../thunar-volman/tvm-block-device.c:259
+#: ../thunar-volman/tvm-block-device.c:209
+#: ../thunar-volman/tvm-block-device.c:278
 msgid "Import _Photos"
 msgstr "Importar _Fotos"
 
-#: ../thunar-volman/tvm-block-device.c:194
+#: ../thunar-volman/tvm-block-device.c:210
 msgid "Manage _Music"
 msgstr "Gerir _Música"
 
-#. ask the user whether to import photos
-#: ../thunar-volman/tvm-block-device.c:255
+#. ask the user to import photos
+#: ../thunar-volman/tvm-block-device.c:273
 msgid "Photo Import"
 msgstr "Importar Foto"
 
-#: ../thunar-volman/tvm-block-device.c:256
-msgid "A photo card has been detected."
+#: ../thunar-volman/tvm-block-device.c:274
+#, fuzzy
+msgid "A photo card has been detected"
 msgstr "Cartão de fotos detectado."
 
-#: ../thunar-volman/tvm-block-device.c:257
-msgid "There are photos on the card. Would you like to add these photos to your album?"
+#: ../thunar-volman/tvm-block-device.c:275
+msgid ""
+"There are photos on the card. Would you like to add these photos to your "
+"album?"
 msgstr "Existem fotos no cartão. Deseja adicionar ao álbum?"
 
-#. prompt the user whether to execute this file
-#: ../thunar-volman/tvm-block-device.c:332
-#: ../thunar-volman/tvm-block-device.c:368
+#. prompt the user to execute the file
+#. prompt the user to execute this file
+#: ../thunar-volman/tvm-block-device.c:373
+#: ../thunar-volman/tvm-block-device.c:420
 #, c-format
 msgid "Would you like to allow \"%s\" to run?"
 msgstr "Deseja permitir a execução de \"%s\"?"
 
-#: ../thunar-volman/tvm-block-device.c:333
-#: ../thunar-volman/tvm-block-device.c:369
+#: ../thunar-volman/tvm-block-device.c:376
+#: ../thunar-volman/tvm-block-device.c:423
 msgid "Auto-Run Confirmation"
 msgstr "Confirmação Auto-Run"
 
-#: ../thunar-volman/tvm-block-device.c:334
-#: ../thunar-volman/tvm-block-device.c:370
+#: ../thunar-volman/tvm-block-device.c:377
+#: ../thunar-volman/tvm-block-device.c:424
 msgid "Auto-Run capability detected"
 msgstr "Capacidade Auto-Run detectada"
 
-#: ../thunar-volman/tvm-block-device.c:336
-#: ../thunar-volman/tvm-block-device.c:372
+#: ../thunar-volman/tvm-block-device.c:379
+#: ../thunar-volman/tvm-block-device.c:426
 msgid "_Allow Auto-Run"
 msgstr "_Permitir Auto-Run"
 
 #. prompt the user whether to autoopen this file
-#: ../thunar-volman/tvm-block-device.c:427
+#: ../thunar-volman/tvm-block-device.c:502
 #, c-format
 msgid "Would you like to open \"%s\"?"
 msgstr "Deseja abrir \"%s\"?"
 
-#: ../thunar-volman/tvm-block-device.c:428
+#: ../thunar-volman/tvm-block-device.c:505
 msgid "Auto-Open Confirmation"
 msgstr "Confirmação Auto-Open"
 
-#: ../thunar-volman/tvm-block-device.c:429
+#: ../thunar-volman/tvm-block-device.c:506
 msgid "Auto-Open capability detected"
 msgstr "Auto-Abertura detectada"
 
-#: ../thunar-volman/tvm-block-device.c:431
+#: ../thunar-volman/tvm-block-device.c:508
 msgid "_Open"
 msgstr "_Abrir"
 
-#. ask what do with the mixed audio/data disc
-#: ../thunar-volman/tvm-block-device.c:700
-msgid "Audio / Data CD"
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "CD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "DVD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:618
+msgid "The CD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:619
+msgid "The DVD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:629
+msgid "Volume mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:632
+#, c-format
+msgid "The volume \"%s\" was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:637
+#, c-format
+msgid "The inserted volume was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:691
+#, c-format
+msgid "Unable to locate mount point"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:737
+#, c-format
+msgid "Unable to mount the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:746
+#, c-format
+msgid "Could not detect the volume corresponding to the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:821
+#, fuzzy
+msgid "Audio/Data CD"
 msgstr "Áudio / CD Dados"
 
-#: ../thunar-volman/tvm-block-device.c:701
-msgid "The CD in the drive contains both music and files."
+#: ../thunar-volman/tvm-block-device.c:822
+#, fuzzy
+msgid "The CD in the drive contains both music and files"
 msgstr "O CD contém música e outros ficheiros."
 
-#: ../thunar-volman/tvm-block-device.c:702
+#: ../thunar-volman/tvm-block-device.c:824
 msgid "Would you like to listen to music or browse the files?"
 msgstr "Deseja ouvir música ou explorar os ficheiros?"
 
-#: ../thunar-volman/tvm-block-device.c:704
+#: ../thunar-volman/tvm-block-device.c:827
 msgid "_Browse Files"
 msgstr "_Explorar Ficheiros"
 
-#: ../thunar-volman/tvm-block-device.c:705
+#: ../thunar-volman/tvm-block-device.c:828
 msgid "_Play CD"
 msgstr "_Tocar CD"
 
-#: ../thunar-volman/tvm-command-entry.c:233
-msgid "Select an Application"
-msgstr "Seleccione uma Aplicação"
+#: ../thunar-volman/tvm-block-device.c:916
+#, c-format
+msgid "Unknown block device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:243
-msgid "All Files"
-msgstr "Todos os ficheiros"
+#: ../thunar-volman/tvm-device.c:139
+#, c-format
+msgid "Device type not supported"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:248
-msgid "Executable Files"
-msgstr "Ficheiros executáveis"
+#: ../thunar-volman/tvm-input-device.c:74
+#, fuzzy
+msgid "input-keyboard"
+msgstr "Teclados"
 
-#: ../thunar-volman/tvm-command-entry.c:263
-msgid "Perl Scripts"
-msgstr "Scripts Perl"
+#: ../thunar-volman/tvm-input-device.c:75
+#, fuzzy
+msgid "Keyboard detected"
+msgstr "Teclados"
 
-#: ../thunar-volman/tvm-command-entry.c:269
-msgid "Python Scripts"
-msgstr "Scripts Python"
+#: ../thunar-volman/tvm-input-device.c:76
+#, fuzzy
+msgid "A keyboard was detected"
+msgstr "Cartão de fotos detectado."
 
-#: ../thunar-volman/tvm-command-entry.c:275
-msgid "Ruby Scripts"
-msgstr "Scripts Ruby"
+#: ../thunar-volman/tvm-input-device.c:86
+#: ../thunar-volman/tvm-input-device.c:100
+msgid "input-tablet"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:281
-msgid "Shell Scripts"
-msgstr "Scripts Shell"
+#: ../thunar-volman/tvm-input-device.c:87
+#: ../thunar-volman/tvm-input-device.c:101
+#, fuzzy
+msgid "Tablet detected"
+msgstr "Capacidade Auto-Run detectada"
+
+#: ../thunar-volman/tvm-input-device.c:88
+#: ../thunar-volman/tvm-input-device.c:102
+msgid "A graphics tablet was detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-input-device.c:110
+msgid "input-mouse"
+msgstr ""
+
+#: ../thunar-volman/tvm-input-device.c:111
+msgid "Mouse detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-input-device.c:112
+msgid "A mouse was detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-input-device.c:139
+#, c-format
+msgid "Unsupported input device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:286
-#: ../thunar-volman/tvm-crypto-volume.c:443
-msgid "Encrypted volume"
-msgstr "Volume encriptado"
+#: ../thunar-volman/tvm-run.c:173
+#, c-format
+msgid "Autoburning of blank CDs and DVDs is disabled"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:297
-msgid "<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Montando volume encriptado...</span>"
+#: ../thunar-volman/tvm-run.c:193
+msgid "Blank DVD inserted"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:302
-msgid "Setting up the crypto layer..."
-msgstr "A definir a camada de criptografia..."
+#: ../thunar-volman/tvm-run.c:194
+#, fuzzy
+msgid "You have inserted a blank DVD."
+msgstr "Inseriu um disco em branco."
+
+#: ../thunar-volman/tvm-run.c:195 ../thunar-volman/tvm-run.c:206
+msgid "What would you like to do?"
+msgstr "Que deseja fazer?"
+
+#: ../thunar-volman/tvm-run.c:197
+msgid "Burn _DVD"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:204
+#, fuzzy
+msgid "Blank CD inserted"
+msgstr "CDs e DVDs vazios"
+
+#: ../thunar-volman/tvm-run.c:205
+#, fuzzy
+msgid "You have inserted a blank CD."
+msgstr "Inseriu um disco em branco."
+
+#: ../thunar-volman/tvm-run.c:208
+#, fuzzy
+msgid "Burn _Data CD"
+msgstr "Criar CD de _Dados"
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) but got Permission denied.
-#: ../thunar-volman/tvm-crypto-volume.c:369
+#: ../thunar-volman/tvm-run.c:209
+#, fuzzy
+msgid "Burn _Audio CD"
+msgstr "Criar CD de Á_udio"
+
+#: ../thunar-volman/tvm-run.c:233
 #, c-format
-msgid "You are not privileged to setup the crypto layer"
-msgstr "Não tem privilégios para definir a camada de criptografia "
+msgid "The burn command may not be empty"
+msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) and typed the wrong password.
-#: ../thunar-volman/tvm-crypto-volume.c:374
+#: ../thunar-volman/tvm-run.c:272
 #, c-format
-msgid "Wrong password"
-msgstr "Senha errada"
+msgid "The CD player command is undefined"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:445
-msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Senha errada.</span>"
+#: ../thunar-volman/tvm-usb-device.c:66
+msgid "Camera detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:67
+#, fuzzy
+msgid "A photo camera was detected"
+msgstr "Cartão de fotos detectado."
 
-#: ../thunar-volman/tvm-crypto-volume.c:446
-msgid "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Este volume está encriptado.</span>"
+#: ../thunar-volman/tvm-usb-device.c:77
+msgid "Printer detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:447
-msgid "Please enter your password to decrypt and mount the volume."
-msgstr "Por favor, indique a senha para desencriptar e montar o volume."
+#: ../thunar-volman/tvm-usb-device.c:78
+msgid "A USB printer was detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:449
-msgid "_Mount"
-msgstr "_Mountar"
+#: ../thunar-volman/tvm-usb-device.c:104
+#, c-format
+msgid "Unsupported USB device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:468
-msgid "Failed to setup the encrypted volume"
-msgstr "Falhou a configuração do volume encriptado"
+#. setup application name
+#: ../thunar-volman-settings/main.c:52
+#, fuzzy
+msgid "Thunar Volume Manager Settings"
+msgstr "Thunar Volume Manager"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:119
-#: ../thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:102
 msgid "Removable Drives and Media"
 msgstr "Drives Removíveis"
 
+#: ../thunar-volman-settings/tvm-command-entry.c:240
+msgid "Select an Application"
+msgstr "Seleccione uma Aplicação"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:250
+msgid "All Files"
+msgstr "Todos os ficheiros"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:255
+msgid "Executable Files"
+msgstr "Ficheiros executáveis"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:270
+msgid "Perl Scripts"
+msgstr "Scripts Perl"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:276
+msgid "Python Scripts"
+msgstr "Scripts Python"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:282
+msgid "Ruby Scripts"
+msgstr "Scripts Ruby"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:288
+msgid "Shell Scripts"
+msgstr "Scripts Shell"
+
 #.
 #. Storage
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:143
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:130
 msgid "Storage"
 msgstr "Armazenamento"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:153
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:141
 msgid "Removable Storage"
 msgstr "Armazenamento Removível"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:170
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:158
 msgid "_Mount removable drives when hot-plugged"
 msgstr "_Montar drives removíveis quando hot-plugged"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:175
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:166
 msgid "Mount removable media when _inserted"
 msgstr "Montar dispositivos removíveis quando _inseridos"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:180
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:174
 msgid "B_rowse removable media when inserted"
 msgstr "Explo_rar dispositivo quando inserido"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:185
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:182
 msgid "_Auto-run programs on new drives and media"
 msgstr "_Auto-carregar programas em novas drives"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:190
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:189
 msgid "Auto-open files on new drives and media"
 msgstr "Auto-abrir ficheiros em novas drives"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:199
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:201
 msgid "Blank CDs and DVDs"
 msgstr "CDs e DVDs vazios"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:216
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:218
 msgid "_Burn a CD or DVD when a blank disc is inserted"
 msgstr "_Queimar um CD ou DVD quando inserido um disco vazio"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:224
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:229
 msgid "Command for _Data CDs:"
 msgstr "Comando para CDs de _Dados:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:231
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:239
 msgid "Command for A_udio CDs:"
 msgstr "Comando para CDs Á_udio:"
 
 #.
 #. Multimedia
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:245
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:255
 msgid "Multimedia"
 msgstr "Multimédia"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:255
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:266
 msgid "Audio CDs"
 msgstr "CDs Áudio"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:272
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:283
 msgid "Play _audio CDs when inserted"
 msgstr "Tocar CDs de á_udio quando inseridos"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:277
-#: ../thunar-volman/tvm-preferences-dialog.c:383
-#: ../thunar-volman/tvm-preferences-dialog.c:425
-#: ../thunar-volman/tvm-preferences-dialog.c:499
-#: ../thunar-volman/tvm-preferences-dialog.c:541
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:290
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:415
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:466
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:553
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:601
 msgid "_Command:"
 msgstr "_Comando:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:287
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:304
 msgid "Video CDs/DVDs"
 msgstr "Vídeo CDs/DVDs"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:304
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:321
 msgid "Play _video CDs and DVDs when inserted"
 msgstr "Tocar CDs e DVDs de _vídeo quando inseridos"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:309
-#: ../thunar-volman/tvm-preferences-dialog.c:341
-#: ../thunar-volman/tvm-preferences-dialog.c:457
-#: ../thunar-volman/tvm-preferences-dialog.c:573
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:329
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:367
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:505
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:640
 msgid "C_ommand:"
 msgstr "C_omando:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:319
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:343
 msgid "Portable Music Players"
 msgstr "Dispositivos de Música Portáteis"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:336
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:360
 msgid "Play _music files when connected"
 msgstr "Tocar ficheiros de _música quando ligado"
 
 #.
 #. Cameras
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:351
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:379
 msgid "Cameras"
 msgstr "Câmeras"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:361
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:390
 msgid "Digital Cameras"
 msgstr "Câmeras Digitais"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:378
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:407
 msgid "Import digital photographs when connected"
 msgstr "Importar fotos digitais quando ligado"
 
 #.
 #. PDAs
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:393
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:427
 msgid "PDAs"
 msgstr "PDAs"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:403
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:441
 msgid "Palm™"
 msgstr "Palm™"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:420
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:458
 msgid "Sync _Palm™ devices when connected"
 msgstr "Sincronizar _Palm™ quando ligado"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:435
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:480
 msgid "Pocket PCs"
 msgstr "Pocket Pcs"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:452
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:497
 msgid "Sync Pocket P_C devices when connected"
 msgstr "Sincronizar Pocket P_C quando ligado"
 
 #.
 #. Printers
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:467
-#: ../thunar-volman/tvm-preferences-dialog.c:477
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:517
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:528
 msgid "Printers"
 msgstr "Impressoras"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:494
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:545
 msgid "Automatically run a program when a _printer is connected"
 msgstr "Executar automaticamente um programa quando se liga uma _impressora"
 
 #.
 #. Input Devices
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:509
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:565
 msgid "Input Devices"
 msgstr "Dispositivos de entrada"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:519
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:576
 msgid "Keyboards"
 msgstr "Teclados"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:536
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:593
 msgid "Automatically run a program when an USB _keyboard is connected"
 msgstr "Executar automaticamente um programa quando se liga um _teclado USB"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:551
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:615
 msgid "Mice"
 msgstr "Ratos"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:568
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:632
 msgid "Automatically run a program when an USB _mouse is connected"
 msgstr "Executar automaticamente um programa quando se liga um _rato USB"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:583
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:654
 msgid "Tablet"
 msgstr "Tablet"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:600
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:671
 msgid "Automatically run a program when a _tablet is connected"
 msgstr "Executar automaticamente um programa quando um _tablet é ligado"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:605
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:679
 msgid "Com_mand:"
 msgstr "Co_mando:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:690
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:755
 msgid "Failed to open the documentation browser"
 msgstr "Falha ao abrir a documentação"
 
-#: ../thunar-volman/tvm-run.c:133
-#: ../thunar-volman/tvm-run.c:144
-msgid "Choose Disc Type"
-msgstr "Escolha o Tipo de Disco"
+#~ msgid "Failed to open display"
+#~ msgstr "Falha ao abrir ecrã"
 
-#: ../thunar-volman/tvm-run.c:134
-#: ../thunar-volman/tvm-run.c:145
-msgid "You have inserted a blank disc."
-msgstr "Inseriu um disco em branco."
+#~ msgid "The Thunar development team. All rights reserved."
+#~ msgstr "Equipa de desenvolvimento do Thunar. Todos os direitos reservados."
 
-#: ../thunar-volman/tvm-run.c:135
-#: ../thunar-volman/tvm-run.c:146
-msgid "What would you like to do?"
-msgstr "Que deseja fazer?"
+#~ msgid "Written by Benedikt Meurer <benny at xfce.org>."
+#~ msgstr "Escrito por Benedikt Meurer <benny at xfce.org>."
 
-#: ../thunar-volman/tvm-run.c:137
-msgid "Make _DVD"
-msgstr "Criar _DVD"
+#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
+#~ msgstr "UDI especificado \"%s\" não é um dispositivo HAL válido"
 
-#: ../thunar-volman/tvm-run.c:148
-msgid "Make _Data CD"
-msgstr "Criar CD de _Dados"
+#~ msgid "Encrypted volume"
+#~ msgstr "Volume encriptado"
 
-#: ../thunar-volman/tvm-run.c:149
-msgid "Make _Audio CD"
-msgstr "Criar CD de Á_udio"
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Montando volume encriptado...</span>"
+
+#~ msgid "Setting up the crypto layer..."
+#~ msgstr "A definir a camada de criptografia..."
+
+#~ msgid "You are not privileged to setup the crypto layer"
+#~ msgstr "Não tem privilégios para definir a camada de criptografia "
+
+#~ msgid "Wrong password"
+#~ msgstr "Senha errada"
+
+#~ msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
+#~ msgstr "<span weight=\"bold\" size=\"larger\">Senha errada.</span>"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Este volume está encriptado.</span>"
+
+#~ msgid "Please enter your password to decrypt and mount the volume."
+#~ msgstr "Por favor, indique a senha para desencriptar e montar o volume."
+
+#~ msgid "_Mount"
+#~ msgstr "_Mountar"
+
+#~ msgid "Failed to setup the encrypted volume"
+#~ msgstr "Falhou a configuração do volume encriptado"
+
+#~ msgid "Choose Disc Type"
+#~ msgstr "Escolha o Tipo de Disco"
 
-#: ../thunar-volman-settings.desktop.in.in.h:3
-msgid "Removable Media"
-msgstr "Media Removível"
+#~ msgid "Make _DVD"
+#~ msgstr "Criar _DVD"
 
+#~ msgid "Removable Media"
+#~ msgstr "Media Removível"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index b200337..7580be0 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,459 +8,624 @@ msgid ""
 msgstr ""
 "Project-Id-Version: thunar-volman 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-30 02:26-0700\n"
+"POT-Creation-Date: 2010-07-25 20:06+0200\n"
 "PO-Revision-Date: 2008-08-30 13:32-0300\n"
 "Last-Translator: Fábio Nogueira <deb-user-ba at ubuntu.com>\n"
 "Language-Team: Brazilian Portuguese <ldp-br at bazar2.conectiva.com.br>\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../thunar-volman/main.c:50
-msgid "The HAL device UDI of the newly added device"
+#: ../thunar-volman/main.c:59
+#, fuzzy
+msgid "The syfs path of the newly added device"
 msgstr "O UDI do dispositivo HAL do dispositivo recentemente adicionado"
 
-#: ../thunar-volman/main.c:51
-#: ../thunar-volman/tvm-preferences-dialog.c:120
-#: ../thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman/main.c:60
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:104
 msgid "Configure management of removable drives and media"
 msgstr "Configurar o gerenciamento de drives e mídias removíveis"
 
-#: ../thunar-volman/main.c:52
+#: ../thunar-volman/main.c:61
 msgid "Print version information and exit"
 msgstr "Imprime as informações sobre a versão e sai"
 
 #. setup application name
-#: ../thunar-volman/main.c:69
+#: ../thunar-volman/main.c:93
 msgid "Thunar Volume Manager"
 msgstr "Gerenciador de volumes Thunar"
 
-#: ../thunar-volman/main.c:90
-msgid "Failed to open display"
-msgstr "Falha ao abrir a exibição"
-
-#: ../thunar-volman/main.c:106
-msgid "The Thunar development team. All rights reserved."
-msgstr "O time de desenvolvimento do Thunar. Todos os direitos reservados."
-
-#: ../thunar-volman/main.c:107
-msgid "Written by Benedikt Meurer <benny at xfce.org>."
-msgstr "Escrito por Benedikt Meurer <benny at xfce.org>."
+#: ../thunar-volman/main.c:133
+msgid "All rights reserved."
+msgstr ""
 
-#: ../thunar-volman/main.c:108
+#: ../thunar-volman/main.c:134
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Por favor reporte os erros para <%s>."
 
-#. TRANSLATORS: A HAL device UDI must match certain conditions to be valid (to be exact, it must be a valid D-Bus object path)
-#: ../thunar-volman/main.c:133
+#: ../thunar-volman/main.c:188
 #, c-format
-msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
-msgstr "O UDI especificado \"%s\" não é um UDI de dispositivo HAL válido"
+msgid "There is no device with the sysfs path \"%s\""
+msgstr ""
 
-#. TRANSLATORS: thunar-volman wasn't invoked with either --device-added or --configure.
-#: ../thunar-volman/main.c:144
-#, c-format
-msgid "Must specify the new HAL device UDI with --device-added"
-msgstr "É necessário especificar o novo UDI de dispositivo HAL com --device-added"
+#: ../thunar-volman/main.c:200
+#, fuzzy, c-format
+msgid "Must specify the sysfs path of new devices with --device-added"
+msgstr ""
+"É necessário especificar o novo UDI de dispositivo HAL com --device-added"
 
 #. ...so we need to prompt what to do
-#: ../thunar-volman/tvm-block-device.c:189
+#: ../thunar-volman/tvm-block-device.c:204
 msgid "Photos and Music"
 msgstr "Fotos e Músicas"
 
-#: ../thunar-volman/tvm-block-device.c:190
-msgid "Photos were found on your portable music player."
+#: ../thunar-volman/tvm-block-device.c:205
+#, fuzzy
+msgid "Photos were found on your portable music player"
 msgstr "Fotos foram encontradas no seu reprodutor portátil de música."
 
-#: ../thunar-volman/tvm-block-device.c:191
+#: ../thunar-volman/tvm-block-device.c:206
 msgid "Would you like to import the photos or manage the music?"
 msgstr "Você gostaria de importar as fotos ou organizar as músicas?"
 
-#: ../thunar-volman/tvm-block-device.c:192
-#: ../thunar-volman/tvm-block-device.c:258
-#: ../thunar-volman/tvm-block-device.c:335
-#: ../thunar-volman/tvm-block-device.c:371
-#: ../thunar-volman/tvm-block-device.c:430
-#: ../thunar-volman/tvm-block-device.c:703
-#: ../thunar-volman/tvm-crypto-volume.c:448
-#: ../thunar-volman/tvm-run.c:136
-#: ../thunar-volman/tvm-run.c:147
+#: ../thunar-volman/tvm-block-device.c:208
+#: ../thunar-volman/tvm-block-device.c:277
+#: ../thunar-volman/tvm-block-device.c:378
+#: ../thunar-volman/tvm-block-device.c:425
+#: ../thunar-volman/tvm-block-device.c:507
+#: ../thunar-volman/tvm-block-device.c:826 ../thunar-volman/tvm-run.c:196
+#: ../thunar-volman/tvm-run.c:207
 msgid "Ig_nore"
 msgstr "Ig_norar"
 
-#: ../thunar-volman/tvm-block-device.c:193
-#: ../thunar-volman/tvm-block-device.c:259
+#: ../thunar-volman/tvm-block-device.c:209
+#: ../thunar-volman/tvm-block-device.c:278
 msgid "Import _Photos"
 msgstr "Importar _fotos"
 
-#: ../thunar-volman/tvm-block-device.c:194
+#: ../thunar-volman/tvm-block-device.c:210
 msgid "Manage _Music"
 msgstr "Organizar _música"
 
-#. ask the user whether to import photos
-#: ../thunar-volman/tvm-block-device.c:255
+#. ask the user to import photos
+#: ../thunar-volman/tvm-block-device.c:273
 msgid "Photo Import"
 msgstr "Importação de fotos"
 
-#: ../thunar-volman/tvm-block-device.c:256
-msgid "A photo card has been detected."
+#: ../thunar-volman/tvm-block-device.c:274
+#, fuzzy
+msgid "A photo card has been detected"
 msgstr "Um cartão de foto foi detectado."
 
-#: ../thunar-volman/tvm-block-device.c:257
-msgid "There are photos on the card. Would you like to add these photos to your album?"
-msgstr "Existem fotos no cartão. Você gostaria de adicionar estas fotos no seu álbum?"
+#: ../thunar-volman/tvm-block-device.c:275
+msgid ""
+"There are photos on the card. Would you like to add these photos to your "
+"album?"
+msgstr ""
+"Existem fotos no cartão. Você gostaria de adicionar estas fotos no seu álbum?"
 
-#. prompt the user whether to execute this file
-#: ../thunar-volman/tvm-block-device.c:332
-#: ../thunar-volman/tvm-block-device.c:368
+#. prompt the user to execute the file
+#. prompt the user to execute this file
+#: ../thunar-volman/tvm-block-device.c:373
+#: ../thunar-volman/tvm-block-device.c:420
 #, c-format
 msgid "Would you like to allow \"%s\" to run?"
 msgstr "Você gostaria de habilitar \"%s\" para ser executado?"
 
-#: ../thunar-volman/tvm-block-device.c:333
-#: ../thunar-volman/tvm-block-device.c:369
+#: ../thunar-volman/tvm-block-device.c:376
+#: ../thunar-volman/tvm-block-device.c:423
 msgid "Auto-Run Confirmation"
 msgstr "Confirmação de auto-execução"
 
-#: ../thunar-volman/tvm-block-device.c:334
-#: ../thunar-volman/tvm-block-device.c:370
+#: ../thunar-volman/tvm-block-device.c:377
+#: ../thunar-volman/tvm-block-device.c:424
 msgid "Auto-Run capability detected"
 msgstr "Detectada capacidade de auto-execução"
 
-#: ../thunar-volman/tvm-block-device.c:336
-#: ../thunar-volman/tvm-block-device.c:372
+#: ../thunar-volman/tvm-block-device.c:379
+#: ../thunar-volman/tvm-block-device.c:426
 msgid "_Allow Auto-Run"
 msgstr "H_abilitar auto-execução"
 
 #. prompt the user whether to autoopen this file
-#: ../thunar-volman/tvm-block-device.c:427
+#: ../thunar-volman/tvm-block-device.c:502
 #, c-format
 msgid "Would you like to open \"%s\"?"
 msgstr "Você deseja abrir \"%s\"?"
 
-#: ../thunar-volman/tvm-block-device.c:428
+#: ../thunar-volman/tvm-block-device.c:505
 msgid "Auto-Open Confirmation"
 msgstr "Confirmação de abertura automática"
 
-#: ../thunar-volman/tvm-block-device.c:429
+#: ../thunar-volman/tvm-block-device.c:506
 msgid "Auto-Open capability detected"
 msgstr "Detectada capacidade de abertura automática"
 
-#: ../thunar-volman/tvm-block-device.c:431
+#: ../thunar-volman/tvm-block-device.c:508
 msgid "_Open"
 msgstr "_Abrir"
 
-#. ask what do with the mixed audio/data disc
-#: ../thunar-volman/tvm-block-device.c:700
-msgid "Audio / Data CD"
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "CD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "DVD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:618
+msgid "The CD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:619
+msgid "The DVD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:629
+msgid "Volume mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:632
+#, c-format
+msgid "The volume \"%s\" was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:637
+#, c-format
+msgid "The inserted volume was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:691
+#, c-format
+msgid "Unable to locate mount point"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:737
+#, c-format
+msgid "Unable to mount the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:746
+#, c-format
+msgid "Could not detect the volume corresponding to the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:821
+#, fuzzy
+msgid "Audio/Data CD"
 msgstr "CD de áudio / Dados"
 
-#: ../thunar-volman/tvm-block-device.c:701
-msgid "The CD in the drive contains both music and files."
+#: ../thunar-volman/tvm-block-device.c:822
+#, fuzzy
+msgid "The CD in the drive contains both music and files"
 msgstr "O CD no dispositivo contém músicas e arquivos juntos."
 
-#: ../thunar-volman/tvm-block-device.c:702
+#: ../thunar-volman/tvm-block-device.c:824
 msgid "Would you like to listen to music or browse the files?"
 msgstr "Você gostaria de escutar as músicas ou navegar pelos arquivos?"
 
-#: ../thunar-volman/tvm-block-device.c:704
+#: ../thunar-volman/tvm-block-device.c:827
 msgid "_Browse Files"
 msgstr "_Navegar pelos arquivos"
 
-#: ../thunar-volman/tvm-block-device.c:705
+#: ../thunar-volman/tvm-block-device.c:828
 msgid "_Play CD"
 msgstr "_Reproduzir CD"
 
-#: ../thunar-volman/tvm-command-entry.c:233
-msgid "Select an Application"
-msgstr "Escolha um aplicativo"
+#: ../thunar-volman/tvm-block-device.c:916
+#, c-format
+msgid "Unknown block device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:243
-msgid "All Files"
-msgstr "Todos os arquivos"
+#: ../thunar-volman/tvm-device.c:139
+#, c-format
+msgid "Device type not supported"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:248
-msgid "Executable Files"
-msgstr "Arquivos executáveis"
+#: ../thunar-volman/tvm-input-device.c:74
+#, fuzzy
+msgid "input-keyboard"
+msgstr "Teclados"
 
-#: ../thunar-volman/tvm-command-entry.c:263
-msgid "Perl Scripts"
-msgstr "Scripts Perl"
+#: ../thunar-volman/tvm-input-device.c:75
+#, fuzzy
+msgid "Keyboard detected"
+msgstr "Teclados"
 
-#: ../thunar-volman/tvm-command-entry.c:269
-msgid "Python Scripts"
-msgstr "Scripts Python"
+#: ../thunar-volman/tvm-input-device.c:76
+#, fuzzy
+msgid "A keyboard was detected"
+msgstr "Um cartão de foto foi detectado."
 
-#: ../thunar-volman/tvm-command-entry.c:275
-msgid "Ruby Scripts"
-msgstr "Scripts Ruby"
+#: ../thunar-volman/tvm-input-device.c:86
+#: ../thunar-volman/tvm-input-device.c:100
+msgid "input-tablet"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:281
-msgid "Shell Scripts"
-msgstr "Scripts Shell"
+#: ../thunar-volman/tvm-input-device.c:87
+#: ../thunar-volman/tvm-input-device.c:101
+#, fuzzy
+msgid "Tablet detected"
+msgstr "Detectada capacidade de auto-execução"
 
-#: ../thunar-volman/tvm-crypto-volume.c:286
-#: ../thunar-volman/tvm-crypto-volume.c:443
-msgid "Encrypted volume"
-msgstr "Volume criptografado"
+#: ../thunar-volman/tvm-input-device.c:88
+#: ../thunar-volman/tvm-input-device.c:102
+msgid "A graphics tablet was detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:297
-msgid "<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Montando volume criptografado...</span>"
+#: ../thunar-volman/tvm-input-device.c:110
+msgid "input-mouse"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:302
-msgid "Setting up the crypto layer..."
-msgstr "Configurando a camada de criptografia..."
+#: ../thunar-volman/tvm-input-device.c:111
+msgid "Mouse detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-input-device.c:112
+msgid "A mouse was detected"
+msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) but got Permission denied.
-#: ../thunar-volman/tvm-crypto-volume.c:369
+#: ../thunar-volman/tvm-input-device.c:139
 #, c-format
-msgid "You are not privileged to setup the crypto layer"
-msgstr "Você não tem privilégios para configurar a camada de cripografia"
+msgid "Unsupported input device type"
+msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) and typed the wrong password.
-#: ../thunar-volman/tvm-crypto-volume.c:374
+#: ../thunar-volman/tvm-run.c:173
 #, c-format
-msgid "Wrong password"
-msgstr "Senha incorreta"
+msgid "Autoburning of blank CDs and DVDs is disabled"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:445
-msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Senha incorreta.</span>"
+#: ../thunar-volman/tvm-run.c:193
+msgid "Blank DVD inserted"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:446
-msgid "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Este volume está criptografado.</span>"
+#: ../thunar-volman/tvm-run.c:194
+#, fuzzy
+msgid "You have inserted a blank DVD."
+msgstr "Você inseriu um disco em branco."
 
-#: ../thunar-volman/tvm-crypto-volume.c:447
-msgid "Please enter your password to decrypt and mount the volume."
-msgstr "Por favor, entre com sua senha para descriptografar e montar o volume."
+#: ../thunar-volman/tvm-run.c:195 ../thunar-volman/tvm-run.c:206
+msgid "What would you like to do?"
+msgstr "O que você deseja fazer?"
+
+#: ../thunar-volman/tvm-run.c:197
+msgid "Burn _DVD"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:204
+#, fuzzy
+msgid "Blank CD inserted"
+msgstr "CDs e DVDs em branco"
+
+#: ../thunar-volman/tvm-run.c:205
+#, fuzzy
+msgid "You have inserted a blank CD."
+msgstr "Você inseriu um disco em branco."
+
+#: ../thunar-volman/tvm-run.c:208
+#, fuzzy
+msgid "Burn _Data CD"
+msgstr "Criar CD de _dados"
+
+#: ../thunar-volman/tvm-run.c:209
+#, fuzzy
+msgid "Burn _Audio CD"
+msgstr "Criar _CD de áudio"
+
+#: ../thunar-volman/tvm-run.c:233
+#, c-format
+msgid "The burn command may not be empty"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:272
+#, c-format
+msgid "The CD player command is undefined"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:449
-msgid "_Mount"
-msgstr "_Montar"
+#: ../thunar-volman/tvm-usb-device.c:66
+msgid "Camera detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:67
+#, fuzzy
+msgid "A photo camera was detected"
+msgstr "Um cartão de foto foi detectado."
+
+#: ../thunar-volman/tvm-usb-device.c:77
+msgid "Printer detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:468
-msgid "Failed to setup the encrypted volume"
-msgstr "Falhou ao configurar o volume criptografado."
+#: ../thunar-volman/tvm-usb-device.c:78
+msgid "A USB printer was detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:104
+#, c-format
+msgid "Unsupported USB device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:119
-#: ../thunar-volman-settings.desktop.in.in.h:2
+#. setup application name
+#: ../thunar-volman-settings/main.c:52
+#, fuzzy
+msgid "Thunar Volume Manager Settings"
+msgstr "Gerenciador de volumes Thunar"
+
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:102
 msgid "Removable Drives and Media"
 msgstr "Mídias e Unidades removíveis"
 
+#: ../thunar-volman-settings/tvm-command-entry.c:240
+msgid "Select an Application"
+msgstr "Escolha um aplicativo"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:250
+msgid "All Files"
+msgstr "Todos os arquivos"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:255
+msgid "Executable Files"
+msgstr "Arquivos executáveis"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:270
+msgid "Perl Scripts"
+msgstr "Scripts Perl"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:276
+msgid "Python Scripts"
+msgstr "Scripts Python"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:282
+msgid "Ruby Scripts"
+msgstr "Scripts Ruby"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:288
+msgid "Shell Scripts"
+msgstr "Scripts Shell"
+
 #.
 #. Storage
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:143
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:130
 msgid "Storage"
 msgstr "Armazenamento"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:153
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:141
 msgid "Removable Storage"
 msgstr "Armazenamento removível"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:170
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:158
 msgid "_Mount removable drives when hot-plugged"
 msgstr "_Montar unidades removíveis quando conectados"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:175
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:166
 msgid "Mount removable media when _inserted"
 msgstr "Montar mídia removível quando _inserida"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:180
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:174
 msgid "B_rowse removable media when inserted"
 msgstr "Navega_r pela mídia removível quando inserida"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:185
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:182
 msgid "_Auto-run programs on new drives and media"
 msgstr "_Auto-executar programas nas novas unidades e mídias"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:190
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:189
 msgid "Auto-open files on new drives and media"
 msgstr "Abrir automaticamente arquivos nas novas unidades e mídias"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:199
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:201
 msgid "Blank CDs and DVDs"
 msgstr "CDs e DVDs em branco"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:216
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:218
 msgid "_Burn a CD or DVD when a blank disc is inserted"
 msgstr "_Gravar um CD ou DVD quando um disco em branco for inserido"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:224
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:229
 msgid "Command for _Data CDs:"
 msgstr "Comando para CDs de _dados:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:231
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:239
 msgid "Command for A_udio CDs:"
 msgstr "Comando para CDs de á_udio:"
 
 #.
 #. Multimedia
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:245
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:255
 msgid "Multimedia"
 msgstr "Multimídia"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:255
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:266
 msgid "Audio CDs"
 msgstr "CDs de áudio"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:272
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:283
 msgid "Play _audio CDs when inserted"
 msgstr "Reproduzir CDs de áudio qu_ando inseridos"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:277
-#: ../thunar-volman/tvm-preferences-dialog.c:383
-#: ../thunar-volman/tvm-preferences-dialog.c:425
-#: ../thunar-volman/tvm-preferences-dialog.c:499
-#: ../thunar-volman/tvm-preferences-dialog.c:541
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:290
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:415
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:466
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:553
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:601
 msgid "_Command:"
 msgstr "_Comando:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:287
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:304
 msgid "Video CDs/DVDs"
 msgstr "CDs/DVDs de vídeo"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:304
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:321
 msgid "Play _video CDs and DVDs when inserted"
 msgstr "Reproduzir CDs e DVDs de _vídeo quando inseridos"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:309
-#: ../thunar-volman/tvm-preferences-dialog.c:341
-#: ../thunar-volman/tvm-preferences-dialog.c:457
-#: ../thunar-volman/tvm-preferences-dialog.c:573
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:329
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:367
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:505
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:640
 msgid "C_ommand:"
 msgstr "C_omando:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:319
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:343
 msgid "Portable Music Players"
 msgstr "Reprodutores portáteis de música"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:336
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:360
 msgid "Play _music files when connected"
 msgstr "Reproduzir _música quando conectado"
 
 #.
 #. Cameras
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:351
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:379
 msgid "Cameras"
 msgstr "Câmeras"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:361
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:390
 msgid "Digital Cameras"
 msgstr "Câmeras digitais"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:378
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:407
 msgid "Import digital photographs when connected"
 msgstr "Importar fotografias digitais quando conectadas"
 
 #.
 #. PDAs
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:393
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:427
 msgid "PDAs"
 msgstr "PDAs"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:403
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:441
 msgid "Palm™"
 msgstr "Palm™"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:420
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:458
 msgid "Sync _Palm™ devices when connected"
 msgstr "Sincronizar dispositivos _Palm™ quando conectados"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:435
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:480
 msgid "Pocket PCs"
 msgstr "Pocket PCs"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:452
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:497
 msgid "Sync Pocket P_C devices when connected"
 msgstr "Sincronizar dispositivos Pocket P_C quando conectados"
 
 #.
 #. Printers
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:467
-#: ../thunar-volman/tvm-preferences-dialog.c:477
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:517
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:528
 msgid "Printers"
 msgstr "Impressoras"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:494
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:545
 msgid "Automatically run a program when a _printer is connected"
-msgstr "Executar automaticamente um programa quando uma im_pressora for conectada"
+msgstr ""
+"Executar automaticamente um programa quando uma im_pressora for conectada"
 
 #.
 #. Input Devices
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:509
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:565
 msgid "Input Devices"
 msgstr "Dispositivos de entrada"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:519
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:576
 msgid "Keyboards"
 msgstr "Teclados"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:536
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:593
 msgid "Automatically run a program when an USB _keyboard is connected"
-msgstr "Executar automaticamente um programa quando um _teclado USB for conectado"
+msgstr ""
+"Executar automaticamente um programa quando um _teclado USB for conectado"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:551
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:615
 msgid "Mice"
 msgstr "Mouse"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:568
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:632
 msgid "Automatically run a program when an USB _mouse is connected"
-msgstr "Executar automaticamente um programa quando um _mouse USB for conectado"
+msgstr ""
+"Executar automaticamente um programa quando um _mouse USB for conectado"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:583
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:654
 msgid "Tablet"
 msgstr "Tablet"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:600
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:671
 msgid "Automatically run a program when a _tablet is connected"
 msgstr "Executar automaticamente um programa quando um _tablet for conectado"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:605
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:679
 msgid "Com_mand:"
 msgstr "Com_ando:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:690
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:755
 msgid "Failed to open the documentation browser"
 msgstr "Falha ao abrir o navegador de documentação"
 
-#: ../thunar-volman/tvm-run.c:133
-#: ../thunar-volman/tvm-run.c:144
-msgid "Choose Disc Type"
-msgstr "Escolha o tipo de disco"
+#~ msgid "Failed to open display"
+#~ msgstr "Falha ao abrir a exibição"
 
-#: ../thunar-volman/tvm-run.c:134
-#: ../thunar-volman/tvm-run.c:145
-msgid "You have inserted a blank disc."
-msgstr "Você inseriu um disco em branco."
+#~ msgid "The Thunar development team. All rights reserved."
+#~ msgstr "O time de desenvolvimento do Thunar. Todos os direitos reservados."
 
-#: ../thunar-volman/tvm-run.c:135
-#: ../thunar-volman/tvm-run.c:146
-msgid "What would you like to do?"
-msgstr "O que você deseja fazer?"
+#~ msgid "Written by Benedikt Meurer <benny at xfce.org>."
+#~ msgstr "Escrito por Benedikt Meurer <benny at xfce.org>."
 
-#: ../thunar-volman/tvm-run.c:137
-msgid "Make _DVD"
-msgstr "Criar _DVD"
+#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
+#~ msgstr "O UDI especificado \"%s\" não é um UDI de dispositivo HAL válido"
 
-#: ../thunar-volman/tvm-run.c:148
-msgid "Make _Data CD"
-msgstr "Criar CD de _dados"
+#~ msgid "Encrypted volume"
+#~ msgstr "Volume criptografado"
 
-#: ../thunar-volman/tvm-run.c:149
-msgid "Make _Audio CD"
-msgstr "Criar _CD de áudio"
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Montando volume criptografado...</"
+#~ "span>"
+
+#~ msgid "Setting up the crypto layer..."
+#~ msgstr "Configurando a camada de criptografia..."
+
+#~ msgid "You are not privileged to setup the crypto layer"
+#~ msgstr "Você não tem privilégios para configurar a camada de cripografia"
+
+#~ msgid "Wrong password"
+#~ msgstr "Senha incorreta"
+
+#~ msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
+#~ msgstr "<span weight=\"bold\" size=\"larger\">Senha incorreta.</span>"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Este volume está criptografado.</"
+#~ "span>"
+
+#~ msgid "Please enter your password to decrypt and mount the volume."
+#~ msgstr ""
+#~ "Por favor, entre com sua senha para descriptografar e montar o volume."
+
+#~ msgid "_Mount"
+#~ msgstr "_Montar"
+
+#~ msgid "Failed to setup the encrypted volume"
+#~ msgstr "Falhou ao configurar o volume criptografado."
+
+#~ msgid "Choose Disc Type"
+#~ msgstr "Escolha o tipo de disco"
 
-#: ../thunar-volman-settings.desktop.in.in.h:3
-msgid "Removable Media"
-msgstr "Mídia removível"
+#~ msgid "Make _DVD"
+#~ msgstr "Criar _DVD"
 
+#~ msgid "Removable Media"
+#~ msgstr "Mídia removível"
diff --git a/po/ru.po b/po/ru.po
index ec3df50..aafc84d 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,460 +7,618 @@ msgid ""
 msgstr ""
 "Project-Id-Version: thunar-volman\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-30 02:26-0700\n"
+"POT-Creation-Date: 2010-07-25 20:06+0200\n"
 "PO-Revision-Date: 2009-02-20 12:42+0700\n"
 "Last-Translator: Pavel Labushev <p.labushev at gmail.com>\n"
 "Language-Team: Russian <xfce-i18n-ru at xfce.org>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Russian\n"
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
 
-#: ../thunar-volman/main.c:50
-msgid "The HAL device UDI of the newly added device"
+#: ../thunar-volman/main.c:59
+#, fuzzy
+msgid "The syfs path of the newly added device"
 msgstr "UDI устройства HAL для нового оборудования"
 
-#: ../thunar-volman/main.c:51
-#: ../thunar-volman/tvm-preferences-dialog.c:120
-#: ../thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman/main.c:60
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:104
 msgid "Configure management of removable drives and media"
 msgstr "Настроить управление томами"
 
-#: ../thunar-volman/main.c:52
+#: ../thunar-volman/main.c:61
 msgid "Print version information and exit"
 msgstr "Вывести информацию о версии и завершить работу"
 
 #. setup application name
-#: ../thunar-volman/main.c:69
+#: ../thunar-volman/main.c:93
 msgid "Thunar Volume Manager"
 msgstr "Менеджер томов для Thunar"
 
-#: ../thunar-volman/main.c:90
-msgid "Failed to open display"
-msgstr "Невозможно открыть дисплей"
-
-#: ../thunar-volman/main.c:106
-msgid "The Thunar development team. All rights reserved."
-msgstr "Команда разработчиков Thunar. Все права защищены."
-
-#: ../thunar-volman/main.c:107
-msgid "Written by Benedikt Meurer <benny at xfce.org>."
-msgstr "Автор - Benedikt Meurer <benny at xfce.org>."
+#: ../thunar-volman/main.c:133
+msgid "All rights reserved."
+msgstr ""
 
-#: ../thunar-volman/main.c:108
+#: ../thunar-volman/main.c:134
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Пожалуйста, сообщайте об ошибках по адресу <%s>."
 
-#. TRANSLATORS: A HAL device UDI must match certain conditions to be valid (to be exact, it must be a valid D-Bus object path)
-#: ../thunar-volman/main.c:133
+#: ../thunar-volman/main.c:188
 #, c-format
-msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
-msgstr "Указанный UDI \"%s\" не является допустимым UDI устройства HAL"
+msgid "There is no device with the sysfs path \"%s\""
+msgstr ""
 
-#. TRANSLATORS: thunar-volman wasn't invoked with either --device-added or --configure.
-#: ../thunar-volman/main.c:144
-#, c-format
-msgid "Must specify the new HAL device UDI with --device-added"
+#: ../thunar-volman/main.c:200
+#, fuzzy, c-format
+msgid "Must specify the sysfs path of new devices with --device-added"
 msgstr "Необходимо указать новый UDI устройства HAL с ключом --device-added"
 
 #. ...so we need to prompt what to do
-#: ../thunar-volman/tvm-block-device.c:189
+#: ../thunar-volman/tvm-block-device.c:204
 msgid "Photos and Music"
 msgstr "Фотографии и музыка"
 
-#: ../thunar-volman/tvm-block-device.c:190
-msgid "Photos were found on your portable music player."
+#: ../thunar-volman/tvm-block-device.c:205
+#, fuzzy
+msgid "Photos were found on your portable music player"
 msgstr "На вашем музыкальном плеере обнаружены фотографии."
 
-#: ../thunar-volman/tvm-block-device.c:191
+#: ../thunar-volman/tvm-block-device.c:206
 msgid "Would you like to import the photos or manage the music?"
 msgstr "Хотите импортировать фотографии или разобрать музыкальные файлы?"
 
-#: ../thunar-volman/tvm-block-device.c:192
-#: ../thunar-volman/tvm-block-device.c:258
-#: ../thunar-volman/tvm-block-device.c:335
-#: ../thunar-volman/tvm-block-device.c:371
-#: ../thunar-volman/tvm-block-device.c:430
-#: ../thunar-volman/tvm-block-device.c:703
-#: ../thunar-volman/tvm-crypto-volume.c:448
-#: ../thunar-volman/tvm-run.c:136
-#: ../thunar-volman/tvm-run.c:147
+#: ../thunar-volman/tvm-block-device.c:208
+#: ../thunar-volman/tvm-block-device.c:277
+#: ../thunar-volman/tvm-block-device.c:378
+#: ../thunar-volman/tvm-block-device.c:425
+#: ../thunar-volman/tvm-block-device.c:507
+#: ../thunar-volman/tvm-block-device.c:826 ../thunar-volman/tvm-run.c:196
+#: ../thunar-volman/tvm-run.c:207
 msgid "Ig_nore"
 msgstr "_Игнорировать"
 
-#: ../thunar-volman/tvm-block-device.c:193
-#: ../thunar-volman/tvm-block-device.c:259
+#: ../thunar-volman/tvm-block-device.c:209
+#: ../thunar-volman/tvm-block-device.c:278
 msgid "Import _Photos"
 msgstr "Импортировать _фотографии"
 
-#: ../thunar-volman/tvm-block-device.c:194
+#: ../thunar-volman/tvm-block-device.c:210
 msgid "Manage _Music"
 msgstr "Разобрать _музыкальные файлы"
 
-#. ask the user whether to import photos
-#: ../thunar-volman/tvm-block-device.c:255
+#. ask the user to import photos
+#: ../thunar-volman/tvm-block-device.c:273
 msgid "Photo Import"
 msgstr "Импорт фотографий"
 
-#: ../thunar-volman/tvm-block-device.c:256
-msgid "A photo card has been detected."
+#: ../thunar-volman/tvm-block-device.c:274
+#, fuzzy
+msgid "A photo card has been detected"
 msgstr "Обнаружена флэш-карта с фотографиями"
 
-#: ../thunar-volman/tvm-block-device.c:257
-msgid "There are photos on the card. Would you like to add these photos to your album?"
+#: ../thunar-volman/tvm-block-device.c:275
+msgid ""
+"There are photos on the card. Would you like to add these photos to your "
+"album?"
 msgstr "На флэш-карте обнаружены фотографии. Хотите добавить их в альбом?"
 
-#. prompt the user whether to execute this file
-#: ../thunar-volman/tvm-block-device.c:332
-#: ../thunar-volman/tvm-block-device.c:368
+#. prompt the user to execute the file
+#. prompt the user to execute this file
+#: ../thunar-volman/tvm-block-device.c:373
+#: ../thunar-volman/tvm-block-device.c:420
 #, c-format
 msgid "Would you like to allow \"%s\" to run?"
 msgstr "Разрешить запуск \"%s\"?"
 
-#: ../thunar-volman/tvm-block-device.c:333
-#: ../thunar-volman/tvm-block-device.c:369
+#: ../thunar-volman/tvm-block-device.c:376
+#: ../thunar-volman/tvm-block-device.c:423
 msgid "Auto-Run Confirmation"
 msgstr "Подтверждение автозапуска"
 
-#: ../thunar-volman/tvm-block-device.c:334
-#: ../thunar-volman/tvm-block-device.c:370
+#: ../thunar-volman/tvm-block-device.c:377
+#: ../thunar-volman/tvm-block-device.c:424
 msgid "Auto-Run capability detected"
 msgstr "Обнаружена возможность автозапуска"
 
-#: ../thunar-volman/tvm-block-device.c:336
-#: ../thunar-volman/tvm-block-device.c:372
+#: ../thunar-volman/tvm-block-device.c:379
+#: ../thunar-volman/tvm-block-device.c:426
 msgid "_Allow Auto-Run"
 msgstr "Разрешить _автозапуск"
 
 #. prompt the user whether to autoopen this file
-#: ../thunar-volman/tvm-block-device.c:427
+#: ../thunar-volman/tvm-block-device.c:502
 #, c-format
 msgid "Would you like to open \"%s\"?"
 msgstr "Хотите открыть \"%s\"?"
 
-#: ../thunar-volman/tvm-block-device.c:428
+#: ../thunar-volman/tvm-block-device.c:505
 msgid "Auto-Open Confirmation"
 msgstr "Подтверждение автоматического открытия"
 
-#: ../thunar-volman/tvm-block-device.c:429
+#: ../thunar-volman/tvm-block-device.c:506
 msgid "Auto-Open capability detected"
 msgstr "Обнаружена возможность автоматического открытия"
 
-#: ../thunar-volman/tvm-block-device.c:431
+#: ../thunar-volman/tvm-block-device.c:508
 msgid "_Open"
 msgstr "_Открыть"
 
-#. ask what do with the mixed audio/data disc
-#: ../thunar-volman/tvm-block-device.c:700
-msgid "Audio / Data CD"
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "CD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "DVD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:618
+msgid "The CD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:619
+msgid "The DVD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:629
+msgid "Volume mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:632
+#, c-format
+msgid "The volume \"%s\" was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:637
+#, c-format
+msgid "The inserted volume was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:691
+#, c-format
+msgid "Unable to locate mount point"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:737
+#, c-format
+msgid "Unable to mount the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:746
+#, c-format
+msgid "Could not detect the volume corresponding to the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:821
+#, fuzzy
+msgid "Audio/Data CD"
 msgstr "Диск с музыкой или данными"
 
-#: ../thunar-volman/tvm-block-device.c:701
-msgid "The CD in the drive contains both music and files."
+#: ../thunar-volman/tvm-block-device.c:822
+#, fuzzy
+msgid "The CD in the drive contains both music and files"
 msgstr "Диск в приводе содержит музыку и файлы."
 
-#: ../thunar-volman/tvm-block-device.c:702
+#: ../thunar-volman/tvm-block-device.c:824
 msgid "Would you like to listen to music or browse the files?"
 msgstr "Хотите слушать музыку или просмотреть файлы?"
 
-#: ../thunar-volman/tvm-block-device.c:704
+#: ../thunar-volman/tvm-block-device.c:827
 msgid "_Browse Files"
 msgstr "Просмотреть _файлы"
 
-#: ../thunar-volman/tvm-block-device.c:705
+#: ../thunar-volman/tvm-block-device.c:828
 msgid "_Play CD"
 msgstr "Слушать _музыку"
 
-#: ../thunar-volman/tvm-command-entry.c:233
-msgid "Select an Application"
-msgstr "Выберите приложение"
+#: ../thunar-volman/tvm-block-device.c:916
+#, c-format
+msgid "Unknown block device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:243
-msgid "All Files"
-msgstr "Все файлы"
+#: ../thunar-volman/tvm-device.c:139
+#, c-format
+msgid "Device type not supported"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:248
-msgid "Executable Files"
-msgstr "Исполняемые файлы"
+#: ../thunar-volman/tvm-input-device.c:74
+#, fuzzy
+msgid "input-keyboard"
+msgstr "Клавиатуры"
 
-#: ../thunar-volman/tvm-command-entry.c:263
-msgid "Perl Scripts"
-msgstr "Сценарии Perl"
+#: ../thunar-volman/tvm-input-device.c:75
+#, fuzzy
+msgid "Keyboard detected"
+msgstr "Клавиатуры"
 
-#: ../thunar-volman/tvm-command-entry.c:269
-msgid "Python Scripts"
-msgstr "Сценарии Python"
+#: ../thunar-volman/tvm-input-device.c:76
+#, fuzzy
+msgid "A keyboard was detected"
+msgstr "Обнаружена флэш-карта с фотографиями"
 
-#: ../thunar-volman/tvm-command-entry.c:275
-msgid "Ruby Scripts"
-msgstr "Сценарии Ruby"
+#: ../thunar-volman/tvm-input-device.c:86
+#: ../thunar-volman/tvm-input-device.c:100
+msgid "input-tablet"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:281
-msgid "Shell Scripts"
-msgstr "Сценарии Shell"
+#: ../thunar-volman/tvm-input-device.c:87
+#: ../thunar-volman/tvm-input-device.c:101
+#, fuzzy
+msgid "Tablet detected"
+msgstr "Обнаружена возможность автозапуска"
+
+#: ../thunar-volman/tvm-input-device.c:88
+#: ../thunar-volman/tvm-input-device.c:102
+msgid "A graphics tablet was detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:286
-#: ../thunar-volman/tvm-crypto-volume.c:443
-msgid "Encrypted volume"
-msgstr "Зашифрованный том"
+#: ../thunar-volman/tvm-input-device.c:110
+msgid "input-mouse"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:297
-msgid "<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Подключение зашифрованного тома...</span>"
+#: ../thunar-volman/tvm-input-device.c:111
+msgid "Mouse detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:302
-msgid "Setting up the crypto layer..."
-msgstr "Настройка подсистемы шифрования..."
+#: ../thunar-volman/tvm-input-device.c:112
+msgid "A mouse was detected"
+msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) but got Permission denied.
-#: ../thunar-volman/tvm-crypto-volume.c:369
+#: ../thunar-volman/tvm-input-device.c:139
 #, c-format
-msgid "You are not privileged to setup the crypto layer"
-msgstr "У вас недостаточно привилегий для настройки подсистемы шифрования"
+msgid "Unsupported input device type"
+msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) and typed the wrong password.
-#: ../thunar-volman/tvm-crypto-volume.c:374
+#: ../thunar-volman/tvm-run.c:173
 #, c-format
-msgid "Wrong password"
-msgstr "Неправильный пароль"
+msgid "Autoburning of blank CDs and DVDs is disabled"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:445
-msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Неправильный пароль.</span>"
+#: ../thunar-volman/tvm-run.c:193
+msgid "Blank DVD inserted"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:446
-msgid "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Этот том зашифрован.</span>"
+#: ../thunar-volman/tvm-run.c:194
+#, fuzzy
+msgid "You have inserted a blank DVD."
+msgstr "Вы вставили чистый диск."
 
-#: ../thunar-volman/tvm-crypto-volume.c:447
-msgid "Please enter your password to decrypt and mount the volume."
-msgstr "Введите пароль для настройки и подключения зашифрованного тома."
+#: ../thunar-volman/tvm-run.c:195 ../thunar-volman/tvm-run.c:206
+msgid "What would you like to do?"
+msgstr "Что вы хотите сделать?"
 
-#: ../thunar-volman/tvm-crypto-volume.c:449
-msgid "_Mount"
-msgstr "_Подключить"
+#: ../thunar-volman/tvm-run.c:197
+msgid "Burn _DVD"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:468
-msgid "Failed to setup the encrypted volume"
-msgstr "Не удалось настроить зашифрованный том"
+#: ../thunar-volman/tvm-run.c:204
+#, fuzzy
+msgid "Blank CD inserted"
+msgstr "Пустые CD и DVD"
+
+#: ../thunar-volman/tvm-run.c:205
+#, fuzzy
+msgid "You have inserted a blank CD."
+msgstr "Вы вставили чистый диск."
+
+#: ../thunar-volman/tvm-run.c:208
+#, fuzzy
+msgid "Burn _Data CD"
+msgstr "Записать CD с _данными"
+
+#: ../thunar-volman/tvm-run.c:209
+#, fuzzy
+msgid "Burn _Audio CD"
+msgstr "Записать CD с _музыкой"
+
+#: ../thunar-volman/tvm-run.c:233
+#, c-format
+msgid "The burn command may not be empty"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:272
+#, c-format
+msgid "The CD player command is undefined"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:66
+msgid "Camera detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:119
-#: ../thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman/tvm-usb-device.c:67
+#, fuzzy
+msgid "A photo camera was detected"
+msgstr "Обнаружена флэш-карта с фотографиями"
+
+#: ../thunar-volman/tvm-usb-device.c:77
+msgid "Printer detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:78
+msgid "A USB printer was detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:104
+#, c-format
+msgid "Unsupported USB device type"
+msgstr ""
+
+#. setup application name
+#: ../thunar-volman-settings/main.c:52
+#, fuzzy
+msgid "Thunar Volume Manager Settings"
+msgstr "Менеджер томов для Thunar"
+
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:102
 msgid "Removable Drives and Media"
 msgstr "Съемные устройства и носители данных"
 
+#: ../thunar-volman-settings/tvm-command-entry.c:240
+msgid "Select an Application"
+msgstr "Выберите приложение"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:250
+msgid "All Files"
+msgstr "Все файлы"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:255
+msgid "Executable Files"
+msgstr "Исполняемые файлы"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:270
+msgid "Perl Scripts"
+msgstr "Сценарии Perl"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:276
+msgid "Python Scripts"
+msgstr "Сценарии Python"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:282
+msgid "Ruby Scripts"
+msgstr "Сценарии Ruby"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:288
+msgid "Shell Scripts"
+msgstr "Сценарии Shell"
+
 #.
 #. Storage
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:143
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:130
 msgid "Storage"
 msgstr "Накопители"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:153
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:141
 msgid "Removable Storage"
 msgstr "Съемные накопители"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:170
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:158
 msgid "_Mount removable drives when hot-plugged"
 msgstr "Подключать обнаруженные съемные _устройства"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:175
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:166
 msgid "Mount removable media when _inserted"
 msgstr "Подключать вставленные съемные _носители"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:180
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:174
 msgid "B_rowse removable media when inserted"
 msgstr "Просматривать вставленный съемный носитель в файловом _менеджере"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:185
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:182
 msgid "_Auto-run programs on new drives and media"
 msgstr "Автоматически запускать _программы с новых устройств и носителей"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:190
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:189
 msgid "Auto-open files on new drives and media"
 msgstr "Автоматически открывать _файлы с новых устройств и носителей"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:199
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:201
 msgid "Blank CDs and DVDs"
 msgstr "Пустые CD и DVD"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:216
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:218
 msgid "_Burn a CD or DVD when a blank disc is inserted"
-msgstr "Запускать приложение для _записи дисков при обнаружении пустого CD или DVD"
+msgstr ""
+"Запускать приложение для _записи дисков при обнаружении пустого CD или DVD"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:224
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:229
 msgid "Command for _Data CDs:"
 msgstr "Команда для записи _данных"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:231
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:239
 msgid "Command for A_udio CDs:"
 msgstr "Команда для записи _аудио"
 
 #.
 #. Multimedia
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:245
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:255
 msgid "Multimedia"
 msgstr "Мультимедиа"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:255
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:266
 msgid "Audio CDs"
 msgstr "Аудиодиски"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:272
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:283
 msgid "Play _audio CDs when inserted"
 msgstr "При обнаружении проигрывать диски с _аудио"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:277
-#: ../thunar-volman/tvm-preferences-dialog.c:383
-#: ../thunar-volman/tvm-preferences-dialog.c:425
-#: ../thunar-volman/tvm-preferences-dialog.c:499
-#: ../thunar-volman/tvm-preferences-dialog.c:541
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:290
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:415
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:466
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:553
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:601
 msgid "_Command:"
 msgstr "_Команда:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:287
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:304
 msgid "Video CDs/DVDs"
 msgstr "Видеодиски"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:304
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:321
 msgid "Play _video CDs and DVDs when inserted"
 msgstr "При обнаружении проигрывать диски с _видео"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:309
-#: ../thunar-volman/tvm-preferences-dialog.c:341
-#: ../thunar-volman/tvm-preferences-dialog.c:457
-#: ../thunar-volman/tvm-preferences-dialog.c:573
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:329
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:367
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:505
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:640
 msgid "C_ommand:"
 msgstr "К_оманда:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:319
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:343
 msgid "Portable Music Players"
 msgstr "Музыкальные плееры"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:336
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:360
 msgid "Play _music files when connected"
 msgstr "Проигрывать файлы с _музыкой при подключении плеера"
 
 #.
 #. Cameras
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:351
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:379
 msgid "Cameras"
 msgstr "Камеры"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:361
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:390
 msgid "Digital Cameras"
 msgstr "Цифровые камеры"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:378
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:407
 msgid "Import digital photographs when connected"
 msgstr "_Импортировать цифровые фотографии при подключении камеры"
 
 #.
 #. PDAs
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:393
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:427
 msgid "PDAs"
 msgstr "КПК"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:403
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:441
 msgid "Palm™"
 msgstr "КПК Palm™"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:420
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:458
 msgid "Sync _Palm™ devices when connected"
 msgstr "Синхронизировать К_ПК Palm™ при подключении"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:435
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:480
 msgid "Pocket PCs"
 msgstr "КПК"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:452
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:497
 msgid "Sync Pocket P_C devices when connected"
 msgstr "Синхронизировать _КПК при подключении"
 
 #.
 #. Printers
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:467
-#: ../thunar-volman/tvm-preferences-dialog.c:477
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:517
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:528
 msgid "Printers"
 msgstr "Принтеры"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:494
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:545
 msgid "Automatically run a program when a _printer is connected"
 msgstr "Запускать приложение при подключении _принтера"
 
 #.
 #. Input Devices
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:509
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:565
 msgid "Input Devices"
 msgstr "Устройства ввода"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:519
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:576
 msgid "Keyboards"
 msgstr "Клавиатуры"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:536
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:593
 msgid "Automatically run a program when an USB _keyboard is connected"
 msgstr "Запускать приложение при подключении _клавиатуры USB"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:551
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:615
 msgid "Mice"
 msgstr "Мыши"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:568
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:632
 msgid "Automatically run a program when an USB _mouse is connected"
 msgstr "Запускать приложение при подключении _мыши USB"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:583
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:654
 msgid "Tablet"
 msgstr "Планшеты"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:600
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:671
 msgid "Automatically run a program when a _tablet is connected"
 msgstr "Запускать приложение при подключении _планшета"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:605
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:679
 msgid "Com_mand:"
 msgstr "Ко_манда:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:690
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:755
 msgid "Failed to open the documentation browser"
 msgstr "Не удалось открыть обозреватель документации"
 
-#: ../thunar-volman/tvm-run.c:133
-#: ../thunar-volman/tvm-run.c:144
-msgid "Choose Disc Type"
-msgstr "Выберите тип диска"
+#~ msgid "Failed to open display"
+#~ msgstr "Невозможно открыть дисплей"
 
-#: ../thunar-volman/tvm-run.c:134
-#: ../thunar-volman/tvm-run.c:145
-msgid "You have inserted a blank disc."
-msgstr "Вы вставили чистый диск."
+#~ msgid "The Thunar development team. All rights reserved."
+#~ msgstr "Команда разработчиков Thunar. Все права защищены."
 
-#: ../thunar-volman/tvm-run.c:135
-#: ../thunar-volman/tvm-run.c:146
-msgid "What would you like to do?"
-msgstr "Что вы хотите сделать?"
+#~ msgid "Written by Benedikt Meurer <benny at xfce.org>."
+#~ msgstr "Автор - Benedikt Meurer <benny at xfce.org>."
 
-#: ../thunar-volman/tvm-run.c:137
-msgid "Make _DVD"
-msgstr "_Записать DVD"
+#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
+#~ msgstr "Указанный UDI \"%s\" не является допустимым UDI устройства HAL"
 
-#: ../thunar-volman/tvm-run.c:148
-msgid "Make _Data CD"
-msgstr "Записать CD с _данными"
+#~ msgid "Encrypted volume"
+#~ msgstr "Зашифрованный том"
 
-#: ../thunar-volman/tvm-run.c:149
-msgid "Make _Audio CD"
-msgstr "Записать CD с _музыкой"
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Подключение зашифрованного тома...</"
+#~ "span>"
+
+#~ msgid "Setting up the crypto layer..."
+#~ msgstr "Настройка подсистемы шифрования..."
+
+#~ msgid "You are not privileged to setup the crypto layer"
+#~ msgstr "У вас недостаточно привилегий для настройки подсистемы шифрования"
+
+#~ msgid "Wrong password"
+#~ msgstr "Неправильный пароль"
+
+#~ msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
+#~ msgstr "<span weight=\"bold\" size=\"larger\">Неправильный пароль.</span>"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
+#~ msgstr "<span weight=\"bold\" size=\"larger\">Этот том зашифрован.</span>"
+
+#~ msgid "Please enter your password to decrypt and mount the volume."
+#~ msgstr "Введите пароль для настройки и подключения зашифрованного тома."
+
+#~ msgid "_Mount"
+#~ msgstr "_Подключить"
+
+#~ msgid "Failed to setup the encrypted volume"
+#~ msgstr "Не удалось настроить зашифрованный том"
+
+#~ msgid "Choose Disc Type"
+#~ msgstr "Выберите тип диска"
 
-#: ../thunar-volman-settings.desktop.in.in.h:3
-msgid "Removable Media"
-msgstr "Съемные носители"
+#~ msgid "Make _DVD"
+#~ msgstr "_Записать DVD"
 
+#~ msgid "Removable Media"
+#~ msgstr "Съемные носители"
diff --git a/po/sk.po b/po/sk.po
index 76d34db..08c8865 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,452 +8,619 @@ msgid ""
 msgstr ""
 "Project-Id-Version: thunar-volman 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-30 02:26-0700\n"
+"POT-Creation-Date: 2010-07-25 20:06+0200\n"
 "PO-Revision-Date: 2009-09-13 18:41+0200\n"
 "Last-Translator: Robert Hartl <hartl.robert at gmail.com>\n"
 "Language-Team: slovak <sk-i18n at lists.linux.sk>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
 "X-Generator: Lokalize 0.3\n"
 
-#: ../thunar-volman/main.c:50
-msgid "The HAL device UDI of the newly added device"
+#: ../thunar-volman/main.c:59
+#, fuzzy
+msgid "The syfs path of the newly added device"
 msgstr "UDI HAL zariadenia novo pridaného zariadenia"
 
-#: ../thunar-volman/main.c:51 ../thunar-volman/tvm-preferences-dialog.c:120
-#: ../thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman/main.c:60
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:104
 msgid "Configure management of removable drives and media"
 msgstr "Nastavenie správy vymeniteľných zariadení a médií"
 
-#: ../thunar-volman/main.c:52
+#: ../thunar-volman/main.c:61
 msgid "Print version information and exit"
 msgstr "Vypísať verziu a skončiť"
 
 #. setup application name
-#: ../thunar-volman/main.c:69
+#: ../thunar-volman/main.c:93
 msgid "Thunar Volume Manager"
 msgstr "Správca médií Thunar"
 
-#: ../thunar-volman/main.c:90
-msgid "Failed to open display"
-msgstr "Zlyhalo otvorenie displeja"
-
-#: ../thunar-volman/main.c:106
-msgid "The Thunar development team. All rights reserved."
-msgstr "Vývojový tím Thunar. Všetky práva vyhradené."
-
-#: ../thunar-volman/main.c:107
-msgid "Written by Benedikt Meurer <benny at xfce.org>."
-msgstr "Napísal Benedikt Meurer <benny at xfce.org>."
+#: ../thunar-volman/main.c:133
+msgid "All rights reserved."
+msgstr ""
 
-#: ../thunar-volman/main.c:108
+#: ../thunar-volman/main.c:134
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Prosím, chyby hláste na <%s>."
 
-#. TRANSLATORS: A HAL device UDI must match certain conditions to be valid (to
-#. be exact, it must be a valid D-Bus object path)
-#: ../thunar-volman/main.c:133
+#: ../thunar-volman/main.c:188
 #, c-format
-msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
-msgstr "Zadané UDI \"%s\" nie je platné HAL UDI zariadenia"
+msgid "There is no device with the sysfs path \"%s\""
+msgstr ""
 
-#. TRANSLATORS: thunar-volman wasn't invoked with either --device-added or
-#. --configure.
-#: ../thunar-volman/main.c:144
-#, c-format
-msgid "Must specify the new HAL device UDI with --device-added"
+#: ../thunar-volman/main.c:200
+#, fuzzy, c-format
+msgid "Must specify the sysfs path of new devices with --device-added"
 msgstr "Musíte zadať nové HAL UDI zariadenia pomocou --device-added"
 
 #. ...so we need to prompt what to do
-#: ../thunar-volman/tvm-block-device.c:189
+#: ../thunar-volman/tvm-block-device.c:204
 msgid "Photos and Music"
 msgstr "Fotografie a Hudba"
 
-#: ../thunar-volman/tvm-block-device.c:190
-msgid "Photos were found on your portable music player."
+#: ../thunar-volman/tvm-block-device.c:205
+#, fuzzy
+msgid "Photos were found on your portable music player"
 msgstr "V prenosnom prehrávači hudby boli nájdené fotografie."
 
-#: ../thunar-volman/tvm-block-device.c:191
+#: ../thunar-volman/tvm-block-device.c:206
 msgid "Would you like to import the photos or manage the music?"
 msgstr "Chcete importovať fotografie alebo spravovať hudbu?"
 
-#: ../thunar-volman/tvm-block-device.c:192
-#: ../thunar-volman/tvm-block-device.c:258
-#: ../thunar-volman/tvm-block-device.c:335
-#: ../thunar-volman/tvm-block-device.c:371
-#: ../thunar-volman/tvm-block-device.c:430
-#: ../thunar-volman/tvm-block-device.c:703
-#: ../thunar-volman/tvm-crypto-volume.c:448 ../thunar-volman/tvm-run.c:136
-#: ../thunar-volman/tvm-run.c:147
+#: ../thunar-volman/tvm-block-device.c:208
+#: ../thunar-volman/tvm-block-device.c:277
+#: ../thunar-volman/tvm-block-device.c:378
+#: ../thunar-volman/tvm-block-device.c:425
+#: ../thunar-volman/tvm-block-device.c:507
+#: ../thunar-volman/tvm-block-device.c:826 ../thunar-volman/tvm-run.c:196
+#: ../thunar-volman/tvm-run.c:207
 msgid "Ig_nore"
 msgstr "Ig_norovať"
 
-#: ../thunar-volman/tvm-block-device.c:193
-#: ../thunar-volman/tvm-block-device.c:259
+#: ../thunar-volman/tvm-block-device.c:209
+#: ../thunar-volman/tvm-block-device.c:278
 msgid "Import _Photos"
 msgstr "Im_portovat fotografie"
 
-#: ../thunar-volman/tvm-block-device.c:194
+#: ../thunar-volman/tvm-block-device.c:210
 msgid "Manage _Music"
 msgstr "Spravovať _hudbu"
 
-#. ask the user whether to import photos
-#: ../thunar-volman/tvm-block-device.c:255
+#. ask the user to import photos
+#: ../thunar-volman/tvm-block-device.c:273
 msgid "Photo Import"
 msgstr "Import fotografií"
 
-#: ../thunar-volman/tvm-block-device.c:256
-msgid "A photo card has been detected."
+#: ../thunar-volman/tvm-block-device.c:274
+#, fuzzy
+msgid "A photo card has been detected"
 msgstr "Bola zistená foto karta."
 
-#: ../thunar-volman/tvm-block-device.c:257
-msgid "There are photos on the card. Would you like to add these photos to your album?"
-msgstr "Na karte sú fotografie. Chcete tieto fotografie pridať do svojho albumu?"
+#: ../thunar-volman/tvm-block-device.c:275
+msgid ""
+"There are photos on the card. Would you like to add these photos to your "
+"album?"
+msgstr ""
+"Na karte sú fotografie. Chcete tieto fotografie pridať do svojho albumu?"
 
-#. prompt the user whether to execute this file
-#: ../thunar-volman/tvm-block-device.c:332
-#: ../thunar-volman/tvm-block-device.c:368
+#. prompt the user to execute the file
+#. prompt the user to execute this file
+#: ../thunar-volman/tvm-block-device.c:373
+#: ../thunar-volman/tvm-block-device.c:420
 #, c-format
 msgid "Would you like to allow \"%s\" to run?"
 msgstr "Chcete povoliť spustenie \"%s\"?"
 
-#: ../thunar-volman/tvm-block-device.c:333
-#: ../thunar-volman/tvm-block-device.c:369
+#: ../thunar-volman/tvm-block-device.c:376
+#: ../thunar-volman/tvm-block-device.c:423
 msgid "Auto-Run Confirmation"
 msgstr "Potvrdenie auto-spustenia"
 
-#: ../thunar-volman/tvm-block-device.c:334
-#: ../thunar-volman/tvm-block-device.c:370
+#: ../thunar-volman/tvm-block-device.c:377
+#: ../thunar-volman/tvm-block-device.c:424
 msgid "Auto-Run capability detected"
 msgstr "Zistená schopnosť auto-spustenia"
 
-#: ../thunar-volman/tvm-block-device.c:336
-#: ../thunar-volman/tvm-block-device.c:372
+#: ../thunar-volman/tvm-block-device.c:379
+#: ../thunar-volman/tvm-block-device.c:426
 msgid "_Allow Auto-Run"
 msgstr "Povoliť _auto-spustenie"
 
 #. prompt the user whether to autoopen this file
-#: ../thunar-volman/tvm-block-device.c:427
+#: ../thunar-volman/tvm-block-device.c:502
 #, c-format
 msgid "Would you like to open \"%s\"?"
 msgstr "Chcete otvoriť \"%s\"?"
 
-#: ../thunar-volman/tvm-block-device.c:428
+#: ../thunar-volman/tvm-block-device.c:505
 msgid "Auto-Open Confirmation"
 msgstr "Potvrdenie auto-otvorenia"
 
-#: ../thunar-volman/tvm-block-device.c:429
+#: ../thunar-volman/tvm-block-device.c:506
 msgid "Auto-Open capability detected"
 msgstr "Zistená schopnosť auto-otvorenia"
 
-#: ../thunar-volman/tvm-block-device.c:431
+#: ../thunar-volman/tvm-block-device.c:508
 msgid "_Open"
 msgstr "_Otvoriť"
 
-#. ask what do with the mixed audio/data disc
-#: ../thunar-volman/tvm-block-device.c:700
-msgid "Audio / Data CD"
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "CD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "DVD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:618
+msgid "The CD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:619
+msgid "The DVD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:629
+msgid "Volume mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:632
+#, c-format
+msgid "The volume \"%s\" was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:637
+#, c-format
+msgid "The inserted volume was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:691
+#, c-format
+msgid "Unable to locate mount point"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:737
+#, c-format
+msgid "Unable to mount the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:746
+#, c-format
+msgid "Could not detect the volume corresponding to the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:821
+#, fuzzy
+msgid "Audio/Data CD"
 msgstr "Audio / Dátové CD"
 
-#: ../thunar-volman/tvm-block-device.c:701
-msgid "The CD in the drive contains both music and files."
+#: ../thunar-volman/tvm-block-device.c:822
+#, fuzzy
+msgid "The CD in the drive contains both music and files"
 msgstr "CD v zariadení obsahuje hudbu aj súbory."
 
-#: ../thunar-volman/tvm-block-device.c:702
+#: ../thunar-volman/tvm-block-device.c:824
 msgid "Would you like to listen to music or browse the files?"
 msgstr "Chcete počúvať hudnu alebo prezerať súbory?"
 
-#: ../thunar-volman/tvm-block-device.c:704
+#: ../thunar-volman/tvm-block-device.c:827
 msgid "_Browse Files"
 msgstr "P_rechádzať súbory"
 
-#: ../thunar-volman/tvm-block-device.c:705
+#: ../thunar-volman/tvm-block-device.c:828
 msgid "_Play CD"
 msgstr "_Prehrať CD"
 
-#: ../thunar-volman/tvm-command-entry.c:233
-msgid "Select an Application"
-msgstr "Zvoľte program"
+#: ../thunar-volman/tvm-block-device.c:916
+#, c-format
+msgid "Unknown block device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:243
-msgid "All Files"
-msgstr "Všetky súbory"
+#: ../thunar-volman/tvm-device.c:139
+#, c-format
+msgid "Device type not supported"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:248
-msgid "Executable Files"
-msgstr "Spustiteľné súbory"
+#: ../thunar-volman/tvm-input-device.c:74
+#, fuzzy
+msgid "input-keyboard"
+msgstr "Klávesnice"
 
-#: ../thunar-volman/tvm-command-entry.c:263
-msgid "Perl Scripts"
-msgstr "Perlové skripty"
+#: ../thunar-volman/tvm-input-device.c:75
+#, fuzzy
+msgid "Keyboard detected"
+msgstr "Klávesnice"
 
-#: ../thunar-volman/tvm-command-entry.c:269
-msgid "Python Scripts"
-msgstr "Pythonové skripty"
+#: ../thunar-volman/tvm-input-device.c:76
+#, fuzzy
+msgid "A keyboard was detected"
+msgstr "Bola zistená foto karta."
 
-#: ../thunar-volman/tvm-command-entry.c:275
-msgid "Ruby Scripts"
-msgstr "Ruby skripty"
+#: ../thunar-volman/tvm-input-device.c:86
+#: ../thunar-volman/tvm-input-device.c:100
+msgid "input-tablet"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:281
-msgid "Shell Scripts"
-msgstr "Shellové skripty"
+#: ../thunar-volman/tvm-input-device.c:87
+#: ../thunar-volman/tvm-input-device.c:101
+#, fuzzy
+msgid "Tablet detected"
+msgstr "Zistená schopnosť auto-spustenia"
+
+#: ../thunar-volman/tvm-input-device.c:88
+#: ../thunar-volman/tvm-input-device.c:102
+msgid "A graphics tablet was detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-input-device.c:110
+msgid "input-mouse"
+msgstr ""
+
+#: ../thunar-volman/tvm-input-device.c:111
+msgid "Mouse detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-input-device.c:112
+msgid "A mouse was detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-input-device.c:139
+#, c-format
+msgid "Unsupported input device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:286
-#: ../thunar-volman/tvm-crypto-volume.c:443
-msgid "Encrypted volume"
-msgstr "Šifrovaný zväzok"
+#: ../thunar-volman/tvm-run.c:173
+#, c-format
+msgid "Autoburning of blank CDs and DVDs is disabled"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:297
-msgid "<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Pripájanie šifrovaného zväzku...</span>"
+#: ../thunar-volman/tvm-run.c:193
+msgid "Blank DVD inserted"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:302
-msgid "Setting up the crypto layer..."
-msgstr "Nastavovanie šifrovacej vrstvy..."
+#: ../thunar-volman/tvm-run.c:194
+#, fuzzy
+msgid "You have inserted a blank DVD."
+msgstr "Vložili ste prázdny disk."
+
+#: ../thunar-volman/tvm-run.c:195 ../thunar-volman/tvm-run.c:206
+msgid "What would you like to do?"
+msgstr "Čo chcete urobiť?"
+
+#: ../thunar-volman/tvm-run.c:197
+msgid "Burn _DVD"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:204
+#, fuzzy
+msgid "Blank CD inserted"
+msgstr "Prázdne CD a DVD"
+
+#: ../thunar-volman/tvm-run.c:205
+#, fuzzy
+msgid "You have inserted a blank CD."
+msgstr "Vložili ste prázdny disk."
+
+#: ../thunar-volman/tvm-run.c:208
+#, fuzzy
+msgid "Burn _Data CD"
+msgstr "Vytvoriť _Dátové CD"
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume)
-#. but got Permission denied.
-#: ../thunar-volman/tvm-crypto-volume.c:369
+#: ../thunar-volman/tvm-run.c:209
+#, fuzzy
+msgid "Burn _Audio CD"
+msgstr "Vytvoriť _Audio CD"
+
+#: ../thunar-volman/tvm-run.c:233
 #, c-format
-msgid "You are not privileged to setup the crypto layer"
-msgstr "Nemáte oprávnenie nastavovať šifrovaciu vrstvu"
+msgid "The burn command may not be empty"
+msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume)
-#. and typed the wrong password.
-#: ../thunar-volman/tvm-crypto-volume.c:374
+#: ../thunar-volman/tvm-run.c:272
 #, c-format
-msgid "Wrong password"
-msgstr "Nesprávne heslo"
+msgid "The CD player command is undefined"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:445
-msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Nesprávne heslo.</span>"
+#: ../thunar-volman/tvm-usb-device.c:66
+msgid "Camera detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:67
+#, fuzzy
+msgid "A photo camera was detected"
+msgstr "Bola zistená foto karta."
 
-#: ../thunar-volman/tvm-crypto-volume.c:446
-msgid "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Tento zväzok je šifrovaný.</span>"
+#: ../thunar-volman/tvm-usb-device.c:77
+msgid "Printer detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:447
-msgid "Please enter your password to decrypt and mount the volume."
-msgstr "Pre odšifrovanie a pripojenie zadajte heslo."
+#: ../thunar-volman/tvm-usb-device.c:78
+msgid "A USB printer was detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:449
-msgid "_Mount"
-msgstr "_Pripojiť"
+#: ../thunar-volman/tvm-usb-device.c:104
+#, c-format
+msgid "Unsupported USB device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:468
-msgid "Failed to setup the encrypted volume"
-msgstr "Nepodarilo sa nastaviť šifrovaný zväzok"
+#. setup application name
+#: ../thunar-volman-settings/main.c:52
+#, fuzzy
+msgid "Thunar Volume Manager Settings"
+msgstr "Správca médií Thunar"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:119
-#: ../thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:102
 msgid "Removable Drives and Media"
 msgstr "Vymeniteľné zariadenia a médiá"
 
+#: ../thunar-volman-settings/tvm-command-entry.c:240
+msgid "Select an Application"
+msgstr "Zvoľte program"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:250
+msgid "All Files"
+msgstr "Všetky súbory"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:255
+msgid "Executable Files"
+msgstr "Spustiteľné súbory"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:270
+msgid "Perl Scripts"
+msgstr "Perlové skripty"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:276
+msgid "Python Scripts"
+msgstr "Pythonové skripty"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:282
+msgid "Ruby Scripts"
+msgstr "Ruby skripty"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:288
+msgid "Shell Scripts"
+msgstr "Shellové skripty"
+
+#.
 #. Storage
-#. 
-#: ../thunar-volman/tvm-preferences-dialog.c:143
+#.
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:130
 msgid "Storage"
 msgstr "Úložisko"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:153
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:141
 msgid "Removable Storage"
 msgstr "Vymeniteľné úložisko"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:170
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:158
 msgid "_Mount removable drives when hot-plugged"
 msgstr "Pripojiť vy_meniteľné zariadenie pri pripojení"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:175
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:166
 msgid "Mount removable media when _inserted"
 msgstr "Pr_ipojiť vymeniteľné zariadenie pri vložení"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:180
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:174
 msgid "B_rowse removable media when inserted"
 msgstr "P_rechádzať vymeniteľné médiá pri vložení"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:185
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:182
 msgid "_Auto-run programs on new drives and media"
 msgstr "_Auto spustenie programov na nových zariadeniach a médiách"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:190
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:189
 msgid "Auto-open files on new drives and media"
 msgstr "Auto otvorenie súborov na nových zariadeniach a médiách"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:199
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:201
 msgid "Blank CDs and DVDs"
 msgstr "Prázdne CD a DVD"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:216
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:218
 msgid "_Burn a CD or DVD when a blank disc is inserted"
 msgstr "_Napaľovanie CD alebo DVD pri vložení prázdneho disku"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:224
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:229
 msgid "Command for _Data CDs:"
 msgstr "Príkaz pre _dátové CD:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:231
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:239
 msgid "Command for A_udio CDs:"
 msgstr "Príkaz pre A_udio CD:"
 
+#.
 #. Multimedia
-#. 
-#: ../thunar-volman/tvm-preferences-dialog.c:245
+#.
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:255
 msgid "Multimedia"
 msgstr "Multimédiá"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:255
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:266
 msgid "Audio CDs"
 msgstr "Audio CD"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:272
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:283
 msgid "Play _audio CDs when inserted"
 msgstr "Prehrať _audio CD pri vložení"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:277
-#: ../thunar-volman/tvm-preferences-dialog.c:383
-#: ../thunar-volman/tvm-preferences-dialog.c:425
-#: ../thunar-volman/tvm-preferences-dialog.c:499
-#: ../thunar-volman/tvm-preferences-dialog.c:541
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:290
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:415
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:466
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:553
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:601
 msgid "_Command:"
 msgstr "_Príkaz:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:287
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:304
 msgid "Video CDs/DVDs"
 msgstr "Video CD/DVD"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:304
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:321
 msgid "Play _video CDs and DVDs when inserted"
 msgstr "Prehrať _video CD a DVD pri vložení"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:309
-#: ../thunar-volman/tvm-preferences-dialog.c:341
-#: ../thunar-volman/tvm-preferences-dialog.c:457
-#: ../thunar-volman/tvm-preferences-dialog.c:573
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:329
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:367
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:505
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:640
 msgid "C_ommand:"
 msgstr "Prík_az:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:319
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:343
 msgid "Portable Music Players"
 msgstr "Prenosné prehrávače hudby"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:336
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:360
 msgid "Play _music files when connected"
 msgstr "Prehrať _hudobné súbory pri pripojení"
 
+#.
 #. Cameras
-#. 
-#: ../thunar-volman/tvm-preferences-dialog.c:351
+#.
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:379
 msgid "Cameras"
 msgstr "Kamery"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:361
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:390
 msgid "Digital Cameras"
 msgstr "Digitálne fotoaparáty"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:378
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:407
 msgid "Import digital photographs when connected"
 msgstr "Importovať digitálne fotografie pri pripojení"
 
+#.
 #. PDAs
-#. 
-#: ../thunar-volman/tvm-preferences-dialog.c:393
+#.
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:427
 msgid "PDAs"
 msgstr "PDA"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:403
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:441
 msgid "Palm™"
 msgstr "Palm™"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:420
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:458
 msgid "Sync _Palm™ devices when connected"
 msgstr "Synchronizovať zariadenia _Palm™ pri pripojení"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:435
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:480
 msgid "Pocket PCs"
 msgstr "Pocket PC"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:452
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:497
 msgid "Sync Pocket P_C devices when connected"
 msgstr "Synchtonizovať zariadenia Pocket P_C pri pripojení"
 
+#.
 #. Printers
-#. 
-#: ../thunar-volman/tvm-preferences-dialog.c:467
-#: ../thunar-volman/tvm-preferences-dialog.c:477
+#.
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:517
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:528
 msgid "Printers"
 msgstr "Tlačiarne"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:494
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:545
 msgid "Automatically run a program when a _printer is connected"
 msgstr "Automaticky spustiť program pri pripojení _tlačiarne"
 
+#.
 #. Input Devices
-#. 
-#: ../thunar-volman/tvm-preferences-dialog.c:509
+#.
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:565
 msgid "Input Devices"
 msgstr "Vstupné zariadenia"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:519
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:576
 msgid "Keyboards"
 msgstr "Klávesnice"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:536
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:593
 msgid "Automatically run a program when an USB _keyboard is connected"
 msgstr "Automaticky spustiť program pri pripojení USB _klávesnice"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:551
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:615
 msgid "Mice"
 msgstr "Myši"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:568
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:632
 msgid "Automatically run a program when an USB _mouse is connected"
 msgstr "Automaticky spustiť program pri pripojení USB _myši"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:583
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:654
 msgid "Tablet"
 msgstr "Tablet"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:600
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:671
 msgid "Automatically run a program when a _tablet is connected"
 msgstr "Automaticky spustiť program pri pripojení _tabletu"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:605
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:679
 msgid "Com_mand:"
 msgstr "Prík_az:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:690
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:755
 msgid "Failed to open the documentation browser"
 msgstr "Zlyhalo otvorenie prehliadača dokumentácie"
 
-#: ../thunar-volman/tvm-run.c:133 ../thunar-volman/tvm-run.c:144
-msgid "Choose Disc Type"
-msgstr "Zvoľte typ disku"
+#~ msgid "Failed to open display"
+#~ msgstr "Zlyhalo otvorenie displeja"
 
-#: ../thunar-volman/tvm-run.c:134 ../thunar-volman/tvm-run.c:145
-msgid "You have inserted a blank disc."
-msgstr "Vložili ste prázdny disk."
+#~ msgid "The Thunar development team. All rights reserved."
+#~ msgstr "Vývojový tím Thunar. Všetky práva vyhradené."
 
-#: ../thunar-volman/tvm-run.c:135 ../thunar-volman/tvm-run.c:146
-msgid "What would you like to do?"
-msgstr "Čo chcete urobiť?"
+#~ msgid "Written by Benedikt Meurer <benny at xfce.org>."
+#~ msgstr "Napísal Benedikt Meurer <benny at xfce.org>."
 
-#: ../thunar-volman/tvm-run.c:137
-msgid "Make _DVD"
-msgstr "Vytvoriť _DVD"
+#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
+#~ msgstr "Zadané UDI \"%s\" nie je platné HAL UDI zariadenia"
 
-#: ../thunar-volman/tvm-run.c:148
-msgid "Make _Data CD"
-msgstr "Vytvoriť _Dátové CD"
+#~ msgid "Encrypted volume"
+#~ msgstr "Šifrovaný zväzok"
 
-#: ../thunar-volman/tvm-run.c:149
-msgid "Make _Audio CD"
-msgstr "Vytvoriť _Audio CD"
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Pripájanie šifrovaného zväzku...</"
+#~ "span>"
+
+#~ msgid "Setting up the crypto layer..."
+#~ msgstr "Nastavovanie šifrovacej vrstvy..."
+
+#~ msgid "You are not privileged to setup the crypto layer"
+#~ msgstr "Nemáte oprávnenie nastavovať šifrovaciu vrstvu"
+
+#~ msgid "Wrong password"
+#~ msgstr "Nesprávne heslo"
+
+#~ msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
+#~ msgstr "<span weight=\"bold\" size=\"larger\">Nesprávne heslo.</span>"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Tento zväzok je šifrovaný.</span>"
+
+#~ msgid "Please enter your password to decrypt and mount the volume."
+#~ msgstr "Pre odšifrovanie a pripojenie zadajte heslo."
+
+#~ msgid "_Mount"
+#~ msgstr "_Pripojiť"
+
+#~ msgid "Failed to setup the encrypted volume"
+#~ msgstr "Nepodarilo sa nastaviť šifrovaný zväzok"
+
+#~ msgid "Choose Disc Type"
+#~ msgstr "Zvoľte typ disku"
+
+#~ msgid "Make _DVD"
+#~ msgstr "Vytvoriť _DVD"
 
-#: ../thunar-volman-settings.desktop.in.in.h:3
-msgid "Removable Media"
-msgstr "Vyberateľné médiá"
+#~ msgid "Removable Media"
+#~ msgstr "Vyberateľné médiá"
diff --git a/po/sq.po b/po/sq.po
index 1c533c8..54ac2af 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -6,458 +6,617 @@ msgid ""
 msgstr ""
 "Project-Id-Version: thunar-volman 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-15 21:12+0100\n"
+"POT-Creation-Date: 2010-07-25 20:06+0200\n"
 "PO-Revision-Date: 2008-11-04 22:37+0200\n"
 "Last-Translator: Besnik Bleta <besnik at programeshqip.org>\n"
 "Language-Team: Albanian <translation-team-sq at lists.sourceforge.net>\n"
+"Language: sq\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../thunar-volman/main.c:50
-msgid "The HAL device UDI of the newly added device"
+#: ../thunar-volman/main.c:59
+#, fuzzy
+msgid "The syfs path of the newly added device"
 msgstr "Pajisja HAL UDI e pajisjes së shtuar rishtazi"
 
-#: ../thunar-volman/main.c:51
-#: ../thunar-volman/tvm-preferences-dialog.c:120
-#: ../thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman/main.c:60
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:104
 msgid "Configure management of removable drives and media"
 msgstr "Formësoni administrimin e pajisjeve dhe mediave të heqshme"
 
-#: ../thunar-volman/main.c:52
+#: ../thunar-volman/main.c:61
 msgid "Print version information and exit"
 msgstr "Shtyp të dhëna versioni dhe dil"
 
 #. setup application name
-#: ../thunar-volman/main.c:69
+#: ../thunar-volman/main.c:93
 msgid "Thunar Volume Manager"
 msgstr "Përgjegjësi i Volumit Thunar"
 
-#: ../thunar-volman/main.c:90
-msgid "Failed to open display"
-msgstr "Dështoi në hapje ekrani"
-
-#: ../thunar-volman/main.c:106
-msgid "The Thunar development team. All rights reserved."
-msgstr "Ekipi zhvillues i Thunar-it. Tërë të drejtat të rezervuara."
-
-#: ../thunar-volman/main.c:107
-msgid "Written by Benedikt Meurer <benny at xfce.org>."
-msgstr "Shkruar nga Benedikt Meurer <benny at xfce.org>."
+#: ../thunar-volman/main.c:133
+msgid "All rights reserved."
+msgstr ""
 
-#: ../thunar-volman/main.c:108
+#: ../thunar-volman/main.c:134
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Ju lutem njoftoni të meta te <%s>."
 
-#. TRANSLATORS: A HAL device UDI must match certain conditions to be valid (to be exact, it must be a valid D-Bus object path)
-#: ../thunar-volman/main.c:133
+#: ../thunar-volman/main.c:188
 #, c-format
-msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
-msgstr "UDI \"%s\" e dhënë nuk është pajisje e vlefshme HAL UDI"
+msgid "There is no device with the sysfs path \"%s\""
+msgstr ""
 
-#. TRANSLATORS: thunar-volman wasn't invoked with either --device-added or --configure.
-#: ../thunar-volman/main.c:144
-#, c-format
-msgid "Must specify the new HAL device UDI with --device-added"
+#: ../thunar-volman/main.c:200
+#, fuzzy, c-format
+msgid "Must specify the sysfs path of new devices with --device-added"
 msgstr "Duhet të tregoni pajisjes e re HAL UDI me --device-added"
 
 #. ...so we need to prompt what to do
-#: ../thunar-volman/tvm-block-device.c:189
+#: ../thunar-volman/tvm-block-device.c:204
 msgid "Photos and Music"
 msgstr "Foto dhe Muzikë"
 
-#: ../thunar-volman/tvm-block-device.c:190
-msgid "Photos were found on your portable music player."
+#: ../thunar-volman/tvm-block-device.c:205
+#, fuzzy
+msgid "Photos were found on your portable music player"
 msgstr "Në luajtësin tuaj mbartshëm të muzikës u gjetën foto."
 
-#: ../thunar-volman/tvm-block-device.c:191
+#: ../thunar-volman/tvm-block-device.c:206
 msgid "Would you like to import the photos or manage the music?"
 msgstr "Doni të importoni fotot apo të administroni muzikën?"
 
-#: ../thunar-volman/tvm-block-device.c:192
-#: ../thunar-volman/tvm-block-device.c:258
-#: ../thunar-volman/tvm-block-device.c:335
-#: ../thunar-volman/tvm-block-device.c:371
-#: ../thunar-volman/tvm-block-device.c:430
-#: ../thunar-volman/tvm-block-device.c:703
-#: ../thunar-volman/tvm-crypto-volume.c:448
-#: ../thunar-volman/tvm-run.c:136
-#: ../thunar-volman/tvm-run.c:147
+#: ../thunar-volman/tvm-block-device.c:208
+#: ../thunar-volman/tvm-block-device.c:277
+#: ../thunar-volman/tvm-block-device.c:378
+#: ../thunar-volman/tvm-block-device.c:425
+#: ../thunar-volman/tvm-block-device.c:507
+#: ../thunar-volman/tvm-block-device.c:826 ../thunar-volman/tvm-run.c:196
+#: ../thunar-volman/tvm-run.c:207
 msgid "Ig_nore"
 msgstr "_Shpërfill"
 
-#: ../thunar-volman/tvm-block-device.c:193
-#: ../thunar-volman/tvm-block-device.c:259
+#: ../thunar-volman/tvm-block-device.c:209
+#: ../thunar-volman/tvm-block-device.c:278
 msgid "Import _Photos"
 msgstr "Importo _Foto"
 
-#: ../thunar-volman/tvm-block-device.c:194
+#: ../thunar-volman/tvm-block-device.c:210
 msgid "Manage _Music"
 msgstr "Administroni _Muzikë"
 
-#. ask the user whether to import photos
-#: ../thunar-volman/tvm-block-device.c:255
+#. ask the user to import photos
+#: ../thunar-volman/tvm-block-device.c:273
 msgid "Photo Import"
 msgstr "Importim Fotosh"
 
-#: ../thunar-volman/tvm-block-device.c:256
-msgid "A photo card has been detected."
+#: ../thunar-volman/tvm-block-device.c:274
+#, fuzzy
+msgid "A photo card has been detected"
 msgstr "U zbulua nëj kartë fotosh."
 
-#: ../thunar-volman/tvm-block-device.c:257
-msgid "There are photos on the card. Would you like to add these photos to your album?"
+#: ../thunar-volman/tvm-block-device.c:275
+msgid ""
+"There are photos on the card. Would you like to add these photos to your "
+"album?"
 msgstr "Ka foto në kartë. Doni të shtohen fotot te albumi juaj?"
 
-#. prompt the user whether to execute this file
-#: ../thunar-volman/tvm-block-device.c:332
-#: ../thunar-volman/tvm-block-device.c:368
+#. prompt the user to execute the file
+#. prompt the user to execute this file
+#: ../thunar-volman/tvm-block-device.c:373
+#: ../thunar-volman/tvm-block-device.c:420
 #, c-format
 msgid "Would you like to allow \"%s\" to run?"
 msgstr "Doni të lejoni lejimin e xhirimit të \"%s\"?"
 
-#: ../thunar-volman/tvm-block-device.c:333
-#: ../thunar-volman/tvm-block-device.c:369
+#: ../thunar-volman/tvm-block-device.c:376
+#: ../thunar-volman/tvm-block-device.c:423
 msgid "Auto-Run Confirmation"
 msgstr "Ripohim Vetëxhirimi"
 
-#: ../thunar-volman/tvm-block-device.c:334
-#: ../thunar-volman/tvm-block-device.c:370
+#: ../thunar-volman/tvm-block-device.c:377
+#: ../thunar-volman/tvm-block-device.c:424
 msgid "Auto-Run capability detected"
 msgstr "U zbulua aftësi Vetëxhirimi"
 
-#: ../thunar-volman/tvm-block-device.c:336
-#: ../thunar-volman/tvm-block-device.c:372
+#: ../thunar-volman/tvm-block-device.c:379
+#: ../thunar-volman/tvm-block-device.c:426
 msgid "_Allow Auto-Run"
 msgstr "_Lejo Vetëxhirim"
 
 #. prompt the user whether to autoopen this file
-#: ../thunar-volman/tvm-block-device.c:427
+#: ../thunar-volman/tvm-block-device.c:502
 #, c-format
 msgid "Would you like to open \"%s\"?"
 msgstr "Doni të hapni \"%s\"?"
 
-#: ../thunar-volman/tvm-block-device.c:428
+#: ../thunar-volman/tvm-block-device.c:505
 msgid "Auto-Open Confirmation"
 msgstr "Ripohim Vetëhapjeje"
 
-#: ../thunar-volman/tvm-block-device.c:429
+#: ../thunar-volman/tvm-block-device.c:506
 msgid "Auto-Open capability detected"
 msgstr "U zbulua aftësi Vetëhapjeje"
 
-#: ../thunar-volman/tvm-block-device.c:431
+#: ../thunar-volman/tvm-block-device.c:508
 msgid "_Open"
 msgstr "_Hap"
 
-#. ask what do with the mixed audio/data disc
-#: ../thunar-volman/tvm-block-device.c:700
-msgid "Audio / Data CD"
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "CD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "DVD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:618
+msgid "The CD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:619
+msgid "The DVD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:629
+msgid "Volume mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:632
+#, c-format
+msgid "The volume \"%s\" was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:637
+#, c-format
+msgid "The inserted volume was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:691
+#, c-format
+msgid "Unable to locate mount point"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:737
+#, c-format
+msgid "Unable to mount the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:746
+#, c-format
+msgid "Could not detect the volume corresponding to the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:821
+#, fuzzy
+msgid "Audio/Data CD"
 msgstr "CD Audio/Të dhënash"
 
-#: ../thunar-volman/tvm-block-device.c:701
-msgid "The CD in the drive contains both music and files."
+#: ../thunar-volman/tvm-block-device.c:822
+#, fuzzy
+msgid "The CD in the drive contains both music and files"
 msgstr "CD në pajisje përmban edhe muzikë edhe kartela."
 
-#: ../thunar-volman/tvm-block-device.c:702
+#: ../thunar-volman/tvm-block-device.c:824
 msgid "Would you like to listen to music or browse the files?"
 msgstr "DOni të dëgjoni muzikë apo të shfletoni kartelat?te te kartela?"
 
-#: ../thunar-volman/tvm-block-device.c:704
+#: ../thunar-volman/tvm-block-device.c:827
 msgid "_Browse Files"
 msgstr "_Shfletoni Kartela"
 
-#: ../thunar-volman/tvm-block-device.c:705
+#: ../thunar-volman/tvm-block-device.c:828
 msgid "_Play CD"
 msgstr "_Luaj CD"
 
-#: ../thunar-volman/tvm-command-entry.c:233
-msgid "Select an Application"
-msgstr "Përzgjidhni një Zbatim"
+#: ../thunar-volman/tvm-block-device.c:916
+#, c-format
+msgid "Unknown block device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:243
-msgid "All Files"
-msgstr "Tërë Kartelat"
+#: ../thunar-volman/tvm-device.c:139
+#, c-format
+msgid "Device type not supported"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:248
-msgid "Executable Files"
-msgstr "Kartela të Ekzekutueshmish"
+#: ../thunar-volman/tvm-input-device.c:74
+#, fuzzy
+msgid "input-keyboard"
+msgstr "Tastiera"
 
-#: ../thunar-volman/tvm-command-entry.c:263
-msgid "Perl Scripts"
-msgstr "Programthe Perl"
+#: ../thunar-volman/tvm-input-device.c:75
+#, fuzzy
+msgid "Keyboard detected"
+msgstr "Tastiera"
 
-#: ../thunar-volman/tvm-command-entry.c:269
-msgid "Python Scripts"
-msgstr "Programthe Python"
+#: ../thunar-volman/tvm-input-device.c:76
+#, fuzzy
+msgid "A keyboard was detected"
+msgstr "U zbulua nëj kartë fotosh."
 
-#: ../thunar-volman/tvm-command-entry.c:275
-msgid "Ruby Scripts"
-msgstr "Programthe Ruby"
+#: ../thunar-volman/tvm-input-device.c:86
+#: ../thunar-volman/tvm-input-device.c:100
+msgid "input-tablet"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:281
-msgid "Shell Scripts"
-msgstr "Programthe Shell"
+#: ../thunar-volman/tvm-input-device.c:87
+#: ../thunar-volman/tvm-input-device.c:101
+#, fuzzy
+msgid "Tablet detected"
+msgstr "U zbulua aftësi Vetëxhirimi"
+
+#: ../thunar-volman/tvm-input-device.c:88
+#: ../thunar-volman/tvm-input-device.c:102
+msgid "A graphics tablet was detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-input-device.c:110
+msgid "input-mouse"
+msgstr ""
+
+#: ../thunar-volman/tvm-input-device.c:111
+msgid "Mouse detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-input-device.c:112
+msgid "A mouse was detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-input-device.c:139
+#, c-format
+msgid "Unsupported input device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:286
-#: ../thunar-volman/tvm-crypto-volume.c:443
-msgid "Encrypted volume"
-msgstr "Vëllim i koduar"
+#: ../thunar-volman/tvm-run.c:173
+#, c-format
+msgid "Autoburning of blank CDs and DVDs is disabled"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:297
-msgid "<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Po montohet vëllim i koduar...</span>"
+#: ../thunar-volman/tvm-run.c:193
+msgid "Blank DVD inserted"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:302
-msgid "Setting up the crypto layer..."
-msgstr "Po rregullon shtresën e kodimit..."
+#: ../thunar-volman/tvm-run.c:194
+#, fuzzy
+msgid "You have inserted a blank DVD."
+msgstr "Keni futur një disk bosh."
+
+#: ../thunar-volman/tvm-run.c:195 ../thunar-volman/tvm-run.c:206
+msgid "What would you like to do?"
+msgstr "Çfarë do të donit të bëni?"
+
+#: ../thunar-volman/tvm-run.c:197
+msgid "Burn _DVD"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:204
+#, fuzzy
+msgid "Blank CD inserted"
+msgstr "Zbardhje CD-sh dhe DVD-sh"
+
+#: ../thunar-volman/tvm-run.c:205
+#, fuzzy
+msgid "You have inserted a blank CD."
+msgstr "Keni futur një disk bosh."
+
+#: ../thunar-volman/tvm-run.c:208
+#, fuzzy
+msgid "Burn _Data CD"
+msgstr "Krijo CD të _Dhënash"
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) but got Permission denied.
-#: ../thunar-volman/tvm-crypto-volume.c:369
+#: ../thunar-volman/tvm-run.c:209
+#, fuzzy
+msgid "Burn _Audio CD"
+msgstr "Krijo CD _Audio"
+
+#: ../thunar-volman/tvm-run.c:233
 #, c-format
-msgid "You are not privileged to setup the crypto layer"
-msgstr "Nuk keni privilegje për të rregulluar shtresën e kodimit"
+msgid "The burn command may not be empty"
+msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) and typed the wrong password.
-#: ../thunar-volman/tvm-crypto-volume.c:374
+#: ../thunar-volman/tvm-run.c:272
 #, c-format
-msgid "Wrong password"
-msgstr "Fjalëkalim i gabuar"
+msgid "The CD player command is undefined"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:445
-msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Fjalëkalim i gabuar.</span>"
+#: ../thunar-volman/tvm-usb-device.c:66
+msgid "Camera detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:67
+#, fuzzy
+msgid "A photo camera was detected"
+msgstr "U zbulua nëj kartë fotosh."
 
-#: ../thunar-volman/tvm-crypto-volume.c:446
-msgid "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Ky vëllim është i koduar.</span>"
+#: ../thunar-volman/tvm-usb-device.c:77
+msgid "Printer detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:447
-msgid "Please enter your password to decrypt and mount the volume."
-msgstr "Ju lutem jepni fjalëkalimin tuaj për çkodimin dhe montimin e vëllimit."
+#: ../thunar-volman/tvm-usb-device.c:78
+msgid "A USB printer was detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:449
-msgid "_Mount"
-msgstr "_Montoje"
+#: ../thunar-volman/tvm-usb-device.c:104
+#, c-format
+msgid "Unsupported USB device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:468
-msgid "Failed to setup the encrypted volume"
-msgstr "Dështoi në rregullimin e vëllimit të koduar"
+#. setup application name
+#: ../thunar-volman-settings/main.c:52
+#, fuzzy
+msgid "Thunar Volume Manager Settings"
+msgstr "Përgjegjësi i Volumit Thunar"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:119
-#: ../thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:102
 msgid "Removable Drives and Media"
 msgstr "Media dhe Pajisje të Heqshme"
 
+#: ../thunar-volman-settings/tvm-command-entry.c:240
+msgid "Select an Application"
+msgstr "Përzgjidhni një Zbatim"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:250
+msgid "All Files"
+msgstr "Tërë Kartelat"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:255
+msgid "Executable Files"
+msgstr "Kartela të Ekzekutueshmish"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:270
+msgid "Perl Scripts"
+msgstr "Programthe Perl"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:276
+msgid "Python Scripts"
+msgstr "Programthe Python"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:282
+msgid "Ruby Scripts"
+msgstr "Programthe Ruby"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:288
+msgid "Shell Scripts"
+msgstr "Programthe Shell"
+
 #.
 #. Storage
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:143
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:130
 msgid "Storage"
 msgstr "Depozitim"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:153
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:141
 msgid "Removable Storage"
 msgstr "Depozitim i Heqshëm"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:170
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:158
 msgid "_Mount removable drives when hot-plugged"
 msgstr "_Monto pajisje të heqshme kur futen pa rinisur kompjuterin"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:175
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:166
 msgid "Mount removable media when _inserted"
 msgstr "Monto media të heqshme kur _futet"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:180
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:174
 msgid "B_rowse removable media when inserted"
 msgstr "Sh_fleto media të heqshme kur futet"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:185
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:182
 msgid "_Auto-run programs on new drives and media"
 msgstr "_Vetëxhiro programe prej pajisjesh apo mediash të reja"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:190
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:189
 msgid "Auto-open files on new drives and media"
 msgstr "_Vetëhap kartela prej pajisjesh apo mediash të reja"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:199
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:201
 msgid "Blank CDs and DVDs"
 msgstr "Zbardhje CD-sh dhe DVD-sh"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:216
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:218
 msgid "_Burn a CD or DVD when a blank disc is inserted"
 msgstr "_Piq një CD ose një DVD kur futet një disk bosh"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:224
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:229
 msgid "Command for _Data CDs:"
 msgstr "Urdhër për CD me të _dhëna:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:231
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:239
 msgid "Command for A_udio CDs:"
 msgstr "Urdhër për CD _AUDIO:"
 
 #.
 #. Multimedia
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:245
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:255
 msgid "Multimedia"
 msgstr "Multimedia"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:255
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:266
 msgid "Audio CDs"
 msgstr "CD Audio"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:272
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:283
 msgid "Play _audio CDs when inserted"
 msgstr "Luaj CD _audio kur futet"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:277
-#: ../thunar-volman/tvm-preferences-dialog.c:383
-#: ../thunar-volman/tvm-preferences-dialog.c:425
-#: ../thunar-volman/tvm-preferences-dialog.c:499
-#: ../thunar-volman/tvm-preferences-dialog.c:541
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:290
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:415
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:466
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:553
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:601
 msgid "_Command:"
 msgstr "_Urdhër:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:287
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:304
 msgid "Video CDs/DVDs"
 msgstr "CD/DVD Video"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:304
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:321
 msgid "Play _video CDs and DVDs when inserted"
 msgstr "Luaj CD dhe DVD _video kur futet"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:309
-#: ../thunar-volman/tvm-preferences-dialog.c:341
-#: ../thunar-volman/tvm-preferences-dialog.c:457
-#: ../thunar-volman/tvm-preferences-dialog.c:573
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:329
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:367
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:505
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:640
 msgid "C_ommand:"
 msgstr "Ur_dhër:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:319
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:343
 msgid "Portable Music Players"
 msgstr "Luajtësa të Mbartshëm Muzike"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:336
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:360
 msgid "Play _music files when connected"
 msgstr "Luaj kartela _muzike kur lidhet"
 
 #.
 #. Cameras
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:351
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:379
 msgid "Cameras"
 msgstr "Aparate Fotografikë"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:361
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:390
 msgid "Digital Cameras"
 msgstr "Kamera Shifrore"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:378
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:407
 msgid "Import digital photographs when connected"
 msgstr "Importo foto shifrore kur lidhet"
 
 #.
 #. PDAs
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:393
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:427
 msgid "PDAs"
 msgstr "PDA-ra"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:403
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:441
 msgid "Palm™"
 msgstr "Palm™"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:420
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:458
 msgid "Sync _Palm™ devices when connected"
 msgstr "Njëkohëso pajisje _Palm™ kur lidhen të tilla"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:435
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:480
 msgid "Pocket PCs"
 msgstr "Pocket PC"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:452
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:497
 msgid "Sync Pocket P_C devices when connected"
 msgstr "Njëkohëso pajisje Pocket P_C kur lidhen të tilla "
 
 #.
 #. Printers
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:467
-#: ../thunar-volman/tvm-preferences-dialog.c:477
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:517
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:528
 msgid "Printers"
 msgstr "Shtypësa"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:494
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:545
 msgid "Automatically run a program when a _printer is connected"
 msgstr "Xhiro vetvetiu një program kur lidhet një _shtypës"
 
 #.
 #. Input Devices
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:509
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:565
 msgid "Input Devices"
 msgstr "Pajisje Futjeje "
 
-#: ../thunar-volman/tvm-preferences-dialog.c:519
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:576
 msgid "Keyboards"
 msgstr "Tastiera"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:536
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:593
 msgid "Automatically run a program when an USB _keyboard is connected"
 msgstr "Xhiro vetvetiu një program kur lidhet një _tastierë USB"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:551
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:615
 msgid "Mice"
 msgstr "Minj"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:568
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:632
 msgid "Automatically run a program when an USB _mouse is connected"
 msgstr "Xhiro vetvetiu një program kur lidhet një _mi USB"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:583
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:654
 msgid "Tablet"
 msgstr "Tablet"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:600
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:671
 msgid "Automatically run a program when a _tablet is connected"
 msgstr "Xhiro vetvetiu një program kur lidhet një _tablet"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:605
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:679
 msgid "Com_mand:"
 msgstr "U_rdhër:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:690
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:755
 msgid "Failed to open the documentation browser"
 msgstr "Dështoi në hapjen e shfletuesit të dokumentacionit"
 
-#: ../thunar-volman/tvm-run.c:133
-#: ../thunar-volman/tvm-run.c:144
-msgid "Choose Disc Type"
-msgstr "Zgjidhni Tip Disku"
+#~ msgid "Failed to open display"
+#~ msgstr "Dështoi në hapje ekrani"
 
-#: ../thunar-volman/tvm-run.c:134
-#: ../thunar-volman/tvm-run.c:145
-msgid "You have inserted a blank disc."
-msgstr "Keni futur një disk bosh."
+#~ msgid "The Thunar development team. All rights reserved."
+#~ msgstr "Ekipi zhvillues i Thunar-it. Tërë të drejtat të rezervuara."
 
-#: ../thunar-volman/tvm-run.c:135
-#: ../thunar-volman/tvm-run.c:146
-msgid "What would you like to do?"
-msgstr "Çfarë do të donit të bëni?"
+#~ msgid "Written by Benedikt Meurer <benny at xfce.org>."
+#~ msgstr "Shkruar nga Benedikt Meurer <benny at xfce.org>."
 
-#: ../thunar-volman/tvm-run.c:137
-msgid "Make _DVD"
-msgstr "Krijo _DVD"
+#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
+#~ msgstr "UDI \"%s\" e dhënë nuk është pajisje e vlefshme HAL UDI"
 
-#: ../thunar-volman/tvm-run.c:148
-msgid "Make _Data CD"
-msgstr "Krijo CD të _Dhënash"
+#~ msgid "Encrypted volume"
+#~ msgstr "Vëllim i koduar"
 
-#: ../thunar-volman/tvm-run.c:149
-msgid "Make _Audio CD"
-msgstr "Krijo CD _Audio"
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Po montohet vëllim i koduar...</"
+#~ "span>"
+
+#~ msgid "Setting up the crypto layer..."
+#~ msgstr "Po rregullon shtresën e kodimit..."
+
+#~ msgid "You are not privileged to setup the crypto layer"
+#~ msgstr "Nuk keni privilegje për të rregulluar shtresën e kodimit"
+
+#~ msgid "Wrong password"
+#~ msgstr "Fjalëkalim i gabuar"
+
+#~ msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
+#~ msgstr "<span weight=\"bold\" size=\"larger\">Fjalëkalim i gabuar.</span>"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Ky vëllim është i koduar.</span>"
+
+#~ msgid "Please enter your password to decrypt and mount the volume."
+#~ msgstr ""
+#~ "Ju lutem jepni fjalëkalimin tuaj për çkodimin dhe montimin e vëllimit."
+
+#~ msgid "_Mount"
+#~ msgstr "_Montoje"
+
+#~ msgid "Failed to setup the encrypted volume"
+#~ msgstr "Dështoi në rregullimin e vëllimit të koduar"
+
+#~ msgid "Choose Disc Type"
+#~ msgstr "Zgjidhni Tip Disku"
 
-#: ../thunar-volman-settings.desktop.in.in.h:3
-msgid "Removable Media"
-msgstr "Media të Heqshme"
+#~ msgid "Make _DVD"
+#~ msgstr "Krijo _DVD"
 
+#~ msgid "Removable Media"
+#~ msgstr "Media të Heqshme"
diff --git a/po/sv.po b/po/sv.po
index 6df56e5..5e7efd9 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,458 +7,617 @@ msgid ""
 msgstr ""
 "Project-Id-Version: thunar-volman\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-30 02:26-0700\n"
+"POT-Creation-Date: 2010-07-25 20:06+0200\n"
 "PO-Revision-Date: 2009-12-16 18:21+0100\n"
 "Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../thunar-volman/main.c:50
-msgid "The HAL device UDI of the newly added device"
+#: ../thunar-volman/main.c:59
+#, fuzzy
+msgid "The syfs path of the newly added device"
 msgstr "HAL-enhets UDI för nyligen tillagd enhet"
 
-#: ../thunar-volman/main.c:51
-#: ../thunar-volman/tvm-preferences-dialog.c:120
-#: ../thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman/main.c:60
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:104
 msgid "Configure management of removable drives and media"
 msgstr "Konfigurera hanteringen av flyttbara enheter och media"
 
-#: ../thunar-volman/main.c:52
+#: ../thunar-volman/main.c:61
 msgid "Print version information and exit"
 msgstr "Skriv ut versionsinformation och avsluta"
 
 #. setup application name
-#: ../thunar-volman/main.c:69
+#: ../thunar-volman/main.c:93
 msgid "Thunar Volume Manager"
 msgstr "Volymhanterare för Thunar"
 
-#: ../thunar-volman/main.c:90
-msgid "Failed to open display"
-msgstr "Misslyckades med att öppna display"
-
-#: ../thunar-volman/main.c:106
-msgid "The Thunar development team. All rights reserved."
-msgstr "The Thunar development team. Alla rättigheter är reserverade."
-
-#: ../thunar-volman/main.c:107
-msgid "Written by Benedikt Meurer <benny at xfce.org>."
-msgstr "Skrivet av Benedikt Meurer <benny at xfce.org>."
+#: ../thunar-volman/main.c:133
+msgid "All rights reserved."
+msgstr ""
 
-#: ../thunar-volman/main.c:108
+#: ../thunar-volman/main.c:134
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Rapportera fel till <%s>."
 
-#. TRANSLATORS: A HAL device UDI must match certain conditions to be valid (to be exact, it must be a valid D-Bus object path)
-#: ../thunar-volman/main.c:133
+#: ../thunar-volman/main.c:188
 #, c-format
-msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
-msgstr "Angivet UDI \"%s\" är inte en giltig HAL-enhets UDI"
+msgid "There is no device with the sysfs path \"%s\""
+msgstr ""
 
-#. TRANSLATORS: thunar-volman wasn't invoked with either --device-added or --configure.
-#: ../thunar-volman/main.c:144
-#, c-format
-msgid "Must specify the new HAL device UDI with --device-added"
+#: ../thunar-volman/main.c:200
+#, fuzzy, c-format
+msgid "Must specify the sysfs path of new devices with --device-added"
 msgstr "Måste ange ny HAL-enhet UDI med --device-added"
 
 #. ...so we need to prompt what to do
-#: ../thunar-volman/tvm-block-device.c:189
+#: ../thunar-volman/tvm-block-device.c:204
 msgid "Photos and Music"
 msgstr "Foton och musik"
 
-#: ../thunar-volman/tvm-block-device.c:190
-msgid "Photos were found on your portable music player."
+#: ../thunar-volman/tvm-block-device.c:205
+#, fuzzy
+msgid "Photos were found on your portable music player"
 msgstr "Foton hittades på din bärbara musikspelare."
 
-#: ../thunar-volman/tvm-block-device.c:191
+#: ../thunar-volman/tvm-block-device.c:206
 msgid "Would you like to import the photos or manage the music?"
 msgstr "Vill du importera dessa foton eller hantera musiken?"
 
-#: ../thunar-volman/tvm-block-device.c:192
-#: ../thunar-volman/tvm-block-device.c:258
-#: ../thunar-volman/tvm-block-device.c:335
-#: ../thunar-volman/tvm-block-device.c:371
-#: ../thunar-volman/tvm-block-device.c:430
-#: ../thunar-volman/tvm-block-device.c:703
-#: ../thunar-volman/tvm-crypto-volume.c:448
-#: ../thunar-volman/tvm-run.c:136
-#: ../thunar-volman/tvm-run.c:147
+#: ../thunar-volman/tvm-block-device.c:208
+#: ../thunar-volman/tvm-block-device.c:277
+#: ../thunar-volman/tvm-block-device.c:378
+#: ../thunar-volman/tvm-block-device.c:425
+#: ../thunar-volman/tvm-block-device.c:507
+#: ../thunar-volman/tvm-block-device.c:826 ../thunar-volman/tvm-run.c:196
+#: ../thunar-volman/tvm-run.c:207
 msgid "Ig_nore"
 msgstr "Ig_norera"
 
-#: ../thunar-volman/tvm-block-device.c:193
-#: ../thunar-volman/tvm-block-device.c:259
+#: ../thunar-volman/tvm-block-device.c:209
+#: ../thunar-volman/tvm-block-device.c:278
 msgid "Import _Photos"
 msgstr "Importera _foton"
 
-#: ../thunar-volman/tvm-block-device.c:194
+#: ../thunar-volman/tvm-block-device.c:210
 msgid "Manage _Music"
 msgstr "Hantera _musik"
 
-#. ask the user whether to import photos
-#: ../thunar-volman/tvm-block-device.c:255
+#. ask the user to import photos
+#: ../thunar-volman/tvm-block-device.c:273
 msgid "Photo Import"
 msgstr "Fotoimport"
 
-#: ../thunar-volman/tvm-block-device.c:256
-msgid "A photo card has been detected."
+#: ../thunar-volman/tvm-block-device.c:274
+#, fuzzy
+msgid "A photo card has been detected"
 msgstr "Ett fotokort har upptäckts."
 
-#: ../thunar-volman/tvm-block-device.c:257
-msgid "There are photos on the card. Would you like to add these photos to your album?"
-msgstr "Det finns foton på kortet. Vill du lägga till dessa foton till ditt fotoalbum?"
+#: ../thunar-volman/tvm-block-device.c:275
+msgid ""
+"There are photos on the card. Would you like to add these photos to your "
+"album?"
+msgstr ""
+"Det finns foton på kortet. Vill du lägga till dessa foton till ditt "
+"fotoalbum?"
 
-#. prompt the user whether to execute this file
-#: ../thunar-volman/tvm-block-device.c:332
-#: ../thunar-volman/tvm-block-device.c:368
+#. prompt the user to execute the file
+#. prompt the user to execute this file
+#: ../thunar-volman/tvm-block-device.c:373
+#: ../thunar-volman/tvm-block-device.c:420
 #, c-format
 msgid "Would you like to allow \"%s\" to run?"
 msgstr "Tillåter du att \"%s\" körs?"
 
-#: ../thunar-volman/tvm-block-device.c:333
-#: ../thunar-volman/tvm-block-device.c:369
+#: ../thunar-volman/tvm-block-device.c:376
+#: ../thunar-volman/tvm-block-device.c:423
 msgid "Auto-Run Confirmation"
 msgstr "Bekräftelse för automatisk körning"
 
-#: ../thunar-volman/tvm-block-device.c:334
-#: ../thunar-volman/tvm-block-device.c:370
+#: ../thunar-volman/tvm-block-device.c:377
+#: ../thunar-volman/tvm-block-device.c:424
 msgid "Auto-Run capability detected"
 msgstr "Förmåga för automatisk körning hittades"
 
-#: ../thunar-volman/tvm-block-device.c:336
-#: ../thunar-volman/tvm-block-device.c:372
+#: ../thunar-volman/tvm-block-device.c:379
+#: ../thunar-volman/tvm-block-device.c:426
 msgid "_Allow Auto-Run"
 msgstr "_Tillåt automatisk körning"
 
 #. prompt the user whether to autoopen this file
-#: ../thunar-volman/tvm-block-device.c:427
+#: ../thunar-volman/tvm-block-device.c:502
 #, c-format
 msgid "Would you like to open \"%s\"?"
 msgstr "Vill du öppna \"%s\"?"
 
-#: ../thunar-volman/tvm-block-device.c:428
+#: ../thunar-volman/tvm-block-device.c:505
 msgid "Auto-Open Confirmation"
 msgstr "Bekräftelse för automatiskt öppnande"
 
-#: ../thunar-volman/tvm-block-device.c:429
+#: ../thunar-volman/tvm-block-device.c:506
 msgid "Auto-Open capability detected"
 msgstr "Förmåga för automatiskt öppnande hittades"
 
-#: ../thunar-volman/tvm-block-device.c:431
+#: ../thunar-volman/tvm-block-device.c:508
 msgid "_Open"
 msgstr "_Öppna"
 
-#. ask what do with the mixed audio/data disc
-#: ../thunar-volman/tvm-block-device.c:700
-msgid "Audio / Data CD"
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "CD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "DVD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:618
+msgid "The CD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:619
+msgid "The DVD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:629
+msgid "Volume mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:632
+#, c-format
+msgid "The volume \"%s\" was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:637
+#, c-format
+msgid "The inserted volume was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:691
+#, c-format
+msgid "Unable to locate mount point"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:737
+#, c-format
+msgid "Unable to mount the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:746
+#, c-format
+msgid "Could not detect the volume corresponding to the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:821
+#, fuzzy
+msgid "Audio/Data CD"
 msgstr "Ljud-/data-cd"
 
-#: ../thunar-volman/tvm-block-device.c:701
-msgid "The CD in the drive contains both music and files."
+#: ../thunar-volman/tvm-block-device.c:822
+#, fuzzy
+msgid "The CD in the drive contains both music and files"
 msgstr "Cd-skivan i enheten innehåller både musik och filer."
 
-#: ../thunar-volman/tvm-block-device.c:702
+#: ../thunar-volman/tvm-block-device.c:824
 msgid "Would you like to listen to music or browse the files?"
 msgstr "Vill du lyssna på musik eller bläddra bland filerna?"
 
-#: ../thunar-volman/tvm-block-device.c:704
+#: ../thunar-volman/tvm-block-device.c:827
 msgid "_Browse Files"
 msgstr "_Bläddra efter filer"
 
-#: ../thunar-volman/tvm-block-device.c:705
+#: ../thunar-volman/tvm-block-device.c:828
 msgid "_Play CD"
 msgstr "Spela _upp cd-skiva"
 
-#: ../thunar-volman/tvm-command-entry.c:233
-msgid "Select an Application"
-msgstr "Välj ett program"
+#: ../thunar-volman/tvm-block-device.c:916
+#, c-format
+msgid "Unknown block device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:243
-msgid "All Files"
-msgstr "Alla filer"
+#: ../thunar-volman/tvm-device.c:139
+#, c-format
+msgid "Device type not supported"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:248
-msgid "Executable Files"
-msgstr "Körbara filer"
+#: ../thunar-volman/tvm-input-device.c:74
+#, fuzzy
+msgid "input-keyboard"
+msgstr "Tangentbord"
 
-#: ../thunar-volman/tvm-command-entry.c:263
-msgid "Perl Scripts"
-msgstr "Perl-skript"
+#: ../thunar-volman/tvm-input-device.c:75
+#, fuzzy
+msgid "Keyboard detected"
+msgstr "Tangentbord"
 
-#: ../thunar-volman/tvm-command-entry.c:269
-msgid "Python Scripts"
-msgstr "Python-skript"
+#: ../thunar-volman/tvm-input-device.c:76
+#, fuzzy
+msgid "A keyboard was detected"
+msgstr "Ett fotokort har upptäckts."
 
-#: ../thunar-volman/tvm-command-entry.c:275
-msgid "Ruby Scripts"
-msgstr "Ruby-skript"
+#: ../thunar-volman/tvm-input-device.c:86
+#: ../thunar-volman/tvm-input-device.c:100
+msgid "input-tablet"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:281
-msgid "Shell Scripts"
-msgstr "Skalskript"
+#: ../thunar-volman/tvm-input-device.c:87
+#: ../thunar-volman/tvm-input-device.c:101
+#, fuzzy
+msgid "Tablet detected"
+msgstr "Förmåga för automatisk körning hittades"
+
+#: ../thunar-volman/tvm-input-device.c:88
+#: ../thunar-volman/tvm-input-device.c:102
+msgid "A graphics tablet was detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:286
-#: ../thunar-volman/tvm-crypto-volume.c:443
-msgid "Encrypted volume"
-msgstr "Krypterad volym"
+#: ../thunar-volman/tvm-input-device.c:110
+msgid "input-mouse"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:297
-msgid "<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Monterar krypterad volym...</span>"
+#: ../thunar-volman/tvm-input-device.c:111
+msgid "Mouse detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:302
-msgid "Setting up the crypto layer..."
-msgstr "Konfigurerar krypteringslagret..."
+#: ../thunar-volman/tvm-input-device.c:112
+msgid "A mouse was detected"
+msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) but got Permission denied.
-#: ../thunar-volman/tvm-crypto-volume.c:369
+#: ../thunar-volman/tvm-input-device.c:139
 #, c-format
-msgid "You are not privileged to setup the crypto layer"
-msgstr "Du är inte behörig att konfigurera krypteringslagret"
+msgid "Unsupported input device type"
+msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) and typed the wrong password.
-#: ../thunar-volman/tvm-crypto-volume.c:374
+#: ../thunar-volman/tvm-run.c:173
 #, c-format
-msgid "Wrong password"
-msgstr "Felaktigt lösenord"
+msgid "Autoburning of blank CDs and DVDs is disabled"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:445
-msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Felaktigt lösenord.</span>"
+#: ../thunar-volman/tvm-run.c:193
+msgid "Blank DVD inserted"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:446
-msgid "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Denna volym är krypterad.</span>"
+#: ../thunar-volman/tvm-run.c:194
+#, fuzzy
+msgid "You have inserted a blank DVD."
+msgstr "Du har matat in en tom skiva."
 
-#: ../thunar-volman/tvm-crypto-volume.c:447
-msgid "Please enter your password to decrypt and mount the volume."
-msgstr "Ange ditt lösenord för att dekryptera och montera volymen."
+#: ../thunar-volman/tvm-run.c:195 ../thunar-volman/tvm-run.c:206
+msgid "What would you like to do?"
+msgstr "Vad vill du göra?"
 
-#: ../thunar-volman/tvm-crypto-volume.c:449
-msgid "_Mount"
-msgstr "_Montera"
+#: ../thunar-volman/tvm-run.c:197
+msgid "Burn _DVD"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:468
-msgid "Failed to setup the encrypted volume"
-msgstr "Misslyckades med att konfigurera den krypterade volymen"
+#: ../thunar-volman/tvm-run.c:204
+#, fuzzy
+msgid "Blank CD inserted"
+msgstr "Tomma cd- och dvd-skivor"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:119
-#: ../thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman/tvm-run.c:205
+#, fuzzy
+msgid "You have inserted a blank CD."
+msgstr "Du har matat in en tom skiva."
+
+#: ../thunar-volman/tvm-run.c:208
+#, fuzzy
+msgid "Burn _Data CD"
+msgstr "Skapa _data-cd"
+
+#: ../thunar-volman/tvm-run.c:209
+#, fuzzy
+msgid "Burn _Audio CD"
+msgstr "Skapa _ljud-cd"
+
+#: ../thunar-volman/tvm-run.c:233
+#, c-format
+msgid "The burn command may not be empty"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:272
+#, c-format
+msgid "The CD player command is undefined"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:66
+msgid "Camera detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:67
+#, fuzzy
+msgid "A photo camera was detected"
+msgstr "Ett fotokort har upptäckts."
+
+#: ../thunar-volman/tvm-usb-device.c:77
+msgid "Printer detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:78
+msgid "A USB printer was detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:104
+#, c-format
+msgid "Unsupported USB device type"
+msgstr ""
+
+#. setup application name
+#: ../thunar-volman-settings/main.c:52
+#, fuzzy
+msgid "Thunar Volume Manager Settings"
+msgstr "Volymhanterare för Thunar"
+
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:102
 msgid "Removable Drives and Media"
 msgstr "Flyttbara enheter och media"
 
+#: ../thunar-volman-settings/tvm-command-entry.c:240
+msgid "Select an Application"
+msgstr "Välj ett program"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:250
+msgid "All Files"
+msgstr "Alla filer"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:255
+msgid "Executable Files"
+msgstr "Körbara filer"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:270
+msgid "Perl Scripts"
+msgstr "Perl-skript"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:276
+msgid "Python Scripts"
+msgstr "Python-skript"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:282
+msgid "Ruby Scripts"
+msgstr "Ruby-skript"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:288
+msgid "Shell Scripts"
+msgstr "Skalskript"
+
 #.
 #. Storage
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:143
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:130
 msgid "Storage"
 msgstr "Lagring"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:153
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:141
 msgid "Removable Storage"
 msgstr "Flyttbar lagring"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:170
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:158
 msgid "_Mount removable drives when hot-plugged"
 msgstr "_Montera flyttbara enheter när de ansluts"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:175
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:166
 msgid "Mount removable media when _inserted"
 msgstr "Montera flyttbara media när _anslutna"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:180
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:174
 msgid "B_rowse removable media when inserted"
 msgstr "B_läddra i flyttbara media när anslutna"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:185
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:182
 msgid "_Auto-run programs on new drives and media"
 msgstr "Kör _automatiskt program på nya enheter och media"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:190
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:189
 msgid "Auto-open files on new drives and media"
 msgstr "Öppna automatiskt filer på nya enheter och media"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:199
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:201
 msgid "Blank CDs and DVDs"
 msgstr "Tomma cd- och dvd-skivor"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:216
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:218
 msgid "_Burn a CD or DVD when a blank disc is inserted"
 msgstr "_Bränn en cd eller dvd när en tom skiva matas in"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:224
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:229
 msgid "Command for _Data CDs:"
 msgstr "Kommando för _data-cd:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:231
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:239
 msgid "Command for A_udio CDs:"
 msgstr "Kommando för l_jud-cd:"
 
 #.
 #. Multimedia
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:245
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:255
 msgid "Multimedia"
 msgstr "Multimedia"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:255
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:266
 msgid "Audio CDs"
 msgstr "Ljud-cd"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:272
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:283
 msgid "Play _audio CDs when inserted"
 msgstr "Spela upp _ljud-cd när inmatad"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:277
-#: ../thunar-volman/tvm-preferences-dialog.c:383
-#: ../thunar-volman/tvm-preferences-dialog.c:425
-#: ../thunar-volman/tvm-preferences-dialog.c:499
-#: ../thunar-volman/tvm-preferences-dialog.c:541
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:290
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:415
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:466
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:553
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:601
 msgid "_Command:"
 msgstr "_Kommando:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:287
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:304
 msgid "Video CDs/DVDs"
 msgstr "Video-cd/dvd"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:304
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:321
 msgid "Play _video CDs and DVDs when inserted"
 msgstr "Spela upp _video-cd och dvd när inmatade"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:309
-#: ../thunar-volman/tvm-preferences-dialog.c:341
-#: ../thunar-volman/tvm-preferences-dialog.c:457
-#: ../thunar-volman/tvm-preferences-dialog.c:573
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:329
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:367
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:505
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:640
 msgid "C_ommand:"
 msgstr "K_ommando:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:319
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:343
 msgid "Portable Music Players"
 msgstr "Bärbara musikspelare"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:336
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:360
 msgid "Play _music files when connected"
 msgstr "Spela upp _musikfiler när ansluten"
 
 #.
 #. Cameras
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:351
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:379
 msgid "Cameras"
 msgstr "Kameror"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:361
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:390
 msgid "Digital Cameras"
 msgstr "Digitalkameror"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:378
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:407
 msgid "Import digital photographs when connected"
 msgstr "Importera digitalfoton när ansluten"
 
 #.
 #. PDAs
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:393
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:427
 msgid "PDAs"
 msgstr "Handdatorer"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:403
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:441
 msgid "Palm™"
 msgstr "Palm™"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:420
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:458
 msgid "Sync _Palm™ devices when connected"
 msgstr "Synkronisera _Palm™-enheter när anslutna"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:435
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:480
 msgid "Pocket PCs"
 msgstr "Pocket PC-datorer"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:452
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:497
 msgid "Sync Pocket P_C devices when connected"
 msgstr "Synkronisera Pocket P_C-enheter när anslutna"
 
 #.
 #. Printers
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:467
-#: ../thunar-volman/tvm-preferences-dialog.c:477
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:517
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:528
 msgid "Printers"
 msgstr "Skrivare"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:494
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:545
 msgid "Automatically run a program when a _printer is connected"
 msgstr "Kör automatiskt ett program när en _skrivare ansluts"
 
 #.
 #. Input Devices
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:509
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:565
 msgid "Input Devices"
 msgstr "Inmatningsenheter"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:519
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:576
 msgid "Keyboards"
 msgstr "Tangentbord"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:536
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:593
 msgid "Automatically run a program when an USB _keyboard is connected"
 msgstr "Kör automatiskt ett program när ett USB-_tangentbord ansluts"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:551
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:615
 msgid "Mice"
 msgstr "Möss"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:568
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:632
 msgid "Automatically run a program when an USB _mouse is connected"
 msgstr "Kör automatiskt ett program när en USB-_mus ansluts"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:583
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:654
 msgid "Tablet"
 msgstr "Ritbord"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:600
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:671
 msgid "Automatically run a program when a _tablet is connected"
 msgstr "Kör automatiskt ett program när ett _ritbord ansluts"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:605
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:679
 msgid "Com_mand:"
 msgstr "Kom_mando:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:690
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:755
 msgid "Failed to open the documentation browser"
 msgstr "Misslyckades med att öppna dokumentationsvisaren"
 
-#: ../thunar-volman/tvm-run.c:133
-#: ../thunar-volman/tvm-run.c:144
-msgid "Choose Disc Type"
-msgstr "Välj skivtyp"
+#~ msgid "Failed to open display"
+#~ msgstr "Misslyckades med att öppna display"
 
-#: ../thunar-volman/tvm-run.c:134
-#: ../thunar-volman/tvm-run.c:145
-msgid "You have inserted a blank disc."
-msgstr "Du har matat in en tom skiva."
+#~ msgid "The Thunar development team. All rights reserved."
+#~ msgstr "The Thunar development team. Alla rättigheter är reserverade."
 
-#: ../thunar-volman/tvm-run.c:135
-#: ../thunar-volman/tvm-run.c:146
-msgid "What would you like to do?"
-msgstr "Vad vill du göra?"
+#~ msgid "Written by Benedikt Meurer <benny at xfce.org>."
+#~ msgstr "Skrivet av Benedikt Meurer <benny at xfce.org>."
 
-#: ../thunar-volman/tvm-run.c:137
-msgid "Make _DVD"
-msgstr "Skapa _dvd"
+#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
+#~ msgstr "Angivet UDI \"%s\" är inte en giltig HAL-enhets UDI"
 
-#: ../thunar-volman/tvm-run.c:148
-msgid "Make _Data CD"
-msgstr "Skapa _data-cd"
+#~ msgid "Encrypted volume"
+#~ msgstr "Krypterad volym"
 
-#: ../thunar-volman/tvm-run.c:149
-msgid "Make _Audio CD"
-msgstr "Skapa _ljud-cd"
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Monterar krypterad volym...</span>"
+
+#~ msgid "Setting up the crypto layer..."
+#~ msgstr "Konfigurerar krypteringslagret..."
+
+#~ msgid "You are not privileged to setup the crypto layer"
+#~ msgstr "Du är inte behörig att konfigurera krypteringslagret"
+
+#~ msgid "Wrong password"
+#~ msgstr "Felaktigt lösenord"
+
+#~ msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
+#~ msgstr "<span weight=\"bold\" size=\"larger\">Felaktigt lösenord.</span>"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Denna volym är krypterad.</span>"
+
+#~ msgid "Please enter your password to decrypt and mount the volume."
+#~ msgstr "Ange ditt lösenord för att dekryptera och montera volymen."
+
+#~ msgid "_Mount"
+#~ msgstr "_Montera"
+
+#~ msgid "Failed to setup the encrypted volume"
+#~ msgstr "Misslyckades med att konfigurera den krypterade volymen"
+
+#~ msgid "Choose Disc Type"
+#~ msgstr "Välj skivtyp"
 
-#: ../thunar-volman-settings.desktop.in.in.h:3
-msgid "Removable Media"
-msgstr "Flyttbart media"
+#~ msgid "Make _DVD"
+#~ msgstr "Skapa _dvd"
 
+#~ msgid "Removable Media"
+#~ msgstr "Flyttbart media"
diff --git a/po/thunar-volman.pot b/po/thunar-volman.pot
index 0498ad0..4663afb 100644
--- a/po/thunar-volman.pot
+++ b/po/thunar-volman.pot
@@ -8,455 +8,544 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-30 02:26-0700\n"
+"POT-Creation-Date: 2010-07-25 20:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../thunar-volman/main.c:50
-msgid "The HAL device UDI of the newly added device"
+#: ../thunar-volman/main.c:59
+msgid "The syfs path of the newly added device"
 msgstr ""
 
-#: ../thunar-volman/main.c:51 ../thunar-volman/tvm-preferences-dialog.c:120
-#: ../thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman/main.c:60
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:104
 msgid "Configure management of removable drives and media"
 msgstr ""
 
-#: ../thunar-volman/main.c:52
+#: ../thunar-volman/main.c:61
 msgid "Print version information and exit"
 msgstr ""
 
 #. setup application name
-#: ../thunar-volman/main.c:69
+#: ../thunar-volman/main.c:93
 msgid "Thunar Volume Manager"
 msgstr ""
 
-#: ../thunar-volman/main.c:90
-msgid "Failed to open display"
-msgstr ""
-
-#: ../thunar-volman/main.c:106
-msgid "The Thunar development team. All rights reserved."
-msgstr ""
-
-#: ../thunar-volman/main.c:107
-msgid "Written by Benedikt Meurer <benny at xfce.org>."
+#: ../thunar-volman/main.c:133
+msgid "All rights reserved."
 msgstr ""
 
-#: ../thunar-volman/main.c:108
+#: ../thunar-volman/main.c:134
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr ""
 
-#. TRANSLATORS: A HAL device UDI must match certain conditions to be valid (to be exact, it must be a valid D-Bus object path)
-#: ../thunar-volman/main.c:133
+#: ../thunar-volman/main.c:188
 #, c-format
-msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
+msgid "There is no device with the sysfs path \"%s\""
 msgstr ""
 
-#. TRANSLATORS: thunar-volman wasn't invoked with either --device-added or --configure.
-#: ../thunar-volman/main.c:144
+#: ../thunar-volman/main.c:200
 #, c-format
-msgid "Must specify the new HAL device UDI with --device-added"
+msgid "Must specify the sysfs path of new devices with --device-added"
 msgstr ""
 
 #. ...so we need to prompt what to do
-#: ../thunar-volman/tvm-block-device.c:189
+#: ../thunar-volman/tvm-block-device.c:204
 msgid "Photos and Music"
 msgstr ""
 
-#: ../thunar-volman/tvm-block-device.c:190
-msgid "Photos were found on your portable music player."
+#: ../thunar-volman/tvm-block-device.c:205
+msgid "Photos were found on your portable music player"
 msgstr ""
 
-#: ../thunar-volman/tvm-block-device.c:191
+#: ../thunar-volman/tvm-block-device.c:206
 msgid "Would you like to import the photos or manage the music?"
 msgstr ""
 
-#: ../thunar-volman/tvm-block-device.c:192
-#: ../thunar-volman/tvm-block-device.c:258
-#: ../thunar-volman/tvm-block-device.c:335
-#: ../thunar-volman/tvm-block-device.c:371
-#: ../thunar-volman/tvm-block-device.c:430
-#: ../thunar-volman/tvm-block-device.c:703
-#: ../thunar-volman/tvm-crypto-volume.c:448 ../thunar-volman/tvm-run.c:136
-#: ../thunar-volman/tvm-run.c:147
+#: ../thunar-volman/tvm-block-device.c:208
+#: ../thunar-volman/tvm-block-device.c:277
+#: ../thunar-volman/tvm-block-device.c:378
+#: ../thunar-volman/tvm-block-device.c:425
+#: ../thunar-volman/tvm-block-device.c:507
+#: ../thunar-volman/tvm-block-device.c:826 ../thunar-volman/tvm-run.c:196
+#: ../thunar-volman/tvm-run.c:207
 msgid "Ig_nore"
 msgstr ""
 
-#: ../thunar-volman/tvm-block-device.c:193
-#: ../thunar-volman/tvm-block-device.c:259
+#: ../thunar-volman/tvm-block-device.c:209
+#: ../thunar-volman/tvm-block-device.c:278
 msgid "Import _Photos"
 msgstr ""
 
-#: ../thunar-volman/tvm-block-device.c:194
+#: ../thunar-volman/tvm-block-device.c:210
 msgid "Manage _Music"
 msgstr ""
 
-#. ask the user whether to import photos
-#: ../thunar-volman/tvm-block-device.c:255
+#. ask the user to import photos
+#: ../thunar-volman/tvm-block-device.c:273
 msgid "Photo Import"
 msgstr ""
 
-#: ../thunar-volman/tvm-block-device.c:256
-msgid "A photo card has been detected."
+#: ../thunar-volman/tvm-block-device.c:274
+msgid "A photo card has been detected"
 msgstr ""
 
-#: ../thunar-volman/tvm-block-device.c:257
+#: ../thunar-volman/tvm-block-device.c:275
 msgid ""
 "There are photos on the card. Would you like to add these photos to your "
 "album?"
 msgstr ""
 
-#. prompt the user whether to execute this file
-#: ../thunar-volman/tvm-block-device.c:332
-#: ../thunar-volman/tvm-block-device.c:368
+#. prompt the user to execute the file
+#. prompt the user to execute this file
+#: ../thunar-volman/tvm-block-device.c:373
+#: ../thunar-volman/tvm-block-device.c:420
 #, c-format
 msgid "Would you like to allow \"%s\" to run?"
 msgstr ""
 
-#: ../thunar-volman/tvm-block-device.c:333
-#: ../thunar-volman/tvm-block-device.c:369
+#: ../thunar-volman/tvm-block-device.c:376
+#: ../thunar-volman/tvm-block-device.c:423
 msgid "Auto-Run Confirmation"
 msgstr ""
 
-#: ../thunar-volman/tvm-block-device.c:334
-#: ../thunar-volman/tvm-block-device.c:370
+#: ../thunar-volman/tvm-block-device.c:377
+#: ../thunar-volman/tvm-block-device.c:424
 msgid "Auto-Run capability detected"
 msgstr ""
 
-#: ../thunar-volman/tvm-block-device.c:336
-#: ../thunar-volman/tvm-block-device.c:372
+#: ../thunar-volman/tvm-block-device.c:379
+#: ../thunar-volman/tvm-block-device.c:426
 msgid "_Allow Auto-Run"
 msgstr ""
 
 #. prompt the user whether to autoopen this file
-#: ../thunar-volman/tvm-block-device.c:427
+#: ../thunar-volman/tvm-block-device.c:502
 #, c-format
 msgid "Would you like to open \"%s\"?"
 msgstr ""
 
-#: ../thunar-volman/tvm-block-device.c:428
+#: ../thunar-volman/tvm-block-device.c:505
 msgid "Auto-Open Confirmation"
 msgstr ""
 
-#: ../thunar-volman/tvm-block-device.c:429
+#: ../thunar-volman/tvm-block-device.c:506
 msgid "Auto-Open capability detected"
 msgstr ""
 
-#: ../thunar-volman/tvm-block-device.c:431
+#: ../thunar-volman/tvm-block-device.c:508
 msgid "_Open"
 msgstr ""
 
-#. ask what do with the mixed audio/data disc
-#: ../thunar-volman/tvm-block-device.c:700
-msgid "Audio / Data CD"
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "CD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "DVD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:618
+msgid "The CD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:619
+msgid "The DVD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:629
+msgid "Volume mounted"
 msgstr ""
 
-#: ../thunar-volman/tvm-block-device.c:701
-msgid "The CD in the drive contains both music and files."
+#: ../thunar-volman/tvm-block-device.c:632
+#, c-format
+msgid "The volume \"%s\" was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:637
+#, c-format
+msgid "The inserted volume was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:691
+#, c-format
+msgid "Unable to locate mount point"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:737
+#, c-format
+msgid "Unable to mount the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:746
+#, c-format
+msgid "Could not detect the volume corresponding to the device"
 msgstr ""
 
-#: ../thunar-volman/tvm-block-device.c:702
+#: ../thunar-volman/tvm-block-device.c:821
+msgid "Audio/Data CD"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:822
+msgid "The CD in the drive contains both music and files"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:824
 msgid "Would you like to listen to music or browse the files?"
 msgstr ""
 
-#: ../thunar-volman/tvm-block-device.c:704
+#: ../thunar-volman/tvm-block-device.c:827
 msgid "_Browse Files"
 msgstr ""
 
-#: ../thunar-volman/tvm-block-device.c:705
+#: ../thunar-volman/tvm-block-device.c:828
 msgid "_Play CD"
 msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:233
-msgid "Select an Application"
+#: ../thunar-volman/tvm-block-device.c:916
+#, c-format
+msgid "Unknown block device type"
 msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:243
-msgid "All Files"
+#: ../thunar-volman/tvm-device.c:139
+#, c-format
+msgid "Device type not supported"
 msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:248
-msgid "Executable Files"
+#: ../thunar-volman/tvm-input-device.c:74
+msgid "input-keyboard"
 msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:263
-msgid "Perl Scripts"
+#: ../thunar-volman/tvm-input-device.c:75
+msgid "Keyboard detected"
 msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:269
-msgid "Python Scripts"
+#: ../thunar-volman/tvm-input-device.c:76
+msgid "A keyboard was detected"
 msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:275
-msgid "Ruby Scripts"
+#: ../thunar-volman/tvm-input-device.c:86
+#: ../thunar-volman/tvm-input-device.c:100
+msgid "input-tablet"
 msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:281
-msgid "Shell Scripts"
+#: ../thunar-volman/tvm-input-device.c:87
+#: ../thunar-volman/tvm-input-device.c:101
+msgid "Tablet detected"
 msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:286
-#: ../thunar-volman/tvm-crypto-volume.c:443
-msgid "Encrypted volume"
+#: ../thunar-volman/tvm-input-device.c:88
+#: ../thunar-volman/tvm-input-device.c:102
+msgid "A graphics tablet was detected"
 msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:297
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
+#: ../thunar-volman/tvm-input-device.c:110
+msgid "input-mouse"
+msgstr ""
+
+#: ../thunar-volman/tvm-input-device.c:111
+msgid "Mouse detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-input-device.c:112
+msgid "A mouse was detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-input-device.c:139
+#, c-format
+msgid "Unsupported input device type"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:173
+#, c-format
+msgid "Autoburning of blank CDs and DVDs is disabled"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:193
+msgid "Blank DVD inserted"
 msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:302
-msgid "Setting up the crypto layer..."
+#: ../thunar-volman/tvm-run.c:194
+msgid "You have inserted a blank DVD."
 msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) but got Permission denied.
-#: ../thunar-volman/tvm-crypto-volume.c:369
+#: ../thunar-volman/tvm-run.c:195 ../thunar-volman/tvm-run.c:206
+msgid "What would you like to do?"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:197
+msgid "Burn _DVD"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:204
+msgid "Blank CD inserted"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:205
+msgid "You have inserted a blank CD."
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:208
+msgid "Burn _Data CD"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:209
+msgid "Burn _Audio CD"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:233
 #, c-format
-msgid "You are not privileged to setup the crypto layer"
+msgid "The burn command may not be empty"
 msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) and typed the wrong password.
-#: ../thunar-volman/tvm-crypto-volume.c:374
+#: ../thunar-volman/tvm-run.c:272
 #, c-format
-msgid "Wrong password"
+msgid "The CD player command is undefined"
 msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:445
-msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
+#: ../thunar-volman/tvm-usb-device.c:66
+msgid "Camera detected"
 msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:446
-msgid "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
+#: ../thunar-volman/tvm-usb-device.c:67
+msgid "A photo camera was detected"
 msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:447
-msgid "Please enter your password to decrypt and mount the volume."
+#: ../thunar-volman/tvm-usb-device.c:77
+msgid "Printer detected"
 msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:449
-msgid "_Mount"
+#: ../thunar-volman/tvm-usb-device.c:78
+msgid "A USB printer was detected"
 msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:468
-msgid "Failed to setup the encrypted volume"
+#: ../thunar-volman/tvm-usb-device.c:104
+#, c-format
+msgid "Unsupported USB device type"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:119
-#: ../thunar-volman-settings.desktop.in.in.h:2
+#. setup application name
+#: ../thunar-volman-settings/main.c:52
+msgid "Thunar Volume Manager Settings"
+msgstr ""
+
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:102
 msgid "Removable Drives and Media"
 msgstr ""
 
+#: ../thunar-volman-settings/tvm-command-entry.c:240
+msgid "Select an Application"
+msgstr ""
+
+#: ../thunar-volman-settings/tvm-command-entry.c:250
+msgid "All Files"
+msgstr ""
+
+#: ../thunar-volman-settings/tvm-command-entry.c:255
+msgid "Executable Files"
+msgstr ""
+
+#: ../thunar-volman-settings/tvm-command-entry.c:270
+msgid "Perl Scripts"
+msgstr ""
+
+#: ../thunar-volman-settings/tvm-command-entry.c:276
+msgid "Python Scripts"
+msgstr ""
+
+#: ../thunar-volman-settings/tvm-command-entry.c:282
+msgid "Ruby Scripts"
+msgstr ""
+
+#: ../thunar-volman-settings/tvm-command-entry.c:288
+msgid "Shell Scripts"
+msgstr ""
+
 #.
 #. Storage
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:143
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:130
 msgid "Storage"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:153
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:141
 msgid "Removable Storage"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:170
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:158
 msgid "_Mount removable drives when hot-plugged"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:175
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:166
 msgid "Mount removable media when _inserted"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:180
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:174
 msgid "B_rowse removable media when inserted"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:185
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:182
 msgid "_Auto-run programs on new drives and media"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:190
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:189
 msgid "Auto-open files on new drives and media"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:199
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:201
 msgid "Blank CDs and DVDs"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:216
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:218
 msgid "_Burn a CD or DVD when a blank disc is inserted"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:224
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:229
 msgid "Command for _Data CDs:"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:231
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:239
 msgid "Command for A_udio CDs:"
 msgstr ""
 
 #.
 #. Multimedia
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:245
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:255
 msgid "Multimedia"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:255
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:266
 msgid "Audio CDs"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:272
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:283
 msgid "Play _audio CDs when inserted"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:277
-#: ../thunar-volman/tvm-preferences-dialog.c:383
-#: ../thunar-volman/tvm-preferences-dialog.c:425
-#: ../thunar-volman/tvm-preferences-dialog.c:499
-#: ../thunar-volman/tvm-preferences-dialog.c:541
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:290
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:415
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:466
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:553
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:601
 msgid "_Command:"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:287
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:304
 msgid "Video CDs/DVDs"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:304
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:321
 msgid "Play _video CDs and DVDs when inserted"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:309
-#: ../thunar-volman/tvm-preferences-dialog.c:341
-#: ../thunar-volman/tvm-preferences-dialog.c:457
-#: ../thunar-volman/tvm-preferences-dialog.c:573
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:329
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:367
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:505
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:640
 msgid "C_ommand:"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:319
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:343
 msgid "Portable Music Players"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:336
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:360
 msgid "Play _music files when connected"
 msgstr ""
 
 #.
 #. Cameras
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:351
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:379
 msgid "Cameras"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:361
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:390
 msgid "Digital Cameras"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:378
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:407
 msgid "Import digital photographs when connected"
 msgstr ""
 
 #.
 #. PDAs
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:393
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:427
 msgid "PDAs"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:403
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:441
 msgid "Palm™"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:420
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:458
 msgid "Sync _Palm™ devices when connected"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:435
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:480
 msgid "Pocket PCs"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:452
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:497
 msgid "Sync Pocket P_C devices when connected"
 msgstr ""
 
 #.
 #. Printers
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:467
-#: ../thunar-volman/tvm-preferences-dialog.c:477
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:517
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:528
 msgid "Printers"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:494
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:545
 msgid "Automatically run a program when a _printer is connected"
 msgstr ""
 
 #.
 #. Input Devices
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:509
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:565
 msgid "Input Devices"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:519
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:576
 msgid "Keyboards"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:536
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:593
 msgid "Automatically run a program when an USB _keyboard is connected"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:551
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:615
 msgid "Mice"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:568
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:632
 msgid "Automatically run a program when an USB _mouse is connected"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:583
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:654
 msgid "Tablet"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:600
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:671
 msgid "Automatically run a program when a _tablet is connected"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:605
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:679
 msgid "Com_mand:"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:690
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:755
 msgid "Failed to open the documentation browser"
 msgstr ""
-
-#: ../thunar-volman/tvm-run.c:133 ../thunar-volman/tvm-run.c:144
-msgid "Choose Disc Type"
-msgstr ""
-
-#: ../thunar-volman/tvm-run.c:134 ../thunar-volman/tvm-run.c:145
-msgid "You have inserted a blank disc."
-msgstr ""
-
-#: ../thunar-volman/tvm-run.c:135 ../thunar-volman/tvm-run.c:146
-msgid "What would you like to do?"
-msgstr ""
-
-#: ../thunar-volman/tvm-run.c:137
-msgid "Make _DVD"
-msgstr ""
-
-#: ../thunar-volman/tvm-run.c:148
-msgid "Make _Data CD"
-msgstr ""
-
-#: ../thunar-volman/tvm-run.c:149
-msgid "Make _Audio CD"
-msgstr ""
-
-#: ../thunar-volman-settings.desktop.in.in.h:3
-msgid "Removable Media"
-msgstr ""
diff --git a/po/tr.po b/po/tr.po
index 88deb35..b623ace 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -2,459 +2,618 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar volman plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-30 02:26-0700\n"
+"POT-Creation-Date: 2010-07-25 20:06+0200\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Samed Beyribey <ras0ir at eventualis.org>\n"
 "Language-Team: Xfce TR <xfce-tr at googlegroups.com>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Country: TURKEY\n"
 
-#: ../thunar-volman/main.c:50
-msgid "The HAL device UDI of the newly added device"
+#: ../thunar-volman/main.c:59
+#, fuzzy
+msgid "The syfs path of the newly added device"
 msgstr "Yeni eklenen aygıtın HAL aygıt UDI değeri"
 
-#: ../thunar-volman/main.c:51
-#: ../thunar-volman/tvm-preferences-dialog.c:120
-#: ../thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman/main.c:60
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:104
 msgid "Configure management of removable drives and media"
 msgstr "Kaldırılabilir sürücü ve ortam yönetimi yapılandırması"
 
-#: ../thunar-volman/main.c:52
+#: ../thunar-volman/main.c:61
 msgid "Print version information and exit"
 msgstr "Sürüm bilgisini göster ve çık"
 
 #. setup application name
-#: ../thunar-volman/main.c:69
+#: ../thunar-volman/main.c:93
 msgid "Thunar Volume Manager"
 msgstr "Thunar Birim Yöneticisi"
 
-#: ../thunar-volman/main.c:90
-msgid "Failed to open display"
-msgstr "Ekran açılamadı"
-
-#: ../thunar-volman/main.c:106
-msgid "The Thunar development team. All rights reserved."
-msgstr "Thunar geliştirici takımı. Tüm hakları saklıdır."
-
-#: ../thunar-volman/main.c:107
-msgid "Written by Benedikt Meurer <benny at xfce.org>."
-msgstr "Benedikt Meurer tarafından yazılmıştır <benny at xfce.org>."
+#: ../thunar-volman/main.c:133
+msgid "All rights reserved."
+msgstr ""
 
-#: ../thunar-volman/main.c:108
+#: ../thunar-volman/main.c:134
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Hataları lütfen <%s> adresine bildirin."
 
-#. TRANSLATORS: A HAL device UDI must match certain conditions to be valid (to be exact, it must be a valid D-Bus object path)
-#: ../thunar-volman/main.c:133
+#: ../thunar-volman/main.c:188
 #, c-format
-msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
-msgstr "Belirtilen UDI \"%s\" geçerli bir HAL aygıt UDI değeri değil"
+msgid "There is no device with the sysfs path \"%s\""
+msgstr ""
 
-#. TRANSLATORS: thunar-volman wasn't invoked with either --device-added or --configure.
-#: ../thunar-volman/main.c:144
-#, c-format
-msgid "Must specify the new HAL device UDI with --device-added"
+#: ../thunar-volman/main.c:200
+#, fuzzy, c-format
+msgid "Must specify the sysfs path of new devices with --device-added"
 msgstr "Yeni HAL aygıt UDI değeri --device-added ile belirtilmelidir"
 
 #. ...so we need to prompt what to do
-#: ../thunar-volman/tvm-block-device.c:189
+#: ../thunar-volman/tvm-block-device.c:204
 msgid "Photos and Music"
 msgstr "Fotoğraf ve Müzik"
 
-#: ../thunar-volman/tvm-block-device.c:190
-msgid "Photos were found on your portable music player."
+#: ../thunar-volman/tvm-block-device.c:205
+#, fuzzy
+msgid "Photos were found on your portable music player"
 msgstr "Taşınabilir müzik çalarınızda fotoğraflar bulundu."
 
-#: ../thunar-volman/tvm-block-device.c:191
+#: ../thunar-volman/tvm-block-device.c:206
 msgid "Would you like to import the photos or manage the music?"
 msgstr "Fotoğrafları içeri aktarmak veya müziği yönetmek ister misiniz?"
 
-#: ../thunar-volman/tvm-block-device.c:192
-#: ../thunar-volman/tvm-block-device.c:258
-#: ../thunar-volman/tvm-block-device.c:335
-#: ../thunar-volman/tvm-block-device.c:371
-#: ../thunar-volman/tvm-block-device.c:430
-#: ../thunar-volman/tvm-block-device.c:703
-#: ../thunar-volman/tvm-crypto-volume.c:448
-#: ../thunar-volman/tvm-run.c:136
-#: ../thunar-volman/tvm-run.c:147
+#: ../thunar-volman/tvm-block-device.c:208
+#: ../thunar-volman/tvm-block-device.c:277
+#: ../thunar-volman/tvm-block-device.c:378
+#: ../thunar-volman/tvm-block-device.c:425
+#: ../thunar-volman/tvm-block-device.c:507
+#: ../thunar-volman/tvm-block-device.c:826 ../thunar-volman/tvm-run.c:196
+#: ../thunar-volman/tvm-run.c:207
 msgid "Ig_nore"
 msgstr "Yoksa_y"
 
-#: ../thunar-volman/tvm-block-device.c:193
-#: ../thunar-volman/tvm-block-device.c:259
+#: ../thunar-volman/tvm-block-device.c:209
+#: ../thunar-volman/tvm-block-device.c:278
 msgid "Import _Photos"
 msgstr "Fotoğrafları İçeriye _Aktar"
 
-#: ../thunar-volman/tvm-block-device.c:194
+#: ../thunar-volman/tvm-block-device.c:210
 msgid "Manage _Music"
 msgstr "_Müziği Yönet"
 
-#. ask the user whether to import photos
-#: ../thunar-volman/tvm-block-device.c:255
+#. ask the user to import photos
+#: ../thunar-volman/tvm-block-device.c:273
 msgid "Photo Import"
 msgstr "Fotoğraf Aktarımı"
 
-#: ../thunar-volman/tvm-block-device.c:256
-msgid "A photo card has been detected."
+#: ../thunar-volman/tvm-block-device.c:274
+#, fuzzy
+msgid "A photo card has been detected"
 msgstr "Fotoğraf kartı tespit edildi."
 
-#: ../thunar-volman/tvm-block-device.c:257
-msgid "There are photos on the card. Would you like to add these photos to your album?"
-msgstr "Kart üzerinde fotoğraflar bulundu. Bu fotoğrafları albüme aktarmak ister misiniz?"
+#: ../thunar-volman/tvm-block-device.c:275
+msgid ""
+"There are photos on the card. Would you like to add these photos to your "
+"album?"
+msgstr ""
+"Kart üzerinde fotoğraflar bulundu. Bu fotoğrafları albüme aktarmak ister "
+"misiniz?"
 
-#. prompt the user whether to execute this file
-#: ../thunar-volman/tvm-block-device.c:332
-#: ../thunar-volman/tvm-block-device.c:368
+#. prompt the user to execute the file
+#. prompt the user to execute this file
+#: ../thunar-volman/tvm-block-device.c:373
+#: ../thunar-volman/tvm-block-device.c:420
 #, c-format
 msgid "Would you like to allow \"%s\" to run?"
 msgstr "\"%s\" dosyasının çalıştırılmasına izin vermek istiyor musunuz?"
 
-#: ../thunar-volman/tvm-block-device.c:333
-#: ../thunar-volman/tvm-block-device.c:369
+#: ../thunar-volman/tvm-block-device.c:376
+#: ../thunar-volman/tvm-block-device.c:423
 msgid "Auto-Run Confirmation"
 msgstr "Otomatik Çalıştırma Onayı"
 
-#: ../thunar-volman/tvm-block-device.c:334
-#: ../thunar-volman/tvm-block-device.c:370
+#: ../thunar-volman/tvm-block-device.c:377
+#: ../thunar-volman/tvm-block-device.c:424
 msgid "Auto-Run capability detected"
 msgstr "Otomatik çalıştırma kabiliyeti tespit edildi"
 
-#: ../thunar-volman/tvm-block-device.c:336
-#: ../thunar-volman/tvm-block-device.c:372
+#: ../thunar-volman/tvm-block-device.c:379
+#: ../thunar-volman/tvm-block-device.c:426
 msgid "_Allow Auto-Run"
 msgstr "Otom_atik Çalıştırmaya İzin Ver"
 
 #. prompt the user whether to autoopen this file
-#: ../thunar-volman/tvm-block-device.c:427
+#: ../thunar-volman/tvm-block-device.c:502
 #, c-format
 msgid "Would you like to open \"%s\"?"
 msgstr "\"%s\" dosyasını açmak istiyor musunuz?"
 
-#: ../thunar-volman/tvm-block-device.c:428
+#: ../thunar-volman/tvm-block-device.c:505
 msgid "Auto-Open Confirmation"
 msgstr "Otomatik Açma Onayı"
 
-#: ../thunar-volman/tvm-block-device.c:429
+#: ../thunar-volman/tvm-block-device.c:506
 msgid "Auto-Open capability detected"
 msgstr "Otomatik Açma kabiliyeti tespit edildi"
 
-#: ../thunar-volman/tvm-block-device.c:431
+#: ../thunar-volman/tvm-block-device.c:508
 msgid "_Open"
 msgstr "_Aç"
 
-#. ask what do with the mixed audio/data disc
-#: ../thunar-volman/tvm-block-device.c:700
-msgid "Audio / Data CD"
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "CD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "DVD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:618
+msgid "The CD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:619
+msgid "The DVD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:629
+msgid "Volume mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:632
+#, c-format
+msgid "The volume \"%s\" was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:637
+#, c-format
+msgid "The inserted volume was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:691
+#, c-format
+msgid "Unable to locate mount point"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:737
+#, c-format
+msgid "Unable to mount the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:746
+#, c-format
+msgid "Could not detect the volume corresponding to the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:821
+#, fuzzy
+msgid "Audio/Data CD"
 msgstr "Müzik / Veri CD'si "
 
-#: ../thunar-volman/tvm-block-device.c:701
-msgid "The CD in the drive contains both music and files."
+#: ../thunar-volman/tvm-block-device.c:822
+#, fuzzy
+msgid "The CD in the drive contains both music and files"
 msgstr "Sürücüdeki CD müzik ve çeşitli dosyaları barındırıyor."
 
-#: ../thunar-volman/tvm-block-device.c:702
+#: ../thunar-volman/tvm-block-device.c:824
 msgid "Would you like to listen to music or browse the files?"
 msgstr "Müzik dinlemek veya dosyaları görmek istiyor musunuz?"
 
-#: ../thunar-volman/tvm-block-device.c:704
+#: ../thunar-volman/tvm-block-device.c:827
 msgid "_Browse Files"
 msgstr "_Dosyaları Göster"
 
-#: ../thunar-volman/tvm-block-device.c:705
+#: ../thunar-volman/tvm-block-device.c:828
 msgid "_Play CD"
 msgstr "Müzik _Oynat"
 
-#: ../thunar-volman/tvm-command-entry.c:233
-msgid "Select an Application"
-msgstr "Uygulama Seçin"
+#: ../thunar-volman/tvm-block-device.c:916
+#, c-format
+msgid "Unknown block device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:243
-msgid "All Files"
-msgstr "Bütün dosyalar"
+#: ../thunar-volman/tvm-device.c:139
+#, c-format
+msgid "Device type not supported"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:248
-msgid "Executable Files"
-msgstr "Çalıştırılabilir Dosyalar"
+#: ../thunar-volman/tvm-input-device.c:74
+#, fuzzy
+msgid "input-keyboard"
+msgstr "Klavyeler"
 
-#: ../thunar-volman/tvm-command-entry.c:263
-msgid "Perl Scripts"
-msgstr "Perl Betikleri"
+#: ../thunar-volman/tvm-input-device.c:75
+#, fuzzy
+msgid "Keyboard detected"
+msgstr "Klavyeler"
 
-#: ../thunar-volman/tvm-command-entry.c:269
-msgid "Python Scripts"
-msgstr "Python Betikleri"
+#: ../thunar-volman/tvm-input-device.c:76
+#, fuzzy
+msgid "A keyboard was detected"
+msgstr "Fotoğraf kartı tespit edildi."
 
-#: ../thunar-volman/tvm-command-entry.c:275
-msgid "Ruby Scripts"
-msgstr "Ruby Betikleri"
+#: ../thunar-volman/tvm-input-device.c:86
+#: ../thunar-volman/tvm-input-device.c:100
+msgid "input-tablet"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:281
-msgid "Shell Scripts"
-msgstr "Kabuk Betikleri"
+#: ../thunar-volman/tvm-input-device.c:87
+#: ../thunar-volman/tvm-input-device.c:101
+#, fuzzy
+msgid "Tablet detected"
+msgstr "Otomatik çalıştırma kabiliyeti tespit edildi"
+
+#: ../thunar-volman/tvm-input-device.c:88
+#: ../thunar-volman/tvm-input-device.c:102
+msgid "A graphics tablet was detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:286
-#: ../thunar-volman/tvm-crypto-volume.c:443
-msgid "Encrypted volume"
-msgstr "Şifrelenmiş birim"
+#: ../thunar-volman/tvm-input-device.c:110
+msgid "input-mouse"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:297
-msgid "<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Şifrelenmiş birim bağlanıyor...</span>"
+#: ../thunar-volman/tvm-input-device.c:111
+msgid "Mouse detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:302
-msgid "Setting up the crypto layer..."
-msgstr "Şifre katmanı ayarlanıyor..."
+#: ../thunar-volman/tvm-input-device.c:112
+msgid "A mouse was detected"
+msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) but got Permission denied.
-#: ../thunar-volman/tvm-crypto-volume.c:369
+#: ../thunar-volman/tvm-input-device.c:139
 #, c-format
-msgid "You are not privileged to setup the crypto layer"
-msgstr "Şifre katmanı ayarlamak için yetkiniz bulunmamaktadır"
+msgid "Unsupported input device type"
+msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) and typed the wrong password.
-#: ../thunar-volman/tvm-crypto-volume.c:374
+#: ../thunar-volman/tvm-run.c:173
 #, c-format
-msgid "Wrong password"
-msgstr "Yanlış parola"
+msgid "Autoburning of blank CDs and DVDs is disabled"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:445
-msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Yanlış parola.</span>"
+#: ../thunar-volman/tvm-run.c:193
+msgid "Blank DVD inserted"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:446
-msgid "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Bu birim şifrelenmiş.</span>"
+#: ../thunar-volman/tvm-run.c:194
+#, fuzzy
+msgid "You have inserted a blank DVD."
+msgstr "Boş bir disk yerleştirdiniz."
 
-#: ../thunar-volman/tvm-crypto-volume.c:447
-msgid "Please enter your password to decrypt and mount the volume."
-msgstr "Lütfen şifreyi çözmek ve birimi bağlamak için parolanızı yazın."
+#: ../thunar-volman/tvm-run.c:195 ../thunar-volman/tvm-run.c:206
+msgid "What would you like to do?"
+msgstr "İşlem yapmak istiyor musunuz?"
 
-#: ../thunar-volman/tvm-crypto-volume.c:449
-msgid "_Mount"
-msgstr "_Bağla"
+#: ../thunar-volman/tvm-run.c:197
+msgid "Burn _DVD"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:468
-msgid "Failed to setup the encrypted volume"
-msgstr "Şifrelenmiş birim ayarlanamadı"
+#: ../thunar-volman/tvm-run.c:204
+#, fuzzy
+msgid "Blank CD inserted"
+msgstr "Boş CD ve DVD'ler"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:119
-#: ../thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman/tvm-run.c:205
+#, fuzzy
+msgid "You have inserted a blank CD."
+msgstr "Boş bir disk yerleştirdiniz."
+
+#: ../thunar-volman/tvm-run.c:208
+#, fuzzy
+msgid "Burn _Data CD"
+msgstr "Veri _Diski Oluştur"
+
+#: ../thunar-volman/tvm-run.c:209
+#, fuzzy
+msgid "Burn _Audio CD"
+msgstr "_Müzik CD'si Oluştur"
+
+#: ../thunar-volman/tvm-run.c:233
+#, c-format
+msgid "The burn command may not be empty"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:272
+#, c-format
+msgid "The CD player command is undefined"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:66
+msgid "Camera detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:67
+#, fuzzy
+msgid "A photo camera was detected"
+msgstr "Fotoğraf kartı tespit edildi."
+
+#: ../thunar-volman/tvm-usb-device.c:77
+msgid "Printer detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:78
+msgid "A USB printer was detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:104
+#, c-format
+msgid "Unsupported USB device type"
+msgstr ""
+
+#. setup application name
+#: ../thunar-volman-settings/main.c:52
+#, fuzzy
+msgid "Thunar Volume Manager Settings"
+msgstr "Thunar Birim Yöneticisi"
+
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:102
 msgid "Removable Drives and Media"
 msgstr "Kaldırılabilir Sürücüler ve Ortam"
 
+#: ../thunar-volman-settings/tvm-command-entry.c:240
+msgid "Select an Application"
+msgstr "Uygulama Seçin"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:250
+msgid "All Files"
+msgstr "Bütün dosyalar"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:255
+msgid "Executable Files"
+msgstr "Çalıştırılabilir Dosyalar"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:270
+msgid "Perl Scripts"
+msgstr "Perl Betikleri"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:276
+msgid "Python Scripts"
+msgstr "Python Betikleri"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:282
+msgid "Ruby Scripts"
+msgstr "Ruby Betikleri"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:288
+msgid "Shell Scripts"
+msgstr "Kabuk Betikleri"
+
 #.
 #. Storage
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:143
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:130
 msgid "Storage"
 msgstr "Bellek"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:153
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:141
 msgid "Removable Storage"
 msgstr "Kaldırılabilir Bellek"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:170
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:158
 msgid "_Mount removable drives when hot-plugged"
 msgstr "Kaldırılabilir sürücüleri takıldıklarında siste_me bağla"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:175
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:166
 msgid "Mount removable media when _inserted"
 msgstr "Kaldırılabilir sürücüleri yerleştirildiklerinde s_isteme bağla"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:180
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:174
 msgid "B_rowse removable media when inserted"
 msgstr "Kaldırılabili_r sürücü yerleştirildiğinde içeriğini göster  "
 
-#: ../thunar-volman/tvm-preferences-dialog.c:185
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:182
 msgid "_Auto-run programs on new drives and media"
 msgstr "Yeni sürücülerde ve ortamda bulunan uygulam_aları otomatik çalıştır"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:190
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:189
 msgid "Auto-open files on new drives and media"
 msgstr "Yeni sürücülerde ve ortamdaki dosyaları otomatik aç"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:199
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:201
 msgid "Blank CDs and DVDs"
 msgstr "Boş CD ve DVD'ler"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:216
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:218
 msgid "_Burn a CD or DVD when a blank disc is inserted"
 msgstr "_Boş bir disk yerleştirildiğinde CD veya DVD yazdır"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:224
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:229
 msgid "Command for _Data CDs:"
 msgstr "_Veri CD'leri için komut:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:231
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:239
 msgid "Command for A_udio CDs:"
 msgstr "Müzik CD'leri için kom_ut:"
 
 #.
 #. Multimedia
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:245
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:255
 msgid "Multimedia"
 msgstr "Çoklu Ortam"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:255
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:266
 msgid "Audio CDs"
 msgstr "Müzik CD'leri"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:272
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:283
 msgid "Play _audio CDs when inserted"
 msgstr "Yerleştirildiklerinde müzik CD'lerini ç_al"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:277
-#: ../thunar-volman/tvm-preferences-dialog.c:383
-#: ../thunar-volman/tvm-preferences-dialog.c:425
-#: ../thunar-volman/tvm-preferences-dialog.c:499
-#: ../thunar-volman/tvm-preferences-dialog.c:541
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:290
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:415
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:466
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:553
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:601
 msgid "_Command:"
 msgstr "_Komut:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:287
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:304
 msgid "Video CDs/DVDs"
 msgstr "Video CD/DVD'leri"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:304
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:321
 msgid "Play _video CDs and DVDs when inserted"
 msgstr "Yerleştirildiklerinde _video CD'lerini ve DVD'lerini oynat"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:309
-#: ../thunar-volman/tvm-preferences-dialog.c:341
-#: ../thunar-volman/tvm-preferences-dialog.c:457
-#: ../thunar-volman/tvm-preferences-dialog.c:573
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:329
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:367
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:505
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:640
 msgid "C_ommand:"
 msgstr "K_omut:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:319
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:343
 msgid "Portable Music Players"
 msgstr "Taşınabilir Müzik Çalarlar"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:336
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:360
 msgid "Play _music files when connected"
 msgstr "Bağlandıklarında _müzik dosyalarını çal"
 
 #.
 #. Cameras
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:351
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:379
 msgid "Cameras"
 msgstr "Fotoğraf Makineleri"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:361
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:390
 msgid "Digital Cameras"
 msgstr "Sayısal Fotoğraf Makineleri"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:378
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:407
 msgid "Import digital photographs when connected"
 msgstr "Bağlandığında fotoğrafları içeri aktar"
 
 #.
 #. PDAs
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:393
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:427
 msgid "PDAs"
 msgstr "PDA'lar"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:403
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:441
 msgid "Palm™"
 msgstr "Palm™"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:420
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:458
 msgid "Sync _Palm™ devices when connected"
 msgstr "_Palm™ aygıtları bağlandığında senkronize et"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:435
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:480
 msgid "Pocket PCs"
 msgstr "Cep Bilgisayarları"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:452
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:497
 msgid "Sync Pocket P_C devices when connected"
 msgstr "_Cep bilgisayarları bağlandığında senkronize et"
 
 #.
 #. Printers
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:467
-#: ../thunar-volman/tvm-preferences-dialog.c:477
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:517
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:528
 msgid "Printers"
 msgstr "Yazıcılar"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:494
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:545
 msgid "Automatically run a program when a _printer is connected"
 msgstr "Yazıcı bağlandığında otomatik olarak uy_gulama çalıştır"
 
 #.
 #. Input Devices
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:509
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:565
 msgid "Input Devices"
 msgstr "Girdi Aygıtları"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:519
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:576
 msgid "Keyboards"
 msgstr "Klavyeler"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:536
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:593
 msgid "Automatically run a program when an USB _keyboard is connected"
 msgstr "USB _klavye bağlandığında uygulama çalıştır"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:551
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:615
 msgid "Mice"
 msgstr "Fare"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:568
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:632
 msgid "Automatically run a program when an USB _mouse is connected"
 msgstr "USB fare bağlandığında uygula_ma çalıştır"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:583
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:654
 msgid "Tablet"
 msgstr "Tablet"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:600
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:671
 msgid "Automatically run a program when a _tablet is connected"
 msgstr "_Tablet bağlandığında uygulama çalıştır"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:605
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:679
 msgid "Com_mand:"
 msgstr "Ko_mut:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:690
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:755
 msgid "Failed to open the documentation browser"
 msgstr "Doküman tarayıcı açılamadı"
 
-#: ../thunar-volman/tvm-run.c:133
-#: ../thunar-volman/tvm-run.c:144
-msgid "Choose Disc Type"
-msgstr "Disk Türünü Seçin"
+#~ msgid "Failed to open display"
+#~ msgstr "Ekran açılamadı"
 
-#: ../thunar-volman/tvm-run.c:134
-#: ../thunar-volman/tvm-run.c:145
-msgid "You have inserted a blank disc."
-msgstr "Boş bir disk yerleştirdiniz."
+#~ msgid "The Thunar development team. All rights reserved."
+#~ msgstr "Thunar geliştirici takımı. Tüm hakları saklıdır."
 
-#: ../thunar-volman/tvm-run.c:135
-#: ../thunar-volman/tvm-run.c:146
-msgid "What would you like to do?"
-msgstr "İşlem yapmak istiyor musunuz?"
+#~ msgid "Written by Benedikt Meurer <benny at xfce.org>."
+#~ msgstr "Benedikt Meurer tarafından yazılmıştır <benny at xfce.org>."
 
-#: ../thunar-volman/tvm-run.c:137
-msgid "Make _DVD"
-msgstr "_DVD Oluştur"
+#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
+#~ msgstr "Belirtilen UDI \"%s\" geçerli bir HAL aygıt UDI değeri değil"
 
-#: ../thunar-volman/tvm-run.c:148
-msgid "Make _Data CD"
-msgstr "Veri _Diski Oluştur"
+#~ msgid "Encrypted volume"
+#~ msgstr "Şifrelenmiş birim"
 
-#: ../thunar-volman/tvm-run.c:149
-msgid "Make _Audio CD"
-msgstr "_Müzik CD'si Oluştur"
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Şifrelenmiş birim bağlanıyor...</"
+#~ "span>"
+
+#~ msgid "Setting up the crypto layer..."
+#~ msgstr "Şifre katmanı ayarlanıyor..."
+
+#~ msgid "You are not privileged to setup the crypto layer"
+#~ msgstr "Şifre katmanı ayarlamak için yetkiniz bulunmamaktadır"
+
+#~ msgid "Wrong password"
+#~ msgstr "Yanlış parola"
+
+#~ msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
+#~ msgstr "<span weight=\"bold\" size=\"larger\">Yanlış parola.</span>"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
+#~ msgstr "<span weight=\"bold\" size=\"larger\">Bu birim şifrelenmiş.</span>"
+
+#~ msgid "Please enter your password to decrypt and mount the volume."
+#~ msgstr "Lütfen şifreyi çözmek ve birimi bağlamak için parolanızı yazın."
+
+#~ msgid "_Mount"
+#~ msgstr "_Bağla"
+
+#~ msgid "Failed to setup the encrypted volume"
+#~ msgstr "Şifrelenmiş birim ayarlanamadı"
+
+#~ msgid "Choose Disc Type"
+#~ msgstr "Disk Türünü Seçin"
 
-#: ../thunar-volman-settings.desktop.in.in.h:3
-msgid "Removable Media"
-msgstr "Kaldırılabilir Ortam"
+#~ msgid "Make _DVD"
+#~ msgstr "_DVD Oluştur"
 
+#~ msgid "Removable Media"
+#~ msgstr "Kaldırılabilir Ortam"
diff --git a/po/uk.po b/po/uk.po
index e642500..b87d36d 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,457 +7,618 @@ msgid ""
 msgstr ""
 "Project-Id-Version: thunar-volman 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-30 02:26-0700\n"
+"POT-Creation-Date: 2010-07-25 20:06+0200\n"
 "PO-Revision-Date: 2007-11-10 20:23+0200\n"
 "Last-Translator: Dmitry Nikitin <luckas_fb at mail.ru>\n"
 "Language-Team: Ukrainian <xfce-i18n at xfce.org>\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../thunar-volman/main.c:50
-msgid "The HAL device UDI of the newly added device"
+#: ../thunar-volman/main.c:59
+#, fuzzy
+msgid "The syfs path of the newly added device"
 msgstr "UDI ново-доданого HAL -ом пристрою"
 
-#: ../thunar-volman/main.c:51 ../thunar-volman/tvm-preferences-dialog.c:120
-#: ../thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman/main.c:60
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:104
 msgid "Configure management of removable drives and media"
 msgstr "Налаштувати керування змінними дисками і пристроями"
 
-#: ../thunar-volman/main.c:52
+#: ../thunar-volman/main.c:61
 msgid "Print version information and exit"
 msgstr "Показати інформацію про версію і вийти"
 
 #. setup application name
-#: ../thunar-volman/main.c:69
+#: ../thunar-volman/main.c:93
 msgid "Thunar Volume Manager"
 msgstr "Thunar Керівник Томів"
 
-#: ../thunar-volman/main.c:90
-msgid "Failed to open display"
-msgstr "Невдача при спробі відкити дисплей"
-
-#: ../thunar-volman/main.c:106
-msgid "The Thunar development team. All rights reserved."
-msgstr "Команда розробників Thunar. Всі права захищено."
-
-#: ../thunar-volman/main.c:107
-msgid "Written by Benedikt Meurer <benny at xfce.org>."
-msgstr "Написано Benedikt Meurer <benny at xfce.org>."
+#: ../thunar-volman/main.c:133
+msgid "All rights reserved."
+msgstr ""
 
-#: ../thunar-volman/main.c:108
+#: ../thunar-volman/main.c:134
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Будь-ласка, звітуйте про помилки для <%s>."
 
-#. TRANSLATORS: A HAL device UDI must match certain conditions to be valid (to be exact, it must be a valid D-Bus object path)
-#: ../thunar-volman/main.c:133
+#: ../thunar-volman/main.c:188
 #, c-format
-msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
-msgstr "Визначений UDI \"%s\" не є достовірним UDI для пристрою HAL"
+msgid "There is no device with the sysfs path \"%s\""
+msgstr ""
 
-#. TRANSLATORS: thunar-volman wasn't invoked with either --device-added or --configure.
-#: ../thunar-volman/main.c:144
-#, c-format
-msgid "Must specify the new HAL device UDI with --device-added"
+#: ../thunar-volman/main.c:200
+#, fuzzy, c-format
+msgid "Must specify the sysfs path of new devices with --device-added"
 msgstr "Мусите визначити новий UDI пристрою для HAL з --device-added"
 
 #. ...so we need to prompt what to do
-#: ../thunar-volman/tvm-block-device.c:189
+#: ../thunar-volman/tvm-block-device.c:204
 msgid "Photos and Music"
 msgstr "Фото і Музика"
 
-#: ../thunar-volman/tvm-block-device.c:190
-msgid "Photos were found on your portable music player."
+#: ../thunar-volman/tvm-block-device.c:205
+#, fuzzy
+msgid "Photos were found on your portable music player"
 msgstr "Фотографії будуть знайдені на вашому портативному музичному плеєрі."
 
-#: ../thunar-volman/tvm-block-device.c:191
+#: ../thunar-volman/tvm-block-device.c:206
 msgid "Would you like to import the photos or manage the music?"
 msgstr "Хочете імпортувати фотографії чи керувати музикою?"
 
-#: ../thunar-volman/tvm-block-device.c:192
-#: ../thunar-volman/tvm-block-device.c:258
-#: ../thunar-volman/tvm-block-device.c:335
-#: ../thunar-volman/tvm-block-device.c:371
-#: ../thunar-volman/tvm-block-device.c:430
-#: ../thunar-volman/tvm-block-device.c:703
-#: ../thunar-volman/tvm-crypto-volume.c:448 ../thunar-volman/tvm-run.c:136
-#: ../thunar-volman/tvm-run.c:147
+#: ../thunar-volman/tvm-block-device.c:208
+#: ../thunar-volman/tvm-block-device.c:277
+#: ../thunar-volman/tvm-block-device.c:378
+#: ../thunar-volman/tvm-block-device.c:425
+#: ../thunar-volman/tvm-block-device.c:507
+#: ../thunar-volman/tvm-block-device.c:826 ../thunar-volman/tvm-run.c:196
+#: ../thunar-volman/tvm-run.c:207
 msgid "Ig_nore"
 msgstr "Іг_норувати"
 
-#: ../thunar-volman/tvm-block-device.c:193
-#: ../thunar-volman/tvm-block-device.c:259
+#: ../thunar-volman/tvm-block-device.c:209
+#: ../thunar-volman/tvm-block-device.c:278
 msgid "Import _Photos"
 msgstr "Імпортувати _Фото"
 
-#: ../thunar-volman/tvm-block-device.c:194
+#: ../thunar-volman/tvm-block-device.c:210
 msgid "Manage _Music"
 msgstr "Керувати _Музикою"
 
-#. ask the user whether to import photos
-#: ../thunar-volman/tvm-block-device.c:255
+#. ask the user to import photos
+#: ../thunar-volman/tvm-block-device.c:273
 msgid "Photo Import"
 msgstr "Імпорт Фотографій"
 
-#: ../thunar-volman/tvm-block-device.c:256
-msgid "A photo card has been detected."
+#: ../thunar-volman/tvm-block-device.c:274
+#, fuzzy
+msgid "A photo card has been detected"
 msgstr "Виявлена фото-картка."
 
-#: ../thunar-volman/tvm-block-device.c:257
+#: ../thunar-volman/tvm-block-device.c:275
 msgid ""
 "There are photos on the card. Would you like to add these photos to your "
 "album?"
 msgstr "На картці є фотографії. Хочете додати ці фото до Вашого альбому?"
 
-#. prompt the user whether to execute this file
-#: ../thunar-volman/tvm-block-device.c:332
-#: ../thunar-volman/tvm-block-device.c:368
+#. prompt the user to execute the file
+#. prompt the user to execute this file
+#: ../thunar-volman/tvm-block-device.c:373
+#: ../thunar-volman/tvm-block-device.c:420
 #, c-format
 msgid "Would you like to allow \"%s\" to run?"
 msgstr "Хотіли б прийняти \"%s\" запуск?"
 
-#: ../thunar-volman/tvm-block-device.c:333
-#: ../thunar-volman/tvm-block-device.c:369
+#: ../thunar-volman/tvm-block-device.c:376
+#: ../thunar-volman/tvm-block-device.c:423
 msgid "Auto-Run Confirmation"
 msgstr "Авто-запуск Підтвердження"
 
-#: ../thunar-volman/tvm-block-device.c:334
-#: ../thunar-volman/tvm-block-device.c:370
+#: ../thunar-volman/tvm-block-device.c:377
+#: ../thunar-volman/tvm-block-device.c:424
 msgid "Auto-Run capability detected"
 msgstr "Виявлено сумісність з Авто-запуском"
 
-#: ../thunar-volman/tvm-block-device.c:336
-#: ../thunar-volman/tvm-block-device.c:372
+#: ../thunar-volman/tvm-block-device.c:379
+#: ../thunar-volman/tvm-block-device.c:426
 msgid "_Allow Auto-Run"
 msgstr "_Дозволити Авто-запуск"
 
 #. prompt the user whether to autoopen this file
-#: ../thunar-volman/tvm-block-device.c:427
+#: ../thunar-volman/tvm-block-device.c:502
 #, c-format
 msgid "Would you like to open \"%s\"?"
 msgstr "Хотіли б відкрити \"%s\"?"
 
-#: ../thunar-volman/tvm-block-device.c:428
+#: ../thunar-volman/tvm-block-device.c:505
 msgid "Auto-Open Confirmation"
 msgstr "Авто-відкриття Підтвердження"
 
-#: ../thunar-volman/tvm-block-device.c:429
+#: ../thunar-volman/tvm-block-device.c:506
 msgid "Auto-Open capability detected"
 msgstr "Виявлено сумісність з Авто-відкриттям"
 
-#: ../thunar-volman/tvm-block-device.c:431
+#: ../thunar-volman/tvm-block-device.c:508
 msgid "_Open"
 msgstr "_Відкрити"
 
-#. ask what do with the mixed audio/data disc
-#: ../thunar-volman/tvm-block-device.c:700
-msgid "Audio / Data CD"
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "CD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "DVD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:618
+msgid "The CD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:619
+msgid "The DVD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:629
+msgid "Volume mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:632
+#, c-format
+msgid "The volume \"%s\" was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:637
+#, c-format
+msgid "The inserted volume was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:691
+#, c-format
+msgid "Unable to locate mount point"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:737
+#, c-format
+msgid "Unable to mount the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:746
+#, c-format
+msgid "Could not detect the volume corresponding to the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:821
+#, fuzzy
+msgid "Audio/Data CD"
 msgstr "Аудіо / Данні CD"
 
-#: ../thunar-volman/tvm-block-device.c:701
-msgid "The CD in the drive contains both music and files."
+#: ../thunar-volman/tvm-block-device.c:822
+#, fuzzy
+msgid "The CD in the drive contains both music and files"
 msgstr "CD-диск в пристрої має музичні і файли даних."
 
-#: ../thunar-volman/tvm-block-device.c:702
+#: ../thunar-volman/tvm-block-device.c:824
 msgid "Would you like to listen to music or browse the files?"
 msgstr "Хотіли б слухати музику чи переглянути файли?"
 
-#: ../thunar-volman/tvm-block-device.c:704
+#: ../thunar-volman/tvm-block-device.c:827
 msgid "_Browse Files"
 msgstr "_Переглянути Файли"
 
-#: ../thunar-volman/tvm-block-device.c:705
+#: ../thunar-volman/tvm-block-device.c:828
 msgid "_Play CD"
 msgstr "_Слухати CD"
 
-#: ../thunar-volman/tvm-command-entry.c:233
-msgid "Select an Application"
-msgstr "Вибрати Програму"
+#: ../thunar-volman/tvm-block-device.c:916
+#, c-format
+msgid "Unknown block device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:243
-msgid "All Files"
-msgstr "Всі Файли"
+#: ../thunar-volman/tvm-device.c:139
+#, c-format
+msgid "Device type not supported"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:248
-msgid "Executable Files"
-msgstr "Виконувані файли"
+#: ../thunar-volman/tvm-input-device.c:74
+#, fuzzy
+msgid "input-keyboard"
+msgstr "Клавіатури"
 
-#: ../thunar-volman/tvm-command-entry.c:263
-msgid "Perl Scripts"
-msgstr "Скрипти Перл"
+#: ../thunar-volman/tvm-input-device.c:75
+#, fuzzy
+msgid "Keyboard detected"
+msgstr "Клавіатури"
 
-#: ../thunar-volman/tvm-command-entry.c:269
-msgid "Python Scripts"
-msgstr "Скрипти Пітон"
+#: ../thunar-volman/tvm-input-device.c:76
+#, fuzzy
+msgid "A keyboard was detected"
+msgstr "Виявлена фото-картка."
 
-#: ../thunar-volman/tvm-command-entry.c:275
-msgid "Ruby Scripts"
-msgstr "Скрипти Рубі"
+#: ../thunar-volman/tvm-input-device.c:86
+#: ../thunar-volman/tvm-input-device.c:100
+msgid "input-tablet"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:281
-msgid "Shell Scripts"
-msgstr "Скрипти командної оболонки"
+#: ../thunar-volman/tvm-input-device.c:87
+#: ../thunar-volman/tvm-input-device.c:101
+#, fuzzy
+msgid "Tablet detected"
+msgstr "Виявлено сумісність з Авто-запуском"
+
+#: ../thunar-volman/tvm-input-device.c:88
+#: ../thunar-volman/tvm-input-device.c:102
+msgid "A graphics tablet was detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:286
-#: ../thunar-volman/tvm-crypto-volume.c:443
-msgid "Encrypted volume"
-msgstr "Зашифрований том"
+#: ../thunar-volman/tvm-input-device.c:110
+msgid "input-mouse"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:297
-msgid "<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Монтування зашифрованого тому...</span>"
+#: ../thunar-volman/tvm-input-device.c:111
+msgid "Mouse detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:302
-msgid "Setting up the crypto layer..."
-msgstr "Налаштувати криптографічний шар..."
+#: ../thunar-volman/tvm-input-device.c:112
+msgid "A mouse was detected"
+msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) but got Permission denied.
-#: ../thunar-volman/tvm-crypto-volume.c:369
+#: ../thunar-volman/tvm-input-device.c:139
 #, c-format
-msgid "You are not privileged to setup the crypto layer"
-msgstr "Ви не уповноважені налаштовувати криптографічний шар"
+msgid "Unsupported input device type"
+msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) and typed the wrong password.
-#: ../thunar-volman/tvm-crypto-volume.c:374
+#: ../thunar-volman/tvm-run.c:173
 #, c-format
-msgid "Wrong password"
-msgstr "Невірний пароль"
+msgid "Autoburning of blank CDs and DVDs is disabled"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:445
-msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Невірний пароль.</span>"
+#: ../thunar-volman/tvm-run.c:193
+msgid "Blank DVD inserted"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:446
-msgid "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Цей том зашифрований.</span>"
+#: ../thunar-volman/tvm-run.c:194
+#, fuzzy
+msgid "You have inserted a blank DVD."
+msgstr "Ви маєте вставлений чистий диск."
 
-#: ../thunar-volman/tvm-crypto-volume.c:447
-msgid "Please enter your password to decrypt and mount the volume."
-msgstr "Будь ласка введіть Ваш пароль для розшифровки і монтування тому."
+#: ../thunar-volman/tvm-run.c:195 ../thunar-volman/tvm-run.c:206
+msgid "What would you like to do?"
+msgstr "Що думаєте робити?"
+
+#: ../thunar-volman/tvm-run.c:197
+msgid "Burn _DVD"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:204
+#, fuzzy
+msgid "Blank CD inserted"
+msgstr "Чисті CD-диски  і DVD-диски"
+
+#: ../thunar-volman/tvm-run.c:205
+#, fuzzy
+msgid "You have inserted a blank CD."
+msgstr "Ви маєте вставлений чистий диск."
+
+#: ../thunar-volman/tvm-run.c:208
+#, fuzzy
+msgid "Burn _Data CD"
+msgstr "Створити _Data CD"
+
+#: ../thunar-volman/tvm-run.c:209
+#, fuzzy
+msgid "Burn _Audio CD"
+msgstr "Створити _Audio CD"
+
+#: ../thunar-volman/tvm-run.c:233
+#, c-format
+msgid "The burn command may not be empty"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:272
+#, c-format
+msgid "The CD player command is undefined"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:66
+msgid "Camera detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:67
+#, fuzzy
+msgid "A photo camera was detected"
+msgstr "Виявлена фото-картка."
+
+#: ../thunar-volman/tvm-usb-device.c:77
+msgid "Printer detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:78
+msgid "A USB printer was detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:449
-msgid "_Mount"
-msgstr "_Монтувати"
+#: ../thunar-volman/tvm-usb-device.c:104
+#, c-format
+msgid "Unsupported USB device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:468
-msgid "Failed to setup the encrypted volume"
-msgstr "Не вдалось налаштувати зашифроватий том"
+#. setup application name
+#: ../thunar-volman-settings/main.c:52
+#, fuzzy
+msgid "Thunar Volume Manager Settings"
+msgstr "Thunar Керівник Томів"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:119
-#: ../thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:102
 msgid "Removable Drives and Media"
 msgstr "Переносні Пристрої і Медіа"
 
+#: ../thunar-volman-settings/tvm-command-entry.c:240
+msgid "Select an Application"
+msgstr "Вибрати Програму"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:250
+msgid "All Files"
+msgstr "Всі Файли"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:255
+msgid "Executable Files"
+msgstr "Виконувані файли"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:270
+msgid "Perl Scripts"
+msgstr "Скрипти Перл"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:276
+msgid "Python Scripts"
+msgstr "Скрипти Пітон"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:282
+msgid "Ruby Scripts"
+msgstr "Скрипти Рубі"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:288
+msgid "Shell Scripts"
+msgstr "Скрипти командної оболонки"
+
 #.
 #. Storage
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:143
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:130
 msgid "Storage"
 msgstr "Пристрій"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:153
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:141
 msgid "Removable Storage"
 msgstr "Змінний пристрій"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:170
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:158
 msgid "_Mount removable drives when hot-plugged"
 msgstr "_Монтувати змінні пристрої якщо включені"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:175
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:166
 msgid "Mount removable media when _inserted"
 msgstr "_Монтувати змінний носій коли _вставлений"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:180
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:174
 msgid "B_rowse removable media when inserted"
 msgstr "В_ідкривати змінний носій коли вставлений"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:185
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:182
 msgid "_Auto-run programs on new drives and media"
 msgstr "_Авто-запуск програм на нових пристроях і носіях"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:190
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:189
 msgid "Auto-open files on new drives and media"
 msgstr "Авто-відкриття файлів на нових пристроях і носіях"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:199
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:201
 msgid "Blank CDs and DVDs"
 msgstr "Чисті CD-диски  і DVD-диски"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:216
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:218
 msgid "_Burn a CD or DVD when a blank disc is inserted"
 msgstr "_Запис CD чи DVD коли чистий диск є вставленим"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:224
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:229
 msgid "Command for _Data CDs:"
 msgstr "Команди для CD з _Данними:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:231
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:239
 msgid "Command for A_udio CDs:"
 msgstr "Команди для CD з А_удіо:"
 
 #.
 #. Multimedia
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:245
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:255
 msgid "Multimedia"
 msgstr "Мультимедія"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:255
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:266
 msgid "Audio CDs"
 msgstr "Аудіо CD-диски"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:272
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:283
 msgid "Play _audio CDs when inserted"
 msgstr "Грати _аудіо CD диск коли вставлений"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:277
-#: ../thunar-volman/tvm-preferences-dialog.c:383
-#: ../thunar-volman/tvm-preferences-dialog.c:425
-#: ../thunar-volman/tvm-preferences-dialog.c:499
-#: ../thunar-volman/tvm-preferences-dialog.c:541
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:290
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:415
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:466
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:553
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:601
 msgid "_Command:"
 msgstr "_Команда:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:287
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:304
 msgid "Video CDs/DVDs"
 msgstr "Відео CDs/DVDs"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:304
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:321
 msgid "Play _video CDs and DVDs when inserted"
 msgstr "Грати _відео CD диск і DVD коли вставлений"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:309
-#: ../thunar-volman/tvm-preferences-dialog.c:341
-#: ../thunar-volman/tvm-preferences-dialog.c:457
-#: ../thunar-volman/tvm-preferences-dialog.c:573
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:329
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:367
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:505
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:640
 msgid "C_ommand:"
 msgstr "К_оманда:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:319
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:343
 msgid "Portable Music Players"
 msgstr "Портативні Музичні Плеєри"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:336
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:360
 msgid "Play _music files when connected"
 msgstr "Грати _музичні файли коли під'єднано"
 
 #.
 #. Cameras
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:351
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:379
 msgid "Cameras"
 msgstr "Камери"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:361
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:390
 msgid "Digital Cameras"
 msgstr "Цифрові камери"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:378
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:407
 msgid "Import digital photographs when connected"
 msgstr "Імпортувати цифрові фотографії коли під'єднано"
 
 #.
 #. PDAs
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:393
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:427
 msgid "PDAs"
 msgstr "PDA-пристрої"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:403
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:441
 msgid "Palm™"
 msgstr "Palm™"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:420
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:458
 msgid "Sync _Palm™ devices when connected"
 msgstr "Синхронізувати _Palm™ пристрої коли під'єднано"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:435
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:480
 msgid "Pocket PCs"
 msgstr "Pocket PCs"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:452
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:497
 msgid "Sync Pocket P_C devices when connected"
 msgstr "Синхронізувати Pocket P_C пристрої коли під'єднано"
 
 #.
 #. Printers
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:467
-#: ../thunar-volman/tvm-preferences-dialog.c:477
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:517
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:528
 msgid "Printers"
 msgstr "Принтери"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:494
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:545
 msgid "Automatically run a program when a _printer is connected"
 msgstr "Автоматично запускати програму коли _принтер під'єднаний"
 
 #.
 #. Input Devices
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:509
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:565
 msgid "Input Devices"
 msgstr "Пристрої Вводу"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:519
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:576
 msgid "Keyboards"
 msgstr "Клавіатури"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:536
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:593
 msgid "Automatically run a program when an USB _keyboard is connected"
 msgstr "Автоматично запустити програму коли USB _клавіатуру під'єднано"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:551
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:615
 msgid "Mice"
 msgstr "Миша"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:568
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:632
 msgid "Automatically run a program when an USB _mouse is connected"
 msgstr "Автоматично запускати програму коли USB _миша під'єднана"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:583
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:654
 msgid "Tablet"
 msgstr "Tablet"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:600
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:671
 msgid "Automatically run a program when a _tablet is connected"
 msgstr "Автоматично запускати програму коли _tablet під'єднано"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:605
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:679
 msgid "Com_mand:"
 msgstr "Ко_манда:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:690
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:755
 msgid "Failed to open the documentation browser"
 msgstr "невдача при відкритті переглядача документації"
 
-#: ../thunar-volman/tvm-run.c:133 ../thunar-volman/tvm-run.c:144
-msgid "Choose Disc Type"
-msgstr "Вибрати Тип Диску"
+#~ msgid "Failed to open display"
+#~ msgstr "Невдача при спробі відкити дисплей"
 
-#: ../thunar-volman/tvm-run.c:134 ../thunar-volman/tvm-run.c:145
-msgid "You have inserted a blank disc."
-msgstr "Ви маєте вставлений чистий диск."
+#~ msgid "The Thunar development team. All rights reserved."
+#~ msgstr "Команда розробників Thunar. Всі права захищено."
 
-#: ../thunar-volman/tvm-run.c:135 ../thunar-volman/tvm-run.c:146
-msgid "What would you like to do?"
-msgstr "Що думаєте робити?"
+#~ msgid "Written by Benedikt Meurer <benny at xfce.org>."
+#~ msgstr "Написано Benedikt Meurer <benny at xfce.org>."
 
-#: ../thunar-volman/tvm-run.c:137
-msgid "Make _DVD"
-msgstr "Створити _DVD"
+#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
+#~ msgstr "Визначений UDI \"%s\" не є достовірним UDI для пристрою HAL"
 
-#: ../thunar-volman/tvm-run.c:148
-msgid "Make _Data CD"
-msgstr "Створити _Data CD"
+#~ msgid "Encrypted volume"
+#~ msgstr "Зашифрований том"
 
-#: ../thunar-volman/tvm-run.c:149
-msgid "Make _Audio CD"
-msgstr "Створити _Audio CD"
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Монтування зашифрованого тому...</"
+#~ "span>"
+
+#~ msgid "Setting up the crypto layer..."
+#~ msgstr "Налаштувати криптографічний шар..."
+
+#~ msgid "You are not privileged to setup the crypto layer"
+#~ msgstr "Ви не уповноважені налаштовувати криптографічний шар"
+
+#~ msgid "Wrong password"
+#~ msgstr "Невірний пароль"
+
+#~ msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
+#~ msgstr "<span weight=\"bold\" size=\"larger\">Невірний пароль.</span>"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
+#~ msgstr "<span weight=\"bold\" size=\"larger\">Цей том зашифрований.</span>"
+
+#~ msgid "Please enter your password to decrypt and mount the volume."
+#~ msgstr "Будь ласка введіть Ваш пароль для розшифровки і монтування тому."
+
+#~ msgid "_Mount"
+#~ msgstr "_Монтувати"
+
+#~ msgid "Failed to setup the encrypted volume"
+#~ msgstr "Не вдалось налаштувати зашифроватий том"
+
+#~ msgid "Choose Disc Type"
+#~ msgstr "Вибрати Тип Диску"
 
-#: ../thunar-volman-settings.desktop.in.in.h:3
-msgid "Removable Media"
-msgstr "Переносні пристрої"
+#~ msgid "Make _DVD"
+#~ msgstr "Створити _DVD"
 
+#~ msgid "Removable Media"
+#~ msgstr "Переносні пристрої"
diff --git a/po/ur.po b/po/ur.po
index 8d5a8b3..e707469 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: thunar-volman.pot\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-30 02:26-0700\n"
+"POT-Creation-Date: 2010-07-25 20:06+0200\n"
 "PO-Revision-Date: 2009-05-14 02:39+0500\n"
 "Last-Translator: Muhammad Ali Makki <makki.ma at gmail.com>\n"
 "Language-Team: Urdu <makki.ma at gmail.com>\n"
+"Language: ur\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,450 +20,608 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../thunar-volman/main.c:50
-msgid "The HAL device UDI of the newly added device"
+#: ../thunar-volman/main.c:59
+#, fuzzy
+msgid "The syfs path of the newly added device"
 msgstr "نئی شامل کردہ ڈیوائس کا HAL ڈیوائس UDI"
 
-#: ../thunar-volman/main.c:51
-#: ../thunar-volman/tvm-preferences-dialog.c:120
-#: ../thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman/main.c:60
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:104
 msgid "Configure management of removable drives and media"
 msgstr "قابلِ فصل ڈرائیوز اور میڈیا کی ادارت وضع کریں"
 
-#: ../thunar-volman/main.c:52
+#: ../thunar-volman/main.c:61
 msgid "Print version information and exit"
 msgstr "ورژن معلومات طبع کرکے برخاست کریں"
 
 #. setup application name
-#: ../thunar-volman/main.c:69
+#: ../thunar-volman/main.c:93
 msgid "Thunar Volume Manager"
 msgstr "تھنر والیم منیجر"
 
-#: ../thunar-volman/main.c:90
-msgid "Failed to open display"
-msgstr "ڈسپلے کھولنے میں ناکامی"
-
-#: ../thunar-volman/main.c:106
-msgid "The Thunar development team. All rights reserved."
-msgstr "تھنر ترقیاتی ٹیم. تمام حقوق محفوظ ہیں. اردو ترجمہ از محمد علی مکی"
-
-#: ../thunar-volman/main.c:107
-msgid "Written by Benedikt Meurer <benny at xfce.org>."
-msgstr "Benedikt Meurer <benny at xfce.org> نے لکھا."
+#: ../thunar-volman/main.c:133
+msgid "All rights reserved."
+msgstr ""
 
-#: ../thunar-volman/main.c:108
+#: ../thunar-volman/main.c:134
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "بگ <%s> رپورٹ کریں"
 
-#. TRANSLATORS: A HAL device UDI must match certain conditions to be valid (to be exact, it must be a valid D-Bus object path)
-#: ../thunar-volman/main.c:133
+#: ../thunar-volman/main.c:188
 #, c-format
-msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
-msgstr "معین کردہ UDI \"%s\" غیر موزوں HAL ڈیوائس UDI ہے"
+msgid "There is no device with the sysfs path \"%s\""
+msgstr ""
 
-#. TRANSLATORS: thunar-volman wasn't invoked with either --device-added or --configure.
-#: ../thunar-volman/main.c:144
-#, c-format
-msgid "Must specify the new HAL device UDI with --device-added"
+#: ../thunar-volman/main.c:200
+#, fuzzy, c-format
+msgid "Must specify the sysfs path of new devices with --device-added"
 msgstr "--device-added سے نئی HAL ڈیوائس UDI کا تعین لازمی ہے"
 
 #. ...so we need to prompt what to do
-#: ../thunar-volman/tvm-block-device.c:189
+#: ../thunar-volman/tvm-block-device.c:204
 msgid "Photos and Music"
 msgstr "فوٹو اور موسیقی"
 
-#: ../thunar-volman/tvm-block-device.c:190
-msgid "Photos were found on your portable music player."
+#: ../thunar-volman/tvm-block-device.c:205
+#, fuzzy
+msgid "Photos were found on your portable music player"
 msgstr "آپ کے پورٹبل موسیقی پلیئر میں فوٹو پائے گئے ہیں."
 
-#: ../thunar-volman/tvm-block-device.c:191
+#: ../thunar-volman/tvm-block-device.c:206
 msgid "Would you like to import the photos or manage the music?"
 msgstr "کیا آپ تصاویر درآمد یا موسیقی کی ادارت کرنا چاہتے ہیں؟"
 
-#: ../thunar-volman/tvm-block-device.c:192
-#: ../thunar-volman/tvm-block-device.c:258
-#: ../thunar-volman/tvm-block-device.c:335
-#: ../thunar-volman/tvm-block-device.c:371
-#: ../thunar-volman/tvm-block-device.c:430
-#: ../thunar-volman/tvm-block-device.c:703
-#: ../thunar-volman/tvm-crypto-volume.c:448
-#: ../thunar-volman/tvm-run.c:136
-#: ../thunar-volman/tvm-run.c:147
+#: ../thunar-volman/tvm-block-device.c:208
+#: ../thunar-volman/tvm-block-device.c:277
+#: ../thunar-volman/tvm-block-device.c:378
+#: ../thunar-volman/tvm-block-device.c:425
+#: ../thunar-volman/tvm-block-device.c:507
+#: ../thunar-volman/tvm-block-device.c:826 ../thunar-volman/tvm-run.c:196
+#: ../thunar-volman/tvm-run.c:207
 msgid "Ig_nore"
 msgstr "_نظر انداز"
 
-#: ../thunar-volman/tvm-block-device.c:193
-#: ../thunar-volman/tvm-block-device.c:259
+#: ../thunar-volman/tvm-block-device.c:209
+#: ../thunar-volman/tvm-block-device.c:278
 msgid "Import _Photos"
 msgstr "_تصاویر درآمد"
 
-#: ../thunar-volman/tvm-block-device.c:194
+#: ../thunar-volman/tvm-block-device.c:210
 msgid "Manage _Music"
 msgstr "_موسیقی ادارت"
 
-#. ask the user whether to import photos
-#: ../thunar-volman/tvm-block-device.c:255
+#. ask the user to import photos
+#: ../thunar-volman/tvm-block-device.c:273
 msgid "Photo Import"
 msgstr "تصاویر درآمد کریں"
 
-#: ../thunar-volman/tvm-block-device.c:256
-msgid "A photo card has been detected."
+#: ../thunar-volman/tvm-block-device.c:274
+#, fuzzy
+msgid "A photo card has been detected"
 msgstr "فوٹو کارڈ دریافت ہوا ہے."
 
-#: ../thunar-volman/tvm-block-device.c:257
-msgid "There are photos on the card. Would you like to add these photos to your album?"
-msgstr "کارڈ میں تصاویر ہیں. کیا آپ ان تصاویر کو اپنے ایلبم میں شامل کرنا چاہتے ہیں؟"
+#: ../thunar-volman/tvm-block-device.c:275
+msgid ""
+"There are photos on the card. Would you like to add these photos to your "
+"album?"
+msgstr ""
+"کارڈ میں تصاویر ہیں. کیا آپ ان تصاویر کو اپنے ایلبم میں شامل کرنا چاہتے ہیں؟"
 
-#. prompt the user whether to execute this file
-#: ../thunar-volman/tvm-block-device.c:332
-#: ../thunar-volman/tvm-block-device.c:368
+#. prompt the user to execute the file
+#. prompt the user to execute this file
+#: ../thunar-volman/tvm-block-device.c:373
+#: ../thunar-volman/tvm-block-device.c:420
 #, c-format
 msgid "Would you like to allow \"%s\" to run?"
 msgstr "کیا آپ \"%s\" کو چلنے کی اجازت دینا چاہتے ہیں؟"
 
-#: ../thunar-volman/tvm-block-device.c:333
-#: ../thunar-volman/tvm-block-device.c:369
+#: ../thunar-volman/tvm-block-device.c:376
+#: ../thunar-volman/tvm-block-device.c:423
 msgid "Auto-Run Confirmation"
 msgstr "آٹو رن تصدیق"
 
-#: ../thunar-volman/tvm-block-device.c:334
-#: ../thunar-volman/tvm-block-device.c:370
+#: ../thunar-volman/tvm-block-device.c:377
+#: ../thunar-volman/tvm-block-device.c:424
 msgid "Auto-Run capability detected"
 msgstr "آٹو رن موافقت دریافت ہوئی ہے"
 
-#: ../thunar-volman/tvm-block-device.c:336
-#: ../thunar-volman/tvm-block-device.c:372
+#: ../thunar-volman/tvm-block-device.c:379
+#: ../thunar-volman/tvm-block-device.c:426
 msgid "_Allow Auto-Run"
 msgstr "آٹو رن کی ا_جازت دیں"
 
 #. prompt the user whether to autoopen this file
-#: ../thunar-volman/tvm-block-device.c:427
+#: ../thunar-volman/tvm-block-device.c:502
 #, c-format
 msgid "Would you like to open \"%s\"?"
 msgstr "کیا آپ \"%s\" کو کھولنا چاہتے ہیں؟"
 
-#: ../thunar-volman/tvm-block-device.c:428
+#: ../thunar-volman/tvm-block-device.c:505
 msgid "Auto-Open Confirmation"
 msgstr "خودکار کھولنے کی تصدیق"
 
-#: ../thunar-volman/tvm-block-device.c:429
+#: ../thunar-volman/tvm-block-device.c:506
 msgid "Auto-Open capability detected"
 msgstr "خودکار کھولنے کی موافقت دریافت ہوئی ہے"
 
-#: ../thunar-volman/tvm-block-device.c:431
+#: ../thunar-volman/tvm-block-device.c:508
 msgid "_Open"
 msgstr "_کھولیں"
 
-#. ask what do with the mixed audio/data disc
-#: ../thunar-volman/tvm-block-device.c:700
-msgid "Audio / Data CD"
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "CD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "DVD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:618
+msgid "The CD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:619
+msgid "The DVD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:629
+msgid "Volume mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:632
+#, c-format
+msgid "The volume \"%s\" was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:637
+#, c-format
+msgid "The inserted volume was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:691
+#, c-format
+msgid "Unable to locate mount point"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:737
+#, c-format
+msgid "Unable to mount the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:746
+#, c-format
+msgid "Could not detect the volume corresponding to the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:821
+#, fuzzy
+msgid "Audio/Data CD"
 msgstr "صوتی / ڈیٹا سی ڈی"
 
-#: ../thunar-volman/tvm-block-device.c:701
-msgid "The CD in the drive contains both music and files."
+#: ../thunar-volman/tvm-block-device.c:822
+#, fuzzy
+msgid "The CD in the drive contains both music and files"
 msgstr "ڈرائیو میں موجود سی ڈی میں موسیقی اور فائلیں دونوں ہیں."
 
-#: ../thunar-volman/tvm-block-device.c:702
+#: ../thunar-volman/tvm-block-device.c:824
 msgid "Would you like to listen to music or browse the files?"
 msgstr "کیا آپ موسیقی سننا یا فائلیں دیکھنا چاہتے ہیں؟"
 
-#: ../thunar-volman/tvm-block-device.c:704
+#: ../thunar-volman/tvm-block-device.c:827
 msgid "_Browse Files"
 msgstr "_فائلیں دیکھیں"
 
-#: ../thunar-volman/tvm-block-device.c:705
+#: ../thunar-volman/tvm-block-device.c:828
 msgid "_Play CD"
 msgstr "سی ڈی _چلائیں"
 
-#: ../thunar-volman/tvm-command-entry.c:233
-msgid "Select an Application"
-msgstr "اطلاقیہ منتخب کریں"
+#: ../thunar-volman/tvm-block-device.c:916
+#, c-format
+msgid "Unknown block device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:243
-msgid "All Files"
-msgstr "تمام فائلیں"
+#: ../thunar-volman/tvm-device.c:139
+#, c-format
+msgid "Device type not supported"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:248
-msgid "Executable Files"
-msgstr "اطلاقی فائلیں"
+#: ../thunar-volman/tvm-input-device.c:74
+#, fuzzy
+msgid "input-keyboard"
+msgstr "کیبورڈ"
 
-#: ../thunar-volman/tvm-command-entry.c:263
-msgid "Perl Scripts"
-msgstr "پرل سکرپٹ"
+#: ../thunar-volman/tvm-input-device.c:75
+#, fuzzy
+msgid "Keyboard detected"
+msgstr "کیبورڈ"
 
-#: ../thunar-volman/tvm-command-entry.c:269
-msgid "Python Scripts"
-msgstr "پائتھن سکرپٹ"
+#: ../thunar-volman/tvm-input-device.c:76
+#, fuzzy
+msgid "A keyboard was detected"
+msgstr "فوٹو کارڈ دریافت ہوا ہے."
 
-#: ../thunar-volman/tvm-command-entry.c:275
-msgid "Ruby Scripts"
-msgstr "روبی سکرپٹ"
+#: ../thunar-volman/tvm-input-device.c:86
+#: ../thunar-volman/tvm-input-device.c:100
+msgid "input-tablet"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:281
-msgid "Shell Scripts"
-msgstr "شیل سکرپٹ"
+#: ../thunar-volman/tvm-input-device.c:87
+#: ../thunar-volman/tvm-input-device.c:101
+#, fuzzy
+msgid "Tablet detected"
+msgstr "آٹو رن موافقت دریافت ہوئی ہے"
+
+#: ../thunar-volman/tvm-input-device.c:88
+#: ../thunar-volman/tvm-input-device.c:102
+msgid "A graphics tablet was detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:286
-#: ../thunar-volman/tvm-crypto-volume.c:443
-msgid "Encrypted volume"
-msgstr "رمز شدہ (انکرپٹڈ) والیم"
+#: ../thunar-volman/tvm-input-device.c:110
+msgid "input-mouse"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:297
-msgid "<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">رمز شدہ (انکرپٹڈ) والیم ماؤنٹ کیا جارہا ہے...</span>"
+#: ../thunar-volman/tvm-input-device.c:111
+msgid "Mouse detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:302
-msgid "Setting up the crypto layer..."
-msgstr "کرپٹو تہہ مرتب کی جارہی ہے..."
+#: ../thunar-volman/tvm-input-device.c:112
+msgid "A mouse was detected"
+msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) but got Permission denied.
-#: ../thunar-volman/tvm-crypto-volume.c:369
+#: ../thunar-volman/tvm-input-device.c:139
 #, c-format
-msgid "You are not privileged to setup the crypto layer"
-msgstr "آپ کو کرپٹو تہہ مرتب کرنے کی اجازت نہیں ہے"
+msgid "Unsupported input device type"
+msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) and typed the wrong password.
-#: ../thunar-volman/tvm-crypto-volume.c:374
+#: ../thunar-volman/tvm-run.c:173
 #, c-format
-msgid "Wrong password"
-msgstr "غلط پاس ورڈ"
+msgid "Autoburning of blank CDs and DVDs is disabled"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:445
-msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">غلط پاس ورڈ.</span>"
+#: ../thunar-volman/tvm-run.c:193
+msgid "Blank DVD inserted"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:446
-msgid "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">والیم رمز (انکرپٹڈ) ہے.</span>"
+#: ../thunar-volman/tvm-run.c:194
+#, fuzzy
+msgid "You have inserted a blank DVD."
+msgstr "آپ نے ایک خالی سی ڈی داخل کی ہے."
 
-#: ../thunar-volman/tvm-crypto-volume.c:447
-msgid "Please enter your password to decrypt and mount the volume."
-msgstr "والیم کو غیر رمز شدہ اور ماؤنٹ کرنے کے لیے اپنا پاس ورڈ لکھیں."
+#: ../thunar-volman/tvm-run.c:195 ../thunar-volman/tvm-run.c:206
+msgid "What would you like to do?"
+msgstr "آپ کیا کرنا چاہتے ہیں؟"
 
-#: ../thunar-volman/tvm-crypto-volume.c:449
-msgid "_Mount"
-msgstr "-ماؤنٹ"
+#: ../thunar-volman/tvm-run.c:197
+msgid "Burn _DVD"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:468
-msgid "Failed to setup the encrypted volume"
-msgstr "رمز شدہ (انکرپٹڈ) والیم کو مرتب کرنے میں ناکامی"
+#: ../thunar-volman/tvm-run.c:204
+#, fuzzy
+msgid "Blank CD inserted"
+msgstr "خالی سیڈیاں اور ڈی وی ڈی"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:119
-#: ../thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman/tvm-run.c:205
+#, fuzzy
+msgid "You have inserted a blank CD."
+msgstr "آپ نے ایک خالی سی ڈی داخل کی ہے."
+
+#: ../thunar-volman/tvm-run.c:208
+#, fuzzy
+msgid "Burn _Data CD"
+msgstr "_ڈیٹا سی ڈی بنائیں"
+
+#: ../thunar-volman/tvm-run.c:209
+#, fuzzy
+msgid "Burn _Audio CD"
+msgstr "_صوتی سی ڈی بنائیں"
+
+#: ../thunar-volman/tvm-run.c:233
+#, c-format
+msgid "The burn command may not be empty"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:272
+#, c-format
+msgid "The CD player command is undefined"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:66
+msgid "Camera detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:67
+#, fuzzy
+msgid "A photo camera was detected"
+msgstr "فوٹو کارڈ دریافت ہوا ہے."
+
+#: ../thunar-volman/tvm-usb-device.c:77
+msgid "Printer detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:78
+msgid "A USB printer was detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:104
+#, c-format
+msgid "Unsupported USB device type"
+msgstr ""
+
+#. setup application name
+#: ../thunar-volman-settings/main.c:52
+#, fuzzy
+msgid "Thunar Volume Manager Settings"
+msgstr "تھنر والیم منیجر"
+
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:102
 msgid "Removable Drives and Media"
 msgstr "قابلِ فصل ڈرئیوز اور میڈیا"
 
+#: ../thunar-volman-settings/tvm-command-entry.c:240
+msgid "Select an Application"
+msgstr "اطلاقیہ منتخب کریں"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:250
+msgid "All Files"
+msgstr "تمام فائلیں"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:255
+msgid "Executable Files"
+msgstr "اطلاقی فائلیں"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:270
+msgid "Perl Scripts"
+msgstr "پرل سکرپٹ"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:276
+msgid "Python Scripts"
+msgstr "پائتھن سکرپٹ"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:282
+msgid "Ruby Scripts"
+msgstr "روبی سکرپٹ"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:288
+msgid "Shell Scripts"
+msgstr "شیل سکرپٹ"
+
 #.
 #. Storage
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:143
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:130
 msgid "Storage"
 msgstr "سٹوریج"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:153
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:141
 msgid "Removable Storage"
 msgstr "قابلِ فصل سٹوریج"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:170
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:158
 msgid "_Mount removable drives when hot-plugged"
 msgstr "ہاٹ-پلگ پر قابلِ فصل ڈرائیوز _ماؤنٹ کریں"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:175
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:166
 msgid "Mount removable media when _inserted"
 msgstr "قابلِ فصل میڈیا داخل کیے جانے پر ماؤنٹ کریں"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:180
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:174
 msgid "B_rowse removable media when inserted"
 msgstr "قابلِ فصل میڈیا داخل کیے جانے پر براؤز کریں"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:185
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:182
 msgid "_Auto-run programs on new drives and media"
 msgstr "نئی ڈرائیو اور میڈیا پر خودکار پروگرام چلائیں"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:190
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:189
 msgid "Auto-open files on new drives and media"
 msgstr "نئی ڈرائیو اور میڈیا پر خودکار فائلیں کھولیں"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:199
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:201
 msgid "Blank CDs and DVDs"
 msgstr "خالی سیڈیاں اور ڈی وی ڈی"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:216
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:218
 msgid "_Burn a CD or DVD when a blank disc is inserted"
 msgstr "جب خالی ڈسک داخل کی جائے سی ڈی یا ڈی وی ڈی ب_رن کریں"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:224
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:229
 msgid "Command for _Data CDs:"
 msgstr "_ڈیٹا سیڈیوں کے لیے کمانڈ:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:231
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:239
 msgid "Command for A_udio CDs:"
 msgstr "_صوتی سیڈیوں کے لیے کمانڈ:"
 
 #.
 #. Multimedia
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:245
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:255
 msgid "Multimedia"
 msgstr "ملٹی میڈیا"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:255
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:266
 msgid "Audio CDs"
 msgstr "صوتی سیڈیاں"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:272
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:283
 msgid "Play _audio CDs when inserted"
 msgstr "داخل کیے جانے پر صوتی سیڈیاں چلائیں"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:277
-#: ../thunar-volman/tvm-preferences-dialog.c:383
-#: ../thunar-volman/tvm-preferences-dialog.c:425
-#: ../thunar-volman/tvm-preferences-dialog.c:499
-#: ../thunar-volman/tvm-preferences-dialog.c:541
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:290
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:415
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:466
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:553
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:601
 msgid "_Command:"
 msgstr "_کمانڈ:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:287
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:304
 msgid "Video CDs/DVDs"
 msgstr "ویڈیو سیڈیاں/ڈی وی ڈی"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:304
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:321
 msgid "Play _video CDs and DVDs when inserted"
 msgstr "داخل کیے جانے پر _ویڈیو سیڈیاں اور ڈی وی ڈی چلائیں"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:309
-#: ../thunar-volman/tvm-preferences-dialog.c:341
-#: ../thunar-volman/tvm-preferences-dialog.c:457
-#: ../thunar-volman/tvm-preferences-dialog.c:573
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:329
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:367
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:505
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:640
 msgid "C_ommand:"
 msgstr "ک_مانڈ:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:319
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:343
 msgid "Portable Music Players"
 msgstr "پورٹبل موسیقی پلیئرز"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:336
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:360
 msgid "Play _music files when connected"
 msgstr "متصل ہونے پر مو_سیقی فائلیں چلائیں"
 
 #.
 #. Cameras
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:351
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:379
 msgid "Cameras"
 msgstr "کیمرے"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:361
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:390
 msgid "Digital Cameras"
 msgstr "رقمی کیمرے"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:378
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:407
 msgid "Import digital photographs when connected"
 msgstr "متصل ہونے پر رقمی فوٹوگراف درآمد کریں"
 
 #.
 #. PDAs
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:393
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:427
 msgid "PDAs"
 msgstr "PDAs"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:403
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:441
 msgid "Palm™"
 msgstr "Palm™"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:420
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:458
 msgid "Sync _Palm™ devices when connected"
 msgstr "متصل ہونے پر Palm™ ڈیوائسس ہم آہنگ کریں"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:435
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:480
 msgid "Pocket PCs"
 msgstr "پاکٹ PCs"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:452
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:497
 msgid "Sync Pocket P_C devices when connected"
 msgstr "متصل ہونے پر پاکٹ پی سی ڈیوائسز کو ہم آہنگ کریں"
 
 #.
 #. Printers
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:467
-#: ../thunar-volman/tvm-preferences-dialog.c:477
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:517
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:528
 msgid "Printers"
 msgstr "پرنٹرز"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:494
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:545
 msgid "Automatically run a program when a _printer is connected"
 msgstr "_پرنٹر کے متصل ہونے پر خودکار طور پر پروگرام چلائیں"
 
 #.
 #. Input Devices
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:509
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:565
 msgid "Input Devices"
 msgstr "ماداخل ڈیوائسس"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:519
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:576
 msgid "Keyboards"
 msgstr "کیبورڈ"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:536
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:593
 msgid "Automatically run a program when an USB _keyboard is connected"
 msgstr "یو ایس بی کیبورڈ متصل ہونے پر پروگرام خودکار طور پر چلائیں"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:551
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:615
 msgid "Mice"
 msgstr "مائیس"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:568
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:632
 msgid "Automatically run a program when an USB _mouse is connected"
 msgstr "یو ایس بی ماؤس متصل ہونے پر خودکار طور پر پروگرام چلائیں"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:583
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:654
 msgid "Tablet"
 msgstr "ٹیبلیٹ"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:600
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:671
 msgid "Automatically run a program when a _tablet is connected"
 msgstr "ٹیبلیٹ کے متصل ہونے پر خودکار طور پر پروگرام چلائیں"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:605
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:679
 msgid "Com_mand:"
 msgstr "کم_انڈ:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:690
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:755
 msgid "Failed to open the documentation browser"
 msgstr "دستاویزات براؤزر کھولنے میں ناکامی"
 
-#: ../thunar-volman/tvm-run.c:133
-#: ../thunar-volman/tvm-run.c:144
-msgid "Choose Disc Type"
-msgstr "ڈسک کی نوعیت منتخب کریں"
+#~ msgid "Failed to open display"
+#~ msgstr "ڈسپلے کھولنے میں ناکامی"
 
-#: ../thunar-volman/tvm-run.c:134
-#: ../thunar-volman/tvm-run.c:145
-msgid "You have inserted a blank disc."
-msgstr "آپ نے ایک خالی سی ڈی داخل کی ہے."
+#~ msgid "The Thunar development team. All rights reserved."
+#~ msgstr "تھنر ترقیاتی ٹیم. تمام حقوق محفوظ ہیں. اردو ترجمہ از محمد علی مکی"
 
-#: ../thunar-volman/tvm-run.c:135
-#: ../thunar-volman/tvm-run.c:146
-msgid "What would you like to do?"
-msgstr "آپ کیا کرنا چاہتے ہیں؟"
+#~ msgid "Written by Benedikt Meurer <benny at xfce.org>."
+#~ msgstr "Benedikt Meurer <benny at xfce.org> نے لکھا."
 
-#: ../thunar-volman/tvm-run.c:137
-msgid "Make _DVD"
-msgstr "_ڈی وی ڈی بنائیں"
+#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
+#~ msgstr "معین کردہ UDI \"%s\" غیر موزوں HAL ڈیوائس UDI ہے"
 
-#: ../thunar-volman/tvm-run.c:148
-msgid "Make _Data CD"
-msgstr "_ڈیٹا سی ڈی بنائیں"
+#~ msgid "Encrypted volume"
+#~ msgstr "رمز شدہ (انکرپٹڈ) والیم"
 
-#: ../thunar-volman/tvm-run.c:149
-msgid "Make _Audio CD"
-msgstr "_صوتی سی ڈی بنائیں"
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">رمز شدہ (انکرپٹڈ) والیم ماؤنٹ کیا "
+#~ "جارہا ہے...</span>"
+
+#~ msgid "Setting up the crypto layer..."
+#~ msgstr "کرپٹو تہہ مرتب کی جارہی ہے..."
+
+#~ msgid "You are not privileged to setup the crypto layer"
+#~ msgstr "آپ کو کرپٹو تہہ مرتب کرنے کی اجازت نہیں ہے"
+
+#~ msgid "Wrong password"
+#~ msgstr "غلط پاس ورڈ"
+
+#~ msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
+#~ msgstr "<span weight=\"bold\" size=\"larger\">غلط پاس ورڈ.</span>"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">والیم رمز (انکرپٹڈ) ہے.</span>"
+
+#~ msgid "Please enter your password to decrypt and mount the volume."
+#~ msgstr "والیم کو غیر رمز شدہ اور ماؤنٹ کرنے کے لیے اپنا پاس ورڈ لکھیں."
+
+#~ msgid "_Mount"
+#~ msgstr "-ماؤنٹ"
+
+#~ msgid "Failed to setup the encrypted volume"
+#~ msgstr "رمز شدہ (انکرپٹڈ) والیم کو مرتب کرنے میں ناکامی"
+
+#~ msgid "Choose Disc Type"
+#~ msgstr "ڈسک کی نوعیت منتخب کریں"
 
-#: ../thunar-volman-settings.desktop.in.in.h:3
-msgid "Removable Media"
-msgstr "قابلِ فصل میڈیا"
+#~ msgid "Make _DVD"
+#~ msgstr "_ڈی وی ڈی بنائیں"
 
+#~ msgid "Removable Media"
+#~ msgstr "قابلِ فصل میڈیا"
diff --git a/po/ur_PK.po b/po/ur_PK.po
index 8d5a8b3..e707469 100644
--- a/po/ur_PK.po
+++ b/po/ur_PK.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: thunar-volman.pot\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-30 02:26-0700\n"
+"POT-Creation-Date: 2010-07-25 20:06+0200\n"
 "PO-Revision-Date: 2009-05-14 02:39+0500\n"
 "Last-Translator: Muhammad Ali Makki <makki.ma at gmail.com>\n"
 "Language-Team: Urdu <makki.ma at gmail.com>\n"
+"Language: ur\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,450 +20,608 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../thunar-volman/main.c:50
-msgid "The HAL device UDI of the newly added device"
+#: ../thunar-volman/main.c:59
+#, fuzzy
+msgid "The syfs path of the newly added device"
 msgstr "نئی شامل کردہ ڈیوائس کا HAL ڈیوائس UDI"
 
-#: ../thunar-volman/main.c:51
-#: ../thunar-volman/tvm-preferences-dialog.c:120
-#: ../thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman/main.c:60
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:104
 msgid "Configure management of removable drives and media"
 msgstr "قابلِ فصل ڈرائیوز اور میڈیا کی ادارت وضع کریں"
 
-#: ../thunar-volman/main.c:52
+#: ../thunar-volman/main.c:61
 msgid "Print version information and exit"
 msgstr "ورژن معلومات طبع کرکے برخاست کریں"
 
 #. setup application name
-#: ../thunar-volman/main.c:69
+#: ../thunar-volman/main.c:93
 msgid "Thunar Volume Manager"
 msgstr "تھنر والیم منیجر"
 
-#: ../thunar-volman/main.c:90
-msgid "Failed to open display"
-msgstr "ڈسپلے کھولنے میں ناکامی"
-
-#: ../thunar-volman/main.c:106
-msgid "The Thunar development team. All rights reserved."
-msgstr "تھنر ترقیاتی ٹیم. تمام حقوق محفوظ ہیں. اردو ترجمہ از محمد علی مکی"
-
-#: ../thunar-volman/main.c:107
-msgid "Written by Benedikt Meurer <benny at xfce.org>."
-msgstr "Benedikt Meurer <benny at xfce.org> نے لکھا."
+#: ../thunar-volman/main.c:133
+msgid "All rights reserved."
+msgstr ""
 
-#: ../thunar-volman/main.c:108
+#: ../thunar-volman/main.c:134
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "بگ <%s> رپورٹ کریں"
 
-#. TRANSLATORS: A HAL device UDI must match certain conditions to be valid (to be exact, it must be a valid D-Bus object path)
-#: ../thunar-volman/main.c:133
+#: ../thunar-volman/main.c:188
 #, c-format
-msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
-msgstr "معین کردہ UDI \"%s\" غیر موزوں HAL ڈیوائس UDI ہے"
+msgid "There is no device with the sysfs path \"%s\""
+msgstr ""
 
-#. TRANSLATORS: thunar-volman wasn't invoked with either --device-added or --configure.
-#: ../thunar-volman/main.c:144
-#, c-format
-msgid "Must specify the new HAL device UDI with --device-added"
+#: ../thunar-volman/main.c:200
+#, fuzzy, c-format
+msgid "Must specify the sysfs path of new devices with --device-added"
 msgstr "--device-added سے نئی HAL ڈیوائس UDI کا تعین لازمی ہے"
 
 #. ...so we need to prompt what to do
-#: ../thunar-volman/tvm-block-device.c:189
+#: ../thunar-volman/tvm-block-device.c:204
 msgid "Photos and Music"
 msgstr "فوٹو اور موسیقی"
 
-#: ../thunar-volman/tvm-block-device.c:190
-msgid "Photos were found on your portable music player."
+#: ../thunar-volman/tvm-block-device.c:205
+#, fuzzy
+msgid "Photos were found on your portable music player"
 msgstr "آپ کے پورٹبل موسیقی پلیئر میں فوٹو پائے گئے ہیں."
 
-#: ../thunar-volman/tvm-block-device.c:191
+#: ../thunar-volman/tvm-block-device.c:206
 msgid "Would you like to import the photos or manage the music?"
 msgstr "کیا آپ تصاویر درآمد یا موسیقی کی ادارت کرنا چاہتے ہیں؟"
 
-#: ../thunar-volman/tvm-block-device.c:192
-#: ../thunar-volman/tvm-block-device.c:258
-#: ../thunar-volman/tvm-block-device.c:335
-#: ../thunar-volman/tvm-block-device.c:371
-#: ../thunar-volman/tvm-block-device.c:430
-#: ../thunar-volman/tvm-block-device.c:703
-#: ../thunar-volman/tvm-crypto-volume.c:448
-#: ../thunar-volman/tvm-run.c:136
-#: ../thunar-volman/tvm-run.c:147
+#: ../thunar-volman/tvm-block-device.c:208
+#: ../thunar-volman/tvm-block-device.c:277
+#: ../thunar-volman/tvm-block-device.c:378
+#: ../thunar-volman/tvm-block-device.c:425
+#: ../thunar-volman/tvm-block-device.c:507
+#: ../thunar-volman/tvm-block-device.c:826 ../thunar-volman/tvm-run.c:196
+#: ../thunar-volman/tvm-run.c:207
 msgid "Ig_nore"
 msgstr "_نظر انداز"
 
-#: ../thunar-volman/tvm-block-device.c:193
-#: ../thunar-volman/tvm-block-device.c:259
+#: ../thunar-volman/tvm-block-device.c:209
+#: ../thunar-volman/tvm-block-device.c:278
 msgid "Import _Photos"
 msgstr "_تصاویر درآمد"
 
-#: ../thunar-volman/tvm-block-device.c:194
+#: ../thunar-volman/tvm-block-device.c:210
 msgid "Manage _Music"
 msgstr "_موسیقی ادارت"
 
-#. ask the user whether to import photos
-#: ../thunar-volman/tvm-block-device.c:255
+#. ask the user to import photos
+#: ../thunar-volman/tvm-block-device.c:273
 msgid "Photo Import"
 msgstr "تصاویر درآمد کریں"
 
-#: ../thunar-volman/tvm-block-device.c:256
-msgid "A photo card has been detected."
+#: ../thunar-volman/tvm-block-device.c:274
+#, fuzzy
+msgid "A photo card has been detected"
 msgstr "فوٹو کارڈ دریافت ہوا ہے."
 
-#: ../thunar-volman/tvm-block-device.c:257
-msgid "There are photos on the card. Would you like to add these photos to your album?"
-msgstr "کارڈ میں تصاویر ہیں. کیا آپ ان تصاویر کو اپنے ایلبم میں شامل کرنا چاہتے ہیں؟"
+#: ../thunar-volman/tvm-block-device.c:275
+msgid ""
+"There are photos on the card. Would you like to add these photos to your "
+"album?"
+msgstr ""
+"کارڈ میں تصاویر ہیں. کیا آپ ان تصاویر کو اپنے ایلبم میں شامل کرنا چاہتے ہیں؟"
 
-#. prompt the user whether to execute this file
-#: ../thunar-volman/tvm-block-device.c:332
-#: ../thunar-volman/tvm-block-device.c:368
+#. prompt the user to execute the file
+#. prompt the user to execute this file
+#: ../thunar-volman/tvm-block-device.c:373
+#: ../thunar-volman/tvm-block-device.c:420
 #, c-format
 msgid "Would you like to allow \"%s\" to run?"
 msgstr "کیا آپ \"%s\" کو چلنے کی اجازت دینا چاہتے ہیں؟"
 
-#: ../thunar-volman/tvm-block-device.c:333
-#: ../thunar-volman/tvm-block-device.c:369
+#: ../thunar-volman/tvm-block-device.c:376
+#: ../thunar-volman/tvm-block-device.c:423
 msgid "Auto-Run Confirmation"
 msgstr "آٹو رن تصدیق"
 
-#: ../thunar-volman/tvm-block-device.c:334
-#: ../thunar-volman/tvm-block-device.c:370
+#: ../thunar-volman/tvm-block-device.c:377
+#: ../thunar-volman/tvm-block-device.c:424
 msgid "Auto-Run capability detected"
 msgstr "آٹو رن موافقت دریافت ہوئی ہے"
 
-#: ../thunar-volman/tvm-block-device.c:336
-#: ../thunar-volman/tvm-block-device.c:372
+#: ../thunar-volman/tvm-block-device.c:379
+#: ../thunar-volman/tvm-block-device.c:426
 msgid "_Allow Auto-Run"
 msgstr "آٹو رن کی ا_جازت دیں"
 
 #. prompt the user whether to autoopen this file
-#: ../thunar-volman/tvm-block-device.c:427
+#: ../thunar-volman/tvm-block-device.c:502
 #, c-format
 msgid "Would you like to open \"%s\"?"
 msgstr "کیا آپ \"%s\" کو کھولنا چاہتے ہیں؟"
 
-#: ../thunar-volman/tvm-block-device.c:428
+#: ../thunar-volman/tvm-block-device.c:505
 msgid "Auto-Open Confirmation"
 msgstr "خودکار کھولنے کی تصدیق"
 
-#: ../thunar-volman/tvm-block-device.c:429
+#: ../thunar-volman/tvm-block-device.c:506
 msgid "Auto-Open capability detected"
 msgstr "خودکار کھولنے کی موافقت دریافت ہوئی ہے"
 
-#: ../thunar-volman/tvm-block-device.c:431
+#: ../thunar-volman/tvm-block-device.c:508
 msgid "_Open"
 msgstr "_کھولیں"
 
-#. ask what do with the mixed audio/data disc
-#: ../thunar-volman/tvm-block-device.c:700
-msgid "Audio / Data CD"
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "CD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "DVD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:618
+msgid "The CD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:619
+msgid "The DVD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:629
+msgid "Volume mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:632
+#, c-format
+msgid "The volume \"%s\" was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:637
+#, c-format
+msgid "The inserted volume was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:691
+#, c-format
+msgid "Unable to locate mount point"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:737
+#, c-format
+msgid "Unable to mount the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:746
+#, c-format
+msgid "Could not detect the volume corresponding to the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:821
+#, fuzzy
+msgid "Audio/Data CD"
 msgstr "صوتی / ڈیٹا سی ڈی"
 
-#: ../thunar-volman/tvm-block-device.c:701
-msgid "The CD in the drive contains both music and files."
+#: ../thunar-volman/tvm-block-device.c:822
+#, fuzzy
+msgid "The CD in the drive contains both music and files"
 msgstr "ڈرائیو میں موجود سی ڈی میں موسیقی اور فائلیں دونوں ہیں."
 
-#: ../thunar-volman/tvm-block-device.c:702
+#: ../thunar-volman/tvm-block-device.c:824
 msgid "Would you like to listen to music or browse the files?"
 msgstr "کیا آپ موسیقی سننا یا فائلیں دیکھنا چاہتے ہیں؟"
 
-#: ../thunar-volman/tvm-block-device.c:704
+#: ../thunar-volman/tvm-block-device.c:827
 msgid "_Browse Files"
 msgstr "_فائلیں دیکھیں"
 
-#: ../thunar-volman/tvm-block-device.c:705
+#: ../thunar-volman/tvm-block-device.c:828
 msgid "_Play CD"
 msgstr "سی ڈی _چلائیں"
 
-#: ../thunar-volman/tvm-command-entry.c:233
-msgid "Select an Application"
-msgstr "اطلاقیہ منتخب کریں"
+#: ../thunar-volman/tvm-block-device.c:916
+#, c-format
+msgid "Unknown block device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:243
-msgid "All Files"
-msgstr "تمام فائلیں"
+#: ../thunar-volman/tvm-device.c:139
+#, c-format
+msgid "Device type not supported"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:248
-msgid "Executable Files"
-msgstr "اطلاقی فائلیں"
+#: ../thunar-volman/tvm-input-device.c:74
+#, fuzzy
+msgid "input-keyboard"
+msgstr "کیبورڈ"
 
-#: ../thunar-volman/tvm-command-entry.c:263
-msgid "Perl Scripts"
-msgstr "پرل سکرپٹ"
+#: ../thunar-volman/tvm-input-device.c:75
+#, fuzzy
+msgid "Keyboard detected"
+msgstr "کیبورڈ"
 
-#: ../thunar-volman/tvm-command-entry.c:269
-msgid "Python Scripts"
-msgstr "پائتھن سکرپٹ"
+#: ../thunar-volman/tvm-input-device.c:76
+#, fuzzy
+msgid "A keyboard was detected"
+msgstr "فوٹو کارڈ دریافت ہوا ہے."
 
-#: ../thunar-volman/tvm-command-entry.c:275
-msgid "Ruby Scripts"
-msgstr "روبی سکرپٹ"
+#: ../thunar-volman/tvm-input-device.c:86
+#: ../thunar-volman/tvm-input-device.c:100
+msgid "input-tablet"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:281
-msgid "Shell Scripts"
-msgstr "شیل سکرپٹ"
+#: ../thunar-volman/tvm-input-device.c:87
+#: ../thunar-volman/tvm-input-device.c:101
+#, fuzzy
+msgid "Tablet detected"
+msgstr "آٹو رن موافقت دریافت ہوئی ہے"
+
+#: ../thunar-volman/tvm-input-device.c:88
+#: ../thunar-volman/tvm-input-device.c:102
+msgid "A graphics tablet was detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:286
-#: ../thunar-volman/tvm-crypto-volume.c:443
-msgid "Encrypted volume"
-msgstr "رمز شدہ (انکرپٹڈ) والیم"
+#: ../thunar-volman/tvm-input-device.c:110
+msgid "input-mouse"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:297
-msgid "<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">رمز شدہ (انکرپٹڈ) والیم ماؤنٹ کیا جارہا ہے...</span>"
+#: ../thunar-volman/tvm-input-device.c:111
+msgid "Mouse detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:302
-msgid "Setting up the crypto layer..."
-msgstr "کرپٹو تہہ مرتب کی جارہی ہے..."
+#: ../thunar-volman/tvm-input-device.c:112
+msgid "A mouse was detected"
+msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) but got Permission denied.
-#: ../thunar-volman/tvm-crypto-volume.c:369
+#: ../thunar-volman/tvm-input-device.c:139
 #, c-format
-msgid "You are not privileged to setup the crypto layer"
-msgstr "آپ کو کرپٹو تہہ مرتب کرنے کی اجازت نہیں ہے"
+msgid "Unsupported input device type"
+msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) and typed the wrong password.
-#: ../thunar-volman/tvm-crypto-volume.c:374
+#: ../thunar-volman/tvm-run.c:173
 #, c-format
-msgid "Wrong password"
-msgstr "غلط پاس ورڈ"
+msgid "Autoburning of blank CDs and DVDs is disabled"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:445
-msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">غلط پاس ورڈ.</span>"
+#: ../thunar-volman/tvm-run.c:193
+msgid "Blank DVD inserted"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:446
-msgid "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">والیم رمز (انکرپٹڈ) ہے.</span>"
+#: ../thunar-volman/tvm-run.c:194
+#, fuzzy
+msgid "You have inserted a blank DVD."
+msgstr "آپ نے ایک خالی سی ڈی داخل کی ہے."
 
-#: ../thunar-volman/tvm-crypto-volume.c:447
-msgid "Please enter your password to decrypt and mount the volume."
-msgstr "والیم کو غیر رمز شدہ اور ماؤنٹ کرنے کے لیے اپنا پاس ورڈ لکھیں."
+#: ../thunar-volman/tvm-run.c:195 ../thunar-volman/tvm-run.c:206
+msgid "What would you like to do?"
+msgstr "آپ کیا کرنا چاہتے ہیں؟"
 
-#: ../thunar-volman/tvm-crypto-volume.c:449
-msgid "_Mount"
-msgstr "-ماؤنٹ"
+#: ../thunar-volman/tvm-run.c:197
+msgid "Burn _DVD"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:468
-msgid "Failed to setup the encrypted volume"
-msgstr "رمز شدہ (انکرپٹڈ) والیم کو مرتب کرنے میں ناکامی"
+#: ../thunar-volman/tvm-run.c:204
+#, fuzzy
+msgid "Blank CD inserted"
+msgstr "خالی سیڈیاں اور ڈی وی ڈی"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:119
-#: ../thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman/tvm-run.c:205
+#, fuzzy
+msgid "You have inserted a blank CD."
+msgstr "آپ نے ایک خالی سی ڈی داخل کی ہے."
+
+#: ../thunar-volman/tvm-run.c:208
+#, fuzzy
+msgid "Burn _Data CD"
+msgstr "_ڈیٹا سی ڈی بنائیں"
+
+#: ../thunar-volman/tvm-run.c:209
+#, fuzzy
+msgid "Burn _Audio CD"
+msgstr "_صوتی سی ڈی بنائیں"
+
+#: ../thunar-volman/tvm-run.c:233
+#, c-format
+msgid "The burn command may not be empty"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:272
+#, c-format
+msgid "The CD player command is undefined"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:66
+msgid "Camera detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:67
+#, fuzzy
+msgid "A photo camera was detected"
+msgstr "فوٹو کارڈ دریافت ہوا ہے."
+
+#: ../thunar-volman/tvm-usb-device.c:77
+msgid "Printer detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:78
+msgid "A USB printer was detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:104
+#, c-format
+msgid "Unsupported USB device type"
+msgstr ""
+
+#. setup application name
+#: ../thunar-volman-settings/main.c:52
+#, fuzzy
+msgid "Thunar Volume Manager Settings"
+msgstr "تھنر والیم منیجر"
+
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:102
 msgid "Removable Drives and Media"
 msgstr "قابلِ فصل ڈرئیوز اور میڈیا"
 
+#: ../thunar-volman-settings/tvm-command-entry.c:240
+msgid "Select an Application"
+msgstr "اطلاقیہ منتخب کریں"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:250
+msgid "All Files"
+msgstr "تمام فائلیں"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:255
+msgid "Executable Files"
+msgstr "اطلاقی فائلیں"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:270
+msgid "Perl Scripts"
+msgstr "پرل سکرپٹ"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:276
+msgid "Python Scripts"
+msgstr "پائتھن سکرپٹ"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:282
+msgid "Ruby Scripts"
+msgstr "روبی سکرپٹ"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:288
+msgid "Shell Scripts"
+msgstr "شیل سکرپٹ"
+
 #.
 #. Storage
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:143
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:130
 msgid "Storage"
 msgstr "سٹوریج"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:153
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:141
 msgid "Removable Storage"
 msgstr "قابلِ فصل سٹوریج"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:170
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:158
 msgid "_Mount removable drives when hot-plugged"
 msgstr "ہاٹ-پلگ پر قابلِ فصل ڈرائیوز _ماؤنٹ کریں"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:175
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:166
 msgid "Mount removable media when _inserted"
 msgstr "قابلِ فصل میڈیا داخل کیے جانے پر ماؤنٹ کریں"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:180
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:174
 msgid "B_rowse removable media when inserted"
 msgstr "قابلِ فصل میڈیا داخل کیے جانے پر براؤز کریں"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:185
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:182
 msgid "_Auto-run programs on new drives and media"
 msgstr "نئی ڈرائیو اور میڈیا پر خودکار پروگرام چلائیں"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:190
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:189
 msgid "Auto-open files on new drives and media"
 msgstr "نئی ڈرائیو اور میڈیا پر خودکار فائلیں کھولیں"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:199
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:201
 msgid "Blank CDs and DVDs"
 msgstr "خالی سیڈیاں اور ڈی وی ڈی"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:216
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:218
 msgid "_Burn a CD or DVD when a blank disc is inserted"
 msgstr "جب خالی ڈسک داخل کی جائے سی ڈی یا ڈی وی ڈی ب_رن کریں"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:224
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:229
 msgid "Command for _Data CDs:"
 msgstr "_ڈیٹا سیڈیوں کے لیے کمانڈ:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:231
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:239
 msgid "Command for A_udio CDs:"
 msgstr "_صوتی سیڈیوں کے لیے کمانڈ:"
 
 #.
 #. Multimedia
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:245
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:255
 msgid "Multimedia"
 msgstr "ملٹی میڈیا"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:255
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:266
 msgid "Audio CDs"
 msgstr "صوتی سیڈیاں"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:272
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:283
 msgid "Play _audio CDs when inserted"
 msgstr "داخل کیے جانے پر صوتی سیڈیاں چلائیں"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:277
-#: ../thunar-volman/tvm-preferences-dialog.c:383
-#: ../thunar-volman/tvm-preferences-dialog.c:425
-#: ../thunar-volman/tvm-preferences-dialog.c:499
-#: ../thunar-volman/tvm-preferences-dialog.c:541
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:290
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:415
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:466
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:553
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:601
 msgid "_Command:"
 msgstr "_کمانڈ:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:287
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:304
 msgid "Video CDs/DVDs"
 msgstr "ویڈیو سیڈیاں/ڈی وی ڈی"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:304
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:321
 msgid "Play _video CDs and DVDs when inserted"
 msgstr "داخل کیے جانے پر _ویڈیو سیڈیاں اور ڈی وی ڈی چلائیں"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:309
-#: ../thunar-volman/tvm-preferences-dialog.c:341
-#: ../thunar-volman/tvm-preferences-dialog.c:457
-#: ../thunar-volman/tvm-preferences-dialog.c:573
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:329
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:367
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:505
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:640
 msgid "C_ommand:"
 msgstr "ک_مانڈ:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:319
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:343
 msgid "Portable Music Players"
 msgstr "پورٹبل موسیقی پلیئرز"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:336
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:360
 msgid "Play _music files when connected"
 msgstr "متصل ہونے پر مو_سیقی فائلیں چلائیں"
 
 #.
 #. Cameras
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:351
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:379
 msgid "Cameras"
 msgstr "کیمرے"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:361
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:390
 msgid "Digital Cameras"
 msgstr "رقمی کیمرے"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:378
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:407
 msgid "Import digital photographs when connected"
 msgstr "متصل ہونے پر رقمی فوٹوگراف درآمد کریں"
 
 #.
 #. PDAs
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:393
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:427
 msgid "PDAs"
 msgstr "PDAs"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:403
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:441
 msgid "Palm™"
 msgstr "Palm™"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:420
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:458
 msgid "Sync _Palm™ devices when connected"
 msgstr "متصل ہونے پر Palm™ ڈیوائسس ہم آہنگ کریں"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:435
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:480
 msgid "Pocket PCs"
 msgstr "پاکٹ PCs"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:452
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:497
 msgid "Sync Pocket P_C devices when connected"
 msgstr "متصل ہونے پر پاکٹ پی سی ڈیوائسز کو ہم آہنگ کریں"
 
 #.
 #. Printers
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:467
-#: ../thunar-volman/tvm-preferences-dialog.c:477
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:517
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:528
 msgid "Printers"
 msgstr "پرنٹرز"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:494
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:545
 msgid "Automatically run a program when a _printer is connected"
 msgstr "_پرنٹر کے متصل ہونے پر خودکار طور پر پروگرام چلائیں"
 
 #.
 #. Input Devices
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:509
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:565
 msgid "Input Devices"
 msgstr "ماداخل ڈیوائسس"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:519
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:576
 msgid "Keyboards"
 msgstr "کیبورڈ"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:536
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:593
 msgid "Automatically run a program when an USB _keyboard is connected"
 msgstr "یو ایس بی کیبورڈ متصل ہونے پر پروگرام خودکار طور پر چلائیں"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:551
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:615
 msgid "Mice"
 msgstr "مائیس"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:568
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:632
 msgid "Automatically run a program when an USB _mouse is connected"
 msgstr "یو ایس بی ماؤس متصل ہونے پر خودکار طور پر پروگرام چلائیں"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:583
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:654
 msgid "Tablet"
 msgstr "ٹیبلیٹ"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:600
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:671
 msgid "Automatically run a program when a _tablet is connected"
 msgstr "ٹیبلیٹ کے متصل ہونے پر خودکار طور پر پروگرام چلائیں"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:605
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:679
 msgid "Com_mand:"
 msgstr "کم_انڈ:"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:690
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:755
 msgid "Failed to open the documentation browser"
 msgstr "دستاویزات براؤزر کھولنے میں ناکامی"
 
-#: ../thunar-volman/tvm-run.c:133
-#: ../thunar-volman/tvm-run.c:144
-msgid "Choose Disc Type"
-msgstr "ڈسک کی نوعیت منتخب کریں"
+#~ msgid "Failed to open display"
+#~ msgstr "ڈسپلے کھولنے میں ناکامی"
 
-#: ../thunar-volman/tvm-run.c:134
-#: ../thunar-volman/tvm-run.c:145
-msgid "You have inserted a blank disc."
-msgstr "آپ نے ایک خالی سی ڈی داخل کی ہے."
+#~ msgid "The Thunar development team. All rights reserved."
+#~ msgstr "تھنر ترقیاتی ٹیم. تمام حقوق محفوظ ہیں. اردو ترجمہ از محمد علی مکی"
 
-#: ../thunar-volman/tvm-run.c:135
-#: ../thunar-volman/tvm-run.c:146
-msgid "What would you like to do?"
-msgstr "آپ کیا کرنا چاہتے ہیں؟"
+#~ msgid "Written by Benedikt Meurer <benny at xfce.org>."
+#~ msgstr "Benedikt Meurer <benny at xfce.org> نے لکھا."
 
-#: ../thunar-volman/tvm-run.c:137
-msgid "Make _DVD"
-msgstr "_ڈی وی ڈی بنائیں"
+#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
+#~ msgstr "معین کردہ UDI \"%s\" غیر موزوں HAL ڈیوائس UDI ہے"
 
-#: ../thunar-volman/tvm-run.c:148
-msgid "Make _Data CD"
-msgstr "_ڈیٹا سی ڈی بنائیں"
+#~ msgid "Encrypted volume"
+#~ msgstr "رمز شدہ (انکرپٹڈ) والیم"
 
-#: ../thunar-volman/tvm-run.c:149
-msgid "Make _Audio CD"
-msgstr "_صوتی سی ڈی بنائیں"
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">رمز شدہ (انکرپٹڈ) والیم ماؤنٹ کیا "
+#~ "جارہا ہے...</span>"
+
+#~ msgid "Setting up the crypto layer..."
+#~ msgstr "کرپٹو تہہ مرتب کی جارہی ہے..."
+
+#~ msgid "You are not privileged to setup the crypto layer"
+#~ msgstr "آپ کو کرپٹو تہہ مرتب کرنے کی اجازت نہیں ہے"
+
+#~ msgid "Wrong password"
+#~ msgstr "غلط پاس ورڈ"
+
+#~ msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
+#~ msgstr "<span weight=\"bold\" size=\"larger\">غلط پاس ورڈ.</span>"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">والیم رمز (انکرپٹڈ) ہے.</span>"
+
+#~ msgid "Please enter your password to decrypt and mount the volume."
+#~ msgstr "والیم کو غیر رمز شدہ اور ماؤنٹ کرنے کے لیے اپنا پاس ورڈ لکھیں."
+
+#~ msgid "_Mount"
+#~ msgstr "-ماؤنٹ"
+
+#~ msgid "Failed to setup the encrypted volume"
+#~ msgstr "رمز شدہ (انکرپٹڈ) والیم کو مرتب کرنے میں ناکامی"
+
+#~ msgid "Choose Disc Type"
+#~ msgstr "ڈسک کی نوعیت منتخب کریں"
 
-#: ../thunar-volman-settings.desktop.in.in.h:3
-msgid "Removable Media"
-msgstr "قابلِ فصل میڈیا"
+#~ msgid "Make _DVD"
+#~ msgstr "_ڈی وی ڈی بنائیں"
 
+#~ msgid "Removable Media"
+#~ msgstr "قابلِ فصل میڈیا"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index d24128d..8f744e5 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,457 +8,613 @@ msgid ""
 msgstr ""
 "Project-Id-Version: thunar-volman\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-30 02:26-0700\n"
+"POT-Creation-Date: 2010-07-25 20:06+0200\n"
 "PO-Revision-Date: 2009-06-16 13:00+0800\n"
 "Last-Translator: Hunt Xu <huntxu at live.cn>\n"
 "Language-Team: Chinese (Simplified) <xfce-i18n at xfce.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../thunar-volman/main.c:50
-msgid "The HAL device UDI of the newly added device"
+#: ../thunar-volman/main.c:59
+#, fuzzy
+msgid "The syfs path of the newly added device"
 msgstr "新插入的 HAL 设备 UDI"
 
-#: ../thunar-volman/main.c:51
-#: ../thunar-volman/tvm-preferences-dialog.c:120
-#: ../thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman/main.c:60
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:104
 msgid "Configure management of removable drives and media"
 msgstr "配置可移动驱动器和介质管理"
 
-#: ../thunar-volman/main.c:52
+#: ../thunar-volman/main.c:61
 msgid "Print version information and exit"
 msgstr "打印版本信息并退出"
 
 #. setup application name
-#: ../thunar-volman/main.c:69
+#: ../thunar-volman/main.c:93
 msgid "Thunar Volume Manager"
 msgstr "Thunar 卷管理器"
 
-#: ../thunar-volman/main.c:90
-msgid "Failed to open display"
-msgstr "打开显示失败"
-
-#: ../thunar-volman/main.c:106
-msgid "The Thunar development team. All rights reserved."
-msgstr "Thunar 开发团队。版权所有。"
-
-#: ../thunar-volman/main.c:107
-msgid "Written by Benedikt Meurer <benny at xfce.org>."
-msgstr "作者: Benedikt Meurer <benny at xfce.org>。"
+#: ../thunar-volman/main.c:133
+msgid "All rights reserved."
+msgstr ""
 
-#: ../thunar-volman/main.c:108
+#: ../thunar-volman/main.c:134
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "请报告 bug 至 <%s>。"
 
-#. TRANSLATORS: A HAL device UDI must match certain conditions to be valid (to be exact, it must be a valid D-Bus object path)
-#: ../thunar-volman/main.c:133
+#: ../thunar-volman/main.c:188
 #, c-format
-msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
-msgstr "指定的 UDI \"%s\" 并非有效的 HAL 设备 UDI"
+msgid "There is no device with the sysfs path \"%s\""
+msgstr ""
 
-#. TRANSLATORS: thunar-volman wasn't invoked with either --device-added or --configure.
-#: ../thunar-volman/main.c:144
-#, c-format
-msgid "Must specify the new HAL device UDI with --device-added"
+#: ../thunar-volman/main.c:200
+#, fuzzy, c-format
+msgid "Must specify the sysfs path of new devices with --device-added"
 msgstr "必须使用 --device-added 来指定新的 HAL 设备 UDI"
 
 #. ...so we need to prompt what to do
-#: ../thunar-volman/tvm-block-device.c:189
+#: ../thunar-volman/tvm-block-device.c:204
 msgid "Photos and Music"
 msgstr "照片和音乐"
 
-#: ../thunar-volman/tvm-block-device.c:190
-msgid "Photos were found on your portable music player."
+#: ../thunar-volman/tvm-block-device.c:205
+#, fuzzy
+msgid "Photos were found on your portable music player"
 msgstr "在您的音乐播放器里找到相片。"
 
-#: ../thunar-volman/tvm-block-device.c:191
+#: ../thunar-volman/tvm-block-device.c:206
 msgid "Would you like to import the photos or manage the music?"
 msgstr "您是想要导入相片还是管理音乐?"
 
-#: ../thunar-volman/tvm-block-device.c:192
-#: ../thunar-volman/tvm-block-device.c:258
-#: ../thunar-volman/tvm-block-device.c:335
-#: ../thunar-volman/tvm-block-device.c:371
-#: ../thunar-volman/tvm-block-device.c:430
-#: ../thunar-volman/tvm-block-device.c:703
-#: ../thunar-volman/tvm-crypto-volume.c:448
-#: ../thunar-volman/tvm-run.c:136
-#: ../thunar-volman/tvm-run.c:147
+#: ../thunar-volman/tvm-block-device.c:208
+#: ../thunar-volman/tvm-block-device.c:277
+#: ../thunar-volman/tvm-block-device.c:378
+#: ../thunar-volman/tvm-block-device.c:425
+#: ../thunar-volman/tvm-block-device.c:507
+#: ../thunar-volman/tvm-block-device.c:826 ../thunar-volman/tvm-run.c:196
+#: ../thunar-volman/tvm-run.c:207
 msgid "Ig_nore"
 msgstr "忽略(_N)"
 
-#: ../thunar-volman/tvm-block-device.c:193
-#: ../thunar-volman/tvm-block-device.c:259
+#: ../thunar-volman/tvm-block-device.c:209
+#: ../thunar-volman/tvm-block-device.c:278
 msgid "Import _Photos"
 msgstr "导入照片(_P)"
 
-#: ../thunar-volman/tvm-block-device.c:194
+#: ../thunar-volman/tvm-block-device.c:210
 msgid "Manage _Music"
 msgstr "管理音乐(_M)"
 
-#. ask the user whether to import photos
-#: ../thunar-volman/tvm-block-device.c:255
+#. ask the user to import photos
+#: ../thunar-volman/tvm-block-device.c:273
 msgid "Photo Import"
 msgstr "照片导入"
 
-#: ../thunar-volman/tvm-block-device.c:256
-msgid "A photo card has been detected."
+#: ../thunar-volman/tvm-block-device.c:274
+#, fuzzy
+msgid "A photo card has been detected"
 msgstr "检测到照片存储卡。"
 
-#: ../thunar-volman/tvm-block-device.c:257
-msgid "There are photos on the card. Would you like to add these photos to your album?"
+#: ../thunar-volman/tvm-block-device.c:275
+msgid ""
+"There are photos on the card. Would you like to add these photos to your "
+"album?"
 msgstr "存储卡中有照片。是否添加到相册?"
 
-#. prompt the user whether to execute this file
-#: ../thunar-volman/tvm-block-device.c:332
-#: ../thunar-volman/tvm-block-device.c:368
+#. prompt the user to execute the file
+#. prompt the user to execute this file
+#: ../thunar-volman/tvm-block-device.c:373
+#: ../thunar-volman/tvm-block-device.c:420
 #, c-format
 msgid "Would you like to allow \"%s\" to run?"
 msgstr "是否允许 \"%s\" 运行?"
 
-#: ../thunar-volman/tvm-block-device.c:333
-#: ../thunar-volman/tvm-block-device.c:369
+#: ../thunar-volman/tvm-block-device.c:376
+#: ../thunar-volman/tvm-block-device.c:423
 msgid "Auto-Run Confirmation"
 msgstr "自动运行确认"
 
-#: ../thunar-volman/tvm-block-device.c:334
-#: ../thunar-volman/tvm-block-device.c:370
+#: ../thunar-volman/tvm-block-device.c:377
+#: ../thunar-volman/tvm-block-device.c:424
 msgid "Auto-Run capability detected"
 msgstr "检测到自动运行功能"
 
-#: ../thunar-volman/tvm-block-device.c:336
-#: ../thunar-volman/tvm-block-device.c:372
+#: ../thunar-volman/tvm-block-device.c:379
+#: ../thunar-volman/tvm-block-device.c:426
 msgid "_Allow Auto-Run"
 msgstr "允许自动运行(_A)"
 
 #. prompt the user whether to autoopen this file
-#: ../thunar-volman/tvm-block-device.c:427
+#: ../thunar-volman/tvm-block-device.c:502
 #, c-format
 msgid "Would you like to open \"%s\"?"
 msgstr "您要打开 \"%s\" 吗?"
 
-#: ../thunar-volman/tvm-block-device.c:428
+#: ../thunar-volman/tvm-block-device.c:505
 msgid "Auto-Open Confirmation"
 msgstr "自动打开确认"
 
-#: ../thunar-volman/tvm-block-device.c:429
+#: ../thunar-volman/tvm-block-device.c:506
 msgid "Auto-Open capability detected"
 msgstr "检测到自动打开功能"
 
-#: ../thunar-volman/tvm-block-device.c:431
+#: ../thunar-volman/tvm-block-device.c:508
 msgid "_Open"
 msgstr "打开(_O)"
 
-#. ask what do with the mixed audio/data disc
-#: ../thunar-volman/tvm-block-device.c:700
-msgid "Audio / Data CD"
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "CD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "DVD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:618
+msgid "The CD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:619
+msgid "The DVD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:629
+msgid "Volume mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:632
+#, c-format
+msgid "The volume \"%s\" was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:637
+#, c-format
+msgid "The inserted volume was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:691
+#, c-format
+msgid "Unable to locate mount point"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:737
+#, c-format
+msgid "Unable to mount the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:746
+#, c-format
+msgid "Could not detect the volume corresponding to the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:821
+#, fuzzy
+msgid "Audio/Data CD"
 msgstr "音乐/数据 CD"
 
-#: ../thunar-volman/tvm-block-device.c:701
-msgid "The CD in the drive contains both music and files."
+#: ../thunar-volman/tvm-block-device.c:822
+#, fuzzy
+msgid "The CD in the drive contains both music and files"
 msgstr "驱动器中的 CD 同时包含音乐和文件。"
 
-#: ../thunar-volman/tvm-block-device.c:702
+#: ../thunar-volman/tvm-block-device.c:824
 msgid "Would you like to listen to music or browse the files?"
 msgstr "您是想要播放音乐还是浏览文件?"
 
-#: ../thunar-volman/tvm-block-device.c:704
+#: ../thunar-volman/tvm-block-device.c:827
 msgid "_Browse Files"
 msgstr "浏览文件(_B)"
 
-#: ../thunar-volman/tvm-block-device.c:705
+#: ../thunar-volman/tvm-block-device.c:828
 msgid "_Play CD"
 msgstr "播放 CD(_P)"
 
-#: ../thunar-volman/tvm-command-entry.c:233
-msgid "Select an Application"
-msgstr "选择应用程序"
+#: ../thunar-volman/tvm-block-device.c:916
+#, c-format
+msgid "Unknown block device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:243
-msgid "All Files"
-msgstr "所有文件"
+#: ../thunar-volman/tvm-device.c:139
+#, c-format
+msgid "Device type not supported"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:248
-msgid "Executable Files"
-msgstr "可执行文件"
+#: ../thunar-volman/tvm-input-device.c:74
+#, fuzzy
+msgid "input-keyboard"
+msgstr "键盘"
 
-#: ../thunar-volman/tvm-command-entry.c:263
-msgid "Perl Scripts"
-msgstr "Perl 脚本"
+#: ../thunar-volman/tvm-input-device.c:75
+#, fuzzy
+msgid "Keyboard detected"
+msgstr "键盘"
 
-#: ../thunar-volman/tvm-command-entry.c:269
-msgid "Python Scripts"
-msgstr "Python 脚本"
+#: ../thunar-volman/tvm-input-device.c:76
+#, fuzzy
+msgid "A keyboard was detected"
+msgstr "检测到照片存储卡。"
 
-#: ../thunar-volman/tvm-command-entry.c:275
-msgid "Ruby Scripts"
-msgstr "Ruby 脚本"
+#: ../thunar-volman/tvm-input-device.c:86
+#: ../thunar-volman/tvm-input-device.c:100
+msgid "input-tablet"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:281
-msgid "Shell Scripts"
-msgstr "Shell 脚本"
+#: ../thunar-volman/tvm-input-device.c:87
+#: ../thunar-volman/tvm-input-device.c:101
+#, fuzzy
+msgid "Tablet detected"
+msgstr "检测到自动运行功能"
+
+#: ../thunar-volman/tvm-input-device.c:88
+#: ../thunar-volman/tvm-input-device.c:102
+msgid "A graphics tablet was detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:286
-#: ../thunar-volman/tvm-crypto-volume.c:443
-msgid "Encrypted volume"
-msgstr "加密卷"
+#: ../thunar-volman/tvm-input-device.c:110
+msgid "input-mouse"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:297
-msgid "<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">正在挂载加密卷...</span>"
+#: ../thunar-volman/tvm-input-device.c:111
+msgid "Mouse detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:302
-msgid "Setting up the crypto layer..."
-msgstr "正在设置加密层..."
+#: ../thunar-volman/tvm-input-device.c:112
+msgid "A mouse was detected"
+msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) but got Permission denied.
-#: ../thunar-volman/tvm-crypto-volume.c:369
+#: ../thunar-volman/tvm-input-device.c:139
 #, c-format
-msgid "You are not privileged to setup the crypto layer"
-msgstr "您没有权限设置加密层"
+msgid "Unsupported input device type"
+msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) and typed the wrong password.
-#: ../thunar-volman/tvm-crypto-volume.c:374
+#: ../thunar-volman/tvm-run.c:173
 #, c-format
-msgid "Wrong password"
-msgstr "密码错误"
+msgid "Autoburning of blank CDs and DVDs is disabled"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:445
-msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">密码错误。</span>"
+#: ../thunar-volman/tvm-run.c:193
+msgid "Blank DVD inserted"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:446
-msgid "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">此卷已被加密。</span>"
+#: ../thunar-volman/tvm-run.c:194
+#, fuzzy
+msgid "You have inserted a blank DVD."
+msgstr "您插入了一张空白光盘。"
 
-#: ../thunar-volman/tvm-crypto-volume.c:447
-msgid "Please enter your password to decrypt and mount the volume."
-msgstr "请输入密码并挂载卷"
+#: ../thunar-volman/tvm-run.c:195 ../thunar-volman/tvm-run.c:206
+msgid "What would you like to do?"
+msgstr "接下来您要做什么?"
 
-#: ../thunar-volman/tvm-crypto-volume.c:449
-msgid "_Mount"
-msgstr "挂载(_M)"
+#: ../thunar-volman/tvm-run.c:197
+msgid "Burn _DVD"
+msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:468
-msgid "Failed to setup the encrypted volume"
-msgstr "设置加密卷失败"
+#: ../thunar-volman/tvm-run.c:204
+#, fuzzy
+msgid "Blank CD inserted"
+msgstr "空白 CD 与 DVD"
+
+#: ../thunar-volman/tvm-run.c:205
+#, fuzzy
+msgid "You have inserted a blank CD."
+msgstr "您插入了一张空白光盘。"
+
+#: ../thunar-volman/tvm-run.c:208
+#, fuzzy
+msgid "Burn _Data CD"
+msgstr "制作数据 CD(_D)"
+
+#: ../thunar-volman/tvm-run.c:209
+#, fuzzy
+msgid "Burn _Audio CD"
+msgstr "制作音乐 CD(_A)"
+
+#: ../thunar-volman/tvm-run.c:233
+#, c-format
+msgid "The burn command may not be empty"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:272
+#, c-format
+msgid "The CD player command is undefined"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:66
+msgid "Camera detected"
+msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:119
-#: ../thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman/tvm-usb-device.c:67
+#, fuzzy
+msgid "A photo camera was detected"
+msgstr "检测到照片存储卡。"
+
+#: ../thunar-volman/tvm-usb-device.c:77
+msgid "Printer detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:78
+msgid "A USB printer was detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-usb-device.c:104
+#, c-format
+msgid "Unsupported USB device type"
+msgstr ""
+
+#. setup application name
+#: ../thunar-volman-settings/main.c:52
+#, fuzzy
+msgid "Thunar Volume Manager Settings"
+msgstr "Thunar 卷管理器"
+
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:102
 msgid "Removable Drives and Media"
 msgstr "可移动驱动器和介质"
 
+#: ../thunar-volman-settings/tvm-command-entry.c:240
+msgid "Select an Application"
+msgstr "选择应用程序"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:250
+msgid "All Files"
+msgstr "所有文件"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:255
+msgid "Executable Files"
+msgstr "可执行文件"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:270
+msgid "Perl Scripts"
+msgstr "Perl 脚本"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:276
+msgid "Python Scripts"
+msgstr "Python 脚本"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:282
+msgid "Ruby Scripts"
+msgstr "Ruby 脚本"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:288
+msgid "Shell Scripts"
+msgstr "Shell 脚本"
+
 #.
 #. Storage
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:143
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:130
 msgid "Storage"
 msgstr "存储设备"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:153
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:141
 msgid "Removable Storage"
 msgstr "可移动存储设备"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:170
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:158
 msgid "_Mount removable drives when hot-plugged"
 msgstr "热插拔时挂载可移动驱动器(_M)"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:175
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:166
 msgid "Mount removable media when _inserted"
 msgstr "插入后挂载可移动介质(_I)"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:180
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:174
 msgid "B_rowse removable media when inserted"
 msgstr "插入后浏览可移动介质(_R)"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:185
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:182
 msgid "_Auto-run programs on new drives and media"
 msgstr "自动运行新驱动器和介质上的程序(_A)"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:190
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:189
 msgid "Auto-open files on new drives and media"
 msgstr "自动打开新驱动器和介质上的文件"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:199
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:201
 msgid "Blank CDs and DVDs"
 msgstr "空白 CD 与 DVD"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:216
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:218
 msgid "_Burn a CD or DVD when a blank disc is inserted"
 msgstr "插入空白光盘后进行刻录(_B)"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:224
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:229
 msgid "Command for _Data CDs:"
 msgstr "刻录数据 CD 的程序(_D):"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:231
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:239
 msgid "Command for A_udio CDs:"
 msgstr "刻录音乐 CD 的程序(_U):"
 
 #.
 #. Multimedia
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:245
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:255
 msgid "Multimedia"
 msgstr "多媒体"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:255
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:266
 msgid "Audio CDs"
 msgstr "音乐 CD"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:272
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:283
 msgid "Play _audio CDs when inserted"
 msgstr "插入后播放音乐(_A)"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:277
-#: ../thunar-volman/tvm-preferences-dialog.c:383
-#: ../thunar-volman/tvm-preferences-dialog.c:425
-#: ../thunar-volman/tvm-preferences-dialog.c:499
-#: ../thunar-volman/tvm-preferences-dialog.c:541
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:290
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:415
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:466
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:553
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:601
 msgid "_Command:"
 msgstr "命令(_C):"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:287
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:304
 msgid "Video CDs/DVDs"
 msgstr "VCD / DVD"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:304
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:321
 msgid "Play _video CDs and DVDs when inserted"
 msgstr "插入后播放 VCD 与 DVD(_V)"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:309
-#: ../thunar-volman/tvm-preferences-dialog.c:341
-#: ../thunar-volman/tvm-preferences-dialog.c:457
-#: ../thunar-volman/tvm-preferences-dialog.c:573
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:329
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:367
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:505
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:640
 msgid "C_ommand:"
 msgstr "命令(_O):"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:319
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:343
 msgid "Portable Music Players"
 msgstr "MP3 播放器"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:336
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:360
 msgid "Play _music files when connected"
 msgstr "连接后播放音乐(_M)"
 
 #.
 #. Cameras
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:351
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:379
 msgid "Cameras"
 msgstr "相机"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:361
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:390
 msgid "Digital Cameras"
 msgstr "数码相机"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:378
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:407
 msgid "Import digital photographs when connected"
 msgstr "连接后导入照片"
 
 #.
 #. PDAs
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:393
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:427
 msgid "PDAs"
 msgstr "PDA"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:403
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:441
 msgid "Palm™"
 msgstr "Palm™"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:420
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:458
 msgid "Sync _Palm™ devices when connected"
 msgstr "连接时同步 Palm™ 设备(_P)"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:435
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:480
 msgid "Pocket PCs"
 msgstr "Pocket PC"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:452
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:497
 msgid "Sync Pocket P_C devices when connected"
 msgstr "连接时同步 Pocket PC 设备(_C)"
 
 #.
 #. Printers
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:467
-#: ../thunar-volman/tvm-preferences-dialog.c:477
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:517
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:528
 msgid "Printers"
 msgstr "打印机"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:494
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:545
 msgid "Automatically run a program when a _printer is connected"
 msgstr "打印机连接后自动运行程序(_P)"
 
 #.
 #. Input Devices
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:509
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:565
 msgid "Input Devices"
 msgstr "输入设备"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:519
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:576
 msgid "Keyboards"
 msgstr "键盘"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:536
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:593
 msgid "Automatically run a program when an USB _keyboard is connected"
 msgstr "USB 键盘连接后自动运行程序(_K)"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:551
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:615
 msgid "Mice"
 msgstr "鼠标"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:568
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:632
 msgid "Automatically run a program when an USB _mouse is connected"
 msgstr "USB 鼠标连接后自动运行程序(_M)"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:583
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:654
 msgid "Tablet"
 msgstr "写字板"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:600
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:671
 msgid "Automatically run a program when a _tablet is connected"
 msgstr "写字板连接后自动运行程序(_T)"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:605
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:679
 msgid "Com_mand:"
 msgstr "命令(_M):"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:690
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:755
 msgid "Failed to open the documentation browser"
 msgstr "打开文件浏览器失败"
 
-#: ../thunar-volman/tvm-run.c:133
-#: ../thunar-volman/tvm-run.c:144
-msgid "Choose Disc Type"
-msgstr "选择光盘类型"
+#~ msgid "Failed to open display"
+#~ msgstr "打开显示失败"
 
-#: ../thunar-volman/tvm-run.c:134
-#: ../thunar-volman/tvm-run.c:145
-msgid "You have inserted a blank disc."
-msgstr "您插入了一张空白光盘。"
+#~ msgid "The Thunar development team. All rights reserved."
+#~ msgstr "Thunar 开发团队。版权所有。"
 
-#: ../thunar-volman/tvm-run.c:135
-#: ../thunar-volman/tvm-run.c:146
-msgid "What would you like to do?"
-msgstr "接下来您要做什么?"
+#~ msgid "Written by Benedikt Meurer <benny at xfce.org>."
+#~ msgstr "作者: Benedikt Meurer <benny at xfce.org>。"
 
-#: ../thunar-volman/tvm-run.c:137
-msgid "Make _DVD"
-msgstr "制作 DVD(_D)"
+#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
+#~ msgstr "指定的 UDI \"%s\" 并非有效的 HAL 设备 UDI"
 
-#: ../thunar-volman/tvm-run.c:148
-msgid "Make _Data CD"
-msgstr "制作数据 CD(_D)"
+#~ msgid "Encrypted volume"
+#~ msgstr "加密卷"
 
-#: ../thunar-volman/tvm-run.c:149
-msgid "Make _Audio CD"
-msgstr "制作音乐 CD(_A)"
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
+#~ msgstr "<span weight=\"bold\" size=\"larger\">正在挂载加密卷...</span>"
+
+#~ msgid "Setting up the crypto layer..."
+#~ msgstr "正在设置加密层..."
+
+#~ msgid "You are not privileged to setup the crypto layer"
+#~ msgstr "您没有权限设置加密层"
+
+#~ msgid "Wrong password"
+#~ msgstr "密码错误"
+
+#~ msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
+#~ msgstr "<span weight=\"bold\" size=\"larger\">密码错误。</span>"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
+#~ msgstr "<span weight=\"bold\" size=\"larger\">此卷已被加密。</span>"
+
+#~ msgid "Please enter your password to decrypt and mount the volume."
+#~ msgstr "请输入密码并挂载卷"
+
+#~ msgid "_Mount"
+#~ msgstr "挂载(_M)"
+
+#~ msgid "Failed to setup the encrypted volume"
+#~ msgstr "设置加密卷失败"
+
+#~ msgid "Choose Disc Type"
+#~ msgstr "选择光盘类型"
+
+#~ msgid "Make _DVD"
+#~ msgstr "制作 DVD(_D)"
 
-#: ../thunar-volman-settings.desktop.in.in.h:3
-msgid "Removable Media"
-msgstr "可移动介质"
+#~ msgid "Removable Media"
+#~ msgstr "可移动介质"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 1f48eee..2f082b7 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: thunar-volman 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-30 02:26-0700\n"
+"POT-Creation-Date: 2010-07-25 20:06+0200\n"
 "PO-Revision-Date: 2007-01-17 01:47+0800\n"
 "Last-Translator: Cheng-Wei Chien <e.cwchien at gmail.com>\n"
 "Language-Team: Cheng-Wei Chien <e.cwchien at gmail.com>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,448 +19,573 @@ msgstr ""
 "X-Poedit-Country: TAIWAN\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../thunar-volman/main.c:50
-msgid "The HAL device UDI of the newly added device"
+#: ../thunar-volman/main.c:59
+#, fuzzy
+msgid "The syfs path of the newly added device"
 msgstr "新裝置的 HAL 裝置 UDI"
 
-#: ../thunar-volman/main.c:51 ../thunar-volman/tvm-preferences-dialog.c:120
-#: ../thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman/main.c:60
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:104
 msgid "Configure management of removable drives and media"
 msgstr "可移除裝置與媒體的設定管理員"
 
-#: ../thunar-volman/main.c:52
+#: ../thunar-volman/main.c:61
 msgid "Print version information and exit"
 msgstr "列出版本資訊後結束"
 
 #. setup application name
-#: ../thunar-volman/main.c:69
+#: ../thunar-volman/main.c:93
 msgid "Thunar Volume Manager"
 msgstr "Thunar 的儲存裝置管理員"
 
-#: ../thunar-volman/main.c:90
-msgid "Failed to open display"
-msgstr "無法開啟顯示"
-
-#: ../thunar-volman/main.c:106
-msgid "The Thunar development team. All rights reserved."
-msgstr "Thunar 開發團隊。保留一切權利。"
-
-#: ../thunar-volman/main.c:107
-msgid "Written by Benedikt Meurer <benny at xfce.org>."
-msgstr "由 Benedikt Meurer 開發 <benny at xfce.org>。"
+#: ../thunar-volman/main.c:133
+msgid "All rights reserved."
+msgstr ""
 
-#: ../thunar-volman/main.c:108
+#: ../thunar-volman/main.c:134
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "請回報錯誤至 <%s>。"
 
-#. TRANSLATORS: A HAL device UDI must match certain conditions to be valid (to be exact, it must be a valid D-Bus object path)
-#: ../thunar-volman/main.c:133
+#: ../thunar-volman/main.c:188
 #, c-format
-msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
-msgstr "指定的 UDI \"%s\" 並非有效的 HAL 裝置 UDI"
+msgid "There is no device with the sysfs path \"%s\""
+msgstr ""
 
-#. TRANSLATORS: thunar-volman wasn't invoked with either --device-added or --configure.
-#: ../thunar-volman/main.c:144
-#, c-format
-msgid "Must specify the new HAL device UDI with --device-added"
+#: ../thunar-volman/main.c:200
+#, fuzzy, c-format
+msgid "Must specify the sysfs path of new devices with --device-added"
 msgstr "必須使用 --device-added 來指定新的 HAL 裝置 UDI"
 
 #. ...so we need to prompt what to do
-#: ../thunar-volman/tvm-block-device.c:189
+#: ../thunar-volman/tvm-block-device.c:204
 msgid "Photos and Music"
 msgstr "相片與音樂"
 
-#: ../thunar-volman/tvm-block-device.c:190
-msgid "Photos were found on your portable music player."
+#: ../thunar-volman/tvm-block-device.c:205
+#, fuzzy
+msgid "Photos were found on your portable music player"
 msgstr "在您的可攜式音樂播放器裡找到相片。"
 
-#: ../thunar-volman/tvm-block-device.c:191
+#: ../thunar-volman/tvm-block-device.c:206
 msgid "Would you like to import the photos or manage the music?"
 msgstr "您要匯入相片或整理音樂嗎?"
 
-#: ../thunar-volman/tvm-block-device.c:192
-#: ../thunar-volman/tvm-block-device.c:258
-#: ../thunar-volman/tvm-block-device.c:335
-#: ../thunar-volman/tvm-block-device.c:371
-#: ../thunar-volman/tvm-block-device.c:430
-#: ../thunar-volman/tvm-block-device.c:703
-#: ../thunar-volman/tvm-crypto-volume.c:448 ../thunar-volman/tvm-run.c:136
-#: ../thunar-volman/tvm-run.c:147
+#: ../thunar-volman/tvm-block-device.c:208
+#: ../thunar-volman/tvm-block-device.c:277
+#: ../thunar-volman/tvm-block-device.c:378
+#: ../thunar-volman/tvm-block-device.c:425
+#: ../thunar-volman/tvm-block-device.c:507
+#: ../thunar-volman/tvm-block-device.c:826 ../thunar-volman/tvm-run.c:196
+#: ../thunar-volman/tvm-run.c:207
 msgid "Ig_nore"
 msgstr "忽略 (_n)"
 
-#: ../thunar-volman/tvm-block-device.c:193
-#: ../thunar-volman/tvm-block-device.c:259
+#: ../thunar-volman/tvm-block-device.c:209
+#: ../thunar-volman/tvm-block-device.c:278
 msgid "Import _Photos"
 msgstr "匯入相片 (_P)"
 
-#: ../thunar-volman/tvm-block-device.c:194
+#: ../thunar-volman/tvm-block-device.c:210
 msgid "Manage _Music"
 msgstr "整理音樂 (_M)"
 
-#. ask the user whether to import photos
-#: ../thunar-volman/tvm-block-device.c:255
+#. ask the user to import photos
+#: ../thunar-volman/tvm-block-device.c:273
 msgid "Photo Import"
 msgstr "相片匯入至"
 
-#: ../thunar-volman/tvm-block-device.c:256
-msgid "A photo card has been detected."
+#: ../thunar-volman/tvm-block-device.c:274
+#, fuzzy
+msgid "A photo card has been detected"
 msgstr "已偵測到相片記憶卡。"
 
-#: ../thunar-volman/tvm-block-device.c:257
+#: ../thunar-volman/tvm-block-device.c:275
 msgid ""
 "There are photos on the card. Would you like to add these photos to your "
 "album?"
 msgstr "在記憶卡中找到相片。您要將這些相片加入相簿嗎?"
 
-#. prompt the user whether to execute this file
-#: ../thunar-volman/tvm-block-device.c:332
-#: ../thunar-volman/tvm-block-device.c:368
+#. prompt the user to execute the file
+#. prompt the user to execute this file
+#: ../thunar-volman/tvm-block-device.c:373
+#: ../thunar-volman/tvm-block-device.c:420
 #, c-format
 msgid "Would you like to allow \"%s\" to run?"
 msgstr "您要讓 \"%s\" 執行嗎?"
 
-#: ../thunar-volman/tvm-block-device.c:333
-#: ../thunar-volman/tvm-block-device.c:369
+#: ../thunar-volman/tvm-block-device.c:376
+#: ../thunar-volman/tvm-block-device.c:423
 msgid "Auto-Run Confirmation"
 msgstr "自動執行確認"
 
-#: ../thunar-volman/tvm-block-device.c:334
-#: ../thunar-volman/tvm-block-device.c:370
+#: ../thunar-volman/tvm-block-device.c:377
+#: ../thunar-volman/tvm-block-device.c:424
 msgid "Auto-Run capability detected"
 msgstr "偵測到自動執行功能"
 
-#: ../thunar-volman/tvm-block-device.c:336
-#: ../thunar-volman/tvm-block-device.c:372
+#: ../thunar-volman/tvm-block-device.c:379
+#: ../thunar-volman/tvm-block-device.c:426
 msgid "_Allow Auto-Run"
 msgstr "允許自動執行 (_A)"
 
 #. prompt the user whether to autoopen this file
-#: ../thunar-volman/tvm-block-device.c:427
+#: ../thunar-volman/tvm-block-device.c:502
 #, c-format
 msgid "Would you like to open \"%s\"?"
 msgstr "您要開啟 \"%s\" 嗎?"
 
-#: ../thunar-volman/tvm-block-device.c:428
+#: ../thunar-volman/tvm-block-device.c:505
 msgid "Auto-Open Confirmation"
 msgstr "自動開啟確認"
 
-#: ../thunar-volman/tvm-block-device.c:429
+#: ../thunar-volman/tvm-block-device.c:506
 msgid "Auto-Open capability detected"
 msgstr "偵測到自動開啟功能"
 
-#: ../thunar-volman/tvm-block-device.c:431
+#: ../thunar-volman/tvm-block-device.c:508
 msgid "_Open"
 msgstr "開啟 (_O)"
 
-#. ask what do with the mixed audio/data disc
-#: ../thunar-volman/tvm-block-device.c:700
-msgid "Audio / Data CD"
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "CD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:616
+msgid "DVD mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:618
+msgid "The CD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:619
+msgid "The DVD was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:629
+msgid "Volume mounted"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:632
+#, c-format
+msgid "The volume \"%s\" was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:637
+#, c-format
+msgid "The inserted volume was mounted automatically"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:691
+#, c-format
+msgid "Unable to locate mount point"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:737
+#, c-format
+msgid "Unable to mount the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:746
+#, c-format
+msgid "Could not detect the volume corresponding to the device"
+msgstr ""
+
+#: ../thunar-volman/tvm-block-device.c:821
+#, fuzzy
+msgid "Audio/Data CD"
 msgstr "音訊 / 資料 CD"
 
-#: ../thunar-volman/tvm-block-device.c:701
-msgid "The CD in the drive contains both music and files."
+#: ../thunar-volman/tvm-block-device.c:822
+#, fuzzy
+msgid "The CD in the drive contains both music and files"
 msgstr "裝置裡的 CD 含有音樂和資料檔。"
 
-#: ../thunar-volman/tvm-block-device.c:702
+#: ../thunar-volman/tvm-block-device.c:824
 msgid "Would you like to listen to music or browse the files?"
 msgstr "您要聽音樂或瀏覽檔案嗎?"
 
-#: ../thunar-volman/tvm-block-device.c:704
+#: ../thunar-volman/tvm-block-device.c:827
 msgid "_Browse Files"
 msgstr "瀏覽檔案 (_B)"
 
-#: ../thunar-volman/tvm-block-device.c:705
+#: ../thunar-volman/tvm-block-device.c:828
 msgid "_Play CD"
 msgstr "播放 CD (_P)"
 
-#: ../thunar-volman/tvm-command-entry.c:233
-msgid "Select an Application"
-msgstr "請選擇一個應用程式"
+#: ../thunar-volman/tvm-block-device.c:916
+#, c-format
+msgid "Unknown block device type"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:243
-msgid "All Files"
-msgstr "所有檔案"
+#: ../thunar-volman/tvm-device.c:139
+#, c-format
+msgid "Device type not supported"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:248
-msgid "Executable Files"
-msgstr "可執行檔"
+#: ../thunar-volman/tvm-input-device.c:74
+#, fuzzy
+msgid "input-keyboard"
+msgstr "鍵盤"
 
-#: ../thunar-volman/tvm-command-entry.c:263
-msgid "Perl Scripts"
-msgstr "Perl 腳本"
+#: ../thunar-volman/tvm-input-device.c:75
+#, fuzzy
+msgid "Keyboard detected"
+msgstr "鍵盤"
 
-#: ../thunar-volman/tvm-command-entry.c:269
-msgid "Python Scripts"
-msgstr "Python 腳本"
+#: ../thunar-volman/tvm-input-device.c:76
+#, fuzzy
+msgid "A keyboard was detected"
+msgstr "已偵測到相片記憶卡。"
 
-#: ../thunar-volman/tvm-command-entry.c:275
-msgid "Ruby Scripts"
-msgstr "Ruby 腳本"
+#: ../thunar-volman/tvm-input-device.c:86
+#: ../thunar-volman/tvm-input-device.c:100
+msgid "input-tablet"
+msgstr ""
 
-#: ../thunar-volman/tvm-command-entry.c:281
-msgid "Shell Scripts"
-msgstr "Shell 腳本"
+#: ../thunar-volman/tvm-input-device.c:87
+#: ../thunar-volman/tvm-input-device.c:101
+#, fuzzy
+msgid "Tablet detected"
+msgstr "偵測到自動執行功能"
 
-#: ../thunar-volman/tvm-crypto-volume.c:286
-#: ../thunar-volman/tvm-crypto-volume.c:443
-msgid "Encrypted volume"
+#: ../thunar-volman/tvm-input-device.c:88
+#: ../thunar-volman/tvm-input-device.c:102
+msgid "A graphics tablet was detected"
 msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:297
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"
+#: ../thunar-volman/tvm-input-device.c:110
+msgid "input-mouse"
+msgstr ""
+
+#: ../thunar-volman/tvm-input-device.c:111
+msgid "Mouse detected"
+msgstr ""
+
+#: ../thunar-volman/tvm-input-device.c:112
+msgid "A mouse was detected"
 msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:302
-msgid "Setting up the crypto layer..."
+#: ../thunar-volman/tvm-input-device.c:139
+#, c-format
+msgid "Unsupported input device type"
 msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) but got Permission denied.
-#: ../thunar-volman/tvm-crypto-volume.c:369
+#: ../thunar-volman/tvm-run.c:173
 #, c-format
-msgid "You are not privileged to setup the crypto layer"
+msgid "Autoburning of blank CDs and DVDs is disabled"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:193
+msgid "Blank DVD inserted"
+msgstr ""
+
+#: ../thunar-volman/tvm-run.c:194
+#, fuzzy
+msgid "You have inserted a blank DVD."
+msgstr "您已置入一片空白光碟。"
+
+#: ../thunar-volman/tvm-run.c:195 ../thunar-volman/tvm-run.c:206
+msgid "What would you like to do?"
+msgstr "接下來您要做什麼?"
+
+#: ../thunar-volman/tvm-run.c:197
+msgid "Burn _DVD"
 msgstr ""
 
-#. TRANSLATORS: The user tried to setup a crypto layer (LUKS-encrpyted volume) and typed the wrong password.
-#: ../thunar-volman/tvm-crypto-volume.c:374
+#: ../thunar-volman/tvm-run.c:204
+#, fuzzy
+msgid "Blank CD inserted"
+msgstr "抹除 CD 與 DVD"
+
+#: ../thunar-volman/tvm-run.c:205
+#, fuzzy
+msgid "You have inserted a blank CD."
+msgstr "您已置入一片空白光碟。"
+
+#: ../thunar-volman/tvm-run.c:208
+#, fuzzy
+msgid "Burn _Data CD"
+msgstr "製作資料 CD (_D)"
+
+#: ../thunar-volman/tvm-run.c:209
+#, fuzzy
+msgid "Burn _Audio CD"
+msgstr "製作音訊 CD (_A)"
+
+#: ../thunar-volman/tvm-run.c:233
 #, c-format
-msgid "Wrong password"
+msgid "The burn command may not be empty"
 msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:445
-msgid "<span weight=\"bold\" size=\"larger\">Wrong password.</span>"
+#: ../thunar-volman/tvm-run.c:272
+#, c-format
+msgid "The CD player command is undefined"
 msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:446
-msgid "<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"
+#: ../thunar-volman/tvm-usb-device.c:66
+msgid "Camera detected"
 msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:447
-msgid "Please enter your password to decrypt and mount the volume."
+#: ../thunar-volman/tvm-usb-device.c:67
+#, fuzzy
+msgid "A photo camera was detected"
+msgstr "已偵測到相片記憶卡。"
+
+#: ../thunar-volman/tvm-usb-device.c:77
+msgid "Printer detected"
 msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:449
-msgid "_Mount"
+#: ../thunar-volman/tvm-usb-device.c:78
+msgid "A USB printer was detected"
 msgstr ""
 
-#: ../thunar-volman/tvm-crypto-volume.c:468
-msgid "Failed to setup the encrypted volume"
+#: ../thunar-volman/tvm-usb-device.c:104
+#, c-format
+msgid "Unsupported USB device type"
 msgstr ""
 
-#: ../thunar-volman/tvm-preferences-dialog.c:119
-#: ../thunar-volman-settings.desktop.in.in.h:2
+#. setup application name
+#: ../thunar-volman-settings/main.c:52
+#, fuzzy
+msgid "Thunar Volume Manager Settings"
+msgstr "Thunar 的儲存裝置管理員"
+
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:102
 msgid "Removable Drives and Media"
 msgstr "可移除裝置與媒體"
 
+#: ../thunar-volman-settings/tvm-command-entry.c:240
+msgid "Select an Application"
+msgstr "請選擇一個應用程式"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:250
+msgid "All Files"
+msgstr "所有檔案"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:255
+msgid "Executable Files"
+msgstr "可執行檔"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:270
+msgid "Perl Scripts"
+msgstr "Perl 腳本"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:276
+msgid "Python Scripts"
+msgstr "Python 腳本"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:282
+msgid "Ruby Scripts"
+msgstr "Ruby 腳本"
+
+#: ../thunar-volman-settings/tvm-command-entry.c:288
+msgid "Shell Scripts"
+msgstr "Shell 腳本"
+
 #.
 #. Storage
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:143
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:130
 msgid "Storage"
 msgstr "儲存裝置"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:153
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:141
 msgid "Removable Storage"
 msgstr "可移除儲存裝置"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:170
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:158
 msgid "_Mount removable drives when hot-plugged"
 msgstr "熱插拔時掛載可移除裝置 (_M)"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:175
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:166
 msgid "Mount removable media when _inserted"
 msgstr "置入時掛載可移除裝置 (_i)"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:180
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:174
 msgid "B_rowse removable media when inserted"
 msgstr "置入時瀏覽可移除媒體 (_r)"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:185
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:182
 msgid "_Auto-run programs on new drives and media"
 msgstr "自動執行新裝置與媒體上的程式 (_A)"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:190
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:189
 msgid "Auto-open files on new drives and media"
 msgstr "自動開啟新裝置與媒體上的檔案"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:199
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:201
 msgid "Blank CDs and DVDs"
 msgstr "抹除 CD 與 DVD"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:216
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:218
 msgid "_Burn a CD or DVD when a blank disc is inserted"
 msgstr "置入空白光碟時燒錄 CD 或 DVD (_B)"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:224
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:229
 msgid "Command for _Data CDs:"
 msgstr "資料 CD 所用指令 (_D):"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:231
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:239
 msgid "Command for A_udio CDs:"
 msgstr "音訊 CD 所用指令 (_u):"
 
 #.
 #. Multimedia
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:245
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:255
 msgid "Multimedia"
 msgstr "多媒體"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:255
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:266
 msgid "Audio CDs"
 msgstr "音訊 CD"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:272
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:283
 msgid "Play _audio CDs when inserted"
 msgstr "置入時播放音訊 CD (_a)"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:277
-#: ../thunar-volman/tvm-preferences-dialog.c:383
-#: ../thunar-volman/tvm-preferences-dialog.c:425
-#: ../thunar-volman/tvm-preferences-dialog.c:499
-#: ../thunar-volman/tvm-preferences-dialog.c:541
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:290
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:415
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:466
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:553
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:601
 msgid "_Command:"
 msgstr "指令 (_C):"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:287
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:304
 msgid "Video CDs/DVDs"
 msgstr "視訊 CD / DVD"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:304
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:321
 msgid "Play _video CDs and DVDs when inserted"
 msgstr "置入時播放視訊 CD 與 DVD (_v)"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:309
-#: ../thunar-volman/tvm-preferences-dialog.c:341
-#: ../thunar-volman/tvm-preferences-dialog.c:457
-#: ../thunar-volman/tvm-preferences-dialog.c:573
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:329
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:367
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:505
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:640
 msgid "C_ommand:"
 msgstr "指令 (_o):"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:319
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:343
 msgid "Portable Music Players"
 msgstr "可攜式音樂播放器"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:336
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:360
 msgid "Play _music files when connected"
 msgstr "連線時播放音樂檔 (_m)"
 
 #.
 #. Cameras
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:351
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:379
 msgid "Cameras"
 msgstr "相機"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:361
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:390
 msgid "Digital Cameras"
 msgstr "數位相機"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:378
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:407
 msgid "Import digital photographs when connected"
 msgstr "連線時匯入數位影像"
 
 #.
 #. PDAs
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:393
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:427
 msgid "PDAs"
 msgstr "PDA"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:403
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:441
 msgid "Palm™"
 msgstr "Palm™"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:420
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:458
 msgid "Sync _Palm™ devices when connected"
 msgstr "連線時同步化 Palm™裝置 (_P)"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:435
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:480
 msgid "Pocket PCs"
 msgstr "Pocket PC"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:452
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:497
 msgid "Sync Pocket P_C devices when connected"
 msgstr "連線時同步化 Pocket PC 裝置 (_C)"
 
 #.
 #. Printers
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:467
-#: ../thunar-volman/tvm-preferences-dialog.c:477
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:517
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:528
 msgid "Printers"
 msgstr "印表機"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:494
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:545
 msgid "Automatically run a program when a _printer is connected"
 msgstr "印表機連線時自動執行程式 (_p)"
 
 #.
 #. Input Devices
 #.
-#: ../thunar-volman/tvm-preferences-dialog.c:509
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:565
 msgid "Input Devices"
 msgstr "輸入裝置"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:519
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:576
 msgid "Keyboards"
 msgstr "鍵盤"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:536
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:593
 msgid "Automatically run a program when an USB _keyboard is connected"
 msgstr "USB 鍵盤連線時自動執行程式 (_k)"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:551
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:615
 msgid "Mice"
 msgstr "滑鼠"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:568
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:632
 msgid "Automatically run a program when an USB _mouse is connected"
 msgstr "USB 滑鼠連線時自動執行程式 (_m)"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:583
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:654
 msgid "Tablet"
 msgstr "數位書寫板"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:600
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:671
 msgid "Automatically run a program when a _tablet is connected"
 msgstr "數位書寫板連線時自動執行程式 (_t)"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:605
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:679
 msgid "Com_mand:"
 msgstr "指令 (_m):"
 
-#: ../thunar-volman/tvm-preferences-dialog.c:690
+#: ../thunar-volman-settings/tvm-preferences-dialog.c:755
 msgid "Failed to open the documentation browser"
 msgstr "無法開啟文件瀏覽器"
 
-#: ../thunar-volman/tvm-run.c:133 ../thunar-volman/tvm-run.c:144
-msgid "Choose Disc Type"
-msgstr "請選擇光碟類型"
+#~ msgid "Failed to open display"
+#~ msgstr "無法開啟顯示"
 
-#: ../thunar-volman/tvm-run.c:134 ../thunar-volman/tvm-run.c:145
-msgid "You have inserted a blank disc."
-msgstr "您已置入一片空白光碟。"
+#~ msgid "The Thunar development team. All rights reserved."
+#~ msgstr "Thunar 開發團隊。保留一切權利。"
 
-#: ../thunar-volman/tvm-run.c:135 ../thunar-volman/tvm-run.c:146
-msgid "What would you like to do?"
-msgstr "接下來您要做什麼?"
+#~ msgid "Written by Benedikt Meurer <benny at xfce.org>."
+#~ msgstr "由 Benedikt Meurer 開發 <benny at xfce.org>。"
 
-#: ../thunar-volman/tvm-run.c:137
-msgid "Make _DVD"
-msgstr "製作 DVD (_D)"
+#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI"
+#~ msgstr "指定的 UDI \"%s\" 並非有效的 HAL 裝置 UDI"
 
-#: ../thunar-volman/tvm-run.c:148
-msgid "Make _Data CD"
-msgstr "製作資料 CD (_D)"
+#~ msgid "Choose Disc Type"
+#~ msgstr "請選擇光碟類型"
 
-#: ../thunar-volman/tvm-run.c:149
-msgid "Make _Audio CD"
-msgstr "製作音訊 CD (_A)"
+#~ msgid "Make _DVD"
+#~ msgstr "製作 DVD (_D)"
 
-#: ../thunar-volman-settings.desktop.in.in.h:3
 #, fuzzy
-msgid "Removable Media"
-msgstr "可移除裝置與媒體"
+#~ msgid "Removable Media"
+#~ msgstr "可移除裝置與媒體"
diff --git a/thunar-volman/tvm-block-device.c b/thunar-volman/tvm-block-device.c
index b7b8402..b88d01d 100644
--- a/thunar-volman/tvm-block-device.c
+++ b/thunar-volman/tvm-block-device.c
@@ -629,13 +629,12 @@ tvm_block_device_mounted (TvmContext *context,
       summary = _("Volume mounted");
       if (decoded_name != NULL)
         {
-          message = g_strdup_printf (_("The volume \"%s\" was mounted\n"
-                                       "automatically"), decoded_name);
+          message = g_strdup_printf (_("The volume \"%s\" was mounted automatically"), 
+                                     decoded_name);
         }
       else
         {
-          message = g_strdup_printf (_("The inserted volume was mounted\n"
-                                       "automatically"));
+          message = g_strdup_printf (_("The inserted volume was mounted automatically"));
         }
 
       g_free (decoded_name);
diff --git a/thunar-volman/tvm-run.c b/thunar-volman/tvm-run.c
index a4bc67b..c1ff47d 100644
--- a/thunar-volman/tvm-run.c
+++ b/thunar-volman/tvm-run.c
@@ -119,8 +119,6 @@ tvm_run_command (TvmContext  *context,
   result = g_shell_parse_argv (command_line->str, NULL, &argv, &err);
   if (G_LIKELY (result))
     {
-      g_debug ("%s", command_line->str);
-
       /* try to spawn the command asynchronously in the users home directory */
       result = g_spawn_async (g_get_home_dir (), argv, NULL, G_SPAWN_SEARCH_PATH, 
                               NULL, NULL, NULL, &err);
@@ -184,8 +182,6 @@ tvm_run_burn_software (TvmContext *context,
     if (g_udev_device_get_property_as_boolean (context->device, dvd_criteria[n]))
       is_dvd = TRUE;
 
-  g_debug ("is_cd = %i, is_dvd = %i", is_cd, is_dvd);
-
   if (is_dvd)
     {
       /* ask what to do with the empty DVD */
diff --git a/thunar-volman/tvm-usb-device.c b/thunar-volman/tvm-usb-device.c
index 3e99f27..8fe8191 100644
--- a/thunar-volman/tvm-usb-device.c
+++ b/thunar-volman/tvm-usb-device.c
@@ -49,16 +49,12 @@ tvm_usb_device_added (TvmContext *context)
 
   g_return_if_fail (context != NULL);
 
-  g_debug ("usb device added");
-
   /* collect device information */
   driver = g_udev_device_get_property (context->device, "DRIVER");
   is_camera = g_udev_device_get_property_as_boolean (context->device, "ID_GPHOTO2");
 
   if (is_camera)
     {
-      g_debug ("is camera");
-
       enabled_property = "/autophoto/enabled";
       command_property = "/autophoto/command";
 
@@ -68,8 +64,6 @@ tvm_usb_device_added (TvmContext *context)
     }
   else if (g_strcmp0 (driver, "usblp") == 0)
     {
-      g_debug ("is printer");
-
       enabled_property = "/autoprinter/enabled";
       command_property = "/autoprinter/command";
 



More information about the Xfce4-commits mailing list