[gentoo-commits] dev/ikelos:master commit in: media-video/griffith/, media-video/griffith/files/

[Mike Auty]

commit:     f31c2f4f2e19ccaf0d155ef0fc57f593e4175f1c
Author:     layman <layman <AT> localhost>
AuthorDate: Fri May  6 01:11:12 2016 +0000
Commit:     Mike Auty <ikelos <AT> gentoo <DOT> org>
CommitDate: Fri May  6 01:11:12 2016 +0000
URL:        https://gitweb.gentoo.org/dev/ikelos.git/commit/?id=f31c2f4f

Source git from a recent github (source not verified).

 media-video/griffith/ChangeLog                     |   80 +
 media-video/griffith/ChangeLog-2015                |  292 +
 media-video/griffith/Manifest                      |    8 +
 media-video/griffith/files/0.10-fix_lib_path.patch |   13 +
 .../files/griffith-0.12.1-sqlalchemy-0.7.patch     |   39 +
 .../griffith/files/griffith-svn-latest.patch       | 9709 ++++++++++++++++++++
 media-video/griffith/griffith-0.13-r2.ebuild       |   76 +
 media-video/griffith/metadata.xml                  |   15 +
 8 files changed, 10232 insertions(+)

diff --git a/media-video/griffith/ChangeLog b/media-video/griffith/ChangeLog
new file mode 100644
index 0000000..0525524
--- /dev/null
+++ b/media-video/griffith/ChangeLog
@@ -0,0 +1,80 @@
+# ChangeLog for media-video/griffith
+# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
+# (auto-generated from git log)
+
+*griffith-0.13-r1 (09 Aug 2015)
+*griffith-0.13 (09 Aug 2015)
+
+  09 Aug 2015; Robin H. Johnson <robbat2@g.o>
+  +files/0.10-fix_lib_path.patch, +files/griffith-0.12.1-sqlalchemy-0.7.patch,
+  +griffith-0.13.ebuild, +griffith-0.13-r1.ebuild, +metadata.xml:
+  proj/gentoo: Initial commit
+
+  This commit represents a new era for Gentoo:
+  Storing the gentoo-x86 tree in Git, as converted from CVS.
+
+  This commit is the start of the NEW history.
+  Any historical data is intended to be grafted onto this point.
+
+  Creation process:
+  1. Take final CVS checkout snapshot
+  2. Remove ALL ChangeLog* files
+  3. Transform all Manifests to thin
+  4. Remove empty Manifests
+  5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
+  5.1. Do not touch files with -kb/-ko keyword flags.
+
+  Signed-off-by: Robin H. Johnson <robbat2@g.o>
+  X-Thanks: Alec Warner <antarus@g.o> - did the GSoC 2006 migration
+  tests
+  X-Thanks: Robin H. Johnson <robbat2@g.o> - infra guy, herding this
+  project
+  X-Thanks: Nguyen Thai Ngoc Duy <pclouds@g.o> - Former Gentoo
+  developer, wrote Git features for the migration
+  X-Thanks: Brian Harring <ferringb@g.o> - wrote much python to improve
+  cvs2svn
+  X-Thanks: Rich Freeman <rich0@g.o> - validation scripts
+  X-Thanks: Patrick Lauer <patrick@g.o> - Gentoo dev, running new 2014
+  work in migration
+  X-Thanks: Michał Górny <mgorny@g.o> - scripts, QA, nagging
+  X-Thanks: All of other Gentoo developers - many ideas and lots of paint on
+  the bikeshed
+
+  24 Aug 2015; Justin Lecher <jlec@g.o> griffith-0.13.ebuild,
+  griffith-0.13-r1.ebuild, metadata.xml:
+  Use https by default
+
+  Convert all URLs for sites supporting encrypted connections from http to
+  https
+
+  Signed-off-by: Justin Lecher <jlec@g.o>
+
+  24 Aug 2015; Justin Lecher <jlec@g.o> griffith-0.13.ebuild,
+  griffith-0.13-r1.ebuild:
+  Convert all URIs for launchpad.net from http to https
+
+  Signed-off-by: Justin Lecher <jlec@g.o>
+
+  24 Aug 2015; Mike Gilbert <floppym@g.o> metadata.xml:
+  Revert DOCTYPE SYSTEM https changes in metadata.xml
+
+  repoman does not yet accept the https version.
+  This partially reverts eaaface92ee81f30a6ac66fe7acbcc42c00dc450.
+
+  Bug: https://bugs.gentoo.org/552720
+
+  10 Nov 2015; Justin Lecher <jlec@g.o> griffith-0.13.ebuild,
+  griffith-0.13-r1.ebuild:
+  Convert from virtual/python-imaging to plain dev-python/pillow
+
+  Signed-off-by: Justin Lecher <jlec@g.o>
+
+  24 Jan 2016; Michał Górny <mgorny@g.o> metadata.xml:
+  Replace all herds with appropriate projects (GLEP 67)
+
+  Replace all uses of herd with appropriate project maintainers, or no
+  maintainers in case of herds requested to be disbanded.
+
+  24 Jan 2016; Michał Górny <mgorny@g.o> metadata.xml:
+  Set appropriate maintainer types in metadata.xml (GLEP 67)
+

diff --git a/media-video/griffith/ChangeLog-2015 b/media-video/griffith/ChangeLog-2015
new file mode 100644
index 0000000..591f976
--- /dev/null
+++ b/media-video/griffith/ChangeLog-2015
@@ -0,0 +1,292 @@
+# ChangeLog for media-video/griffith
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/griffith/ChangeLog,v 1.69 2015/02/26 15:18:56 idella4 Exp $
+
+*griffith-0.13-r1 (26 Feb 2015)
+
+  26 Feb 2015; Ian Delaney <idella4@g.o> +griffith-0.13-r1.ebuild:
+  revbump; convert -> python-single-r1 and upgrade EAPI, consent by maintainer
+  hwoarang
+
+  14 Feb 2015; Markos Chandras <hwoarang@g.o> griffith-0.13.ebuild:
+  Fix URL for artwork files
+
+  31 Jan 2015; Markos Chandras <hwoarang@g.o> -griffith-9999.ebuild,
+  griffith-0.13.ebuild:
+  Update HOMEPAGE and host artwork tarball ourselves. Drop 9999 ebuild since
+  upstream is gone
+
+  04 Oct 2014; Markos Chandras <hwoarang@g.o> griffith-9999.ebuild:
+  depend on libglade. Bug #295291
+
+  28 Dec 2013; Markos Chandras <hwoarang@g.o> griffith-9999.ebuild:
+  Remove obsolete patch. Bug #496206
+
+  09 Jun 2013; Mike Gilbert <floppym@g.o> griffith-0.13.ebuild,
+  griffith-9999.ebuild:
+  Depend on virtual/python-imaging.
+
+  12 May 2013; Patrick Lauer <patrick@g.o> metadata.xml:
+  Remove obsolete useflag from metadata.xml
+
+  17 Jan 2013; Michał Górny <mgorny@g.o> griffith-9999.ebuild:
+  Ah, and the live ebuild.
+
+  17 Jan 2013; Michał Górny <mgorny@g.o> griffith-0.13.ebuild:
+  Request built-in Python sqlite3 support rather than pysqlite package.
+
+  22 Jul 2012; Markos Chandras <hwoarang@g.o> -griffith-0.12.1.ebuild,
+  griffith-0.13.ebuild:
+  Stable on amd64 wrt bug #427240. Remove old ebuild
+
+  19 Jul 2012; Jeff Horelick <jdhore@g.o> griffith-0.13.ebuild:
+  marked x86 per bug 427240
+
+*griffith-0.13 (22 Mar 2012)
+
+  22 Mar 2012; Markos Chandras <hwoarang@g.o> +griffith-0.13.ebuild,
+  griffith-9999.ebuild:
+  Version bump. Ebuild clean up. EAPI4
+
+  05 Aug 2011; Markos Chandras <hwoarang@g.o> griffith-9999.ebuild:
+  Comply with EAPI3 standards
+
+  05 Aug 2011; Markos Chandras <hwoarang@g.o> griffith-0.12.1.ebuild,
+  +files/griffith-0.12.1-sqlalchemy-0.7.patch, griffith-9999.ebuild:
+  EAPI3, apply conditional patch for sqlalchemy-0.7.1. Add post_inst message
+  about optional runtime dependencies. Bug #377789
+
+  04 Jun 2011; Pacho Ramos <pacho@g.o> griffith-0.12.1.ebuild,
+  griffith-9999.ebuild:
+  RDEPEND on splitted python ebuilds (bug #352935 with Markos Chandras
+  approval).
+
+  17 May 2011; Markos Chandras <hwoarang@g.o> -griffith-0.11.ebuild,
+  -griffith-0.12.ebuild:
+  Remove old
+
+  24 Jan 2011; Christian Faulhammer <fauli@g.o>
+  griffith-0.12.1.ebuild:
+  stable x86, bug 351792
+
+  17 Jan 2011; Markos Chandras <hwoarang@g.o> griffith-0.12.1.ebuild:
+  Stable on amd64 wrt bug #351792
+
+*griffith-0.12.1 (28 Oct 2010)
+
+  28 Oct 2010; Markos Chandras <hwoarang@g.o>
+  +griffith-0.12.1.ebuild:
+  Version bump. Bug 343003
+
+  23 Oct 2010; Markos Chandras <hwoarang@g.o> +griffith-9999.ebuild:
+  Initial commit of live ebuild. Moved from my overlay
+
+*griffith-0.12 (10 Oct 2010)
+
+  10 Oct 2010; Markos Chandras <hwoarang@g.o> +griffith-0.12.ebuild:
+  Version bump
+
+  21 Aug 2010; Markos Chandras <hwoarang@g.o>
+  -files/0.9.6-moving_share_dir.patch, -files/0.9.7.1-fix_spellcheck.patch:
+  Remove unused files
+
+  09 Jul 2010; Markos Chandras <hwoarang@g.o> -griffith-0.9.9.ebuild,
+  -griffith-0.10-r1.ebuild:
+  Remove old ebuilds
+
+  09 Jul 2010; Christian Faulhammer <fauli@g.o> griffith-0.11.ebuild:
+  stable x86, bug 325637
+
+  26 Jun 2010; Christoph Mende <angelos@g.o> griffith-0.11.ebuild:
+  Stable on amd64 wrt bug #325637
+
+  17 Jun 2010; Markos Chandras <hwoarang@g.o> griffith-0.11.ebuild:
+  Fix python eclass usage wrt bug #321889
+
+  28 May 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
+  griffith-0.9.9.ebuild, griffith-0.10-r1.ebuild, griffith-0.11.ebuild:
+  Delete calls to deprecated python_version().
+
+*griffith-0.11 (11 Jan 2010)
+
+  11 Jan 2010; Markos Chandras <hwoarang@g.o> +griffith-0.11.ebuild:
+  version bump. Fixes bug #300493
+
+  10 Jan 2010; Markus Meier <maekke@g.o> griffith-0.10-r1.ebuild:
+  x86 stable, bug #298300
+
+  02 Jan 2010; Markos Chandras <hwoarang@g.o>
+  griffith-0.10-r1.ebuild:
+  Stable on amd64 wrt bug #298300
+
+*griffith-0.10-r1 (01 Dec 2009)
+
+  01 Dec 2009; <hwoarang@g.o> -griffith-0.9.10.ebuild,
+  -griffith-0.10.ebuild, +griffith-0.10-r1.ebuild:
+  Depend to libglade instead of glade ( bug #295291 ). Drop old ebuilds
+
+*griffith-0.10 (05 Oct 2009)
+
+  05 Oct 2009; Markos Chandras <hwoarang@g.o>
+  -griffith-0.10_rc1.ebuild, +griffith-0.10.ebuild:
+  Version bump to 0.10. Remove _rc release
+
+*griffith-0.10_rc1 (21 Jul 2009)
+
+  21 Jul 2009; Markos Chandras <hwoarang@g.o>
+  -griffith-0.10_beta3.ebuild, +griffith-0.10_rc1.ebuild:
+  Version bump to _rc1. Remove beta ebuild
+
+*griffith-0.10_beta3 (02 Jul 2009)
+
+  02 Jul 2009; Markos Chandras <hwoarang@g.o>
+  +files/0.10-fix_lib_path.patch, +griffith-0.10_beta3.ebuild:
+  Bump to 0.10_beta3.
+
+  02 Jul 2009; Markos Chandras <hwoarang@g.o> -griffith-0.9.5.ebuild,
+  -griffith-0.9.6-r1.ebuild, -griffith-0.9.7.1.ebuild:
+  Remove old ebuilds
+
+  02 Jul 2009; Markus Meier <maekke@g.o> griffith-0.9.9.ebuild:
+  amd64 stable, bug #273203
+
+  12 Jun 2009; Markos Chandras <hwoarang@g.o> -griffith-9999.ebuild:
+  Remove live ebuild. Moved to my dev overlay
+
+  11 Jun 2009; Christian Faulhammer <fauli@g.o>
+  griffith-0.9.9.ebuild:
+  stable x86, bug 273203
+
+*griffith-0.9.10 (08 Jun 2009)
+
+  08 Jun 2009; Markos Chandras <hwoarang@g.o> griffith-0.9.9.ebuild,
+  +griffith-0.9.10.ebuild:
+  Version bump, ebuild clean up
+
+  24 Feb 2009; Markos Chandras <hwoarang@g.o> griffith-9999:
+  Dropping keywords from live ebuild
+
+*griffith-0.9.9 (24 Feb 2009)
+
+  24 Feb 2009; Markos Chandras <hwoarang@g.o> metadata.xml,
+  +griffith-0.9.9.ebuild:
+  Version bump ( bug #250767 ), changing maintainer
+
+*griffith-9999 (16 Aug 2008)
+*griffith-0.9.7.1 (16 Aug 2008)
+
+  16 Aug 2008; Tiziano Müller <dev-zero@g.o>
+  +files/0.9.7.1-fix_spellcheck.patch, +griffith-0.9.7.1.ebuild,
+  +griffith-9999.ebuild:
+  Version bump. Added live ebuild for testing (no bundled sqlalchemy
+  anymore).
+
+  17 Jul 2008; Alexis Ballier <aballier@g.o>
+  griffith-0.9.6-r1.ebuild:
+  keyword ~x86-fbsd, thanks to Davide Italiano <dav_it@g.o>, bug
+  #231906
+
+  27 Jun 2008; Tiziano Müller <dev-zero@g.o>
+  griffith-0.9.6-r1.ebuild:
+  Added csv USE flag and dependency on dev-python/chardet
+
+*griffith-0.9.6-r1 (07 Jun 2008)
+
+  07 Jun 2008; Tiziano Müller <dev-zero@g.o>
+  +files/0.9.6-moving_share_dir.patch, -griffith-0.9.6.ebuild,
+  +griffith-0.9.6-r1.ebuild:
+  Finally fixed bug #202484
+
+*griffith-0.9.6 (07 Jun 2008)
+
+  07 Jun 2008; Tiziano Müller <dev-zero@g.o> metadata.xml,
+  +griffith-0.9.6.ebuild:
+  Version bump (bug #210993): Currently installs a copy of SQLAlchemy-0.3,
+  this will be fixed in 0.10.
+
+  29 May 2008; Ali Polatel <hawking@g.o> griffith-0.9.5.ebuild:
+  python_mod_{cleanup,optimize} is ROOT aware.
+
+  04 May 2008; Samuli Suominen <drac@g.o> griffith-0.9.5.ebuild:
+  Use berlios mirrors:// wrt #218657
+
+  25 Jan 2008; Krzysiek Pawlik <nelchael@g.o> -griffith-0.9.2.ebuild,
+  -griffith-0.9.3.1.ebuild, griffith-0.9.5.ebuild:
+  Depend on dev-python/pysqlite-2.3*, remove old versions.
+
+  16 Dec 2007; Samuli Suominen <drac@g.o> griffith-0.9.5.ebuild:
+  amd64 stable wrt #202308
+
+  16 Dec 2007; Markus Meier <maekke@g.o> griffith-0.9.5.ebuild:
+  x86 stable, bug #202308
+
+  14 Dec 2007; Krzysiek Pawlik <nelchael@g.o> griffith-0.9.5.ebuild:
+  Fix bug #201648: require =dev-python/sqlalchemy-0.3*
+
+  27 Oct 2007; Krzysiek Pawlik <nelchael@g.o> griffith-0.9.2.ebuild,
+  griffith-0.9.3.1.ebuild, griffith-0.9.5.ebuild:
+  Fix variable quoting.
+
+*griffith-0.9.5 (27 Oct 2007)
+
+  27 Oct 2007; Krzysiek Pawlik <nelchael@g.o> +griffith-0.9.5.ebuild:
+  Version bump.
+
+  27 Oct 2007; Krzysiek Pawlik <nelchael@g.o> griffith-0.9.2.ebuild,
+  griffith-0.9.3.1.ebuild:
+  Update homepage, see bug #196998.
+
+*griffith-0.9.3.1 (03 Jul 2007)
+
+  03 Jul 2007; Krzysiek Pawlik <nelchael@g.o> -griffith-0.9.3.ebuild,
+  +griffith-0.9.3.1.ebuild:
+  Version bump.
+
+  01 Jul 2007; Krzysiek Pawlik <nelchael@g.o> griffith-0.9.3.ebuild:
+  Add dev-python/pyxml to RDEPEND, see bug #183895.
+
+*griffith-0.9.3 (01 Jul 2007)
+
+  01 Jul 2007; Krzysiek Pawlik <nelchael@g.o> +griffith-0.9.3.ebuild:
+  Version bump.
+
+  01 Jul 2007; Piotr Jaroszyński <peper@g.o>
+  +files/digest-griffith-0.9.2, Manifest:
+  (QA) Add digests.
+
+  29 Jun 2007; Christian Faulhammer <opfer@g.o>
+  griffith-0.9.2.ebuild:
+  stable x86, bug 177157
+
+  24 Jun 2007; Christoph Mende <angelos@g.o> griffith-0.9.2.ebuild:
+  Stable on amd64 wrt bug 177157
+
+  15 Jun 2007; Daniel Gryniewicz <dang@g.o> griffith-0.9.2.ebuild:
+  Marked ~amd64 Oops, sqlalchemy not stable; fricken repoman
+
+  15 Jun 2007; Daniel Gryniewicz <dang@g.o> griffith-0.9.2.ebuild:
+  Marked stable on amd64 for bug #177157
+
+  05 May 2007; Krzysiek Pawlik <nelchael@g.o> -griffith-0.6.2.ebuild:
+  Remove old version.
+
+*griffith-0.9.2 (17 Mar 2007)
+
+  17 Mar 2007; Krzysiek Pawlik <nelchael@g.o>
+  -griffith-0.9_rc1.ebuild, +griffith-0.9.2.ebuild:
+  Version bump, see bug #169045.
+
+  02 Mar 2007; Simon Stelling <blubb@g.o> griffith-0.9_rc1.ebuild:
+  add ~amd64; bug 168908
+
+*griffith-0.9_rc1 (29 Dec 2006)
+
+  29 Dec 2006; Tiziano Müller <dev-zero@g.o>
+  +griffith-0.9_rc1.ebuild:
+  Version bump
+
+*griffith-0.6.2 (27 Sep 2006)
+
+  27 Sep 2006; Krzysiek Pawlik <nelchael@g.o> +metadata.xml,
+  +griffith-0.6.2.ebuild:
+  Initial version, see bug #100003.

diff --git a/media-video/griffith/Manifest b/media-video/griffith/Manifest
new file mode 100644
index 0000000..891763f
--- /dev/null
+++ b/media-video/griffith/Manifest
@@ -0,0 +1,8 @@
+AUX 0.10-fix_lib_path.patch 667 SHA256 f9c5a58ac4552ddfe254cdb9e02ef3e91a5feb500c7afe92f9faed9cc02687f2 SHA512 9e85aa92627898a667b86ead4ae691c9d2562300f99da4c4efe57644a9c2bddef0648fce39290b50471cc22e49b4bd478979d3147dfda8a52e8bd55d2c1c6ee7 WHIRLPOOL 2d21cf60ec65001dc5606c4cae638d9102bf0ff576b258aff45246d631d94a900e19a508aff8fed9becb80b5f0708d94959f4473271d35e7fec73492b40e8560
+AUX griffith-0.12.1-sqlalchemy-0.7.patch 1505 SHA256 18989a678f44d4498e08c8c1a7cec41a3ce9bd245e93319878ff4dcefdaaa42c SHA512 43c703a77972731ca5a10bff0151ec53bf0f575e41d85b7bda7260cf0f51fa7972b4159fcca879672754945fadf27d4071fb93ca0c38391317192e0cda7a0637 WHIRLPOOL 7bda212851da410b6da08b4b006cfc55059ef6fe1992308c128acca00d87df8d043f82a8a9c5b53c7f0f5e59d24272e5b031a5c78df55766e6cd6bd72e11e989
+AUX griffith-svn-latest.patch 374854 SHA256 bfccf101d5258b2a321295c3758a58607cd1328b41e07f9d5e01d4789b13114c SHA512 558074473b243d453a968ac0338cba16f08fc96d28767edb1a4f8b3cc17429255b607372038923ea6245b1c07a9e806eeccd4258ca3c031b4ef0ec06461f3008 WHIRLPOOL d9c9db9f5d026facfa699419362ee4ae469f61421f7ddca07ca2c818c768135ac8786a34a204855cd47a89d584152b3eaa9671afb4a351cd10307ed19e202521
+DIST griffith-extra-artwork-0.9.4.tar.gz 124008 SHA256 96bc01a05ad54aad9fabcf411809c46c78b990fc7656ea004cebdfd8ea9894fd SHA512 09e912b4511c5c4a7b501d9a8f98223d20e58574e667cdb759e66f743cce14b45cce8bf0f9502ff2aacfc09e7a7b37966a887205a74a6e028b832703a65a2734 WHIRLPOOL 166dcf1bee1ef07452d00b7c87f487fea5417a0b6d156afd127f8723c6d2c44d2a0e4a5719ab5f85c662b7bbc30f0fadd8ba7873908cdf7ae85167b07a518e6b
+EBUILD griffith-0.13-r2.ebuild 2024 SHA256 cf580721ff4d6516dd00deda37a5cf53c0386f22292191da56ac00b19e21d202 SHA512 1853ccd50e0a771d63abfd44220becf4c9d30c06c8e06dcdbb9d1cd66e83f6e3819d5382f0ba9e450f2e145ce473e5d85217cd267ca173257f09121121a3fb71 WHIRLPOOL 8e35f4e6a94dc59fabe3f096c59fb5e2dbeb24f2d8d95348a4c751ba07f9ed035595ed9fa5a6deb137333fff54a2a5318e8eeff965bdddbddcd5d74814de1559
+MISC ChangeLog 3032 SHA256 ae8db1cd37e72e665ead210852d4cd7c525877487b55ae795ee23664cf9ab5cf SHA512 3833126c33efdd30b5ac3848d5e460a3bfbdb669ad4f6c7fc8269572ea6179b32c1a0b7bd757809fc1333cda2734ba4b9ce7aa3f445ef8043c521005969bb4aa WHIRLPOOL 5382d59070d38edfb47bad710d0d098a6e48d07d23c8ea2588b4ed4db2684a743dfae3a073d2b2223d52c7c5ffea820076c5a213429541812cf26be4b80fdba2
+MISC ChangeLog-2015 9835 SHA256 78a400b34b02b1b3dd875913a658719436a8babfe31978c55e5b59a45881f435 SHA512 f5702d13f2a1b96d3d82520a01b765648b2b78f01eed62ca5d963c1b546f47da0192a9379e77224ee517c6432224f7baba472072c000998bf6f0390dba266963 WHIRLPOOL 5115452e9824a3c69f58980f8a71ac83d42f7cff554b98ad10a1044d4a212edb047458ac6a81f522d50e4de3e4ac98589fd847758c4d55904047dcc3d6247ed2
+MISC metadata.xml 462 SHA256 6e2bf71ddd60d3db2ea72117a88617f654058b959fafcef23d771228da75e6ba SHA512 0aab82c7eaffc0269cb66bbdb5df6e98dad1259c50bfc5343839a7ec2c6b547d3f5d47053673dd8759d945083f2860790a7e2f2efb5f8b0f50be4e74beb1381e WHIRLPOOL e6e875629a9733ac0109bff47e87cdc20c4f270d96279efe1c8c705149dda98a3ada370bd18ec915b9b7a88078aa3e6a6d83b4a9f8eeef2a4268bff0f39f7246

diff --git a/media-video/griffith/files/0.10-fix_lib_path.patch b/media-video/griffith/files/0.10-fix_lib_path.patch
new file mode 100644
index 0000000..952448f
--- /dev/null
+++ b/media-video/griffith/files/0.10-fix_lib_path.patch
@@ -0,0 +1,13 @@
+Index: lib/initialize.py
+===================================================================
+--- lib.orig/initialize.py
++++ lib/initialize.py
+@@ -73,7 +73,7 @@ def locations(self, home_dir):
+             os.environ['LANG'] = lang
+ 
+     elif os.name == 'posix':
+-        locations['share'] = os.path.abspath(os.path.join(locations['lib'], '..'))
++        locations['share'] = os.path.abspath(os.path.join(locations['lib'], '../../share/griffith/'))
+         locations['glade'] = os.path.join(locations['share'], 'glade')
+         locations['i18n']  = os.path.abspath(os.path.join(locations['share'], '..', 'locale'))
+         if not os.path.isdir(locations['i18n']):

diff --git a/media-video/griffith/files/griffith-0.12.1-sqlalchemy-0.7.patch b/media-video/griffith/files/griffith-0.12.1-sqlalchemy-0.7.patch
new file mode 100644
index 0000000..d3e6a5b
--- /dev/null
+++ b/media-video/griffith/files/griffith-0.12.1-sqlalchemy-0.7.patch
@@ -0,0 +1,39 @@
+Index: griffith-0.12.1/lib/add.py
+===================================================================
+--- griffith-0.12.1.orig/lib/add.py
++++ griffith-0.12.1/lib/add.py
+@@ -26,7 +26,7 @@ import logging
+ import os
+ 
+ import gtk
+-from sqlalchemy.exceptions import IntegrityError
++from sqlalchemy.exc import IntegrityError
+ 
+ import quick_filter
+ import db
+Index: griffith-0.12.1/lib/db/tables.py
+===================================================================
+--- griffith-0.12.1.orig/lib/db/tables.py
++++ griffith-0.12.1/lib/db/tables.py
+@@ -64,7 +64,7 @@ movies = Table('movies', metadata,
+     Column('poster_md5', ForeignKey(posters.c.md5sum)),
+     Column('loaned', Boolean, nullable=False, default=False),
+     Column('seen', Boolean, nullable=False, default=False),
+-    Column('rating', SmallInteger(2)),
++    Column('rating', SmallInteger),
+     Column('color', SmallInteger),
+     Column('cond', SmallInteger), # MySQL will not accept name "condition"
+     Column('layers', SmallInteger),
+Index: griffith-0.12.1/lib/sql.py
+===================================================================
+--- griffith-0.12.1.orig/lib/sql.py
++++ griffith-0.12.1/lib/sql.py
+@@ -29,7 +29,7 @@ import logging
+ import os.path
+ 
+ from sqlalchemy import create_engine, or_, and_, not_, exists, asc, desc
+-from sqlalchemy.exceptions import OperationalError
++from sqlalchemy.exc import OperationalError
+ from sqlalchemy.orm import sessionmaker, scoped_session
+ from sqlalchemy.sql.expression import Update, Delete
+ 

diff --git a/media-video/griffith/files/griffith-svn-latest.patch b/media-video/griffith/files/griffith-svn-latest.patch
new file mode 100644
index 0000000..8d0d1b3
--- /dev/null
+++ b/media-video/griffith/files/griffith-svn-latest.patch
@@ -0,0 +1,9709 @@
+diff --git a/.gitignore b/.gitignore
+new file mode 100644
+index 0000000..3af4e56
+--- /dev/null
++++ b/.gitignore
+@@ -0,0 +1,62 @@
++# Byte-compiled / optimized / DLL files
++__pycache__/
++*.py[cod]
++
++# C extensions
++*.so
++
++# Distribution / packaging
++.Python
++env/
++build/
++develop-eggs/
++dist/
++downloads/
++eggs/
++.eggs/
++lib64/
++parts/
++sdist/
++var/
++*.egg-info/
++.installed.cfg
++*.egg
++
++# PyInstaller
++#  Usually these files are written by a python script from a template
++#  before PyInstaller builds the exe, so as to inject date/other infos into it.
++*.manifest
++*.spec
++
++# Installer logs
++pip-log.txt
++pip-delete-this-directory.txt
++
++# Unit test / coverage reports
++htmlcov/
++.tox/
++.coverage
++.coverage.*
++.cache
++nosetests.xml
++coverage.xml
++*,cover
++
++# Translations
++*.mo
++*.pot
++
++# Django stuff:
++*.log
++
++# Sphinx documentation
++docs/_build/
++
++# PyBuilder
++target/
++
++# temp files
++*~
++
++# IDEs
++.idea/
+diff --git a/AUTHORS b/AUTHORS
+index 22b0283..25c9c46 100644
+--- a/AUTHORS
++++ b/AUTHORS
+@@ -32,3 +32,6 @@ dragonskulle <dragonskulle@×××××.com>:
+ 
+ Ivo Nunes <netherblood@×××××.com>
+ * Programmer
++
++Elan Ruusamäe <glen@×××××.ee>
++* Tellico import plugin
+diff --git a/ChangeLog b/ChangeLog
+index e3f8490..df5d1c8 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,10 +1,127 @@
+-# $Id: ChangeLog 1604 2011-12-18 20:46:19Z piotrek $ vim: ts=4
++# $Id$ vim: ts=4
+ 
+ Griffith ChangeLog
+ ------------------
+-(c) 2005-2011  Vasco Nunes, Piotr Ożarowski
++(c) 2005-2014  Vasco Nunes, Piotr Ożarowski
+ 
+ 
++2014-03-13  Michael Jahn
++	* [#1290146] imdb searches
++	* [#1271874] "weitere Titel" werden in Originaltitel übernommen
++
++2013-12-16  Michael Jahn
++	* better handling of temporary poster files
++	
++2013-12-09  Michael Jahn
++	* IMDb plugin updated
++
++2013-12-03  Michael Jahn
++	* IMDb plugin updated
++
++2013-11-17  Michael Jahn
++	* [#1251923] poster not loaded from CSFD
++
++2013-11-12  Michael Jahn
++	* [#1250013] Allocine plugin do not populate the fields
++
++2013-10-17  Michael Jahn
++	* IMDb plugin updated
++	  [#1235747] IMDB fields not populating
++	  [#1239178] IMDB fails to populate some fields
++	  [#1236093] IMDB failure starting around 25 Sept 2013
++	  [#1240477] IMDB not Downloading All Fields in 0.13 for Linux
++
++2013-10-04  Michael Jahn
++	* FilmeAffinity movie plugin updated
++	  [#1210828] FilmAffinity
++	  [#1216572] [FilmAffinity plugin] doesn't show the list of movies
++
++2013-09-27  Michael Jahn
++	* FilmeVonAZ movie plugin updated
++
++2013-06-26  Michael Jahn
++	* [1194709] DVDEmpire plugin stopped returning results
++
++2013-06-24  Michael Jahn
++	* [1174569] FilmAffinity plugin does not work since today
++
++2013-06-01  Michael Jahn
++	* PDF export plugin updated
++	
++2013-05-24  Michael Jahn
++	* Allocine movie plugin updated
++
++2013-04-02  Michael Jahn
++	* [1039068] Return the list of films sorted; added sorting by title for result lists
++
++2013-02-21  Michael Jahn
++	* IMDb and Cinemovies movies plugin updated
++
++2013-01-30  Michael Jahn
++	* FilmeVonAZ and OFDb movie plugins updated
++
++2013-01-28  Michael Jahn
++	* Kino.de and Cineteka movie plugins updated
++
++2012-12-29  Michael Jahn
++	* remove movie plugin FilmDb (site doesn't exists anymore)
++
++2012-12-16  Michael Jahn
++	* fixed backup for databases other than sqlite
++
++2012-12-06  Michael Jahn
++	* fixed IMDb plugins for direct search results
++
++2012-11-29  Michael Jahn
++	* [1084608] IMDB does not work from November 28, 2012; fixed IMDb plugins
++
++2012-11-20  Michael Jahn
++	* fixed Allocine plugin [663709]
++	
++2012-08-30  Michael Jahn
++	* [1043263] importing GriffithXML fails: posters are not added
++
++2012-08-29  Michael Jahn
++	* [1037249] typo in tellico spelling
++	
++2012-07-03  Michael Jahn
++	* DVD Palace movie plugin updated
++	
++2012-06-09  Michael Jahn
++	* DVD Palace movie plugin updated
++
++2012-06-07  Michael Jahn
++	* [#1010073] The MoviePosterDB seems to have quit working properly.
++
++2012-04-10  Vasco Nunes
++	* [#669431] Spell checker doesn't work
++
++2012-04-02  Michael Jahn
++	* fixed Allocine plugin (V3 API) (thanks to CinéphOli)
++
++2012-01-29  Michael Jahn
++	* [#923416] Connection failed. (Amazon plugin)
++	* [#913299] importing covers gives list index out of range
++	* [#913283] importer: 'poster' overwritten by 'image'
++
++2012-01-10  Piotr Ożarowski
++	* Filmweb movie plugin updated (thanks to mariusz2806)
++
++2012-01-08  Piotr Ożarowski
++	* Tellico import plugin added (thanks to Elan Ruusamäe)
++
++2012-01-07  Ivo Nunes
++	* Added a plugin for the portuguese website www.dvdpt.com
++
++2012-01-02  Michael Jahn
++	* [#909513] code errors in import plugins
++
++2011-12-27  Michael Jahn
++	* better error handling for PDF export plugin
++
++2011-12-26  Piotr Ożarowski
++	* Restoring database from backup fixed
++
+ ---- 0.13 ----
+ 
+ 2011-12-18  Piotr Ożarowski
+diff --git a/Makefile b/Makefile
+index 2b66db0..92e6182 100755
+--- a/Makefile
++++ b/Makefile
+@@ -2,7 +2,7 @@
+ #
+ # (c) 2005-2009 Vasco Nunes, Piotr Ozarowski
+ #
+-# $Id: Makefile 1372 2010-01-04 21:20:40Z piotrek $
++# $Id$
+ 
+ PACKAGE=griffith
+ LANGUAGES=$(shell find i18n/ -maxdepth 1 -mindepth 1 -type d -not -name \.svn -printf "%f ")
+diff --git a/NEWS b/NEWS
+index b9bc78d..185fa3e 100644
+--- a/NEWS
++++ b/NEWS
+@@ -2,7 +2,7 @@ Griffith 0.13
+ =============
+ * New movie plugins: AllRovi, IMDB-pt, Interfilmes
+ * Most movie plugins updated, 
+-  - AniDB plugin requires lxml module now (new 4rd party dependency)
++  - AniDB plugin requires lxml module now (new 3rd party dependency)
+ * New extensions: Database Cleanup and Maintenance
+ * MacOSX integration improved
+ * Many bug fixes
+diff --git a/README b/README
+index ccd77cf..8b8b50f 100644
+--- a/README
++++ b/README
+@@ -1,4 +1,4 @@
+-Griffith 0.12.1 README
++Griffith 0.13.0 README
+ ======================
+ 
+ This document was last updated on Thu Jun 10 2009.
+diff --git a/docs/Makefile b/docs/Makefile
+index 699eef4..8bb7a3c 100644
+--- a/docs/Makefile
++++ b/docs/Makefile
+@@ -1,4 +1,4 @@
+-# $Id: Makefile 638 2006-12-31 23:55:38Z piotrek $
++# $Id$
+ LANGUAGES = en pl pt
+ DOC2MAN ?= docbook2x-man
+ 
+diff --git a/docs/en/Makefile b/docs/en/Makefile
+index ce9ba13..07cfd73 100644
+--- a/docs/en/Makefile
++++ b/docs/en/Makefile
+@@ -1,4 +1,4 @@
+-# $Id: Makefile 686 2007-01-07 22:36:07Z piotrek $
++# $Id$
+ .PHONY: all man
+ MANPAGES= griffith.1
+ 
+diff --git a/docs/pl/Makefile b/docs/pl/Makefile
+index 42b8e2c..8bfa015 100644
+--- a/docs/pl/Makefile
++++ b/docs/pl/Makefile
+@@ -1,4 +1,4 @@
+-# $Id: Makefile 686 2007-01-07 22:36:07Z piotrek $
++# $Id$
+ .PHONY: all man
+ MANPAGES= griffith.1
+ 
+diff --git a/docs/pt/Makefile b/docs/pt/Makefile
+index de15a55..dfc3b64 100644
+--- a/docs/pt/Makefile
++++ b/docs/pt/Makefile
+@@ -1,4 +1,4 @@
+-# $Id: Makefile 686 2007-01-07 22:36:07Z piotrek $
++# $Id$
+ .PHONY: all man
+ MANPAGES= griffith.1
+ 
+diff --git a/glade/exporthtml.glade.h b/glade/exporthtml.glade.h
+deleted file mode 100644
+index 6c9b770..0000000
+--- a/glade/exporthtml.glade.h
++++ /dev/null
+@@ -1,27 +0,0 @@
+-char *s = N_("<b>Example</b>");
+-char *s = N_("<b>Export</b>");
+-char *s = N_("<b>Header</b>");
+-char *s = N_("<b>Sort by</b>");
+-char *s = N_("<b>Split into</b>");
+-char *s = N_("<b>Style</b>");
+-char *s = N_("<b>Template</b>");
+-char *s = N_("Author");
+-char *s = N_("Black and white");
+-char *s = N_("Choose style file");
+-char *s = N_("Convert images");
+-char *s = N_("Data");
+-char *s = N_("Description");
+-char *s = N_("Destination");
+-char *s = N_("E-mail");
+-char *s = N_("Export");
+-char *s = N_("Export data");
+-char *s = N_("Format");
+-char *s = N_("Maximal height");
+-char *s = N_("Maximal width");
+-char *s = N_("Posters");
+-char *s = N_("Reverse");
+-char *s = N_("Template");
+-char *s = N_("Use custom file");
+-char *s = N_("Version");
+-char *s = N_("entries per page");
+-char *s = N_("files");
+diff --git a/glade/griffith.glade.h b/glade/griffith.glade.h
+deleted file mode 100644
+index 03d617f..0000000
+--- a/glade/griffith.glade.h
++++ /dev/null
+@@ -1,196 +0,0 @@
+-char *s = N_("0 means no limits");
+-char *s = N_("<b>Audio channels</b>");
+-char *s = N_("<b>Audio codecs</b>");
+-char *s = N_("<b>Audio</b>");
+-char *s = N_("<b>Collection</b>");
+-char *s = N_("<b>Collections</b>");
+-char *s = N_("<b>Defaults</b>");
+-char *s = N_("<b>E-mail reminder</b>");
+-char *s = N_("<b>Languages</b>");
+-char *s = N_("<b>Limits</b>");
+-char *s = N_("<b>Loan History</b>");
+-char *s = N_("<b>Loans</b>");
+-char *s = N_("<b>Media</b>");
+-char *s = N_("<b>Search for:</b>");
+-char *s = N_("<b>Search results</b>");
+-char *s = N_("<b>Select database to use</b>");
+-char *s = N_("<b>Show only the following columns</b>");
+-char *s = N_("<b>Sort by</b>");
+-char *s = N_("<b>Subtitle formats</b>");
+-char *s = N_("<b>Subtitles</b>");
+-char *s = N_("<b>Tags</b>");
+-char *s = N_("<b>Use spell checking on the following fields:</b>");
+-char *s = N_("<b>Video codecs</b>");
+-char *s = N_("<b>Volume</b>");
+-char *s = N_("<b>Volumes</b>");
+-char *s = N_("Add");
+-char *s = N_("Add a new movie");
+-char *s = N_("Add a new person");
+-char *s = N_("Add movie");
+-char *s = N_("Add movie and close");
+-char *s = N_("Adds new movie");
+-char *s = N_("All Movies");
+-char *s = N_("Barcode");
+-char *s = N_("Base font size");
+-char *s = N_("By Collection");
+-char *s = N_("Cameraman");
+-char *s = N_("Cast");
+-char *s = N_("Choose Image");
+-char *s = N_("Classification");
+-char *s = N_("Clear filter");
+-char *s = N_("Clone");
+-char *s = N_("Collection");
+-char *s = N_("Color");
+-char *s = N_("Condition");
+-char *s = N_("Country");
+-char *s = N_("Create backup");
+-char *s = N_("Created");
+-char *s = N_("Database");
+-char *s = N_("Delete a person");
+-char *s = N_("Details");
+-char *s = N_("Dictionaries");
+-char *s = N_("Director");
+-char *s = N_("Discs");
+-char *s = N_("E-mail");
+-char *s = N_("E-mail reminder");
+-char *s = N_("E_xport");
+-char *s = N_("Edit a person");
+-char *s = N_("Edit movie details");
+-char *s = N_("Extensions");
+-char *s = N_("Extensions toolbar");
+-char *s = N_("Favorite Movie Plugin");
+-char *s = N_("Fill empty fields only");
+-char *s = N_("Filter ");
+-char *s = N_("Filter movies");
+-char *s = N_("Font for reports");
+-char *s = N_("Forum");
+-char *s = N_("Found Results");
+-char *s = N_("Genre");
+-char *s = N_("Get from web");
+-char *s = N_("Get movie data from:");
+-char *s = N_("Homepage");
+-char *s = N_("Host");
+-char *s = N_("I_mport");
+-char *s = N_("Image");
+-char *s = N_("Include Front Image");
+-char *s = N_("Include movie number");
+-char *s = N_("Languages");
+-char *s = N_("Layers");
+-char *s = N_("Limit search results to");
+-char *s = N_("Load poster from disk");
+-char *s = N_("Loan");
+-char *s = N_("Loan Management");
+-char *s = N_("Loan movie");
+-char *s = N_("Loan to");
+-char *s = N_("Loaned Movies");
+-char *s = N_("Loans");
+-char *s = N_("Main list");
+-char *s = N_("Manage People");
+-char *s = N_("Media");
+-char *s = N_("Medium");
+-char *s = N_("Meter\n"
+-             "Stars");
+-char *s = N_("Movie details");
+-char *s = N_("Movie information");
+-char *s = N_("Name");
+-char *s = N_("Needs authentication");
+-char *s = N_("New database");
+-char *s = N_("Not Seen Movies");
+-char *s = N_("Notes");
+-char *s = N_("Number");
+-char *s = N_("Official site");
+-char *s = N_("Open search window");
+-char *s = N_("Original Title");
+-char *s = N_("Original title");
+-char *s = N_("Other");
+-char *s = N_("PDF reader");
+-char *s = N_("Password");
+-char *s = N_("People");
+-char *s = N_("Phone");
+-char *s = N_("Please wait a moment...");
+-char *s = N_("Plot");
+-char *s = N_("Plugins");
+-char *s = N_("Port");
+-char *s = N_("Poster image");
+-char *s = N_("Poster viewer");
+-char *s = N_("Preferences");
+-char *s = N_("Print Cover");
+-char *s = N_("Print cover");
+-char *s = N_("Rating");
+-char *s = N_("Rating image");
+-char *s = N_("Region");
+-char *s = N_("Remove");
+-char *s = N_("Remove poster");
+-char *s = N_("Remove selected movie");
+-char *s = N_("Rename");
+-char *s = N_("Report bug");
+-char *s = N_("Resolution");
+-char *s = N_("Restore from backup");
+-char *s = N_("Return");
+-char *s = N_("Reverse");
+-char *s = N_("Runtime");
+-char *s = N_("SMTP port");
+-char *s = N_("SMTP server");
+-char *s = N_("Saved filters");
+-char *s = N_("Screenplay");
+-char *s = N_("Searching on the web");
+-char *s = N_("Seen it");
+-char *s = N_("Select all");
+-char *s = N_("Select database");
+-char *s = N_("Select first movie");
+-char *s = N_("Select last movie");
+-char *s = N_("Select next movie");
+-char *s = N_("Select previous movie");
+-char *s = N_("Sender E-mail address");
+-char *s = N_("Show other movies in this collection");
+-char *s = N_("Show other movies in this volume");
+-char *s = N_("Simple");
+-char *s = N_("Site");
+-char *s = N_("Size");
+-char *s = N_("Spell check the following language");
+-char *s = N_("Standard\n"
+-             "Slim\n"
+-             "Double Slim");
+-char *s = N_("Studio");
+-char *s = N_("Suggest an unseen movie");
+-char *s = N_("Tags");
+-char *s = N_("Technical information");
+-char *s = N_("This movie is part of...");
+-char *s = N_("Title");
+-char *s = N_("Toolbar");
+-char *s = N_("Trailer");
+-char *s = N_("Type");
+-char *s = N_("Type in the original film title, select source and choose <i>Get from web</i>. Griffith will try to fetch all the related information from the Web.");
+-char *s = N_("Updated");
+-char *s = N_("Use Spellchecker");
+-char *s = N_("Use TLS?");
+-char *s = N_("Username");
+-char *s = N_("Video codec");
+-char *s = N_("Visit movie web site");
+-char *s = N_("Visit the official web site");
+-char *s = N_("Volume");
+-char *s = N_("Watch the trailer");
+-char *s = N_("Year");
+-char *s = N_("_Edit");
+-char *s = N_("_File");
+-char *s = N_("_Help");
+-char *s = N_("_Loans");
+-char *s = N_("_Tools");
+-char *s = N_("_View");
+-char *s = N_("add entered name to collections list");
+-char *s = N_("add entered name to volumes list");
+-char *s = N_("classification");
+-char *s = N_("click here if movie was returned");
+-char *s = N_("collection details");
+-char *s = N_("loaned only");
+-char *s = N_("loans movie or volume");
+-char *s = N_("minutes");
+-char *s = N_("movies");
+-char *s = N_("none");
+-char *s = N_("not loaned only");
+-char *s = N_("remove selected collection");
+-char *s = N_("remove selected volume");
+-char *s = N_("seen only");
+-char *s = N_("tags");
+-char *s = N_("unseen only");
+-char *s = N_("volume details");
+diff --git a/glade/import.glade.h b/glade/import.glade.h
+deleted file mode 100644
+index cf41b79..0000000
+--- a/glade/import.glade.h
++++ /dev/null
+@@ -1,10 +0,0 @@
+-char *s = N_("<b>Import only fields selected below</b>");
+-char *s = N_("<b>Importing...</b>");
+-char *s = N_("Author");
+-char *s = N_("Description");
+-char *s = N_("E-mail");
+-char *s = N_("Fields");
+-char *s = N_("Import window");
+-char *s = N_("Plugin");
+-char *s = N_("Source");
+-char *s = N_("Version");
+diff --git a/glade/importcsv.glade.h b/glade/importcsv.glade.h
+deleted file mode 100644
+index 78d94b5..0000000
+--- a/glade/importcsv.glade.h
++++ /dev/null
+@@ -1,102 +0,0 @@
+-char *s = N_("<b>Some Hints</b>:\n"
+-             "\n"
+-             "On the next step you can assign your csv fields with the one in Griffith.\n"
+-             "One CSV-field can be assigned to multiple griffith-fields, i.e. if you have only one title.\n"
+-             "Your cast-list should be comma-seperated to break it apart in multiple lines.");
+-char *s = N_("Assigned Fields (CSV > Griffith)");
+-char *s = N_("CSV Fields");
+-char *s = N_("CSV Import");
+-char *s = N_("Delimiter");
+-char *s = N_("Encoding");
+-char *s = N_("Fields");
+-char *s = N_("File-Options");
+-char *s = N_("From Row");
+-char *s = N_("Griffith Fields");
+-char *s = N_("If your file has no column headers then you should import from row 0.");
+-char *s = N_("Line terminator");
+-char *s = N_("Quotechar");
+-char *s = N_("ascii (English)\n"
+-             "big5 (Traditional Chinese)\n"
+-             "big5hkscs (Traditional Chinese)\n"
+-             "cp037 (English)\n"
+-             "cp424 (Hebrew)\n"
+-             "cp437 (English)\n"
+-             "cp500 (Western Europe)\n"
+-             "cp737 (Greek)\n"
+-             "cp775 (Baltic languages)\n"
+-             "cp850 (Western Europe)\n"
+-             "cp852 (Central and Eastern Europe)\n"
+-             "cp855 (Bulgarian, Byelorussian, Macedonian, Russian, Serbian)\n"
+-             "cp856 (Hebrew)\n"
+-             "cp857 (Turkish)\n"
+-             "cp860 (Portuguese)\n"
+-             "cp861 (Icelandic)\n"
+-             "cp862 (Hebrew)\n"
+-             "cp863 (Canadian)\n"
+-             "cp864 (Arabic)\n"
+-             "cp865 (Danish, Norwegian)\n"
+-             "cp866 (Russian)\n"
+-             "cp869 (Greek)\n"
+-             "cp874 (Thai)\n"
+-             "cp875 (Greek)\n"
+-             "cp932 (Japanese)\n"
+-             "cp949 (Korean)\n"
+-             "cp950 (Traditional Chinese)\n"
+-             "cp1006 (Urdu)\n"
+-             "cp1026 (Turkish)\n"
+-             "cp1140 (Western Europe)\n"
+-             "cp1250 (Central and Eastern Europe)\n"
+-             "cp1251 (Bulgarian, Byelorussian, Macedonian, Russian, Serbian)\n"
+-             "cp1252 (Western Europe)\n"
+-             "cp1253 (Greek)\n"
+-             "cp1254 (Turkish)\n"
+-             "cp1255 (Hebrew)\n"
+-             "cp1256 (Arabic)\n"
+-             "cp1257 (Baltic languages)\n"
+-             "cp1258 (Vietnamese)\n"
+-             "euc_jp (Japanese)\n"
+-             "euc_jis_2004 (Japanese)\n"
+-             "euc_jisx0213 (Japanese)\n"
+-             "euc_kr (Korean)\n"
+-             "gb2312 (Simplified Chinese)\n"
+-             "gbk (Unified Chinese)\n"
+-             "gb18030 (Unified Chinese)\n"
+-             "hz (Simplified Chinese)\n"
+-             "iso2022_jp (Japanese)\n"
+-             "iso2022_jp_1 (Japanese)\n"
+-             "iso2022_jp_2 (Japanese, Korean, Simplified Chinese, Western Europe, Greek)\n"
+-             "iso2022_jp_2004 (Japanese)\n"
+-             "iso2022_jp_3 (Japanese)\n"
+-             "iso2022_jp_ext (Japanese)\n"
+-             "iso2022_kr (Korean)\n"
+-             "latin_1 (West Europe)\n"
+-             "iso8859_2 (Central and Eastern Europe)\n"
+-             "iso8859_3 (Esperanto, Maltese)\n"
+-             "iso8859_4 (Baltic languagues)\n"
+-             "iso8859_5 (Bulgarian, Byelorussian, Macedonian, Russian, Serbian)\n"
+-             "iso8859_6 (Arabic)\n"
+-             "iso8859_7 (Greek)\n"
+-             "iso8859_8 (Hebrew)\n"
+-             "iso8859_9 (Turkish)\n"
+-             "iso8859_10 (Nordic languages)\n"
+-             "iso8859_13 (Baltic languages)\n"
+-             "iso8859_14 (Celtic languages)\n"
+-             "iso8859_15 (Western Europe)\n"
+-             "johab (Korean)\n"
+-             "koi8_r (Russian)\n"
+-             "koi8_u (Ukrainian)\n"
+-             "mac_cyrillic (Bulgarian, Byelorussian, Macedonian, Russian, Serbian)\n"
+-             "mac_greek (Greek)\n"
+-             "mac_iceland (Icelandic)\n"
+-             "mac_latin2 (Central and Eastern Europe)\n"
+-             "mac_roman (Western Europe)\n"
+-             "mac_turkish (Turkish)\n"
+-             "ptcp154 (Kazakh)\n"
+-             "shift_jis (Japanese)\n"
+-             "shift_jis_2004 (Japanese)\n"
+-             "shift_jisx0213 (Japanese)\n"
+-             "utf_16 (all languages)\n"
+-             "utf_16_be (all languages (BMP only))\n"
+-             "utf_16_le (all languages (BMP only))\n"
+-             "utf_7 (all languages)\n"
+-             "utf_8 (all languages)");
+diff --git a/griffith b/griffith
+index 1242e28..52955ff 100755
+--- a/griffith
++++ b/griffith
+@@ -1,7 +1,7 @@
+ #!/usr/bin/env python
+ # -*- coding: utf-8 -*-
+ 
+-__revision__ = '$Id: griffith 1600 2011-12-02 20:30:27Z mikej06 $'
++__revision__ = '$Id$'
+ 
+ # Copyright © 2005-2010 Vasco Nunes, Piotr Ożarowski
+ 
+diff --git a/i18n/ar/LC_MESSAGES/griffith.mo b/i18n/ar/LC_MESSAGES/griffith.mo
+deleted file mode 100644
+index e0f71aa..0000000
+Binary files a/i18n/ar/LC_MESSAGES/griffith.mo and /dev/null differ
+diff --git a/i18n/bg/LC_MESSAGES/griffith.mo b/i18n/bg/LC_MESSAGES/griffith.mo
+deleted file mode 100644
+index 9967ec7..0000000
+Binary files a/i18n/bg/LC_MESSAGES/griffith.mo and /dev/null differ
+diff --git a/i18n/ca/LC_MESSAGES/griffith.mo b/i18n/ca/LC_MESSAGES/griffith.mo
+deleted file mode 100644
+index d7582de..0000000
+Binary files a/i18n/ca/LC_MESSAGES/griffith.mo and /dev/null differ
+diff --git a/i18n/cs/LC_MESSAGES/griffith.mo b/i18n/cs/LC_MESSAGES/griffith.mo
+deleted file mode 100644
+index 285225f..0000000
+Binary files a/i18n/cs/LC_MESSAGES/griffith.mo and /dev/null differ
+diff --git a/i18n/da/LC_MESSAGES/griffith.mo b/i18n/da/LC_MESSAGES/griffith.mo
+deleted file mode 100644
+index df35e48..0000000
+Binary files a/i18n/da/LC_MESSAGES/griffith.mo and /dev/null differ
+diff --git a/i18n/de/LC_MESSAGES/griffith.mo b/i18n/de/LC_MESSAGES/griffith.mo
+deleted file mode 100644
+index 1308fa4..0000000
+Binary files a/i18n/de/LC_MESSAGES/griffith.mo and /dev/null differ
+diff --git a/i18n/el/LC_MESSAGES/griffith.mo b/i18n/el/LC_MESSAGES/griffith.mo
+deleted file mode 100644
+index c0182ef..0000000
+Binary files a/i18n/el/LC_MESSAGES/griffith.mo and /dev/null differ
+diff --git a/i18n/en_GB/LC_MESSAGES/griffith.mo b/i18n/en_GB/LC_MESSAGES/griffith.mo
+deleted file mode 100644
+index 8b2408a..0000000
+Binary files a/i18n/en_GB/LC_MESSAGES/griffith.mo and /dev/null differ
+diff --git a/i18n/es/LC_MESSAGES/griffith.mo b/i18n/es/LC_MESSAGES/griffith.mo
+deleted file mode 100644
+index 8277702..0000000
+Binary files a/i18n/es/LC_MESSAGES/griffith.mo and /dev/null differ
+diff --git a/i18n/et/LC_MESSAGES/griffith.mo b/i18n/et/LC_MESSAGES/griffith.mo
+deleted file mode 100644
+index 8477844..0000000
+Binary files a/i18n/et/LC_MESSAGES/griffith.mo and /dev/null differ
+diff --git a/i18n/eu/LC_MESSAGES/griffith.mo b/i18n/eu/LC_MESSAGES/griffith.mo
+deleted file mode 100644
+index a071409..0000000
+Binary files a/i18n/eu/LC_MESSAGES/griffith.mo and /dev/null differ
+diff --git a/i18n/fa/LC_MESSAGES/griffith.mo b/i18n/fa/LC_MESSAGES/griffith.mo
+deleted file mode 100644
+index cf9d159..0000000
+Binary files a/i18n/fa/LC_MESSAGES/griffith.mo and /dev/null differ
+diff --git a/i18n/fi/LC_MESSAGES/griffith.mo b/i18n/fi/LC_MESSAGES/griffith.mo
+deleted file mode 100644
+index ea86b14..0000000
+Binary files a/i18n/fi/LC_MESSAGES/griffith.mo and /dev/null differ
+diff --git a/i18n/fr/LC_MESSAGES/griffith.mo b/i18n/fr/LC_MESSAGES/griffith.mo
+deleted file mode 100644
+index a040bdc..0000000
+Binary files a/i18n/fr/LC_MESSAGES/griffith.mo and /dev/null differ
+diff --git a/i18n/gl/LC_MESSAGES/griffith.mo b/i18n/gl/LC_MESSAGES/griffith.mo
+deleted file mode 100644
+index d758f19..0000000
+Binary files a/i18n/gl/LC_MESSAGES/griffith.mo and /dev/null differ
+diff --git a/i18n/hr/LC_MESSAGES/griffith.mo b/i18n/hr/LC_MESSAGES/griffith.mo
+deleted file mode 100644
+index 5e36c3a..0000000
+Binary files a/i18n/hr/LC_MESSAGES/griffith.mo and /dev/null differ
+diff --git a/i18n/hu/LC_MESSAGES/griffith.mo b/i18n/hu/LC_MESSAGES/griffith.mo
+deleted file mode 100644
+index 877848e..0000000
+Binary files a/i18n/hu/LC_MESSAGES/griffith.mo and /dev/null differ
+diff --git a/i18n/id/LC_MESSAGES/griffith.mo b/i18n/id/LC_MESSAGES/griffith.mo
+deleted file mode 100644
+index c459603..0000000
+Binary files a/i18n/id/LC_MESSAGES/griffith.mo and /dev/null differ
+diff --git a/i18n/it/LC_MESSAGES/griffith.mo b/i18n/it/LC_MESSAGES/griffith.mo
+deleted file mode 100644
+index 0c69f82..0000000
+Binary files a/i18n/it/LC_MESSAGES/griffith.mo and /dev/null differ
+diff --git a/i18n/ja/LC_MESSAGES/griffith.mo b/i18n/ja/LC_MESSAGES/griffith.mo
+deleted file mode 100644
+index c592f08..0000000
+Binary files a/i18n/ja/LC_MESSAGES/griffith.mo and /dev/null differ
+diff --git a/i18n/ko/LC_MESSAGES/griffith.mo b/i18n/ko/LC_MESSAGES/griffith.mo
+deleted file mode 100644
+index d03fa77..0000000
+Binary files a/i18n/ko/LC_MESSAGES/griffith.mo and /dev/null differ
+diff --git a/i18n/lv/LC_MESSAGES/griffith.mo b/i18n/lv/LC_MESSAGES/griffith.mo
+deleted file mode 100644
+index cea2de7..0000000
+Binary files a/i18n/lv/LC_MESSAGES/griffith.mo and /dev/null differ
+diff --git a/i18n/nb/LC_MESSAGES/griffith.mo b/i18n/nb/LC_MESSAGES/griffith.mo
+deleted file mode 100644
+index bacb307..0000000
+Binary files a/i18n/nb/LC_MESSAGES/griffith.mo and /dev/null differ
+diff --git a/i18n/nds/LC_MESSAGES/griffith.mo b/i18n/nds/LC_MESSAGES/griffith.mo
+deleted file mode 100644
+index b3e9ebb..0000000
+Binary files a/i18n/nds/LC_MESSAGES/griffith.mo and /dev/null differ
+diff --git a/i18n/nl/LC_MESSAGES/griffith.mo b/i18n/nl/LC_MESSAGES/griffith.mo
+deleted file mode 100644
+index ca03e6f..0000000
+Binary files a/i18n/nl/LC_MESSAGES/griffith.mo and /dev/null differ
+diff --git a/i18n/oc/LC_MESSAGES/griffith.mo b/i18n/oc/LC_MESSAGES/griffith.mo
+deleted file mode 100644
+index 9aeca5a..0000000
+Binary files a/i18n/oc/LC_MESSAGES/griffith.mo and /dev/null differ
+diff --git a/i18n/pl/LC_MESSAGES/griffith.mo b/i18n/pl/LC_MESSAGES/griffith.mo
+deleted file mode 100644
+index 1a066cc..0000000
+Binary files a/i18n/pl/LC_MESSAGES/griffith.mo and /dev/null differ
+diff --git a/i18n/ps/LC_MESSAGES/griffith.mo b/i18n/ps/LC_MESSAGES/griffith.mo
+deleted file mode 100644
+index 7a45882..0000000
+Binary files a/i18n/ps/LC_MESSAGES/griffith.mo and /dev/null differ
+diff --git a/i18n/pt/LC_MESSAGES/griffith.mo b/i18n/pt/LC_MESSAGES/griffith.mo
+deleted file mode 100644
+index 30467b8..0000000
+Binary files a/i18n/pt/LC_MESSAGES/griffith.mo and /dev/null differ
+diff --git a/i18n/pt_BR/LC_MESSAGES/griffith.mo b/i18n/pt_BR/LC_MESSAGES/griffith.mo
+deleted file mode 100644
+index 7950f6c..0000000
+Binary files a/i18n/pt_BR/LC_MESSAGES/griffith.mo and /dev/null differ
+diff --git a/i18n/ro/LC_MESSAGES/griffith.mo b/i18n/ro/LC_MESSAGES/griffith.mo
+deleted file mode 100644
+index f354f0b..0000000
+Binary files a/i18n/ro/LC_MESSAGES/griffith.mo and /dev/null differ
+diff --git a/i18n/ru/LC_MESSAGES/griffith.mo b/i18n/ru/LC_MESSAGES/griffith.mo
+deleted file mode 100644
+index 7655f60..0000000
+Binary files a/i18n/ru/LC_MESSAGES/griffith.mo and /dev/null differ
+diff --git a/i18n/sk/LC_MESSAGES/griffith.mo b/i18n/sk/LC_MESSAGES/griffith.mo
+deleted file mode 100644
+index c7e9ecb..0000000
+Binary files a/i18n/sk/LC_MESSAGES/griffith.mo and /dev/null differ
+diff --git a/i18n/sr/LC_MESSAGES/griffith.mo b/i18n/sr/LC_MESSAGES/griffith.mo
+deleted file mode 100644
+index b53df6e..0000000
+Binary files a/i18n/sr/LC_MESSAGES/griffith.mo and /dev/null differ
+diff --git a/i18n/sv/LC_MESSAGES/griffith.mo b/i18n/sv/LC_MESSAGES/griffith.mo
+deleted file mode 100644
+index e8f0c08..0000000
+Binary files a/i18n/sv/LC_MESSAGES/griffith.mo and /dev/null differ
+diff --git a/i18n/th/LC_MESSAGES/griffith.mo b/i18n/th/LC_MESSAGES/griffith.mo
+deleted file mode 100644
+index 105c803..0000000
+Binary files a/i18n/th/LC_MESSAGES/griffith.mo and /dev/null differ
+diff --git a/i18n/tr/LC_MESSAGES/griffith.mo b/i18n/tr/LC_MESSAGES/griffith.mo
+deleted file mode 100644
+index 284e41c..0000000
+Binary files a/i18n/tr/LC_MESSAGES/griffith.mo and /dev/null differ
+diff --git a/i18n/uk/LC_MESSAGES/griffith.mo b/i18n/uk/LC_MESSAGES/griffith.mo
+deleted file mode 100644
+index cadfd19..0000000
+Binary files a/i18n/uk/LC_MESSAGES/griffith.mo and /dev/null differ
+diff --git a/i18n/zh_CN/LC_MESSAGES/griffith.mo b/i18n/zh_CN/LC_MESSAGES/griffith.mo
+deleted file mode 100644
+index b4effb3..0000000
+Binary files a/i18n/zh_CN/LC_MESSAGES/griffith.mo and /dev/null differ
+diff --git a/lib/about.py b/lib/about.py
+index 691bcf1..7cf3482 100644
+--- a/lib/about.py
++++ b/lib/about.py
+@@ -1,6 +1,6 @@
+ # -*- coding: UTF-8 -*-
+ 
+-__revision__ = '$Id: about.py 1519 2011-02-05 15:32:36Z iznogoud $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2005-2011 Vasco Nunes, Piotr Ożarowski
+ #
+diff --git a/lib/add.py b/lib/add.py
+index 18ac196..54c1262 100644
+--- a/lib/add.py
++++ b/lib/add.py
+@@ -1,7 +1,7 @@
+ # -*- coding: UTF-8 -*-
+ # vim: fdm=marker
+ 
+-__revision__ = '$Id: add.py 1595 2011-10-02 19:25:14Z mikej06 $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2005-2011 Vasco Nunes, Piotr Ożarowski
+ #
+@@ -245,19 +245,23 @@ def show_websearch_results(self):
+     if total > 1:
+         self.widgets['results']['window'].show()
+         self.widgets['results']['window'].set_keep_above(True)
++        movieslist = []
+         row = None
+         key = 0
+-        self.treemodel_results.clear()
+         for row in self.search_movie.ids:
+             if (str(row) != ''):
+                 if isinstance(self.search_movie.titles[key], unicode):
+                     title = self.search_movie.titles[key]
+                 else:
+                     title = str(self.search_movie.titles[key]).decode(self.search_movie.encode)
+-                myiter = self.treemodel_results.insert_before(None, None)
+-                self.treemodel_results.set_value(myiter, 0, str(row))
+-                self.treemodel_results.set_value(myiter, 1, title)
++                movieslist.append((row, title))
+             key += 1
++        movieslist = sorted(movieslist, key=lambda titel: titel[1])
++        self.treemodel_results.clear()
++        for entry in movieslist:
++            myiter = self.treemodel_results.insert_before(None, None)
++            self.treemodel_results.set_value(myiter, 0, str(entry[0]))
++            self.treemodel_results.set_value(myiter, 1, entry[1])
+         self.widgets['results']['treeview'].show()
+     elif total == 1:
+         self.widgets['results']['treeview'].set_cursor(total-1)
+@@ -301,7 +305,7 @@ def get_from_web(self):
+                 self.search_movie.title = unicode(title, 'utf-8')
+         # check if internet connection is available
+         try:
+-            urllib2.urlopen(self.search_movie.url)
++            urllib2.urlopen("http://www.griffith.cc")
+             if self.search_movie.search_movies(self.widgets['add']['window']):
+                 self.search_movie.get_searches()
+             if len(self.search_movie.ids) == 1 and o_title and title:
+@@ -684,26 +688,31 @@ def add_movie_db(self, close):
+ 
+     new_poster_md5 = None
+     if details['image']:
+-        tmp_image_path = details['image']
++        tmp_image_path = original_image_path = details['image']
+         if not os.path.isfile(tmp_image_path):
+             tmp_image_path = os.path.join(self.locations['temp'], "poster_%s.jpg" % details['image'])
+         if os.path.isfile(tmp_image_path):
+-            new_poster_md5 = gutils.md5sum(file(tmp_image_path, 'rb'))
++            file_object = file(tmp_image_path, 'rb')
++            try:
++                new_poster_md5 = gutils.md5sum(file_object)
+ 
+-            if session.query(db.Poster).filter_by(md5sum=new_poster_md5).count() == 0:
+-                try:
+-                    data = file(tmp_image_path, 'rb').read()
+-                except Exception, e:
+-                    log.warning("cannot read poster data")
++                if session.query(db.Poster).filter_by(md5sum=new_poster_md5).count() == 0:
++                    try:
++                        file_object.seek(0, 0);
++                        data = file_object.read()
++                    except Exception, e:
++                        log.warning("cannot read poster data")
++                    else:
++                        poster = db.Poster(md5sum=new_poster_md5, data=data)
++                        del details["image"]
++                        details["poster_md5"] = new_poster_md5
++                        session.add(poster)
+                 else:
+-                    poster = db.Poster(md5sum=new_poster_md5, data=data)
+-                    del details["image"]
+                     details["poster_md5"] = new_poster_md5
+-                    session.add(poster)
+-            else:
+-                details["poster_md5"] = new_poster_md5
++            finally:
++                file_object.close()
+             try:
+-                if not tmp_image_path == details['image']:
++                if not tmp_image_path == original_image_path:
+                     os.remove(tmp_image_path)
+             except Exception, e:
+                 log.warn("cannot remove temporary file %s", tmp_image_path)
+diff --git a/lib/advfilter.py b/lib/advfilter.py
+index 1449fb2..6cff56c 100644
+--- a/lib/advfilter.py
++++ b/lib/advfilter.py
+@@ -1,6 +1,6 @@
+ # -*- coding: UTF-8 -*-
+ # vim: fdm=marker et ts=4 sw=4
+-__revision__ = '$Id: advfilter.py 1478 2010-11-23 20:25:16Z mikej06 $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2008 Vasco Nunes, Piotr Ożarowski
+ #
+diff --git a/lib/backup.py b/lib/backup.py
+index c861c87..8b89c8d 100644
+--- a/lib/backup.py
++++ b/lib/backup.py
+@@ -1,6 +1,6 @@
+ # -*- coding: UTF-8 -*-
+ 
+-__revision__ = '$Id: backup.py 1539 2011-02-17 00:31:19Z iznogoud $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2005-2009 Vasco Nunes, Piotr Ożarowski
+ #
+@@ -85,10 +85,12 @@ def create(self):
+                 file_path = os.path.join(self.locations['home'], db_file_name).encode('utf-8')
+                 mzip.write(file_path, arcname=db_file_name)
+             else:
++                tmp_engine = None
+                 try:
+                     tmp_dir = mkdtemp()
+-                    tmp_config = copy.deepcopy(self.config)
+-                    tmp_config._file = os.path.join(tmp_dir, 'griffith.cfg')
++                    tmp_config_file = os.path.join(tmp_dir, 'griffith.cfg')
++                    self.config.save(tmp_config_file)
++                    tmp_config = config.Config(file=tmp_config_file)
+                     tmp_config.set('type', 'sqlite', section='database')
+                     tmp_config.set('file', 'griffith.db', section='database')
+                     tmp_config.set('name', 'griffith', section='database')
+@@ -114,7 +116,8 @@ def create(self):
+                     mzip.write(tmp_file, arcname='griffith.db')
+                 finally:
+                     # disposing the temporary db connection before rmtree and in finally block to avoid locked db file
+-                    tmp_engine.dispose()
++                    if tmp_engine:
++                        tmp_engine.dispose()
+                     rmtree(tmp_dir)
+             gutils.info(_("Backup has been created"), self.widgets['window'])
+ 
+@@ -200,7 +203,7 @@ def restore(self, merge=False):
+     * SQLite3 *.db file
+     """
+     # let user select a backup file
+-    filename = gutils.file_chooser(_("Restore Griffith backup"), \
++    filename, path = gutils.file_chooser(_("Restore Griffith backup"), \
+                 action=gtk.FILE_CHOOSER_ACTION_OPEN, backup=True, \
+                 buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_OPEN, gtk.RESPONSE_OK))
+     if not filename:
+diff --git a/lib/config.py b/lib/config.py
+index 6c95eb3..8db4b1b 100644
+--- a/lib/config.py
++++ b/lib/config.py
+@@ -1,6 +1,6 @@
+ # -*- coding: UTF-8 -*-
+ 
+-__revision__ = '$Id: config.py 1502 2011-01-19 15:52:19Z mikej06 $'
++__revision__ = '$Id$'
+ 
+ # Copyright © 2005-2011 Vasco Nunes, Piotr Ożarowski
+ #
+@@ -85,10 +85,12 @@ class Config(object):
+             d[i] = j
+         return d
+ 
+-    def save(self):
+-        if not os.path.exists(os.path.split(self._file)[0]):
+-            os.makedirs(os.path.split(self._file)[0])
+-        self._cfg.write(open(self._file, 'w'))
++    def save(self, file = None):
++        if not file:
++            file = self._file
++        if not os.path.exists(os.path.split(file)[0]):
++            os.makedirs(os.path.split(file)[0])
++        self._cfg.write(open(file, 'w'))
+ 
+     def load(self):
+         if os.path.isfile(self._file):
+diff --git a/lib/cover.py b/lib/cover.py
+index 7996a89..6dc6cc7 100644
+--- a/lib/cover.py
++++ b/lib/cover.py
+@@ -1,6 +1,6 @@
+ # -*- coding: UTF-8 -*-
+ 
+-__revision__ = '$Id: cover.py 1154 2009-02-08 23:20:39Z piotrek $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2005-2009 Vasco Nunes, Piotr Ożarowski
+ #
+diff --git a/lib/db/__init__.py b/lib/db/__init__.py
+index bdfb131..e63bea9 100644
+--- a/lib/db/__init__.py
++++ b/lib/db/__init__.py
+@@ -1,6 +1,6 @@
+ # -*- coding: UTF-8 -*-
+ # vim: fdm=marker
+-__revision__ = '$Id: __init__.py 1449 2010-09-29 21:03:04Z mikej06 $'
++__revision__ = '$Id$'
+ __version__ = 6 # XXX: database format version, remember to increase after changing data structures
+ 
+ # Copyright © 2009 Piotr Ożarowski
+diff --git a/lib/db/_movie.py b/lib/db/_movie.py
+index 36f014d..42f5adf 100644
+--- a/lib/db/_movie.py
++++ b/lib/db/_movie.py
+@@ -1,5 +1,5 @@
+ # -*- coding: UTF-8 -*-
+-__revision__ = '$Id: _movie.py 1556 2011-06-13 20:46:47Z mikej06 $'
++__revision__ = '$Id$'
+ 
+ # Copyright © 2009-2011 Piotr Ożarowski
+ #
+diff --git a/lib/db/_objects.py b/lib/db/_objects.py
+index f162dd3..8a1e151 100644
+--- a/lib/db/_objects.py
++++ b/lib/db/_objects.py
+@@ -1,6 +1,6 @@
+ # -*- coding: UTF-8 -*-
+ # vim: fdm=marker
+-__revision__ = '$Id: _objects.py 1556 2011-06-13 20:46:47Z mikej06 $'
++__revision__ = '$Id$'
+ 
+ # Copyright © 2009-2011 Piotr Ożarowski
+ #
+diff --git a/lib/db/tables.py b/lib/db/tables.py
+index e36bd2a..5fa152f 100644
+--- a/lib/db/tables.py
++++ b/lib/db/tables.py
+@@ -1,6 +1,6 @@
+ # -*- coding: UTF-8 -*-
+ # vim: fdm=marker
+-__revision__ = '$Id: tables.py 1538 2011-02-13 20:04:22Z piotrek $'
++__revision__ = '$Id$'
+ 
+ # Copyright © 2009 Piotr Ożarowski
+ #
+@@ -66,7 +66,7 @@ movies = Table('movies', metadata,
+     Column('seen', Boolean, nullable=False, default=False),
+     Column('rating', SmallInteger),
+     Column('color', SmallInteger),
+-    Column('cond', SmallInteger), # MySQL will not accept name "condition"
++    Column('cond', SmallInteger),   # MySQL will not accept name "condition"
+     Column('layers', SmallInteger),
+     Column('region', SmallInteger),
+     Column('media_num', SmallInteger),
+diff --git a/lib/db/validators.py b/lib/db/validators.py
+index 9827ef5..d9ca35a 100644
+--- a/lib/db/validators.py
++++ b/lib/db/validators.py
+@@ -23,7 +23,13 @@ __revision__ = '$Id$'
+ 
+ import logging
+ 
+-from sqlalchemy.orm.interfaces import AttributeExtension, InstrumentationManager
++from sqlalchemy.orm.interfaces import AttributeExtension
++try:
++    # sql alchemy 0.8 (and above)
++    from sqlalchemy.ext.instrumentation import InstrumentationManager
++except:
++    # sql alchemy 0.7
++    from sqlalchemy.orm.interfaces import InstrumentationManager
+ from sqlalchemy.orm import ColumnProperty
+ from sqlalchemy.types import String
+ 
+@@ -35,6 +41,7 @@ except:
+ 
+ log = logging.getLogger('Griffith')
+ 
++
+ class InstallValidatorListeners(InstrumentationManager):
+     def post_configure_attribute(self, class_, key, inst):
+         if use_pre_07:
+@@ -78,9 +85,9 @@ class LengthValidator(AttributeExtension):
+         if value and len(value) > self.max_length:
+             # can be changed so that an exception is raised which can be shown in UI
+             # but at the moment an exception is silently lost, only written to console
+-            #raise ValidationError("Length %d exceeds allowed %d for %s" %
++            # raise ValidationError("Length %d exceeds allowed %d for %s" %
+             #                    (len(value), self.max_length, self.name))
+             log.warning("Length %d exceeds allowed %d for %s; truncating value" %
+-                                (len(value), self.max_length, self.name))
++                        (len(value), self.max_length, self.name))
+             return value[0:self.max_length]
+         return value
+diff --git a/lib/dbupgrade.py b/lib/dbupgrade.py
+index 8800fb9..b8f6977 100644
+--- a/lib/dbupgrade.py
++++ b/lib/dbupgrade.py
+@@ -1,7 +1,7 @@
+ # -*- coding: UTF-8 -*-
+ # vim: fdm=marker
+ 
+-__revision__ = '$Id: dbupgrade.py 1596 2011-10-04 18:41:03Z piotrek $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2005-2009 Vasco Nunes, Piotr Ożarowski
+ #
+diff --git a/lib/delete.py b/lib/delete.py
+index ec7e307..f311f4a 100644
+--- a/lib/delete.py
++++ b/lib/delete.py
+@@ -1,6 +1,6 @@
+ # -*- coding: UTF-8 -*-
+ 
+-__revision__ = '$Id: delete.py 1536 2011-02-12 00:50:13Z iznogoud $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2005-2009 Vasco Nunes, Piotr Ożarowski
+ #
+diff --git a/lib/edit.py b/lib/edit.py
+index 60bb70e..b1c387e 100644
+--- a/lib/edit.py
++++ b/lib/edit.py
+@@ -1,6 +1,6 @@
+ # -*- coding: UTF-8 -*-
+ 
+-__revision__ = '$Id: edit.py 1572 2011-08-23 18:47:22Z mikej06 $'
++__revision__ = '$Id$'
+ 
+ # Copyright © 2005-2011 Vasco Nunes, Piotr Ożarowski
+ 
+@@ -37,18 +37,19 @@ def change_poster(self):
+     changes movie poster image to a custom one
+     showing a file chooser dialog to select it
+     """
+-    picture = self.widgets['movie']['picture']
+     number = int(self.selected[0])
+     if number is None:
+         gutils.error(_("You have no movies in your database"), self.widgets['window'])
+         return False
+     return change_poster_select_file(self, number)
+ 
++
+ def update_image(self, number, filename):
+     imagedata = file(filename, 'rb').read()
+     return update_image_from_memory(self, number, imagedata)
+ 
+-def change_poster_select_file(self, number, handler = update_image):
++
++def change_poster_select_file(self, number, handler=update_image):
+     filename = gutils.file_chooser(_("Select image"),
+                                    action=gtk.FILE_CHOOSER_ACTION_OPEN,
+                                    buttons=(gtk.STOCK_CANCEL,
+@@ -64,14 +65,15 @@ def change_poster_select_file(self, number, handler = update_image):
+             return handler(self, number, filename)
+     return False
+ 
++
+ def update_image_from_memory(self, number, data):
+     session = self.db.Session()
+     try:
+         loader = gtk.gdk.PixbufLoader()
+         loader.write(data, len(data))
+         loader.close()
+-        self.widgets['movie']['picture'].set_from_pixbuf(\
+-                loader.get_pixbuf().scale_simple(100, 140, gtk.gdk.INTERP_BILINEAR))
++        self.widgets['movie']['picture'].set_from_pixbuf(
++            loader.get_pixbuf().scale_simple(100, 140, gtk.gdk.INTERP_BILINEAR))
+     except Exception, e:
+         log.error(str(e))
+         gutils.error(_("Image is not valid."), self.widgets['window'])
+@@ -114,7 +116,8 @@ def update_image_from_memory(self, number, data):
+     self.update_statusbar(_("Image has been updated"))
+     return True
+ 
+-def delete_poster(self, movie_id = None):
++
++def delete_poster(self, movie_id=None):
+     if movie_id is None:
+         movie_id = self._movie_id
+     session = self.db.Session()
+@@ -149,8 +152,9 @@ def delete_poster(self, movie_id = None):
+         return True
+     return False
+ 
++
+ def update_tree_thumbnail(self, t_image_path):
+     self.Image.set_from_file(t_image_path)
+     pixbuf = self.Image.get_pixbuf()
+-    if self.selected_iter[0]:
+-        self.treemodel.set_value(self.selected_iter[0], 1, pixbuf)
+\ No newline at end of file
++    if len(self.selected_iter) > 0 and self.selected_iter[0]:
++        self.treemodel.set_value(self.selected_iter[0], 1, pixbuf)
+diff --git a/lib/gconsole.py b/lib/gconsole.py
+index da94b92..ff32c32 100644
+--- a/lib/gconsole.py
++++ b/lib/gconsole.py
+@@ -1,6 +1,6 @@
+ # -*- coding: utf-8 -*-
+ 
+-__revision__ = '$Id: gconsole.py 1588 2011-09-14 19:14:08Z mikej06 $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2005-2009 Vasco Nunes, Piotr Ożarowski
+ 
+diff --git a/lib/gdebug.py b/lib/gdebug.py
+index 538b881..1d04b2a 100644
+--- a/lib/gdebug.py
++++ b/lib/gdebug.py
+@@ -1,6 +1,6 @@
+ # -*- coding: UTF-8 -*-
+ 
+-__revision__ = '$Id: gdebug.py 1326 2009-12-01 21:06:05Z mikej06 $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2009 Vasco Nunes, Piotr Ożarowski
+ #
+diff --git a/lib/gemail.py b/lib/gemail.py
+index cc46779..fa32d9a 100644
+--- a/lib/gemail.py
++++ b/lib/gemail.py
+@@ -1,6 +1,6 @@
+ # -*- coding: UTF-8 -*-
+ 
+-__revision__ = '$Id: gemail.py 1481 2010-12-07 22:32:30Z piotrek $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2005-2007 Vasco Nunes
+ 
+diff --git a/lib/gutils.py b/lib/gutils.py
+index 1ec884f..019d568 100644
+--- a/lib/gutils.py
++++ b/lib/gutils.py
+@@ -1,6 +1,6 @@
+ # -*- coding: UTF-8 -*-
+ 
+-__revision__ = '$Id: gutils.py 1582 2011-09-04 21:08:14Z piotrek $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2005-2009 Vasco Nunes, Piotr Ożarowski
+ #
+diff --git a/lib/initialize.py b/lib/initialize.py
+index 77750a8..bd6a861 100644
+--- a/lib/initialize.py
++++ b/lib/initialize.py
+@@ -1,6 +1,6 @@
+ # -*- coding: UTF-8 -*-
+ 
+-__revision__ = '$Id: initialize.py 1600 2011-12-02 20:30:27Z mikej06 $'
++__revision__ = '$Id$'
+ 
+ # Copyright © 2005-2011 Vasco Nunes, Piotr Ożarowski
+ #
+@@ -50,14 +50,11 @@ def locations(self, home_dir):
+     if defaultEnc is None:
+         defaultEnc = 'UTF-8'
+     locations = {}
+-    locations['exec'] = os.path.abspath(os.path.dirname(sys.argv[0])) # deprecated
++    locations['exec'] = os.path.abspath(os.path.dirname(sys.argv[0]))  # deprecated
+     locations['lib'] = os.path.dirname(__file__)
+     locations['home'] = home_dir
+ 
+-    if os.name == 'nt' or os.name.startswith('win'): # win32, win64
+-        import winshell
+-        from win32com.shell import shellcon, shell
+-
++    if os.name == 'nt' or os.name.startswith('win'):  # win32, win64
+         locations['movie_plugins'] = "%s\\lib\\plugins\\movie" % locations['exec']
+         locations['export_plugins'] = "%s\\lib\\plugins\\export" % locations['exec']
+         locations['images'] = "%s\\images" % locations['exec']
+@@ -165,6 +162,7 @@ def toolbar(self):
+         self.widgets['extensions']['toolbar_hb'].show()
+         self.widgets['menu']['ext_toolbar'].set_active(True)
+ 
++
+ def treeview(self):
+     import main_treeview
+     # set up the treeview to do multiple selection
+@@ -174,7 +172,7 @@ def treeview(self):
+     tree.set_headers_visible(True)
+     tree.get_selection().set_mode(gtk.SELECTION_MULTIPLE)
+     self.widgets['treeview'].get_selection().connect("changed", main_treeview.on_tree_selection, self)
+-    
++
+     # number column
+     renderer = gtk.CellRendererText()
+     self.number_column = gtk.TreeViewColumn(_('No.'), renderer, text=0)
+@@ -280,6 +278,7 @@ def treeview(self):
+     self.updated_column.set_alignment(0.5)
+     self.updated_column.set_reorderable(True)
+     self.widgets['treeview'].append_column(self.updated_column)
++
+     # reflect saved column order and column sizes
+     columnorder = self.config.get('columnorder', None, section='mainlist')
+     if columnorder:
+@@ -319,7 +318,7 @@ def treeview(self):
+     self.total = self.db.session.query(db.Movie).count()
+     self.widgets['treeview'].set_search_equal_func(search_func_treeview)
+     self.widgets['treeview'].show()
+-    
++
+     # adding some completion fields - TODO: move it to initialize
+     self.completion = gtk.EntryCompletion()
+     self.widgets['add']['o_title'].set_completion(self.completion)
+@@ -331,14 +330,15 @@ def treeview(self):
+     self.completion_t.set_model(self.treemodel)
+     self.completion_t.set_text_column(4)
+ 
++
+ def search_func_treeview(model, column, key, iter):
+-    return not (str(model.get_value(iter, 0)).startswith(key) or 
+-        str(model.get_value(iter, 2)).lower().startswith(key.lower()) or 
++    return not (str(model.get_value(iter, 0)).startswith(key) or
++        str(model.get_value(iter, 2)).lower().startswith(key.lower()) or
+         str(model.get_value(iter, 3)).lower().startswith(key.lower()))
+ 
+ 
+ def loans_treeview(self):
+-    self.loans_treemodel = gtk.TreeStore(str, str, str) # move to self.widgets
++    self.loans_treemodel = gtk.TreeStore(str, str, str)  # move to self.widgets
+     self.widgets['movie']['loan_history'].set_model(self.loans_treemodel)
+     self.widgets['movie']['loan_history'].set_headers_visible(True)
+     # loan date
+@@ -540,7 +540,7 @@ def import_plugins(self):
+     for i in fields_to_import:
+         j = j + 1
+         w['fields'][i] = gtk.CheckButton(self.field_names[i])
+-        w['fields'][i].set_active(True) # TODO: get from config
++        w['fields'][i].set_active(True)  # TODO: get from config
+         if j <= k:
+             w['box_import_1'].add(w['fields'][i])
+         elif j <= 2 * k:
+@@ -583,7 +583,6 @@ def extension(self, module, enabled):
+ def extension_preferences(self, module, enabled):
+     # preferences window
+     p_vbox = self.widgets['extensions']['preferences_vbox']
+-
+     configwidgets = {}
+ 
+     label = "%s v%s <i>(%s &lt;%s&gt;)</i>" % (module.name, module.version, module.author, module.email)
+@@ -615,6 +614,9 @@ def extension_preferences(self, module, enabled):
+             w.insert_text(value)
+             # TODO: min, max
+         # elif type is int: # TODO
++        elif type_ is bool:
++            w = gtk.CheckButton()
++            w.set_active(bool(value))
+         elif isinstance(type_, (list, tuple, dict)):
+             model = gtk.TreeStore(str, str)
+             if isinstance(type_, dict):
+@@ -665,7 +667,7 @@ def extensions(self):
+     if hasattr(self, 'extensions'):
+         for ext in self.extensions:
+             ext.clear()
+-    self.extensions = [] # deletes previous instances
++    self.extensions = []  # deletes previous instances
+ 
+     for ext_name in plugins.extensions.by_name:
+         ext_module = plugins.extensions.by_name[ext_name]
+@@ -730,7 +732,7 @@ def combos(self):
+     pos_to_activate = 0
+     selected_criteria = self.config.get('criteria', None, section='mainlist')
+     self.search_criteria_sorted = sorted((self.field_names[criteria], criteria) for criteria in self.search_criteria)
+-    self.search_criteria_sorted.insert( 0, ( _('Any'), 'any' ) ) 
++    self.search_criteria_sorted.insert(0, (_('Any'), 'any'))
+     for (criterianame, criteria) in self.search_criteria_sorted:
+         self.widgets['filter']['criteria'].insert_text(i, criterianame)
+         if selected_criteria == criterianame:
+@@ -745,12 +747,12 @@ def combos(self):
+             self.widgets['preferences']['sortby'].insert_text(i, _('Last added'))
+         i += 1
+     self.widgets['preferences']['sortby'].set_wrap_width(3)
+-    self.widgets['preferences']['sortby'].set_active(0) # Number
++    self.widgets['preferences']['sortby'].set_active(0)  # Number
+ 
+ 
+ def dictionaries(self):
+     """initializes data filled dynamically by users"""
+-    self.am_tags = {} # dictionary for tag CheckBoxes
++    self.am_tags = {}  # dictionary for tag CheckBoxes
+     update_volume_combo_ids(self)
+     update_collection_combo_ids(self)
+     fill_volumes_combo(self)
+@@ -765,7 +767,7 @@ def dictionaries(self):
+     vcodec_combos(self)
+     media_combos(self)
+     create_tag_vbox(self, widget=self.widgets['add']['tag_vbox'], tab=self.am_tags)
+-    self.sort_criteria = [ # "[]" because of index()
++    self.sort_criteria = [  # "[]" because of index()
+         'number', 'o_title', 'title', 'director', 'year', 'runtime', 'country',
+         'genre', 'studio', 'media_num', 'rating', 'classification', 'collection_id',
+         'volume_id', 'cond', 'layers', 'region', 'movie_id']
+@@ -851,9 +853,9 @@ def spellcheck(self):
+     spell_error = False
+     if self.posix and spell_support:
+         if self.config.get('gtkspell', False, section='spell') == True:
+-            if self.config.get('notes', True, section='spell') == True and self.config.get('lang', section='spell') != '':
++            if self.config.get('notes', True, section='spell') is True and self.config.get('lang', section='spell') != '':
+                 try:
+-                    self.notes_spell = gtkspell.Spell(self.widgets['add']['cast'], self.config.get('lang', section='spell'))
++                    self.notes_spell = gtkspell.Spell(self.widgets['add']['notes'], self.config.get('lang', section='spell'))
+                 except:
+                     spell_error = True
+             if self.config.get('plot', True, section='spell') is True and self.config.get('lang', section='spell') != '':
+@@ -921,7 +923,7 @@ def update_collection_combo_ids(self):
+ 
+ def fill_volumes_combo(self, default=0):
+     _tmp = self.initialized
+-    self.initialized = False # don't refresh main treeview
++    self.initialized = False  # don't refresh main treeview
+     self.widgets['add']['volume'].get_model().clear()
+     for i in self.volume_combo_ids:
+         vol_id = self.volume_combo_ids[i]
+@@ -940,7 +942,7 @@ def fill_volumes_combo(self, default=0):
+ 
+ def fill_collections_combo(self, default=0):
+     _tmp = self.initialized
+-    self.initialized = False # don't refresh main treeview
++    self.initialized = False  # don't refresh main treeview
+     self.widgets['add']['collection'].get_model().clear()
+     self.widgets['filter']['collection'].get_model().clear()
+     for i in self.collection_combo_ids:
+@@ -964,9 +966,9 @@ def fill_collections_combo(self, default=0):
+ 
+ def fill_advfilter_combo(self):
+     _tmp = self.initialized
+-    self.initialized = False # don't refresh main treeview
++    self.initialized = False  # don't refresh main treeview
+     self.widgets['filter']['advfilter'].get_model().clear()
+-    self.widgets['filter']['advfilter'].insert_text(0, '') # empty one
++    self.widgets['filter']['advfilter'].insert_text(0, '')  # empty one
+     for i, item in enumerate(self.db.session.query(db.Filter.name).order_by(db.Filter.name).all()):
+         # add some white spaces to prevent scrollbar hides parts of the names
+         self.widgets['filter']['advfilter'].insert_text(i + 1, item.name + '   ')
+@@ -977,7 +979,7 @@ def fill_advfilter_combo(self):
+ 
+ def fill_preferences_tags_combo(self):
+     _tmp = self.initialized
+-    self.initialized = False # don't refresh main treeview
++    self.initialized = False  # don't refresh main treeview
+     self.widgets['preferences']['tag_name'].get_model().clear()
+     self.tags_ids = {}
+     for i, tag in enumerate(self.db.session.query(db.Tag.name, db.Tag.tag_id).all()):
+@@ -990,7 +992,7 @@ def fill_preferences_tags_combo(self):
+ 
+ def fill_resolutions_combo(self, default=0):
+     _tmp = self.initialized
+-    self.initialized = False # don't refresh main treeview
++    self.initialized = False  # don't refresh main treeview
+     self.widgets['add']['resolution'].get_model().clear()
+     #resolutions = [names[0] for names in db._movie.res_aliases.values()]
+     resolutions = [names[0] for (res, names) in db._movie.res_aliases.iteritems()]
+@@ -1086,7 +1088,7 @@ def media_combos(self):
+     self.widgets['preferences']['media'].show_all()
+     if self.config.has_key('media', section='defaults'):
+         pos = gutils.findKey(self.config.get('media', section='defaults'), self.media_ids)
+-        if pos  is not None:
++        if pos is not None:
+             self.widgets['preferences']['media'].set_active(int(pos))
+         else:
+             self.widgets['preferences']['media'].set_active(0)
+@@ -1138,7 +1140,7 @@ def create_tag_vbox(self, widget, tab):
+ 
+ 
+ def remove_hbox(self, widget, tab):
+-    number = len(widget.get_children())-1    # last box number
++    number = len(widget.get_children()) - 1  # last box number
+     try:
+         tab.pop()
+         widget.remove(widget.get_children().pop())
+diff --git a/lib/loan.py b/lib/loan.py
+index c14d423..38210a7 100644
+--- a/lib/loan.py
++++ b/lib/loan.py
+@@ -1,6 +1,6 @@
+ # -*- coding: UTF-8 -*-
+ 
+-__revision__ = '$Id: loan.py 1522 2011-02-05 19:59:38Z iznogoud $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2005-2009 Vasco Nunes, Piotr Ożarowski
+ #
+diff --git a/lib/main_treeview.py b/lib/main_treeview.py
+index 84ccd55..fe110ca 100644
+--- a/lib/main_treeview.py
++++ b/lib/main_treeview.py
+@@ -1,6 +1,6 @@
+ # -*- coding: UTF-8 -*-
+ 
+-__revision__ = '$Id: main_treeview.py 1572 2011-08-23 18:47:22Z mikej06 $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2005-2011 Vasco Nunes, Piotr Ożarowski
+ 
+@@ -24,7 +24,6 @@ __revision__ = '$Id: main_treeview.py 1572 2011-08-23 18:47:22Z mikej06 $'
+ import logging
+ import os
+ import gtk
+-from sqlalchemy import select, desc
+ from sqlalchemy.sql.expression import Select
+ import db
+ import gutils
+@@ -32,12 +31,13 @@ import sql
+ 
+ log = logging.getLogger("Griffith")
+ 
++
+ def on_tree_selection(tree_selection, self):
+     counts = tree_selection.count_selected_rows()
+     treeview_selection_on_event(self, self.widgets['treeview'])
+     treemodel, selected = tree_selection.get_selected_rows()
+     self.selected_iter = [treemodel.get_iter(path) for path in selected]
+-    
++
+     if counts == 1:
+         # TODO: rewrite me
+         self.widgets['menu']['clone'].set_sensitive(True)
+@@ -62,14 +62,17 @@ def on_tree_selection(tree_selection, self):
+         self.widgets['popups']['print_cover'].set_sensitive(False)
+     treeview_clicked(self)
+ 
++
+ def foreach_treeview_selected(model, path, iter, selected):
+     selected.append(model.get_value(iter, 0))
+ 
+-def treeview_selection_on_event(self, treeview, iter = False):
++
++def treeview_selection_on_event(self, treeview, iter=False):
+     self.selected = []
+     treeview.get_selection().selected_foreach(foreach_treeview_selected, self.selected)
+     #return selected
+ 
++
+ def treeview_clicked(self):
+     if self.initialized is False:
+         return False
+@@ -89,7 +92,8 @@ def treeview_clicked(self):
+     else:
+         return False
+ 
+-def set_details(self, item=None):#{{{
++
++def set_details(self, item=None):  # {{{
+     if item is None:
+         item = {}
+     if 'movie_id' in item and item['movie_id']:
+@@ -127,7 +131,7 @@ def set_details(self, item=None):#{{{
+             w['resolution'].set_text(item['resolution'])
+         elif 'height' in item and item['height'] and 'width' in item and item['width']:
+             w['resolution'].set_text("%dx%d" % (item['width'], item['height']))
+-        else: # fallback to 'resolution'
++        else:  # fallback to 'resolution'
+             w['resolution'].set_text(item['resolution'])
+     else:
+         w['resolution'].set_text('')
+@@ -172,10 +176,10 @@ def set_details(self, item=None):#{{{
+         else:
+             log.info("Wrong value in 'region' field (movie_id=%s, region=%s)" % (item['movie_id'], item['region']))
+             w['region'].set_text('')
+-            self.widgets['tooltips'].set_tip(w['region'], self._regions[0]) # N/A
++            self.widgets['tooltips'].set_tip(w['region'], self._regions[0])  # N/A
+     else:
+         w['region'].set_text('')
+-        self.widgets['tooltips'].set_tip(w['region'], self._regions[0]) # N/A
++        self.widgets['tooltips'].set_tip(w['region'], self._regions[0])  # N/A
+     if 'layers' in item and item['layers']:
+         if str(item['layers']) in [str(i) for i in range(len(self._layers))]:
+             w['layers'].set_markup("<i>%s</i>" % self._layers[item['layers']])
+@@ -303,7 +307,7 @@ def set_details(self, item=None):#{{{
+             self.loan_date = str(item.loan_details.date)
+             w['loan_info'].set_use_markup(False)
+             w['loan_info'].set_label(_("This movie has been loaned to %s on %s") % (self.person_name, self.loan_date[:10]))
+-    if 'loaned' in item and not item['loaned']: # "loaned" status can be changed above, so don't use "else:" in this line
++    if 'loaned' in item and not item['loaned']:  # "loaned" status can be changed above, so don't use "else:" in this line
+         self.widgets['popups']['loan'].set_sensitive(True)
+         self.widgets['popups']['email'].set_sensitive(False)
+         self.widgets['popups']['return'].set_sensitive(False)
+@@ -358,7 +362,7 @@ def set_details(self, item=None):#{{{
+         i.destroy()
+     if 'languages' in item and len(item['languages']) > 0:
+         for i in item['languages']:
+-            if i.type == 3: # subtitles
++            if i.type == 3:  # subtitles
+                 if i.subformat:
+                     tmp = "%s - %s" % (i.language.name, i.subformat.name)
+                 else:
+@@ -390,21 +394,21 @@ def set_details(self, item=None):#{{{
+         tmp = ''
+         for tag in item['tags']:
+             tmp += "%s, " % tag.name
+-        tmp = tmp[:-2] # cut last comma
++        tmp = tmp[:-2]  # cut last comma
+         w['tags'].set_text(tmp)
+     #}}}
+ 
+ 
+-def populate(self, movies=None, where=None, qf=True):#{{{
+-    if self.initialized is False: # dont try to fill movie list if Griffith is not initialized yet
++def populate(self, movies=None, where=None, qf=True):  # {{{
++    if self.initialized is False:  # dont try to fill movie list if Griffith is not initialized yet
+         return False
+ 
+-    if qf and movies is None or isinstance(movies, Select): # if ".execute().fetchall()" not invoked on movies yet
+-        if not where: # due to possible 'seen', 'loaned', 'collection_id' in where
++    if qf and movies is None or isinstance(movies, Select):  # if ".execute().fetchall()" not invoked on movies yet
++        if not where:  # due to possible 'seen', 'loaned', 'collection_id' in where
+             import advfilter
+ 
+             # saved in advfilter
+-            name = self.widgets['filter']['advfilter'].get_active_text()[:-3].decode('utf-8') # :-3 due to additional '   ' in the name
++            name = self.widgets['filter']['advfilter'].get_active_text()[:-3].decode('utf-8')  # :-3 due to additional '   ' in the name
+             if name:
+                 cond = self.db.session.query(db.Filter).filter_by(name=name).first()
+                 if not cond:
+@@ -529,13 +533,15 @@ def populate(self, movies=None, where=None, qf=True):#{{{
+     self.count_statusbar()
+ #}}}
+ 
+-def addmovie(self, movie): #{{{
++
++def addmovie(self, movie):  # {{{
+     myiter = self.treemodel.append(None)
+     setmovie(self, movie, myiter)
+     return myiter
+ #}}}
+ 
+-def setmovie(self, movie, iter, treemodel = None): #{{{
++
++def setmovie(self, movie, iter, treemodel=None):  # {{{
+     if not treemodel:
+         treemodel = self.treemodel
+ 
+@@ -573,7 +579,8 @@ def setmovie(self, movie, iter, treemodel = None): #{{{
+     return iter
+ #}}}
+ 
+-def select(self, iter, ensurevisible = True): #{{{
++
++def select(self, iter, ensurevisible=True):  # {{{
+     if iter:
+         self.widgets['treeview'].get_selection().select_iter(iter)
+         if ensurevisible:
+diff --git a/lib/movie.py b/lib/movie.py
+index 3489932..dbe41c7 100644
+--- a/lib/movie.py
++++ b/lib/movie.py
+@@ -1,6 +1,6 @@
+ # -*- coding: UTF-8 -*-
+ 
+-__revision__ = '$Id: movie.py 1585 2011-09-12 20:43:18Z mikej06 $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2005-2009 Vasco Nunes, Piotr Ożarowski
+ #
+@@ -24,7 +24,6 @@ __revision__ = '$Id: movie.py 1585 2011-09-12 20:43:18Z mikej06 $'
+ import logging
+ import os
+ import string
+-import sys
+ import tempfile
+ import threading
+ import time
+@@ -76,7 +75,7 @@ class Movie(object):
+     progress = None
+     useurllib2 = False
+ 
+-    # functions that plugin should implement: {{{
++    # functions that plugin should implement
+     def initialize(self):
+         pass
+ 
+@@ -142,7 +141,6 @@ class Movie(object):
+ 
+     def get_year(self):
+         pass
+-    #}}}
+ 
+     def __getitem__(self, key):
+         return getattr(self, key)
+@@ -228,7 +226,8 @@ class Movie(object):
+             dest = "%s.jpg" % tmp_dest
+             try:
+                 self.progress.set_data(self.parent_window, _("Fetching poster"), _("Wait a moment"), False)
+-                retriever = Retriever(self.image_url, self.parent_window, self.progress, dest, useurllib2=self.useurllib2)
++                retriever = Retriever(self.image_url, self.parent_window, self.progress, dest,
++                                      useurllib2=self.useurllib2)
+                 retriever.start()
+                 while retriever.isAlive():
+                     self.progress.pulse()
+@@ -293,13 +292,6 @@ class Movie(object):
+                 self[i] = gutils.clean(self[i])
+                 if not isinstance(self[i], unicode):
+                     self[i] = gutils.gdecode(self[i], self.encode)
+-
+-            if 'o_title' in self.fields_to_fetch and self.o_title is not None:
+-                if self.o_title[:4] == u'The ':
+-                    self.o_title = self.o_title[4:] + u', The'
+-            if 'title' in self.fields_to_fetch and self.title is not None:
+-                if self.title[:4] == u'The ':
+-                    self.title = self.title[4:] + u', The'
+         except:
+             log.exception('')
+         finally:
+@@ -321,10 +313,14 @@ class SearchMovie(object):
+     remove_accents = True
+     progress = None
+     useurllib2 = False
++    usepostrequest = False
+ 
+     def __init__(self):
+         pass
+ 
++    def search(self, parent_window):
++        pass
++
+     def search_movies(self, parent_window):
+         try:
+             #
+@@ -348,13 +344,19 @@ class SearchMovie(object):
+             self.url = self.url % self.title
+             self.url = string.replace(self.url, ' ', '%20')
+         else:
+-            self.url = string.replace(self.url + self.title, ' ', '%20')
++            if not self.usepostrequest:
++                self.url = string.replace(self.url + self.title, ' ', '%20')
+         try:
+             url = self.url.encode(self.encode)
+         except UnicodeEncodeError:
+             url = self.url.encode('utf-8')
+         self.progress.set_data(parent_window, _("Searching"), _("Wait a moment"), True)
+-        retriever = Retriever(url, parent_window, self.progress, destination, useurllib2=self.useurllib2)
++        if self.usepostrequest:
++            postdata = self.get_postdata()
++            retriever = Retriever(url, parent_window, self.progress, destination, useurllib2=self.useurllib2,
++                                  postdata=postdata)
++        else:
++            retriever = Retriever(url, parent_window, self.progress, destination, useurllib2=self.useurllib2)
+         retriever.start()
+         while retriever.isAlive():
+             self.progress.pulse()
+@@ -389,12 +391,16 @@ class SearchMovie(object):
+         finally:
+             urlcleanup()
+         return True
++    
++    def get_postdata(self):
++        # sample, depends on target site
++        return {}
+ 
+ 
+ class Retriever(threading.Thread):
+ 
+-    def __init__(self, URL, parent_window, progress, destination=None, useurllib2=False):
+-        self.URL = URL
++    def __init__(self, url, parent_window, progress, destination=None, useurllib2=False, postdata=None):
++        self.URL = url
+         self.html = None
+         self.exception = None
+         self.destination = destination
+@@ -402,14 +408,23 @@ class Retriever(threading.Thread):
+         self.progress = progress
+         self._stopevent = threading.Event()
+         self._sleepperiod = 1.0
++        self.postdata = postdata
+         threading.Thread.__init__(self, name="Retriever")
+ 
+     def run(self):
+         try:
+             if self.useurllib2:
+-                self.html = urlretrieve2(self.URL, self.destination, self.hook)
++                if self.postdata:
++                    encodedpostdata = urlencode(self.postdata)
++                    self.html = urlretrieve2(self.URL, self.destination, self.hook, encodedpostdata)
++                else:
++                    self.html = urlretrieve2(self.URL, self.destination, self.hook)
+             else:
+-                self.html = urlretrieve(self.URL, self.destination, self.hook)
++                if self.postdata:
++                    encodedpostdata = urlencode(self.postdata)
++                    self.html = urlretrieve(self.URL, self.destination, self.hook, encodedpostdata)
++                else:
++                    self.html = urlretrieve(self.URL, self.destination, self.hook)
+             if self.progress.status:
+                 self.html = []
+         except Exception, e:
+@@ -417,16 +432,17 @@ class Retriever(threading.Thread):
+             self.exception = e
+ 
+     def hook(self, count, blockSize, totalSize):
+-        if totalSize == -1:
+-            pass
+-        else:
+-            try:
+-                downloaded_percentage = min((count * blockSize * 100) / totalSize, 100)
+-            except:
+-                downloaded_percentage = 100
+-            if count != 0:
+-                downloaded_kbyte = int(count * blockSize / 1024.0)
+-                filesize_kbyte = int(totalSize / 1024.0)
++        # if totalSize == -1:
++        #     pass
++        # else:
++        #     try:
++        #         downloaded_percentage = min((count * blockSize * 100) / totalSize, 100)
++        #     except:
++        #         downloaded_percentage = 100
++        #     if count != 0:
++        #         downloaded_kbyte = int(count * blockSize / 1024.0)
++        #         filesize_kbyte = int(totalSize / 1024.0)
++        pass
+ 
+ #
+ # use own derived URLopener class because we need to set a correct User-Agent
+@@ -447,7 +463,7 @@ def urlretrieve(url, filename=None, reporthook=None, data=None):
+ def urlretrieve2(url, filename=None, reporthook=None, data=None):
+     global _tempfilecleanup
+     headers = {
+-        'User-Agent': 'Mozilla/5.0 (Windows; U; Windows NT 5.1; de; rv:1.9.1.7) Gecko/20091221 Firefox/3.5.7',
++        'User-Agent': 'Dalvik/1.2.0 (Linux; U; Android 2.2.2; Huawei U8800-51 Build/HWU8800B635)',
+         'Cache-Control': 'no-cache',
+         'Pragma': 'no-cache',
+         'Accept-Encoding': 'gzip'}
+@@ -540,7 +556,6 @@ class Progress:
+         self.dialog.hide()
+ 
+     def set_data(self, parent_window, title, message, showit):
+-        #self.dialog.set_parent(parent_window)
+         self.dialog.set_title(title)
+         self.label.set_markup(message)
+         if showit is True:
+diff --git a/lib/people.py b/lib/people.py
+index 8545058..4978fb7 100644
+--- a/lib/people.py
++++ b/lib/people.py
+@@ -1,6 +1,6 @@
+ # -*- coding: UTF-8 -*-
+ 
+-__revision__ = '$Id: people.py 1388 2010-01-06 21:02:22Z piotrek $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2005-2009 Vasco Nunes, Piotr Ożarowski
+ #
+diff --git a/lib/plugins/export/PluginExportCSV.py b/lib/plugins/export/PluginExportCSV.py
+index 9dc4ee6..a81778d 100644
+--- a/lib/plugins/export/PluginExportCSV.py
++++ b/lib/plugins/export/PluginExportCSV.py
+@@ -1,6 +1,6 @@
+ # -*- coding: UTF-8 -*-
+ 
+-__revision__ = '$Id: PluginExportCSV.py 1533 2011-02-08 21:04:38Z iznogoud $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2005-2007 Vasco Nunes
+ #
+diff --git a/lib/plugins/export/PluginExportHTML.py b/lib/plugins/export/PluginExportHTML.py
+index 0df219c..4bedf2b 100644
+--- a/lib/plugins/export/PluginExportHTML.py
++++ b/lib/plugins/export/PluginExportHTML.py
+@@ -1,7 +1,7 @@
+ # -*- coding: UTF-8 -*-
+ # vim: fdm=marker
+ 
+-__revision__ = '$Id: PluginExportHTML.py 1509 2011-02-01 21:56:04Z mikej06 $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2005-2009 Piotr Ożarowski
+ #
+diff --git a/lib/plugins/export/PluginExportPDF.py b/lib/plugins/export/PluginExportPDF.py
+index d4ad547..3e707fd 100644
+--- a/lib/plugins/export/PluginExportPDF.py
++++ b/lib/plugins/export/PluginExportPDF.py
+@@ -1,8 +1,8 @@
+ # -*- coding: UTF-8 -*-
+ 
+-__revision__ = '$Id: PluginExportPDF.py 1533 2011-02-08 21:04:38Z iznogoud $'
++__revision__ = '$Id$'
+ 
+-# Copyright (c) 2005-2010 Vasco Nunes
++# Copyright (c) 2005-2013 Vasco Nunes
+ #
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -42,20 +42,34 @@ import db
+ import gutils
+ import version
+ from plugins.export import Base
++import logging
++
++log = logging.getLogger("Griffith")
+ 
+ class ExportPlugin(Base):
+     name = "PDF"
+     description = _("PDF export plugin")
+     author = "Vasco Nunes"
+     email = "<vasco.m.nunes@×××××.com>"
+-    version = "0.6"
++    version = "0.7"
+ 
+-    fields_to_export = ('number', 'o_title', 'title', 'director', 'genre', 'cast', 'plot', 'runtime', 'year', 'notes', 'poster_md5')
++    fields_to_export = ('number', 'o_title', 'title', 'director', 'genre', 'cast', 'plot', 'runtime', 'year', 'notes', 'poster_md5', 'width', 'height', 'volumes.name', 'collections.name')
+ 
+     def initialize(self):
+         self.fontName = ''
+         return True
+ 
++    def _get_resolution(self, movie):
++        if not movie.movies_width or not movie.movies_height:
++            return ''
++        from db._movie import res_aliases
++        resolution = (movie.movies_width, movie.movies_height)
++        if resolution in res_aliases:
++            return res_aliases[resolution][0]
++        else:
++            res_string = "%dx%d" % resolution
++            return res_string
++    
+     def run(self):
+         """exports a simple movie list to a pdf file"""
+ 
+@@ -79,124 +93,142 @@ class ExportPlugin(Base):
+                     overwrite = False
+ 
+             if overwrite == True or overwrite is None:
+-                # filename encoding
+-                defaultLang, defaultEnc = getdefaultlocale()
+-                if defaultEnc is None:
+-                    defaultEnc = 'UTF-8'
+-                c = SimpleDocTemplate(pdffilename.encode(defaultEnc), \
+-                    author = 'Griffith', \
+-                    title = _('List of films').encode('utf-8'), \
+-                    subject = _('List of films').encode('utf-8'))
+-                # data encoding
+-                #if defaultEncoding == 'WinAnsiEncoding':
+-                #    defaultEnc = 'cp1252'
+-                #else:
+-                defaultEnc = 'utf-8'
++                try:
++                    # filename encoding
++                    defaultLang, defaultEnc = getdefaultlocale()
++                    if defaultEnc is None:
++                        defaultEnc = 'UTF-8'
++                    c = SimpleDocTemplate(pdffilename.encode(defaultEnc), \
++                        author = 'Griffith', \
++                        title = _('List of films').encode('utf-8'), \
++                        subject = _('List of films').encode('utf-8'), \
++                        allowSplitting = False)
++                    # data encoding
++                    #if defaultEncoding == 'WinAnsiEncoding':
++                    #    defaultEnc = 'cp1252'
++                    #else:
++                    defaultEnc = 'utf-8'
+ 
+-                pdf_elements = self.config.get('pdf_elements', 'image,director,genre,cast').split(',')
++                    pdf_elements = self.config.get('pdf_elements', 'image,director,genre,cast').split(',')
+ 
+-                self.create_styles()
+-                style = self.styles["Normal"]
+-                Story = [Spacer(1,2*inch)]
++                    self.create_styles()
++                    style = self.styles["Normal"]
++                    Story = [Spacer(1,2*inch)]
+ 
+-                # select sort column - FIXME
+-                sort_column_name = self.config.get('sortby', 'number', section='mainlist')
+-                sort_reverse = self.config.get('sortby_reverse', False, section='mainlist')
+-                do_grouping = True
+-                for i in sort_column_name.split(','):
+-                    if i != 'title' and i != 'o_title':
+-                        do_grouping = False
++                    # select sort column - FIXME
++                    sort_column_name = self.config.get('sortby', 'number', section='mainlist')
++                    sort_reverse = self.config.get('sortby_reverse', False, section='mainlist')
++                    do_grouping = True
++                    for i in sort_column_name.split(','):
++                        if i != 'title' and i != 'o_title':
++                            do_grouping = False
+ 
+-                # build the query
+-                query = self.get_query()
+-                movies = query.execute().fetchall()
++                    # build the query
++                    query = self.get_query()
++                    movies = query.execute().fetchall()
+ 
+-                # define some custom stylesheetfont
+-                total = len(movies)
+-                p = Paragraph(saxutils.escape((_("List of films")).encode('utf-8')), self.styles["Heading1"] )
+-                Story.append(p)
+-                Story.append(Paragraph(" ",style))
+-                p = Paragraph(saxutils.escape((_("Total Movies: %s") % str(total)).encode('utf-8')), self.styles["Heading3"])
+-                Story.append(p)
+-                Story.append(Paragraph(" ",style))
+-                # output movies
+-                first_letter = ''
+-                for movie in movies:
+-                    number = movie.number
+-                    if movie.o_title:
+-                        original_title = movie.o_title.encode(defaultEnc)
+-                    else:
+-                        original_title = ''
+-                    if movie.title:
+-                        title = movie.title.encode(defaultEnc)
+-                    else:
+-                        title = ''
+-                    grouping_title = movie.title
+-                    if grouping_title is None:
+-                        grouping_title = u'None'
+-                    if movie.director:
+-                        director = ' - ' + movie.director.encode(defaultEnc)
+-                    else:
+-                        director = ""
+-                    # group by first letter
+-                    # use movie.title/grouping_title for grouping because of encoding problems !!!
+-                    if do_grouping and grouping_title[0] != first_letter:
+-                        if grouping_title[0] in '0123456789':
+-                            # Group Numbers
+-                            if first_letter != '0-9':
+-                                first_letter = '0-9'
++                    # define some custom stylesheetfont
++                    total = len(movies)
++                    p = Paragraph(saxutils.escape((_("List of films")).encode('utf-8')), self.styles["Heading1"] )
++                    Story.append(p)
++                    Story.append(Paragraph(" ",style))
++                    p = Paragraph(saxutils.escape((_("Total Movies: %s") % str(total)).encode('utf-8')), self.styles["Heading3"])
++                    Story.append(p)
++                    Story.append(Paragraph(" ",style))
++                    # output movies
++                    first_letter = ''
++                    for movie in movies:
++                        number = movie.movies_number
++                        if movie.movies_o_title:
++                            original_title = movie.movies_o_title.encode(defaultEnc)
++                        else:
++                            original_title = ''
++                        if movie.movies_title:
++                            title = movie.movies_title.encode(defaultEnc)
++                        else:
++                            title = ''
++                        grouping_title = movie.movies_title
++                        if grouping_title is None:
++                            grouping_title = u'None'
++                        if movie.movies_director:
++                            director = ' - ' + movie.movies_director.encode(defaultEnc)
++                        else:
++                            director = ""
++                        # group by first letter
++                        # use movie.title/grouping_title for grouping because of encoding problems !!!
++                        if do_grouping and grouping_title[0] != first_letter:
++                            if grouping_title[0] in '0123456789':
++                                # Group Numbers
++                                if first_letter != '0-9':
++                                    first_letter = '0-9'
++                                    paragraph_text = saxutils.escape(first_letter)
++                                    p = Paragraph(paragraph_text.decode(defaultEnc), self.styles['Heading2'])
++                                    Story.append(p)
++                            else:
++                                first_letter = grouping_title[0]
+                                 paragraph_text = saxutils.escape(first_letter)
+                                 p = Paragraph(paragraph_text.decode(defaultEnc), self.styles['Heading2'])
+                                 Story.append(p)
+-                        else:
+-                            first_letter = grouping_title[0]
+-                            paragraph_text = saxutils.escape(first_letter)
+-                            p = Paragraph(paragraph_text.decode(defaultEnc), self.styles['Heading2'])
+-                            Story.append(p)
+-                    # add movie title
+-                    paragraph_text = '<b>'+ saxutils.escape(title) + '</b>' + \
+-                        saxutils.escape(' (' + original_title + ') | ' + str(number))
+-                    p = Paragraph(paragraph_text.decode(defaultEnc), self.styles['Heading3'])
+-                    if 'image' in pdf_elements:
+-                        image_filename = None
+-                        if movie.poster_md5:
+-                            image_filename = gutils.get_image_fname(movie.poster_md5, self.db, 'm')
+-                        if image_filename:
+-                            p = ParagraphAndImage(p, Image(image_filename, width = 30, height = 40), side = 'left')
+-                            # wrap call needed because of a bug in reportlab flowables.py - ParagraphAndImage::split(self,availWidth, availHeight)
+-                            # AttributeError: ParagraphAndImage instance has no attribute 'wI'
+-                            p.wrap(30, 40)
+-                    Story.append(p)
+-                    if 'year' in pdf_elements and movie.year:
+-                        paragraph_text = '<b>' + _('Year') + ': </b>' + saxutils.escape(str(movie.year))
+-                        p = Paragraph(paragraph_text.decode(defaultEnc), self.styles['Normal'])
+-                        Story.append(p)
+-                    if 'runtime' in pdf_elements and movie.runtime:
+-                        paragraph_text = '<b>' + _('Runtime') + ': </b>' + saxutils.escape(str(movie.runtime))
+-                        p = Paragraph(paragraph_text.decode(defaultEnc), self.styles['Normal'])
+-                        Story.append(p)
+-                    if 'genre' in pdf_elements and movie.genre:
+-                        paragraph_text = '<b>' + _('Genre') + ': </b>' + saxutils.escape(movie.genre.encode(defaultEnc))
+-                        p = Paragraph(paragraph_text.decode(defaultEnc), self.styles['Normal'])
+-                        Story.append(p)
+-                    if 'director' in pdf_elements and movie.director:
+-                        paragraph_text = '<i><b>' + _('Director') + ': </b>' + saxutils.escape(movie.director.encode(defaultEnc)) + '</i>'
+-                        p = Paragraph(paragraph_text.decode(defaultEnc), self.styles['Normal'])
++                        # add movie title
++                        paragraph_text = '<b>'+ saxutils.escape(title) + '</b>' + \
++                            saxutils.escape(' (' + original_title + ') | ' + str(number))
++                        p = Paragraph(paragraph_text.decode(defaultEnc), self.styles['Heading3'])
++                        if 'image' in pdf_elements:
++                            image_filename = None
++                            if movie.movies_poster_md5:
++                                image_filename = gutils.get_image_fname(movie.movies_poster_md5, self.db, 'm')
++                            if image_filename:
++                                p = ParagraphAndImage(p, Image(image_filename, width = 30, height = 40), side = 'left')
++                                # wrap call needed because of a bug in reportlab flowables.py - ParagraphAndImage::split(self,availWidth, availHeight)
++                                # AttributeError: ParagraphAndImage instance has no attribute 'wI'
++                                p.wrap(30, 40)
+                         Story.append(p)
+-                    if 'cast' in pdf_elements and movie.cast:
+-                        paragraph_text = '<i><b>' + _('Cast') + ': </b>' + saxutils.escape('; '.join(movie.cast.encode(defaultEnc).split("\n")[0:2])) + '</i>'
+-                        p = Paragraph(paragraph_text.decode(defaultEnc), self.styles['Normal'])
+-                        Story.append(p)
+-                    if 'plot' in pdf_elements and movie.plot:
+-                        paragraph_text = '<i><b>' + _('Plot') + ': </b>' + saxutils.escape(movie.plot.encode(defaultEnc)) + '</i>'
+-                        p = Paragraph(paragraph_text.decode(defaultEnc), self.styles['Normal'])
+-                        Story.append(p)
+-                    if 'notes' in pdf_elements and movie.notes:
+-                        paragraph_text = '<i><b>' + _('Notes') + ': </b>' + saxutils.escape(movie.notes.encode(defaultEnc)) + '</i>'
+-                        p = Paragraph(paragraph_text.decode(defaultEnc), self.styles['Normal'])
+-                        Story.append(p)
+-                c.build(Story, onFirstPage=self.page_template, onLaterPages=self.page_template)
+-                gutils.info(_('PDF has been created.'), self.parent_window)
++                        if 'year' in pdf_elements and movie.movies_year:
++                            paragraph_text = '<b>' + _('Year') + ': </b>' + saxutils.escape(str(movie.movies_year))
++                            p = Paragraph(paragraph_text.decode(defaultEnc), self.styles['Normal'])
++                            Story.append(p)
++                        if 'runtime' in pdf_elements and movie.movies_runtime:
++                            paragraph_text = '<b>' + _('Runtime') + ': </b>' + saxutils.escape(str(movie.movies_runtime))
++                            p = Paragraph(paragraph_text.decode(defaultEnc), self.styles['Normal'])
++                            Story.append(p)
++                        if 'genre' in pdf_elements and movie.movies_genre:
++                            paragraph_text = '<b>' + _('Genre') + ': </b>' + saxutils.escape(movie.movies_genre.encode(defaultEnc))
++                            p = Paragraph(paragraph_text.decode(defaultEnc), self.styles['Normal'])
++                            Story.append(p)
++                        if 'director' in pdf_elements and movie.movies_director:
++                            paragraph_text = '<i><b>' + _('Director') + ': </b>' + saxutils.escape(movie.movies_director.encode(defaultEnc)) + '</i>'
++                            p = Paragraph(paragraph_text.decode(defaultEnc), self.styles['Normal'])
++                            Story.append(p)
++                        if 'cast' in pdf_elements and movie.movies_cast:
++                            paragraph_text = '<i><b>' + _('Cast') + ': </b>' + saxutils.escape('; '.join(movie.movies_cast.encode(defaultEnc).split("\n")[0:2])) + '</i>'
++                            p = Paragraph(paragraph_text.decode(defaultEnc), self.styles['Normal'])
++                            Story.append(p)
++                        if 'plot' in pdf_elements and movie.movies_plot:
++                            paragraph_text = '<i><b>' + _('Plot') + ': </b>' + saxutils.escape(movie.movies_plot.encode(defaultEnc)) + '</i>'
++                            p = Paragraph(paragraph_text.decode(defaultEnc), self.styles['Normal'])
++                            Story.append(p)
++                        if 'notes' in pdf_elements and movie.movies_notes:
++                            paragraph_text = '<i><b>' + _('Notes') + ': </b>' + saxutils.escape(movie.movies_notes.encode(defaultEnc)) + '</i>'
++                            p = Paragraph(paragraph_text.decode(defaultEnc), self.styles['Normal'])
++                            Story.append(p)
++                        resolution = self._get_resolution(movie)
++                        if resolution:
++                            paragraph_text = '<i><b>' + _('Resolution') + ': </b>' + saxutils.escape(resolution.encode(defaultEnc)) + '</i>'
++                            p = Paragraph(paragraph_text.decode(defaultEnc), self.styles['Normal'])
++                            Story.append(p)
++                        if movie.volumes_name:
++                            paragraph_text = '<i><b>' + _('Volume') + ': </b>' + saxutils.escape(movie.volumes_name.encode(defaultEnc)) + '</i>'
++                            p = Paragraph(paragraph_text.decode(defaultEnc), self.styles['Normal'])
++                            Story.append(p)
++                        if movie.collections_name:
++                            paragraph_text = '<i><b>' + _('Collection') + ': </b>' + saxutils.escape(movie.collections_name.encode(defaultEnc)) + '</i>'
++                            p = Paragraph(paragraph_text.decode(defaultEnc), self.styles['Normal'])
++                            Story.append(p)
++                    c.build(Story, onFirstPage=self.page_template, onLaterPages=self.page_template)
++                    gutils.info(_('PDF has been created.'), self.parent_window)
++                except Exception, e:
++                    log.exception('')
++                    gutils.error(str(e))
+ 
+     def create_styles(self):
+         self.styles = getSampleStyleSheet()
+@@ -206,18 +238,23 @@ class ExportPlugin(Base):
+             fontfilename = self.config.get('font', '')
+             (fontfilenamebase, fontfilenameextension) = os.path.splitext(fontfilename)
+ 
+-            pdfmetrics.registerFont(TTFont(self.fontName, fontfilename))
+-            addMapping(self.fontName, 0, 0, self.fontName)
+-            # build font family if available to support <b> and <i>
+-            if os.path.isfile(fontfilenamebase + 'bd' + fontfilenameextension):
+-                pdfmetrics.registerFont(TTFont(self.fontName + '-bold', fontfilenamebase + 'bd' + fontfilenameextension))
+-                addMapping(self.fontName, 1, 0, self.fontName + '-bold')
+-            if os.path.isfile(fontfilenamebase + 'bi' + fontfilenameextension):
+-                pdfmetrics.registerFont(TTFont(self.fontName + '-bolditalic', fontfilenamebase + 'bi' + fontfilenameextension))
+-                addMapping(self.fontName, 1, 1, self.fontName + '-bolditalic')
+-            if os.path.isfile(fontfilenamebase + 'i' + fontfilenameextension):
+-                pdfmetrics.registerFont(TTFont(self.fontName + '-italic', fontfilenamebase + 'i' + fontfilenameextension))
+-                addMapping(self.fontName, 0, 1, self.fontName + '-italic')
++            try:
++                pdfmetrics.registerFont(TTFont(self.fontName, fontfilename))
++            except:
++                log.exception('')
++                self.fontName = "Helvetica"
++            else:
++                addMapping(self.fontName, 0, 0, self.fontName)
++                # build font family if available to support <b> and <i>
++                if os.path.isfile(fontfilenamebase + 'bd' + fontfilenameextension):
++                    pdfmetrics.registerFont(TTFont(self.fontName + '-bold', fontfilenamebase + 'bd' + fontfilenameextension))
++                    addMapping(self.fontName, 1, 0, self.fontName + '-bold')
++                if os.path.isfile(fontfilenamebase + 'bi' + fontfilenameextension):
++                    pdfmetrics.registerFont(TTFont(self.fontName + '-bolditalic', fontfilenamebase + 'bi' + fontfilenameextension))
++                    addMapping(self.fontName, 1, 1, self.fontName + '-bolditalic')
++                if os.path.isfile(fontfilenamebase + 'i' + fontfilenameextension):
++                    pdfmetrics.registerFont(TTFont(self.fontName + '-italic', fontfilenamebase + 'i' + fontfilenameextension))
++                    addMapping(self.fontName, 0, 1, self.fontName + '-italic')
+         else:
+             self.fontName = "Helvetica"
+ 
+diff --git a/lib/plugins/export/PluginExportXML.py b/lib/plugins/export/PluginExportXML.py
+index 5a92473..c645cf8 100644
+--- a/lib/plugins/export/PluginExportXML.py
++++ b/lib/plugins/export/PluginExportXML.py
+@@ -1,6 +1,6 @@
+ # -*- coding: UTF-8 -*-
+ 
+-__revision__ = '$Id: PluginExportXML.py 1533 2011-02-08 21:04:38Z iznogoud $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2005-2007 Vasco Nunes, Piotr Ożarowski
+ #
+diff --git a/lib/plugins/export/PluginExportiPod.py b/lib/plugins/export/PluginExportiPod.py
+index 73179bf..2e1f175 100644
+--- a/lib/plugins/export/PluginExportiPod.py
++++ b/lib/plugins/export/PluginExportiPod.py
+@@ -1,6 +1,6 @@
+ # -*- coding: UTF-8 -*-
+ 
+-__revision__ = '$Id: PluginExportiPod.py 1533 2011-02-08 21:04:38Z iznogoud $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2005-2011 Vasco Nunes
+ #
+diff --git a/lib/plugins/export/__init__.py b/lib/plugins/export/__init__.py
+index 15ce315..957f527 100644
+--- a/lib/plugins/export/__init__.py
++++ b/lib/plugins/export/__init__.py
+@@ -1,6 +1,6 @@
+ # -*- coding: UTF-8 -*-
+ 
+-__revision__ = '$Id: __init__.py 1533 2011-02-08 21:04:38Z iznogoud $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2008-2009 Piotr Ożarowski
+ #
+diff --git a/lib/plugins/extensions/__init__.py b/lib/plugins/extensions/__init__.py
+index 576378b..8b17a29 100644
+--- a/lib/plugins/extensions/__init__.py
++++ b/lib/plugins/extensions/__init__.py
+@@ -1,6 +1,6 @@
+ # -*- coding: UTF-8 -*-
+ 
+-__revision__ = '$Id: __init__.py 1444 2010-08-29 17:52:31Z piotrek $'
++__revision__ = '$Id$'
+ 
+ # Copyright © 2009 Piotr Ożarowski
+ #
+diff --git a/lib/plugins/extensions/ge_amazon.py b/lib/plugins/extensions/ge_amazon.py
+index a12dcc0..ef98df6 100644
+--- a/lib/plugins/extensions/ge_amazon.py
++++ b/lib/plugins/extensions/ge_amazon.py
+@@ -1,6 +1,6 @@
+ # -*- coding: UTF-8 -*-
+ 
+-__revision__ = '$Id: ge_amazon.py 1568 2011-08-10 20:08:12Z mikej06 $'
++__revision__ = '$Id$'
+ 
+ # Copyright © 2009 Piotr Ożarowski
+ #
+diff --git a/lib/plugins/extensions/ge_mark_seen.py b/lib/plugins/extensions/ge_mark_seen.py
+index 8385022..30ccb43 100644
+--- a/lib/plugins/extensions/ge_mark_seen.py
++++ b/lib/plugins/extensions/ge_mark_seen.py
+@@ -1,6 +1,6 @@
+ # -*- coding: UTF-8 -*-
+ 
+-__revision__ = '$Id: ge_mark_seen.py 1568 2011-08-10 20:08:12Z mikej06 $'
++__revision__ = '$Id$'
+ 
+ # Copyright © 2009 Piotr Ożarowski
+ #
+diff --git a/lib/plugins/extensions/ge_movieposterdb.py b/lib/plugins/extensions/ge_movieposterdb.py
+index 27053c7..d7e3e07 100644
+--- a/lib/plugins/extensions/ge_movieposterdb.py
++++ b/lib/plugins/extensions/ge_movieposterdb.py
+@@ -1,6 +1,6 @@
+ # -*- coding: UTF-8 -*-
+ 
+-__revision__ = '$Id: ge_movieposterdb.py 1568 2011-08-10 20:08:12Z mikej06 $'
++__revision__ = '$Id$'
+ 
+ # Copyright © 2010 Michael Jahn
+ #
+@@ -77,23 +77,23 @@ class GriffithExtension(Base):
+                 if movie.year:
+                     url = self.baseurltitleyear % (o_title, movie.year)
+                     data = self._get(url, self.widgets['window'])
+-                    if data:
++                    if data and data.find('movie/0000000') < 0:
+                         largeurl = gutils.trim(data, 'src=\\"', '\\"').replace('/t_', '/l_')
+                 if not data or not largeurl:
+                     url = self.baseurltitle % o_title
+                     data = self._get(url, self.widgets['window'])
+-                    if data:
++                    if data and data.find('movie/0000000') < 0:
+                         largeurl = gutils.trim(data, 'src=\\"', '\\"').replace('/t_', '/l_')
+             if not data or not largeurl and title and title != o_title:
+                 if movie.year:
+                     url = self.baseurltitleyear % (title, movie.year)
+                     data = self._get(url, self.widgets['window'])
+-                    if data:
++                    if data and data.find('movie/0000000') < 0:
+                         largeurl = gutils.trim(data, 'src=\\"', '\\"').replace('/t_', '/l_')
+                 if not data or not largeurl:
+                     url = self.baseurltitle % title
+                     data = self._get(url, self.widgets['window'])
+-                    if data:
++                    if data and data.find('movie/0000000') < 0:
+                         largeurl = gutils.trim(data, 'src=\\"', '\\"').replace('/t_', '/l_')
+         except:
+             log.exception('')
+diff --git a/lib/plugins/extensions/ge_player.py b/lib/plugins/extensions/ge_player.py
+index 2f1644d..81553c1 100644
+--- a/lib/plugins/extensions/ge_player.py
++++ b/lib/plugins/extensions/ge_player.py
+@@ -1,6 +1,6 @@
+ # -*- coding: UTF-8 -*-
+ 
+-__revision__ = '$Id: ge_player.py 1568 2011-08-10 20:08:12Z mikej06 $'
++__revision__ = '$Id$'
+ 
+ # Copyright © 2009 Piotr Ożarowski
+ #
+diff --git a/lib/plugins/extensions/ge_remover.py b/lib/plugins/extensions/ge_remover.py
+index 8674b24..aa6aae3 100644
+--- a/lib/plugins/extensions/ge_remover.py
++++ b/lib/plugins/extensions/ge_remover.py
+@@ -1,6 +1,6 @@
+ # -*- coding: UTF-8 -*-
+ 
+-__revision__ = '$Id: ge_remover.py 1576 2011-08-23 20:20:12Z mikej06 $'
++__revision__ = '$Id$'
+ 
+ # Copyright © 2009 Piotr Ożarowski
+ #
+diff --git a/lib/plugins/imp/AMC.py b/lib/plugins/imp/AMC.py
+index 3a7e7de..0c72de9 100644
+--- a/lib/plugins/imp/AMC.py
++++ b/lib/plugins/imp/AMC.py
+@@ -1,6 +1,6 @@
+ # -*- coding: utf-8 -*-
+ 
+-__revision__ = '$Id: AMC.py 1605 2011-12-18 22:35:25Z piotrek $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2009
+ 
+diff --git a/lib/plugins/imp/AllMyMovies.py b/lib/plugins/imp/AllMyMovies.py
+index e7be119..35e3c03 100644
+--- a/lib/plugins/imp/AllMyMovies.py
++++ b/lib/plugins/imp/AllMyMovies.py
+@@ -1,6 +1,6 @@
+ # -*- coding: utf-8 -*-
+ 
+-__revision__ = '$Id: AllMyMovies.py 1605 2011-12-18 22:35:25Z piotrek $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2009
+ 
+diff --git a/lib/plugins/imp/BESTheMovieLibrary.py b/lib/plugins/imp/BESTheMovieLibrary.py
+index b6c0fd6..28d43d4 100644
+--- a/lib/plugins/imp/BESTheMovieLibrary.py
++++ b/lib/plugins/imp/BESTheMovieLibrary.py
+@@ -1,6 +1,6 @@
+ # -*- coding: utf-8 -*-
+ 
+-__revision__ = '$Id: BESTheMovieLibrary.py 1605 2011-12-18 22:35:25Z piotrek $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2009
+ 
+diff --git a/lib/plugins/imp/CSV.py b/lib/plugins/imp/CSV.py
+index 6fab0a1..8c0017a 100644
+--- a/lib/plugins/imp/CSV.py
++++ b/lib/plugins/imp/CSV.py
+@@ -1,6 +1,6 @@
+ # -*- coding: UTF-8 -*-
+ 
+-__revision__ = '$Id: CSV.py 1549 2011-05-18 12:36:46Z mikej06 $'
++__revision__ = '$Id$'
+ 
+ ###########################################################################
+ #    Copyright (C) 2006-2007 by Jessica Katharina Parth
+@@ -14,8 +14,6 @@ from plugins.imp import ImportPlugin as IP
+ import gtk
+ import gtk.glade
+ import os
+-import pygtk
+-import sys
+ import gutils
+ import string
+ import re
+@@ -281,7 +279,7 @@ class ImportPlugin(IP):
+         # quotechar
+         quotechar = self.gtk.get_widget('e_quotechar').get_text()
+         if quotechar == '':
+-            quotechar == '"'
++            quotechar = '"'
+         # lineterminator
+         active = self.gtk.get_widget('e_lineterminator').get_active()
+         # default for none selected and the same for linux and macintosh
+@@ -292,7 +290,8 @@ class ImportPlugin(IP):
+ 
+         # open file
+         try:
+-            self.data = csv.reader(codecs.open(self.__source_name, 'r', encoding), dialect = 'excel', quotechar = quotechar, delimiter = delimiter, lineterminator = lineterminator)
++            self.data = csv.reader(codecs.open(self.__source_name, 'r', encoding), dialect='excel',
++                                   quotechar=quotechar, delimiter=delimiter, lineterminator=lineterminator)
+ 
+             # get the first line in csv file for the field names
+             self.csv_header = self.data.next()
+diff --git a/lib/plugins/imp/DVDProfiler.py b/lib/plugins/imp/DVDProfiler.py
+index 20f790a..c842dd1 100644
+--- a/lib/plugins/imp/DVDProfiler.py
++++ b/lib/plugins/imp/DVDProfiler.py
+@@ -1,6 +1,6 @@
+ # -*- coding: utf-8 -*-
+ 
+-__revision__ = '$Id: DVDProfiler.py 1605 2011-12-18 22:35:25Z piotrek $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2009
+ 
+@@ -205,11 +205,11 @@ class ImportPlugin(IP):
+                                         details['screenplay'] = details['screenplay'] + lastName + ', '
+                                     elif firstName:
+                                         details['screenplay'] = details['screenplay'] + firstName + ', '
+-                        if len(details['director']) > 2:
++                        if len(details['director']) > 1:
+                             details['director'] = details['director'][:-2]
+-                        if len(details['cameraman']) > 2:
++                        if len(details['cameraman']) > 1:
+                             details['cameraman'] = details['cameraman'][:-2]
+-                        if len(details['screenplay']) > 2:
++                        if len(details['screenplay']) > 1:
+                             details['screenplay'] = details['screenplay'][:-2]
+                     elif node.nodeName == 'Actors':
+                         details['cast'] = ''
+@@ -260,7 +260,7 @@ class ImportPlugin(IP):
+                         for genreElement in genreElements:
+                             if len(genreElement.childNodes) > 0:
+                                 details['genre'] = details['genre'] + genreElement.childNodes[0].data.strip() + ', '
+-                        if details['genre'] > 2:
++                        if len(details['genre']) > 1:
+                             details['genre'] = details['genre'][:-2]
+                     elif node.nodeName == 'Studios':
+                         details['studio'] = ''
+@@ -268,7 +268,7 @@ class ImportPlugin(IP):
+                         for studioElement in studioElements:
+                             if len(studioElement.childNodes) > 0:
+                                 details['studio'] = details['studio'] + studioElement.childNodes[0].data.strip() + ', '
+-                        if details['studio'] > 2:
++                        if len(details['studio']) > 1:
+                             details['studio'] = details['studio'][:-2]
+                     elif node.nodeName == 'Regions':
+                         regionElements = node.getElementsByTagName('Region')
+diff --git a/lib/plugins/imp/FoxMovieManager.py b/lib/plugins/imp/FoxMovieManager.py
+index fc9050b..2a53d7f 100644
+--- a/lib/plugins/imp/FoxMovieManager.py
++++ b/lib/plugins/imp/FoxMovieManager.py
+@@ -1,6 +1,6 @@
+ # -*- coding: utf-8 -*-
+ 
+-__revision__ = '$Id: FoxMovieManager.py 1605 2011-12-18 22:35:25Z piotrek $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2009
+ 
+diff --git a/lib/plugins/imp/GCstar.py b/lib/plugins/imp/GCstar.py
+index 4168e58..e536c7b 100644
+--- a/lib/plugins/imp/GCstar.py
++++ b/lib/plugins/imp/GCstar.py
+@@ -1,6 +1,6 @@
+ # -*- coding: utf-8 -*-
+ 
+-__revision__ = '$Id: GCstar.py 1605 2011-12-18 22:35:25Z piotrek $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2009
+ 
+diff --git a/lib/plugins/imp/GriffithXML.py b/lib/plugins/imp/GriffithXML.py
+index 61ce829..af3075a 100644
+--- a/lib/plugins/imp/GriffithXML.py
++++ b/lib/plugins/imp/GriffithXML.py
+@@ -1,6 +1,6 @@
+ # -*- coding: utf-8 -*-
+ 
+-__revision__ = '$Id: GriffithXML.py 1605 2011-12-18 22:35:25Z piotrek $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2010
+ 
+diff --git a/lib/plugins/imp/MovieTrack.py b/lib/plugins/imp/MovieTrack.py
+index bbf1e03..d54bc9d 100644
+--- a/lib/plugins/imp/MovieTrack.py
++++ b/lib/plugins/imp/MovieTrack.py
+@@ -1,6 +1,6 @@
+ # -*- coding: utf-8 -*-
+ 
+-__revision__ = '$Id: MovieTrack.py 1605 2011-12-18 22:35:25Z piotrek $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2009
+ 
+diff --git a/lib/plugins/imp/MyDVDs.py b/lib/plugins/imp/MyDVDs.py
+index e2a90e5..34cfc66 100644
+--- a/lib/plugins/imp/MyDVDs.py
++++ b/lib/plugins/imp/MyDVDs.py
+@@ -1,6 +1,6 @@
+ # -*- coding: utf-8 -*-
+ 
+-__revision__ = '$Id: MyDVDs.py 1605 2011-12-18 22:35:25Z piotrek $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2009
+ 
+diff --git a/lib/plugins/imp/PersonalVideoDatabase.py b/lib/plugins/imp/PersonalVideoDatabase.py
+index 86f6c97..f9e38a9 100644
+--- a/lib/plugins/imp/PersonalVideoDatabase.py
++++ b/lib/plugins/imp/PersonalVideoDatabase.py
+@@ -1,6 +1,6 @@
+ # -*- coding: utf-8 -*-
+ 
+-__revision__ = '$Id: PersonalVideoDatabase.py 1605 2011-12-18 22:35:25Z piotrek $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2009
+ 
+diff --git a/lib/plugins/imp/Tellico.py b/lib/plugins/imp/Tellico.py
+new file mode 100644
+index 0000000..d12414d
+--- /dev/null
++++ b/lib/plugins/imp/Tellico.py
+@@ -0,0 +1,244 @@
++# -*- coding: utf-8 -*-
++
++__revision__ = '$Id: $'
++
++# Copyright (c) 2011, 2012
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU Library General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
++
++# You may use and distribute this software under the terms of the
++# GNU General Public License, version 2 or later
++
++from plugins.imp import ImportPlugin as IP
++import os
++import gutils
++import string
++from xml.dom import minidom, Node
++import zipfile
++from shutil import rmtree
++from tempfile import mkdtemp
++
++import logging
++log = logging.getLogger("Griffith")
++
++
++class ImportPlugin(IP):
++    description  = 'Tellico'
++    author       = 'Elan Ruusamäe'
++    email        = 'glen@×××××.ee'
++    version      = '1.1'
++    file_filters = '*.[tT][cC]'
++    mime_types   = None
++
++    fileversion  = None
++    filedom      = None
++    items        = None
++    itemindex    = 0
++    zipdir       = None
++
++    def initialize(self):
++        if not IP.initialize(self):
++            return False
++        self.edit = False
++        return True
++
++    def set_source(self, name):
++        IP.set_source(self, name)
++        self.filename = name
++        self.fileversion = self.read_fileversion()
++        if self.fileversion == None:
++            gutils.error(_('The format of the file is not supported.'))
++            return False
++        return True
++
++    def count_movies(self):
++        """Returns number of movies in file which is about to be imported"""
++        count = 0
++        if self.filedom:
++            try:
++                collectionElement = self.filedom.getElementsByTagName('collection')[0]
++                for element in collectionElement.childNodes:
++                    if element.nodeType == Node.ELEMENT_NODE and element.nodeName == 'entry':
++                        count = count + 1
++                log.info('Tellico Import: %s movies for import' % count)
++            except:
++                log.exception('')
++        else:
++            log.error('Tellico Import: No filedom object.')
++        return count
++
++    def get_movie_details(self):
++        """Returns dictionary with movie details"""
++        if not self.filedom:
++            log.error('Tellico Import: filedom not open')
++            return None
++
++        if not self.items:
++            collectionElement = self.filedom.getElementsByTagName('collection')[0]
++            self.items = collectionElement.childNodes
++            self.itemindex = 0
++        if not self.items or len(self.items) < 1:
++            return None
++        if len(self.items) <= self.itemindex:
++            return None
++        item = self.items[self.itemindex]
++        while not (item.nodeType == Node.ELEMENT_NODE and item.nodeName == 'entry') and len(self.items) > self.itemindex + 1:
++            self.itemindex = self.itemindex + 1
++            item = self.items[self.itemindex]
++        if len(self.items) <= self.itemindex:
++            return None
++        if not len(item.childNodes):
++            return None
++
++        details = {}
++        try:
++            details['number'] = item.getAttribute('id')
++            for node in item.childNodes:
++                if node.nodeType == Node.ELEMENT_NODE and len(node.childNodes) > 0:
++                    if node.nodeName == 'color':
++                        value = node.childNodes[0].data.strip()
++                        if value == 'Color':
++                            details['color'] = 1
++                        elif value == 'Black & White':
++                            details['color'] = 2
++                    elif node.nodeName == 'region':
++                        details['region'] = node.childNodes[0].data.strip()
++                    elif node.nodeName == 'running-time':
++                        details['runtime'] = node.childNodes[0].data.strip()
++                        try:
++                            details['runtime'] = int(details['runtime'])
++                        except:
++                            details['runtime'] = 0
++                    elif node.nodeName == 'year':
++                        details['year'] = node.childNodes[0].data.strip()
++                    elif node.nodeName == 'orig-title':
++                        details['o_title'] = node.childNodes[0].data.strip()
++                    elif node.nodeName == 'title':
++                        details['title'] = node.childNodes[0].data.strip()
++                    elif node.nodeName == 'directors':
++                        details['director'] = self._joinXmlNodes(node.getElementsByTagName('director'))
++                    elif node.nodeName == 'writers':
++                        details['screenplay'] = self._joinXmlNodes(node.getElementsByTagName('writer'))
++                    elif node.nodeName == 'o_site':
++                        details['o_site'] = node.childNodes[0].data.strip()
++                    elif node.nodeName == 'url':
++                        details['site'] = node.childNodes[0].data.strip()
++                    elif node.nodeName == 'nationalitys':
++                        details['country'] = self._joinXmlNodes(node.getElementsByTagName('nationality'))
++                    elif node.nodeName == 'genres':
++                        details['genre'] = self._joinXmlNodes(node.getElementsByTagName('genre'))
++                    elif node.nodeName == 'certification':
++                        details['classification'] = node.childNodes[0].data.strip()
++                    elif node.nodeName == 'casts':
++                        details['cast'] = self._joinCastNodes(node.getElementsByTagName('cast'), separator = "\n")
++                    elif node.nodeName == 'plot':
++                        details['plot'] = node.childNodes[0].data.strip()
++                    elif node.nodeName == 'comments':
++                        details['notes'] = node.childNodes[0].data.strip()
++                    elif node.nodeName == 'cover':
++                        imgfile = node.childNodes[0].data.strip()
++                        # use 'image' field, 'poster' field is buggy, bug #913283
++                        # https://bugs.launchpad.net/griffith/+bug/913283
++                        details['image'] = os.path.join(self.zipdir, 'images', imgfile)
++        except EOFError:
++            details = None
++        except Exception, e:
++            log.exception('')
++            details = None
++
++        self.itemindex = self.itemindex + 1
++        return details
++
++    def clear(self):
++        """clear plugin before next source file"""
++        IP.clear(self)
++        if self.filedom:
++            rmtree(self.zipdir)
++            self.zipdir = None
++            self.filedom.unlink()
++            self.filedom = None
++            self.fileversion = None
++            self.items = None
++            self.itemindex = 0
++
++    def destroy(self):
++        """close all resources"""
++        IP.destroy(self)
++
++    def read_fileversion(self):
++        version = None
++        try:
++            self.zipdir = self._extractZip(self.filename)
++            self.filedom = minidom.parse(os.path.join(self.zipdir, 'tellico.xml'))
++            rootElement = self.filedom.getElementsByTagName('tellico')[0]
++            version = rootElement.getAttribute('syntaxVersion')
++        except Exception, e:
++            log.error(str(e))
++            if self.filedom:
++                self.filedom.unlink()
++                self.filedom = None
++        log.info('Tellico: Found file version %s' % version)
++        return version
++
++    def _extractZip(self, filename):
++        zf = zipfile.ZipFile(filename, 'r')
++        tmpdir = mkdtemp(prefix = 'griffit2tellico')
++        zf.extractall(path = tmpdir)
++        return tmpdir
++
++    def _joinXmlNodes(self, elements, separator = ', '):
++        ret = ''
++        for element in elements:
++            if len(element.childNodes) > 0:
++                ret = ret + element.childNodes[0].data.strip() + separator
++
++        # chop off last separator
++        if len(elements) > 0:
++            ret = ret[:-len(separator)]
++        return ret
++
++    # join nodes for cast
++    def _joinCastNodes(self, elements, separator = ', '):
++        """
++        we assume that this format:
++            <cast>
++            <column>Actor/Actress</column>
++            <column>Role</column>
++            </cast>
++
++        ideally the columns likely came from header, which may differ:
++            <field flags="3" title="Cast" category="Cast" format="2" type="8" name="cast" description="...">
++                <prop name="column1" >Actor/Actress</prop>
++                <prop name="column2" >Role</prop>
++                <prop name="columns" >2</prop>
++            </field>
++        """
++
++        ret = ''
++        for element in elements:
++            actor = None
++            columns = element.getElementsByTagName('column')
++            actor = columns[0].childNodes[0].data.strip()
++            if len(columns) > 1 and len(columns[1].childNodes) > 0:
++                actor = actor + _(' as ') + columns[1].childNodes[0].data.strip()
++
++            if actor:
++                ret = ret + actor + separator
++
++        # chop off last separator
++        if len(elements) > 0:
++            ret = ret[:-len(separator)]
++
++        return ret
+diff --git a/lib/plugins/imp/TheMovieLibrary.py b/lib/plugins/imp/TheMovieLibrary.py
+index 9e4b1ef..f631f12 100644
+--- a/lib/plugins/imp/TheMovieLibrary.py
++++ b/lib/plugins/imp/TheMovieLibrary.py
+@@ -1,6 +1,6 @@
+ # -*- coding: utf-8 -*-
+ 
+-__revision__ = '$Id: TheMovieLibrary.py 1605 2011-12-18 22:35:25Z piotrek $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2009
+ 
+diff --git a/lib/plugins/imp/WintoolzFilmdatenbank.py b/lib/plugins/imp/WintoolzFilmdatenbank.py
+index baa29f6..db93487 100644
+--- a/lib/plugins/imp/WintoolzFilmdatenbank.py
++++ b/lib/plugins/imp/WintoolzFilmdatenbank.py
+@@ -1,6 +1,6 @@
+ # -*- coding: utf-8 -*-
+ 
+-__revision__ = '$Id: WintoolzFilmdatenbank.py 1605 2011-12-18 22:35:25Z piotrek $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2009
+ 
+diff --git a/lib/plugins/imp/__init__.py b/lib/plugins/imp/__init__.py
+index ccdce0b..28d538c 100644
+--- a/lib/plugins/imp/__init__.py
++++ b/lib/plugins/imp/__init__.py
+@@ -1,6 +1,6 @@
+ # -*- coding: UTF-8 -*-
+ 
+-__revision__ = '$Id: __init__.py 1497 2011-01-16 13:09:52Z mikej06 $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2006-2011 Piotr Ożarowski
+ #
+@@ -181,14 +181,11 @@ class ImportPlugin(object):
+                             tags = details.pop('tags')
+                         else:
+                             tags = None
++                        poster = None
+                         if 'poster' in details:
+                             poster = details.pop('poster')
+-                        else:
+-                            poster = None
+-                        if 'image' in details:
++                        elif 'image' in details:
+                             poster = details.pop('image')
+-                        else:
+-                            poster = None
+                         try:
+                             # optional: do mapping of lookup data
+                             if not self.foreignkeymaps:
+@@ -229,6 +226,7 @@ class ImportPlugin(object):
+                                         db.tables.movie_tag.insert(bind=self.db.session.bind).execute({'movie_id': movie.lastrowid, 'tag_id': tag_id})
+                                     except:
+                                         pass
++                            self.db.session.commit()
+                             # adding poster
+                             if poster:
+                                 if len(poster) > 4:
+diff --git a/lib/plugins/imp/eXtremeMovieManager.py b/lib/plugins/imp/eXtremeMovieManager.py
+index 5ab1e54..4dd31d6 100644
+--- a/lib/plugins/imp/eXtremeMovieManager.py
++++ b/lib/plugins/imp/eXtremeMovieManager.py
+@@ -1,6 +1,6 @@
+ # -*- coding: utf-8 -*-
+ 
+-__revision__ = '$Id: eXtremeMovieManager.py 1605 2011-12-18 22:35:25Z piotrek $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2009
+ 
+diff --git a/lib/plugins/movie/PluginMovie7arte.py b/lib/plugins/movie/PluginMovie7arte.py
+index 853ed5c..55a728c 100644
+--- a/lib/plugins/movie/PluginMovie7arte.py
++++ b/lib/plugins/movie/PluginMovie7arte.py
+@@ -1,6 +1,6 @@
+ # -*- coding: UTF-8 -*-
+ 
+-__revision__ = '$Id: PluginMovie7arte.py 1138 2009-01-31 21:48:43Z mikej06 $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2005-2009 Vasco Nunes, Piotr Ozarowski
+ #
+diff --git a/lib/plugins/movie/PluginMovieAllRovi.py b/lib/plugins/movie/PluginMovieAllRovi.py
+index 0e02ba8..dddba72 100644
+--- a/lib/plugins/movie/PluginMovieAllRovi.py
++++ b/lib/plugins/movie/PluginMovieAllRovi.py
+@@ -1,6 +1,6 @@
+ # -*- coding: UTF-8 -*-
+ 
+-__revision__ = '$Id: PluginMovieAllRovi.py 1605 2011-12-18 22:35:25Z piotrek $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2009-2011
+ #
+@@ -151,7 +151,7 @@ class SearchPluginTest(SearchPlugin):
+     # dict { movie_id -> [ expected result count for original url, expected result count for translated url ] }
+     #
+     test_configuration = {
+-        'Rocky' : [ 57, 57 ],
++        'Rocky' : [ 100, 100 ],
+     }
+ 
+ class PluginTest:
+@@ -195,7 +195,7 @@ Talia Shire',
+             'country'             : 'USA',
+             'genre'               : 'Drama',
+             'classification'      : False,
+-            'studio'              : 'Columbia Pictures, MGM, Revolution Studios, Chartoff Winkler Productions',
++            'studio'              : 'Chartoff Winkler Productions, Columbia Pictures, MGM, Revolution Studios',
+             'o_site'              : False,
+             'site'                : 'http://www.allrovi.com/movies/movie/rocky-balboa-v337682',
+             'trailer'             : False,
+diff --git a/lib/plugins/movie/PluginMovieAllocine.py b/lib/plugins/movie/PluginMovieAllocine.py
+index 7a8c078..601bbab 100644
+--- a/lib/plugins/movie/PluginMovieAllocine.py
++++ b/lib/plugins/movie/PluginMovieAllocine.py
+@@ -1,8 +1,8 @@
+ # -*- coding: UTF-8 -*-
+ 
+-__revision__ = '$Id: PluginMovieIMDB.py 176 2006-02-01 12:07:26Z iznogoud $'
++__revision__ = '$Id$'
+ 
+-# Copyright (c) 2005-2011 Vasco Nunes, Piotr Ozarowski
++# Copyright (c) 2005-2012 Vasco Nunes, Piotr Ozarowski
+ #
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -21,6 +21,11 @@ __revision__ = '$Id: PluginMovieIMDB.py 176 2006-02-01 12:07:26Z iznogoud $'
+ # You may use and distribute this software under the terms of the
+ # GNU General Public License, version 2 or later
+ 
++from datetime import date
++import hashlib
++import base64
++import string
++import urllib
+ import movie
+ try:
+     import simplejson as json
+@@ -35,15 +40,25 @@ plugin_url          = "www.allocine.fr"
+ plugin_language     = _("French")
+ plugin_author       = "Pierre-Luc Levy, Michael Jahn (JSON api)"
+ plugin_author_email = ""
+-plugin_version      = "1.0"
++plugin_version      = "1.2"
+ 
+ 
+ class Plugin(movie.Movie):
+     def __init__(self, id):
+         self.movie_id = id
+-        self.url      = "http://api.allocine.fr/xml/movie?partner=3&json=1&profile=large&code=%s" % str(self.movie_id)
++        self.query    = "partner=100043982026&format=json&profile=large&code=%s" % str(self.movie_id)
++        self.url      = "http://api.allocine.fr/rest/v3/movie?"
+         self.encode   = 'utf-8'
+-
++        self.useurllib2 = True
++
++    def open_page(self, parent_window=None, url=None):
++        query = self.query + '&sed=' + date.today().strftime("%Y%m%d")
++        to_signature = '29d185d98c984a359e6e6f26a0474269' + query
++        signature = urllib.quote_plus(base64.b64encode(hashlib.sha1(to_signature).digest()))
++        url = self.url + query + '&sig=' + signature
++        self.page = movie.Movie.open_page(self, parent_window, url)
++        return self.page
++        
+     def initialize(self):
+         self.movie = json.JSONDecoder().decode(self.page)['movie']
+ 
+@@ -101,14 +116,14 @@ class Plugin(movie.Movie):
+                     if 'code' in activity:
+                         if activity['code'] == 8001:
+                             if 'role' in cast:
+-                                self.cast = self.cast + cast['person']['$'] + _(' as ') + cast['role'] + '\n'
++                                self.cast = self.cast + cast['person']['name'] + _(' as ') + cast['role'] + '\n'
+                             else:
+-                                self.cast = self.cast + cast['person']['$'] + '\n'
++                                self.cast = self.cast + cast['person']['name'] + '\n'
+ 
+     def get_classification(self):
+         self.classification = ""
+         if 'movieCertificate' in self.movie:
+-            self.classification = self.movie['movieCertificate']['$']
++            self.classification = self.movie['movieCertificate']['certificate']['$']
+ 
+     def get_studio(self):
+         self.studio = ""
+@@ -159,7 +174,7 @@ class Plugin(movie.Movie):
+                     activity = cast['activity']
+                     if 'code' in activity:
+                         if activity['code'] == code:
+-                            result = result + cast['person']['$'] + ', '
++                            result = result + cast['person']['name'] + ', '
+         if result:
+             result = result[:-2]
+         return result
+@@ -168,12 +183,22 @@ class Plugin(movie.Movie):
+ class SearchPlugin(movie.SearchMovie):
+ 
+     def __init__(self):
+-        self.original_url_search   = "http://api.allocine.fr/xml/search?partner=3&json=1&count=100&profile=small&q="
+-        self.translated_url_search = "http://api.allocine.fr/xml/search?partner=3&json=1&count=100&profile=small&q="
++        self.search_query = "partner=100043982026&format=json&q=%s&filter=movie&count=100&page=1&profile=small"
++        self.search_url = "http://api.allocine.fr/rest/v3/search?"
++        
++        self.original_url_search   = "http://api.allocine.fr/rest/v3/search?partner=YW5kcm9pZC12M3M&count=100&profile=small&format=json&filter=movie&q="
++        self.translated_url_search = "http://api.allocine.fr/rest/v3/search?partner=YW5kcm9pZC12M3M&count=100&profile=small&format=json&filter=movie&q="
+         self.encode                = 'utf-8'
+         self.remove_accents        = True
++        self.useurllib2 = True
+ 
+     def search(self, parent_window):
++        query = string.replace(self.search_query % self.title, ' ', '%20')
++        query = query + '&sed=' + date.today().strftime("%Y%m%d")
++        to_signature = '29d185d98c984a359e6e6f26a0474269' + query
++        signature = urllib.quote_plus(base64.b64encode(hashlib.sha1(to_signature).digest()))
++        self.title = self.search_url + query + '&sig=' + signature
++        self.url = ''
+         if not self.open_search(parent_window):
+             return None
+         return self.page
+@@ -198,6 +223,7 @@ class SearchPlugin(movie.SearchMovie):
+                     log.exception('')
+         except:
+             log.exception('')
++            log.error(self.page)
+ 
+ 
+ #
+@@ -258,7 +284,7 @@ Francis Leplay' + _(' as ') + 'l\'agent immobilier',
+             'o_title'             : u'Terminator, The',
+             'director'            : u'James Cameron',
+             'plot'                : True,
+-            'cast'                : u'Arnold Schwarzenegger' + _(' as ') + 'le Terminator\n\
++            'cast'                : u'Arnold Schwarzenegger' + _(' as ') + 'Le Terminator\n\
+ Michael Biehn' + _(' as ') + 'Kyle Reese\n\
+ Linda Hamilton' + _(' as ') + 'Sarah Connor\n\
+ Lance Henriksen' + _(' as ') + 'l\'inspecteur Vukovich\n\
+@@ -268,7 +294,7 @@ Rick Rossovich' + _(' as ') + 'Matt Buchanan\n\
+ Earl Boen' + _(' as ') + 'le Dr Peter Silberman\n\
+ Dick Miller' + _(' as ') + 'le marchand d\'armes\n\
+ Shawn Schepps' + _(' as ') + 'Nancy\n\
+-Bill Paxton' + _(' as ') + 'le chef des punks\n\
++Bill Paxton' + _(' as ') + 'Le chef des punks\n\
+ Brian Thompson' + _(' as ') + 'un punk\n\
+ Marianne Muellerleile' + _(' as ') + 'la \'mauvaise\' Sarah Connor\n\
+ Franco Columbu' + _(' as ') + 'le Terminator infiltrant le bunker dans le futur\n\
+@@ -306,7 +332,7 @@ Chino \'Fats\' Williams' + _(' as ') + 'Truck Driver',
+             'notes'               : False,
+             'runtime'             : 108,
+             'image'               : True,
+-            'rating'              : 8,
++            'rating'              : 7,
+             'cameraman'           : u'Adam Greenberg',
+             'screenplay'          : u'James Cameron, Gale Anne Hurd, Harlan Ellison, William Wisher',
+             'barcode'             : False
+diff --git a/lib/plugins/movie/PluginMovieAmazon.py b/lib/plugins/movie/PluginMovieAmazon.py
+index f853dc6..4382a31 100644
+--- a/lib/plugins/movie/PluginMovieAmazon.py
++++ b/lib/plugins/movie/PluginMovieAmazon.py
+@@ -2,7 +2,7 @@
+ 
+ __revision__ = '$Id$'
+ 
+-# Copyright (c) 2006-2009
++# Copyright (c) 2006-2012
+ #
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -125,7 +125,9 @@ class Plugin(movie.Movie):
+             if hasattr(self.page.EditorialReviews, 'EditorialReview'):
+                 if isSequenceType(self.page.EditorialReviews.EditorialReview):
+                     for review in self.page.EditorialReviews.EditorialReview:
+-                        if string.find(review.Source, 'Amazon') > -1:
++                        if hasattr(review, 'Source') and \
++                            hasattr(review, 'Content') and \
++                            string.find(review.Source, 'Amazon') > -1:
+                             self.plot = review.Content
+                 else:
+                     if hasattr(self.page.EditorialReviews.EditorialReview, 'Source') and \
+@@ -398,8 +400,8 @@ class SearchPluginTest(SearchPlugin):
+     # dict { movie_id -> [ expected result count for original url, expected result count for translated url ] }
+     #
+     test_configuration = {
+-        'Rocky Balboa' : [  22,  22 ],
+-        'Arahan'       : [   9,   9 ],
++        'Rocky Balboa' : [  23,  23 ],
++        'Arahan'       : [  10,  10 ],
+         'Glück'        : [ 100, 100 ]
+     }
+ 
+@@ -428,11 +430,11 @@ Burt Young',
+             'o_site'              : False,
+             'site'                : 'http://www.amazon.de/dp/B000TIQMMI',
+             'trailer'             : False,
+-            'year'                : 2006,
++            'year'                : 2007,
+             'notes'               : 'EAN: 4045167004504',
+             'runtime'             : 97,
+             'image'               : True,
+-            'rating'              : 8,
++            'rating'              : False,
+             'barcode'             : '4045167004504'
+         },
+         'B0009NSASM' : {
+@@ -450,11 +452,11 @@ Charles Gérard',
+             'o_site'              : False,
+             'site'                : 'http://www.amazon.de/dp/B0009NSASM',
+             'trailer'             : False,
+-            'year'                : 1973,
++            'year'                : 2008,
+             'notes'               : 'EAN: 7321921998843',
+             'runtime'             : 110,
+             'image'               : True,
+-            'rating'              : 10,
++            'rating'              : False,
+             'barcode'             : '7321921998843'
+         },
+         'B000BSNOD6' : {
+@@ -475,7 +477,7 @@ Ahn Sung-kee',
+             'notes'               : 'EAN: 4013549871105',
+             'runtime'             : 108,
+             'image'               : True,
+-            'rating'              : 8,
++            'rating'              : False,
+             'barcode'             : '4013549871105'
+         }
+     }
+diff --git a/lib/plugins/movie/PluginMovieAniDB.py b/lib/plugins/movie/PluginMovieAniDB.py
+index e38066d..31a9249 100644
+--- a/lib/plugins/movie/PluginMovieAniDB.py
++++ b/lib/plugins/movie/PluginMovieAniDB.py
+@@ -1,6 +1,6 @@
+ # -*- coding: utf-8 -*-
+ 
+-__revision__ = '$Id: PluginMovieAniDB.py 1594 2011-09-22 21:00:44Z mikej06 $'
++__revision__ = '$Id$'
+ 
+ # Copyright © 2005-2011 Piotr Ożarowski
+ #
+@@ -256,7 +256,7 @@ class PluginTest:
+ [Seras Victoria] voiced by Orikasa Fumiko\n\
+ [Incognito] voiced by Yamazaki Takumi',
+             'country'             : False,
+-            'genre'               : 'Law and Order, Alternative Present, Horror, Vampires, Gunfights, Action, Contemporary Fantasy, United Kingdom, Earth, Europe, Special Squads, Cops, Manga, Seinen, Violence, Fantasy, Present',
++            'genre'               : 'Law and Order, Alternative Present, Horror, Vampires, Gunfights, Action, Contemporary Fantasy, United Kingdom, Earth, Europe, Special Squads, Cops, Manga, Seinen, Violence, Fantasy, Present, London, Zombies',
+             'classification'      : False,
+             'studio'              : False,
+             'o_site'              : 'http://www.gonzo.co.jp/works/0102.html',
+@@ -266,7 +266,7 @@ class PluginTest:
+             'notes'               : True,
+             'runtime'             : 0,
+             'image'               : True,
+-            'rating'              : 8,
++            'rating'              : 6,
+             'cameraman'           : False,
+             'screenplay'          : False
+         },
+diff --git a/lib/plugins/movie/PluginMovieCSFD.py b/lib/plugins/movie/PluginMovieCSFD.py
+index 922af1a..24ce575 100644
+--- a/lib/plugins/movie/PluginMovieCSFD.py
++++ b/lib/plugins/movie/PluginMovieCSFD.py
+@@ -41,9 +41,9 @@ class Plugin(movie.Movie):
+         self.url = "http://www.csfd.cz" + str(id)
+ 
+     def get_image(self):
+-        self.image_url = re.search(r"content=\"http://img.csfd.cz/posters/([^\"]*)\"", self.page)
++        self.image_url = re.search(r"content=\"http://img.csfd.cz/files/images/film/posters/([^\"]*)\"", self.page)
+         if self.image_url:
+-            self.image_url = "http://img.csfd.cz/posters/" + gutils.strip_tags(self.image_url.group(1))
++            self.image_url = "http://img.csfd.cz/files/images/film/posters/" + gutils.strip_tags(self.image_url.group(1))
+         else:
+             self.image_url = ""
+ 
+@@ -130,7 +130,7 @@ class Plugin(movie.Movie):
+         a = re.sub("\n", "", a)
+         a = re.sub("<BR>", "", a)
+         try:
+-            self.plot = re.search(r'ka"([^<]*)', a).group(0)[6:]
++            self.plot = gutils.after(re.search(r'ka"([^<]*)', a).group(0), '>')
+         except:
+             self.plot = ""
+ 
+@@ -178,6 +178,18 @@ class Plugin(movie.Movie):
+     def get_classification(self):
+         self.classification = ""
+ 
++    def get_screenplay(self):
++        self.screenplay = ''
++        tmp = gutils.trim(self.page, '>Scénář:<', '</div>')
++        if tmp:
++            tmp = string.split(tmp, "href=")
++            for item in tmp:
++                item = gutils.clean(gutils.trim(item, '>', '<'))
++                if item:
++                    self.screenplay = self.screenplay + item + ', '
++            if self.screenplay:
++                self.screenplay = self.screenplay[:-2]
++
+ 
+ class SearchPlugin(movie.SearchMovie):
+     def __init__(self):
+@@ -214,7 +226,7 @@ class SearchPluginTest(SearchPlugin):
+     #
+     test_configuration = {
+         'Cliffhanger' : [ 1, 1 ],
+-        'Rocky' : [ 38, 38 ]
++        'Rocky' : [ 41, 41 ]
+     }
+ 
+ 
+@@ -245,10 +257,10 @@ Mike Tyson\n\
+ Michael Ahl\n\
+ Dean Maur',
+             'country'        : 'USA',
+-            'genre'          : 'Sportovní / Drama',
++            'genre'          : 'Sportovní / Drama / Akční / Romantický',
+             'classification' : False,
+             'studio'         : False,
+-            'o_site'         : 'http://www.mgm.com/view/movie/1667/Rocky-Balboa/',
++            'o_site'         : False,
+             'site'           : 'http://www.imdb.com/title/tt0479143/',
+             'trailer'        : 'http://www.csfd.cz/film/221900-rocky-balboa/videa',
+             'year'           : 2006,
+@@ -275,11 +287,13 @@ Craig Fairbrass\n\
+ Gregory Scott Cummins\n\
+ Max Perlich\n\
+ Paul Winfield\n\
++Ralph Waite\n\
+ Zach Grenier\n\
+ Don S. Davis\n\
+ Bruce McGill\n\
+ Jeff Blynn\n\
+-John Fin',
++John Finn\n\
++Rosemary Dunsmor',
+             'country'        : 'USA / Itálie / Francie',
+             'genre'          : 'Akční / Dobrodružný / Thriller',
+             'classification' : False,
+diff --git a/lib/plugins/movie/PluginMovieCineMovies.py b/lib/plugins/movie/PluginMovieCineMovies.py
+index 959e76e..33ee5ff 100644
+--- a/lib/plugins/movie/PluginMovieCineMovies.py
++++ b/lib/plugins/movie/PluginMovieCineMovies.py
+@@ -1,6 +1,6 @@
+ # -*- coding: UTF-8 -*-
+ 
+-__revision__ = '$Id: PluginMovieCineMovies.py 1577 2011-08-30 21:13:26Z mikej06 $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2005-2011 Vasco Nunes, Piotr Ożarowski
+ #
+@@ -30,66 +30,64 @@ plugin_url          = "www.cinemovies.fr"
+ plugin_language     = _("French")
+ plugin_author       = "Vasco Nunes"
+ plugin_author_email = "<vasco.m.nunes@×××××.com>"
+-plugin_version      = "0.4"
++plugin_version      = "0.5"
+ 
+ class Plugin(movie.Movie):
+     def __init__(self, id):
+-        self.encode   = 'iso-8859-1'
++        self.encode   = 'utf-8'
+         self.movie_id = id
+-        self.url      = "http://www.cinemovies.fr/fiche_film.php?IDfilm=" + str(self.movie_id)
+-
+-    def initialize(self):
+-        self.page_cast = self.open_page(self.parent_window, url = 'http://www.cinemovies.fr/fiche_cast.php?IDfilm='+ str(self.movie_id))
++        self.url      = "http://www.cinemovies.fr/film/" + str(self.movie_id)
++        print self.url
+ 
+     def get_image(self):
+-        self.image_url = gutils.trim(self.page, '<link rel="image_src" href="', '">')
++        self.image_url = gutils.trim(gutils.trim(self.page, 'property="og:image"', '>'), '"', '"')
+ 
+     def get_o_title(self):
+-        self.o_title = gutils.trim(self.page, 'Titre original :', '</tr>')
++        self.o_title = gutils.trim(self.page, 'Titre original :', '</span>')
+ 
+     def get_title(self):
+-        self.title = gutils.trim(self.page, '<h1 class="h1artist" property="v:name">', '</h1>')
++        self.title = gutils.trim(gutils.trim(self.page, 'property="og:title"', '>'), '"', '"')
+ 
+     def get_director(self):
+-        self.director = gutils.clean(gutils.trim(self.page_cast, u'Réalisé par</h2> :', '<div id="cast_film">'))
++        self.director = gutils.clean(gutils.trim(self.page, u'Réalisé par', '</span>'))
+         self.director = re.sub('[\n|\t]+', ', ', self.director)
+ 
+     def get_plot(self):
+-        self.plot = gutils.trim(gutils.after(self.page, '>L\'histoire<'), '<div id="story_fiche" property="v:summary">', '</div>')
++        self.plot = gutils.after(gutils.trim(self.page, 'class="synopsis"', '</div>'), '>')
+ 
+     def get_year(self):
+-        self.year = gutils.trim(self.page, 'Date(s) de Sortie(s)', '</a>')
+-        if len(self.year) > 4:
+-            self.year = self.year[len(self.year) - 4:len(self.year)]
++        self.year = gutils.trim(gutils.trim(self.page, 'Date de sortie :', '</span>'), 'content="', '-')
+ 
+     def get_runtime(self):
+-        self.runtime = gutils.clean(gutils.trim(self.page, u'>Durée :', '</tr>'))
++        self.runtime = gutils.clean(gutils.trim(self.page, u'Durée : ', '</span>'))
+         if self.runtime:
+-           if self.runtime.find('h') > 0:
+-              self.runtime = str (int(gutils.before(self.runtime,'h'))*60 + int(gutils.after(self.runtime,'h')))
++           if self.runtime.find('H') > 0:
++              self.runtime = str (int(gutils.before(self.runtime,'H'))*60 + int(gutils.after(self.runtime,'H')))
+            else:
+               self.runtime = gutils.before(self.runtime,' mn')
+ 
+     def get_genre(self):
+-        self.genre = gutils.trim(self.page, 'Genre :', '</tr>')
++        self.genre = gutils.trim(self.page, 'Genre :', '</span>')
+         self.genre = re.sub('[,][^,]*$', '', self.genre)
+         self.genre = self.genre.replace(',', ', ')
+ 
+     def get_cast(self):
+-        self.cast = gutils.trim(self.page_cast, u'Comédiens</h2> :', '<div id="cast_film">')
+-        self.cast = self.cast.replace('\n', '')
+-        self.cast = self.cast.replace('</tr>', '\n')
+-        self.cast = re.sub('</a></h5>', _(' as '), self.cast)
+-        self.cast = gutils.clean(self.cast)
+-        self.cast = re.sub(_(' as ') + '[ \t]*(\n|$)', '\n', self.cast)
+-        self.cast = re.sub('[ \t]*\n[ \t]+', '\n', self.cast)
++        self.cast = ''
++        tmp = self.page.split('itemprop="actor"')
++        for element in tmp[1:]:
++            actor = gutils.trim(element, '>', '</span>')
++            role = gutils.after(gutils.trim(element, u'Rôle', '</span>'), ': ')
++            if role:
++                self.cast = self.cast + actor + _(' as ') + role + '\n'
++            else:
++                self.cast = self.cast + actor + '\n'
+ 
+     def get_classification(self):
+         # not available on this site
+         self.classification = ''
+ 
+     def get_studio(self):
+-        self.studio = string.strip(gutils.trim(self.page, 'Distributeur :', '</tr>'))
++        self.studio = string.strip(gutils.trim(self.page, 'Distributeur :', '</span>'))
+ 
+     def get_o_site(self):
+         self.o_site = gutils.after(gutils.after(gutils.trim(self.page, '>Site(s) Officiel(s)<', '</a'), '<a '), '>')
+@@ -108,35 +106,33 @@ class Plugin(movie.Movie):
+         self.rating = gutils.clean(gutils.trim(self.page, '<div class=number3>', '</div>'))
+ 
+     def get_screenplay(self):
+-        self.screenplay = gutils.clean(gutils.trim(self.page_cast, u'Scénario de</h2> :', '<div id="cast_film">'))
++        self.screenplay = gutils.clean(gutils.trim(self.page, u'Scénario de</h2> :', '<div id="cast_film">'))
+         self.screenplay = re.sub('[\n|\t]+', ', ', self.screenplay)
+ 
+ 
+ class SearchPlugin(movie.SearchMovie):
+     def __init__(self):
+-        self.encode                = 'iso-8859-1'
+-        self.original_url_search   = "http://www.cinemovies.fr/resultat_recherche.php?typsearch=11&cherche="
+-        self.translated_url_search = "http://www.cinemovies.fr/resultat_recherche.php?typsearch=11&cherche="
++        self.encode                = 'utf-8'
++        self.original_url_search   = 'http://www.cinemovies.fr/rechercher/?e=m&page=1&q='
++        self.translated_url_search = 'http://www.cinemovies.fr/rechercher/?e=m&page=1&q='
+ 
+     def search(self,parent_window):
+         if not self.open_search(parent_window):
+             return None
+-        self.sub_search()
+         return self.page
+ 
+-    def sub_search(self):
+-        self.page = gutils.trim(self.page, '<div class=searchban>Les film', '<div class=spaceblank>')
+-
+     def get_searches(self):
+-        elements = string.split(self.page, '<tr')
++        elements = string.split(self.page, '"><a href="http://www.cinemovies.fr/film/')
+         self.number_results = elements[-1]
+ 
+         if (elements[0]<>''):
+             for element in elements:
+-                self.ids.append(gutils.trim(element, 'IDfilm=', '"'))
+-                title = gutils.convert_entities(gutils.strip_tags(gutils.after(gutils.trim(element, 'IDfilm=', '</a>'), '>')))
+-                year = gutils.after(gutils.trim(element, '<td valign="bottom"', '</td>'), '>')
+-                self.titles.append(title + ' (' + year + ')')
++                id = gutils.before(element, '"')
++                title = gutils.clean(gutils.trim(element, '>', '<'))
++                if id and title:
++                    self.ids.append(id)
++                    year = gutils.trim(element, '">Sortie le', '<')
++                    self.titles.append(title + ' (' + year + ')')
+         else:
+             self.number_results = 0
+ 
+@@ -149,7 +145,7 @@ class SearchPluginTest(SearchPlugin):
+     # dict { movie_id -> [ expected result count for original url, expected result count for translated url ] }
+     #
+     test_configuration = {
+-        'Rocky Balboa' : [ 2, 2 ],
++        'Rocky Balboa' : [ 4, 4 ],
+     }
+ 
+ class PluginTest:
+@@ -161,7 +157,7 @@ class PluginTest:
+     #        * or the expected value
+     #
+     test_configuration = {
+-        '6065' : { 
++        'rocky-balboa_e54849' : { 
+             'title'               : 'Rocky Balboa',
+             'o_title'             : 'Rocky VI',
+             'director'            : 'Sylvester Stallone',
+@@ -186,7 +182,7 @@ Lahmard J. Tate' + _(' as ') + 'X-Cell',
+             'classification'      : False,
+             'studio'              : 'Twentieth Century Fox France',
+             'o_site'              : 'http://www.sonypictures.com/movies/rocky/',
+-            'site'                : 'http://www.cinemovies.fr/fiche_film.php?IDfilm=6065',
++            'site'                : 'http://www.cinemovies.fr/film/rocky-balboa_e54849',
+             'trailer'             : 'http://www.cinemovies.fr/fiche_multimedia.php?IDfilm=6065',
+             'year'                : 2007,
+             'notes'               : False,
+diff --git a/lib/plugins/movie/PluginMovieCinematografo.py b/lib/plugins/movie/PluginMovieCinematografo.py
+index e17a526..3464102 100644
+--- a/lib/plugins/movie/PluginMovieCinematografo.py
++++ b/lib/plugins/movie/PluginMovieCinematografo.py
+@@ -1,6 +1,6 @@
+ # -*- coding: UTF-8 -*-
+ 
+-__revision__ = '$Id: PluginMovieCinematografo.py 1410 2010-03-27 21:11:21Z mikej06 $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2005-2009 Vasco Nunes, Piotr Ożarowski
+ #
+diff --git a/lib/plugins/movie/PluginMovieCineteka.py b/lib/plugins/movie/PluginMovieCineteka.py
+index 2804408..bdf772c 100644
+--- a/lib/plugins/movie/PluginMovieCineteka.py
++++ b/lib/plugins/movie/PluginMovieCineteka.py
+@@ -134,7 +134,7 @@ class Plugin(movie.Movie):
+ class SearchPlugin(movie.SearchMovie):
+     """A movie search object"""
+     def __init__(self):
+-        self.original_url_search   = "http://www.cineteka.com/index.php?op=MovieSearch&s="
++        self.original_url_search   = "http://www.cineteka.com/index.php?op=MovieSearch&perfil_display=0&ordby=3&s="
+         self.translated_url_search = self.original_url_search
+         self.encode                = 'iso-8859-1'
+ 
+@@ -142,7 +142,7 @@ class SearchPlugin(movie.SearchMovie):
+         """Perform the web search"""
+         if not self.open_search(parent_window):
+             return None
+-        self.page = gutils.trim(self.page, 'tulo(s): ', '<div class="menuright">')
++        self.page = gutils.after(self.page, '"Resultados Ordenados por:"')
+         return self.page
+ 
+     def get_searches(self):
+diff --git a/lib/plugins/movie/PluginMovieDVDEmpire.py b/lib/plugins/movie/PluginMovieDVDEmpire.py
+index a1eaba9..e61cbac 100644
+--- a/lib/plugins/movie/PluginMovieDVDEmpire.py
++++ b/lib/plugins/movie/PluginMovieDVDEmpire.py
+@@ -1,6 +1,6 @@
+ # -*- coding: UTF-8 -*-
+ 
+-__revision__ = '$Id: PluginMovieDVDEmpire.py 1327 2009-12-08 20:38:46Z mikej06 $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2007-2009
+ #
+@@ -24,6 +24,7 @@ __revision__ = '$Id: PluginMovieDVDEmpire.py 1327 2009-12-08 20:38:46Z mikej06 $
+ import gutils
+ import movie
+ import re
++import string
+ 
+ plugin_name         = "DVD Empire"
+ plugin_description  = "International Retailer of DVD Movies"
+@@ -31,57 +32,68 @@ plugin_url          = "www.dvdempire.com"
+ plugin_language     = _("English")
+ plugin_author       = "Michael Jahn"
+ plugin_author_email = "<mikej06@×××××××.com>"
+-plugin_version      = "1.1"
++plugin_version      = "1.2"
+ 
+ class Plugin(movie.Movie):
+     def __init__(self, id):
+         self.encode   = 'iso-8859-1'
+         self.movie_id = id
+-        self.url      = "http://www.dvdempire.com/Exec/v4_item.asp?item_id=" + str(self.movie_id)
++        self.url      = "http://www.dvdempire.com" + str(self.movie_id)
+ 
+     def get_image(self):
+-        tmp_page = gutils.trim(self.page, '<td align="center" valign="top" class="fontsmall">', '</td>')
+-        self.image_url = gutils.trim(tmp_page, '<img src=\'', '\' ')
++        tmp_page = gutils.trim(self.page, 'id="Boxcover"', '</div>')
++        self.image_url = gutils.trim(tmp_page, 'href="', '"')
+ 
+     def get_o_title(self):
+-        self.o_title = gutils.strip_tags(gutils.trim(self.page,'<td class="fontxlarge" valign="top" align="left">', '<nobr>'))
++        self.o_title = gutils.strip_tags(gutils.trim(self.page, '<title>', '('))
+ 
+     def get_title(self):
+-        self.title = gutils.strip_tags(gutils.trim(self.page,'<td class="fontxlarge" valign="top" align="left">', '<nobr>'))
++        self.title = gutils.strip_tags(gutils.trim(self.page, '<title>', '('))
+ 
+     def get_director(self):
+-        self.director = gutils.strip_tags(gutils.trim(self.page,">Directors:","</a>"))
++        self.director = gutils.trim(self.page, '<h3>Director</h3>', '</div>')
++        self.director = self.director.replace('</li><li', '</li>, <li')
+         self.director = self.director.replace('&nbsp;', '')
+         self.director = self.director.replace('&#149;', '')
+ 
+     def get_plot(self):
+-        self.plot = gutils.strip_tags(gutils.trim(self.page, '<td width="100%" valign="top" class="fontsmall3">', '</td>'))
++        self.plot = gutils.strip_tags(gutils.trim(self.page, 'Synopsis</h2>', '</div>'))
+         self.plot = self.plot.replace(u'\x93', '"')
+         self.plot = self.plot.replace(u'\x84', '"')
+ 
+     def get_year(self):
+-        self.year = gutils.strip_tags(gutils.trim(self.page, '>Production Year:', '<br />'))
++        self.year = gutils.strip_tags(gutils.after(gutils.trim(self.page, 'Production Year', '<br'), '>'))
+ 
+     def get_runtime(self):
+-        self.runtime = gutils.strip_tags(gutils.trim(self.page, '>Length:', '<br />'))
++        self.runtime = ''
++        tmp = gutils.strip_tags(gutils.trim(self.page, 'Length', '<br'))
++        #1 hrs. 59 mins.
++        try:
++            self.runtime = int(gutils.before(tmp, 'hrs')) * 60 + int(gutils.trim(tmp, '.', 'mins'))
++        except:
++            self.runtime = ''
+ 
+     def get_genre(self):
+-        self.genre = gutils.strip_tags(gutils.trim(self.page, '>Genre</b>:', '</tr>'))
++        tmp = gutils.strip_tags(gutils.trim(self.page, '<h2>Categories</h2>', '</p>'))
++        tmp = tmp.replace('\r\n', '')
++        self.genre = re.sub('[ \t]+', ' ', tmp)
+ 
+     def get_cast(self):
+-        self.cast = gutils.trim(self.page, '>Actors:', '</td><td')
++        self.cast = gutils.trim(self.page, '<h3>Cast</h3>', '</div>')
+         self.cast = self.cast.replace('<br>', '\n')
+         self.cast = self.cast.replace('<br />', '\n')
+         self.cast = self.cast.replace('&nbsp;', '')
+         self.cast = self.cast.replace('&#8226;', '')
+         self.cast = self.cast.replace('&#149;', '')
++        self.cast = self.cast.replace('</li><li', '</li>\n<li')
++        self.cast = self.cast.replace('</li><!-- non-headliners --><li', '</li>\n<li')
+         self.cast = gutils.strip_tags(self.cast)
+ 
+     def get_classification(self):
+-        self.classification = gutils.strip_tags(gutils.trim(self.page, '>Rating:', '<br />'))
++        self.classification = gutils.strip_tags(gutils.trim(self.page, 'Rating</strong>', '<br'))
+ 
+     def get_studio(self):
+-        self.studio = gutils.strip_tags(gutils.trim(self.page, '>Studio:', '<br />'))
++        self.studio = gutils.strip_tags(gutils.trim(self.page, 'Studio</strong>', '<br'))
+ 
+     def get_o_site(self):
+         self.o_site = ""
+@@ -96,7 +108,7 @@ class Plugin(movie.Movie):
+         self.country = ""
+ 
+     def get_rating(self):
+-        self.rating = gutils.clean(gutils.trim(self.page, '>Overall Rating:', ' out of'))
++        self.rating = gutils.clean(gutils.trim(self.page, 'Overall Rating:', ' out of'))
+         try:
+             tmp_float = float(self.rating)
+             tmp_float = round(2 * tmp_float, 0)
+@@ -106,90 +118,65 @@ class Plugin(movie.Movie):
+ 
+     def get_notes(self):
+         self.notes = ''
+-        tmp_page = gutils.trim(self.page, 'Features:', '<b>')
++        tmp_page = gutils.trim(self.page, '<h3>Features</h3>', '</p>')
+         tmp_page = tmp_page.replace('<br>', '\n')
+         tmp_page = tmp_page.replace('<br />', '\n')
+         tmp_page = gutils.strip_tags(tmp_page)
+         if tmp_page <> '':
+-            tmp_page = re.sub('[\r\n]+', '\n', tmp_page)
+-            self.notes = self.notes + '\nFeatures:' + tmp_page + '\n'
+-        tmp_page = gutils.trim(self.page, 'Video:', '<b>')
++            self.notes = self.notes + 'Features:\n' + tmp_page + '\n\n'
++        tmp_page = gutils.trim(self.page, 'Video</strong>', '<strong>')
++        tmp_page = tmp_page.replace('\r\n', '')
++        tmp_page = re.sub('[ \t]+', ' ', tmp_page)
+         tmp_page = tmp_page.replace('<br>', '\n')
+         tmp_page = tmp_page.replace('<br />', '\n')
+         tmp_page = gutils.strip_tags(tmp_page)
+         if tmp_page <> '':
+-            tmp_page = re.sub('[\r\n]+', '\n', tmp_page)
+-            self.notes = self.notes + '\nVideo:' + tmp_page + '\n'
+-        tmp_page = gutils.trim(self.page, 'Audio:', '<b>')
++            self.notes = self.notes + 'Video:' + tmp_page
++        tmp_page = gutils.trim(self.page, 'Audio</strong>', '</div>')
++        tmp_page = tmp_page.replace('\r\n', '')
++        tmp_page = re.sub('[ \t]+', ' ', tmp_page)
+         tmp_page = tmp_page.replace('<br>', '\n')
+         tmp_page = tmp_page.replace('<br />', '\n')
+         tmp_page = tmp_page.replace('(more info)', '\n')
+         tmp_page = gutils.strip_tags(tmp_page)
+         if tmp_page <> '':
+-            tmp_page = re.sub('[\r\n]+', '\n', tmp_page)
+-            self.notes = self.notes + '\nAudio:' + tmp_page
+-        tmp_page = gutils.trim(self.page, 'Subtitles:', '<b>')
+-        tmp_page = gutils.strip_tags(tmp_page)
+-        if tmp_page <> '':
+-            tmp_page = re.sub('[\r\n]+', '\n', tmp_page)
+-            self.notes = self.notes + '\nSubtitles:\n' + tmp_page + '\n'
++            self.notes = self.notes + 'Audio:' + tmp_page
+ 
+     def get_screenplay(self):
+-        self.screenplay = gutils.strip_tags(gutils.trim(self.page, '>Writers:', '</a>'))
++        self.screenplay = gutils.strip_tags(gutils.trim(self.page, 'Writers</strong>', '<br'))
+         self.screenplay = self.screenplay.replace('&nbsp;', '')
+         self.screenplay = self.screenplay.replace('&#149;', '')
+ 
+     def get_barcode(self):
+-        self.barcode = gutils.trim(self.page, '<b>UPC Code:</b>', '<')
++        self.barcode = gutils.trim(self.page, 'UPC Code</strong>', '<br')
++
+ 
+ class SearchPlugin(movie.SearchMovie):
+     def __init__(self):
+-        self.original_url_search   = "http://www.dvdempire.com/Exec/v1_search_all.asp?&site_media_id=0&pp=&search_refined=32&used=0&string="
+-        self.translated_url_search = "http://www.dvdempire.com/Exec/v1_search_all.asp?&site_media_id=0&pp=&search_refined=32&used=0&string="
++        self.original_url_search   = "http://www.dvdempire.com/allsearch/search?pageSize=100&q="
++        self.translated_url_search = "http://www.dvdempire.com/allsearch/search?pageSize=100&q="
+         self.encode                = 'iso-8859-1'
+ 
+     def search(self,parent_window):
+         if not self.open_search(parent_window):
+             return None
+-        # short the content
+-        tmp_page = gutils.trim(self.page,'<select name="sort"', 'Click Here to make a Suggestion</a>')
+-        #
+-        # try to get all result pages (not so nice, but it works)
+-        #
+-        tmp_pagecount = gutils.trim(self.page, '<div id="Search_Container" name="Search_Container">', '</table>')
+-        tmp_pagecountintuse = 1
+-        elements = tmp_pagecount.split("&page=")
+-        for element in elements:
+-            try:
+-                tmp_pagecountint = int(gutils.before(element, '\''))
+-            except:
+-                tmp_pagecountint = 0
+-            if tmp_pagecountint > tmp_pagecountintuse:
+-                tmp_pagecountintuse = tmp_pagecountint
+-        tmp_pagecountintcurrent = 1
+-        while tmp_pagecountintuse > tmp_pagecountintcurrent and tmp_pagecountintuse < 4:
+-            tmp_pagecountintcurrent = tmp_pagecountintcurrent + 1
+-            self.url = "http://www.dvdempire.com/Exec/v1_search_all.asp?&site_media_id=0&pp=&search_refined=32&used=0&page=" + str(tmp_pagecountintcurrent) + "&string="
+-            self.open_search(parent_window)
+-            if self.open_search(parent_window):
+-                tmp_page2 = gutils.trim(self.page,'<select name="sort"', 'Click Here to make a Suggestion</a>')
+-                tmp_page = tmp_page + tmp_page2
+-
+-        self.page = tmp_page
+         return self.page
+ 
+     def get_searches(self):
+-        split_pattern = re.compile('<a[\t ]+href=["\']/Exec/v4_item[.]asp[?](?:userid=[-0-9]+[&]amp;)*item_id=([0-9]+)\'')
++        split_pattern = re.compile('class="title"')
+         elements = split_pattern.split(self.page)
+-        for index in range(1, len(elements), 2):
+-            title_element = elements[index + 1]
+-            tmp_title = gutils.strip_tags(gutils.trim(title_element, '>', '</a>'))
++        for index in range(1, len(elements), 1):
++            title_element = elements[index]
++            tmp_title = gutils.clean(gutils.strip_tags(gutils.trim(title_element, '>', '</a>')))
++            tmp_title = string.replace(tmp_title, '&nbsp;', ' ')
++            tmp_title = string.replace(tmp_title, '&amp;', '&')
++            tmp_title = string.replace(tmp_title, '&quot;', '"')
+             if tmp_title <> '':
+-                self.ids.append(elements[index])
+-                type = re.search('<b>Blu-ray</b>', title_element)
++                self.ids.append(gutils.trim(elements[index], 'href="', '"'))
++                type = re.search('>Blu-ray</span>', title_element)
+                 if type:
+                     tmp_title = tmp_title + ' (Blu-ray)'
+-                type = re.search('<b>DVD-Video</b>', title_element)
++                type = re.search('>DVD-Video</span>', title_element)
+                 if type:
+                     tmp_title = tmp_title + ' (DVD)'
+                 self.titles.append(tmp_title)
+@@ -203,7 +190,7 @@ class SearchPluginTest(SearchPlugin):
+     # dict { movie_id -> [ expected result count for original url, expected result count for translated url ] }
+     #
+     test_configuration = {
+-        'Rocky Balboa' : [ 2, 2 ],
++        'Rocky Balboa' : [ 30, 30 ],
+     }
+ 
+ class PluginTest:
+@@ -215,45 +202,45 @@ class PluginTest:
+     #        * or the expected value
+     #
+     test_configuration = {
+-        '1300280' : { 
+-            'title'               : 'Rocky Balboa',
+-            'o_title'             : 'Rocky Balboa',
+-            'director'            : 'Sylvester Stallone',
++        '/1402424/meet-the-spartans-unrated-pit-of-death-edition-blu-ray.html' : { 
++            'title'               : 'Meet The Spartans: Unrated Pit Of Death Edition',
++            'o_title'             : 'Meet The Spartans: Unrated Pit Of Death Edition',
++            'director'            : 'Jason Friedberg, Aaron Seltzer',
+             'plot'                : True,
+-            'cast'                : 'Sylvester Stallone\n\
+-Burt Young\n\
+-Geraldine Hughes\n\
+-Milo Ventimiglia\n\
+-Antonio Tarver',
++            'cast'                : 'Carmen Electra\n\
++Sean Maguire\n\
++Ken Davitian',
+             'country'             : False,
+-            'genre'               : 'Sports, Boxing, Drama',
+-            'classification'      : 'PG',
+-            'studio'              : 'Sony Pictures Home Entertainment',
++            'genre'               : 'Blu-ray, Comedy, Movies, Spoofs & Parodies',
++            'classification'      : 'NR',
++            'studio'              : '20th Century Fox',
+             'o_site'              : False,
+-            'site'                : 'http://www.dvdempire.com/Exec/v4_item.asp?item_id=1300280',
++            'site'                : 'http://www.dvdempire.com/1402424/meet-the-spartans-unrated-pit-of-death-edition-blu-ray.html',
+             'trailer'             : False,
+-            'year'                : 2006,
++            'year'                : 2008,
+             'notes'               : 'Features:\n\
+-Deleted Scenes & Alternate Ending\n\
+-Boxing\'s Bloopers\n\
+-Skill Vs. Will: The Making of Rocky Balboa\n\
+-Reality in the Ring: Filming Rocky\'s Final Fight\n\
+-Virtual Champion: Creating the Computer Fight\n\
+-Audio Commentary with Sylvester Stallone\n\
++Audio Commentary By Cast And Crew\n\
++Prepare For Thrusting Featurette\n\
++Tour The Set With Ike Barinholtz Featurette\n\
++Gag Reel\n\
++Know Your Spartans Pop Culture Trivia Game\n\
++Celebrity Kickoff Game\n\
++Super Pit-Of-Death Ultimate Tactical Battle Challange Game\n\
++Meet The Spartans: The Music\n\
++Trivial Track\n\
++Theatrical Trailers\n\
+ \n\
+ Video:\n\
+-Widescreen 1.85:1 Color (Anamorphic) \n\
+-\n\
+-Audio: \n\
+-ENGLISH: Dolby Digital 5.1 [CC]\n\
+-FRENCH: Dolby Digital 5.1\n\
++ Widescreen 1.85:1 Color \n\
+ \n\
+-Subtitles:\n\
+-English, Spanish, French',
+-            'runtime'             : 102,
++Audio:\n\
++ French Dolby Digital Surround \n\
++ Spanish Dolby Digital Surround \n\
++ English DTS-HD MA 5.1',
++            'runtime'             : 87,
+             'image'               : True,
+-            'rating'              : 9,
+-            'screenplay'          : 'Sylvester Stallone',
+-            'barcode'             : '043396161900'
++            'rating'              : 5,
++            'screenplay'          : False,
++            'barcode'             : '024543522614'
+         },
+     }
+diff --git a/lib/plugins/movie/PluginMovieDVDPalace.py b/lib/plugins/movie/PluginMovieDVDPalace.py
+index 04c4327..25007db 100644
+--- a/lib/plugins/movie/PluginMovieDVDPalace.py
++++ b/lib/plugins/movie/PluginMovieDVDPalace.py
+@@ -1,8 +1,8 @@
+ # -*- coding: UTF-8 -*-
+ 
+-__revision__ = '$Id: PluginMovieDVDPalace.py 1409 2010-03-12 21:22:28Z mikej06 $'
++__revision__ = '$Id$'
+ 
+-# Copyright (c) 2006-2009
++# Copyright (c) 2006-2012
+ #
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -32,14 +32,14 @@ plugin_url          = "www.dvd-palace.de"
+ plugin_language     = _("German")
+ plugin_author       = "Michael Jahn"
+ plugin_author_email = "<mikej06@×××××××.com>"
+-plugin_version      = "1.2"
++plugin_version      = "1.3"
+ 
+ class Plugin(movie.Movie):
+ 
+     def __init__(self, id):
+         self.encode   = 'iso-8859-1'
+         self.movie_id = id
+-        self.url      = 'http://www.dvd-palace.de/dvd-datenbank/' + self.movie_id
++        self.url      = 'http://www.dvd-palace.de/datenbank/medien/' + self.movie_id
+ 
+     def get_image(self):
+         self.image_url = gutils.trim(self.page, 'src="/showcover.php?', '"')
+@@ -85,7 +85,9 @@ class Plugin(movie.Movie):
+         self.classification = string.replace(gutils.trim(self.page, 'Altersfreigabe (FSK)', '</TR>'), '&nbsp;', '')
+ 
+     def get_studio(self):
+-        self.studio = string.replace(string.replace(gutils.trim(self.page, 'Label', '</td>'), '&nbsp;', ''), ':', '')
++        self.studio = string.replace(string.replace(gutils.trim(self.page, 'Label</b>', '</td>'), '&nbsp;', ''), ':', '')
++        if not self.studio:
++            self.studio = string.replace(string.replace(gutils.trim(self.page, 'Vertrieb</b>', '</td>'), '&nbsp;', ''), ':', '')
+ 
+     def get_o_site(self):
+         self.o_site = ""
+@@ -132,14 +134,34 @@ class Plugin(movie.Movie):
+         if (tmp_notes != ""):
+             self.notes = self.notes + "Untertitel:" + tmp_notes + "\n\n"
+ 
++    def get_barcode(self):
++        self.barcode = gutils.trim(self.page, 'EAN', '</b>')
++
++
+ class SearchPlugin(movie.SearchMovie):
+ 
++    translations = (
++        ('ü', 'ue'),
++        ('ä', 'ae'),
++        ('ö', 'oe'),
++        ('Ü', 'UE'),
++        ('Ä', 'AE'),
++        ('Ö', 'OE'),
++        ('ß', 'ss')
++    )
++
+     def __init__(self):
+         self.original_url_search   = "http://www.dvd-palace.de/dvddatabase/dbsearch.php?action=1&suchbegriff="
+         self.translated_url_search = "http://www.dvd-palace.de/dvddatabase/dbsearch.php?action=1&suchbegriff="
+         self.encode='iso-8859-1'
++        self.remove_accents = False
+ 
+     def search(self,parent_window):
++        # replace some standard german umlauts
++        for from_str, to_str in self.translations:
++            self.title = self.title.replace(from_str, to_str)
++        # AFTER that remove accents
++        self.title = gutils.remove_accents(str(self.title))
+         if not self.open_search(parent_window):
+             return None
+         tmp_pagemovie = self.page
+@@ -161,16 +183,17 @@ class SearchPlugin(movie.SearchMovie):
+         return self.page
+ 
+     def get_searches(self):
+-        elements = re.split('&nbsp;<a title="[^"]+" href="(/dvd-datenbank/|/datenbank/blu-ray/)', self.page)
++        elements = re.split('&nbsp;<a title="[^"]+" href="(/datenbank/medien/dvd/|/datenbank/medien/blu-ray/)', self.page)
+         elements[0] = None
+         for index in range(1, len(elements), 2):
+             element = elements[index + 1]
+-            if elements[index] == '/datenbank/blu-ray/':
+-                medium = 'Blu-Ray'
+-            else:
+-                medium = 'DVD'
+             if element <> None:
+-                self.ids.append(gutils.before(element,'"'))
++                if elements[index] == '/datenbank/medien/blu-ray/':
++                    medium = 'Blu-Ray'
++                    self.ids.append('blu-ray/' + gutils.before(element,'"'))
++                else:
++                    medium = 'DVD'
++                    self.ids.append('dvd/' + gutils.before(element,'"'))
+                 self.titles.append(
+                     gutils.trim(element, '>', '</a>') +
+                     gutils.clean(
+diff --git a/lib/plugins/movie/PluginMovieDVDpt.py b/lib/plugins/movie/PluginMovieDVDpt.py
+new file mode 100755
+index 0000000..fac942f
+--- /dev/null
++++ b/lib/plugins/movie/PluginMovieDVDpt.py
+@@ -0,0 +1,143 @@
++# -*- coding: UTF-8 -*-
++
++__revision__ = '$Id: PluginMovieDVDpt.py 1138 2009-01-31 21:48:43Z mikej06 $'
++
++# Copyright (c) 2005-2009 Vasco Nunes, Piotr Ozarowski
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU Library General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
++
++# You may use and distribute this software under the terms of the
++# GNU General Public License, version 2 or later
++
++import gutils
++import movie
++import string
++
++plugin_name         = "DVDpt"
++plugin_description  = ""
++plugin_url          = "dvdpt.com"
++plugin_language     = _("Portuguese")
++plugin_author       = "Ivo Nunes"
++plugin_author_email = "<netherblood@×××××.com>"
++plugin_version      = "0.1"
++
++class Plugin(movie.Movie):
++    """A movie plugin object"""
++    def __init__(self, id):
++        self.encode='iso-8859-1'
++        self.movie_id = id
++        self.url = "http://www.dvdpt.com/" + str(self.movie_id) + ".php"
++
++    def get_image(self):
++        """Finds the film's poster image"""
++        self.image_url = "http://www.dvdpt.com/" + str(self.movie_id) + ".jpg"
++
++    def get_o_title(self):
++        """Finds the film's original title"""
++        self.o_title = string.capwords(gutils.trim(self.page, '<font face=arial size=-1><b>"', '"'))
++
++    def get_title(self):
++        """Finds the film's local title.
++        Probably the original title translation"""
++        self.title = string.capwords(gutils.trim(self.page, "<title>", "</title>"))
++
++    def get_director(self):
++        """Finds the film's director"""
++        self.director = gutils.trim(self.page, "<b>REALIZADOR</b></font>\n<br />\n<font face=arial size=-1>", "\n<br /><br />")
++        self.director = gutils.strip_tags(self.director)
++
++    def get_plot(self):
++        """Finds the film's plot"""
++        self.plot = gutils.trim(self.page, '<center>\n<b>"', '"</b><br />')
++
++    def get_year(self):
++        """Finds the film's year"""
++        self.year = gutils.trim(self.page, '" (', ' -')
++
++    def get_runtime(self):
++        """Finds the film's running time"""
++        self.runtime = gutils.trim(self.page, " - ", "m)")
++        #self.runtime = gutils.after(self.runtime, "-1>")
++
++    def get_genre(self):
++        """Finds the film's genre"""
++        self.genre = ""
++
++    def get_cast(self):
++        self.cast = gutils.trim(self.page, "<b>INTÉRPRETES</b></font>\n<br />\n<font face=arial size=-1>", "\n</div>")
++
++    def get_classification(self):
++        """Find the film's classification"""
++        self.classification = ""
++
++    def get_studio(self):
++        """Find the studio"""
++        self.studio = gutils.trim(self.page, "<font color=red face=arial size=-1><b>ESTÚDIO</b></font> \n<br />\n<font face=arial size=-1>", "<br />")
++
++    def get_o_site(self):
++        """Find the film's oficial site"""
++        self.o_site = ""
++
++    def get_site(self):
++        """Find the film's imdb details page"""
++        self.site = ""
++
++    def get_trailer(self):
++        """Find the film's trailer page or location"""
++        self.trailer = ""
++
++    def get_country(self):
++        """Find the film's country"""
++        self.country = ""
++
++    def get_rating(self):
++        """Find the film's rating. From 0 to 10.
++        Convert if needed when assigning."""
++        self.rating = ""
++
++class SearchPlugin(movie.SearchMovie):
++    """A movie search object"""
++    def __init__(self):
++        self.original_url_search   = "http://search.freefind.com/find.html?id=58910933&pageid=r&mode=all&n=0&query="
++        self.translated_url_search = "http://search.freefind.com/find.html?id=58910933&pageid=r&mode=all&n=0&query="
++        self.encode                = 'utf-8'
++
++    def search(self, parent_window):
++        """Perform the web search"""
++        if not self.open_search(parent_window):
++            return None
++        self.sub_search()
++        return self.page
++
++    def sub_search(self):
++        """Isolating just a portion (with the data we want) of the results"""
++        self.page = gutils.trim(self.page, \
++            "<!-- search results copyright FreeFind.com.  All rights reserved. Results may not be re-used, meta searched, or searched robotically -->", "<table class=search-nav-form-table>")
++
++    def get_searches(self):
++        """Try to find both id and film title for each search result"""
++        elements = string.split(self.page, "<br>")
++        self.number_results = elements[-1]
++
++        if (len(elements[0])):
++            for element in elements:
++                self.ids.append(gutils.trim(element, '<a  href="http://www.dvdpt.com/', '.php" >'))
++                title = gutils.trim(element, '.php" >', '</a>')
++                title = title.replace("<b>", "")
++                title = title.replace("</b>", "")
++                self.titles.append(title)
++        else:
++            self.number_results = 0
++
+diff --git a/lib/plugins/movie/PluginMovieE-Pipoca.py b/lib/plugins/movie/PluginMovieE-Pipoca.py
+index a3dbd62..c885d54 100644
+--- a/lib/plugins/movie/PluginMovieE-Pipoca.py
++++ b/lib/plugins/movie/PluginMovieE-Pipoca.py
+@@ -1,6 +1,6 @@
+ # -*- coding: UTF-8 -*-
+ 
+-__revision__ = '$Id: PluginMovieE-Pipoca.py 1548 2011-05-18 11:36:17Z mikej06 $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2005-2009 Vasco Nunes, Piotr Ożarowski
+ #
+@@ -242,7 +242,7 @@ Paul Dion Monte' + _(' as ') + 'Amigo de Robert\n\
+ Kevin King Templeton' + _(' as ') + 'Amigo de Robert\n\
+ Robert Michael Kelly' + _(' as ') + 'Senhor Tomilson\n\
+ Rick Buchborn' + _(' as ') + 'Fã de Rocky\n\
+-Nick Baker' + _(' as ') + 'Bartender do pub irlandês\n\
++Nick Baker (1)' + _(' as ') + 'Bartender do pub irlandês\n\
+ Don Sherman' + _(' as ') + 'Andy\n\
+ Stu Nahan' + _(' as ') + 'Comentarista da luta pelo computador\n\
+ Gary Compton' + _(' as ') + 'Segurança\n\
+diff --git a/lib/plugins/movie/PluginMovieFDb.py b/lib/plugins/movie/PluginMovieFDb.py
+index 65cc032..83f2acd 100644
+--- a/lib/plugins/movie/PluginMovieFDb.py
++++ b/lib/plugins/movie/PluginMovieFDb.py
+@@ -1,6 +1,6 @@
+ # -*- coding: utf-8 -*-
+ 
+-__revision__ = '$Id: PluginMovieFDb.py 1385 2010-01-06 19:47:44Z kura666 $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2006-2007 Piotr Ozarowski
+ #
+diff --git a/lib/plugins/movie/PluginMovieFilmAffinity.py b/lib/plugins/movie/PluginMovieFilmAffinity.py
+index 92f4f5d..2b90de5 100644
+--- a/lib/plugins/movie/PluginMovieFilmAffinity.py
++++ b/lib/plugins/movie/PluginMovieFilmAffinity.py
+@@ -31,7 +31,7 @@ plugin_url          = 'www.filmaffinity.com'
+ plugin_language     = _('Spanish')
+ plugin_author       = 'Pedro D. Sánchez'
+ plugin_author_email = '<pedrodav@×××××.com>'
+-plugin_version      = '0.6'
++plugin_version      = '0.7'
+ 
+ class Plugin(movie.Movie):
+     def __init__(self, id):
+@@ -51,43 +51,41 @@ class Plugin(movie.Movie):
+             self.image_url = 'http://' + gutils.before(self.page[tmp.start():], '"')
+ 
+     def get_o_title(self):
+-        self.o_title = gutils.trim(self.page, u'<th>T&Iacute;TULO ORIGINAL</th>', '</strong></td>')
+-        self.o_title = gutils.after(self.o_title, '<strong>')
++        self.o_title = gutils.trim(self.page, u'<dt>T&iacute;tulo original</dt>', '</dd>')
+         self.o_title = re.sub('[ ]+', ' ', self.o_title)
+         self.o_title = re.sub('([(]Serie de TV[)]|[(]TV[)]|[(]TV Series[)])', '', self.o_title)
+ 
+     def get_title(self):
+-        self.title = gutils.trim(self.page, 'www.filmaffinity.com/images/movie.gif" border="0"> ', '</span>')
++        self.title = gutils.after(gutils.trim(self.page, 'id="main-title"', '</a>'), '>')
+         self.title = re.sub('[ ]+', ' ', self.title)
+         self.title = re.sub('([(]Serie de TV[)]|[(]TV[)]|[(]TV Series[)])', '', self.title)
+ 
+     def get_director(self):
+-        self.director = gutils.trim(self.page,'<th>DIRECTOR</th>', '</td>')
++        self.director = gutils.trim(self.page,'<dt>Director</dt>', '</dd>')
+ 
+     def get_plot(self):
+-        self.plot = gutils.trim(self.page, '<th>SINOPSIS</th>', '</td>')
++        self.plot = gutils.trim(self.page, '<dt>Sinopsis</dt>', '</dd>')
+         self.plot = string.replace(self.plot, ' (FILMAFFINITY)', '')
+         self.plot = string.replace(self.plot, '(FILMAFFINITY)', '')
+ 
+     def get_year(self):
+-        self.year = gutils.trim(self.page, '<th>A&Ntilde;O</th>', '</td>')
++        self.year = gutils.trim(self.page, '<dt>A&ntilde;o</dt>', '</dd>')
+         self.year = gutils.clean(self.year)
+ 
+     def get_runtime(self):
+-        self.runtime = gutils.trim(self.page, '<th>DURACI&Oacute;N</th>', ' min.')
+-        self.runtime = gutils.after(self.runtime[-10:], '<td>')
++        self.runtime = gutils.trim(self.page, '<dt>Duraci&oacute;n</dt>', 'min.')
++        self.runtime = gutils.clean(self.runtime)
+ 
+     def get_genre(self):
+         self.genre = ''
+-        tmp = gutils.trim(self.page, '<th>G&Eacute;NERO</th>', '</tr>')
+-        tmp = gutils.after(tmp, '<td>')
++        tmp = gutils.trim(self.page, '<dt>G&eacute;nero</dt>', '</dd>')
+         if tmp:
+             self.genre = gutils.clean(string.replace(tmp, ' | ', '. '))
+             self.genre = re.sub('[.][ \t]+', '. ', self.genre)
+ 
+     def get_cast(self):
+         self.cast = ''
+-        self.cast = gutils.trim(self.page, '<th>REPARTO</th>', '</td>')
++        self.cast = gutils.trim(self.page, '<dt>Reparto</dt>', '</dd>')
+         self.cast = re.sub('</a>,[ ]*', '\n', self.cast)
+         self.cast = string.strip(gutils.strip_tags(self.cast))
+         self.cast = re.sub('[ ]+', ' ', self.cast)
+@@ -97,11 +95,10 @@ class Plugin(movie.Movie):
+         self.classification = ''
+ 
+     def get_studio(self):
+-        self.studio = gutils.trim(self.page, '<th>PRODUCTORA</th>', '</td>')
+-        self.studio = gutils.after(self.studio, '<td>')
++        self.studio = gutils.trim(self.page, '<dt>Productora</dt>', '</dd>')
+ 
+     def get_o_site(self):
+-        self.o_site = gutils.trim(self.page, '<th>WEB OFICIAL</th>', '</a>')
++        self.o_site = gutils.trim(self.page, '<dt>Web Oficial</dt>', '</a>')
+         self.o_site = gutils.after(self.o_site, '">')
+ 
+     def get_site(self):
+@@ -111,23 +108,19 @@ class Plugin(movie.Movie):
+         self.trailer = ''
+ 
+     def get_country(self):
+-        self.country = gutils.trim(self.page, '<b>PA&Iacute;S</th>', '</td>')
+-        tmp = gutils.trim(self.country, 'alt="', '"')
+-        if tmp == '':
+-            self.country = gutils.trim(self.country, 'title="', '"')
+-        else:
+-            self.country = tmp
++        self.country = gutils.trim(self.page, '<dt>Pa&iacute;s</dt>', '</dd>')
+ 
+     def get_rating(self):
+-        self.rating = gutils.trim(self.page, '<div style="margin: 4px 0; color:#990000; font-size:22px; font-weight: bold;">', '</div>')
++        self.rating = gutils.after(gutils.trim(self.page, 'id="movie-rat-avg"', '</div>'), '>')
+         if self.rating:
+             self.rating = str(round(float(gutils.clean(string.replace(self.rating, ',', '.')))))
+ 
+     def get_cameraman(self):
+-        self.cameraman = gutils.trim(self.page, '<th>FOTOGRAF&Iacute;A</th>','</td>')
++        self.cameraman = gutils.trim(self.page, '<dt>Fotograf&iacute;a</dt>','</dd>')
+ 
+     def get_screenplay(self):
+-        self.screenplay = gutils.trim(self.page, '<th>GUI&Oacute;N</th>', '</td>')
++        self.screenplay = gutils.trim(self.page, '<dt>Gui&oacute;n</dt>', '</dd>')
++
+ 
+ class SearchPlugin(movie.SearchMovie):
+ 
+@@ -143,17 +136,17 @@ class SearchPlugin(movie.SearchMovie):
+         self.sub_search(parent_window)
+         if self.page <> '':
+             return self.page
+-        auxPage = gutils.trim(auxPage, u'<b>TU CRÍTICA</b></div>', '</a>')
+-        self.page = gutils.trim(auxPage, 'movie_id=', '">')
++        auxPage = gutils.trim(auxPage, 'id="main-title"', '</a>')
++        self.page = gutils.trim(auxPage, 'es/film', '.html')
+         return self.page
+ 
+     def sub_search(self, parent_window):
+-        moviepage = gutils.trim(self.page, u'Resultados por título</span>', '<div id="bpanel">')
++        moviepage = gutils.trim(self.page, u'Resultados por título</h1>', '<div id="bpanel">')
+         nextpage = self.get_nextpage_url()
+         while nextpage:
+             self.url = nextpage
+             self.open_search(parent_window)
+-            moviepage = moviepage + gutils.trim(self.page, u'Resultados por título</span>', '<div id="bpanel">')
++            moviepage = moviepage + gutils.trim(self.page, u'Resultados por título</h1>', '<div id="bpanel">')
+             nextpage = self.get_nextpage_url()
+         self.page = moviepage
+ 
+@@ -173,18 +166,13 @@ class SearchPlugin(movie.SearchMovie):
+             self.ids.append(self.page)
+             self.titles.append(self.url)
+         else:            # multiple matches
+-            elements = string.split(self.page, '</a></b>')
+-
+-            if (elements[0]<>''):
+-                for index in range(0, len(elements) - 1, 1):
+-                    element = elements[index]
+-                    nextelement = elements[index + 1]
+-                    id = gutils.trim(element, '<b><a href="/es/film', '.html')
+-                    if id:
+-                        self.ids.append(id)
+-                        title = gutils.clean(gutils.after(element, '<b><a href="/es/film')).replace("\n", "")
+-                        title = gutils.strip_tags(gutils.convert_entities(gutils.after(title, '>'))) + ' ' + string.strip(gutils.before(nextelement, '<'))
+-                        self.titles.append(title)
++            elements = string.split(self.page, 'class="mc-title"')
++            for element in elements[1:]:
++                id = gutils.trim(element, 'href="/es/film', '.html')
++                title = gutils.clean(gutils.trim(element, '>', '</div>'))
++                if id:
++                    self.ids.append(id)
++                    self.titles.append(title)
+ 
+ #
+ # Plugin Test
+@@ -195,8 +183,8 @@ class SearchPluginTest(SearchPlugin):
+     # dict { movie_id -> [ expected result count for original url, expected result count for translated url ] }
+     #
+     test_configuration = {
+-        'Rocky' : [ 17, 17 ],
+-        'Darkness' : [59, 59 ]
++        'Rocky' : [ 18, 18 ],
++        'Darkness' : [74, 74 ]
+     }
+ 
+ class PluginTest:
+@@ -220,7 +208,6 @@ Geraldine Hughes\n\
+ Milo Ventimiglia\n\
+ Tony Burton\n\
+ James Francis Kelly III\n\
+-Talia Shire\n\
+ Angela Boyd\n\
+ A.J. Benza\n\
+ Mike Tyson',
+diff --git a/lib/plugins/movie/PluginMovieFilmDb.py b/lib/plugins/movie/PluginMovieFilmDb.py
+deleted file mode 100644
+index 4c1a4d1..0000000
+--- a/lib/plugins/movie/PluginMovieFilmDb.py
++++ /dev/null
+@@ -1,322 +0,0 @@
+-# -*- coding: UTF-8 -*-
+-
+-__revision__ = '$Id: PluginMovieFilmDb.py 1577 2011-08-30 21:13:26Z mikej06 $'
+-
+-# Copyright (c) 2007-2009 Michael Jahn
+-#
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2 of the License, or
+-# (at your option) any later version.
+-#
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-# GNU Library General Public License for more details.
+-#
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+-
+-# You may use and distribute this software under the terms of the
+-# GNU General Public License, version 2 or later
+-
+-import gutils
+-import movie
+-import string, re
+-
+-plugin_name         = 'FilmDb.de'
+-plugin_description  = 'FILMDB.DE'
+-plugin_url          = 'www.filmdb.de'
+-plugin_language     = _('German')
+-plugin_author       = 'Michael Jahn'
+-plugin_author_email = '<mikej06@×××××××.com>'
+-plugin_version      = '1.1'
+-
+-class Plugin(movie.Movie):
+-    def __init__(self, id):
+-        self.encode   = 'iso-8859-1'
+-        self.movie_id = id
+-        self.url      = "http://www.filmdb.de/filmanzeige.php?alle=1&filmid=" + self.movie_id
+-
+-    def get_image(self):
+-        tmp = gutils.regextrim(self.page, 'plakat.php[?]', '["\']')
+-        if tmp:
+-            page_image = self.open_page(url='http://www.filmdb.de/plakat.php?' + tmp)
+-            tmp = gutils.regextrim(self.page, 'bilder.filmdb.de', '["\']')
+-            if tmp:
+-                self.image_url = 'http://bilder.filmdb.de' + tmp
+-
+-    def get_o_title(self):
+-        self.o_title = gutils.trim(self.page, '<h1>', '</h1>')
+-
+-    def get_title(self):
+-        self.title = gutils.trim(self.page, '<h1>', '</h1>')
+-
+-    def get_director(self):
+-        self.director = ''
+-        elements = re.split('regisseursuche.php?', self.page)
+-        elements[0] = ''
+-        listelement = ''
+-        for element in elements:
+-            if element <> '':
+-                self.director = self.director + listelement + gutils.trim(element, '>', '</a>')
+-                listelement = ', '
+-
+-    def get_plot(self):
+-        self.plot = gutils.trim(self.page, 'noshade style=\'color:#FFCCCC;\'>', '<')
+-        if self.plot == '':
+-            self.plot = gutils.trim(self.page, 'noshade style=\'color:#FFCCCC;\'>', '"')
+-        self.plot = self.plot.replace('\t', '')
+-        self.plot = self.plot.replace('\n', '')
+-        self.plot = self.plot.replace(u'\x93', '"')
+-        self.plot = self.plot.replace(u'\x84', '"')
+-
+-    def get_year(self):
+-        elements = string.split(self.page, 'landjahrsuche.php')
+-        if len(elements) > 1:
+-            self.year = gutils.trim(elements[2], '>', '</a>')
+-        else:
+-            self.year = ''
+-
+-    def get_runtime(self):
+-        self.runtime = ""
+-        tmp = gutils.trim(self.page, 'L&auml;nge: ', '<')
+-        if tmp <> '':
+-            elements = string.split(tmp, ':')
+-            try:
+-                hours = int(elements[0])
+-                mins = int(elements[1])
+-                self.runtime = str(hours * 60 + mins)
+-            except:
+-                self.runtime = ""
+-
+-    def get_genre(self):
+-        self.genre = gutils.after(gutils.trim(self.page, 'genresuche.php', '</a>'), '>')
+-
+-    def get_cast(self):
+-        self.cast = ""
+-        tmp = gutils.trim(self.page, 'function schauspiel()', '}')
+-        if tmp == '':
+-            tmp = self.page
+-        elements = string.split(tmp, 'schauspielersuche.php')
+-        elements[0] = ''
+-        for element in elements:
+-            if element <> '':
+-                self.cast = self.cast + gutils.clean(gutils.trim(element, '>', '</a>')) + '\n'
+-
+-    def get_classification(self):
+-        self.classification = ""
+-
+-    def get_studio(self):
+-        self.studio = ""
+-
+-    def get_o_site(self):
+-        self.o_site = ""
+-
+-    def get_site(self):
+-        self.site = "http://www.filmdb.de/filmanzeige.php?filmid=" + self.movie_id
+-
+-    def get_trailer(self):
+-        self.trailer = ""
+-
+-    def get_country(self):
+-        elements = string.split(self.page, 'landjahrsuche.php')
+-        if len (elements) > 1:
+-            self.country = gutils.trim(elements[1], '>', '</a>') + '\n'
+-
+-    def get_rating(self):
+-        self.rating = gutils.trim(self.page, 'Unsere User haben diesen Film mit ', ' bewertet.')
+-        self.rating = self.rating.replace('%', '')
+-        self.rating = gutils.strip_tags(self.rating)
+-        elements = self.rating.split('.')
+-        try:
+-            tmprating = int(elements[0])
+-            self.rating = str(tmprating / 10)
+-        except:
+-            self.rating = '0'
+-
+-    def get_notes(self):
+-        self.notes = ''
+-
+-class SearchPlugin(movie.SearchMovie):
+-
+-    def __init__(self):
+-        self.original_url_search   = "http://www.filmdb.de/globalsuche.php?name="
+-        self.translated_url_search = "http://www.filmdb.de/globalsuche.php?name="
+-        self.encode                = 'iso-8859-1'
+-        self.remove_accents        = False
+-
+-    def search(self,parent_window):
+-        if not self.open_search(parent_window):
+-            return None
+-        self.page = gutils.convert_entities(self.page)
+-        return self.page
+-
+-    def get_searches(self):
+-        elements = re.split('(?:href=["]*filmanzeige[.]php[?]filmid=)', self.page)
+-        elements[0] = ''
+-        for element in elements:
+-            if element <> '':
+-                idmatch = re.search('([>]|["])', element)
+-                if idmatch:
+-                    self.ids.append(element[:idmatch.end() - 1])
+-                    # I don't know what <wbr> means but it breaks the result list
+-                    element = string.replace(element, '<wbr>', '')
+-                    element = string.replace(element, '<wbr />', '')
+-                    # line breaks sometimes within the title
+-                    element = string.replace(element, '<wbr>', '')
+-                    element = string.replace(element, '<wbr />', '')
+-                    self.titles.append(string.replace(gutils.trim(element, '>', '<') + ' (' +
+-                            gutils.trim(gutils.after(element, '<td>'), '<td>', '</td>') + ', ' +
+-                            gutils.trim(gutils.after(element, '</a>'), '<td>', '</td>') + ')', '\n', ' - '))
+-
+-#
+-# Plugin Test
+-#
+-class SearchPluginTest(SearchPlugin):
+-    #
+-    # Configuration for automated tests:
+-    # dict { movie_id -> [ expected result count for original url, expected result count for translated url ] }
+-    #
+-    test_configuration = {
+-        'Rocky Balboa' : [  1,  1 ],
+-        'Arahan'       : [  1,  1 ],
+-        'Märchen'      : [ 24, 24 ]
+-    }
+-
+-class PluginTest:
+-    #
+-    # Configuration for automated tests:
+-    # dict { movie_id -> dict { arribute -> value } }
+-    #
+-    # value: * True/False if attribute only should be tested for any value
+-    #        * or the expected value
+-    #
+-    test_configuration = {
+-        'Rocky%20Balboa' : { 
+-            'title'               : 'Rocky Balboa',
+-            'o_title'             : 'Rocky Balboa',
+-            'director'            : 'Sylvester Stallone',
+-            'plot'                : True,
+-            'cast'                : 'Dolph Lundgren\n\
+-Mike Tyson\n\
+-Sylvester Stallone\n\
+-Carl Weathers\n\
+-Burt Young\n\
+-Milo Ventimiglia\n\
+-Talia Shire\n\
+-Burgess Meredith\n\
+-Tony Burton\n\
+-Mr. T\n\
+-Frank Stallone\n\
+-Geraldine Hughes\n\
+-Lahmard J. Tate\n\
+-Michael Buffer\n\
+-Don Sherman\n\
+-Tobias Segal\n\
+-Gunnar Peterson\n\
+-LeRoy Neiman\n\
+-Yahya\n\
+-Henry G. Sanders\n\
+-Stu Nahan\n\
+-Jody Giambelluca\n\
+-Ricky Cavazos\n\
+-Rick Buchborn\n\
+-Joe Cortez\n\
+-Skip Bayless\n\
+-Barney Fitzpatrick\n\
+-Fran Pultro\n\
+-Angela Boyd\n\
+-Robert Michael Kelly\n\
+-Ana Gerena\n\
+-Tim Carr\n\
+-Jim Lampley\n\
+-Charles Johnson\n\
+-Carter Mitchell\n\
+-Dana Jacobson\n\
+-Matt Frack\n\
+-A.J. Benza\n\
+-Antonio Tarver\n\
+-Max Kellerman\n\
+-Marc Ratner\n\
+-Jack Lazzarado\n\
+-Maureen Schilling\n\
+-Larry Merchant\n\
+-Bernard Fernández\n\
+-Louis Giansante\n\
+-Nick Baker\n\
+-James Binns\n\
+-Brian Kenny\n\
+-Anthony Lato Jr.\n\
+-Paul Dion Monte\n\
+-Woody Paige\n\
+-Kevin King Templeton\n\
+-Gary Compton\n\
+-Lou DiBella\n\
+-Jay Crawford\n\
+-Pedro Lovell\n\
+-Johnnie Hobbs Jr.\n\
+-Vinod Kumar\n\
+-Bert Randolph Sugar\n\
+-James Francis Kelly III',
+-            'country'             : 'USA',
+-            'genre'               : 'Drama',
+-            'classification'      : False,
+-            'studio'              : False,
+-            'o_site'              : False,
+-            'site'                : 'http://www.filmdb.de/filmanzeige.php?filmid=Rocky%20Balboa',
+-            'trailer'             : False,
+-            'year'                : 2006,
+-            'notes'               : False,
+-            'runtime'             : 102,
+-            'image'               : True,
+-            'rating'              : False
+-        },
+-        'Tatort%20-<wbr%20%2F>%20M%26auml%3Brchenwald' : { 
+-            'title'               : 'Tatort - Märchenwald',
+-            'o_title'             : 'Tatort - Märchenwald',
+-            'director'            : 'Christiane Balthasar',
+-            'plot'                : True,
+-            'cast'                : 'Hannes Jaenicke\n\
+-Maria Furtwängler\n\
+-Charly Hübner\n\
+-Ingo Naujoks\n\
+-Michael Wittenborn',
+-            'country'             : 'D',
+-            'genre'               : False,
+-            'classification'      : False,
+-            'studio'              : False,
+-            'o_site'              : False,
+-            'site'                : 'http://www.filmdb.de/filmanzeige.php?filmid=Tatort%20-%20M%26auml%3Brchenwald',
+-            'trailer'             : False,
+-            'year'                : 2004,
+-            'notes'               : False,
+-            'runtime'             : 90,
+-            'image'               : True,
+-            'rating'              : False
+-        },
+-        'Arahan' : { 
+-            'title'               : 'Arahan',
+-            'o_title'             : 'Arahan',
+-            'director'            : 'Ryoo Seung-Wan',
+-            'plot'                : True,
+-            'cast'                : 'So-yi Yoon\n\
+-Ahn Sung-ki\n\
+-Doo-hong Jung\n\
+-Ryu Seung-beom\n\
+-Yun Ju-Sang',
+-            'country'             : 'RK',
+-            'genre'               : 'Actionkomödie',
+-            'classification'      : False,
+-            'studio'              : False,
+-            'o_site'              : False,
+-            'site'                : 'http://www.filmdb.de/filmanzeige.php?filmid=Arahan',
+-            'trailer'             : False,
+-            'year'                : 2004,
+-            'notes'               : False,
+-            'runtime'             : 109,
+-            'image'               : False,
+-            'rating'              : False
+-        }
+-    }
+diff --git a/lib/plugins/movie/PluginMovieFilmeVonAZ.py b/lib/plugins/movie/PluginMovieFilmeVonAZ.py
+index 6fd40c8..e801e15 100644
+--- a/lib/plugins/movie/PluginMovieFilmeVonAZ.py
++++ b/lib/plugins/movie/PluginMovieFilmeVonAZ.py
+@@ -1,8 +1,8 @@
+ # -*- coding: UTF-8 -*-
+ 
+-__revision__ = '$Id: PluginMovieFilmeVonAZ.py 1437 2010-07-18 11:37:02Z mikej06 $'
++__revision__ = '$Id$'
+ 
+-# Copyright (c) 2006-2010 Michael Jahn
++# Copyright (c) 2006-2013 Michael Jahn
+ #
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -32,7 +32,7 @@ plugin_url = "www.zweitausendeins.de"
+ plugin_language = _("German")
+ plugin_author = "Michael Jahn"
+ plugin_author_email = "<mikej06@×××××××.com>"
+-plugin_version = "1.4"
++plugin_version = "1.6"
+ 
+ class Plugin(movie.Movie):
+     def __init__(self, id):
+@@ -40,64 +40,50 @@ class Plugin(movie.Movie):
+         self.movie_id = id
+         self.url = 'http://www.zweitausendeins.de/filmlexikon/?sucheNach=titel&wert=' + str(self.movie_id)
+ 
+-    def initialize(self):
+-        url = 'http://www.zweitausendeins.de/getimage/?imageNo=0&movieNo=' + str(self.movie_id)
+-        self.imagelinks = self.open_page(self.parent_window, url=url)
+-
+     def get_image(self):
+-        if string.find(self.imagelinks, '|') > 0:
+-            self.image_url = gutils.before(self.imagelinks, '|')
++        self.image_url = ''
++        url = url = gutils.trim(gutils.trim(self.page, 'class="film-image"', '>'), 'http://', ')')
++        if url:
++            self.image_url = 'http://' + url
+ 
+     def get_o_title(self):
+-        self.o_title = gutils.clean(gutils.after(
+-            gutils.regextrim(self.page, 'class="text_ergebniss_faz_3"', '[ \t]+[(]Originaltitel[)]'), '</a>'))
+-        p1 = string.rfind(self.o_title, ',')
+-        if p1 > 0:
+-            self.o_title = self.o_title[p1 + 1:]
+-        self.o_title = string.capwords(self.o_title)
+-        if self.o_title == '':
+-            self.o_title = gutils.after(gutils.trim(self.page, 'class="text_ergebniss_faz_3"', '</a>'), '>')
++        self.o_title = string.capwords(gutils.clean(gutils.regextrim(self.page, '<b>Originaltitel:', '(</p>|<b>)')))
++        if not self.o_title:
++            self.o_title = gutils.after(gutils.trim(self.page, 'class=\'film-titel\'', '</h1>'), '>')
+ 
+     def get_title(self):
+-        self.title = gutils.after(gutils.trim(self.page, 'class="text_ergebniss_faz_3"', '</a>'), '>')
++        self.title = gutils.after(gutils.trim(self.page, 'class=\'film-titel\'', '</h1>'), '>')
+ 
+     def get_director(self):
+-        self.director = gutils.after(gutils.trim(self.page, '(Regie)', '</span>'), '>')
+-        self.director = re.sub(',[ ]*$', '', self.director)
++        self.director = gutils.trim(self.page, '<b>Regie:', '</p>')
+ 
+     def get_plot(self):
+-        self.plot = gutils.after(gutils.trim(self.page, 'Inhalt des Films:', '</td>'), '</div>')
++        self.plot = gutils.after(gutils.trim(self.page, 'class=\'film-text\'', '</p>'), '>')
+ 
+     def get_year(self):
+-        self.year = gutils.after(gutils.trim(self.page, 'sucheNach=produktionsjahr', '</a>'), '>')
++        self.year = gutils.after(gutils.trim(self.page, '<b>Produktionsjahr:', '<br/>'), '>')
+ 
+     def get_runtime(self):
+-        self.runtime = gutils.trim(self.page, 'L&auml;nge: ', ' Minuten')
++        self.runtime = gutils.trim(self.page, '<b>Länge:', '<br/>')
+ 
+     def get_genre(self):
+-        elements = string.split(self.page, 'sucheNach=genre')
+-        if (elements[0]<>''):
+-            elements[0] = ''
+-            self.delimiter = ''
++        self.genre = gutils.after(gutils.trim(self.page, 'class=\'film-angaben\'', '</p>'), '>')
++        if ':' in self.genre:
+             self.genre = ''
+-            for element in elements:
+-                if (element <> ''):
+-                    self.genre += self.delimiter + gutils.trim(element, '>', '</a>')
+-                    self.delimiter = ", "
+ 
+     def get_cast(self):
+-        self.cast = gutils.regextrim(self.page, '[(]Darsteller[)]', '(</td>|<br><span[^>]+>)')
++        self.cast = gutils.trim(self.page, '<b>Darsteller:', '</p>')
+         self.cast = gutils.clean(self.cast)
+-        self.cast = self.cast.replace(' als ', _(' as '))
+-        self.cast = re.sub('( \t|\t|\r|\n)', '', self.cast)
+-        self.cast = self.cast.replace(',', '\n')
++        self.cast = self.cast.replace(' (', _(' as '))
++        self.cast = self.cast.replace('), ', '\n')
++        self.cast = self.cast.replace(')', '')
+ 
+     def get_classification(self):
+-        self.classification = gutils.regextrim(self.page, 'FSK:[ ]+', '[,;]')
++        self.classification = gutils.regextrim(self.page, '<b>FSK:[ ]*', '(<br/>|[,;])')
+ 
+     def get_studio(self):
+-        self.studio = gutils.after(gutils.trim(self.page, 'sucheNach=produktionsfirma', '</span>'), '>')
+-        self.studio = string.replace(self.studio, '/', ',')
++        self.studio = gutils.after(gutils.trim(self.page, '<b>Produktionsfirma:', '<br/>'), '>')
++        self.studio = string.replace(self.studio, '/', ', ')
+         self.studio = re.sub(',[ ]*$', '', self.studio)
+ 
+     def get_o_site(self):
+@@ -110,64 +96,64 @@ class Plugin(movie.Movie):
+         self.trailer = ''
+ 
+     def get_country(self):
+-        self.country = gutils.after(gutils.trim(self.page, 'sucheNach=produktionsland', '</span>'), '>')
++        self.country = gutils.after(gutils.trim(self.page, '<b>Produktionsland:', '<br/>'), '>')
+         self.country = re.sub(',[ ]*$', '', self.country)
+-        self.country = string.replace(self.country, '/', ',')
++        self.country = string.replace(self.country, '/', ', ')
+ 
+     def get_rating(self):
+         self.rating = 0
+ 
+     def get_screenplay(self):
+-        self.screenplay = gutils.trim(self.page, '(Drehbuch)', '</span>')
++        self.screenplay = gutils.trim(self.page, '<b>Drehbuch:', '</p>')
+         self.screenplay = re.sub(',[ ]*$', '', self.screenplay)
+ 
+     def get_cameraman(self):
+-        self.cameraman = gutils.trim(self.page, '(Kamera)', '</span>')
++        self.cameraman = gutils.trim(self.page, '<b>Kamera:', '</p>')
+         self.cameraman = re.sub(',[ ]*$', '', self.cameraman)
+ 
+ class SearchPlugin(movie.SearchMovie):
+     def __init__(self):
+-        self.original_url_search = "http://www.zweitausendeins.de/filmlexikon/?sucheNach=Titel&wert="
+-        self.translated_url_search = "http://www.zweitausendeins.de/filmlexikon/?sucheNach=Titel&wert="
++        self.original_url_search = "http://www.zweitausendeins.de/filmlexikon/"
++        self.translated_url_search = "http://www.zweitausendeins.de/filmlexikon/"
+         self.encode = 'utf-8'
++        self.useurllib2 = True
++        self.usepostrequest = True
+ 
+     def search(self,parent_window):
+         if not self.open_search(parent_window):
+             return None
+         # used for looking for subpages
+-        tmp_page = gutils.trim(self.page, '<span class="trefferliste">', '</span>')
++        tmp_page = gutils.trim(self.page, '<li>Treffer', '</div>')
+         elements = string.split(tmp_page, 'cp=')
+         # first results
+-        tmp_page = gutils.after(gutils.trim(self.page, 'Alle Treffer aus der Kategorie', '<span class="trefferliste">'), "Titel:")
++        tmp_page = gutils.trim(self.page, '<ul class=\'film-liste\'>', '</ul>')
+         # look for subpages
+         for element in elements:
+-            element = gutils.before(element, '"')
++            element = gutils.before(element, '\'')
+             try:
+                 tmp_element = int(element)
+             except:
+                 tmp_element = 1
+             if tmp_element != 1:
+-                self.url = 'http://www.zweitausendeins.de/filmlexikon/?sucheNach=Titel&cp=' + str(tmp_element) + "&wert="
++                self.url = 'http://www.zweitausendeins.de/filmlexikon/?sucheNach=filmtitel&cp=' + str(tmp_element) + "&wert="
+                 if self.open_search(parent_window):
+-                    tmp_page2 = gutils.trim(self.page, 'Alle Treffer aus der Kategorie', '<span class="trefferliste">')
++                    tmp_page2 = gutils.trim(self.page, '<ul class=\'film-liste\'>', '</ul>')
+                     tmp_page = tmp_page + tmp_page2
+         self.page = tmp_page
+ 
+         return self.page
+ 
+     def get_searches(self):
+-        elements = string.split(self.page, '<div class="text_ergebniss_faz_3"')
++        elements = string.split(self.page, '<h2 class=\'film-titel\'>')
+         i = 1
+         while i < len(elements):
+             element = elements[i]
+             i = i + 1
+-            self.ids.append(gutils.trim(element, 'filmlexikon/?wert=', '&'))
+-            self.titles.append(string.strip(gutils.clean(
+-                        gutils.trim(element, '>', '</a>') + ' (' +
+-                        string.capwords(gutils.trim(element, '</a>', '(Originaltitel)')) + ', ' +
+-                        gutils.after(gutils.trim(element, 'sucheNach=produktionsland', '</a>'), '>') + ', ' +
+-                        gutils.after(gutils.trim(element, 'sucheNach=produktionsjahr', '</a>'), '>') +
+-                        ')')))
++            self.ids.append(gutils.trim(element, 'wert=', '\''))
++            self.titles.append(gutils.trim(element, '>', '</a>'))
++
++    def get_postdata(self):
++        return {'sucheNach' : 'filmtitel', 'wert' : self.title }
+ 
+ #
+ # Plugin Test
+@@ -178,9 +164,9 @@ class SearchPluginTest(SearchPlugin):
+     # dict { movie_id -> [ expected result count for original url, expected result count for translated url ] }
+     #
+     test_configuration = {
+-        'Rocky'                : [ 15, 15 ],
++        'Rocky'                : [ 17, 17 ],
+         'Arahan'               : [ 1, 1 ],
+-        'Ein glückliches Jahr' : [ 0, 0 ]
++        'Ein glückliches Jahr' : [ 1, 1 ]
+     }
+ 
+ class PluginTest:
+@@ -197,13 +183,13 @@ class PluginTest:
+             'o_title'           : 'Rocky Balboa',
+             'director'          : 'Sylvester Stallone',
+             'plot'              : True,
+-            'cast'              : 'A.J. Benza' + _(' as ') + 'L.C.\n\
+-Milo Ventimiglia' + _(' as ') + 'Rocky jr.\n\
++            'cast'              : 'Sylvester Stallone' + _(' as ') + 'Rocky Balboa\n\
++Burt Young' + _(' as ') + 'Paulie\n\
+ Antonio Tarver' + _(' as ') + 'Mason \'The Line\' Dixon\n\
+ Geraldine Hughes' + _(' as ') + 'Marie\n\
+-Sylvester Stallone' + _(' as ') + 'Rocky Balboa\n\
+-Burt Young' + _(' as ') + 'Paulie\n\
+-Tony Burton' + _(' as ') + 'Duke',
++Milo Ventimiglia' + _(' as ') + 'Rocky jr.\n\
++Tony Burton' + _(' as ') + 'Duke\n\
++A.J. Benza' + _(' as ') + 'L.C.',
+             'country'           : 'USA',
+             'genre'             : 'Boxerfilm',
+             'classification'    : 'ab 12',
+@@ -217,25 +203,25 @@ Tony Burton' + _(' as ') + 'Duke',
+             'image'             : True,
+             'rating'            : False,
+             'screenplay'        : 'Sylvester Stallone',
+-            'cameraman'         : 'J. Clark Mathis',
++            'cameraman'         : 'Clark Mathis',
+         },
+         '26956' : { 
+             'title'             : 'Bürgschaft für ein Jahr',
+             'o_title'           : 'Bürgschaft für ein Jahr',
+             'director'          : 'Herrmann Zschoche',
+             'plot'              : True,
+-            'cast'              : 'Heide Kipp' + _(' as ') + 'Frau Braun\n\
+-Jan Spitzer' + _(' as ') + 'Werner Horn\n\
++            'cast'              : 'Katrin Saß' + _(' as ') + 'Nina\n\
+ Monika Lennartz' + _(' as ') + 'Irmgard Behrend\n\
+-Katrin Saß' + _(' as ') + 'Nina\n\
+-Ursula Werner' + _(' as ') + 'Frau Müller\n\
+-Christian Steyer' + _(' as ') + 'Heiner Menk\n\
+ Jaecki Schwarz' + _(' as ') + 'Peter Müller\n\
+-Barbara Dittus' + _(' as ') + 'Heimleiterin',
++Christian Steyer' + _(' as ') + 'Heiner Menk\n\
++Jan Spitzer' + _(' as ') + 'Werner Horn\n\
++Heide Kipp' + _(' as ') + 'Frau Braun\n\
++Barbara Dittus' + _(' as ') + 'Heimleiterin\n\
++Ursula Werner' + _(' as ') + 'Frau Müller',
+             'country'           : 'DDR',
+             'genre'             : 'Arbeiterfilm, Frauenfilm, Literaturverfilmung',
+             'classification'    : 'ab 6',
+-            'studio'            : 'DEFA, Gruppe "Berlin"',
++            'studio'            : 'DEFA, Gruppe Berlin""',
+             'o_site'            : False,
+             'site'              : 'http://www.zweitausendeins.de/filmlexikon/?sucheNach=titel&wert=26956',
+             'trailer'           : False,
+@@ -254,9 +240,9 @@ Barbara Dittus' + _(' as ') + 'Heimleiterin',
+             'plot'              : True,
+             'cast'              : 'Ryu Seung-beom' + _(' as ') + 'Sang-hwan\n\
+ Yoon So-yi' + _(' as ') + 'Wi-jin\n\
+-Yun Ju-sang' + _(' as ') + 'Mu-woon\n\
+ Ahn Sung-kee' + _(' as ') + 'Ja-woon\n\
+-Jung Doo-hong' + _(' as ') + 'Heukwoon',
++Jung Doo-hong' + _(' as ') + 'Heukwoon\n\
++Yun Ju-sang' + _(' as ') + 'Mu-woon',
+             'country'           : 'Südkorea',
+             'genre'             : False,
+             'classification'    : 'ab 16',
+@@ -269,7 +255,7 @@ Jung Doo-hong' + _(' as ') + 'Heukwoon',
+             'runtime'           : 108,
+             'image'             : False,
+             'rating'            : False,
+-            'screenplay'        : 'Ryoo Seung-wan',
++            'screenplay'        : 'Eun Ji-hie, Ryoo Seung-wan, Yu Seon-dong',
+             'cameraman'         : 'Lee Jun-gyu',
+         }
+     }
+diff --git a/lib/plugins/movie/PluginMovieFilmtipset.py b/lib/plugins/movie/PluginMovieFilmtipset.py
+index e090df5..7e7587e 100644
+--- a/lib/plugins/movie/PluginMovieFilmtipset.py
++++ b/lib/plugins/movie/PluginMovieFilmtipset.py
+@@ -70,7 +70,7 @@ class Plugin(movie.Movie):
+     def get_genre(self):
+         self.genre = string.strip(gutils.trim(self.page, 'Nyckelord:', '</tr>'))
+         if self.genre == '':
+-            self.genre = string.strip(gutils.trim(self.page, 'Genre:', '</tr>'))
++            self.genre = string.strip(gutils.trim(self.page, 'Genre:</h2>', '</tr>'))
+ 
+     def get_cast(self):
+         self.cast = gutils.regextrim(self.page, 'Sk&aring;despelare[^:]*[:]', '</tr>')
+diff --git a/lib/plugins/movie/PluginMovieFilmweb.py b/lib/plugins/movie/PluginMovieFilmweb.py
+index bf82697..d2c1951 100644
+--- a/lib/plugins/movie/PluginMovieFilmweb.py
++++ b/lib/plugins/movie/PluginMovieFilmweb.py
+@@ -1,8 +1,8 @@
+ # -*- coding: utf-8 -*-
+ 
+-__revision__ = '$Id: PluginMovieFilmweb.py 1602 2011-12-18 19:11:55Z piotrek $'
++__revision__ = '$Id$'
+ 
+-# Copyright (c) 2005-2011 Piotr Ożarowski
++# Copyright (c) 2005-2012 Piotr Ożarowski
+ #
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -27,12 +27,12 @@ import movie
+ plugin_name = 'Filmweb'
+ plugin_description = 'Web pełen filmów'
+ plugin_url = 'filmweb.pl'
+-plugin_url_other = 'm.filmweb.pl'
++plugin_url_other = 'filmweb.pl'
+ plugin_server = '193.200.227.13'
+ plugin_language = _('Polish')
+ plugin_author = 'Piotr Ożarowski, Bartosz Kurczewski, Mariusz Szczepanek'
+ plugin_author_email = '<mariusz2806@×××××.com>'
+-plugin_version = '1.28'
++plugin_version = '1.29'
+ 
+ 
+ class Plugin(movie.Movie):
+@@ -50,11 +50,14 @@ class Plugin(movie.Movie):
+ 
+     def get_o_title(self):
+         self.url = self.url.replace(plugin_server, plugin_url)
+-        self.o_title = gutils.trim(self.page, '<title>', '</title>')
+-        if self.o_title.find('/') > -1:
+-            self.o_title = gutils.trim(self.o_title, '/', '(')
+-        if self.o_title.find('(') > -1:
+-            self.o_title = gutils.before(self.o_title, '(')
++        self.o_title = gutils.trim(self.page, '<h2 class=origTitle>', '</h2>')
++        self.o_title = gutils.after(self.o_title, '</span>')
++        if self.o_title == '':
++            self.o_title = gutils.trim(self.page, '<title>', '</title>')
++            if self.o_title.find('(') > -1:
++                self.o_title = gutils.before(self.o_title, '(')
++            if self.o_title.find('/') > -1:
++                self.o_title = gutils.before(self.o_title, '/')
+ 
+     def get_title(self):
+         self.url = self.url.replace(plugin_server, plugin_url)
+@@ -68,20 +71,12 @@ class Plugin(movie.Movie):
+         self.director = gutils.trim(self.page, "reżyseria:", '</tr>')
+         self.director = gutils.after(self.director, '</th>')
+         self.director = self.director.replace("(więcej...)", '')
+-        self.director = self.director.replace('  ', '\t')
+-        self.director = self.director.replace("\t ", '')
+-        self.director = self.director.replace("\t", '')
+-        self.director = self.director.replace(',', ', ')
+         self.director = gutils.strip_tags(self.director)
+ 
+     def get_screenplay(self):
+         self.screenplay = gutils.trim(self.page, "scenariusz:", '</tr>')
+         self.screenplay = gutils.after(self.screenplay, '</th>')
+         self.screenplay = self.screenplay.replace("(więcej...)", '')
+-        self.screenplay = self.screenplay.replace('  ', '\t')
+-        self.screenplay = self.screenplay.replace("\t ", '')
+-        self.screenplay = self.screenplay.replace("\t", '')
+-        self.screenplay = self.screenplay.replace(',', ', ')
+         self.screenplay = gutils.strip_tags(self.screenplay)
+ 
+     def get_plot(self):
+@@ -114,26 +109,16 @@ class Plugin(movie.Movie):
+ 
+     def get_genre(self):
+         self.genre = gutils.trim(self.page, "gatunek:", '</tr>')
+-        self.genre = self.genre.replace("\t", '')
+-        self.genre = self.genre.replace("\n", '')
+-        self.genre = self.genre.replace('  ', '')
+-        self.genre = self.genre.replace(',', ', ')
+ 
+     def get_cast(self):
+         self.cast = gutils.trim(self.page, '<div class="castListWrapper cl">', '<div class="additional-info comBox">')
+-        url = gutils.after(self.cast, '</ul>')
+-        url = gutils.trim(url, 'href="', '"')
+         self.cast = gutils.before(self.cast, '</ul>')
+-        self.cast = self.cast.replace(chr(13), '')
+-        self.cast = self.cast.replace(chr(10), '')
+-        self.cast = self.cast.replace("  ", '\t')
+-        self.cast = self.cast.replace("\t ", '')
+-        self.cast = self.cast.replace('\t', '')
+-        self.cast = self.cast.replace(" (", '(')
+-        self.cast = self.cast.replace('(', " (")
++        self.cast = self.cast.replace('</span> ', '')
+         self.cast = self.cast.replace('<div>', _(" as "))
+         self.cast = self.cast.replace('</li>', "\n")
+-        self.cast = self.cast.replace('</span> ', '')
++        self.cast = gutils.strip_tags(self.cast)
++        self.cast = self.cast.replace('   ', '')
++        self.cast = self.cast.replace('  ', ' ')
+ 
+     def get_classification(self):
+         self.classification = ''
+@@ -151,11 +136,7 @@ class Plugin(movie.Movie):
+         self.trailer = ''
+ 
+     def get_country(self):
+-        self.country = gutils.trim(self.page, '<dt>kraj', '</dd>')
+-        self.country = self.country.replace('  ', '')
+-        self.country = self.country.replace("e:", '')
+-        self.country = self.country.replace(":", '')
+-        self.country = self.country.replace("\t", '')
++        self.country = gutils.trim(self.page, 'produkcja:', '</tr>')
+ 
+     def get_rating(self):
+         self.rating = gutils.trim(self.page, '<div class=rates>', '</div>')
+diff --git a/lib/plugins/movie/PluginMovieHKMDB.py b/lib/plugins/movie/PluginMovieHKMDB.py
+index 798bf3f..4ea5060 100644
+--- a/lib/plugins/movie/PluginMovieHKMDB.py
++++ b/lib/plugins/movie/PluginMovieHKMDB.py
+@@ -1,6 +1,6 @@
+ # -*- coding: UTF-8 -*-
+ 
+-__revision__ = '$Id: PluginMovieHKMDB.py 1605 2011-12-18 22:35:25Z piotrek $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2010 Michael Jahn
+ #
+@@ -183,25 +183,26 @@ class PluginTest:
+             'director'          : 'Ting Chung (1)',
+             'plot'              : False,
+             'cast'              : 'John Liu Chung-Liang' + _(' as ') + 'Ma Tien Lang\n\
+-Phillip Ko Fei' + _(' as ') + 'Fang Kang and his brother\n\
+ Stephen Tung Wai\n\
++Tong Bo-Wan' + _(' as ') + 'Ma\'s wife\n\
+ Suen Yuet\n\
+-Wong Chi-Sang' + _(' as ') + 'Henchman\n\
++Phillip Ko Fei' + _(' as ') + 'Fang Kang and his brother\n\
+ Ga Hoi\n\
+-Tong Bo-Wan' + _(' as ') + 'Ma\'s wife\n\
++Wong Kwok-Fai (2)' + _(' as ') + 'Fei Hu\n\
+ Peng Kong' + _(' as ') + 'Fei Lung\n\
+ Wong Hoi (3)\n\
+-Chen Chin-Hai' + _(' as ') + 'extra\n\
+-Mau Ging-Shun' + _(' as ') + 'extra\n\
+-Wong Kwok-Fai (2)\n\
+-Peter Chang\n\
+-Cheung Chung-Kwai\n\
+-Lui Wan-Biu' + _(' as ') + 'extra\n\
+-Hung Ji-Yue\n\
++Wong Chi-Sang' + _(' as ') + 'Henchman\n\
+ Ho Szu-Yuan\n\
++Hung Ji-Yue\n\
++San Bao\n\
++Cheung Chung-Kwai (1)\n\
++Peter Chang Chi-Long\n\
+ Mark Lung Goon-Mo\n\
+-Chan Jan (1)' + _(' as ') + 'extra\n\
+-Fan Fung-San' + _(' as ') + 'extra',
++Fan Fung-San' + _(' as ') + '[Extra]\n\
++Chan Jan (1)' + _(' as ') + '[Extra]\n\
++Chen Chin-Hai' + _(' as ') + '[Extra]\n\
++Mau Ging-Shun' + _(' as ') + '[Extra]\n\
++Lui Wan-Biu' + _(' as ') + '[Extra]',
+             'country'           : 'Taiwan',
+             'genre'             : 'Martial Arts',
+             'classification'    : False,
+diff --git a/lib/plugins/movie/PluginMovieIMDB-de.py b/lib/plugins/movie/PluginMovieIMDB-de.py
+index ef8338d..7a3e92a 100644
+--- a/lib/plugins/movie/PluginMovieIMDB-de.py
++++ b/lib/plugins/movie/PluginMovieIMDB-de.py
+@@ -1,8 +1,8 @@
+ # -*- coding: UTF-8 -*-
+ 
+-__revision__ = '$Id: PluginMovieIMDB-de.py 1577 2011-08-30 21:13:26Z mikej06 $'
++__revision__ = '$Id$'
+ 
+-# Copyright (c) 2007-2011 Michael Jahn
++# Copyright (c) 2007-2012 Michael Jahn
+ #
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -30,7 +30,7 @@ plugin_url          = 'www.imdb.de'
+ plugin_language     = _('German')
+ plugin_author       = 'Michael Jahn'
+ plugin_author_email = 'mikej06@×××××××.com'
+-plugin_version      = '1.8'
++plugin_version      = '1.9'
+ 
+ class Plugin(movie.Movie):
+     def __init__(self, id):
+@@ -247,42 +247,35 @@ class Plugin(movie.Movie):
+         return data
+ 
+ class SearchPlugin(movie.SearchMovie):
+-    PATTERN = re.compile(r"""<a href=['"]/title/tt([0-9]+)/["'](.*?)</tr>""", re.IGNORECASE)
+-    PATTERN_POWERSEARCH = re.compile(r"""Here are the [0-9]+ matching titles""")
++    PATTERN = re.compile(r"""<a href=['"]/title/tt([0-9]+)/[^>]+[>](.*?)</td>""")
++    PATTERN_DIRECT = re.compile(r"""value="/title/tt([0-9]+)""")
+ 
+     def __init__(self):
+-        self.original_url_search   = 'http://www.imdb.de/find?more=tt&q='
+-        self.translated_url_search = 'http://www.imdb.de/find?more=tt&q='
++        self.original_url_search   = 'http://www.imdb.de/find?s=tt&q='
++        self.translated_url_search = 'http://www.imdb.de/find?s=tt&q='
+         self.encode                = 'utf8'
+         self.remove_accents        = False
+ 
+     def search(self,parent_window):
+         if not self.open_search(parent_window):
+             return None
+-        tmp = gutils.trim(self.page, ' angezeigt)', ' Treffergenauigkeit')
+-        if tmp == '':
+-            if self.PATTERN_POWERSEARCH.search(self.page) is None:
+-                self.page = ''
+-        else:
+-            self.page = tmp
+-        # correction of all &#xxx entities
+-        self.page = self.page.decode('iso8859-1')
+-        self.page = gutils.convert_entities(self.page)
+-        #self.page = self.page.encode(self.encode)
+         return self.page
+-
++    
+     def get_searches(self):
+-        elements = string.split(self.page, '<tr>')
+-        if len(elements) < 2:
+-            elements = string.split(self.page, '<TR>')
+-
++        elements = string.split(self.page, '<tr')
+         if len(elements):
+             for element in elements[1:]:
+                 match = self.PATTERN.findall(element)
+-                for entry in match:
+-                    tmp  = re.sub('^[0-9]+[.]', '', gutils.clean(gutils.after(entry[1], '>')))
+-                    self.ids.append(entry[0])
++                if len(match) > 1:
++                    tmp = re.sub('^[0-9]+[.]', '', gutils.clean(match[1][1]))
++                    self.ids.append(match[1][0])
+                     self.titles.append(tmp)
++        if len(self.ids) < 2:
++            # try to find a direct result
++            match = self.PATTERN_DIRECT.findall(self.page)
++            if len(match) > 0:
++                self.ids.append(match[0])
++
+ 
+ #
+ # Plugin Test
+@@ -293,8 +286,8 @@ class SearchPluginTest(SearchPlugin):
+     # dict { movie_id -> [ expected result count for original url, expected result count for translated url ] }
+     #
+     test_configuration = {
+-        'Rocky Balboa'         : [ 25, 25 ],
+-        'Ein glückliches Jahr' : [ 47, 47 ]
++        'Rocky Balboa'         : [ 10, 10 ],
++        'Ein glückliches Jahr' : [ 3, 3 ]
+     }
+ 
+ class PluginTest:
+@@ -377,6 +370,7 @@ Tim Brooks' + _(' as ') + 'Boxing Spectator (nicht im Abspann)\n\
+ D.T. Carney' + _(' as ') + 'High Roller (nicht im Abspann)\n\
+ Ricky Cavazos' + _(' as ') + 'Boxing Spectator (nicht im Abspann)\n\
+ Rennie Cowan' + _(' as ') + 'Boxing Spectator (nicht im Abspann)\n\
++Kevin Deon' + _(' as ') + 'Jeno (nicht im Abspann)\n\
+ Deon Derrico' + _(' as ') + 'High Roller at Limo (nicht im Abspann)\n\
+ Jacob \'Stitch\' Duran' + _(' as ') + 'Dixon\'s Trainer (nicht im Abspann)\n\
+ Simon P. Edwards' + _(' as ') + 'Crowd Member (nicht im Abspann)\n\
+@@ -390,6 +384,7 @@ Dolph Lundgren' + _(' as ') + 'Captain Ivan Drago (Archivmaterial) (nicht im Abs
+ Dean Mauro' + _(' as ') + 'Sports Journalist (nicht im Abspann) (unbestätigt)\n\
+ Burgess Meredith' + _(' as ') + 'Mickey Goldmill (Archivmaterial) (nicht im Abspann)\n\
+ Dan Montero' + _(' as ') + 'Boxing Spectator (nicht im Abspann)\n\
++Babs Moran' + _(' as ') + 'Obnoxious Fan (nicht im Abspann)\n\
+ Keith Moyer' + _(' as ') + 'Bargast (nicht im Abspann)\n\
+ Mr. T' + _(' as ') + 'Clubber Lang (Archivmaterial) (nicht im Abspann)\n\
+ Carol Anne Mueller' + _(' as ') + 'Restaurant Patron (nicht im Abspann)\n\
+@@ -400,8 +395,8 @@ Frank Traynor' + _(' as ') + 'Rechtsanwalt (nicht im Abspann)\n\
+ Ryan Tygh' + _(' as ') + 'Ring Photographer (nicht im Abspann)\n\
+ Kimberly Villanova' + _(' as ') + 'Businesswoman (nicht im Abspann)',
+             'country'           : 'USA',
+-            'genre'             : 'Action | Drama | Romanze | Sport',
+-            'classification'    : False,
++            'genre'             : 'Drama | Sport',
++            'classification'    : '12',
+             'studio'            : 'Metro-Goldwyn-Mayer (MGM) (presents) (copyright owner), Columbia Pictures (presents) (copyright owner), Revolution Studios (presents) (copyright owner), Rogue Marble',
+             'o_site'            : False,
+             'site'              : 'http://www.imdb.de/title/tt0479143',
+@@ -443,7 +438,7 @@ Georges Staquet\n\
+ Jacques Villedieu\n\
+ Harry Walter übrige Besetzung in alphabetischer Reihenfolge:\n\
+ Anouk Aimée' + _(' as ') + 'Une femme (Archivmaterial) (nicht im Abspann)\n\
+-Elie Chouraqui' + _(' as ') + ' (nicht im Abspann)\n\
++Élie Chouraqui' + _(' as ') + ' (nicht im Abspann)\n\
+ Rémy Julienne' + _(' as ') + 'Chauffeur de taxi (nicht im Abspann)\n\
+ Jean-Louis Trintignant' + _(' as ') + 'Un homme (Archivmaterial) (nicht im Abspann)',
+             'country'            : 'Frankreich | Italien',
+diff --git a/lib/plugins/movie/PluginMovieIMDB-es.py b/lib/plugins/movie/PluginMovieIMDB-es.py
+index 72f8978..084be9b 100644
+--- a/lib/plugins/movie/PluginMovieIMDB-es.py
++++ b/lib/plugins/movie/PluginMovieIMDB-es.py
+@@ -26,18 +26,20 @@ import movie
+ import string
+ import re
+ 
+-plugin_name         = 'IMDb-es'
+-plugin_description  = 'Internet Movie Database Spanish'
+-plugin_url          = 'www.imdb.es'
+-plugin_language     = _('Spanish')
+-plugin_author       = 'Pedro D. Sánchez'
++plugin_name = 'IMDb-es'
++plugin_description = 'Internet Movie Database Spanish'
++plugin_url = 'www.imdb.es'
++plugin_language = _('Spanish')
++plugin_author = 'Pedro D. Sánchez'
+ plugin_author_email = '<pedrodav@×××××.com>'
+-plugin_version      = '0.3'
++plugin_version = '0.4'
++
+ 
+ class Plugin(movie.Movie):
+-    def __init__(self, id):
+-        self.encode='iso-8859-15'
+-        self.movie_id = id
++
++    def __init__(self, movie_id):
++        self.encode = 'iso-8859-15'
++        self.movie_id = movie_id
+         self.url = "http://www.imdb.es/title/tt%s" % str(self.movie_id)
+ 
+     def initialize(self):
+@@ -207,37 +209,34 @@ class Plugin(movie.Movie):
+         return data
+ 
+ class SearchPlugin(movie.SearchMovie):
+-    PATTERN = re.compile(r"""<a href=['"]/title/tt([0-9]+)/["'](.*?)</tr>""", re.IGNORECASE)
++    PATTERN = re.compile(r"""<a href=['"]/title/tt([0-9]+)/[^>]+[>](.*?)</td>""")
++    PATTERN_DIRECT = re.compile(r"""value="/title/tt([0-9]+)""")
+ 
+     def __init__(self):
+-        self.original_url_search = 'http://www.imdb.es/find?more=tt;q='
+-        self.translated_url_search = 'http://www.imdb.es/find?more=tt;q='
+-        self.encode = 'iso-8859-15'
++        self.original_url_search = 'http://www.imdb.es/find?s=tt&q='
++        self.translated_url_search = 'http://www.imdb.es/find?s=tt&q='
++        self.encode = 'utf8'
+ 
+     def search(self,parent_window):
+         if not self.open_search(parent_window):
+             return None
+-        self.sub_search()
+         return self.page
+ 
+-    def sub_search(self):
+-        self.page = gutils.regextrim(self.page, ' resultado[s]*[)]', 'Sugerencias Para Mejorar Sus Resultados');
+-        self.page = self.page.decode('iso-8859-15')
+-        # correction of all &#xxx entities
+-        self.page = gutils.convert_entities(self.page)
+-
+     def get_searches(self):
+-        elements = string.split(self.page, '<tr>')
+-        if len(elements) < 2:
+-            elements = string.split(self.page, '<TR>')
+-
++        elements = string.split(self.page, '<tr')
+         if len(elements):
+             for element in elements[1:]:
+                 match = self.PATTERN.findall(element)
+-                for entry in match:
+-                    tmp  = re.sub('^[0-9]+[.]', '', gutils.clean(gutils.after(entry[1], '>')))
+-                    self.ids.append(entry[0])
++                if len(match) > 1:
++                    tmp = re.sub('^[0-9]+[.]', '', gutils.clean(match[1][1]))
++                    self.ids.append(match[1][0])
+                     self.titles.append(tmp)
++        if len(self.ids) < 2:
++            # try to find a direct result
++            match = self.PATTERN_DIRECT.findall(self.page)
++            if len(match) > 0:
++                self.ids.append(match[0])
++
+ 
+ #
+ # Plugin Test
+@@ -248,7 +247,7 @@ class SearchPluginTest(SearchPlugin):
+     # dict { movie_id -> [ expected result count for original url, expected result count for translated url ] }
+     #
+     test_configuration = {
+-        'Rocky Balboa'         : [ 25, 25 ]
++        'Rocky Balboa'         : [ 10, 10 ]
+     }
+ 
+ class PluginTest:
+@@ -265,97 +264,9 @@ class PluginTest:
+             'o_title'           : 'Rocky Balboa',
+             'director'          : 'Sylvester Stallone',
+             'plot'              : True,
+-            'cast'              : 'Sylvester Stallone' + _(' as ') + 'Rocky Balboa\n\
+-Burt Young' + _(' as ') + 'Paulie\n\
+-Antonio Tarver' + _(' as ') + 'Mason \'The Line\' Dixon\n\
+-Geraldine Hughes' + _(' as ') + 'Marie\n\
+-Milo Ventimiglia' + _(' as ') + 'Robert Balboa Jr.\n\
+-Tony Burton' + _(' as ') + 'Duke\n\
+-A.J. Benza' + _(' as ') + 'L.C.\n\
+-James Francis Kelly III' + _(' as ') + 'Steps\n\
+-Talia Shire' + _(' as ') + 'Adrian (tomas de archivo)\n\
+-Lou DiBella' + _(' as ') + u'Él Mismo\n\
+-Mike Tyson' + _(' as ') + u'Él Mismo\n\
+-Henry G. Sanders' + _(' as ') + 'Martin\n\
+-Pedro Lovell' + _(' as ') + 'Spider Rico\n\
+-Ana Gerena' + _(' as ') + 'Isabel\n\
+-Angela Boyd' + _(' as ') + 'Angie\n\
+-Louis Giansante' + _(' as ') + 'Bar Thug\n\
+-Maureen Schilling' + _(' as ') + 'Lucky\'s Bartender\n\
+-Lahmard J. Tate' + _(' as ') + 'X-Cell (como Lahmard Tate)\n\
+-Woody Paige' + _(' as ') + 'ESPN Commentator (como Woodrow W. Paige)\n\
+-Skip Bayless' + _(' as ') + 'ESPN Commentator\n\
+-Jay Crawford' + _(' as ') + 'ESPN Commentator\n\
+-Brian Kenny' + _(' as ') + 'ESPN Host\n\
+-Dana Jacobson' + _(' as ') + 'ESPN Host\n\
+-Charles Johnson' + _(' as ') + 'ESPN Host (como Chuck Johnson)\n\
+-James Binns' + _(' as ') + 'Commissioner (como James J. Binns)\n\
+-Johnnie Hobbs Jr.' + _(' as ') + 'Commissioner\n\
+-Barney Fitzpatrick' + _(' as ') + 'Commissioner\n\
+-Jim Lampley' + _(' as ') + 'HBO Commentator\n\
+-Larry Merchant' + _(' as ') + 'HBO Commentator\n\
+-Max Kellerman' + _(' as ') + 'HBO Commentator\n\
+-LeRoy Neiman' + _(' as ') + u'Él Mismo\n\
+-Bert Randolph Sugar' + _(' as ') + u'Ring Magazine Reporter\n\
+-Bernard Fernández' + _(' as ') + 'Boxing Association of America Writer (como Bernard Fernandez)\n\
+-Gunnar Peterson' + _(' as ') + 'Weightlifting Trainer\n\
+-Yahya' + _(' as ') + 'Dixon\'s Opponent\n\
+-Marc Ratner' + _(' as ') + 'Weigh-In Official\n\
+-Anthony Lato Jr.' + _(' as ') + 'Rocky\'s Inspector\n\
+-Jack Lazzarado' + _(' as ') + 'Dixon\'s Inspector\n\
+-Michael Buffer' + _(' as ') + 'Ring Announcer\n\
+-Joe Cortez' + _(' as ') + u'Árbitro\n\
+-Carter Mitchell' + _(' as ') + 'Shamrock Foreman\n\
+-Vinod Kumar' + _(' as ') + 'Ravi\n\
+-Fran Pultro' + _(' as ') + 'Father at Restaurant\n\
+-Frank Stallone' + _(' as ') + 'Dinner Patron (como Frank Stallone Jr.)\n\
+-Jody Giambelluca' + _(' as ') + 'Dinner Patron\n\
+-Tobias Segal' + _(' as ') + 'Robert\'s Friend\n\
+-Tim Carr' + _(' as ') + 'Robert\'s Friend\n\
+-Matt Frack' + _(' as ') + 'Robert\'s Friend #3\n\
+-Paul Dion Monte' + _(' as ') + 'Robert\'s Friend\n\
+-Kevin King Templeton' + _(' as ') + 'Robert\'s Friend (como Kevin King-Templeton)\n\
+-Robert Michael Kelly' + _(' as ') + 'Mr. Tomilson\n\
+-Rick Buchborn' + _(' as ') + 'Rocky Fan\n\
+-Nick Baker' + _(' as ') + 'Irish Pub Bartender\n\
+-Don Sherman' + _(' as ') + 'Andy\n\
+-Stu Nahan' + _(' as ') + 'Computer Fight Commentator (voz)\n\
+-Gary Compton' + _(' as ') + u'Oficial de Seguridad listado alfabético del resto del reparto:\n\
+-Vale Anoai' + _(' as ') + 'Shopper in Italian Market\n\
+-Sikander Malik' + _(' as ') + 'Boxer\n\
+-Michael Ahl' + _(' as ') + 'Restaurant Patron (sin acreditar)\n\
+-Andrew Aninsman' + _(' as ') + 'Promoter (sin acreditar)\n\
+-Ben Bachelder' + _(' as ') + 'The Arm (sin acreditar)\n\
+-Lacy Bevis' + _(' as ') + 'Boxing Spectator (sin acreditar)\n\
+-Tim Brooks' + _(' as ') + 'Boxing Spectator (sin acreditar)\n\
+-D.T. Carney' + _(' as ') + 'High Roller (sin acreditar)\n\
+-Ricky Cavazos' + _(' as ') + 'Boxing Spectator (sin acreditar)\n\
+-Rennie Cowan' + _(' as ') + 'Boxing Spectator (sin acreditar)\n\
+-Deon Derrico' + _(' as ') + 'High Roller at Limo (sin acreditar)\n\
+-Jacob \'Stitch\' Duran' + _(' as ') + 'Dixon\'s Trainer (sin acreditar)\n\
+-Simon P. Edwards' + _(' as ') + 'Crowd Member (sin acreditar)\n\
+-Ruben Fischman' + _(' as ') + 'High-Roller in Las Vegas (sin acreditar)\n\
+-David Gere' + _(' as ') + 'Patron at Adrian\'s (sin acreditar)\n\
+-Noah Jacobs' + _(' as ') + 'Boxing Fan (sin acreditar)\n\
+-Mark J. Kilbane' + _(' as ') + 'Businessman (sin acreditar)\n\
+-Zach Klinefelter' + _(' as ') + 'Boxing Spectator (sin acreditar)\n\
+-David Kneeream' + _(' as ') + 'Adrian\'s Patron (sin acreditar)\n\
+-Dolph Lundgren' + _(' as ') + 'Captain Ivan Drago (tomas de archivo) (sin acreditar)\n\
+-Dean Mauro' + _(' as ') + 'Sports Journalist (sin acreditar) (sin confirmar)\n\
+-Burgess Meredith' + _(' as ') + 'Mickey Goldmill (tomas de archivo) (sin acreditar)\n\
+-Dan Montero' + _(' as ') + 'Boxing Spectator (sin acreditar)\n\
+-Keith Moyer' + _(' as ') + 'Administrador del Bar (sin acreditar)\n\
+-Mr. T' + _(' as ') + 'Clubber Lang (tomas de archivo) (sin acreditar)\n\
+-Carol Anne Mueller' + _(' as ') + 'Restaurant Patron (sin acreditar)\n\
+-Jacqueline Olivia' + _(' as ') + 'Chica (sin acreditar)\n\
+-Brian H. Scott' + _(' as ') + 'Ringside Cop #1 (sin acreditar)\n\
+-Keyon Smith' + _(' as ') + 'Boxing Spectator (sin acreditar)\n\
+-Frank Traynor' + _(' as ') + 'Abogado (sin acreditar)\n\
+-Ryan Tygh' + _(' as ') + 'Ring Photographer (sin acreditar)\n\
+-Kimberly Villanova' + _(' as ') + 'Businesswoman (sin acreditar)',
+             'country'           : 'Estados Unidos',
+-            'genre'             : u'Acción | Drama | Romance | Deporte',
+-            'classification'    : u'Estados Unidos:PG  | Singapur:PG  | Finlandia:K-11  | Reino Unido:12A  | Canadá:G (British Columbia) | Australia:M  | Irlanda:PG  | Hong Kong:IIA  | México:A  | Noruega:11  | Suiza:12 (canton of Geneva) | Suiza:12 (canton of Vaud) | Brasil:12  | Argentina:Atp  | Malasia:U  | Filipinas:PG-13 (MTRCB) | Portugal:M/12  | Corea del Sur:12  | Suecia:11  | Nueva Zelanda:M',
++            'genre'             : u'Drama | Deporte',
++            'classification'    : u'Estados Unidos:PG  | Singapur:PG  | Finlandia:K-11  | Reino Unido:12A  | Canadá:G (British Columbia) | Australia:M  | Irlanda:PG  | Hong Kong:IIA  | México:A  | Noruega:11  | Suiza:12 (canton of Vaud) | Suiza:12 (canton of Geneva) | Brasil:12  | Argentina:Atp  | Malasia:U  | Filipinas:PG-13 (MTRCB) | Portugal:M/12  | Corea del Sur:12  | Suecia:11  | Nueva Zelanda:M  | Italia:T  | Alemania:12  | Francia:U',
+             'studio'            : 'Metro-Goldwyn-Mayer (MGM) (presents) (copyright owner), Columbia Pictures (presents) (copyright owner), Revolution Studios (presents) (copyright owner), Rogue Marble',
+             'o_site'            : False,
+             'site'              : 'http://www.imdb.es/title/tt0479143',
+diff --git a/lib/plugins/movie/PluginMovieIMDB-it.py b/lib/plugins/movie/PluginMovieIMDB-it.py
+index 0df9d3b..fec1fd7 100644
+--- a/lib/plugins/movie/PluginMovieIMDB-it.py
++++ b/lib/plugins/movie/PluginMovieIMDB-it.py
+@@ -31,14 +31,14 @@ plugin_url          = 'italian.imdb.com'
+ plugin_language     = _('Italian')
+ plugin_author       = 'Enrico Carlesso, Filippo Valsorda'
+ plugin_author_email = 'enrico@×××××××××.org, filosottile.wiki -at- gmail com'
+-plugin_version      = '0.2'
++plugin_version      = '0.3'
+ 
+ class Plugin(movie.Movie):
+     def __init__(self, id):
+         self.encode   = 'iso8859-1'
+         self.movie_id = id
+         self.url      = "http://www.imdb.it/title/tt%s" % self.movie_id
+-        self.o_url      = "http://www.imdb.com/title/tt%s" % self.movie_id
++        self.o_url    = "http://www.imdb.com/title/tt%s" % self.movie_id
+ 
+     def initialize(self):
+         self.cast_page = self.open_page(url=self.url + '/fullcredits')
+@@ -107,13 +107,13 @@ class Plugin(movie.Movie):
+         self.studio = gutils.trim(self.page, '<h5>Compagnia:</h5>', '</a>')
+ 
+     def get_o_site(self):
+-        self.o_site = "http://italian.imdb.com/title/tt%s/officialsites" % self.movie_id
++        self.o_site = "http://www.imdb.it/title/tt%s/officialsites" % self.movie_id
+ 
+     def get_site(self):
+-        self.site = "http://italian.imdb.com/title/tt%s" % self.movie_id
++        self.site = "http://www.imdb.it/title/tt%s" % self.movie_id
+ 
+     def get_trailer(self):
+-        self.trailer = "http://italian.imdb.com/title/tt%s/trailers" % self.movie_id
++        self.trailer = "http://www.imdb.it/title/tt%s/trailers" % self.movie_id
+ 
+     def get_country(self):
+         self.country = gutils.trim(self.page, '<h5>Nazionalit&#xE0;:</h5>', '</div>')
+@@ -181,50 +181,30 @@ class Plugin(movie.Movie):
+         return data
+ 
+ class SearchPlugin(movie.SearchMovie):
+-    PATTERN = re.compile(r"""<A HREF=['"]/title/tt([0-9]+)/["']>(.*?)</LI>""")
+-    PATTERN2 = re.compile(r"""<a href=['"]/title/tt([0-9]+)/["'](.*?)</tr>""")
++    PATTERN = re.compile(r"""<a href=['"]/title/tt([0-9]+)/[^>]+[>](.*?)</td>""")
++    PATTERN_DIRECT = re.compile(r"""value="/title/tt([0-9]+)""")
+ 
+     def __init__(self):
+-        self.original_url_search   = 'http://italian.imdb.com/find?s=tt;q='
+-        self.translated_url_search = 'http://italian.imdb.com/find?s=tt;q='
+-        self.encode                = 'iso8859-1'
++        self.original_url_search   = 'http://www.imdb.it/find?s=tt&q='
++        self.translated_url_search = 'http://www.imdb.it/find?s=tt&q='
++        self.encode                = 'utf8'
+ 
+-    def search(self, parent_window):
++    def search(self,parent_window):
+         if not self.open_search(parent_window):
+             return None
+-        tmp_page = gutils.trim(self.page, 'Titoli popolari', '</table>')
+-        if not tmp_page:
+-            has_results = re.match('[(]Visualizza [1-9][0-7]* risultat[io]*[)]', self.page)
+-            if not has_results:
+-                # nothing or one result found, try another url which looks deeper in the imdb database
+-                # example: Adventures of Falcon -> one result, jumps directly to the movie page
+-                # which isn't supported by this plugin
+-                self.url = 'http://italian.imdb.com/find?more=tt;q='
+-                if not self.open_search(parent_window):
+-                    return None
+-            self.page = gutils.trim(self.page, '(Visualizza', '>Suggerimenti per migliorare i tuoi risultati<')
+-        else:
+-            self.page = tmp_page
+-        self.page = self.page.decode('iso-8859-1')
+-        # correction of all &#xxx entities
+-        self.page = gutils.convert_entities(self.page)
+         return self.page
+ 
+     def get_searches(self):
+-        elements = re.split('<LI>', self.page)
+-        if len(elements) < 2:
+-            elements = string.split(self.page, '<tr>')
+-            if len(elements):
+-                for element in elements[1:]:
+-                    match = self.PATTERN2.findall(element)
+-                    if len(match):
+-                        tmp = re.sub('^[0-9]+[.]', '', gutils.clean(gutils.after(match[0][1], '>')))
+-                        self.ids.append(match[0][0])
+-                        self.titles.append(tmp)
+-        else:
++        elements = string.split(self.page, '<tr')
++        if len(elements):
+             for element in elements[1:]:
+                 match = self.PATTERN.findall(element)
+-                if len(match):
+-                    tmp = gutils.clean(match[0][1])
+-                    self.ids.append(match[0][0])
++                if len(match) > 1:
++                    tmp = re.sub('^[0-9]+[.]', '', gutils.clean(match[1][1]))
++                    self.ids.append(match[1][0])
+                     self.titles.append(tmp)
++        if len(self.ids) < 2:
++            # try to find a direct result
++            match = self.PATTERN_DIRECT.findall(self.page)
++            if len(match) > 0:
++                self.ids.append(match[0])
+diff --git a/lib/plugins/movie/PluginMovieIMDB-pt.py b/lib/plugins/movie/PluginMovieIMDB-pt.py
+index de3cf7f..c86c33f 100644
+--- a/lib/plugins/movie/PluginMovieIMDB-pt.py
++++ b/lib/plugins/movie/PluginMovieIMDB-pt.py
+@@ -39,14 +39,14 @@ class Plugin(movie.Movie):
+     def __init__(self, id):
+         self.encode   ='iso-8859-1'
+         self.movie_id = id
+-        self.url      = "http://www.imdb.pt/title/" + str(self.movie_id)
++        self.url      = "http://www.imdb.pt/title/tt" + str(self.movie_id)
+ 
+     def initialize(self):
+         self.page = gutils.convert_entities(self.page)
+-	self.cast_page = self.open_page(url=self.url + '/fullcredits')
+-	self.cast_page = gutils.convert_entities(self.cast_page)
+-	self.plot_page = self.open_page(url=self.url + '/plotsummary')
+-	self.plot_page = gutils.convert_entities(self.plot_page)
++        self.cast_page = self.open_page(url=self.url + '/fullcredits')
++        self.cast_page = gutils.convert_entities(self.cast_page)
++        self.plot_page = self.open_page(url=self.url + '/plotsummary')
++        self.plot_page = gutils.convert_entities(self.plot_page)
+ 
+     def get_image(self):
+         self.image_url = gutils.trim(self.page, u'src="http://ia.media-imdb.com/images/', u'.jpg" /></a>')
+@@ -65,8 +65,8 @@ class Plugin(movie.Movie):
+         self.director = gutils.strip_tags(self.director)
+ 
+     def get_plot(self):
+-	self.plot = gutils.trim(self.plot_page, u'<div id="swiki.2.1">', u'</div>')
+-	self.plot = gutils.strip_tags(self.plot)
++        self.plot = gutils.trim(self.plot_page, u'<div id="swiki.2.1">', u'</div>')
++        self.plot = gutils.strip_tags(self.plot)
+         self.plot = self.plot.encode(self.encode)
+ 
+     def get_year(self):
+@@ -103,8 +103,8 @@ class Plugin(movie.Movie):
+ 
+     def get_studio(self):
+         self.studio = gutils.trim(self.page, u'<h5>Companhia :</h5><div class="info-content">', u'Exibir mais</a>')
+-	self.studio = gutils.strip_tags(self.studio)
+-	self.studio = self.studio.encode(self.encode)
++        self.studio = gutils.strip_tags(self.studio)
++        self.studio = self.studio.encode(self.encode)
+ 
+     def get_o_site(self):
+         self.o_site = ""
+@@ -125,11 +125,12 @@ class Plugin(movie.Movie):
+ 
+     def get_rating(self):
+         self.rating = gutils.trim(self.page, u'<div class="starbar-meta">', '/10')
+-    	self.rating = gutils.strip_tags(self.rating)
+-    	self.rating = string.replace(self.rating, ",", ".")
+-        self.rating = float(self.rating)
+-    	self.rating = round(self.rating)
+-	
++        self.rating = gutils.strip_tags(self.rating)
++        self.rating = string.replace(self.rating, ",", ".")
++        if self.rating:
++            self.rating = float(self.rating)
++            self.rating = round(self.rating)
++
+     def get_screenplay(self):
+         self.screenplay = ''
+         parts = re.split('<a href=', gutils.trim(self.cast_page, u'>Créditos como roteirista<', '</table>'))
+@@ -143,10 +144,10 @@ class Plugin(movie.Movie):
+                 self.screenplay = self.screenplay + screenplay + ', '
+             if len(self.screenplay) > 2:
+                 self.screenplay = self.screenplay[0:len(self.screenplay) - 2]
+-		
++
+     def get_cameraman(self):
+         self.cameraman = string.replace('<' + gutils.trim(self.cast_page, u'>Direção de Fotografia de<', '</table>'), u'(diretor de fotografia) ', '')
+-	
++
+     def __before_more(self, data):
+         for element in [u'>Exibir mais<', '>Full summary<', '>Full synopsis<']:
+             tmp = string.find(data, element)
+@@ -155,32 +156,26 @@ class Plugin(movie.Movie):
+         return data
+ 
+ class SearchPlugin(movie.SearchMovie):
++    PATTERN = re.compile(r"""<a href=['"]/title/tt([0-9]+)/[^>]+[>](.*?)</td>""")
++
+     def __init__(self):
+-        self.original_url_search   = 'http://www.imdb.pt/find?s=all&q='
+-        self.translated_url_search = 'http://www.imdb.pt/find?s=all&q='
+-        self.encode                = 'iso-8859-1'
++        self.original_url_search   = 'http://www.imdb.pt/find?s=tt&q='
++        self.translated_url_search = 'http://www.imdb.pt/find?s=tt&q='
++        self.encode                = 'utf8'
+ 
+     def search(self, parent_window):
+         """Perform the web search"""
+         if not self.open_search(parent_window):
+             return None
+-            self.sub_search()
+         return self.page
+ 
+-    def sub_search(self):
+-        """Isolating just a portion (with the data we want) of the results"""
+-        self.page = gutils.trim(self.page, \
+-            "Resultado)<table>", "<p><b>Nomes (Coincid")
+-
+     def get_searches(self):
+         """Try to find both id and film title for each search result"""
+-        elements = string.split(self.page, 'height="6"><br><a href="')
+-        self.number_results = elements[-1]
+-
+-        if (len(elements[0])):
+-            for element in elements:
+-                self.ids.append(gutils.trim(element, "title/", '/" onclick="'))
+-                self.titles.append(gutils.convert_entities \
+-                    (gutils.trim(element, """/';">""", "</a> ")))
+-        else:
+-            self.number_results = 0
+\ No newline at end of file
++        elements = string.split(self.page, '<tr')
++        if len(elements):
++            for element in elements[1:]:
++                match = self.PATTERN.findall(element)
++                if len(match) > 1:
++                    tmp = re.sub('^[0-9]+[.]', '', gutils.clean(match[1][1]))
++                    self.ids.append(match[1][0])
++                    self.titles.append(tmp)
+\ No newline at end of file
+diff --git a/lib/plugins/movie/PluginMovieIMDB.py b/lib/plugins/movie/PluginMovieIMDB.py
+index ed49591..3832528 100644
+--- a/lib/plugins/movie/PluginMovieIMDB.py
++++ b/lib/plugins/movie/PluginMovieIMDB.py
+@@ -1,8 +1,8 @@
+ # -*- coding: UTF-8 -*-
+ 
+-__revision__ = '$Id: PluginMovieIMDB.py 1605 2011-12-18 22:35:25Z piotrek $'
++__revision__ = '$Id$'
+ 
+-# Copyright (c) 2005-2011 Vasco Nunes, Piotr Ożarowski
++# Copyright (c) 2005-2013 Vasco Nunes, Piotr Ożarowski
+ #
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -21,22 +21,26 @@ __revision__ = '$Id: PluginMovieIMDB.py 1605 2011-12-18 22:35:25Z piotrek $'
+ # You may use and distribute this software under the terms of the
+ # GNU General Public License, version 2 or later
+ 
+-import gutils, movie
+-import string, re
++import gutils
++import movie
++import string
++import re
+ 
+-plugin_name         = 'IMDb'
+-plugin_description  = 'Internet Movie Database'
+-plugin_url          = 'www.imdb.com'
+-plugin_language     = _('English')
+-plugin_author       = 'Vasco Nunes, Piotr Ożarowski'
++plugin_name = 'IMDb'
++plugin_description = 'Internet Movie Database'
++plugin_url = 'www.imdb.com'
++plugin_language = _('English')
++plugin_author = 'Vasco Nunes, Piotr Ożarowski'
+ plugin_author_email = 'griffith@××××××××.cc'
+-plugin_version      = '1.12'
++plugin_version = '1.15'
++
+ 
+ class Plugin(movie.Movie):
+-    def __init__(self, id):
+-        self.encode   = 'iso8859-1'
+-        self.movie_id = id
+-        self.url      = "http://imdb.com/title/tt%s" % self.movie_id
++
++    def __init__(self, movie_id):
++        self.encode = 'utf-8'
++        self.movie_id = movie_id
++        self.url = "http://imdb.com/title/tt%s" % self.movie_id
+ 
+     def initialize(self):
+         self.cast_page = self.open_page(url=self.url + '/fullcredits')
+@@ -49,11 +53,12 @@ class Plugin(movie.Movie):
+         self.image_url = gutils.trim(tmp, 'src="', '"')
+ 
+     def get_o_title(self):
+-        self.o_title = gutils.regextrim(self.page, 'class="title-extra">', '<')
++        self.o_title = gutils.regextrim(self.page, 'class="title-extra"[^>]*>', '<')
+         if not self.o_title:
+             self.o_title = gutils.regextrim(self.page, '<h1>', '([ ]|[&][#][0-9]+[;])<span')
+         if not self.o_title:
+             self.o_title = re.sub(' [(].*', '', gutils.trim(self.page, '<title>', '</title>'))
++        self.o_title = re.sub('"', '', self.o_title)
+ 
+     def get_title(self):    # same as get_o_title()
+         self.title = gutils.regextrim(self.page, '<h1>', '([ ]|[&][#][0-9]+[;])<span')
+@@ -62,46 +67,55 @@ class Plugin(movie.Movie):
+ 
+     def get_director(self):
+         self.director = ''
+-        parts = re.split('<a href=', gutils.trim(self.cast_page, '>Directed by<', '</table>'))
++        parts = re.split('<a href=', gutils.trim(self.cast_page, '>Directed by', '</table>'))
+         if len(parts) > 1:
+             for part in parts[1:]:
+-                director = gutils.trim(part, '>', '<')
++                director = string.strip(string.replace(gutils.trim(part, '>', '<'), '\n', ''))
+                 self.director = self.director + director + ', '
+             self.director = self.director[0:len(self.director) - 2]
+ 
+     def get_plot(self):
+-        self.plot = gutils.regextrim(self.page, '<h5>Plot:</h5>', '(</div>|<a href.*)')
+-        self.plot = self.__before_more(self.plot)
++        self.plot = gutils.regextrim(self.page, 'itemprop="description"', '<')
++        self.plot = gutils.after(self.plot, '>')
+         elements = string.split(self.plot_page, '<p class="plotpar">')
++        if len(elements) < 2:
++            elements = re.split('<li class="(?:odd|even)">', self.plot_page)
+         if len(elements) > 1:
+             self.plot = self.plot + '\n\n'
+             elements[0] = ''
+-            for element in elements:
+-                if element <> '':
+-                    self.plot = self.plot + gutils.strip_tags(gutils.before(element, '</a>')) + '\n\n'
++            for element in elements[1:]:
++                if element != '':
++                    self.plot += gutils.strip_tags(gutils.before(element, '</a>')) + '\n\n'
+ 
+     def get_year(self):
+         self.year = gutils.trim(self.page, '<a href="/year/', '</a>')
+-        self.year = gutils.after(self.year, '">')
++        self.year = gutils.after(self.year, '>')
++        if not self.year:
++            tmp = gutils.trim(self.page, '<title>', '</title>')
++            tmp = re.search('([0-9]{4})[)]', tmp)
++            if tmp:
++                self.year = tmp.group(0)
+ 
+     def get_runtime(self):
+         self.runtime = gutils.regextrim(self.page, 'Runtime:<[^>]+>', ' min')
+ 
+     def get_genre(self):
+-        self.genre = gutils.regextrim(self.page, 'Genre[s]*:<[^>]+>', '</div>')
++        self.genre = string.replace(gutils.regextrim(self.page, 'Genre[s]*:<[^>]+>', '</div>'), '\n', '')
+         self.genre = self.__before_more(self.genre)
+ 
+     def get_cast(self):
+         self.cast = ''
+-        self.cast = gutils.trim(self.cast_page, '<table class="cast">', '</table>')
++        self.cast = gutils.trim(self.cast_page, '<table class="cast_list">', '</table>')
+         if self.cast == '':
+             self.cast = gutils.trim(self.page, '<table class="cast">', '</table>')
+         self.cast = string.replace(self.cast, ' ... ', _(' as '))
+         self.cast = string.replace(self.cast, '...', _(' as '))
+-        self.cast = string.replace(self.cast, '</tr><tr>', "\n")
+-        self.cast = re.sub('</tr>[ \t]*<tr[ \t]*class="even">', "\n", self.cast)
+-        self.cast = re.sub('</tr>[ \t]*<tr[ \t]*class="odd">', "\n", self.cast)
++        self.cast = string.replace(self.cast, "\n", '')
++        self.cast = string.replace(self.cast, '</tr>', "\n")
+         self.cast = self.__before_more(self.cast)
++        self.cast = gutils.clean(self.cast)
++        self.cast = re.sub('[ \t]+', ' ', self.cast)
++        self.cast = re.sub(' \n ', '\n', self.cast)
+ 
+     def get_classification(self):
+         self.classification = gutils.trim(self.page, '(<a href="/mpaa">MPAA</a>)', '</div>')
+@@ -109,14 +123,15 @@ class Plugin(movie.Movie):
+ 
+     def get_studio(self):
+         self.studio = ''
+-        tmp = gutils.regextrim(self.comp_page, 'Production Companies<[^>]+', '</ul>')
++        tmp = gutils.regextrim(self.comp_page, 'name="production"', '</ul>')
+         tmp = string.split(tmp, 'href="')
+-        for entry in tmp:
+-            entry = gutils.trim(entry, '>', '<')
+-            if entry:
+-                self.studio = self.studio + entry + ', '
+-        if self.studio:
+-            self.studio = self.studio[:-2]
++        if len(tmp) > 1:
++            for entry in tmp[1:]:
++                entry = string.strip(string.replace(gutils.trim(entry, '>', '<'), '\n', ''))
++                if entry:
++                    self.studio = self.studio + entry + ', '
++            if self.studio:
++                self.studio = self.studio[:-2]
+ 
+     def get_o_site(self):
+         self.o_site = ''
+@@ -129,7 +144,7 @@ class Plugin(movie.Movie):
+ 
+     def get_country(self):
+         self.country = '<' + gutils.trim(self.page, 'Country:<', '</div>')
+-        self.country = re.sub('[\n]+', '', self.country)
++        self.country = re.sub('[ ]+', ' ', re.sub('[\n]+', '', self.country))
+ 
+     def get_rating(self):
+         pattern = re.compile('>([0-9]([.][0-9])*)(<[^>]+>)+[/](<[^>]+>)[0-9][0-9]<')
+@@ -139,7 +154,7 @@ class Plugin(movie.Movie):
+             if self.rating:
+                 try:
+                     self.rating = round(float(self.rating), 0)
+-                except Exception, e:
++                except Exception:
+                     self.rating = 0
+         else:
+             self.rating = 0
+@@ -161,32 +176,29 @@ class Plugin(movie.Movie):
+         sound = re.sub('[\n]+', '', sound)
+         sound = re.sub('[ ]+', ' ', sound)
+         sound = sound.strip()
+-        tagline = gutils.regextrim(self.tagl_page, 'Taglines for', 'Related Links')
+-        index = string.rfind(tagline, '</div>')
+-        if index > -1:
+-            taglines = string.split(tagline[index:], '<hr')
+-            tagline = ''
+-            for entry in taglines:
+-                entry = gutils.clean(gutils.after(entry, '>'))
++        tagline = gutils.regextrim(self.tagl_page, '>Taglines', '>See also')
++        taglines = re.split('<div[^>]+class="soda[^>]*>', tagline)
++        tagline = ''
++        if len(taglines) > 1:
++            for entry in taglines[1:]:
++                entry = gutils.clean(gutils.before(entry, '</div>'))
+                 if entry:
+                     tagline = tagline + entry + '\n'
+-        else:
+-            tagline = ''
+-        if len(language)>0:
+-            self.notes = "%s: %s\n" %(_('Language'), language)
+-        if len(sound)>0:
+-            self.notes += "%s: %s\n" %(gutils.strip_tags(_('<b>Audio</b>')), sound)
+-        if len(color)>0:
+-            self.notes += "%s: %s\n" %(_('Color'), color)
+-        if len(tagline)>0:
+-            self.notes += "%s: %s\n" %('Tagline', tagline)
++        if len(language) > 0:
++            self.notes = "%s: %s\n" % (_('Language'), language)
++        if len(sound) > 0:
++            self.notes += "%s: %s\n" % (gutils.strip_tags(_('<b>Audio</b>')), sound)
++        if len(color) > 0:
++            self.notes += "%s: %s\n" % (_('Color'), color)
++        if len(tagline) > 0:
++            self.notes += "%s: %s\n" % ('Tagline', tagline)
+ 
+     def get_screenplay(self):
+         self.screenplay = ''
+-        parts = re.split('<a href=', gutils.trim(self.cast_page, '>Writing credits<', '</table>'))
++        parts = re.split('<a href=', gutils.trim(self.cast_page, '>Writing Credits', '</table>'))
+         if len(parts) > 1:
+             for part in parts[1:]:
+-                screenplay = gutils.trim(part, '>', '<')
++                screenplay = string.strip(string.replace(gutils.trim(part, '>', '<'), '\n', ''))
+                 if screenplay == 'WGA':
+                     continue
+                 screenplay = screenplay.replace(' (written by)', '')
+@@ -194,28 +206,31 @@ class Plugin(movie.Movie):
+                 self.screenplay = self.screenplay + screenplay + ', '
+             if len(self.screenplay) > 2:
+                 self.screenplay = self.screenplay[0:len(self.screenplay) - 2]
++                self.screenplay = re.sub('[ \t]+', ' ', self.screenplay)
+ 
+     def get_cameraman(self):
+         self.cameraman = ''
+-        tmp = gutils.regextrim(self.cast_page, 'Cinematography by<[^>]+', '</table>')
++        tmp = gutils.regextrim(self.cast_page, '>Cinematography by', '</table>')
+         tmp = string.split(tmp, 'href="')
+-        for entry in tmp:
+-            entry = gutils.trim(entry, '>', '<')
+-            if entry:
+-                self.cameraman = self.cameraman + entry + ', '
+-        if self.cameraman:
+-            self.cameraman = self.cameraman[:-2]
++        if len(tmp) > 1:
++            for entry in tmp[1:]:
++                entry = string.strip(string.replace(gutils.trim(entry, '>', '<'), '\n', ''))
++                if entry:
++                    self.cameraman = self.cameraman + entry + ', '
++            if self.cameraman:
++                self.cameraman = self.cameraman[:-2]
+ 
+     def __before_more(self, data):
+         for element in ['>See more<', '>more<', '>Full summary<', '>Full synopsis<']:
+             tmp = string.find(data, element)
+-            if tmp>0:
++            if tmp > 0:
+                 data = data[:tmp] + '>'
+         return data
+ 
++
+ class SearchPlugin(movie.SearchMovie):
+-    PATTERN = re.compile(r"""<A HREF=['"]/title/tt([0-9]+)/["']>(.*?)</LI>""")
+-    PATTERN2 = re.compile(r"""<a href=['"]/title/tt([0-9]+)/["'](.*?)</tr>""")
++    PATTERN = re.compile(r"""<a href=['"]/title/tt([0-9]+)/[^>]+[>](.*?)</td>""")
++    PATTERN_DIRECT = re.compile(r"""value="/title/tt([0-9]+)""")
+ 
+     def __init__(self):
+         # http://www.imdb.com/List?words=
+@@ -225,49 +240,35 @@ class SearchPlugin(movie.SearchMovie):
+         # finds a whole bunch of results. if you look for "Rocky" you will get 903 results.
+         # http://www.imdb.com/find?s=tt;q=
+         # seems to give the best results. 88 results for "Rocky", popular titles first.
+-        self.original_url_search   = 'http://www.imdb.com/find?s=tt;q='
+-        self.translated_url_search = 'http://www.imdb.com/find?s=tt;q='
+-        self.encode                = 'iso8859-1'
++        self.original_url_search = 'http://www.imdb.com/find?s=tt&q='
++        self.translated_url_search = 'http://www.imdb.com/find?s=tt&q='
++        self.encode = 'utf8'
+ 
+-    def search(self,parent_window):
++    def search(self, parent_window):
+         if not self.open_search(parent_window):
+             return None
+-        tmp_page = gutils.trim(self.page, 'Here are the', '</TABLE>')
+-        if not tmp_page:
+-            has_results = re.match('[(]Displaying [1-9][0-7]* Result[s]*[)]', self.page)
+-            if not has_results:
+-                # nothing or one result found, try another url which looks deeper in the imdb database
+-                # example: Adventures of Falcon -> one result, jumps directly to the movie page
+-                # which isn't supported by this plugin
+-                self.url = 'http://www.imdb.com/find?more=tt;q='
+-                if not self.open_search(parent_window):
+-                    return None
+-            self.page = gutils.trim(self.page, '(Displaying', '>Suggestions For Improving Your Results<')
+-        else:
+-            self.page = tmp_page
+-        self.page = self.page.decode('iso-8859-1')
+-        # correction of all &#xxx entities
+-        self.page = gutils.convert_entities(self.page)
+         return self.page
+ 
+     def get_searches(self):
+-        elements = re.split('<LI>', self.page)
+-        if len(elements) < 2:
+-            elements = string.split(self.page, '<tr>')
+-            if len(elements):
+-                for element in elements[1:]:
+-                    match = self.PATTERN2.findall(element)
+-                    if len(match):
+-                        tmp = re.sub('^[0-9]+[.]', '', gutils.clean(gutils.after(match[0][1], '>')))
+-                        self.ids.append(match[0][0])
+-                        self.titles.append(tmp)
+-        else:
++        elements = string.split(self.page, '<tr')
++        if len(elements):
+             for element in elements[1:]:
+                 match = self.PATTERN.findall(element)
+-                if len(match):
+-                    tmp = gutils.clean(match[0][1])
+-                    self.ids.append(match[0][0])
++                if len(match) > 1:
++                    tmp = re.sub('^[0-9]+[.]', '', gutils.clean(match[1][1]))
++                    self.ids.append(match[1][0])
+                     self.titles.append(tmp)
++        if len(self.ids) < 2:
++            # try to find a direct result
++            match = self.PATTERN_DIRECT.findall(self.page)
++            if len(match) > 0:
++                self.ids.append(match[0])
++            else:
++                # try to look for IMDb id directly
++                if len(self.title) == 7 and re.match('[0-9]+', self.title):
++                    self.ids.append(self.title)
++
++
+ #
+ # Plugin Test
+ #
+@@ -277,11 +278,12 @@ class SearchPluginTest(SearchPlugin):
+     # dict { movie_id -> [ expected result count for original url, expected result count for translated url ] }
+     #
+     test_configuration = {
+-        'Rocky Balboa'         : [ 25, 25 ],
+-        'Ein glückliches Jahr' : [ 47, 47 ]
++        'Rocky Balboa': [8, 8],
++        'Ein glückliches Jahr': [2, 2]
+     }
+ 
+-class PluginTest:
++
++class PluginTest(object):
+     #
+     # Configuration for automated tests:
+     # dict { movie_id -> dict { arribute -> value } }
+@@ -290,85 +292,29 @@ class PluginTest:
+     #        * or the expected value
+     #
+     test_configuration = {
+-        '0138097' : {
+-            'title'             : 'Shakespeare in Love',
+-            'o_title'           : 'Shakespeare in Love',
+-            'director'          : 'John Madden',
+-            'plot'              : True,
+-            'cast'              : 'Geoffrey Rush' + _(' as ') + 'Philip Henslowe\n\
+-Tom Wilkinson' + _(' as ') + 'Hugh Fennyman\n\
+-Steven O\'Donnell' + _(' as ') + 'Lambert\n\
+-Tim McMullan' + _(' as ') + 'Frees (as Tim McMullen)\n\
+-Joseph Fiennes' + _(' as ') + 'Will Shakespeare\n\
+-Steven Beard' + _(' as ') + 'Makepeace - the Preacher\n\
+-Antony Sher' + _(' as ') + 'Dr. Moth\n\
+-Patrick Barlow' + _(' as ') + 'Will Kempe\n\
+-Martin Clunes' + _(' as ') + 'Richard Burbage\n\
+-Sandra Reinton' + _(' as ') + 'Rosaline\n\
+-Simon Callow' + _(' as ') + 'Tilney - Master of the Revels\n\
+-Judi Dench' + _(' as ') + 'Queen Elizabeth\n\
+-Bridget McConnell' + _(' as ') + 'Lady in Waiting (as Bridget McConnel)\n\
+-Georgie Glen' + _(' as ') + 'Lady in Waiting\n\
+-Nicholas Boulton' + _(' as ') + 'Henry Condell\n\
+-Gwyneth Paltrow' + _(' as ') + 'Viola De Lesseps\n\
+-Imelda Staunton' + _(' as ') + 'Nurse\n\
+-Colin Firth' + _(' as ') + 'Lord Wessex\n\
+-Desmond McNamara' + _(' as ') + 'Crier\n\
+-Barnaby Kay' + _(' as ') + 'Nol\n\
+-Jim Carter' + _(' as ') + 'Ralph Bashford\n\
+-Paul Bigley' + _(' as ') + 'Peter - the Stage Manager\n\
+-Jason Round' + _(' as ') + 'Actor in Tavern\n\
+-Rupert Farley' + _(' as ') + 'Barman\n\
+-Adam Barker' + _(' as ') + 'First Auditionee\n\
+-Joe Roberts' + _(' as ') + 'John Webster\n\
+-Harry Gostelow' + _(' as ') + 'Second Auditionee\n\
+-Alan Cody' + _(' as ') + 'Third Auditionee\n\
+-Mark Williams' + _(' as ') + 'Wabash\n\
+-David Curtiz' + _(' as ') + 'John Hemmings\n\
+-Gregor Truter' + _(' as ') + 'James Hemmings\n\
+-Simon Day' + _(' as ') + 'First Boatman\n\
+-Jill Baker' + _(' as ') + 'Lady De Lesseps\n\
+-Amber Glossop' + _(' as ') + 'Scullery Maid\n\
+-Robin Davies' + _(' as ') + 'Master Plum\n\
+-Hywel Simons' + _(' as ') + 'Servant\n\
+-Nicholas Le Prevost' + _(' as ') + 'Sir Robert De Lesseps\n\
+-Ben Affleck' + _(' as ') + 'Ned Alleyn\n\
+-Timothy Kightley' + _(' as ') + 'Edward Pope\n\
+-Mark Saban' + _(' as ') + 'Augustine Philips\n\
+-Bob Barrett' + _(' as ') + 'George Bryan\n\
+-Roger Morlidge' + _(' as ') + 'James Armitage\n\
+-Daniel Brocklebank' + _(' as ') + 'Sam Gosse\n\
+-Roger Frost' + _(' as ') + 'Second Boatman\n\
+-Rebecca Charles' + _(' as ') + 'Chambermaid\n\
+-Richard Gold' + _(' as ') + 'Lord in Waiting\n\
+-Rachel Clarke' + _(' as ') + 'First Whore\n\
+-Lucy Speed' + _(' as ') + 'Second Whore\n\
+-Patricia Potter' + _(' as ') + 'Third Whore\n\
+-John Ramm' + _(' as ') + 'Makepeace\'s Neighbor\n\
+-Martin Neely' + _(' as ') + 'Paris / Lady Montague (as Martin Neeley)\n\
+-The Choir of St. George\'s School in Windsor' + _(' as ') + 'Choir (as The Choir of St. George\'s School, Windsor) rest of cast listed alphabetically:\n\
+-Jason Canning' + _(' as ') + 'Nobleman (uncredited)\n\
+-Kelley Costigan' + _(' as ') + 'Theatregoer (uncredited)\n\
+-Rupert Everett' + _(' as ') + 'Christopher Marlowe (uncredited)\n\
+-John Inman' + _(' as ') + 'Character player (uncredited)',
+-            'country'           : 'USA | UK',
+-            'genre'             : 'Comedy | Drama | Romance',
+-            'classification'    : 'R',
+-            'studio'            : 'Universal Pictures, Miramax Films, Bedford Falls Productions',
+-            'o_site'            : False,
+-            'site'              : 'http://www.imdb.com/title/tt0138097',
+-            'trailer'           : 'http://www.imdb.com/title/tt0138097/trailers',
+-            'year'              : 1998,
+-            'notes'             : _('Language') + ': English\n'\
+-+ _('Audio') + ': Dolby Digital\n'\
+-+ _('Color') + ': Color\n\
++        '0138097': {
++            'title': 'Shakespeare in Love',
++            'o_title': 'Shakespeare in Love',
++            'director': 'John Madden',
++            'plot': True,
++            'country': 'USA',
++            'genre': 'Comedy | Drama | Romance',
++            'classification': False,
++            'studio': 'Universal Pictures, Miramax Films, Bedford Falls Productions',
++            'o_site': False,
++            'site': 'http://www.imdb.com/title/tt0138097',
++            'trailer': 'http://www.imdb.com/title/tt0138097/trailers',
++            'year': 1998,
++            'notes': _('Language') + ': English\n' \
++                     + _('Audio') + ': Dolby Digital\n' \
++                     + _('Color') + ': Color\n\
+ Tagline: ...A Comedy About the Greatest Love Story Almost Never Told...\n\
+ Love is the only inspiration',
+-            'runtime'           : 123,
+-            'image'             : True,
+-            'rating'            : 7,
+-            'screenplay'        : 'Marc Norman, Tom Stoppard',
+-            'cameraman'         : 'Richard Greatrex',
+-            'barcode'           : False
++            'runtime': 123,
++            'image': True,
++            'rating': 7,
++            'screenplay': 'Marc Norman, Tom Stoppard',
++            'cameraman': 'Richard Greatrex',
++            'barcode': False
+         },
+     }
+diff --git a/lib/plugins/movie/PluginMovieKinoDe.py b/lib/plugins/movie/PluginMovieKinoDe.py
+index 315b406..c492d78 100644
+--- a/lib/plugins/movie/PluginMovieKinoDe.py
++++ b/lib/plugins/movie/PluginMovieKinoDe.py
+@@ -1,6 +1,6 @@
+ # -*- coding: UTF-8 -*-
+ 
+-__revision__ = '$Id: PluginMovieKinoDe.py 1599 2011-12-02 19:52:02Z mikej06 $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2006-2011
+ #
+@@ -67,33 +67,34 @@ class Plugin(movie.Movie):
+             self.videopage = None
+ 
+     def get_image(self):
+-        self.image_url = ''
+-        tmpdata = gutils.regextrim(self.page, '<div class="cover-area">', '</div>')
+-        if tmpdata:
+-            # video page
+-            tmpdata = re.search('(http[:][/][/][^/]+[/]flbilder[/][^"\']+)', tmpdata)
+-            if tmpdata:
+-                self.image_url = tmpdata.group(1)
+-        else:
+-            # kino page
+-            tmpdata = gutils.before(self.page, '<span style="line-height: 15px;">')
+-            if tmpdata:
+-                tmpparts = re.split('http://images.kino.de/s/', tmpdata)
+-                if len(tmpparts) > 2:
+-                    self.image_url = 'http://images.kino.de/s/' + gutils.before(tmpparts[2], '"')
+-                elif len(tmpparts) > 1:
+-                    self.image_url = 'http://images.kino.de/s/' + gutils.before(tmpparts[1], '"')
+-        if not self.image_url and self.videopage:
+-            tmpdata = gutils.regextrim(self.videopage, '<div class="cover-area">', '</div>')
++        self.image_url = string.replace(string.replace(gutils.trim(self.page, '"picture":', ','), '"', ''), '\\', '')
++        if not self.image_url:
++            tmpdata = gutils.regextrim(self.page, '<div class="cover-area">', '</div>')
+             if tmpdata:
+                 # video page
+                 tmpdata = re.search('(http[:][/][/][^/]+[/]flbilder[/][^"\']+)', tmpdata)
+                 if tmpdata:
+                     self.image_url = tmpdata.group(1)
++            else:
++                # kino page
++                tmpdata = gutils.before(self.page, '<span style="line-height: 15px;">')
++                if tmpdata:
++                    tmpparts = re.split('http://images.kino.de/s/', tmpdata)
++                    if len(tmpparts) > 2:
++                        self.image_url = 'http://images.kino.de/s/' + gutils.before(tmpparts[2], '"')
++                    elif len(tmpparts) > 1:
++                        self.image_url = 'http://images.kino.de/s/' + gutils.before(tmpparts[1], '"')
++            if not self.image_url and self.videopage:
++                tmpdata = gutils.regextrim(self.videopage, '<div class="cover-area">', '</div>')
++                if tmpdata:
++                    # video page
++                    tmpdata = re.search('(http[:][/][/][^/]+[/]flbilder[/][^"\']+)', tmpdata)
++                    if tmpdata:
++                        self.image_url = tmpdata.group(1)
+ 
+ 
+     def get_o_title(self):
+-        self.o_title = gutils.trim(self.page, '<p>Originaltitel: ', '</p>')
++        self.o_title = gutils.regextrim(self.page, '(<p>Originaltitel[:] |Originaltitel<[^>]+>)', '(</tr>|</p>)')
+         if not self.o_title:
+             self.o_title = gutils.trim(self.page, '<h1(', ')')
+             if not self.o_title:
+@@ -102,23 +103,23 @@ class Plugin(movie.Movie):
+                     if self.videopage:
+                         self.o_title = gutils.trim(self.videopage, '<p>Originaltitel: ', '</p>')
+                     if not self.o_title:
+-                        self.o_title = gutils.regextrim(self.page, '<h1>', '</h1>')
++                        self.o_title = gutils.regextrim(self.page, '<h1>', '(</h1>|</span>)')
+ 
+     def get_title(self):
+         self.title = gutils.trim(self.page, '<div class="teaser">', '</')
+         if not self.title:
+-            self.title = gutils.regextrim(self.page, '<h1>', '</h1>')
++            self.title = gutils.regextrim(self.page, '<h1>', '(</h1>|</span>)')
+ 
+     def get_director(self):
+         self.director = gutils.trim(self.page, '<th>Regie:', '<th>')
+         if not self.director:
+-            self.director = gutils.trim(self.creditspage, 'Regie&nbsp;', '</tr>')
++            self.director = gutils.trim(self.creditspage, 'Regie:', '</li>')
+ 
+     def get_plot(self):
+         self.plot = gutils.trim(self.page, '<div class="yui-content">', '<div class="footer">')
+         if not self.plot:
+             # kino page
+-            self.plot = gutils.trim(self.page, '<span style="line-height: 15px;">', '<table')
++            self.plot = gutils.after(gutils.trim(self.page, 'Filmhandlung & Hintergrund', '</div>'), '</h2>')
+         if not self.plot and self.videopage:
+             self.plot = gutils.trim(self.videopage, '<div class="yui-content">', '<div class="footer">')
+         if self.plot:
+@@ -140,11 +141,15 @@ class Plugin(movie.Movie):
+ 
+     def get_year(self):
+         self.year = ''
+-        tmp = gutils.trim(self.page, '<div class="description">', '</div>')
++        tmp = gutils.trim(gutils.trim(self.page, '"releaseDate":', ','), ':"', '"')
+         if tmp:
+-            searchyearandcountry = re.search('([0-9]{4})<br', tmp)
+-            if searchyearandcountry:
+-                self.year = searchyearandcountry.group(1)
++            self.year = tmp
++        else:
++            tmp = gutils.trim(self.page, '<div class="description">', '</div>')
++            if tmp:
++                searchyearandcountry = re.search('([0-9]{4})<br', tmp)
++                if searchyearandcountry:
++                    self.year = searchyearandcountry.group(1)
+         if not self.year:
+             tmp = gutils.trim(self.page, '<span class="standardsmall"><strong>', '<br')
+             if tmp:
+@@ -161,21 +166,24 @@ class Plugin(movie.Movie):
+                     self.year = searchyearandcountry.group(1)
+ 
+     def get_runtime(self):
+-        self.runtime = ''
+-        srchresult = re.search('Laufzeit: ([0-9]+)[ \t]Min[.]<', self.page)
+-        if srchresult <> None:
+-            self.runtime = srchresult.group(1)
++        self.runtime = gutils.trim(self.page, '"runtime":', ',')
+         if not self.runtime:
+-            srchresult = re.search('>([0-9]+)[ \t]Min[.]<', self.page)
+-            if srchresult <> None:
+-                self.runtime = srchresult.group(1)
+-        if not self.runtime and self.videopage:
+-            srchresult = re.search('Laufzeit: ([0-9]+)[ \t]Min[.]<', self.videopage)
++            srchresult = re.search('Laufzeit: ([0-9]+)[ \t]Min[.]<', self.page)
+             if srchresult <> None:
+                 self.runtime = srchresult.group(1)
++            if not self.runtime:
++                srchresult = re.search('>([0-9]+)[ \t]Min[.]<', self.page)
++                if srchresult <> None:
++                    self.runtime = srchresult.group(1)
++            if not self.runtime and self.videopage:
++                srchresult = re.search('Laufzeit: ([0-9]+)[ \t]Min[.]<', self.videopage)
++                if srchresult <> None:
++                    self.runtime = srchresult.group(1)
+ 
+     def get_genre(self):
+-        self.genre = gutils.trim(self.page,'<p class="genre">', '</p>')
++        self.genre = string.replace(gutils.trim(self.page, '"genre":', ','), '"', '')
++        if not self.genre:
++            self.genre = gutils.trim(self.page,'<p class="genre">', '</p>')
+         if not self.genre:
+             self.genre = gutils.trim(self.page, 'title="Zur Genreliste: Drama">', '<')
+         if not self.genre and self.videopage:
+@@ -195,19 +203,20 @@ class Plugin(movie.Movie):
+                     else:
+                         self.cast = self.cast + name + '\n'
+         if not self.cast:
+-            tmp = gutils.trim(self.creditspage, '>Cast<br />', '>Crew<')
+-            if tmp:
+-                castparts = re.split('width="50%"><a href="/star/', tmp)
+-                for index in range(1, len(castparts), 1):
+-                    role = gutils.clean(gutils.trim(castparts[index - 1], 'width="50%">', '</td>'))
+-                    name = gutils.clean(gutils.trim(castparts[index], '">', '<'))
+-                    if role:
+-                        self.cast = self.cast + name + _(' as ') + role + '\n'
+-                    else:
+-                        self.cast = self.cast + name + '\n'
++            elements = re.split('<h3>Darsteller</h3>', self.page)
++            for element in elements[1:]:
++                actor = gutils.trim(element, 'itemprop="name">', '<')
++                if actor:
++                    self.cast = self.cast + actor
++                    role = gutils.trim(element, 'itemprop="title">', '<')
++                    if role and role <> 'Darsteller':
++                        self.cast = self.cast + _(' as ') + role
++                    self.cast = self.cast + '\n'
+ 
+     def get_classification(self):
+-        self.classification = gutils.regextrim(self.page, 'FSK: ', '<')
++        self.classification = string.replace(gutils.trim(self.page, '"fsk":', ','), '"', '')
++        if not self.classification:
++            self.classification = gutils.regextrim(self.page, 'FSK: ', '<')
+         if not self.classification and self.videopage:
+             self.classification = gutils.regextrim(self.videopage, 'FSK: ', '<')
+ 
+@@ -220,6 +229,8 @@ class Plugin(movie.Movie):
+                 self.studio = string.replace(gutils.after(tmp, '<br/>'), 'Verleih: ', '')
+         if not self.studio:
+             self.studio = gutils.trim(self.page, 'Verleih: ', '<')
++        if not self.studio:
++            self.studio = gutils.trim(self.page, 'Verleih:', '</li>')
+         if not self.studio and self.videopage:
+             tmp = gutils.trim(self.videopage, '<div class="description">', '</div>')
+             if tmp:
+@@ -258,6 +269,8 @@ class Plugin(movie.Movie):
+                 tmp = gutils.trim(tmp, '<strong>', '</strong>')
+                 if tmp:
+                     self.country = gutils.before(tmp, ' ')
++        if not self.country:
++            self.country = gutils.trim(self.page, 'itemprop="contentLocation">', '<')
+         if not self.country and self.videopage:
+             tmp = gutils.trim(self.videopage, '<div class="description">', '</div>')
+             if tmp:
+@@ -298,11 +311,23 @@ class Plugin(movie.Movie):
+         self.screenplay = gutils.regextrim(self.page, '<th>Buch:', '<th>')
+         if not self.screenplay:
+             self.screenplay= gutils.trim(self.creditspage, 'Drehbuch:&nbsp;', '</tr>')
++        if not self.screenplay:
++            elements = re.split('<h3>Drehbuch</h3>', self.page)
++            delimiter = ''
++            for element in elements[1:]:
++                self.screenplay = self.screenplay + delimiter + gutils.trim(element, 'itemprop="name">', '<')
++                delimiter = ', '
+ 
+     def get_cameraman(self):
+         self.cameraman = gutils.regextrim(self.page, '<th>Kamera:', '(<th>|</table>)')
+         if not self.cameraman:
+             self.cameraman= gutils.trim(self.creditspage, 'Kamera&nbsp;', '</tr>')
++        if not self.cameraman:
++            elements = re.split('"function-title">Kamera</span>', self.page)
++            delimiter = ''
++            for element in elements[1:]:
++                self.cameraman = self.cameraman + delimiter + gutils.trim(element, 'itemprop="name">', '<')
++                delimiter = ', '
+ 
+ class SearchPlugin(movie.SearchMovie):
+ 
+@@ -340,7 +365,7 @@ class SearchPlugin(movie.SearchMovie):
+         for element in elements2:
+             if element <> None:
+                 title = gutils.clean(gutils.trim(element,'>','</a>')) + string.replace(' (' +
+-                            gutils.clean(gutils.trim(element, '<p>', "<br />")) + ')', '()', '')
++                            gutils.clean(gutils.trim(gutils.before(element, '</li>'), '<p>', "<br />")) + ')', '()', '')
+                 if title != ' ':
+                     id = re.sub('[?].*', '', gutils.before(element,'"'))
+                     self.ids.append("V_" + id)
+@@ -364,7 +389,7 @@ class SearchPluginTest(SearchPlugin):
+     # dict { movie_id -> [ expected result count for original url, expected result count for translated url ] }
+     #
+     test_configuration = {
+-        'Rocky Balboa'         : [ 9, 9 ],
++        'Rocky Balboa'         : [ 10, 10 ],
+         'Arahan'               : [ 10, 10 ],
+         'Ein glückliches Jahr' : [ 4, 4 ]
+     }
+@@ -393,12 +418,12 @@ Tony Burton' + _(' as ') + 'Duke\n\
+ A.J. Benza' + _(' as ') + 'L.C.',
+             'country'             : 'USA',
+             'genre'               : 'Drama',
+-            'classification'      : 'ab 12 Jahre',
++            'classification'      : '12',
+             'studio'              : 'Fox',
+             'o_site'              : False,
+             'site'                : 'http://www.kino.de/kinofilm/rocky-balboa/96132.html',
+             'trailer'             : 'http://www.kino.de/kinofilm/rocky-balboa/trailer/96132.html',
+-            'year'                : 2006,
++            'year'                : 2007,
+             'notes'               : False,
+             'runtime'             : 102,
+             'image'               : True,
+@@ -417,14 +442,14 @@ Charles Gérard\n\
+ André Falcon',
+             'country'             : 'Frankreich/Italien',
+             'genre'               : 'Drama',
+-            'classification'      : 'ab 12',
+-            'studio'              : 'Black Hill Pictures',
++            'classification'      : '12',
++            'studio'              : 'Columbia TriStar',
+             'o_site'              : False,
+             'site'                : 'http://www.kino.de/kinofilm/ein-glueckliches-jahr/28675.html',
+             'trailer'             : 'http://www.kino.de/kinofilm/ein-glueckliches-jahr/trailer/28675.html',
+             'year'                : 1973,
+             'notes'               : False,
+-            'runtime'             : 110,
++            'runtime'             : 115,
+             'image'               : True,
+             'rating'              : False,
+             'cameraman'           : 'Jean Collomb',
+diff --git a/lib/plugins/movie/PluginMovieMediadis.py b/lib/plugins/movie/PluginMovieMediadis.py
+index a3860eb..94eda95 100644
+--- a/lib/plugins/movie/PluginMovieMediadis.py
++++ b/lib/plugins/movie/PluginMovieMediadis.py
+@@ -1,6 +1,6 @@
+ # -*- coding: UTF-8 -*-
+ 
+-# $Id: PluginMovieMediadis.py 1090 2008-12-16 20:59:02Z piotrek $
++# $Id$
+ 
+ # Copyright (c) 2005-2007 Vasco Nunes
+ # You may use and distribute this software under the terms of the
+diff --git a/lib/plugins/movie/PluginMovieMoviefone.py b/lib/plugins/movie/PluginMovieMoviefone.py
+index 877c0ec..1123e98 100644
+--- a/lib/plugins/movie/PluginMovieMoviefone.py
++++ b/lib/plugins/movie/PluginMovieMoviefone.py
+@@ -1,6 +1,6 @@
+ # -*- coding: UTF-8 -*-
+ 
+-# $Id: PluginMovieMoviefone.py 1113 2009-01-06 21:30:41Z mikej06 $
++# $Id$
+ 
+ # Copyright (c) 2005-2009 Vasco Nunes
+ # You may use and distribute this software under the terms of the
+diff --git a/lib/plugins/movie/PluginMovieMyMoviesIt.py b/lib/plugins/movie/PluginMovieMyMoviesIt.py
+index bdab469..f15d07a 100644
+--- a/lib/plugins/movie/PluginMovieMyMoviesIt.py
++++ b/lib/plugins/movie/PluginMovieMyMoviesIt.py
+@@ -1,6 +1,6 @@
+ # -*- coding: UTF-8 -*-
+ 
+-__revision__ = '$Id: PluginMovieMyMoviesIt.py 1577 2011-08-30 21:13:26Z mikej06 $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2007-2011
+ #
+diff --git a/lib/plugins/movie/PluginMovieOFDb.py b/lib/plugins/movie/PluginMovieOFDb.py
+index 7c7b2b4..369ac17 100644
+--- a/lib/plugins/movie/PluginMovieOFDb.py
++++ b/lib/plugins/movie/PluginMovieOFDb.py
+@@ -1,6 +1,6 @@
+ # -*- coding: UTF-8 -*-
+ 
+-__revision__ = '$Id: PluginMovieOFDb.py 1599 2011-12-02 19:52:02Z mikej06 $'
++__revision__ = '$Id$'
+ 
+ # Written by Christian Sagmueller <christian@××××××××××.net>
+ # based on PluginMovieIMDB.py, Copyright (c) 2005 Vasco Nunes
+@@ -16,7 +16,7 @@ plugin_url          = "www.ofdb.de"
+ plugin_language     = _("German")
+ plugin_author       = "Christian Sagmueller, Jessica Katharina Parth"
+ plugin_author_email = "Jessica.K.P@×××××××××××××.org"
+-plugin_version      = "0.10"
++plugin_version      = "0.11"
+ 
+ class Plugin(movie.Movie):
+     def __init__(self, id):
+@@ -65,7 +65,7 @@ class Plugin(movie.Movie):
+ 
+     def get_runtime(self):
+         # from imdb
+-        self.runtime = gutils.regextrim(self.imdb_page, '<h5>(L&auml;nge|L&#xE4;nge|Runtime):</h5>', ' (min|Min)')
++        self.runtime = gutils.after(gutils.regextrim(self.imdb_page, 'itemprop="duration"', ' (min|Min)'), '>')
+ 
+     def get_genre(self):
+         self.genre = gutils.trim(self.page,"Genre(s):","</table>")
+@@ -94,10 +94,10 @@ class Plugin(movie.Movie):
+ 
+     def get_studio(self):
+         # from imdb
+-        self.studio = gutils.regextrim(self.imdb_page, '<h5>(Firma|Company):</h5>', '</a>')
++        self.studio = gutils.regextrim(self.imdb_page, 'Production Co:', '(<span|</span>)')
+ 
+     def get_o_site(self):
+-        self.o_site = ""
++        self.o_site = gutils.trim(gutils.regextrim(self.imdb_page, 'Official Sites:', '(<span|</span>)'), 'href="', '"')
+ 
+     def get_site(self):
+         self.site = self.url
+@@ -175,63 +175,90 @@ class PluginTest:
+             'plot'                : True,
+             'cast'                : 'Sylvester Stallone' + _(' as ') + 'Rocky Balboa\n\
+ Burt Young' + _(' as ') + 'Paulie\n\
+-Milo Ventimiglia' + _(' as ') + 'Robert Jr.\n\
++Antonio Tarver' + _(' as ') + 'Mason \'The Line\' Dixon\n\
+ Geraldine Hughes' + _(' as ') + 'Marie\n\
+-James Francis Kelly III' + _(' as ') + 'Steps\n\
++Milo Ventimiglia' + _(' as ') + 'Robert Jr.\n\
+ Tony Burton' + _(' as ') + 'Duke\n\
+-A.J. Benza\n\
++A.J. Benza' + _(' as ') + 'L.C.\n\
++James Francis Kelly III' + _(' as ') + 'Steps\n\
++Lou DiBella' + _(' as ') + 'Himself\n\
++Mike Tyson' + _(' as ') + 'Himself\n\
+ Henry G. Sanders' + _(' as ') + 'Martin\n\
+-Antonio Tarver' + _(' as ') + 'Mason \'The Line\' Dixon\n\
+ Pedro Lovell' + _(' as ') + 'Spider Rico\n\
+-Ana Gerena\n\
+-Angela Boyd\n\
++Ana Gerena' + _(' as ') + 'Isabel\n\
++Angela Boyd' + _(' as ') + 'Angie\n\
+ Louis Giansante\n\
+ Maureen Schilling\n\
++Lahmard J. Tate\n\
++Woody Paige\n\
++Skip Bayless\n\
++Jay Crawford\n\
++Brian Kenny\n\
++Dana Jacobson\n\
++Charles Johnson\n\
++James Binns\n\
++Johnnie Hobbs Jr.\n\
++Barney Fitzpatrick\n\
++Jim Lampley\n\
++Larry Merchant\n\
++Max Kellerman\n\
++LeRoy Neiman\n\
++Bert Randolph Sugar\n\
++Bernard Fernández\n\
++Gunnar Peterson\n\
++Yahya\n\
++Marc Ratner\n\
++Anthony Lato Jr.\n\
++Jack Lazzarado\n\
++Michael Buffer' + _(' as ') + 'Ring Announcer\n\
++Joe Cortez' + _(' as ') + 'Referee\n\
+ Carter Mitchell\n\
+ Vinod Kumar\n\
++Fran Pultro\n\
++Frank Stallone als Frank Stallone Jr.' + _(' as ') + 'Dinner Patron \n\
++Jody Giambelluca\n\
+ Tobias Segal' + _(' as ') + 'Robert\'s Friend\n\
+ Tim Carr' + _(' as ') + 'Robert\'s Friend \n\
++Matt Frack\n\
+ Paul Dion Monte' + _(' as ') + 'Robert\'s Friend\n\
+ Kevin King Templeton\n\
+ Robert Michael Kelly\n\
+-Don Sherman' + _(' as ') + 'Andy\n\
+-Nick Baker\n\
+ Rick Buchborn\n\
++Nick Baker\n\
++Don Sherman' + _(' as ') + 'Andy\n\
+ Gary Compton\n\
+-Jody Giambelluca\n\
+-Frank Stallone als Frank Stallone Jr.' + _(' as ') + 'Dinner Patron \n\
+-Fran Pultro\n\
+-Michael Buffer' + _(' as ') + 'Ring Announcer\n\
+-Jack Lazzarado\n\
+-Marc Ratner\n\
+-Anthony Lato Jr.\n\
+-Yahya\n\
+-Gunnar Peterson\n\
+-Bernard Fernández\n\
+-Bert Randolph Sugar\n\
+-Jim Lampley\n\
+-Larry Merchant\n\
+-Max Kellerman\n\
+-James Binns\n\
+-Johnnie Hobbs Jr.\n\
+-Barney Fitzpatrick\n\
+-Brian Kenny\n\
+-Dana Jacobson\n\
+-Skip Bayless\n\
+-Charles Johnson\n\
+-Matt Frack\n\
+-Woody Paige\n\
+-Jay Crawford\n\
+-Lahmard J. Tate\n\
+-LeRoy Neiman\n\
+-Mike Tyson' + _(' as ') + 'Himself\n\
+-Lou DiBella\n\
+-Joe Cortez\n\
+-Ricky Cavazos' + _(' as ') + 'Boxing Spectator (uncredited)',
++Vale Anoai\n\
++Sikander Malik\n\
++Michael Ahl\n\
++Andrew Aninsman\n\
++Ben Bachelder\n\
++Lacy Bevis\n\
++Tim Brooks\n\
++D.T. Carney\n\
++Ricky Cavazos' + _(' as ') + 'Boxing Spectator (uncredited)\n\
++Rennie Cowan\n\
++Deon Derrico\n\
++Jacob \'Stitch\' Duran\n\
++Simon P. Edwards\n\
++Ruben Fischman' + _(' as ') + 'High-Roller in Las Vegas (uncredited)\n\
++David Gere\n\
++Noah Jacobs\n\
++Mark J. Kilbane\n\
++Zach Klinefelter\n\
++David Kneeream\n\
++Dan Montero\n\
++Keith Moyer' + _(' as ') + 'Bar Patron (uncredited)\n\
++Carol Anne Mueller\n\
++Jacqueline Olivia\n\
++Brian H. Scott\n\
++Keyon Smith\n\
++Frank Traynor\n\
++Ryan Tygh\n\
++Kimberly Villanova',
+             'country'             : 'USA',
+             'genre'               : 'Action, Drama, Sportfilm',
+             'classification'      : False,
+-            'studio'              : 'Metro-Goldwyn-Mayer (MGM)',
++            'studio'              : 'Metro-Goldwyn-Mayer (MGM), Columbia Pictures, Revolution Studios',
+             'o_site'              : False,
+             'site'                : 'http://www.ofdb.de/film/103013,Rocky%20Balboa',
+             'trailer'             : False,
+@@ -246,7 +273,7 @@ Ricky Cavazos' + _(' as ') + 'Boxing Spectator (uncredited)',
+             'o_title'             : 'Bonne année, La',
+             'director'            : 'Claude Lelouch',
+             'plot'                : False,
+-            'cast'                : 'Lino Ventura' + _(' as ') + 'Simon \n\
++            'cast'                : 'Lino Ventura' + _(' as ') + 'Simon\n\
+ Françoise Fabian' + _(' as ') + 'Françoise\n\
+ Charles Gérard' + _(' as ') + 'Charlot\n\
+ André Falcon' + _(' as ') + 'Le bijoutier\n\
+@@ -255,7 +282,7 @@ Lilo\n\
+ Claude Mann\n\
+ Frédéric de Pasquale\n\
+ Gérard Sire\n\
+-Silvano Tranquilli' + _(' as ') + 'L\'amant italien \n\
++Silvano Tranquilli' + _(' as ') + 'L\'amant italien\n\
+ André Barello\n\
+ Michel Bertay\n\
+ Norman de la Chesnaye\n\
+@@ -270,14 +297,14 @@ Harry Walter\n\
+ Elie Chouraqui',
+             'country'             : 'Frankreich',
+             'genre'               : 'Komödie, Krimi',
+-            'classification'      : '12 (f)',
+-            'studio'              : 'Les Films 13',
++            'classification'      : False,
++            'studio'              : 'Les Films 13, Rizzoli Film',
+             'o_site'              : False,
+             'site'                : 'http://www.ofdb.de/film/22489,Ein-Gl%C3%BCckliches-Jahr',
+             'trailer'             : False,
+             'year'                : 1973,
+             'notes'               : False,
+-            'runtime'             : 90,
++            'runtime'             : 115,
+             'image'               : True,
+             'rating'              : 6
+         },
+@@ -318,9 +345,9 @@ Oh Soon-tae\n\
+ Lee Oi-soo',
+             'country'             : 'Südkorea',
+             'genre'               : 'Action, Fantasy, Komödie',
+-            'classification'      : '16',
+-            'studio'              : 'Fun and Happiness',
+-            'o_site'              : False,
++            'classification'      : False,
++            'studio'              : 'Fun and Happiness, Good Movie Company',
++            'o_site'              : 'http://www.arahan.co.kr/',
+             'site'                : 'http://www.ofdb.de/film/54088,Arahan',
+             'trailer'             : False,
+             'year'                : 2004,
+diff --git a/lib/plugins/movie/PluginMovieOnet.py b/lib/plugins/movie/PluginMovieOnet.py
+index 647fa5a..23743c4 100644
+--- a/lib/plugins/movie/PluginMovieOnet.py
++++ b/lib/plugins/movie/PluginMovieOnet.py
+@@ -1,6 +1,6 @@
+ # -*- coding: utf-8 -*-
+ 
+-__revision__ = '$Id: PluginMovieOnet.py 1390 2010-01-08 11:13:20Z kura666 $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2005-2006 Piotr Ożarowski
+ #
+diff --git a/lib/plugins/movie/PluginMoviePTGate.py b/lib/plugins/movie/PluginMoviePTGate.py
+index 03a8cda..cfe4741 100644
+--- a/lib/plugins/movie/PluginMoviePTGate.py
++++ b/lib/plugins/movie/PluginMoviePTGate.py
+@@ -1,6 +1,6 @@
+ # -*- coding: UTF-8 -*-
+ 
+-__revision__ = '$Id: PluginMoviePTGate.py 1513 2011-02-03 19:50:04Z iznogoud $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2005-2009 Vasco Nunes, Piotr Ozarowski
+ #
+diff --git a/lib/plugins/movie/PluginMovieScope.py b/lib/plugins/movie/PluginMovieScope.py
+index d7ae589..47f3ce7 100644
+--- a/lib/plugins/movie/PluginMovieScope.py
++++ b/lib/plugins/movie/PluginMovieScope.py
+@@ -1,6 +1,6 @@
+ # -*- coding: UTF-8 -*-
+ 
+-__revision__ = '$Id: PluginMovieScope.py 1405 2010-03-02 21:26:35Z mikej06 $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2010
+ #
+diff --git a/lib/plugins/movie/PluginMovieStopklatka.py b/lib/plugins/movie/PluginMovieStopklatka.py
+index 322f00b..8496d40 100644
+--- a/lib/plugins/movie/PluginMovieStopklatka.py
++++ b/lib/plugins/movie/PluginMovieStopklatka.py
+@@ -1,6 +1,6 @@
+ # -*- coding: utf-8 -*-
+ 
+-__revision__ = '$Id: PluginMovieStopklatka.py 1383 2010-01-05 21:04:00Z mikej06 $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2005-2010 Piotr Ożarowski
+ #
+diff --git a/lib/plugins/movie/PluginMovieTanukiAnime.py b/lib/plugins/movie/PluginMovieTanukiAnime.py
+index 5e58be6..e1a6472 100644
+--- a/lib/plugins/movie/PluginMovieTanukiAnime.py
++++ b/lib/plugins/movie/PluginMovieTanukiAnime.py
+@@ -1,6 +1,6 @@
+ # -*- coding: utf-8 -*-
+ 
+-__revision__ = '$Id: PluginMovieTanukiAnime.py 1090 2008-12-16 20:59:02Z piotrek $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2005-2007 Piotr Ożarowski
+ #
+diff --git a/lib/plugins/movie/PluginMovieWP.py b/lib/plugins/movie/PluginMovieWP.py
+index 31386b8..e159e01 100644
+--- a/lib/plugins/movie/PluginMovieWP.py
++++ b/lib/plugins/movie/PluginMovieWP.py
+@@ -1,6 +1,6 @@
+ # -*- coding: utf-8 -*-
+ 
+-__revision__ = '$Id: PluginMovieWP.py 1412 2010-03-28 20:18:54Z mikej06 $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2005-2010 Piotr Ożarowski
+ #
+diff --git a/lib/plugins/movie/PluginMovieZelluloid.py b/lib/plugins/movie/PluginMovieZelluloid.py
+index e90a829..a9e15a1 100644
+--- a/lib/plugins/movie/PluginMovieZelluloid.py
++++ b/lib/plugins/movie/PluginMovieZelluloid.py
+@@ -1,6 +1,6 @@
+ # -*- coding: UTF-8 -*-
+ 
+-__revision__ = '$Id: PluginMovieZelluloid.py 1599 2011-12-02 19:52:02Z mikej06 $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2007-2011 Michael Jahn
+ #
+@@ -51,7 +51,7 @@ class Plugin(movie.Movie):
+         self.image_url = 'http://www.zelluloid.de/images/poster/' + gutils.trim(self.page, '<IMG SRC="/images/poster/', '"');
+ 
+     def get_o_title(self):
+-        self.o_title = gutils.trim(self.page, 'Originaltitel: ', '<BR>')
++        self.o_title = gutils.regextrim(self.page, 'Originaltitel: ', '(<BR>|<br />)')
+         if self.o_title == '':
+             self.o_title = gutils.trim(self.page, '<title>', '|')
+ 
+@@ -224,11 +224,13 @@ James Francis Kelly III' + _(' as ') + 'Steps\n\
+ Talia Shire' + _(' as ') + 'Adrian\n\
+ Lou DiBella' + _(' as ') + 'Lou DiBella\n\
+ Mike Tyson' + _(' as ') + 'Mike Tyson\n\
+-Henry G. Sanders' + _(' as ') + 'Martin',
++Henry G. Sanders' + _(' as ') + 'Martin\n\
++Kevin King Templeton' + _(' as ') + '\n\
++Frank Stallone as',
+             'country'           : 'USA',
+-            'genre'             : 'Drama, Sport',
++            'genre'             : 'Drama, Action, Sport',
+             'classification'    : 'ab 12',
+-            'studio'            : 'Chartoff-Winkler Productions, Columbia Pictures Corporation, Metro-Goldwyn-Mayer, Revolution Studios, Rogue Marble',
++            'studio'            : 'Chartoff-Winkler Productions, Columbia Pictures Corporation, MGM, Revolution Studios, Rogue Marble',
+             'o_site'            : False,
+             'site'              : 'http://www.zelluloid.de/filme/details.php3?id=2835',
+             'trailer'           : False,
+diff --git a/lib/preferences.py b/lib/preferences.py
+index e65bc2d..7abf510 100644
+--- a/lib/preferences.py
++++ b/lib/preferences.py
+@@ -1,6 +1,6 @@
+ # -*- coding: UTF-8 -*-
+ 
+-__revision__ = '$Id: preferences.py 1597 2011-10-04 18:41:24Z piotrek $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2005-2009 Vasco Nunes, Piotr Ożarowski
+ #
+diff --git a/lib/quick_filter.py b/lib/quick_filter.py
+index 70c6ea8..f9d433e 100644
+--- a/lib/quick_filter.py
++++ b/lib/quick_filter.py
+@@ -1,6 +1,6 @@
+ # -*- coding: UTF-8 -*-
+ 
+-__revision__ = '$Id: quick_filter.py 1601 2011-12-12 20:07:03Z mikej06 $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2005-2009 Vasco Nunes, Piotr Ożarowski
+ 
+diff --git a/lib/sql.py b/lib/sql.py
+index c93587b..5e5e5f3 100644
+--- a/lib/sql.py
++++ b/lib/sql.py
+@@ -1,7 +1,7 @@
+ # -*- coding: UTF-8 -*-
+ # vim: fdm=marker
+ 
+-__revision__ = '$Id: sql.py 1538 2011-02-13 20:04:22Z piotrek $'
++__revision__ = '$Id$'
+ 
+ # Copyright © 2005-2009 Vasco Nunes, Piotr Ożarowski
+ #
+diff --git a/lib/test_movieplugins.py b/lib/test_movieplugins.py
+index 8047375..0c3e80b 100644
+--- a/lib/test_movieplugins.py
++++ b/lib/test_movieplugins.py
+@@ -1,6 +1,6 @@
+ # -*- coding: UTF-8 -*-
+ 
+-__revision__ = '$Id: test_movieplugins.py 1599 2011-12-02 19:52:02Z mikej06 $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2006-2011
+ #
+@@ -69,32 +69,31 @@ sys.path.append('plugins/extensions')
+ #
+ class PluginTester:
+     test_plugins = [
+-        'PluginMovieAllocine',
+-        'PluginMovieAllRovi',
+-        'PluginMovieAmazon',
+-        'PluginMovieAniDB',
+-        'PluginMovieCinematografo',
+-        'PluginMovieCineMovies',
+-        'PluginMovieCineteka',
+-        'PluginMovieClubedevideo',
+-        'PluginMovieCSFD',
+-        'PluginMovieCulturalia',
+-        'PluginMovieDVDEmpire',
+-        'PluginMovieE-Pipoca',
+-        'PluginMovieFilmAffinity',
+-        'PluginMovieFilmDb',
+-        #'PluginMovieFilmeVonAZ',
+-        'PluginMovieFilmtipset',
+-        'PluginMovieHKMDB',
++        # 'PluginMovieAllocine',
++        # 'PluginMovieAllRovi',
++        # 'PluginMovieAmazon',
++        # 'PluginMovieAniDB',
++        # 'PluginMovieCinematografo',
++        # 'PluginMovieCineMovies',
++        # 'PluginMovieCineteka',
++        # 'PluginMovieClubedevideo',
++        # 'PluginMovieCSFD',
++        # 'PluginMovieCulturalia',
++        # 'PluginMovieDVDEmpire',
++        # 'PluginMovieE-Pipoca',
++        # 'PluginMovieFilmAffinity',
++        # 'PluginMovieFilmeVonAZ',
++        # 'PluginMovieFilmtipset',
++        # 'PluginMovieHKMDB',
+         'PluginMovieIMDB',
+-        'PluginMovieIMDB-de',
+-        'PluginMovieIMDB-es',
+-        'PluginMovieKinoDe',
+-        'PluginMovieMovieMeter',
+-        'PluginMovieMyMoviesIt',
+-        'PluginMovieOFDb',
+-        'PluginMovieScope',
+-        'PluginMovieZelluloid',
++        # 'PluginMovieIMDB-de',
++        # 'PluginMovieIMDB-es',
++        # 'PluginMovieKinoDe',
++        # 'PluginMovieMovieMeter',
++        # 'PluginMovieMyMoviesIt',
++        # 'PluginMovieOFDb',
++        # 'PluginMovieScope',
++        # 'PluginMovieZelluloid',
+     ]
+ 
+     #
+diff --git a/lib/version.py b/lib/version.py
+index 141796e..60add34 100644
+--- a/lib/version.py
++++ b/lib/version.py
+@@ -1,6 +1,6 @@
+ # -*- coding: UTF-8 -*-
+ 
+-__revision__ = '$Id: version.py 1606 2011-12-18 22:35:46Z piotrek $'
++__revision__ = '$Id$'
+ 
+ # Copyright © 2005-2010 Vasco Nunes, Piotr Ożarowski
+ #
+diff --git a/lib/view.py b/lib/view.py
+index 6fe644d..64882c9 100644
+--- a/lib/view.py
++++ b/lib/view.py
+@@ -1,6 +1,6 @@
+ # -*- coding: UTF-8 -*-
+ 
+-__revision__ = '$Id: view.py 1536 2011-02-12 00:50:13Z iznogoud $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2005-2009 Vasco Nunes, Piotr Ożarowski
+ #
+diff --git a/lib/widgets.py b/lib/widgets.py
+index f3c75b5..f869d92 100644
+--- a/lib/widgets.py
++++ b/lib/widgets.py
+@@ -1,7 +1,7 @@
+ # -*- coding: UTF-8 -*-
+ # vim: fdm=marker
+ 
+-__revision__ = '$Id: widgets.py 1572 2011-08-23 18:47:22Z mikej06 $'
++__revision__ = '$Id$'
+ 
+ # Copyright (c) 2005-2011 Vasco Nunes, Piotr Ożarowski
+ #
+diff --git a/po/Makefile b/po/Makefile
+index 1eb6b01..f5f666f 100644
+--- a/po/Makefile
++++ b/po/Makefile
+@@ -1,4 +1,4 @@
+-# $Id: Makefile 1603 2011-12-18 19:43:30Z piotrek $
++# $Id$
+ INSTALL ?= install
+ 
+ PYFILES = ../griffith $(wildcard ../lib/*.py ../lib/db/*.py ../lib/plugins/movie/*.py ../lib/plugins/export/*.py ../lib/plugins/imp/*.py) 
+diff --git a/po/messages.pot b/po/messages.pot
+deleted file mode 100644
+index e5ecee9..0000000
+--- a/po/messages.pot
++++ /dev/null
+@@ -1,2773 +0,0 @@
+-# SOME DESCRIPTIVE TITLE.
+-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+-# This file is distributed under the same license as the PACKAGE package.
+-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+-#
+-#, fuzzy
+-msgid ""
+-msgstr ""
+-"Project-Id-Version: PACKAGE VERSION\n"
+-"Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2011-12-18 20:29+0100\n"
+-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+-"Language-Team: LANGUAGE <LL@××.org>\n"
+-"Language: \n"
+-"MIME-Version: 1.0\n"
+-"Content-Type: text/plain; charset=CHARSET\n"
+-"Content-Transfer-Encoding: 8bit\n"
+-
+-#: ../griffith:257 ../griffith:1036 ../lib/delete.py:35 ../lib/edit.py:43
+-msgid "You have no movies in your database"
+-msgstr ""
+-
+-#: ../griffith:442
+-msgid "You have seen all films in your collection!"
+-msgstr ""
+-
+-#: ../griffith:593 ../griffith:598 ../lib/initialize.py:391
+-#: ../lib/initialize.py:814
+-msgid "subtitles"
+-msgstr ""
+-
+-#: ../griffith:641 ../griffith:699 ../griffith:758 ../griffith:815
+-#: ../griffith:872 ../griffith:920 ../griffith:968
+-msgid ""
+-"This item is in use.\n"
+-"Operation aborted!"
+-msgstr ""
+-
+-#: ../griffith:1012
+-msgid ""
+-"Are you sure you want to restore? Your current movie collection will be "
+-"replaced. You can't undo this operation."
+-msgstr ""
+-
+-#: ../griffith:1017
+-msgid ""
+-"Are you sure you want to merge? Your current movie collection will be merged "
+-"with a backup. You can't undo this operation."
+-msgstr ""
+-
+-#: ../griffith:1113
+-#, python-format
+-msgid ""
+-"%s movie(s) in collection. %s movie(s) are shown by the filter. %s movie(s) "
+-"loaned. You haven't seen %s movie(s)"
+-msgstr ""
+-
+-#: ../griffith:1321
+-msgid ""
+-"Are you sure you want to create a new database?\n"
+-"You will lose ALL your current data!"
+-msgstr ""
+-
+-#: ../griffith:1323
+-msgid ""
+-"Last chance!\n"
+-"Do you confirm that you want\n"
+-"to lose your current data?"
+-msgstr ""
+-
+-#: ../griffith:1475
+-msgid ""
+-"This is development version of Griffith.\n"
+-"Upgrade path from dev. versions may not be provided.\n"
+-"Please make sure you have a backup!\n"
+-"\n"
+-"Do you want to proceed?"
+-msgstr ""
+-
+-#: ../lib/about.py:46
+-msgid "Main Authors"
+-msgstr ""
+-
+-#: ../lib/about.py:48
+-msgid "Programmers"
+-msgstr ""
+-
+-#: ../lib/about.py:52
+-msgid "Contributors"
+-msgstr ""
+-
+-#: ../lib/about.py:56
+-msgid "Logo, icon and general artwork "
+-msgstr ""
+-
+-#: ../lib/about.py:82
+-msgid "See TRANSLATORS file"
+-msgstr ""
+-
+-#: ../lib/about.py:90
+-msgid "This program is released under the GNU"
+-msgstr ""
+-
+-#: ../lib/add.py:56 ../glade/griffith.glade.h:27
+-msgid "Add a new movie"
+-msgstr ""
+-
+-#: ../lib/add.py:69
+-msgid "Edit movie"
+-msgstr ""
+-
+-#: ../lib/add.py:130
+-msgid "Movie information has been updated"
+-msgstr ""
+-
+-#: ../lib/add.py:269
+-msgid "No results"
+-msgstr ""
+-
+-#: ../lib/add.py:318 ../lib/movie.py:172
+-msgid "Connection failed."
+-msgstr ""
+-
+-#: ../lib/add.py:320 ../lib/add.py:670
+-msgid ""
+-"You should fill the original title\n"
+-"or the movie title."
+-msgstr ""
+-
+-#: ../lib/add.py:329
+-msgid "Url: "
+-msgstr ""
+-
+-#: ../lib/add.py:330
+-msgid "Language: "
+-msgstr ""
+-
+-#: ../lib/add.py:678 ../lib/add.py:682
+-msgid "Movie with that title already exists, are you sure you want to add?"
+-msgstr ""
+-
+-#: ../lib/advfilter.py:65
+-msgid "is equal to"
+-msgstr ""
+-
+-#: ../lib/advfilter.py:66
+-msgid "is not equal to"
+-msgstr ""
+-
+-#: ../lib/advfilter.py:67
+-msgid "starts with"
+-msgstr ""
+-
+-#: ../lib/advfilter.py:68
+-msgid "doesn't start with"
+-msgstr ""
+-
+-#: ../lib/advfilter.py:69
+-msgid "contains"
+-msgstr ""
+-
+-#: ../lib/advfilter.py:70
+-msgid "doesn't contain"
+-msgstr ""
+-
+-#: ../lib/advfilter.py:71
+-msgid "like"
+-msgstr ""
+-
+-#: ../lib/advfilter.py:72
+-msgid "not like"
+-msgstr ""
+-
+-#: ../lib/advfilter.py:140 ../lib/advfilter.py:148 ../lib/advfilter.py:167
+-msgid "ignore"
+-msgstr ""
+-
+-#: ../lib/advfilter.py:140
+-msgid "with"
+-msgstr ""
+-
+-#: ../lib/advfilter.py:140
+-msgid "without"
+-msgstr ""
+-
+-#: ../lib/advfilter.py:140
+-msgid "require"
+-msgstr ""
+-
+-#: ../lib/advfilter.py:148
+-msgid "in"
+-msgstr ""
+-
+-#: ../lib/advfilter.py:148
+-msgid "not in"
+-msgstr ""
+-
+-#: ../lib/advfilter.py:167
+-msgid "loaned to "
+-msgstr ""
+-
+-#: ../lib/advfilter.py:167
+-msgid "loan history"
+-msgstr ""
+-
+-#: ../lib/advfilter.py:370 ../lib/advfilter.py:413
+-msgid "Name is empty"
+-msgstr ""
+-
+-#: ../lib/advfilter.py:387
+-msgid "Cannot save search conditions"
+-msgstr ""
+-
+-#: ../lib/advfilter.py:392
+-msgid "Search conditions saved"
+-msgstr ""
+-
+-#: ../lib/advfilter.py:425
+-msgid "Cannot delete search conditions"
+-msgstr ""
+-
+-#: ../lib/advfilter.py:429
+-msgid "Search conditions deleted"
+-msgstr ""
+-
+-#: ../lib/backup.py:58
+-msgid "Save Griffith backup"
+-msgstr ""
+-
+-#: ../lib/backup.py:67 ../lib/plugins/export/__init__.py:162
+-#: ../lib/plugins/export/PluginExportCSV.py:61
+-#: ../lib/plugins/export/PluginExportiPod.py:113
+-#: ../lib/plugins/export/PluginExportPDF.py:76
+-#: ../lib/plugins/export/PluginExportXML.py:58
+-msgid "File exists. Do you want to overwrite it?"
+-msgstr ""
+-
+-#: ../lib/backup.py:79
+-msgid "Error creating backup"
+-msgstr ""
+-
+-#: ../lib/backup.py:119
+-msgid "Backup has been created"
+-msgstr ""
+-
+-#: ../lib/backup.py:122
+-msgid "Restoring database..."
+-msgstr ""
+-
+-#: ../lib/backup.py:203
+-msgid "Restore Griffith backup"
+-msgstr ""
+-
+-#: ../lib/backup.py:219
+-msgid "Can't read backup file"
+-msgstr ""
+-
+-#: ../lib/backup.py:289
+-msgid "Backup restored"
+-msgstr ""
+-
+-#: ../lib/cover.py:43 ../lib/edit.py:52
+-msgid "Select image"
+-msgstr ""
+-
+-#: ../lib/cover.py:87 ../lib/cover.py:150
+-msgid "Cover generated by Griffith v"
+-msgstr ""
+-
+-#: ../lib/cover.py:89 ../lib/cover.py:152
+-#: ../lib/plugins/export/PluginExportHTML.py:719
+-#: ../lib/plugins/export/PluginExportPDF.py:265
+-msgid "Released Under the GNU/GPL License"
+-msgstr ""
+-
+-#: ../lib/cover.py:177 ../lib/initialize.py:195 ../lib/initialize.py:795
+-#: ../lib/plugins/export/PluginExportHTML.py:157 ../glade/griffith.glade.h:103
+-msgid "Original Title"
+-msgstr ""
+-
+-#: ../lib/cover.py:178 ../lib/initialize.py:203 ../lib/initialize.py:807
+-#: ../lib/plugins/export/PluginExportHTML.py:163 ../glade/griffith.glade.h:159
+-msgid "Title"
+-msgstr ""
+-
+-#: ../lib/cover.py:180 ../lib/initialize.py:211 ../lib/initialize.py:785
+-#: ../lib/plugins/export/PluginExportHTML.py:148
+-#: ../lib/plugins/export/PluginExportPDF.py:183 ../glade/griffith.glade.h:52
+-msgid "Director"
+-msgstr ""
+-
+-#: ../lib/cover.py:182
+-msgid "Running Time"
+-msgstr ""
+-
+-#: ../lib/cover.py:182 ../lib/main_treeview.py:566
+-#: ../lib/plugins/movie/PluginMovieAniDB.py:168
+-msgid " min"
+-msgstr ""
+-
+-#: ../lib/cover.py:183 ../lib/initialize.py:784
+-#: ../lib/plugins/export/PluginExportHTML.py:147 ../glade/griffith.glade.h:45
+-msgid "Country"
+-msgstr ""
+-
+-#: ../lib/cover.py:184 ../lib/initialize.py:219 ../lib/initialize.py:786
+-#: ../lib/plugins/export/PluginExportHTML.py:149
+-#: ../lib/plugins/export/PluginExportPDF.py:179 ../glade/griffith.glade.h:68
+-msgid "Genre"
+-msgstr ""
+-
+-#: ../lib/dbupgrade.py:37
+-msgid "Upgrading database..."
+-msgstr ""
+-
+-#: ../lib/dbupgrade.py:90 ../lib/plugins/movie/PluginMovieE-Pipoca.py:33
+-#: ../lib/plugins/movie/PluginMovieInterfilmes.py:35
+-msgid "Brazilian Portuguese"
+-msgstr ""
+-
+-#: ../lib/dbupgrade.py:91
+-msgid "Bulgarian"
+-msgstr ""
+-
+-#: ../lib/dbupgrade.py:92
+-msgid "Catalan"
+-msgstr ""
+-
+-#: ../lib/dbupgrade.py:93 ../lib/plugins/movie/PluginMovieCSFD.py:31
+-msgid "Czech"
+-msgstr ""
+-
+-#: ../lib/dbupgrade.py:94 ../lib/plugins/movie/PluginMovieScope.py:32
+-msgid "Danish"
+-msgstr ""
+-
+-#: ../lib/dbupgrade.py:95 ../lib/plugins/movie/PluginMovieMovieMeter.py:32
+-msgid "Dutch"
+-msgstr ""
+-
+-#: ../lib/dbupgrade.py:96 ../lib/plugins/movie/PluginMovieAllRovi.py:31
+-#: ../lib/plugins/movie/PluginMovieAniDB.py:40
+-#: ../lib/plugins/movie/PluginMovieDVDEmpire.py:31
+-#: ../lib/plugins/movie/PluginMovieHKMDB.py:32
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:30
+-#: ../lib/plugins/movie/PluginMovieMediadis.py:15
+-#: ../lib/plugins/movie/PluginMovieMoviefone.py:15
+-msgid "English"
+-msgstr ""
+-
+-#: ../lib/dbupgrade.py:97
+-msgid "Estonian"
+-msgstr ""
+-
+-#: ../lib/dbupgrade.py:98 ../lib/plugins/movie/PluginMovieAllocine.py:35
+-#: ../lib/plugins/movie/PluginMovieCineMovies.py:30
+-msgid "French"
+-msgstr ""
+-
+-#: ../lib/dbupgrade.py:99 ../lib/plugins/movie/PluginMovieDVDPalace.py:32
+-#: ../lib/plugins/movie/PluginMovieFilmDb.py:31
+-#: ../lib/plugins/movie/PluginMovieFilmeVonAZ.py:32
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:30
+-#: ../lib/plugins/movie/PluginMovieKinoDe.py:32
+-#: ../lib/plugins/movie/PluginMovieOFDb.py:16
+-#: ../lib/plugins/movie/PluginMovieZelluloid.py:32
+-msgid "German"
+-msgstr ""
+-
+-#: ../lib/dbupgrade.py:100
+-msgid "Greek"
+-msgstr ""
+-
+-#: ../lib/dbupgrade.py:101
+-msgid "Hungarian"
+-msgstr ""
+-
+-#: ../lib/dbupgrade.py:102
+-msgid "Indonesian"
+-msgstr ""
+-
+-#: ../lib/dbupgrade.py:103 ../lib/plugins/movie/PluginMovieCinematografo.py:32
+-#: ../lib/plugins/movie/PluginMovieIMDB-it.py:31
+-#: ../lib/plugins/movie/PluginMovieMyMoviesIt.py:33
+-msgid "Italian"
+-msgstr ""
+-
+-#: ../lib/dbupgrade.py:104
+-msgid "Japanese"
+-msgstr ""
+-
+-#: ../lib/dbupgrade.py:105
+-msgid "Korean"
+-msgstr ""
+-
+-#: ../lib/dbupgrade.py:106
+-msgid "Norwegian Bokmal"
+-msgstr ""
+-
+-#: ../lib/dbupgrade.py:107
+-msgid "Occitan"
+-msgstr ""
+-
+-#: ../lib/dbupgrade.py:108
+-msgid "Pashto"
+-msgstr ""
+-
+-#: ../lib/dbupgrade.py:109 ../lib/plugins/movie/PluginMovieFDb.py:32
+-#: ../lib/plugins/movie/PluginMovieFilmweb.py:32
+-#: ../lib/plugins/movie/PluginMovieOnet.py:30
+-#: ../lib/plugins/movie/PluginMovieStopklatka.py:32
+-#: ../lib/plugins/movie/PluginMovieTanukiAnime.py:30
+-#: ../lib/plugins/movie/PluginMovieWP.py:31
+-msgid "Polish"
+-msgstr ""
+-
+-#: ../lib/dbupgrade.py:110 ../lib/plugins/movie/PluginMovie7arte.py:31
+-#: ../lib/plugins/movie/PluginMovieCineteka.py:31
+-#: ../lib/plugins/movie/PluginMovieClubedevideo.py:32
+-#: ../lib/plugins/movie/PluginMovieIMDB-pt.py:33
+-#: ../lib/plugins/movie/PluginMoviePTGate.py:32
+-msgid "Portuguese"
+-msgstr ""
+-
+-#: ../lib/dbupgrade.py:111
+-msgid "Russian"
+-msgstr ""
+-
+-#: ../lib/dbupgrade.py:112
+-msgid "Simplified Chinese"
+-msgstr ""
+-
+-#: ../lib/dbupgrade.py:113
+-msgid "Slovak"
+-msgstr ""
+-
+-#: ../lib/dbupgrade.py:114 ../lib/plugins/movie/PluginMovieCulturalia.py:31
+-#: ../lib/plugins/movie/PluginMovieFilmAffinity.py:31
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:32
+-msgid "Spanish"
+-msgstr ""
+-
+-#: ../lib/dbupgrade.py:115 ../lib/plugins/movie/PluginMovieFilmtipset.py:32
+-msgid "Swedish"
+-msgstr ""
+-
+-#: ../lib/dbupgrade.py:116
+-msgid "Turkish"
+-msgstr ""
+-
+-#: ../lib/dbupgrade.py:117
+-msgid "Favourite"
+-msgstr ""
+-
+-#: ../lib/dbupgrade.py:118
+-msgid "Buy me"
+-msgstr ""
+-
+-#: ../lib/dbupgrade.py:303
+-msgid ""
+-"Griffith will now convert your database to the new format. This can take "
+-"several minutes if you have a large database."
+-msgstr ""
+-
+-#: ../lib/dbupgrade.py:321
+-msgid "Old DB conversion: please install pysqlite legacy (v1.0)"
+-msgstr ""
+-
+-#: ../lib/dbupgrade.py:348
+-msgid ""
+-"Your database is most probably in SQLite2 format, please convert it to "
+-"SQLite3"
+-msgstr ""
+-
+-#: ../lib/delete.py:38
+-msgid "Are you sure you want to delete?"
+-msgstr ""
+-
+-#: ../lib/delete.py:42
+-msgid "You can't delete movie while it is loaned."
+-msgstr ""
+-
+-#: ../lib/edit.py:77
+-msgid "Image is not valid."
+-msgstr ""
+-
+-#: ../lib/edit.py:114 ../lib/edit.py:147
+-msgid "Image has been updated"
+-msgstr ""
+-
+-#: ../lib/edit.py:125
+-msgid "Are you sure you want to delete this poster?"
+-msgstr ""
+-
+-#: ../lib/gconsole.py:182
+-msgid "No movie found"
+-msgstr ""
+-
+-#: ../lib/gemail.py:38
+-msgid "Connection timed out"
+-msgstr ""
+-
+-#: ../lib/gemail.py:49 ../lib/gemail.py:59
+-#, python-format
+-msgid "Error sending e-mail: %s"
+-msgstr ""
+-
+-#: ../lib/gemail.py:49
+-msgid "login failure"
+-msgstr ""
+-
+-#: ../lib/gemail.py:56
+-msgid "E-mail sent successfully"
+-msgstr ""
+-
+-#: ../lib/gemail.py:76
+-msgid "Movie loan reminder"
+-msgstr ""
+-
+-#: ../lib/gemail.py:76
+-#, python-format
+-msgid ""
+-"Hi, %s!\n"
+-"\n"
+-"Just to remind you that I'm really needing the following movie I have loaned "
+-"to you recently:\n"
+-"\n"
+-"%s (%s)\n"
+-"\n"
+-"Loaned on %s"
+-msgstr ""
+-
+-#: ../lib/gemail.py:80
+-msgid "Mail could not be sent. Please check e-mail preferences."
+-msgstr ""
+-
+-#: ../lib/gemail.py:82
+-msgid "This person has no e-mail address defined."
+-msgstr ""
+-
+-#: ../lib/gutils.py:381
+-msgid "Images"
+-msgstr ""
+-
+-#: ../lib/gutils.py:392
+-msgid "backups"
+-msgstr ""
+-
+-#: ../lib/gutils.py:398 ../lib/plugins/imp/__init__.py:377
+-msgid "All files"
+-msgstr ""
+-
+-#: ../lib/initialize.py:180
+-msgid "No."
+-msgstr ""
+-
+-#: ../lib/initialize.py:188 ../lib/initialize.py:787
+-#: ../lib/plugins/export/PluginExportHTML.py:150 ../glade/griffith.glade.h:74
+-msgid "Image"
+-msgstr ""
+-
+-#: ../lib/initialize.py:227 ../lib/initialize.py:803
+-#: ../lib/plugins/export/PluginExportHTML.py:162 ../glade/griffith.glade.h:137
+-msgid "Seen it"
+-msgstr ""
+-
+-#: ../lib/initialize.py:236 ../lib/initialize.py:811
+-#: ../lib/plugins/export/PluginExportHTML.py:164
+-#: ../lib/plugins/export/PluginExportPDF.py:171 ../glade/griffith.glade.h:173
+-msgid "Year"
+-msgstr ""
+-
+-#: ../lib/initialize.py:246 ../lib/initialize.py:801
+-#: ../lib/plugins/export/PluginExportHTML.py:160
+-#: ../lib/plugins/export/PluginExportPDF.py:175 ../glade/griffith.glade.h:131
+-msgid "Runtime"
+-msgstr ""
+-
+-#: ../lib/initialize.py:256 ../lib/initialize.py:799
+-#: ../lib/plugins/export/PluginExportHTML.py:159 ../glade/griffith.glade.h:119
+-msgid "Rating"
+-msgstr ""
+-
+-#: ../lib/initialize.py:266 ../glade/griffith.glade.h:47
+-msgid "Created"
+-msgstr ""
+-
+-#: ../lib/initialize.py:276 ../glade/griffith.glade.h:164
+-msgid "Updated"
+-msgstr ""
+-
+-#: ../lib/initialize.py:346
+-msgid "Loan Date"
+-msgstr ""
+-
+-#: ../lib/initialize.py:352
+-msgid "Return Date"
+-msgstr ""
+-
+-#: ../lib/initialize.py:357
+-msgid "Loaned To"
+-msgstr ""
+-
+-#: ../lib/initialize.py:377 ../lib/plugins/movie/PluginMovieIMDB-de.py:210
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:410
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:457
+-#: ../lib/plugins/movie/PluginMovieIMDB-it.py:152
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:176
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:362
+-msgid "Language"
+-msgstr ""
+-
+-#: ../lib/initialize.py:389 ../lib/initialize.py:814
+-msgid "lector"
+-msgstr ""
+-
+-#: ../lib/initialize.py:390 ../lib/initialize.py:814
+-msgid "dubbing"
+-msgstr ""
+-
+-#: ../lib/initialize.py:392 ../lib/initialize.py:814
+-msgid "commentary"
+-msgstr ""
+-
+-#: ../lib/initialize.py:399 ../glade/griffith.glade.h:162
+-msgid "Type"
+-msgstr ""
+-
+-#: ../lib/initialize.py:414
+-msgid "Codec"
+-msgstr ""
+-
+-#: ../lib/initialize.py:429
+-msgid "Channels"
+-msgstr ""
+-
+-#: ../lib/initialize.py:444
+-msgid "Subtitle format"
+-msgstr ""
+-
+-#: ../lib/initialize.py:598
+-msgid "Enable this extension"
+-msgstr ""
+-
+-#: ../lib/initialize.py:689 ../glade/griffith.glade.h:95
+-msgid "Name"
+-msgstr ""
+-
+-#: ../lib/initialize.py:695 ../glade/exporthtml.glade.h:15
+-#: ../glade/griffith.glade.h:54 ../glade/import.glade.h:5
+-msgid "E-mail"
+-msgstr ""
+-
+-#: ../lib/initialize.py:733
+-msgid "Any"
+-msgstr ""
+-
+-#: ../lib/initialize.py:745
+-msgid "Last added"
+-msgstr ""
+-
+-#: ../lib/initialize.py:777 ../lib/plugins/export/PluginExportHTML.py:170
+-#: ../glade/griffith.glade.h:33
+-msgid "Barcode"
+-msgstr ""
+-
+-#: ../lib/initialize.py:778 ../lib/plugins/export/PluginExportHTML.py:145
+-#: ../lib/plugins/export/PluginExportPDF.py:187 ../glade/griffith.glade.h:37
+-msgid "Cast"
+-msgstr ""
+-
+-#: ../lib/initialize.py:779 ../lib/plugins/export/PluginExportHTML.py:167
+-#: ../glade/griffith.glade.h:36
+-msgid "Cameraman"
+-msgstr ""
+-
+-#: ../lib/initialize.py:780 ../lib/plugins/export/PluginExportHTML.py:146
+-#: ../glade/griffith.glade.h:39
+-msgid "Classification"
+-msgstr ""
+-
+-#: ../lib/initialize.py:781 ../lib/plugins/export/PluginExportHTML.py:178
+-#: ../glade/griffith.glade.h:42
+-msgid "Collection"
+-msgstr ""
+-
+-#: ../lib/initialize.py:782 ../lib/initialize.py:813
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:214
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:412
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:459
+-#: ../lib/plugins/movie/PluginMovieIMDB-it.py:156
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:180
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:364 ../glade/griffith.glade.h:43
+-msgid "Color"
+-msgstr ""
+-
+-#: ../lib/initialize.py:783 ../glade/griffith.glade.h:44
+-msgid "Condition"
+-msgstr ""
+-
+-#: ../lib/initialize.py:788 ../glade/griffith.glade.h:78
+-msgid "Layers"
+-msgstr ""
+-
+-#: ../lib/initialize.py:789 ../lib/plugins/export/PluginExportHTML.py:154
+-msgid "Loaned"
+-msgstr ""
+-
+-#: ../lib/initialize.py:790 ../lib/plugins/export/PluginExportHTML.py:155
+-#: ../glade/griffith.glade.h:53
+-msgid "Discs"
+-msgstr ""
+-
+-#: ../lib/initialize.py:791 ../glade/griffith.glade.h:90
+-msgid "Medium"
+-msgstr ""
+-
+-#: ../lib/initialize.py:792 ../lib/plugins/export/PluginExportHTML.py:165
+-#: ../lib/plugins/export/PluginExportPDF.py:195 ../glade/griffith.glade.h:99
+-msgid "Notes"
+-msgstr ""
+-
+-#: ../lib/initialize.py:793 ../lib/plugins/export/PluginExportHTML.py:156
+-#: ../glade/griffith.glade.h:100
+-msgid "Number"
+-msgstr ""
+-
+-#: ../lib/initialize.py:794 ../lib/plugins/export/PluginExportHTML.py:151
+-#: ../glade/griffith.glade.h:101
+-msgid "Official site"
+-msgstr ""
+-
+-#: ../lib/initialize.py:796 ../lib/plugins/export/PluginExportHTML.py:158
+-#: ../lib/plugins/export/PluginExportPDF.py:191 ../glade/griffith.glade.h:111
+-msgid "Plot"
+-msgstr ""
+-
+-#: ../lib/initialize.py:797
+-msgid "Poster"
+-msgstr ""
+-
+-#: ../lib/initialize.py:798
+-msgid "Aspect ratio"
+-msgstr ""
+-
+-#: ../lib/initialize.py:800 ../glade/griffith.glade.h:121
+-msgid "Region"
+-msgstr ""
+-
+-#: ../lib/initialize.py:802 ../lib/plugins/export/PluginExportHTML.py:166
+-#: ../glade/griffith.glade.h:135
+-msgid "Screenplay"
+-msgstr ""
+-
+-#: ../lib/initialize.py:804 ../lib/plugins/export/PluginExportHTML.py:152
+-#: ../glade/griffith.glade.h:148
+-msgid "Site"
+-msgstr ""
+-
+-#: ../lib/initialize.py:805 ../lib/plugins/export/PluginExportHTML.py:161
+-#: ../glade/griffith.glade.h:154
+-msgid "Studio"
+-msgstr ""
+-
+-#: ../lib/initialize.py:806 ../glade/griffith.glade.h:156
+-msgid "Tags"
+-msgstr ""
+-
+-#: ../lib/initialize.py:808 ../lib/plugins/export/PluginExportHTML.py:153
+-#: ../glade/griffith.glade.h:161
+-msgid "Trailer"
+-msgstr ""
+-
+-#: ../lib/initialize.py:809 ../lib/plugins/export/PluginExportHTML.py:181
+-#: ../glade/griffith.glade.h:168
+-msgid "Video codec"
+-msgstr ""
+-
+-#: ../lib/initialize.py:810 ../lib/plugins/export/PluginExportHTML.py:179
+-#: ../glade/griffith.glade.h:171
+-msgid "Volume"
+-msgstr ""
+-
+-#: ../lib/initialize.py:812 ../lib/initialize.py:813 ../lib/initialize.py:815
+-#: ../lib/initialize.py:1076 ../lib/initialize.py:1077
+-#: ../lib/initialize.py:1108 ../lib/initialize.py:1109
+-msgid "N/A"
+-msgstr ""
+-
+-#: ../lib/initialize.py:812
+-msgid "Damaged"
+-msgstr ""
+-
+-#: ../lib/initialize.py:812
+-msgid "Poor"
+-msgstr ""
+-
+-#: ../lib/initialize.py:812
+-msgid "Fair"
+-msgstr ""
+-
+-#: ../lib/initialize.py:812
+-msgid "Good"
+-msgstr ""
+-
+-#: ../lib/initialize.py:812
+-msgid "Excellent"
+-msgstr ""
+-
+-#: ../lib/initialize.py:813
+-msgid "Black and White"
+-msgstr ""
+-
+-#: ../lib/initialize.py:813
+-msgid "Mixed"
+-msgstr ""
+-
+-#: ../lib/initialize.py:815
+-msgid "Single Side, Single Layer"
+-msgstr ""
+-
+-#: ../lib/initialize.py:815
+-msgid "Single Side, Dual Layer"
+-msgstr ""
+-
+-#: ../lib/initialize.py:815
+-msgid "Dual Side, Single Layer"
+-msgstr ""
+-
+-#: ../lib/initialize.py:815
+-msgid "Dual Side, Dual Layer"
+-msgstr ""
+-
+-#: ../lib/initialize.py:817
+-msgid "Region 0 (No Region Coding)"
+-msgstr ""
+-
+-#: ../lib/initialize.py:818
+-msgid "Region 1 (United States of America, Canada)"
+-msgstr ""
+-
+-#: ../lib/initialize.py:819
+-msgid "Region 2 (Europe, Egypt, Arabia, Japan and South Africa)"
+-msgstr ""
+-
+-#: ../lib/initialize.py:820
+-msgid "Region 3 (Korea, Thailand, Vietnam, Borneo and Indonesia)"
+-msgstr ""
+-
+-#: ../lib/initialize.py:821
+-msgid "Region 4 (Australia and New Zealand, Mexico and South America)"
+-msgstr ""
+-
+-#: ../lib/initialize.py:822
+-msgid "Region 5 (India, Africa, Russia and former USSR countries)"
+-msgstr ""
+-
+-#: ../lib/initialize.py:823
+-msgid "Region 6 (Popular Republic of China)"
+-msgstr ""
+-
+-#: ../lib/initialize.py:824
+-msgid "Region 7 (Reserved for Unspecified Special Use)"
+-msgstr ""
+-
+-#: ../lib/initialize.py:825
+-msgid "Region 8 (Airlines/Cruise Ships)"
+-msgstr ""
+-
+-#: ../lib/initialize.py:826
+-msgid ""
+-"Region A/1 (North and South America, Japan, Korea, Taiwan, Hong Kong, "
+-"Southeast Asia)"
+-msgstr ""
+-
+-#: ../lib/initialize.py:827
+-msgid "Region B/2 (Europe, Middle East, Africa, Australia, Oceania)"
+-msgstr ""
+-
+-#: ../lib/initialize.py:828
+-msgid "Region C/3 (India, Nepal, China, Russia, Central and South Asia)"
+-msgstr ""
+-
+-#: ../lib/initialize.py:867
+-msgid "Dictionary not available. Spellcheck will be disabled. \n"
+-msgstr ""
+-
+-#: ../lib/loan.py:44
+-msgid "No person is defined yet."
+-msgstr ""
+-
+-#: ../lib/loan.py:73
+-msgid "Do you want to loan the whole collection?"
+-msgstr ""
+-
+-#: ../lib/loan.py:82
+-msgid ""
+-"Collection contains loaned movie.\n"
+-"Loan aborted!"
+-msgstr ""
+-
+-#: ../lib/loan.py:87
+-msgid "Movie loaned"
+-msgstr ""
+-
+-#: ../lib/main_treeview.py:305
+-#, python-format
+-msgid "This movie has been loaned to %s on %s"
+-msgstr ""
+-
+-#: ../lib/main_treeview.py:316
+-msgid "Movie not loaned"
+-msgstr ""
+-
+-#: ../lib/movie.py:162 ../lib/movie.py:182
+-#: ../lib/plugins/movie/PluginMovieMovieMeter.py:88
+-msgid "Fetching data"
+-msgstr ""
+-
+-#: ../lib/movie.py:162 ../lib/movie.py:182 ../lib/movie.py:230
+-#: ../lib/movie.py:335 ../lib/movie.py:356
+-#: ../lib/plugins/movie/PluginMovieMovieMeter.py:88
+-#: ../lib/plugins/movie/PluginMovieMovieMeter.py:188
+-msgid "Wait a moment"
+-msgstr ""
+-
+-#: ../lib/movie.py:216 ../lib/movie.py:385
+-msgid "Connection error"
+-msgstr ""
+-
+-#: ../lib/movie.py:230
+-msgid "Fetching poster"
+-msgstr ""
+-
+-#: ../lib/movie.py:335 ../lib/movie.py:356
+-#: ../lib/plugins/movie/PluginMovieMovieMeter.py:188
+-msgid "Searching"
+-msgstr ""
+-
+-#: ../lib/movie.py:523
+-msgid "Cancel"
+-msgstr ""
+-
+-#: ../lib/people.py:74
+-msgid "You should fill the person name"
+-msgstr ""
+-
+-#: ../lib/people.py:114
+-msgid "Record updated"
+-msgstr ""
+-
+-#: ../lib/people.py:135
+-msgid "This person has loaned films from you. Return them first."
+-msgstr ""
+-
+-#: ../lib/people.py:139
+-msgid ""
+-"This person has data in the loan history. This data will be erased if you "
+-"continue."
+-msgstr ""
+-
+-#: ../lib/people.py:141
+-#, python-format
+-msgid ""
+-"%s\n"
+-"Are you sure you want to delete this person?"
+-msgstr ""
+-
+-#: ../lib/sql.py:117
+-msgid ""
+-"Cannot connect to database.\n"
+-"Falling back to SQLite."
+-msgstr ""
+-
+-#: ../lib/sql.py:117
+-msgid "Please check debug output for more informations."
+-msgstr ""
+-
+-#: ../lib/sql.py:148
+-msgid "This database requires newer version of Griffith."
+-msgstr ""
+-
+-#: ../lib/version.py:29
+-msgid "Griffith is a film collection manager."
+-msgstr ""
+-
+-#: ../lib/view.py:28
+-msgid "Filter activated. Showing only not seen movies."
+-msgstr ""
+-
+-#: ../lib/view.py:34
+-msgid "Filter activated. Showing only loaned movies."
+-msgstr ""
+-
+-#: ../lib/view.py:46
+-#, python-format
+-msgid "Filter activated. Showing only movies from volume: %s"
+-msgstr ""
+-
+-#: ../lib/view.py:53
+-#, python-format
+-msgid "Filter activated. Showing only movies from collection: %s"
+-msgstr ""
+-
+-#: ../lib/widgets.py:392
+-msgid ""
+-"Define here the PDF reader you want to use within Griffith. Popular choices "
+-"are xpdf, gpdf, evince or kpdf. Make sure you have this program installed "
+-"and working first."
+-msgstr ""
+-
+-#: ../lib/widgets.py:393
+-msgid ""
+-"Here you can define the desired language to use while spell checking some "
+-"fields. Use you locale setting. For example, to use european portuguese "
+-"spell checking enter 'pt'"
+-msgstr ""
+-
+-#: ../lib/widgets.py:394
+-msgid ""
+-"Use this entry to define the SMTP server you want to use to send e-mails. On "
+-"*nix systems, 'localhost' should work. Alternatively, you can use your "
+-"Internet Service Provider's SMTP server address."
+-msgstr ""
+-
+-#: ../lib/widgets.py:395
+-msgid ""
+-"This is the from e-mail address that should be used to all outgoing e-mail. "
+-"You want to include your own e-mail address here probably."
+-msgstr ""
+-
+-#: ../lib/widgets.py:396
+-msgid ""
+-"Here you can define the smtp server port to use. If you want to use your "
+-"gmail account service to send e-mails, try to enter '587' here. Default (and "
+-"the most common one) is '25'"
+-msgstr ""
+-
+-#: ../lib/widgets.py:397
+-msgid ""
+-"If you need TLS support, please check this checkbox. This is needed, for "
+-"example, when using gmail service to send your reminder e-mails."
+-msgstr ""
+-
+-#: ../lib/db/_objects.py:58
+-msgid "Name cannot be empty"
+-msgstr ""
+-
+-#: ../lib/db/_objects.py:188
+-msgid "E-mail address is not valid"
+-msgstr ""
+-
+-#: ../lib/plugins/movie/PluginMovieAllocine.py:104
+-#: ../lib/plugins/movie/PluginMovieAllocine.py:232
+-#: ../lib/plugins/movie/PluginMovieAllocine.py:233
+-#: ../lib/plugins/movie/PluginMovieAllocine.py:234
+-#: ../lib/plugins/movie/PluginMovieAllocine.py:235
+-#: ../lib/plugins/movie/PluginMovieAllocine.py:236
+-#: ../lib/plugins/movie/PluginMovieAllocine.py:237
+-#: ../lib/plugins/movie/PluginMovieAllocine.py:238
+-#: ../lib/plugins/movie/PluginMovieAllocine.py:239
+-#: ../lib/plugins/movie/PluginMovieAllocine.py:261
+-#: ../lib/plugins/movie/PluginMovieAllocine.py:262
+-#: ../lib/plugins/movie/PluginMovieAllocine.py:263
+-#: ../lib/plugins/movie/PluginMovieAllocine.py:264
+-#: ../lib/plugins/movie/PluginMovieAllocine.py:265
+-#: ../lib/plugins/movie/PluginMovieAllocine.py:266
+-#: ../lib/plugins/movie/PluginMovieAllocine.py:267
+-#: ../lib/plugins/movie/PluginMovieAllocine.py:268
+-#: ../lib/plugins/movie/PluginMovieAllocine.py:269
+-#: ../lib/plugins/movie/PluginMovieAllocine.py:270
+-#: ../lib/plugins/movie/PluginMovieAllocine.py:271
+-#: ../lib/plugins/movie/PluginMovieAllocine.py:272
+-#: ../lib/plugins/movie/PluginMovieAllocine.py:273
+-#: ../lib/plugins/movie/PluginMovieAllocine.py:274
+-#: ../lib/plugins/movie/PluginMovieAllocine.py:275
+-#: ../lib/plugins/movie/PluginMovieAllocine.py:276
+-#: ../lib/plugins/movie/PluginMovieAllocine.py:277
+-#: ../lib/plugins/movie/PluginMovieAllocine.py:278
+-#: ../lib/plugins/movie/PluginMovieAllocine.py:279
+-#: ../lib/plugins/movie/PluginMovieAllocine.py:280
+-#: ../lib/plugins/movie/PluginMovieAllocine.py:281
+-#: ../lib/plugins/movie/PluginMovieAllocine.py:282
+-#: ../lib/plugins/movie/PluginMovieAllocine.py:283
+-#: ../lib/plugins/movie/PluginMovieAllocine.py:284
+-#: ../lib/plugins/movie/PluginMovieAllocine.py:285
+-#: ../lib/plugins/movie/PluginMovieAllocine.py:286
+-#: ../lib/plugins/movie/PluginMovieAllocine.py:287
+-#: ../lib/plugins/movie/PluginMovieAllocine.py:288
+-#: ../lib/plugins/movie/PluginMovieAllocine.py:289
+-#: ../lib/plugins/movie/PluginMovieAllocine.py:290
+-#: ../lib/plugins/movie/PluginMovieAllocine.py:291
+-#: ../lib/plugins/movie/PluginMovieAllocine.py:292
+-#: ../lib/plugins/movie/PluginMovieAllocine.py:293
+-#: ../lib/plugins/movie/PluginMovieAllocine.py:294
+-#: ../lib/plugins/movie/PluginMovieAllocine.py:295
+-#: ../lib/plugins/movie/PluginMovieAllocine.py:296
+-#: ../lib/plugins/movie/PluginMovieAllocine.py:297
+-#: ../lib/plugins/movie/PluginMovieAllRovi.py:75
+-#: ../lib/plugins/movie/PluginMovieAllRovi.py:171
+-#: ../lib/plugins/movie/PluginMovieAllRovi.py:172
+-#: ../lib/plugins/movie/PluginMovieAllRovi.py:173
+-#: ../lib/plugins/movie/PluginMovieAllRovi.py:174
+-#: ../lib/plugins/movie/PluginMovieAllRovi.py:175
+-#: ../lib/plugins/movie/PluginMovieAllRovi.py:176
+-#: ../lib/plugins/movie/PluginMovieAllRovi.py:177
+-#: ../lib/plugins/movie/PluginMovieAllRovi.py:178
+-#: ../lib/plugins/movie/PluginMovieAllRovi.py:180
+-#: ../lib/plugins/movie/PluginMovieCinematografo.py:99
+-#: ../lib/plugins/movie/PluginMovieCinematografo.py:254
+-#: ../lib/plugins/movie/PluginMovieCinematografo.py:255
+-#: ../lib/plugins/movie/PluginMovieCinematografo.py:256
+-#: ../lib/plugins/movie/PluginMovieCinematografo.py:257
+-#: ../lib/plugins/movie/PluginMovieCinematografo.py:258
+-#: ../lib/plugins/movie/PluginMovieCinematografo.py:259
+-#: ../lib/plugins/movie/PluginMovieCinematografo.py:260
+-#: ../lib/plugins/movie/PluginMovieCinematografo.py:261
+-#: ../lib/plugins/movie/PluginMovieCinematografo.py:262
+-#: ../lib/plugins/movie/PluginMovieCinematografo.py:263
+-#: ../lib/plugins/movie/PluginMovieCinematografo.py:264
+-#: ../lib/plugins/movie/PluginMovieCinematografo.py:265
+-#: ../lib/plugins/movie/PluginMovieCinematografo.py:266
+-#: ../lib/plugins/movie/PluginMovieCinematografo.py:267
+-#: ../lib/plugins/movie/PluginMovieCinematografo.py:268
+-#: ../lib/plugins/movie/PluginMovieCinematografo.py:269
+-#: ../lib/plugins/movie/PluginMovieCinematografo.py:270
+-#: ../lib/plugins/movie/PluginMovieCinematografo.py:271
+-#: ../lib/plugins/movie/PluginMovieCinematografo.py:272
+-#: ../lib/plugins/movie/PluginMovieCinematografo.py:273
+-#: ../lib/plugins/movie/PluginMovieCinematografo.py:274
+-#: ../lib/plugins/movie/PluginMovieCinematografo.py:275
+-#: ../lib/plugins/movie/PluginMovieCineMovies.py:82
+-#: ../lib/plugins/movie/PluginMovieCineMovies.py:84
+-#: ../lib/plugins/movie/PluginMovieCineMovies.py:169
+-#: ../lib/plugins/movie/PluginMovieCineMovies.py:170
+-#: ../lib/plugins/movie/PluginMovieCineMovies.py:171
+-#: ../lib/plugins/movie/PluginMovieCineMovies.py:172
+-#: ../lib/plugins/movie/PluginMovieCineMovies.py:173
+-#: ../lib/plugins/movie/PluginMovieCineMovies.py:174
+-#: ../lib/plugins/movie/PluginMovieCineMovies.py:175
+-#: ../lib/plugins/movie/PluginMovieCineMovies.py:176
+-#: ../lib/plugins/movie/PluginMovieCineMovies.py:177
+-#: ../lib/plugins/movie/PluginMovieCineMovies.py:178
+-#: ../lib/plugins/movie/PluginMovieCineMovies.py:179
+-#: ../lib/plugins/movie/PluginMovieCineMovies.py:180
+-#: ../lib/plugins/movie/PluginMovieCineMovies.py:181
+-#: ../lib/plugins/movie/PluginMovieCineMovies.py:182
+-#: ../lib/plugins/movie/PluginMovieCineMovies.py:183
+-#: ../lib/plugins/movie/PluginMovieCineMovies.py:205
+-#: ../lib/plugins/movie/PluginMovieCineMovies.py:206
+-#: ../lib/plugins/movie/PluginMovieCineMovies.py:207
+-#: ../lib/plugins/movie/PluginMovieCineMovies.py:208
+-#: ../lib/plugins/movie/PluginMovieCineMovies.py:209
+-#: ../lib/plugins/movie/PluginMovieCineMovies.py:210
+-#: ../lib/plugins/movie/PluginMovieCineMovies.py:211
+-#: ../lib/plugins/movie/PluginMovieCineMovies.py:212
+-#: ../lib/plugins/movie/PluginMovieCineMovies.py:213
+-#: ../lib/plugins/movie/PluginMovieCineMovies.py:214
+-#: ../lib/plugins/movie/PluginMovieCineMovies.py:215
+-#: ../lib/plugins/movie/PluginMovieCineMovies.py:216
+-#: ../lib/plugins/movie/PluginMovieCineMovies.py:217
+-#: ../lib/plugins/movie/PluginMovieCineMovies.py:218
+-#: ../lib/plugins/movie/PluginMovieCineMovies.py:219
+-#: ../lib/plugins/movie/PluginMovieCineMovies.py:220
+-#: ../lib/plugins/movie/PluginMovieCineMovies.py:221
+-#: ../lib/plugins/movie/PluginMovieCineMovies.py:222
+-#: ../lib/plugins/movie/PluginMovieCineMovies.py:223
+-#: ../lib/plugins/movie/PluginMovieCineMovies.py:224
+-#: ../lib/plugins/movie/PluginMovieCineMovies.py:225
+-#: ../lib/plugins/movie/PluginMovieCineMovies.py:226
+-#: ../lib/plugins/movie/PluginMovieCineMovies.py:227
+-#: ../lib/plugins/movie/PluginMovieCineMovies.py:228
+-#: ../lib/plugins/movie/PluginMovieCineMovies.py:229
+-#: ../lib/plugins/movie/PluginMovieCineMovies.py:230
+-#: ../lib/plugins/movie/PluginMovieCineMovies.py:231
+-#: ../lib/plugins/movie/PluginMovieCineMovies.py:232
+-#: ../lib/plugins/movie/PluginMovieCineMovies.py:233
+-#: ../lib/plugins/movie/PluginMovieCineMovies.py:234
+-#: ../lib/plugins/movie/PluginMovieCineMovies.py:235
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:91
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:193
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:194
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:195
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:196
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:197
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:198
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:199
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:200
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:201
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:202
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:203
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:204
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:205
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:206
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:207
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:208
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:209
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:210
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:211
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:212
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:213
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:214
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:215
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:216
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:217
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:218
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:219
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:220
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:221
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:222
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:223
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:224
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:225
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:226
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:227
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:228
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:229
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:230
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:231
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:232
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:233
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:234
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:235
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:236
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:237
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:238
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:239
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:240
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:241
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:242
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:243
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:244
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:245
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:246
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:247
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:248
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:249
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:250
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:251
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:252
+-#: ../lib/plugins/movie/PluginMovieE-Pipoca.py:253
+-#: ../lib/plugins/movie/PluginMovieFDb.py:121
+-#: ../lib/plugins/movie/PluginMovieFilmeVonAZ.py:91
+-#: ../lib/plugins/movie/PluginMovieFilmeVonAZ.py:200
+-#: ../lib/plugins/movie/PluginMovieFilmeVonAZ.py:201
+-#: ../lib/plugins/movie/PluginMovieFilmeVonAZ.py:202
+-#: ../lib/plugins/movie/PluginMovieFilmeVonAZ.py:203
+-#: ../lib/plugins/movie/PluginMovieFilmeVonAZ.py:204
+-#: ../lib/plugins/movie/PluginMovieFilmeVonAZ.py:205
+-#: ../lib/plugins/movie/PluginMovieFilmeVonAZ.py:206
+-#: ../lib/plugins/movie/PluginMovieFilmeVonAZ.py:227
+-#: ../lib/plugins/movie/PluginMovieFilmeVonAZ.py:228
+-#: ../lib/plugins/movie/PluginMovieFilmeVonAZ.py:229
+-#: ../lib/plugins/movie/PluginMovieFilmeVonAZ.py:230
+-#: ../lib/plugins/movie/PluginMovieFilmeVonAZ.py:231
+-#: ../lib/plugins/movie/PluginMovieFilmeVonAZ.py:232
+-#: ../lib/plugins/movie/PluginMovieFilmeVonAZ.py:233
+-#: ../lib/plugins/movie/PluginMovieFilmeVonAZ.py:234
+-#: ../lib/plugins/movie/PluginMovieFilmeVonAZ.py:255
+-#: ../lib/plugins/movie/PluginMovieFilmeVonAZ.py:256
+-#: ../lib/plugins/movie/PluginMovieFilmeVonAZ.py:257
+-#: ../lib/plugins/movie/PluginMovieFilmeVonAZ.py:258
+-#: ../lib/plugins/movie/PluginMovieFilmeVonAZ.py:259
+-#: ../lib/plugins/movie/PluginMovieFilmweb.py:134
+-#: ../lib/plugins/movie/PluginMovieHKMDB.py:84
+-#: ../lib/plugins/movie/PluginMovieHKMDB.py:185
+-#: ../lib/plugins/movie/PluginMovieHKMDB.py:186
+-#: ../lib/plugins/movie/PluginMovieHKMDB.py:189
+-#: ../lib/plugins/movie/PluginMovieHKMDB.py:191
+-#: ../lib/plugins/movie/PluginMovieHKMDB.py:192
+-#: ../lib/plugins/movie/PluginMovieHKMDB.py:194
+-#: ../lib/plugins/movie/PluginMovieHKMDB.py:195
+-#: ../lib/plugins/movie/PluginMovieHKMDB.py:199
+-#: ../lib/plugins/movie/PluginMovieHKMDB.py:203
+-#: ../lib/plugins/movie/PluginMovieHKMDB.py:204
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:133
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:134
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:314
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:315
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:316
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:317
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:318
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:319
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:320
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:321
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:322
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:323
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:324
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:325
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:326
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:327
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:328
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:329
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:330
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:331
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:332
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:333
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:334
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:335
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:336
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:337
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:338
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:339
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:340
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:341
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:342
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:343
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:344
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:345
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:346
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:347
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:348
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:349
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:350
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:351
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:352
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:353
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:354
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:355
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:356
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:357
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:358
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:359
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:360
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:361
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:362
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:363
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:364
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:365
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:366
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:367
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:368
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:369
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:370
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:371
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:372
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:373
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:374
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:375
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:376
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:377
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:378
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:379
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:380
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:381
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:382
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:383
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:384
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:385
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:386
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:387
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:388
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:389
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:390
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:391
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:392
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:393
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:394
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:395
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:396
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:397
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:398
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:399
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:400
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:401
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:424
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:425
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:426
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:427
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:428
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:429
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:430
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:431
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:432
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:433
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:439
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:440
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:445
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:446
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:447
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:448
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:139
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:140
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:268
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:269
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:270
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:271
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:272
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:273
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:274
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:275
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:276
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:277
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:278
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:279
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:280
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:281
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:282
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:283
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:284
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:285
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:286
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:287
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:288
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:289
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:290
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:291
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:292
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:293
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:294
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:295
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:296
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:297
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:298
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:299
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:300
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:301
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:302
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:303
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:304
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:305
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:306
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:307
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:308
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:309
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:310
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:311
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:312
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:313
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:314
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:315
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:316
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:317
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:318
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:319
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:320
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:321
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:322
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:323
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:324
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:325
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:326
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:327
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:328
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:329
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:330
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:331
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:332
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:333
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:334
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:335
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:336
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:337
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:338
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:339
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:340
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:341
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:342
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:343
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:344
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:345
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:346
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:347
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:348
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:349
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:350
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:351
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:352
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:353
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:354
+-#: ../lib/plugins/movie/PluginMovieIMDB-es.py:355
+-#: ../lib/plugins/movie/PluginMovieIMDB-it.py:96
+-#: ../lib/plugins/movie/PluginMovieIMDB-it.py:97
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:99
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:100
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:298
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:299
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:300
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:301
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:302
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:303
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:304
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:305
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:306
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:307
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:308
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:309
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:310
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:311
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:312
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:313
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:314
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:315
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:316
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:317
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:318
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:319
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:320
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:321
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:322
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:323
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:324
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:325
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:326
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:327
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:328
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:329
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:330
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:331
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:332
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:333
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:334
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:335
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:336
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:337
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:338
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:339
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:340
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:341
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:342
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:343
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:344
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:345
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:346
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:347
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:348
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:349
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:350
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:351
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:352
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:353
+-#: ../lib/plugins/movie/PluginMovieKinoDe.py:194
+-#: ../lib/plugins/movie/PluginMovieKinoDe.py:205
+-#: ../lib/plugins/movie/PluginMovieKinoDe.py:386
+-#: ../lib/plugins/movie/PluginMovieKinoDe.py:387
+-#: ../lib/plugins/movie/PluginMovieKinoDe.py:388
+-#: ../lib/plugins/movie/PluginMovieKinoDe.py:389
+-#: ../lib/plugins/movie/PluginMovieKinoDe.py:390
+-#: ../lib/plugins/movie/PluginMovieKinoDe.py:391
+-#: ../lib/plugins/movie/PluginMovieKinoDe.py:392
+-#: ../lib/plugins/movie/PluginMovieKinoDe.py:393
+-#: ../lib/plugins/movie/PluginMovieKinoDe.py:469
+-#: ../lib/plugins/movie/PluginMovieKinoDe.py:470
+-#: ../lib/plugins/movie/PluginMovieKinoDe.py:471
+-#: ../lib/plugins/movie/PluginMovieKinoDe.py:472
+-#: ../lib/plugins/movie/PluginMovieKinoDe.py:473
+-#: ../lib/plugins/movie/PluginMovieMoviefone.py:72
+-#: ../lib/plugins/movie/PluginMovieMyMoviesIt.py:91
+-#: ../lib/plugins/movie/PluginMovieMyMoviesIt.py:214
+-#: ../lib/plugins/movie/PluginMovieMyMoviesIt.py:215
+-#: ../lib/plugins/movie/PluginMovieMyMoviesIt.py:216
+-#: ../lib/plugins/movie/PluginMovieMyMoviesIt.py:217
+-#: ../lib/plugins/movie/PluginMovieMyMoviesIt.py:218
+-#: ../lib/plugins/movie/PluginMovieMyMoviesIt.py:219
+-#: ../lib/plugins/movie/PluginMovieMyMoviesIt.py:220
+-#: ../lib/plugins/movie/PluginMovieMyMoviesIt.py:221
+-#: ../lib/plugins/movie/PluginMovieMyMoviesIt.py:222
+-#: ../lib/plugins/movie/PluginMovieMyMoviesIt.py:223
+-#: ../lib/plugins/movie/PluginMovieMyMoviesIt.py:224
+-#: ../lib/plugins/movie/PluginMovieMyMoviesIt.py:225
+-#: ../lib/plugins/movie/PluginMovieMyMoviesIt.py:226
+-#: ../lib/plugins/movie/PluginMovieMyMoviesIt.py:227
+-#: ../lib/plugins/movie/PluginMovieMyMoviesIt.py:228
+-#: ../lib/plugins/movie/PluginMovieOFDb.py:88
+-#: ../lib/plugins/movie/PluginMovieOFDb.py:176
+-#: ../lib/plugins/movie/PluginMovieOFDb.py:177
+-#: ../lib/plugins/movie/PluginMovieOFDb.py:178
+-#: ../lib/plugins/movie/PluginMovieOFDb.py:179
+-#: ../lib/plugins/movie/PluginMovieOFDb.py:180
+-#: ../lib/plugins/movie/PluginMovieOFDb.py:181
+-#: ../lib/plugins/movie/PluginMovieOFDb.py:183
+-#: ../lib/plugins/movie/PluginMovieOFDb.py:184
+-#: ../lib/plugins/movie/PluginMovieOFDb.py:185
+-#: ../lib/plugins/movie/PluginMovieOFDb.py:192
+-#: ../lib/plugins/movie/PluginMovieOFDb.py:193
+-#: ../lib/plugins/movie/PluginMovieOFDb.py:194
+-#: ../lib/plugins/movie/PluginMovieOFDb.py:197
+-#: ../lib/plugins/movie/PluginMovieOFDb.py:202
+-#: ../lib/plugins/movie/PluginMovieOFDb.py:204
+-#: ../lib/plugins/movie/PluginMovieOFDb.py:227
+-#: ../lib/plugins/movie/PluginMovieOFDb.py:230
+-#: ../lib/plugins/movie/PluginMovieOFDb.py:249
+-#: ../lib/plugins/movie/PluginMovieOFDb.py:250
+-#: ../lib/plugins/movie/PluginMovieOFDb.py:251
+-#: ../lib/plugins/movie/PluginMovieOFDb.py:252
+-#: ../lib/plugins/movie/PluginMovieOFDb.py:258
+-#: ../lib/plugins/movie/PluginMovieOFDb.py:290
+-#: ../lib/plugins/movie/PluginMovieOFDb.py:291
+-#: ../lib/plugins/movie/PluginMovieOFDb.py:292
+-#: ../lib/plugins/movie/PluginMovieOFDb.py:293
+-#: ../lib/plugins/movie/PluginMovieOFDb.py:303
+-#: ../lib/plugins/movie/PluginMovieOFDb.py:304
+-#: ../lib/plugins/movie/PluginMovieOFDb.py:306
+-#: ../lib/plugins/movie/PluginMovieOnet.py:88
+-#: ../lib/plugins/movie/PluginMovieScope.py:86
+-#: ../lib/plugins/movie/PluginMovieScope.py:195
+-#: ../lib/plugins/movie/PluginMovieScope.py:196
+-#: ../lib/plugins/movie/PluginMovieScope.py:197
+-#: ../lib/plugins/movie/PluginMovieScope.py:198
+-#: ../lib/plugins/movie/PluginMovieScope.py:199
+-#: ../lib/plugins/movie/PluginMovieScope.py:200
+-#: ../lib/plugins/movie/PluginMovieScope.py:201
+-#: ../lib/plugins/movie/PluginMovieScope.py:202
+-#: ../lib/plugins/movie/PluginMovieScope.py:203
+-#: ../lib/plugins/movie/PluginMovieScope.py:204
+-#: ../lib/plugins/movie/PluginMovieStopklatka.py:98
+-#: ../lib/plugins/movie/PluginMovieWP.py:98
+-#: ../lib/plugins/movie/PluginMovieZelluloid.py:107
+-#: ../lib/plugins/movie/PluginMovieZelluloid.py:216
+-#: ../lib/plugins/movie/PluginMovieZelluloid.py:217
+-#: ../lib/plugins/movie/PluginMovieZelluloid.py:218
+-#: ../lib/plugins/movie/PluginMovieZelluloid.py:219
+-#: ../lib/plugins/movie/PluginMovieZelluloid.py:220
+-#: ../lib/plugins/movie/PluginMovieZelluloid.py:221
+-#: ../lib/plugins/movie/PluginMovieZelluloid.py:222
+-#: ../lib/plugins/movie/PluginMovieZelluloid.py:223
+-#: ../lib/plugins/movie/PluginMovieZelluloid.py:224
+-#: ../lib/plugins/movie/PluginMovieZelluloid.py:225
+-#: ../lib/plugins/movie/PluginMovieZelluloid.py:226
+-#: ../lib/plugins/movie/PluginMovieZelluloid.py:227
+-#: ../lib/plugins/movie/PluginMovieZelluloid.py:247
+-#: ../lib/plugins/movie/PluginMovieZelluloid.py:248
+-#: ../lib/plugins/movie/PluginMovieZelluloid.py:249
+-#: ../lib/plugins/movie/PluginMovieZelluloid.py:250
+-#: ../lib/plugins/movie/PluginMovieZelluloid.py:251
+-#: ../lib/plugins/movie/PluginMovieZelluloid.py:252
+-#: ../lib/plugins/movie/PluginMovieZelluloid.py:253
+-#: ../lib/plugins/movie/PluginMovieZelluloid.py:254
+-#: ../lib/plugins/movie/PluginMovieZelluloid.py:255
+-#: ../lib/plugins/movie/PluginMovieZelluloid.py:256
+-#: ../lib/plugins/movie/PluginMovieZelluloid.py:257
+-#: ../lib/plugins/movie/PluginMovieZelluloid.py:258
+-#: ../lib/plugins/movie/PluginMovieZelluloid.py:259
+-#: ../lib/plugins/movie/PluginMovieZelluloid.py:260
+-#: ../lib/plugins/movie/PluginMovieZelluloid.py:261
+-#: ../lib/plugins/movie/PluginMovieZelluloid.py:262
+-#: ../lib/plugins/movie/PluginMovieZelluloid.py:263
+-#: ../lib/plugins/movie/PluginMovieZelluloid.py:264
+-#: ../lib/plugins/movie/PluginMovieZelluloid.py:265
+-#: ../lib/plugins/movie/PluginMovieZelluloid.py:266
+-#: ../lib/plugins/movie/PluginMovieZelluloid.py:267
+-#: ../lib/plugins/movie/PluginMovieZelluloid.py:268
+-#: ../lib/plugins/movie/PluginMovieZelluloid.py:269
+-#: ../lib/plugins/movie/PluginMovieZelluloid.py:270
+-#: ../lib/plugins/movie/PluginMovieZelluloid.py:271
+-#: ../lib/plugins/export/PluginExportAMC.py:115
+-#: ../lib/plugins/export/PluginExportDVDProfilerXMLExportV2.py:200
+-#: ../lib/plugins/export/PluginExportDVDProfilerXMLExportV3.py:182
+-#: ../lib/plugins/export/PluginExportGCstar.py:148
+-#: ../lib/plugins/imp/AllMyMovies.py:138 ../lib/plugins/imp/AllMyMovies.py:144
+-#: ../lib/plugins/imp/DVDProfiler.py:229 ../lib/plugins/imp/DVDProfiler.py:231
+-#: ../lib/plugins/imp/DVDProfiler.py:250 ../lib/plugins/imp/DVDProfiler.py:252
+-#: ../lib/plugins/imp/eXtremeMovieManager.py:171
+-#: ../lib/plugins/imp/FoxMovieManager.py:109 ../lib/plugins/imp/GCstar.py:150
+-#: ../lib/plugins/imp/TheMovieLibrary.py:148
+-#: ../lib/plugins/imp/WintoolzFilmdatenbank.py:136
+-msgid " as "
+-msgstr ""
+-
+-#: ../lib/plugins/movie/PluginMovieAmazon.py:38
+-msgid "International"
+-msgstr ""
+-
+-#: ../lib/plugins/movie/PluginMovieAmazon.py:59
+-#: ../lib/plugins/movie/PluginMovieAmazon.py:254
+-msgid ""
+-"Please configure your Amazon Access Key ID and Secret Key correctly in the "
+-"preferences dialog."
+-msgstr ""
+-
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:212
+-#: ../lib/plugins/movie/PluginMovieIMDB-it.py:154
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:178 ../glade/griffith.glade.h:4
+-msgid "<b>Audio</b>"
+-msgstr ""
+-
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:411
+-#: ../lib/plugins/movie/PluginMovieIMDB-de.py:458
+-#: ../lib/plugins/movie/PluginMovieIMDB.py:363
+-msgid "Audio"
+-msgstr ""
+-
+-#: ../lib/plugins/movie/PluginMovieIMDB-it.py:158
+-msgid "Data di uscita"
+-msgstr ""
+-
+-#: ../lib/plugins/movie/PluginMovieIMDB-pt.py:90
+-#: ../lib/plugins/movie/PluginMovieIMDB-pt.py:91
+-msgid " como "
+-msgstr ""
+-
+-#: ../lib/plugins/export/__init__.py:136
+-#: ../lib/plugins/export/PluginExportCSV.py:78
+-#: ../lib/plugins/export/PluginExportXML.py:115
+-#, python-format
+-msgid "%s file has been created."
+-msgstr ""
+-
+-#: ../lib/plugins/export/__init__.py:145 ../lib/plugins/export/__init__.py:148
+-#: ../lib/plugins/export/PluginExportCSV.py:50
+-#: ../lib/plugins/export/PluginExportCSV.py:53
+-#: ../lib/plugins/export/PluginExportiPod.py:108
+-#: ../lib/plugins/export/PluginExportXML.py:47
+-#: ../lib/plugins/export/PluginExportXML.py:50
+-#, python-format
+-msgid "Export a %s document"
+-msgstr ""
+-
+-#: ../lib/plugins/export/PluginExportAMC.py:30
+-msgid "Full Ant Movie Catalog database xml export plugin"
+-msgstr ""
+-
+-#: ../lib/plugins/export/PluginExportCSV.py:34
+-msgid "Full CSV list export plugin"
+-msgstr ""
+-
+-#: ../lib/plugins/export/PluginExportDVDProfilerXMLExportV2.py:29
+-msgid "Full DVD Profiler XML Export V2 plugin"
+-msgstr ""
+-
+-#: ../lib/plugins/export/PluginExportDVDProfilerXMLExportV3.py:29
+-msgid "Full DVD Profiler XML Export V3 plugin"
+-msgstr ""
+-
+-#: ../lib/plugins/export/PluginExportGCstar.py:30
+-msgid "Full GCstar database export plugin"
+-msgstr ""
+-
+-#: ../lib/plugins/export/PluginExportHTML.py:41
+-msgid "Plugin exports data using templates"
+-msgstr ""
+-
+-#: ../lib/plugins/export/PluginExportHTML.py:52
+-msgid "Griffith's movies list"
+-msgstr ""
+-
+-#: ../lib/plugins/export/PluginExportHTML.py:168
+-msgid "Width"
+-msgstr ""
+-
+-#: ../lib/plugins/export/PluginExportHTML.py:169
+-msgid "Height"
+-msgstr ""
+-
+-#: ../lib/plugins/export/PluginExportHTML.py:177 ../glade/griffith.glade.h:89
+-msgid "Media"
+-msgstr ""
+-
+-#: ../lib/plugins/export/PluginExportHTML.py:520
+-#: ../lib/plugins/export/PluginExportHTML.py:522
+-msgid "previous"
+-msgstr ""
+-
+-#: ../lib/plugins/export/PluginExportHTML.py:533
+-#: ../lib/plugins/export/PluginExportHTML.py:535
+-msgid "next"
+-msgstr ""
+-
+-#: ../lib/plugins/export/PluginExportHTML.py:622
+-#: ../lib/plugins/export/PluginExportHTML.py:658
+-#: ../lib/plugins/export/PluginExportHTML.py:763
+-#, python-format
+-msgid "Can't create %s!"
+-msgstr ""
+-
+-#: ../lib/plugins/export/PluginExportHTML.py:647
+-#, python-format
+-msgid ""
+-"Directory %s already exists.\n"
+-"Do you want to overwrite it?"
+-msgstr ""
+-
+-#: ../lib/plugins/export/PluginExportHTML.py:651
+-#, python-format
+-msgid "Can't remove %s!"
+-msgstr ""
+-
+-#: ../lib/plugins/export/PluginExportHTML.py:666
+-#: ../lib/plugins/export/PluginExportHTML.py:679
+-#, python-format
+-msgid "Can't copy %s!"
+-msgstr ""
+-
+-#: ../lib/plugins/export/PluginExportHTML.py:709
+-#, python-format
+-msgid "Can't open %s!"
+-msgstr ""
+-
+-#: ../lib/plugins/export/PluginExportHTML.py:717
+-#: ../lib/plugins/export/PluginExportPDF.py:263
+-msgid "Document generated by Griffith v"
+-msgstr ""
+-
+-#: ../lib/plugins/export/PluginExportHTML.py:785
+-msgid "Yes"
+-msgstr ""
+-
+-#: ../lib/plugins/export/PluginExportHTML.py:787
+-msgid "No"
+-msgstr ""
+-
+-#: ../lib/plugins/export/PluginExportHTML.py:862
+-msgid "Document has been generated."
+-msgstr ""
+-
+-#: ../lib/plugins/export/PluginExportiPod.py:63
+-msgid "iPod Notes export plugin"
+-msgstr ""
+-
+-#: ../lib/plugins/export/PluginExportiPod.py:87
+-msgid "My Movies List"
+-msgstr ""
+-
+-#: ../lib/plugins/export/PluginExportiPod.py:103
+-msgid "List successfully exported to iPod."
+-msgstr ""
+-
+-#: ../lib/plugins/export/PluginExportiPod.py:105
+-msgid "iPod is not connected."
+-msgstr ""
+-
+-#: ../lib/plugins/export/PluginExportiPod.py:119
+-msgid ""
+-"The list was successfully exported. Now you should move it to the 'Notes' "
+-"folder on your iPod."
+-msgstr ""
+-
+-#: ../lib/plugins/export/PluginExportPDF.py:48
+-msgid "PDF export plugin"
+-msgstr ""
+-
+-#: ../lib/plugins/export/PluginExportPDF.py:66
+-#: ../lib/plugins/export/PluginExportPDF.py:68
+-msgid "Export a PDF"
+-msgstr ""
+-
+-#: ../lib/plugins/export/PluginExportPDF.py:88
+-#: ../lib/plugins/export/PluginExportPDF.py:89
+-#: ../lib/plugins/export/PluginExportPDF.py:116
+-msgid "List of films"
+-msgstr ""
+-
+-#: ../lib/plugins/export/PluginExportPDF.py:119
+-#, python-format
+-msgid "Total Movies: %s"
+-msgstr ""
+-
+-#: ../lib/plugins/export/PluginExportPDF.py:199
+-msgid "PDF has been created."
+-msgstr ""
+-
+-#: ../lib/plugins/export/PluginExportPDF.py:261
+-#, python-format
+-msgid "Page %d"
+-msgstr ""
+-
+-#: ../lib/plugins/export/PluginExportXML.py:33
+-msgid "Full XML list export plugin"
+-msgstr ""
+-
+-#: ../lib/plugins/imp/AllMyMovies.py:60 ../lib/plugins/imp/AMC.py:121
+-#: ../lib/plugins/imp/BESTheMovieLibrary.py:60
+-#: ../lib/plugins/imp/DVDProfiler.py:57
+-#: ../lib/plugins/imp/eXtremeMovieManager.py:57
+-#: ../lib/plugins/imp/FoxMovieManager.py:60 ../lib/plugins/imp/GCstar.py:58
+-#: ../lib/plugins/imp/GriffithXML.py:57 ../lib/plugins/imp/MovieTrack.py:56
+-#: ../lib/plugins/imp/MyDVDs.py:60
+-#: ../lib/plugins/imp/PersonalVideoDatabase.py:57
+-#: ../lib/plugins/imp/TheMovieLibrary.py:60
+-#: ../lib/plugins/imp/WintoolzFilmdatenbank.py:59
+-msgid "The format of the file is not supported."
+-msgstr ""
+-
+-#: ../lib/plugins/imp/CSV.py:45
+-msgid "Full CSV list import plugin"
+-msgstr ""
+-
+-#: ../lib/plugins/imp/CSV.py:195
+-msgid "Please assign at least one field first!"
+-msgstr ""
+-
+-#: ../lib/plugins/imp/CSV.py:311
+-#, python-format
+-msgid "Can't open the file %s"
+-msgstr ""
+-
+-#: ../lib/plugins/imp/__init__.py:409
+-#, python-format
+-msgid "%s file has been imported. %s movies added."
+-msgstr ""
+-
+-#: ../glade/exporthtml.glade.h:1
+-msgid "<b>Example</b>"
+-msgstr ""
+-
+-#: ../glade/exporthtml.glade.h:2
+-msgid "<b>Export</b>"
+-msgstr ""
+-
+-#: ../glade/exporthtml.glade.h:3
+-msgid "<b>Header</b>"
+-msgstr ""
+-
+-#: ../glade/exporthtml.glade.h:4 ../glade/griffith.glade.h:18
+-msgid "<b>Sort by</b>"
+-msgstr ""
+-
+-#: ../glade/exporthtml.glade.h:5
+-msgid "<b>Split into</b>"
+-msgstr ""
+-
+-#: ../glade/exporthtml.glade.h:6
+-msgid "<b>Style</b>"
+-msgstr ""
+-
+-#: ../glade/exporthtml.glade.h:7
+-msgid "<b>Template</b>"
+-msgstr ""
+-
+-#: ../glade/exporthtml.glade.h:8 ../glade/import.glade.h:3
+-msgid "Author"
+-msgstr ""
+-
+-#: ../glade/exporthtml.glade.h:9
+-msgid "Black and white"
+-msgstr ""
+-
+-#: ../glade/exporthtml.glade.h:10
+-msgid "Choose style file"
+-msgstr ""
+-
+-#: ../glade/exporthtml.glade.h:11
+-msgid "Convert images"
+-msgstr ""
+-
+-#: ../glade/exporthtml.glade.h:12
+-msgid "Data"
+-msgstr ""
+-
+-#: ../glade/exporthtml.glade.h:13 ../glade/import.glade.h:4
+-msgid "Description"
+-msgstr ""
+-
+-#: ../glade/exporthtml.glade.h:14
+-msgid "Destination"
+-msgstr ""
+-
+-#: ../glade/exporthtml.glade.h:16
+-msgid "Export"
+-msgstr ""
+-
+-#: ../glade/exporthtml.glade.h:17
+-msgid "Export data"
+-msgstr ""
+-
+-#: ../glade/exporthtml.glade.h:18
+-msgid "Format"
+-msgstr ""
+-
+-#: ../glade/exporthtml.glade.h:19
+-msgid "Maximal height"
+-msgstr ""
+-
+-#: ../glade/exporthtml.glade.h:20
+-msgid "Maximal width"
+-msgstr ""
+-
+-#: ../glade/exporthtml.glade.h:21
+-msgid "Posters"
+-msgstr ""
+-
+-#: ../glade/exporthtml.glade.h:22 ../glade/griffith.glade.h:130
+-msgid "Reverse"
+-msgstr ""
+-
+-#: ../glade/exporthtml.glade.h:23
+-msgid "Template"
+-msgstr ""
+-
+-#: ../glade/exporthtml.glade.h:24
+-msgid "Use custom file"
+-msgstr ""
+-
+-#: ../glade/exporthtml.glade.h:25 ../glade/import.glade.h:10
+-msgid "Version"
+-msgstr ""
+-
+-#: ../glade/exporthtml.glade.h:26
+-msgid "entries per page"
+-msgstr ""
+-
+-#: ../glade/exporthtml.glade.h:27
+-msgid "files"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:1
+-msgid "0 means no limits"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:2
+-msgid "<b>Audio channels</b>"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:3
+-msgid "<b>Audio codecs</b>"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:5
+-msgid "<b>Collection</b>"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:6
+-msgid "<b>Collections</b>"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:7
+-msgid "<b>Defaults</b>"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:8
+-msgid "<b>E-mail reminder</b>"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:9
+-msgid "<b>Languages</b>"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:10
+-msgid "<b>Limits</b>"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:11
+-msgid "<b>Loan History</b>"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:12
+-msgid "<b>Loans</b>"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:13
+-msgid "<b>Media</b>"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:14
+-msgid "<b>Search for:</b>"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:15
+-msgid "<b>Search results</b>"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:16
+-msgid "<b>Select database to use</b>"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:17
+-msgid "<b>Show only the following columns</b>"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:19
+-msgid "<b>Subtitle formats</b>"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:20
+-msgid "<b>Subtitles</b>"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:21
+-msgid "<b>Tags</b>"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:22
+-msgid "<b>Use spell checking on the following fields:</b>"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:23
+-msgid "<b>Video codecs</b>"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:24
+-msgid "<b>Volume</b>"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:25
+-msgid "<b>Volumes</b>"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:26
+-msgid "Add"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:28
+-msgid "Add a new person"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:29
+-msgid "Add movie"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:30
+-msgid "Add movie and close"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:31
+-msgid "Adds new movie"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:32
+-msgid "All Movies"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:34
+-msgid "Base font size"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:35
+-msgid "By Collection"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:38
+-msgid "Choose Image"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:40
+-msgid "Clear filter"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:41
+-msgid "Clone"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:46
+-msgid "Create backup"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:48
+-msgid "Database"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:49
+-msgid "Delete a person"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:50
+-msgid "Details"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:51
+-msgid "Dictionaries"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:55
+-msgid "E-mail reminder"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:56
+-msgid "E_xport"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:57
+-msgid "Edit a person"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:58
+-msgid "Edit movie details"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:59
+-msgid "Extensions"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:60
+-msgid "Extensions toolbar"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:61
+-msgid "Favorite Movie Plugin"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:62
+-msgid "Fill empty fields only"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:63
+-msgid "Filter "
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:64
+-msgid "Filter movies"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:65
+-msgid "Font for reports"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:66
+-msgid "Forum"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:67
+-msgid "Found Results"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:69
+-msgid "Get from web"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:70
+-msgid "Get movie data from:"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:71
+-msgid "Homepage"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:72
+-msgid "Host"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:73
+-msgid "I_mport"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:75
+-msgid "Include Front Image"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:76
+-msgid "Include movie number"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:77
+-msgid "Languages"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:79
+-msgid "Limit search results to"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:80
+-msgid "Load poster from disk"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:81
+-msgid "Loan"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:82
+-msgid "Loan Management"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:83
+-msgid "Loan movie"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:84
+-msgid "Loan to"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:85
+-msgid "Loaned Movies"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:86
+-msgid "Loans"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:87
+-msgid "Main list"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:88
+-msgid "Manage People"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:91
+-msgid ""
+-"Meter\n"
+-"Stars"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:93
+-msgid "Movie details"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:94
+-msgid "Movie information"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:96
+-msgid "Needs authentication"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:97
+-msgid "New database"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:98
+-msgid "Not Seen Movies"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:102
+-msgid "Open search window"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:104
+-msgid "Original title"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:105
+-msgid "Other"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:106
+-msgid "PDF reader"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:107
+-msgid "Password"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:108
+-msgid "People"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:109
+-msgid "Phone"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:110
+-msgid "Please wait a moment..."
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:112
+-msgid "Plugins"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:113
+-msgid "Port"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:114
+-msgid "Poster image"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:115
+-msgid "Poster viewer"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:116
+-msgid "Preferences"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:117
+-msgid "Print Cover"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:118
+-msgid "Print cover"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:120
+-msgid "Rating image"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:122
+-msgid "Remove"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:123
+-msgid "Remove poster"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:124
+-msgid "Remove selected movie"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:125
+-msgid "Rename"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:126
+-msgid "Report bug"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:127
+-msgid "Resolution"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:128
+-msgid "Restore from backup"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:129
+-msgid "Return"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:132
+-msgid "SMTP port"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:133
+-msgid "SMTP server"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:134
+-msgid "Saved filters"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:136
+-msgid "Searching on the web"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:138
+-msgid "Select all"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:139
+-msgid "Select database"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:140
+-msgid "Select first movie"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:141
+-msgid "Select last movie"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:142
+-msgid "Select next movie"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:143
+-msgid "Select previous movie"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:144
+-msgid "Sender E-mail address"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:145
+-msgid "Show other movies in this collection"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:146
+-msgid "Show other movies in this volume"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:147
+-msgid "Simple"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:149
+-msgid "Size"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:150
+-msgid "Spell check the following language"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:151
+-msgid ""
+-"Standard\n"
+-"Slim\n"
+-"Double Slim"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:155
+-msgid "Suggest an unseen movie"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:157
+-msgid "Technical information"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:158
+-msgid "This movie is part of..."
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:160
+-msgid "Toolbar"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:163
+-msgid ""
+-"Type in the original film title, select source and choose <i>Get from web</"
+-"i>. Griffith will try to fetch all the related information from the Web."
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:165
+-msgid "Use Spellchecker"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:166
+-msgid "Use TLS?"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:167
+-msgid "Username"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:169
+-msgid "Visit movie web site"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:170
+-msgid "Visit the official web site"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:172
+-msgid "Watch the trailer"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:174
+-msgid "_Edit"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:175
+-msgid "_File"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:176
+-msgid "_Help"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:177
+-msgid "_Loans"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:178
+-msgid "_Tools"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:179
+-msgid "_View"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:180
+-msgid "add entered name to collections list"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:181
+-msgid "add entered name to volumes list"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:182
+-msgid "classification"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:183
+-msgid "click here if movie was returned"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:184
+-msgid "collection details"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:185
+-msgid "loaned only"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:186
+-msgid "loans movie or volume"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:187
+-msgid "minutes"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:188
+-msgid "movies"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:189
+-msgid "none"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:190
+-msgid "not loaned only"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:191
+-msgid "remove selected collection"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:192
+-msgid "remove selected volume"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:193
+-msgid "seen only"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:194
+-msgid "tags"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:195
+-msgid "unseen only"
+-msgstr ""
+-
+-#: ../glade/griffith.glade.h:196
+-msgid "volume details"
+-msgstr ""
+-
+-#: ../glade/importcsv.glade.h:1
+-msgid ""
+-"<b>Some Hints</b>:\n"
+-"\n"
+-"On the next step you can assign your csv fields with the one in Griffith.\n"
+-"One CSV-field can be assigned to multiple griffith-fields, i.e. if you have "
+-"only one title.\n"
+-"Your cast-list should be comma-seperated to break it apart in multiple lines."
+-msgstr ""
+-
+-#: ../glade/importcsv.glade.h:6
+-msgid "Assigned Fields (CSV > Griffith)"
+-msgstr ""
+-
+-#: ../glade/importcsv.glade.h:7
+-msgid "CSV Fields"
+-msgstr ""
+-
+-#: ../glade/importcsv.glade.h:8
+-msgid "CSV Import"
+-msgstr ""
+-
+-#: ../glade/importcsv.glade.h:9
+-msgid "Delimiter"
+-msgstr ""
+-
+-#: ../glade/importcsv.glade.h:10
+-msgid "Encoding"
+-msgstr ""
+-
+-#: ../glade/importcsv.glade.h:11 ../glade/import.glade.h:6
+-msgid "Fields"
+-msgstr ""
+-
+-#: ../glade/importcsv.glade.h:12
+-msgid "File-Options"
+-msgstr ""
+-
+-#: ../glade/importcsv.glade.h:13
+-msgid "From Row"
+-msgstr ""
+-
+-#: ../glade/importcsv.glade.h:14
+-msgid "Griffith Fields"
+-msgstr ""
+-
+-#: ../glade/importcsv.glade.h:15
+-msgid "If your file has no column headers then you should import from row 0."
+-msgstr ""
+-
+-#: ../glade/importcsv.glade.h:16
+-msgid "Line terminator"
+-msgstr ""
+-
+-#: ../glade/importcsv.glade.h:17
+-msgid "Quotechar"
+-msgstr ""
+-
+-#: ../glade/importcsv.glade.h:18
+-msgid ""
+-"ascii (English)\n"
+-"big5 (Traditional Chinese)\n"
+-"big5hkscs (Traditional Chinese)\n"
+-"cp037 (English)\n"
+-"cp424 (Hebrew)\n"
+-"cp437 (English)\n"
+-"cp500 (Western Europe)\n"
+-"cp737 (Greek)\n"
+-"cp775 (Baltic languages)\n"
+-"cp850 (Western Europe)\n"
+-"cp852 (Central and Eastern Europe)\n"
+-"cp855 (Bulgarian, Byelorussian, Macedonian, Russian, Serbian)\n"
+-"cp856 (Hebrew)\n"
+-"cp857 (Turkish)\n"
+-"cp860 (Portuguese)\n"
+-"cp861 (Icelandic)\n"
+-"cp862 (Hebrew)\n"
+-"cp863 (Canadian)\n"
+-"cp864 (Arabic)\n"
+-"cp865 (Danish, Norwegian)\n"
+-"cp866 (Russian)\n"
+-"cp869 (Greek)\n"
+-"cp874 (Thai)\n"
+-"cp875 (Greek)\n"
+-"cp932 (Japanese)\n"
+-"cp949 (Korean)\n"
+-"cp950 (Traditional Chinese)\n"
+-"cp1006 (Urdu)\n"
+-"cp1026 (Turkish)\n"
+-"cp1140 (Western Europe)\n"
+-"cp1250 (Central and Eastern Europe)\n"
+-"cp1251 (Bulgarian, Byelorussian, Macedonian, Russian, Serbian)\n"
+-"cp1252 (Western Europe)\n"
+-"cp1253 (Greek)\n"
+-"cp1254 (Turkish)\n"
+-"cp1255 (Hebrew)\n"
+-"cp1256 (Arabic)\n"
+-"cp1257 (Baltic languages)\n"
+-"cp1258 (Vietnamese)\n"
+-"euc_jp (Japanese)\n"
+-"euc_jis_2004 (Japanese)\n"
+-"euc_jisx0213 (Japanese)\n"
+-"euc_kr (Korean)\n"
+-"gb2312 (Simplified Chinese)\n"
+-"gbk (Unified Chinese)\n"
+-"gb18030 (Unified Chinese)\n"
+-"hz (Simplified Chinese)\n"
+-"iso2022_jp (Japanese)\n"
+-"iso2022_jp_1 (Japanese)\n"
+-"iso2022_jp_2 (Japanese, Korean, Simplified Chinese, Western Europe, Greek)\n"
+-"iso2022_jp_2004 (Japanese)\n"
+-"iso2022_jp_3 (Japanese)\n"
+-"iso2022_jp_ext (Japanese)\n"
+-"iso2022_kr (Korean)\n"
+-"latin_1 (West Europe)\n"
+-"iso8859_2 (Central and Eastern Europe)\n"
+-"iso8859_3 (Esperanto, Maltese)\n"
+-"iso8859_4 (Baltic languagues)\n"
+-"iso8859_5 (Bulgarian, Byelorussian, Macedonian, Russian, Serbian)\n"
+-"iso8859_6 (Arabic)\n"
+-"iso8859_7 (Greek)\n"
+-"iso8859_8 (Hebrew)\n"
+-"iso8859_9 (Turkish)\n"
+-"iso8859_10 (Nordic languages)\n"
+-"iso8859_13 (Baltic languages)\n"
+-"iso8859_14 (Celtic languages)\n"
+-"iso8859_15 (Western Europe)\n"
+-"johab (Korean)\n"
+-"koi8_r (Russian)\n"
+-"koi8_u (Ukrainian)\n"
+-"mac_cyrillic (Bulgarian, Byelorussian, Macedonian, Russian, Serbian)\n"
+-"mac_greek (Greek)\n"
+-"mac_iceland (Icelandic)\n"
+-"mac_latin2 (Central and Eastern Europe)\n"
+-"mac_roman (Western Europe)\n"
+-"mac_turkish (Turkish)\n"
+-"ptcp154 (Kazakh)\n"
+-"shift_jis (Japanese)\n"
+-"shift_jis_2004 (Japanese)\n"
+-"shift_jisx0213 (Japanese)\n"
+-"utf_16 (all languages)\n"
+-"utf_16_be (all languages (BMP only))\n"
+-"utf_16_le (all languages (BMP only))\n"
+-"utf_7 (all languages)\n"
+-"utf_8 (all languages)"
+-msgstr ""
+-
+-#: ../glade/import.glade.h:1
+-msgid "<b>Import only fields selected below</b>"
+-msgstr ""
+-
+-#: ../glade/import.glade.h:2
+-msgid "<b>Importing...</b>"
+-msgstr ""
+-
+-#: ../glade/import.glade.h:7
+-msgid "Import window"
+-msgstr ""
+-
+-#: ../glade/import.glade.h:8
+-msgid "Plugin"
+-msgstr ""
+-
+-#: ../glade/import.glade.h:9
+-msgid "Source"
+-msgstr ""
+diff --git a/winpackage.iss b/winpackage.iss
+index 804a421..9c85c77 100644
+--- a/winpackage.iss
++++ b/winpackage.iss
+@@ -3,7 +3,7 @@
+ 
+ [Setup]
+ AppName=Griffith
+-AppVerName=Griffith 0.12.1
++AppVerName=Griffith 0.13.0
+ AppPublisher=Vasco Nunes, Piotr Ożarowski
+ AppPublisherURL=http://www.griffith.cc/
+ AppSupportURL=http://www.griffith.cc/
+@@ -14,7 +14,7 @@ AllowNoIcons=true
+ LicenseFile=COPYING
+ InfoAfterFile=README
+ OutputDir=installer
+-OutputBaseFilename=griffith-0.12.1-win32.1
++OutputBaseFilename=griffith-0.13-win32
+ SetupIconFile=images\griffith.ico
+ UninstallDisplayIcon={app}\griffith.exe
+ Compression=lzma
+@@ -23,8 +23,8 @@ WizardImageFile=images\griffith_win32_installer.bmp
+ InternalCompressLevel=ultra
+ AppCopyright=Vasco Nunes/Piotr Ożarowski
+ DisableStartupPrompt=false
+-AppVersion=0.12.1
+-VersionInfoVersion=0.12.1
++AppVersion=0.13.0
++VersionInfoVersion=0.13.0
+ 
+ [Languages]
+ Name: eng; MessagesFile: compiler:Default.isl
+@@ -66,7 +66,7 @@ Source: dist\share\*;  DestDir: {app}\share;  Flags: ignoreversion recursesubdir
+ Source: dist\lib\*;    DestDir: {app}\lib;    Flags: ignoreversion
+ ; use recursion, no components
+ Source: dist\lib\db\*;           DestDir: {app}\lib\db;           Flags: ignoreversion recursesubdirs createallsubdirs
+-Source: dist\lib\gettext\*;      DestDir: {app}\lib\gettext;      Flags: ignoreversion recursesubdirs createallsubdirs
++;Source: dist\lib\gettext\*;      DestDir: {app}\lib\gettext;      Flags: ignoreversion recursesubdirs createallsubdirs
+ Source: dist\lib\glade3\*;       DestDir: {app}\lib\glade3;       Flags: ignoreversion recursesubdirs createallsubdirs
+ ;Source: dist\lib\glib-2.0\*;     DestDir: {app}\lib\glib-2.0;     Flags: ignoreversion recursesubdirs createallsubdirs
+ Source: dist\lib\gtk-2.0\*;      DestDir: {app}\lib\gtk-2.0;      Flags: ignoreversion recursesubdirs createallsubdirs
+@@ -97,7 +97,6 @@ Source: dist\lib\plugins\movie\PluginMovieDVDPalace.py;     DestDir: {app}\lib\p
+ Source: dist\lib\plugins\movie\PluginMovieE-Pipoca.py;      DestDir: {app}\lib\plugins\movie; Flags: ignoreversion; Components: Movie_Import_Plugins\Brazilian_Portuguese\E_Pipoca
+ Source: dist\lib\plugins\movie\PluginMovieFDb.py;           DestDir: {app}\lib\plugins\movie; Flags: ignoreversion; Components: Movie_Import_Plugins\Polish\FDb
+ Source: dist\lib\plugins\movie\PluginMovieFilmAffinity.py;  DestDir: {app}\lib\plugins\movie; Flags: ignoreversion; Components: Movie_Import_Plugins\Spanish\FilmAffinity
+-Source: dist\lib\plugins\movie\PluginMovieFilmDb.py;        DestDir: {app}\lib\plugins\movie; Flags: ignoreversion; Components: Movie_Import_Plugins\German\FilmDb
+ Source: dist\lib\plugins\movie\PluginMovieFilmeVonAZ.py;    DestDir: {app}\lib\plugins\movie; Flags: ignoreversion; Components: Movie_Import_Plugins\German\Filme_von_A_bis_Z
+ Source: dist\lib\plugins\movie\PluginMovieFilmtipset.py;    DestDir: {app}\lib\plugins\movie; Flags: ignoreversion; Components: Movie_Import_Plugins\Swedish\Film_tip_set
+ Source: dist\lib\plugins\movie\PluginMovieFilmweb.py;       DestDir: {app}\lib\plugins\movie; Flags: ignoreversion; Components: Movie_Import_Plugins\Polish\Filmweb
+@@ -182,7 +181,6 @@ Name: Movie_Import_Plugins\French\CineMovies;        Description: CineMovies / w
+ 
+ Name: Movie_Import_Plugins\German;                   Description: German Import Plugins; Types: full
+ Name: Movie_Import_Plugins\German\DVD_Palace;        Description: DVD-Palace / www.dvd-palace.de; Types: full
+-Name: Movie_Import_Plugins\German\FilmDb;            Description: FilmDb / www.filmdb.de; Types: full
+ Name: Movie_Import_Plugins\German\Filme_von_A_bis_Z; Description: Filme von A-Z / www.filmevona-z.de; Types: full
+ Name: Movie_Import_Plugins\German\IMDBde;            Description: IMDB.de / german.imdb.com; Types: full
+ Name: Movie_Import_Plugins\German\OFDb;              Description: OFDb / www.ofdb.de; Types: full
+diff --git a/winsetup.bat b/winsetup.bat
+index 190d911..752313e 100644
+--- a/winsetup.bat
++++ b/winsetup.bat
+@@ -52,6 +52,8 @@ xcopy "%GTKDIR%\share\themes\MS-Windows\gtk-2.0\*.*" "%GRIFFITHDIR%\dist\" /s /e
+ if not "%ERRORLEVEL%" == "0" (pause)
+ xcopy "%GTKDIR%\bin\jpeg62.dll"   "%GRIFFITHDIR%\dist\" /s /e
+ if not "%ERRORLEVEL%" == "0" (pause)
++xcopy "%GTKDIR%\bin\libxml2-2.dll"   "%GRIFFITHDIR%\dist\" /s /e
++if not "%ERRORLEVEL%" == "0" (pause)
+ 
+ copy "%GRIFFITHDIR%\AUTHORS"     "%GRIFFITHDIR%\dist\"
+ copy "%GRIFFITHDIR%\COPYING"     "%GRIFFITHDIR%\dist\"
+diff --git a/winsetup.py b/winsetup.py
+index cbe718e..9deb73d 100644
+--- a/winsetup.py
++++ b/winsetup.py
+@@ -1,7 +1,7 @@
+ #!/usr/bin/env python
+ # -*- coding: utf-8 -*-
+ 
+-__revision__ = '$Id: winsetup.py 1605 2011-12-18 22:35:25Z piotrek $'
++__revision__ = '$Id$'
+ 
+ # Copyright © 2005-2010 Vasco Nunes, Piotr Ożarowski
+ # This program is free software; you can redistribute it and/or modify
+@@ -45,7 +45,7 @@ import py2exe
+ 
+ opts = {
+     "py2exe": {
+-        "includes": "pygtk,cairo,pangocairo,gobject,cgi,PIL,pysqlite2,pysqlite2.*,pango,atk,gobject,tempfile,csv,xml.dom,xml.dom.minidom,xml.sax,threading,htmlentitydefs,sqlalchemy,sqlalchemy.*,sqlalchemy.databases.*,sqlalchemy.engine.*,sqlalchemy.ext.*,sqlalchemy.orm.*,sqlalchemy.sql.*,zipfile,webbrowser,shutil,reportlab,reportlab.pdfgen,reportlab.pdfgen.canvas,reportlab.platypus,reportlab.pdfbase.ttfonts,smtplib,win32com,platform,winshell,psycopg2,MySQLdb,chardet,gzip,commands,encodings,encodings.*,ConfigParser,gtk.glade,xmlrpclib,gio",
++        "includes": "pygtk,cairo,pangocairo,gobject,cgi,PIL,pysqlite2,pysqlite2.*,pango,atk,gobject,tempfile,csv,xml.dom,xml.dom.minidom,xml.sax,threading,htmlentitydefs,sqlalchemy,sqlalchemy.*,sqlalchemy.databases.*,sqlalchemy.engine.*,sqlalchemy.ext.*,sqlalchemy.orm.*,sqlalchemy.sql.*,zipfile,webbrowser,shutil,reportlab,reportlab.pdfgen,reportlab.pdfgen.canvas,reportlab.platypus,reportlab.pdfbase.ttfonts,reportlab.pdfbase.*,smtplib,win32com,platform,winshell,psycopg2,MySQLdb,chardet,gzip,commands,encodings,encodings.*,ConfigParser,gtk.glade,xmlrpclib,gio,lxml.*,simplejson",
+         "optimize": 2,
+         "dist_dir": "dist",
+     }

diff --git a/media-video/griffith/griffith-0.13-r2.ebuild b/media-video/griffith/griffith-0.13-r2.ebuild
new file mode 100644
index 0000000..582b582
--- /dev/null
+++ b/media-video/griffith/griffith-0.13-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='sqlite'
+
+inherit versionator python-single-r1 multilib git-r3
+
+ARTWORK_PV="0.9.4"
+
+DESCRIPTION="Movie collection manager"
+HOMEPAGE="http://www.griffith.cc/"
+SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${PN}-extra-artwork-${ARTWORK_PV}.tar.gz"
+EGIT_REPO_URI="https://github.com/santiavenda2/griffith"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="doc"
+
+RDEPEND="dev-python/pillow
+	gnome-base/libglade
+	dev-python/pyxml[${PYTHON_USEDEP}]
+	>=dev-python/pygtk-2.6.1:2[${PYTHON_USEDEP}]
+	dev-python/pygobject:2[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-0.5.2[${PYTHON_USEDEP}]
+	>=dev-python/reportlab-1.19[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( app-text/docbook2X )"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	use doc || { sed -i -e '/docs/d' Makefile || die ; }
+	sed -i \
+		-e 's#/pl/#/pl.UTF-8/#' \
+		"${S}"/docs/pl/Makefile || die "sed failed"
+
+	sed -i \
+		-e 's/ISO-8859-1/UTF-8/' \
+		"${S}"/lib/gconsole.py || die "sed failed"
+
+	# epatch "${FILESDIR}/0.10-fix_lib_path.patch"
+}
+
+src_compile() {
+	# Nothing to compile and default `emake` spews an error message
+	true
+}
+
+src_install() {
+	use doc || { sed -i -e '/docs/d' Makefile || die ; }
+
+	emake \
+		LIBDIR="${D}/usr/$(get_libdir)/griffith" \
+		DESTDIR="${D}" DOC2MAN=docbook2man.pl install
+	dodoc AUTHORS ChangeLog README THANKS TODO NEWS TRANSLATORS
+
+	cd "${WORKDIR}/${PN}-extra-artwork-${ARTWORK_PV}/"
+	emake DESTDIR="${D}" install
+	# This carries over from -0.13 but appears to have no effect.
+	python_optimize "${D}"usr/share/${PN}
+}
+
+pkg_postinst() {
+	einfo
+	einfo "${PN} can make use of the following optional dependencies"
+	einfo "dev-python/chardet: CSV file encoding detections"
+	einfo "dev-python/mysql-python: Python interface for MySQL connectivity"
+	einfo ">=dev-python/psycopg-2.4: Python interface for PostgreSQL connectivity"
+	einfo
+}

diff --git a/media-video/griffith/metadata.xml b/media-video/griffith/metadata.xml
new file mode 100644
index 0000000..2625db8
--- /dev/null
+++ b/media-video/griffith/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>hwoarang@g.o</email>
+    <name>Markos Chandras</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>media-video@g.o</email>
+    <name>Gentoo Video project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="launchpad">griffith</remote-id>
+  </upstream>
+</pkgmetadata>